diff --git a/src/brushmanip.cpp b/src/brushmanip.cpp index 07b2b8e..7c1e0be 100644 --- a/src/brushmanip.cpp +++ b/src/brushmanip.cpp @@ -1300,30 +1300,30 @@ void Brush_registerCommands() GlobalCommands_insert("BrushRock", BrushPrefab::SetCaller(g_brushrock)); GlobalCommands_insert("Brush3Sided", BrushMakeSided::SetCaller(g_brushmakesided3), - Accelerator('3', (GdkModifierType) GDK_CONTROL_MASK)); + Accelerator('3', (GdkModifierType) GDK_LOCK_MASK)); GlobalCommands_insert("Brush4Sided", BrushMakeSided::SetCaller(g_brushmakesided4), - Accelerator('4', (GdkModifierType) GDK_CONTROL_MASK)); + Accelerator('4', (GdkModifierType) GDK_LOCK_MASK)); GlobalCommands_insert("Brush5Sided", BrushMakeSided::SetCaller(g_brushmakesided5), - Accelerator('5', (GdkModifierType) GDK_CONTROL_MASK)); + Accelerator('5', (GdkModifierType) GDK_LOCK_MASK)); GlobalCommands_insert("Brush6Sided", BrushMakeSided::SetCaller(g_brushmakesided6), - Accelerator('6', (GdkModifierType) GDK_CONTROL_MASK)); + Accelerator('6', (GdkModifierType) GDK_LOCK_MASK)); GlobalCommands_insert("Brush7Sided", BrushMakeSided::SetCaller(g_brushmakesided7), - Accelerator('7', (GdkModifierType) GDK_CONTROL_MASK)); + Accelerator('7', (GdkModifierType) GDK_LOCK_MASK)); GlobalCommands_insert("Brush8Sided", BrushMakeSided::SetCaller(g_brushmakesided8), - Accelerator('8', (GdkModifierType) GDK_CONTROL_MASK)); + Accelerator('8', (GdkModifierType) GDK_LOCK_MASK)); GlobalCommands_insert("Brush9Sided", BrushMakeSided::SetCaller(g_brushmakesided9), - Accelerator('9', (GdkModifierType) GDK_CONTROL_MASK)); + Accelerator('9', (GdkModifierType) GDK_LOCK_MASK)); GlobalCommands_insert("ClipSelected", makeCallbackF(ClipSelected), Accelerator(GDK_KEY_Return)); GlobalCommands_insert("SplitSelected", makeCallbackF(SplitSelected), Accelerator(GDK_KEY_Return, (GdkModifierType) GDK_SHIFT_MASK)); GlobalCommands_insert("FlipClip", makeCallbackF(FlipClipper), - Accelerator(GDK_KEY_Return, (GdkModifierType) GDK_CONTROL_MASK)); + Accelerator(GDK_KEY_Return, (GdkModifierType) GDK_LOCK_MASK)); GlobalCommands_insert("MakeDetail", makeCallbackF(Select_MakeDetail), - Accelerator('M', (GdkModifierType) GDK_CONTROL_MASK)); + Accelerator('M', (GdkModifierType) GDK_LOCK_MASK)); GlobalCommands_insert("MakeStructural", makeCallbackF(Select_MakeStructural), - Accelerator('S', (GdkModifierType) (GDK_SHIFT_MASK | GDK_CONTROL_MASK))); + Accelerator('S', (GdkModifierType) (GDK_SHIFT_MASK | GDK_LOCK_MASK))); } void Brush_constructMenu(ui::Menu menu) diff --git a/src/camwindow.cpp b/src/camwindow.cpp index 38aeb40..fba9076 100644 --- a/src/camwindow.cpp +++ b/src/camwindow.cpp @@ -711,17 +711,17 @@ void Camera_motionDelta(int x, int y, unsigned int state, void *data) case 0: cam->m_strafe = (state & GDK_SHIFT_MASK) != 0; if (cam->m_strafe) { - cam->m_strafe_forward = (state & GDK_CONTROL_MASK) != 0; + cam->m_strafe_forward = (state & GDK_LOCK_MASK) != 0; } else { cam->m_strafe_forward = false; } break; case 1: - cam->m_strafe = (state & GDK_CONTROL_MASK) != 0 && (state & GDK_SHIFT_MASK) == 0; + cam->m_strafe = (state & GDK_LOCK_MASK) != 0 && (state & GDK_SHIFT_MASK) == 0; cam->m_strafe_forward = false; break; case 2: - cam->m_strafe = (state & GDK_CONTROL_MASK) != 0 && (state & GDK_SHIFT_MASK) == 0; + cam->m_strafe = (state & GDK_LOCK_MASK) != 0 && (state & GDK_SHIFT_MASK) == 0; cam->m_strafe_forward = cam->m_strafe; break; } @@ -2006,6 +2006,15 @@ void GlobalCamera_LookThroughCamera() CamWnd_LookThroughCamera(*g_camwnd); } + +void GlobalCamera_Refresh(void) +{ + CamWnd &camwnd = *g_camwnd; + Camera_updateModelview(camwnd.getCamera()); + Camera_updateProjection(camwnd.getCamera()); + CamWnd_Update(camwnd); +} + /* sets origin and angle to 0,0,0 coords */ void XYZ_SetOrigin(const Vector3 &origin); void GlobalCamera_GoToZero(void) @@ -2139,18 +2148,18 @@ void CamWnd_Construct() GlobalToggles_insert("ToggleCubicClip", makeCallbackF(Camera_ToggleFarClip), ToggleItem::AddCallbackCaller(g_getfarclip_item), - Accelerator('\\', (GdkModifierType) GDK_CONTROL_MASK)); + Accelerator('\\', (GdkModifierType) GDK_LOCK_MASK)); GlobalCommands_insert("CubicClipZoomIn", makeCallbackF(Camera_CubeIn), - Accelerator('[', (GdkModifierType) GDK_CONTROL_MASK)); + Accelerator('[', (GdkModifierType) GDK_LOCK_MASK)); GlobalCommands_insert("CubicClipZoomOut", makeCallbackF(Camera_CubeOut), - Accelerator(']', (GdkModifierType) GDK_CONTROL_MASK)); + Accelerator(']', (GdkModifierType) GDK_LOCK_MASK)); GlobalCommands_insert("UpFloor", makeCallbackF(Camera_ChangeFloorUp), Accelerator(GDK_KEY_Prior)); GlobalCommands_insert("DownFloor", makeCallbackF(Camera_ChangeFloorDown), Accelerator(GDK_KEY_Next)); GlobalToggles_insert("ToggleCamera", ToggleShown::ToggleCaller(g_camera_shown), ToggleItem::AddCallbackCaller(g_camera_shown.m_item), - Accelerator('C', (GdkModifierType) (GDK_SHIFT_MASK | GDK_CONTROL_MASK))); + Accelerator('C', (GdkModifierType) (GDK_SHIFT_MASK | GDK_LOCK_MASK))); GlobalCommands_insert("LookThroughSelected", makeCallbackF(GlobalCamera_LookThroughSelected)); GlobalCommands_insert("LookThroughCamera", makeCallbackF(GlobalCamera_LookThroughCamera)); diff --git a/src/entity.cpp b/src/entity.cpp index 2723fb0..2465a2c 100644 --- a/src/entity.cpp +++ b/src/entity.cpp @@ -619,7 +619,7 @@ void Entity_Construct() GlobalCommands_insert("EntityColor", makeCallbackF(Entity_setColour), Accelerator('K')); GlobalCommands_insert("NormalizeColor", makeCallbackF(Entity_normalizeColor)); GlobalCommands_insert("ConnectSelection", makeCallbackF(Entity_connectSelected), - Accelerator('K', (GdkModifierType) GDK_CONTROL_MASK)); + Accelerator('K', (GdkModifierType) GDK_LOCK_MASK)); GlobalCommands_insert("KillConnectSelection", makeCallbackF(Entity_killconnectSelected), Accelerator('K', (GdkModifierType) (GDK_SHIFT_MASK))); GlobalCommands_insert("GroupSelection", makeCallbackF(Entity_groupSelected)); diff --git a/src/filters.cpp b/src/filters.cpp index 78cb0ea..209ec16 100644 --- a/src/filters.cpp +++ b/src/filters.cpp @@ -251,16 +251,16 @@ void ConstructFilters() } add_filter_command(EXCLUDE_LIGHTS, "FilterLights", Accelerator('0', (GdkModifierType) GDK_MOD1_MASK)); add_filter_command(EXCLUDE_STRUCTURAL, "FilterStructural", - Accelerator('D', (GdkModifierType) (GDK_SHIFT_MASK | GDK_CONTROL_MASK))); + Accelerator('D', (GdkModifierType) (GDK_SHIFT_MASK | GDK_LOCK_MASK))); if (g_pGameDescription->mGameType != "doom3") { add_filter_command(EXCLUDE_LIGHTGRID, "FilterLightgrid", accelerator_null()); } - add_filter_command(EXCLUDE_CURVES, "FilterPatches", Accelerator('P', (GdkModifierType) GDK_CONTROL_MASK)); - add_filter_command(EXCLUDE_DETAILS, "FilterDetails", Accelerator('D', (GdkModifierType) GDK_CONTROL_MASK)); - add_filter_command(EXCLUDE_HINTSSKIPS, "FilterHintsSkips", Accelerator('H', (GdkModifierType) GDK_CONTROL_MASK)); + add_filter_command(EXCLUDE_CURVES, "FilterPatches", Accelerator('P', (GdkModifierType) GDK_LOCK_MASK)); + add_filter_command(EXCLUDE_DETAILS, "FilterDetails", Accelerator('D', (GdkModifierType) GDK_LOCK_MASK)); + add_filter_command(EXCLUDE_HINTSSKIPS, "FilterHintsSkips", Accelerator('H', (GdkModifierType) GDK_LOCK_MASK)); add_filter_command(EXCLUDE_MODELS, "FilterModels", Accelerator('M', (GdkModifierType) GDK_SHIFT_MASK)); add_filter_command(EXCLUDE_TRIGGERS, "FilterTriggers", - Accelerator('T', (GdkModifierType) (GDK_SHIFT_MASK | GDK_CONTROL_MASK))); + Accelerator('T', (GdkModifierType) (GDK_SHIFT_MASK | GDK_LOCK_MASK))); if (g_pGameDescription->mGameType != "doom3") { add_filter_command(EXCLUDE_BOTCLIP, "FilterBotClips", Accelerator('M', (GdkModifierType) GDK_MOD1_MASK)); add_filter_command(EXCLUDE_DECALS, "FilterDecals", Accelerator('D', (GdkModifierType) GDK_SHIFT_MASK)); diff --git a/src/mainframe.cpp b/src/mainframe.cpp index f3fd99c..282afba 100644 --- a/src/mainframe.cpp +++ b/src/mainframe.cpp @@ -3020,11 +3020,11 @@ void Texdef_ToggleExpansion() void MainFrame_Construct() { /*GlobalCommands_insert("Sleep", makeCallbackF(thunk_OnSleep), - Accelerator('P', (GdkModifierType) (GDK_SHIFT_MASK | GDK_CONTROL_MASK)));*/ + Accelerator('P', (GdkModifierType) (GDK_SHIFT_MASK | GDK_LOCK_MASK)));*/ GlobalCommands_insert("NewMap", makeCallbackF(NewMap)); - GlobalCommands_insert("OpenMap", makeCallbackF(OpenMap), Accelerator('O', (GdkModifierType) GDK_CONTROL_MASK)); + GlobalCommands_insert("OpenMap", makeCallbackF(OpenMap), Accelerator('O', (GdkModifierType) GDK_LOCK_MASK)); GlobalCommands_insert("ImportMap", makeCallbackF(ImportMap)); - GlobalCommands_insert("SaveMap", makeCallbackF(SaveMap), Accelerator('S', (GdkModifierType) GDK_CONTROL_MASK)); + GlobalCommands_insert("SaveMap", makeCallbackF(SaveMap), Accelerator('S', (GdkModifierType) GDK_LOCK_MASK)); GlobalCommands_insert("SaveMapAs", makeCallbackF(SaveMapAs)); GlobalCommands_insert("ExportSelected", makeCallbackF(ExportMap)); GlobalCommands_insert("SaveRegion", makeCallbackF(SaveRegion)); @@ -3032,10 +3032,10 @@ void MainFrame_Construct() GlobalCommands_insert("ProjectSettings", makeCallbackF(DoProjectSettings)); GlobalCommands_insert("Exit", makeCallbackF(Exit)); - GlobalCommands_insert("Undo", makeCallbackF(Undo), Accelerator('Z', (GdkModifierType) GDK_CONTROL_MASK)); - GlobalCommands_insert("Redo", makeCallbackF(Redo), Accelerator('Y', (GdkModifierType) GDK_CONTROL_MASK)); - GlobalCommands_insert("Copy", makeCallbackF(Copy), Accelerator('C', (GdkModifierType) GDK_CONTROL_MASK)); - GlobalCommands_insert("Paste", makeCallbackF(Paste), Accelerator('V', (GdkModifierType) GDK_CONTROL_MASK)); + GlobalCommands_insert("Undo", makeCallbackF(Undo), Accelerator('Z', (GdkModifierType) GDK_LOCK_MASK)); + GlobalCommands_insert("Redo", makeCallbackF(Redo), Accelerator('Y', (GdkModifierType) GDK_LOCK_MASK)); + GlobalCommands_insert("Copy", makeCallbackF(Copy), Accelerator('C', (GdkModifierType) GDK_LOCK_MASK)); + GlobalCommands_insert("Paste", makeCallbackF(Paste), Accelerator('V', (GdkModifierType) GDK_LOCK_MASK)); GlobalCommands_insert("PasteToCamera", makeCallbackF(PasteToCamera), Accelerator('V', (GdkModifierType) GDK_MOD1_MASK)); GlobalCommands_insert("CloneSelection", makeCallbackF(Selection_Clone), Accelerator(GDK_KEY_space)); @@ -3048,7 +3048,7 @@ void MainFrame_Construct() GlobalCommands_insert("SelectInside", makeCallbackF(Select_Inside)); GlobalCommands_insert("SelectTouching", makeCallbackF(Select_Touching)); GlobalCommands_insert("ExpandSelectionToEntities", makeCallbackF(Scene_ExpandSelectionToEntities), - Accelerator('E', (GdkModifierType) (GDK_MOD1_MASK | GDK_CONTROL_MASK))); + Accelerator('E', (GdkModifierType) (GDK_MOD1_MASK | GDK_LOCK_MASK))); GlobalCommands_insert("Preferences", makeCallbackF(PreferencesDialog_showDialog)); GlobalCommands_insert("ToggleEntityInspector", makeCallbackF(EntityInspector_ToggleShow), Accelerator('N')); @@ -3119,14 +3119,14 @@ void MainFrame_Construct() GlobalCommands_insert("CSGSubtract", makeCallbackF(CSG_Subtract), Accelerator('U', (GdkModifierType) GDK_SHIFT_MASK)); - GlobalCommands_insert("CSGMerge", makeCallbackF(CSG_Merge), Accelerator('U', (GdkModifierType) GDK_CONTROL_MASK)); + GlobalCommands_insert("CSGMerge", makeCallbackF(CSG_Merge), Accelerator('U', (GdkModifierType) GDK_LOCK_MASK)); GlobalCommands_insert("CSGMakeHollow", makeCallbackF(CSG_MakeHollow)); GlobalCommands_insert("CSGMakeRoom", makeCallbackF(CSG_MakeRoom)); Grid_registerCommands(); GlobalCommands_insert("SnapToGrid", makeCallbackF(Selection_SnapToGrid), - Accelerator('G', (GdkModifierType) GDK_CONTROL_MASK)); + Accelerator('G', (GdkModifierType) GDK_LOCK_MASK)); GlobalCommands_insert("SelectAllOfType", makeCallbackF(Select_AllOfType), Accelerator('A', (GdkModifierType) GDK_SHIFT_MASK)); @@ -3136,13 +3136,13 @@ void MainFrame_Construct() GlobalCommands_insert("TexRotateCounter", makeCallbackF(Texdef_RotateAntiClockwise), Accelerator(GDK_KEY_Prior, (GdkModifierType) GDK_SHIFT_MASK)); GlobalCommands_insert("TexScaleUp", makeCallbackF(Texdef_ScaleUp), - Accelerator(GDK_KEY_Up, (GdkModifierType) GDK_CONTROL_MASK)); + Accelerator(GDK_KEY_Up, (GdkModifierType) GDK_LOCK_MASK)); GlobalCommands_insert("TexScaleDown", makeCallbackF(Texdef_ScaleDown), - Accelerator(GDK_KEY_Down, (GdkModifierType) GDK_CONTROL_MASK)); + Accelerator(GDK_KEY_Down, (GdkModifierType) GDK_LOCK_MASK)); GlobalCommands_insert("TexScaleLeft", makeCallbackF(Texdef_ScaleLeft), - Accelerator(GDK_KEY_Left, (GdkModifierType) GDK_CONTROL_MASK)); + Accelerator(GDK_KEY_Left, (GdkModifierType) GDK_LOCK_MASK)); GlobalCommands_insert("TexScaleRight", makeCallbackF(Texdef_ScaleRight), - Accelerator(GDK_KEY_Right, (GdkModifierType) GDK_CONTROL_MASK)); + Accelerator(GDK_KEY_Right, (GdkModifierType) GDK_LOCK_MASK)); GlobalCommands_insert("TexShiftUp", makeCallbackF(Texdef_ShiftUp), Accelerator(GDK_KEY_Up, (GdkModifierType) GDK_SHIFT_MASK)); GlobalCommands_insert("TexShiftDown", makeCallbackF(Texdef_ShiftDown), diff --git a/src/map.cpp b/src/map.cpp index aa0907e..245c94d 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -2369,7 +2369,7 @@ void Map_Construct() GlobalCommands_insert("RegionSetXY", makeCallbackF(RegionXY)); GlobalCommands_insert("RegionSetBrush", makeCallbackF(RegionBrush)); GlobalCommands_insert("RegionSetSelection", makeCallbackF(RegionSelected), - Accelerator('R', (GdkModifierType) (GDK_SHIFT_MASK | GDK_CONTROL_MASK))); + Accelerator('R', (GdkModifierType) (GDK_SHIFT_MASK | GDK_LOCK_MASK))); GlobalPreferenceSystem().registerPreference("LastMap", make_property_string(g_strLastMap)); GlobalPreferenceSystem().registerPreference("LoadLastMap", make_property_string(g_bLoadLastMap)); diff --git a/src/patchmanip.cpp b/src/patchmanip.cpp index 42c5e39..131f401 100644 --- a/src/patchmanip.cpp +++ b/src/patchmanip.cpp @@ -708,11 +708,11 @@ void PatchPreferences_construct() void Patch_registerCommands() { GlobalCommands_insert("InvertCurveTextureX", makeCallbackF(Patch_FlipTextureX), - Accelerator('I', (GdkModifierType) (GDK_SHIFT_MASK | GDK_CONTROL_MASK))); + Accelerator('I', (GdkModifierType) (GDK_SHIFT_MASK | GDK_LOCK_MASK))); GlobalCommands_insert("InvertCurveTextureY", makeCallbackF(Patch_FlipTextureY), Accelerator('I', (GdkModifierType) GDK_SHIFT_MASK)); GlobalCommands_insert("NaturalizePatch", makeCallbackF(Patch_NaturalTexture), - Accelerator('N', (GdkModifierType) GDK_CONTROL_MASK)); + Accelerator('N', (GdkModifierType) GDK_LOCK_MASK)); GlobalCommands_insert("PatchCylinder", makeCallbackF(Patch_Cylinder)); GlobalCommands_insert("PatchDenseCylinder", makeCallbackF(Patch_DenseCylinder)); GlobalCommands_insert("PatchVeryDenseCylinder", makeCallbackF(Patch_VeryDenseCylinder)); @@ -729,36 +729,36 @@ void Patch_registerCommands() GlobalCommands_insert("SimplePatchMesh", makeCallbackF(Patch_Plane), Accelerator('P', (GdkModifierType) GDK_SHIFT_MASK)); GlobalCommands_insert("PatchInsertInsertColumn", makeCallbackF(Patch_InsertInsertColumn), - Accelerator(GDK_KEY_KP_Add, (GdkModifierType) (GDK_SHIFT_MASK | GDK_CONTROL_MASK))); + Accelerator(GDK_KEY_KP_Add, (GdkModifierType) (GDK_SHIFT_MASK | GDK_LOCK_MASK))); GlobalCommands_insert("PatchInsertAddColumn", makeCallbackF(Patch_InsertAddColumn)); GlobalCommands_insert("PatchInsertInsertRow", makeCallbackF(Patch_InsertInsertRow), - Accelerator(GDK_KEY_KP_Add, (GdkModifierType) GDK_CONTROL_MASK)); + Accelerator(GDK_KEY_KP_Add, (GdkModifierType) GDK_LOCK_MASK)); GlobalCommands_insert("PatchInsertAddRow", makeCallbackF(Patch_InsertAddRow)); GlobalCommands_insert("PatchDeleteFirstColumn", makeCallbackF(Patch_DeleteFirstColumn)); GlobalCommands_insert("PatchDeleteLastColumn", makeCallbackF(Patch_DeleteLastColumn), - Accelerator(GDK_KEY_KP_Subtract, (GdkModifierType) (GDK_SHIFT_MASK | GDK_CONTROL_MASK))); + Accelerator(GDK_KEY_KP_Subtract, (GdkModifierType) (GDK_SHIFT_MASK | GDK_LOCK_MASK))); GlobalCommands_insert("PatchDeleteFirstRow", makeCallbackF(Patch_DeleteFirstRow), - Accelerator(GDK_KEY_KP_Subtract, (GdkModifierType) GDK_CONTROL_MASK)); + Accelerator(GDK_KEY_KP_Subtract, (GdkModifierType) GDK_LOCK_MASK)); GlobalCommands_insert("PatchDeleteLastRow", makeCallbackF(Patch_DeleteLastRow)); GlobalCommands_insert("InvertCurve", makeCallbackF(Patch_Invert), - Accelerator('I', (GdkModifierType) GDK_CONTROL_MASK)); + Accelerator('I', (GdkModifierType) GDK_LOCK_MASK)); GlobalCommands_insert("RedisperseRows", makeCallbackF(Patch_RedisperseRows), - Accelerator('E', (GdkModifierType) GDK_CONTROL_MASK)); + Accelerator('E', (GdkModifierType) GDK_LOCK_MASK)); GlobalCommands_insert("RedisperseCols", makeCallbackF(Patch_RedisperseCols), - Accelerator('E', (GdkModifierType) (GDK_SHIFT_MASK | GDK_CONTROL_MASK))); + Accelerator('E', (GdkModifierType) (GDK_SHIFT_MASK | GDK_LOCK_MASK))); GlobalCommands_insert("SmoothRows", makeCallbackF(Patch_SmoothRows), - Accelerator('W', (GdkModifierType) GDK_CONTROL_MASK)); + Accelerator('W', (GdkModifierType) GDK_LOCK_MASK)); GlobalCommands_insert("SmoothCols", makeCallbackF(Patch_SmoothCols), - Accelerator('W', (GdkModifierType) (GDK_SHIFT_MASK | GDK_CONTROL_MASK))); + Accelerator('W', (GdkModifierType) (GDK_SHIFT_MASK | GDK_LOCK_MASK))); GlobalCommands_insert("MatrixTranspose", makeCallbackF(Patch_Transpose), - Accelerator('M', (GdkModifierType) (GDK_SHIFT_MASK | GDK_CONTROL_MASK))); + Accelerator('M', (GdkModifierType) (GDK_SHIFT_MASK | GDK_LOCK_MASK))); GlobalCommands_insert("CapCurrentCurve", makeCallbackF(Patch_Cap), Accelerator('C', (GdkModifierType) GDK_SHIFT_MASK)); GlobalCommands_insert("CycleCapTexturePatch", makeCallbackF(Patch_CycleProjection), - Accelerator('N', (GdkModifierType) (GDK_SHIFT_MASK | GDK_CONTROL_MASK))); + Accelerator('N', (GdkModifierType) (GDK_SHIFT_MASK | GDK_LOCK_MASK))); GlobalCommands_insert("MakeOverlayPatch", makeCallbackF(Patch_OverlayOn), Accelerator('Y')); GlobalCommands_insert("ClearPatchOverlays", makeCallbackF(Patch_OverlayOff), - Accelerator('L', (GdkModifierType) GDK_CONTROL_MASK)); + Accelerator('L', (GdkModifierType) GDK_LOCK_MASK)); } void Patch_constructToolbar(ui::Toolbar toolbar) diff --git a/src/points.cpp b/src/points.cpp index 650a1fc..012107b 100644 --- a/src/points.cpp +++ b/src/points.cpp @@ -362,9 +362,9 @@ void Pointfile_Construct() GlobalCommands_insert("TogglePointfile", makeCallbackF(Pointfile_Toggle)); GlobalCommands_insert("NextLeakSpot", makeCallbackF(Pointfile_Next), - Accelerator('K', (GdkModifierType) (GDK_SHIFT_MASK | GDK_CONTROL_MASK))); + Accelerator('K', (GdkModifierType) (GDK_SHIFT_MASK | GDK_LOCK_MASK))); GlobalCommands_insert("PrevLeakSpot", makeCallbackF(Pointfile_Prev), - Accelerator('L', (GdkModifierType) (GDK_SHIFT_MASK | GDK_CONTROL_MASK))); + Accelerator('L', (GdkModifierType) (GDK_SHIFT_MASK | GDK_LOCK_MASK))); } void Pointfile_Destroy() diff --git a/src/texwindow.cpp b/src/texwindow.cpp index 6cd0740..1cacbb5 100644 --- a/src/texwindow.cpp +++ b/src/texwindow.cpp @@ -2920,7 +2920,7 @@ void TextureBrowser_Construct() GlobalToggles_insert("ShowInUse", makeCallbackF(TextureBrowser_ToggleHideUnused), ToggleItem::AddCallbackCaller(g_TextureBrowser.m_hideunused_item), Accelerator('U')); GlobalCommands_insert("ShowAllTextures", makeCallbackF(TextureBrowser_showAll), - Accelerator('A', (GdkModifierType) GDK_CONTROL_MASK)); + Accelerator('A', (GdkModifierType) GDK_LOCK_MASK)); GlobalCommands_insert("ToggleTextures", makeCallbackF(TextureBrowser_toggleShow), Accelerator('T')); GlobalToggles_insert("ToggleShowShaders", makeCallbackF(TextureBrowser_ToggleShowShaders), ToggleItem::AddCallbackCaller(g_TextureBrowser.m_showshaders_item)); diff --git a/src/windowobservers.cpp b/src/windowobservers.cpp index 6f01a68..29c13a9 100644 --- a/src/windowobservers.cpp +++ b/src/windowobservers.cpp @@ -164,7 +164,7 @@ ModifierFlags modifiers_for_state(unsigned int state) if (state & GDK_SHIFT_MASK) { modifiers |= c_modifierShift; } - if (state & GDK_CONTROL_MASK) { + if (state & GDK_LOCK_MASK) { modifiers |= c_modifierControl; } if (state & GDK_MOD1_MASK) { diff --git a/src/xywindow.cpp b/src/xywindow.cpp index d2934bc..1823d9b 100644 --- a/src/xywindow.cpp +++ b/src/xywindow.cpp @@ -476,7 +476,7 @@ inline unsigned int buttons_for_event_button(GdkEventButton *event) break; } - if ((event->state & GDK_CONTROL_MASK) != 0) { + if ((event->state & GDK_LOCK_MASK) != 0) { flags |= RAD_CONTROL; } @@ -507,7 +507,7 @@ inline unsigned int buttons_for_state(guint state) flags |= RAD_RBUTTON; } - if ((state & GDK_CONTROL_MASK) != 0) { + if ((state & GDK_LOCK_MASK) != 0) { flags |= RAD_CONTROL; } @@ -2932,13 +2932,13 @@ void XYWindow_Construct() GlobalToggles_insert("ToggleView", ToggleShown::ToggleCaller(g_xy_top_shown), ToggleItem::AddCallbackCaller(g_xy_top_shown.m_item), - Accelerator('V', (GdkModifierType) (GDK_SHIFT_MASK | GDK_CONTROL_MASK))); + Accelerator('V', (GdkModifierType) (GDK_SHIFT_MASK | GDK_LOCK_MASK))); GlobalToggles_insert("ToggleSideView", ToggleShown::ToggleCaller(g_yz_side_shown), ToggleItem::AddCallbackCaller(g_yz_side_shown.m_item)); GlobalToggles_insert("ToggleFrontView", ToggleShown::ToggleCaller(g_xz_front_shown), ToggleItem::AddCallbackCaller(g_xz_front_shown.m_item)); GlobalCommands_insert("NextView", makeCallbackF(XY_Next), Accelerator(GDK_KEY_Tab, - (GdkModifierType) GDK_CONTROL_MASK)); // fixme: doesn't show its shortcut + (GdkModifierType) GDK_LOCK_MASK)); // fixme: doesn't show its shortcut GlobalCommands_insert("ZoomIn", makeCallbackF(XY_ZoomIn), Accelerator(GDK_KEY_Delete)); GlobalCommands_insert("ZoomOut", makeCallbackF(XY_ZoomOut), Accelerator(GDK_KEY_Insert)); GlobalCommands_insert("ViewTop", makeCallbackF(XY_Top), Accelerator(GDK_KEY_KP_Home)); @@ -2946,7 +2946,7 @@ void XYWindow_Construct() GlobalCommands_insert("ViewFront", makeCallbackF(XY_Front), Accelerator(GDK_KEY_KP_End)); GlobalCommands_insert("Zoom100", makeCallbackF(XY_Zoom100)); GlobalCommands_insert("CenterXYView", makeCallbackF(XY_Focus), - Accelerator(GDK_KEY_Tab, (GdkModifierType) (GDK_SHIFT_MASK | GDK_CONTROL_MASK))); + Accelerator(GDK_KEY_Tab, (GdkModifierType) (GDK_SHIFT_MASK | GDK_LOCK_MASK))); GlobalPreferenceSystem().registerPreference("ClipCaulk", make_property_string(g_clip_useCaulk));