nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'NetHack-3.6.2-beta01' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.2-beta01

Browse Source
This commit is contained in:
nhmall
2018-11-30 20:20:05 -05:00
parent 802c22ed98 028efc7342
commit 92732af7aa
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/fixes36.2
+3
View File
@@ -333,6 +333,9 @@ X11: don't reuse perm_invent window for picking an object
X11: obey mouse_support and allow toggling it in game X11: obey mouse_support and allow toggling it in game
X11: obey menu movement keys X11: obey menu movement keys
X11: enable menu [cancel] button for PICK_NONE menus X11: enable menu [cancel] button for PICK_NONE menus
X11: text popups on OSX wouldn't accept keyboard input unless the 'autofocus'
resource was enabled; most noticeable when trying to dismiss 'things
that are here' while walking over object piles
General New Features General New Features
win/X11/wintext.c
+6 -7
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 wintext.c $NHDT-Date: 1450453309 2015/12/18 15:41:49 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.15 $ */ /* NetHack 3.6 wintext.c $NHDT-Date: 1543622533 2018/12/01 00:02:13 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.16 $ */
/* Copyright (c) Dean Luick, 1992 */ /* Copyright (c) Dean Luick, 1992 */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -281,11 +281,9 @@ struct xwindow *wp;
#endif #endif
num_args = 0; num_args = 0;
XtSetArg(args[num_args], XtNallowShellResize, True); XtSetArg(args[num_args], XtNallowShellResize, True), num_args++;
num_args++;
XtSetArg(args[num_args], XtNtranslations, XtSetArg(args[num_args], XtNtranslations,
XtParseTranslationTable(text_translations)); XtParseTranslationTable(text_translations)), num_args++;
num_args++;
#ifdef TRANSIENT_TEXT #ifdef TRANSIENT_TEXT
wp->popup = XtCreatePopupShell("text", transientShellWidgetClass, wp->popup = XtCreatePopupShell("text", transientShellWidgetClass,
@@ -299,8 +297,9 @@ struct xwindow *wp;
XtParseTranslationTable("<Message>WM_PROTOCOLS: delete_text()")); XtParseTranslationTable("<Message>WM_PROTOCOLS: delete_text()"));
num_args = 0; num_args = 0;
XtSetArg(args[num_args], XtNallowShellResize, True); XtSetArg(args[num_args], XtNallowShellResize, True), num_args++;
num_args++; XtSetArg(args[num_args], XtNtranslations,
XtParseTranslationTable(text_translations)), num_args++;
form = XtCreateManagedWidget("form", formWidgetClass, wp->popup, args, form = XtCreateManagedWidget("form", formWidgetClass, wp->popup, args,
num_args); num_args);