* Massachusetts.
*
* Enhancements Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006,
- * 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+ * 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
*
* The following terms apply to Digital Equipment Corporation's copyright
* interest in XBoard:
gboolean KeyPressProc P((GtkWindow *window, GdkEventKey *eventkey, gpointer data));
Boolean TempBackwardActive = False;
void DisplayMove P((int moveNumber));
-void ICSInitScript P((void));
void update_ics_width P(());
int CopyMemoProc P(());
static gboolean EventProc P((GtkWidget *widget, GdkEvent *event, gpointer g));
static GdkPixbuf *WhiteIcon=NULL;
static GdkPixbuf *BlackIcon=NULL;
+/* key board accelerators */
+GtkAccelGroup *GtkAccelerators;
+
typedef unsigned int BoardSize;
BoardSize boardSize;
Boolean chessProgram;
};
#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";
void
BoardToTop ()
{
- gtk_window_present(GTK_WINDOW(mainwindow));
+ gtk_window_present(GTK_WINDOW(shells[BoardWindow]));
}
//---------------------------------------------------------------------------------------------------------
GtkAllocation a;
if(!shell) return;
gtk_widget_get_allocation(shell, &a);
+ gtk_window_get_position(GTK_WINDOW(shell), &a.x, &a.y);
wp->x = a.x;
wp->y = a.y;
wp->width = a.width;
wp->height = a.height;
-printf("placement\n");
- frameX = a.x; frameY = a.y; // remember to decide if windows touch
+//printf("placement: (%d,%d) %dx%d\n", a.x, a.y, a.width, a.height);
+ frameX = 3; frameY = 3; // remember to decide if windows touch
}
-#ifdef TODO_GTK
-void
-GetActualPlacement (Widget wg, WindowPlacement *wp)
-{
- XWindowAttributes winAt;
- Window win, dummy;
- int rx, ry;
-
- if(!wg) return;
-
- win = XtWindow(wg);
- XGetWindowAttributes(xDisplay, win, &winAt); // this works, where XtGetValues on XtNx, XtNy does not!
- XTranslateCoordinates (xDisplay, win, winAt.root, -winAt.border_width, -winAt.border_width, &rx, &ry, &dummy);
- wp->x = rx - winAt.x;
- wp->y = ry - winAt.y;
- wp->height = winAt.height;
- wp->width = winAt.width;
- frameX = winAt.x; frameY = winAt.y; // remember to decide if windows touch
-}
-#endif
void
GetWindowCoords ()
w += marginW + 1; // [HGM] not sure why the +1 is (sometimes) needed...
h += marginH;
gtk_window_resize(GTK_WINDOW(shellWidget), w, h);
-#ifdef TODO_GTK
- w += marginW + 1; // [HGM] not sure why the +1 is (sometimes) needed...
- h += marginH;
- shellArgs[0].value = w;
- shellArgs[1].value = h;
- shellArgs[4].value = shellArgs[2].value = w;
- shellArgs[5].value = shellArgs[3].value = h;
- XtSetValues(shellWidget, &shellArgs[0], inhibit ? 6 : 2);
-
- XSync(xDisplay, False);
-#endif
}
int
/* 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];
// }
bindtextdomain(PACKAGE, LOCALEDIR);
+ bind_textdomain_codeset(PACKAGE, "UTF-8"); // needed when creating markup for the clocks
textdomain(PACKAGE);
#endif
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.)
*/
//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);
}
safeStrCpy(p, best, strlen(best)+1 );
}
if (appData.debugMode) {
- fprintf(debugFP, _("resolved %s at pixel size %d\n to %s\n"),
+ fprintf(debugFP, "resolved %s at pixel size %d\n to %s\n",
pattern, targetPxlSize, p);
}
XFreeFontNames(fonts);
void
CoDrag (GtkWidget *sh, WindowPlacement *wp)
{
- int touch=0, fudge = 2;
+ int touch=0, fudge = 2, f = 2;
GetActualPlacement(sh, wp);
- if(abs(wpMain.x + wpMain.width + 2*frameX - wp->x) < fudge) touch = 1; else // right touch
- if(abs(wp->x + wp->width + 2*frameX - wpMain.x) < fudge) touch = 2; else // left touch
- if(abs(wpMain.y + wpMain.height + frameX + frameY - wp->y) < fudge) touch = 3; else // bottom touch
- if(abs(wp->y + wp->height + frameX + frameY - wpMain.y) < fudge) touch = 4; // top touch
+ if(abs(wpMain.x + wpMain.width + 2*frameX - f - wp->x) < fudge) touch = 1; else // right touch
+ if(abs(wp->x + wp->width + 2*frameX + f - wpMain.x) < fudge) touch = 2; else // left touch
+ if(abs(wpMain.y + wpMain.height + frameX - f + frameY - wp->y) < fudge) touch = 3; else // bottom touch
+ if(abs(wp->y + wp->height + frameX + frameY + f - wpMain.y) < fudge) touch = 4; // top touch
+//printf("CoDrag: touch = %d x=%d w=%d x2=%d w2=%d fx=%d\n", touch, wpMain.x, wpMain.width, wp->x, wp->width, frameX);
if(!touch ) return; // only windows that touch co-move
if(touch < 3 && wpNew.height != wpMain.height) { // left or right and height changed
int heightInc = wpNew.height - wpMain.height;
#ifdef TODO_GTK
if(heightInc) XtSetArg(args[j], XtNheight, wp->height + heightInc), j++;
#endif
+ wp->height += heightInc;
} else if(touch > 2 && wpNew.width != wpMain.width) { // top or bottom and width changed
int widthInc = wpNew.width - wpMain.width;
double fracLeft = Fraction(wp->x, wpMain.x, wpMain.x + wpMain.width + 2*frameX);
#ifdef TODO_GTK
if(widthInc) XtSetArg(args[j], XtNwidth, wp->width + widthInc), j++;
#endif
+ wp->width += widthInc;
}
wp->x += wpNew.x - wpMain.x;
wp->y += wpNew.y - wpMain.y;
XtSetArg(args[j], XtNy, wp->y); j++;
XtSetValues(sh, args, j);
#endif
+ gtk_window_move(GTK_WINDOW(sh), wp->x, wp->y);
+//printf("moved to (%d,%d)\n", wp->x, wp->y);
+ gtk_window_resize(GTK_WINDOW(sh), wp->width, wp->height);
}
void
ReSize (WindowPlacement *wp)
{
- int sqx, sqy, w, h;
+ int sqx, sqy, w, h, lg = lineGap;
if(wp->width == wpMain.width && wp->height == wpMain.height) return; // not sized
- sqx = (wp->width - lineGap - marginW) / BOARD_WIDTH - lineGap;
- sqy = (wp->height - lineGap - marginH) / BOARD_HEIGHT - lineGap;
+ sqx = (wp->width - lg - marginW) / BOARD_WIDTH - lg;
+ sqy = (wp->height - lg - marginH) / BOARD_HEIGHT - lg;
if(sqy < sqx) sqx = sqy;
+ if(appData.overrideLineGap < 0) { // do second iteration with adjusted lineGap
+ lg = lineGap = sqx < 37 ? 1 : sqx < 59 ? 2 : sqx < 116 ? 3 : 4;
+ sqx = (wp->width - lg - marginW) / BOARD_WIDTH - lg;
+ sqy = (wp->height - lg - marginH) / BOARD_HEIGHT - lg;
+ if(sqy < sqx) sqx = sqy;
+ }
if(sqx != squareSize) {
+//printf("new sq size %d (%dx%d)\n", sqx, wp->width, wp->height);
squareSize = sqx; // adopt new square size
CreatePNGPieces(); // make newly scaled pieces
InitDrawingSizes(0, 0); // creates grid etc.
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);
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;
}
/* 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 );
}
return;
}
selection_tmp[len] = NULLCHAR; // file is now in selection_tmp
-
+
// copy selection_tmp to clipboard
GdkDisplay *gdisp = gdk_display_get_default();
if (!gdisp) {
}
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
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;
}
// 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) {
fwrite(text, 1, len, f);
fclose(f);
- // load from file
+ // load from file
LoadGameFromFile(gamePasteFilename, 0, gamePasteFilename, TRUE);
return;
}
buf[0]=eventkey->keyval;
buf[1]='\0';
- if (*buf >= 32)
+ if (*buf >= 32)
BoxAutoPopUp (buf);
}
DisplayTimerLabel (Option *opt, char *color, long timer, int highlight)
{
GtkWidget *w = (GtkWidget *) opt->handle;
+ GdkColor col;
char *markup;
char bgcolor[10];
char fgcolor[10];
strcpy(fgcolor, appData.lowTimeWarningColor);
}
+ gdk_color_parse( bgcolor, &col );
+ gtk_widget_modify_bg(gtk_widget_get_parent(opt->handle), GTK_STATE_NORMAL, &col);
+
if (appData.clockMode) {
markup = g_markup_printf_escaped("<span size=\"xx-large\" weight=\"heavy\" background=\"%s\" foreground=\"%s\">%s:%s%s</span>",
bgcolor, fgcolor, color, appData.logoSize && !partnerUp ? "\n" : " ", TimeString(timer));
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;
return;
}
-
projects / xboard.git / blobdiff