X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=gtk%2Fxboard.c;h=88d6557a040899cf5d44f96336ceba648f303473;hb=36c7e09704a7ef2229f316e8e70e423d4f0fa93b;hp=fed6aa3d12f5697db34864f13f78430792937429;hpb=a009a27e8c1e0bfa818f12fdcae675d0babc510a;p=xboard.git

diff --git a/gtk/xboard.c b/gtk/xboard.c
index fed6aa3..88d6557 100644
--- a/gtk/xboard.c
+++ b/gtk/xboard.c
@@ -226,6 +226,9 @@ static GdkPixbuf       *mainwindowIcon=NULL;
 static GdkPixbuf       *WhiteIcon=NULL;
 static GdkPixbuf       *BlackIcon=NULL;
 
+/* key board accelerators */
+GtkAccelGroup *GtkAccelerators;
+
 typedef unsigned int BoardSize;
 BoardSize boardSize;
 Boolean chessProgram;
@@ -282,73 +285,10 @@ XtResource clientResources[] = {
 };
 #endif
 
+/* keyboard shortcuts not yet transistioned int menuitem @ menu.c */
 char globalTranslations[] =
-  ":<Key>F9: MenuItem(Actions.Resign) \n \
-   :Ctrl<Key>n: MenuItem(File.NewGame) \n \
-   :Meta<Key>V: MenuItem(File.NewVariant) \n \
-   :Ctrl<Key>o: MenuItem(File.LoadGame) \n \
-   :Meta<Key>Next: MenuItem(LoadNextGameProc) \n \
-   :Meta<Key>Prior: MenuItem(LoadPrevGameProc) \n \
-   :Ctrl<Key>Down: LoadSelectedProc(3) \n \
+  ":Ctrl<Key>Down: LoadSelectedProc(3) \n \
    :Ctrl<Key>Up: LoadSelectedProc(-3) \n \
-   :Ctrl<Key>s: MenuItem(File.SaveGame) \n \
-   :Ctrl<Key>c: MenuItem(Edit.CopyGame) \n \
-   :Ctrl<Key>v: MenuItem(Edit.PasteGame) \n \
-   :Ctrl<Key>O: MenuItem(File.LoadPosition) \n \
-   :Shift<Key>Next: MenuItem(LoadNextPositionProc) \n \
-   :Shift<Key>Prior: MenuItem(LoadPrevPositionProc) \n \
-   :Ctrl<Key>S: MenuItem(File.SavePosition) \n \
-   :Ctrl<Key>C: MenuItem(Edit.CopyPosition) \n \
-   :Ctrl<Key>V: MenuItem(Edit.PastePosition) \n \
-   :Ctrl<Key>q: MenuItem(File.Quit) \n \
-   :Ctrl<Key>w: MenuItem(Mode.MachineWhite) \n \
-   :Ctrl<Key>b: MenuItem(Mode.MachineBlack) \n \
-   :Ctrl<Key>t: MenuItem(Mode.TwoMachines) \n \
-   :Ctrl<Key>a: MenuItem(Mode.AnalysisMode) \n \
-   :Ctrl<Key>g: MenuItem(Mode.AnalyzeFile) \n \
-   :Ctrl<Key>e: MenuItem(Mode.EditGame) \n \
-   :Ctrl<Key>E: MenuItem(Mode.EditPosition) \n \
-   :Meta<Key>O: MenuItem(View.EngineOutput) \n \
-   :Meta<Key>E: MenuItem(View.EvaluationGraph) \n \
-   :Meta<Key>G: MenuItem(View.GameList) \n \
-   :Meta<Key>H: MenuItem(View.MoveHistory) \n \
-   :<Key>Pause: MenuItem(Mode.Pause) \n \
-   :<Key>F3: MenuItem(Action.Accept) \n \
-   :<Key>F4: MenuItem(Action.Decline) \n \
-   :<Key>F12: MenuItem(Action.Rematch) \n \
-   :<Key>F5: MenuItem(Action.CallFlag) \n \
-   :<Key>F6: MenuItem(Action.Draw) \n \
-   :<Key>F7: MenuItem(Action.Adjourn) \n \
-   :<Key>F8: MenuItem(Action.Abort) \n \
-   :<Key>F10: MenuItem(Action.StopObserving) \n \
-   :<Key>F11: MenuItem(Action.StopExamining) \n \
-   :Ctrl<Key>d: MenuItem(DebugProc) \n \
-   :Meta Ctrl<Key>F12: MenuItem(DebugProc) \n \
-   :Meta<Key>End: MenuItem(Edit.ForwardtoEnd) \n \
-   :Meta<Key>Right: MenuItem(Edit.Forward) \n \
-   :Meta<Key>Home: MenuItem(Edit.BacktoStart) \n \
-   :Meta<Key>Left: MenuItem(Edit.Backward) \n \
-   :<Key>Left: MenuItem(Edit.Backward) \n \
-   :<Key>Right: MenuItem(Edit.Forward) \n \
-   :<Key>Home: MenuItem(Edit.Revert) \n \
-   :<Key>End: MenuItem(Edit.TruncateGame) \n \
-   :Ctrl<Key>m: MenuItem(Engine.MoveNow) \n \
-   :Ctrl<Key>x: MenuItem(Engine.RetractMove) \n \
-   :Meta<Key>J: MenuItem(Options.Adjudications) \n \
-   :Meta<Key>U: MenuItem(Options.CommonEngine) \n \
-   :Meta<Key>T: MenuItem(Options.TimeControl) \n \
-   :Ctrl<Key>P: MenuItem(PonderNextMove) \n "
-#ifndef OPTIONSDIALOG
-    "\
-   :Ctrl<Key>Q: MenuItem(AlwaysQueenProc) \n \
-   :Ctrl<Key>F: MenuItem(AutoflagProc) \n \
-   :Ctrl<Key>A: MenuItem(AnimateMovingProc) \n \
-   :Ctrl<Key>L: MenuItem(TestLegalityProc) \n \
-   :Ctrl<Key>H: MenuItem(HideThinkingProc) \n "
-#endif
-   "\
-   :<Key>F1: MenuItem(Help.ManXBoard) \n \
-   :<Key>F2: MenuItem(View.FlipView) \n \
    :<KeyDown>Return: TempBackwardProc() \n \
    :<KeyUp>Return: TempForwardProc() \n";
 
@@ -371,7 +311,7 @@ String xboardResources[] = {
 void
 BoardToTop ()
 {
-  gtk_window_present(GTK_WINDOW(mainwindow));
+  gtk_window_present(GTK_WINDOW(shells[BoardWindow]));
 }
 
 //---------------------------------------------------------------------------------------------------------
@@ -777,6 +717,9 @@ main (int argc, char **argv)
     /* set up GTK */
     gtk_init (&argc, &argv);
 
+    /* set up keyboard accelerators group */
+    GtkAccelerators = gtk_accel_group_new();
+
     programName = strrchr(argv[0], '/');
     if (programName == NULL)
       programName = argv[0];
@@ -994,6 +937,9 @@ main (int argc, char **argv)
 
     InitMenuMarkers();
 
+    // add accelerators to main shell
+    gtk_window_add_accel_group(GTK_WINDOW(shellWidget), GtkAccelerators);
+
     /*
      * Create an icon. (Use two icons, to indicate whther it is white's or black's turn.)
      */
@@ -1030,7 +976,7 @@ main (int argc, char **argv)
 //printf("start size (%d,%d), %dx%d\n", a.x, a.y, w, h);
 	gtk_widget_get_allocation(boardWidget, &a);
 	marginW =  w - boardWidth; // [HGM] needed to set new shellWidget size when we resize board
-	marginH =  h - a.height - 25; // subtract 25, because GTK seems to insert this amount of extra empty space
+	marginH =  h - a.height + 13;
 	gtk_window_resize(GTK_WINDOW(shellWidget), marginW + boardWidth, marginH + boardHeight);
 //printf("margins h=%d v=%d\n", marginW, marginH);
     }
@@ -1492,10 +1438,12 @@ DragProc ()
 	    busy = 0; return; // false alarm
 	}
 	ReSize(&wpNew);
-	if(shellUp[EngOutDlg]) CoDrag(shells[EngOutDlg], &wpEngineOutput);
-	if(shellUp[HistoryDlg]) CoDrag(shells[HistoryDlg], &wpMoveHistory);
-	if(shellUp[EvalGraphDlg]) CoDrag(shells[EvalGraphDlg], &wpEvalGraph);
-	if(shellUp[GameListDlg]) CoDrag(shells[GameListDlg], &wpGameList);
+	if(appData.useStickyWindows) {
+	    if(shellUp[EngOutDlg]) CoDrag(shells[EngOutDlg], &wpEngineOutput);
+	    if(shellUp[HistoryDlg]) CoDrag(shells[HistoryDlg], &wpMoveHistory);
+	    if(shellUp[EvalGraphDlg]) CoDrag(shells[EvalGraphDlg], &wpEvalGraph);
+	    if(shellUp[GameListDlg]) CoDrag(shells[GameListDlg], &wpGameList);
+        }
 	wpMain = wpNew;
 	DrawPosition(True, NULL);
 	if(delayedDragTag) g_source_remove(delayedDragTag);
@@ -1521,8 +1469,7 @@ EventProc (GtkWidget *widget, GdkEvent *event, gpointer g)
     wpNew.y = event->configure.y;
     wpNew.width  = event->configure.width;
     wpNew.height = event->configure.height;
-    if(appData.useStickyWindows)
-	DelayedDrag(); // as long as events keep coming in faster than 50 msec, they destroy each other
+    DelayedDrag(); // as long as events keep coming in faster than 50 msec, they destroy each other
     return FALSE;
 }
 
@@ -1565,7 +1512,7 @@ ModeHighlight ()
 	  /* Always toggle, don't set.  Previous code messes up when
 	     invoked while the button is pressed, as releasing it
 	     toggles the state again. */
-	    GdkColor color;     
+	    GdkColor color;
             gdk_color_parse( pausing ? "#808080" : "#F0F0F0", &color );
             gtk_widget_modify_bg ( GTK_WIDGET(optList[W_PAUSE].handle), GTK_STATE_NORMAL, &color );
 	}
@@ -1618,7 +1565,7 @@ void CopyFileToClipboard(gchar *filename)
       return;
     }
     selection_tmp[len] = NULLCHAR; // file is now in selection_tmp
-    
+
     // copy selection_tmp to clipboard
     GdkDisplay *gdisp = gdk_display_get_default();
     if (!gdisp) {
@@ -1627,7 +1574,7 @@ void CopyFileToClipboard(gchar *filename)
     }
     cb = gtk_clipboard_get_for_display(gdisp, GDK_SELECTION_CLIPBOARD);
     gtk_clipboard_set_text(cb, selection_tmp, -1);
-    g_free(selection_tmp);    
+    g_free(selection_tmp);
 }
 
 void
@@ -1649,9 +1596,9 @@ PastePositionProc ()
     gchar *fenstr;
 
     if (gdisp == NULL) return;
-    cb = gtk_clipboard_get_for_display(gdisp, GDK_SELECTION_CLIPBOARD);    
+    cb = gtk_clipboard_get_for_display(gdisp, GDK_SELECTION_CLIPBOARD);
     fenstr = gtk_clipboard_wait_for_text(cb);
-    if (fenstr==NULL) return; // nothing had been selected to copy  
+    if (fenstr==NULL) return; // nothing had been selected to copy
     EditPositionPasteFEN(fenstr);
     return;
 }
@@ -1667,14 +1614,14 @@ PasteGameProc ()
     // get game from clipboard
     GdkDisplay *gdisp = gdk_display_get_default();
     if (gdisp == NULL) return;
-    cb = gtk_clipboard_get_for_display(gdisp, GDK_SELECTION_CLIPBOARD);    
+    cb = gtk_clipboard_get_for_display(gdisp, GDK_SELECTION_CLIPBOARD);
     text = gtk_clipboard_wait_for_text(cb);
-    if (text == NULL) return; // nothing to paste  
+    if (text == NULL) return; // nothing to paste
     len = strlen(text);
 
     // write to temp file
     if (text == NULL || len == 0) {
-      return; //nothing to paste 
+      return; //nothing to paste
     }
     f = fopen(gamePasteFilename, "w");
     if (f == NULL) {
@@ -1684,7 +1631,7 @@ PasteGameProc ()
     fwrite(text, 1, len, f);
     fclose(f);
 
-    // load from file 
+    // load from file
     LoadGameFromFile(gamePasteFilename, 0, gamePasteFilename, TRUE);
     return;
 }
@@ -1710,7 +1657,7 @@ void MoveTypeInProc(eventkey)
 
     buf[0]=eventkey->keyval;
     buf[1]='\0';
-    if (*buf >= 32)        
+    if (*buf >= 32)
 	BoxAutoPopUp (buf);
 }
 
@@ -2060,7 +2007,7 @@ UpdateLogos (int displ)
     return;
 }
 
-void FileNamePopUpGTK(label, def, filter, proc, pathFlag, openMode, name, fp)
+void FileNamePopUpWrapper(label, def, filter, proc, pathFlag, openMode, name, fp)
      char *label;
      char *def;
      char *filter;
@@ -2160,4 +2107,3 @@ void FileNamePopUpGTK(label, def, filter, proc, pathFlag, openMode, name, fp)
   return;
 
 }
-