Mercurial > emacs
annotate lwlib/xlwmenu.c @ 109489:b4b02bfd4d95
SQL Mode Version2.4 - Improved login prompting
* progmodes/sql.el: Version 2.4. Improved Login prompting.
(sql-login-params): New widget definition.
(sql-oracle-login-params, sql-mysql-login-params)
(sql-solid-login-params, sql-sybase-login-params)
(sql-informix-login-params, sql-ingres-login-params)
(sql-ms-login-params, sql-postgres-login-params)
(sql-interbase-login-params, sql-db2-login-params)
(sql-linter-login-params): Use it.
(sql-sqlite-login-params): Use it; Define "database" parameter as
a file name.
(sql-sqlite-program): Change to "sqlite3"
(sql-comint-sqlite): Make sure database name is complete.
(sql-for-each-login): New function.
(sql-connect, sql-save-connection): Use it.
(sql-get-login-ext): New function.
(sql-get-login): Use it.
(sql-make-alternate-buffer-name): Handle :file parameters.
author | Michael Mauger <mmaug@yahoo.com> |
---|---|
date | Thu, 22 Jul 2010 20:59:43 -0400 |
parents | 33021b778d4d |
children | 8adb5d28e463 |
rev | line source |
---|---|
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
1 /* Implements a lightweight menubar widget. |
76179
f9c64ed5b05d
Adjust FSF copyright years based on changelogs.
Glenn Morris <rgm@gnu.org>
parents:
75348
diff
changeset
|
2 Copyright (C) 1992 Lucid, Inc. |
f9c64ed5b05d
Adjust FSF copyright years based on changelogs.
Glenn Morris <rgm@gnu.org>
parents:
75348
diff
changeset
|
3 Copyright (C) 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003, 2004, |
106815 | 4 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
5626 | 5 |
6 This file is part of the Lucid Widget Library. | |
7 | |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
8 The Lucid Widget Library is free software; you can redistribute it and/or |
5626 | 9 modify it under the terms of the GNU General Public License as published by |
76221
3cceb2f916b0
Revert previous change, since not sure it was correct.
Glenn Morris <rgm@gnu.org>
parents:
76217
diff
changeset
|
10 the Free Software Foundation; either version 2, or (at your option) |
5626 | 11 any later version. |
12 | |
13 The Lucid Widget Library is distributed in the hope that it will be useful, | |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
14 but WITHOUT ANY WARRANTY; without even the implied warranty of |
5626 | 15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 GNU General Public License for more details. | |
17 | |
18 You should have received a copy of the GNU General Public License | |
15742 | 19 along with GNU Emacs; see the file COPYING. If not, write to the |
64083 | 20 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
21 Boston, MA 02110-1301, USA. */ | |
5626 | 22 |
23 /* Created by devin@lucid.com */ | |
24 | |
26087
e0d966fb548f
Add support for large files, plus some locale improvements.
Paul Eggert <eggert@twinsun.com>
parents:
25526
diff
changeset
|
25 #ifdef HAVE_CONFIG_H |
e0d966fb548f
Add support for large files, plus some locale improvements.
Paul Eggert <eggert@twinsun.com>
parents:
25526
diff
changeset
|
26 #include <config.h> |
e0d966fb548f
Add support for large files, plus some locale improvements.
Paul Eggert <eggert@twinsun.com>
parents:
25526
diff
changeset
|
27 #endif |
e0d966fb548f
Add support for large files, plus some locale improvements.
Paul Eggert <eggert@twinsun.com>
parents:
25526
diff
changeset
|
28 |
105669
68dd71358159
* alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100957
diff
changeset
|
29 #include <setjmp.h> |
51143
d4196d00eba5
Include lisp.h, not ../src/lisp.h.
Dave Love <fx@gnu.org>
parents:
49600
diff
changeset
|
30 #include "lisp.h" |
41767 | 31 |
5626 | 32 #include <stdio.h> |
107804
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
33 #include <ctype.h> |
5626 | 34 |
35 #include <sys/types.h> | |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
36 #if (defined __sun) && !(defined SUNOS41) |
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
37 #define SUNOS41 |
5626 | 38 #include <X11/Xos.h> |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
39 #undef SUNOS41 |
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
40 #else |
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
41 #include <X11/Xos.h> |
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
42 #endif |
5626 | 43 #include <X11/IntrinsicP.h> |
9033 | 44 #include <X11/ObjectP.h> |
5626 | 45 #include <X11/StringDefs.h> |
46 #include <X11/cursorfont.h> | |
107886
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
47 #include <X11/Shell.h> |
5626 | 48 #include "xlwmenuP.h" |
29602
d13e7c93d265
(make_shadow_gcs): Free and copy colors so that
Gerd Moellmann <gerd@gnu.org>
parents:
29469
diff
changeset
|
49 |
29469
f9b5fe053f7c
(x_alloc_nearest_color_for_widget, x_catch_errors, x_uncatch_errors)
Dave Love <fx@gnu.org>
parents:
27988
diff
changeset
|
50 #ifdef emacs |
30324
d4713daa6716
Don't include <X11/bitmaps/gray> because that
Gerd Moellmann <gerd@gnu.org>
parents:
29700
diff
changeset
|
51 |
d4713daa6716
Don't include <X11/bitmaps/gray> because that
Gerd Moellmann <gerd@gnu.org>
parents:
29700
diff
changeset
|
52 /* Defined in xfns.c. When config.h defines `static' as empty, we get |
d4713daa6716
Don't include <X11/bitmaps/gray> because that
Gerd Moellmann <gerd@gnu.org>
parents:
29700
diff
changeset
|
53 redefinition errors when gray_bitmap is included more than once, so |
d4713daa6716
Don't include <X11/bitmaps/gray> because that
Gerd Moellmann <gerd@gnu.org>
parents:
29700
diff
changeset
|
54 we're referring to the one include in xfns.c here. */ |
d4713daa6716
Don't include <X11/bitmaps/gray> because that
Gerd Moellmann <gerd@gnu.org>
parents:
29700
diff
changeset
|
55 |
d4713daa6716
Don't include <X11/bitmaps/gray> because that
Gerd Moellmann <gerd@gnu.org>
parents:
29700
diff
changeset
|
56 extern int gray_bitmap_width; |
d4713daa6716
Don't include <X11/bitmaps/gray> because that
Gerd Moellmann <gerd@gnu.org>
parents:
29700
diff
changeset
|
57 extern int gray_bitmap_height; |
34557
b9586137049e
(gray_bitmap_bits): Remove `unsigned' from
Dave Love <fx@gnu.org>
parents:
34436
diff
changeset
|
58 extern char *gray_bitmap_bits; |
30324
d4713daa6716
Don't include <X11/bitmaps/gray> because that
Gerd Moellmann <gerd@gnu.org>
parents:
29700
diff
changeset
|
59 |
70850
b90abedf3b79
* xlwmenu.c: Include xterm.h if emacs instead of declaring functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68640
diff
changeset
|
60 #include "xterm.h" |
29602
d13e7c93d265
(make_shadow_gcs): Free and copy colors so that
Gerd Moellmann <gerd@gnu.org>
parents:
29469
diff
changeset
|
61 |
30324
d4713daa6716
Don't include <X11/bitmaps/gray> because that
Gerd Moellmann <gerd@gnu.org>
parents:
29700
diff
changeset
|
62 #else /* not emacs */ |
d4713daa6716
Don't include <X11/bitmaps/gray> because that
Gerd Moellmann <gerd@gnu.org>
parents:
29700
diff
changeset
|
63 |
d4713daa6716
Don't include <X11/bitmaps/gray> because that
Gerd Moellmann <gerd@gnu.org>
parents:
29700
diff
changeset
|
64 #include <X11/bitmaps/gray> |
d4713daa6716
Don't include <X11/bitmaps/gray> because that
Gerd Moellmann <gerd@gnu.org>
parents:
29700
diff
changeset
|
65 #define gray_bitmap_width gray_width |
d4713daa6716
Don't include <X11/bitmaps/gray> because that
Gerd Moellmann <gerd@gnu.org>
parents:
29700
diff
changeset
|
66 #define gray_bitmap_height gray_height |
d4713daa6716
Don't include <X11/bitmaps/gray> because that
Gerd Moellmann <gerd@gnu.org>
parents:
29700
diff
changeset
|
67 #define gray_bitmap_bits gray_bits |
d4713daa6716
Don't include <X11/bitmaps/gray> because that
Gerd Moellmann <gerd@gnu.org>
parents:
29700
diff
changeset
|
68 |
d4713daa6716
Don't include <X11/bitmaps/gray> because that
Gerd Moellmann <gerd@gnu.org>
parents:
29700
diff
changeset
|
69 #endif /* not emacs */ |
8860 | 70 |
71 static int pointer_grabbed; | |
72 static XEvent menu_post_event; | |
5626 | 73 |
107804
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
74 static XFontStruct *xlwmenu_default_font; |
9746
49e984bf6689
(xlwmenu_default_font): New global variable.
Richard M. Stallman <rms@gnu.org>
parents:
9700
diff
changeset
|
75 |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
76 static char |
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
77 xlwMenuTranslations [] = |
13899
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
78 "<BtnDown>: start()\n\ |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
79 <Motion>: drag()\n\ |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
80 <BtnUp>: select()\n\ |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
81 <Key>Shift_L: nothing()\n\ |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
82 <Key>Shift_R: nothing()\n\ |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
83 <Key>Meta_L: nothing()\n\ |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
84 <Key>Meta_R: nothing()\n\ |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
85 <Key>Control_L: nothing()\n\ |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
86 <Key>Control_R: nothing()\n\ |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
87 <Key>Hyper_L: nothing()\n\ |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
88 <Key>Hyper_R: nothing()\n\ |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
89 <Key>Super_L: nothing()\n\ |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
90 <Key>Super_R: nothing()\n\ |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
91 <Key>Alt_L: nothing()\n\ |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
92 <Key>Alt_R: nothing()\n\ |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
93 <Key>Caps_Lock: nothing()\n\ |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
94 <Key>Shift_Lock: nothing()\n\ |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
95 <KeyUp>Shift_L: nothing()\n\ |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
96 <KeyUp>Shift_R: nothing()\n\ |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
97 <KeyUp>Meta_L: nothing()\n\ |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
98 <KeyUp>Meta_R: nothing()\n\ |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
99 <KeyUp>Control_L: nothing()\n\ |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
100 <KeyUp>Control_R: nothing()\n\ |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
101 <KeyUp>Hyper_L: nothing()\n\ |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
102 <KeyUp>Hyper_R: nothing()\n\ |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
103 <KeyUp>Super_L: nothing()\n\ |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
104 <KeyUp>Super_R: nothing()\n\ |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
105 <KeyUp>Alt_L: nothing()\n\ |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
106 <KeyUp>Alt_R: nothing()\n\ |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
107 <KeyUp>Caps_Lock: nothing()\n\ |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
108 <KeyUp>Shift_Lock:nothing()\n\ |
44707
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
109 <Key>Return: select()\n\ |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
110 <Key>Down: down()\n\ |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
111 <Key>Up: up()\n\ |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
112 <Key>Left: left()\n\ |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
113 <Key>Right: right()\n\ |
13899
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
114 <Key>: key()\n\ |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
115 <KeyUp>: key()\n\ |
5626 | 116 "; |
117 | |
44707
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
118 /* FIXME: Space should toggle toggleable menu item but not remove the menu |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
119 so you can toggle the next one without entering the menu again. */ |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
120 |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
121 /* FIXME: Should ESC close one level of menu structure or the complete menu? */ |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
122 |
44966 | 123 /* FIXME: F10 should enter the menu, the first one in the menu-bar. */ |
44707
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
124 |
5626 | 125 #define offset(field) XtOffset(XlwMenuWidget, field) |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
126 static XtResource |
5626 | 127 xlwMenuResources[] = |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
128 { |
60698
3e557e11645e
Add support for I18N to Lucid menus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59100
diff
changeset
|
129 #ifdef HAVE_X_I18N |
61209
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
130 {XtNfontSet, XtCFontSet, XtRFontSet, sizeof(XFontSet), |
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
131 offset(menu.fontSet), XtRFontSet, NULL}, |
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
132 #endif |
107804
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
133 #ifdef HAVE_XFT |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
134 #define DEFAULT_FACENAME "Sans-10" |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
135 {XtNfaceName, XtCFaceName, XtRString, sizeof(String), |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
136 offset(menu.faceName), XtRString, DEFAULT_FACENAME}, |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
137 {XtNdefaultFace, XtCDefaultFace, XtRInt, sizeof(int), |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
138 offset(menu.default_face), XtRImmediate, (XtPointer)1}, |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
139 #endif |
5626 | 140 {XtNfont, XtCFont, XtRFontStruct, sizeof(XFontStruct *), |
60698
3e557e11645e
Add support for I18N to Lucid menus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59100
diff
changeset
|
141 offset(menu.font), XtRString, "XtDefaultFont"}, |
5626 | 142 {XtNforeground, XtCForeground, XtRPixel, sizeof(Pixel), |
143 offset(menu.foreground), XtRString, "XtDefaultForeground"}, | |
45147
e10cf8f440ae
(xlwMenuResources): New resource.
Pavel Janík <Pavel@Janik.cz>
parents:
44966
diff
changeset
|
144 {XtNdisabledForeground, XtCDisabledForeground, XtRPixel, sizeof(Pixel), |
e10cf8f440ae
(xlwMenuResources): New resource.
Pavel Janík <Pavel@Janik.cz>
parents:
44966
diff
changeset
|
145 offset(menu.disabled_foreground), XtRString, (XtPointer)NULL}, |
5626 | 146 {XtNbuttonForeground, XtCButtonForeground, XtRPixel, sizeof(Pixel), |
147 offset(menu.button_foreground), XtRString, "XtDefaultForeground"}, | |
148 {XtNmargin, XtCMargin, XtRDimension, sizeof(Dimension), | |
44966 | 149 offset(menu.margin), XtRImmediate, (XtPointer)1}, |
5626 | 150 {XtNhorizontalSpacing, XtCMargin, XtRDimension, sizeof(Dimension), |
151 offset(menu.horizontal_spacing), XtRImmediate, (XtPointer)3}, | |
152 {XtNverticalSpacing, XtCMargin, XtRDimension, sizeof(Dimension), | |
44966 | 153 offset(menu.vertical_spacing), XtRImmediate, (XtPointer)2}, |
5626 | 154 {XtNarrowSpacing, XtCMargin, XtRDimension, sizeof(Dimension), |
155 offset(menu.arrow_spacing), XtRImmediate, (XtPointer)10}, | |
156 | |
8860 | 157 {XmNshadowThickness, XmCShadowThickness, XtRDimension, |
5626 | 158 sizeof (Dimension), offset (menu.shadow_thickness), |
44966 | 159 XtRImmediate, (XtPointer)1}, |
5626 | 160 {XmNtopShadowColor, XmCTopShadowColor, XtRPixel, sizeof (Pixel), |
161 offset (menu.top_shadow_color), XtRImmediate, (XtPointer)-1}, | |
162 {XmNbottomShadowColor, XmCBottomShadowColor, XtRPixel, sizeof (Pixel), | |
163 offset (menu.bottom_shadow_color), XtRImmediate, (XtPointer)-1}, | |
164 {XmNtopShadowPixmap, XmCTopShadowPixmap, XtRPixmap, sizeof (Pixmap), | |
165 offset (menu.top_shadow_pixmap), XtRImmediate, (XtPointer)None}, | |
166 {XmNbottomShadowPixmap, XmCBottomShadowPixmap, XtRPixmap, sizeof (Pixmap), | |
167 offset (menu.bottom_shadow_pixmap), XtRImmediate, (XtPointer)None}, | |
168 | |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
169 {XtNopen, XtCCallback, XtRCallback, sizeof(XtPointer), |
5626 | 170 offset(menu.open), XtRCallback, (XtPointer)NULL}, |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
171 {XtNselect, XtCCallback, XtRCallback, sizeof(XtPointer), |
5626 | 172 offset(menu.select), XtRCallback, (XtPointer)NULL}, |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
173 {XtNhighlightCallback, XtCCallback, XtRCallback, sizeof(XtPointer), |
27338
58f8eee82765
(xlwMenuResources): All XtNhighlightCallback.
Gerd Moellmann <gerd@gnu.org>
parents:
26087
diff
changeset
|
174 offset(menu.highlight), XtRCallback, (XtPointer)NULL}, |
75018
d263801b3ca8
(xlwMenuResources): Add XtNleaveCallback, XtNenterCallback.
Jan Djärv <jan.h.d@swipnet.se>
parents:
70850
diff
changeset
|
175 {XtNenterCallback, XtCCallback, XtRCallback, sizeof(XtPointer), |
d263801b3ca8
(xlwMenuResources): Add XtNleaveCallback, XtNenterCallback.
Jan Djärv <jan.h.d@swipnet.se>
parents:
70850
diff
changeset
|
176 offset(menu.enter), XtRCallback, (XtPointer)NULL}, |
d263801b3ca8
(xlwMenuResources): Add XtNleaveCallback, XtNenterCallback.
Jan Djärv <jan.h.d@swipnet.se>
parents:
70850
diff
changeset
|
177 {XtNleaveCallback, XtCCallback, XtRCallback, sizeof(XtPointer), |
d263801b3ca8
(xlwMenuResources): Add XtNleaveCallback, XtNenterCallback.
Jan Djärv <jan.h.d@swipnet.se>
parents:
70850
diff
changeset
|
178 offset(menu.leave), XtRCallback, (XtPointer)NULL}, |
5626 | 179 {XtNmenu, XtCMenu, XtRPointer, sizeof(XtPointer), |
180 offset(menu.contents), XtRImmediate, (XtPointer)NULL}, | |
181 {XtNcursor, XtCCursor, XtRCursor, sizeof(Cursor), | |
182 offset(menu.cursor_shape), XtRString, (XtPointer)"right_ptr"}, | |
183 {XtNhorizontal, XtCHorizontal, XtRInt, sizeof(int), | |
184 offset(menu.horizontal), XtRImmediate, (XtPointer)True}, | |
185 }; | |
186 #undef offset | |
187 | |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109123
diff
changeset
|
188 static Boolean XlwMenuSetValues(Widget current, Widget request, Widget new, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109123
diff
changeset
|
189 ArgList args, Cardinal *num_args); |
109173
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
190 static void XlwMenuRealize(Widget, Mask *, XSetWindowAttributes *); |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
191 static void XlwMenuResize(Widget w); |
109173
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
192 static void XlwMenuInitialize(Widget, Widget, ArgList, Cardinal *); |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
193 static void XlwMenuRedisplay(Widget w, XEvent *ev, Region region); |
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
194 static void XlwMenuDestroy(Widget w); |
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
195 static void XlwMenuClassInitialize(void); |
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
196 static void Start(Widget w, XEvent *ev, String *params, Cardinal *num_params); |
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
197 static void Drag(Widget w, XEvent *ev, String *params, Cardinal *num_params); |
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
198 static void Down(Widget w, XEvent *ev, String *params, Cardinal *num_params); |
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
199 static void Up(Widget w, XEvent *ev, String *params, Cardinal *num_params); |
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
200 static void Left(Widget w, XEvent *ev, String *params, Cardinal *num_params); |
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
201 static void Right(Widget w, XEvent *ev, String *params, Cardinal *num_params); |
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
202 static void Select(Widget w, XEvent *ev, String *params, Cardinal *num_params); |
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
203 static void Key(Widget w, XEvent *ev, String *params, Cardinal *num_params); |
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
204 static void Nothing(Widget w, XEvent *ev, String *params, Cardinal *num_params); |
109100
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108373
diff
changeset
|
205 static int separator_height (enum menu_separator); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108373
diff
changeset
|
206 static void pop_up_menu (XlwMenuWidget, XButtonPressedEvent *); |
53564
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
207 |
5626 | 208 |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
209 static XtActionsRec |
5626 | 210 xlwMenuActionsList [] = |
211 { | |
212 {"start", Start}, | |
213 {"drag", Drag}, | |
44707
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
214 {"down", Down}, |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
215 {"up", Up}, |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
216 {"left", Left}, |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
217 {"right", Right}, |
5626 | 218 {"select", Select}, |
13899
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
219 {"key", Key}, |
59100
768cf68dcd0a
* xlwmenu.c (xlwMenuActionsList): Install MenuGadgetEscape as an
Jan Djärv <jan.h.d@swipnet.se>
parents:
57842
diff
changeset
|
220 {"MenuGadgetEscape", Key}, /* Compatibility with Lesstif/Motif. */ |
13899
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
221 {"nothing", Nothing}, |
5626 | 222 }; |
223 | |
224 #define SuperClass ((CoreWidgetClass)&coreClassRec) | |
225 | |
226 XlwMenuClassRec xlwMenuClassRec = | |
227 { | |
228 { /* CoreClass fields initialization */ | |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
229 (WidgetClass) SuperClass, /* superclass */ |
5626 | 230 "XlwMenu", /* class_name */ |
231 sizeof(XlwMenuRec), /* size */ | |
232 XlwMenuClassInitialize, /* class_initialize */ | |
233 NULL, /* class_part_initialize */ | |
234 FALSE, /* class_inited */ | |
235 XlwMenuInitialize, /* initialize */ | |
236 NULL, /* initialize_hook */ | |
237 XlwMenuRealize, /* realize */ | |
238 xlwMenuActionsList, /* actions */ | |
239 XtNumber(xlwMenuActionsList), /* num_actions */ | |
240 xlwMenuResources, /* resources */ | |
241 XtNumber(xlwMenuResources), /* resource_count */ | |
242 NULLQUARK, /* xrm_class */ | |
243 TRUE, /* compress_motion */ | |
60698
3e557e11645e
Add support for I18N to Lucid menus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59100
diff
changeset
|
244 XtExposeCompressMaximal, /* compress_exposure */ |
5626 | 245 TRUE, /* compress_enterleave */ |
246 FALSE, /* visible_interest */ | |
247 XlwMenuDestroy, /* destroy */ | |
248 XlwMenuResize, /* resize */ | |
249 XlwMenuRedisplay, /* expose */ | |
250 XlwMenuSetValues, /* set_values */ | |
251 NULL, /* set_values_hook */ | |
252 XtInheritSetValuesAlmost, /* set_values_almost */ | |
253 NULL, /* get_values_hook */ | |
254 NULL, /* accept_focus */ | |
255 XtVersion, /* version */ | |
256 NULL, /* callback_private */ | |
257 xlwMenuTranslations, /* tm_table */ | |
258 XtInheritQueryGeometry, /* query_geometry */ | |
259 XtInheritDisplayAccelerator, /* display_accelerator */ | |
260 NULL /* extension */ | |
261 }, /* XlwMenuClass fields initialization */ | |
262 { | |
263 0 /* dummy */ | |
264 }, | |
265 }; | |
266 | |
267 WidgetClass xlwMenuWidgetClass = (WidgetClass) &xlwMenuClassRec; | |
268 | |
8860 | 269 int submenu_destroyed; |
270 | |
44931
18616c930588
Do not grab keyboard if installation-directory is
Jan Djärv <jan.h.d@swipnet.se>
parents:
44750
diff
changeset
|
271 /* For debug, if installation-directory is non-nil this is not an installed |
18616c930588
Do not grab keyboard if installation-directory is
Jan Djärv <jan.h.d@swipnet.se>
parents:
44750
diff
changeset
|
272 Emacs. In that case we do not grab the keyboard to make it easier to |
18616c930588
Do not grab keyboard if installation-directory is
Jan Djärv <jan.h.d@swipnet.se>
parents:
44750
diff
changeset
|
273 debug. */ |
18616c930588
Do not grab keyboard if installation-directory is
Jan Djärv <jan.h.d@swipnet.se>
parents:
44750
diff
changeset
|
274 #define GRAB_KEYBOARD (EQ (Vinstallation_directory, Qnil)) |
44750
2e7603e0c455
Add calls to Grab/UngrabKeyboard to remove strange interactions with
Jan Djärv <jan.h.d@swipnet.se>
parents:
44713
diff
changeset
|
275 |
8860 | 276 static int next_release_must_exit; |
277 | |
5626 | 278 /* Utilities */ |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
279 |
44750
2e7603e0c455
Add calls to Grab/UngrabKeyboard to remove strange interactions with
Jan Djärv <jan.h.d@swipnet.se>
parents:
44713
diff
changeset
|
280 /* Ungrab pointer and keyboard */ |
2e7603e0c455
Add calls to Grab/UngrabKeyboard to remove strange interactions with
Jan Djärv <jan.h.d@swipnet.se>
parents:
44713
diff
changeset
|
281 static void |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
282 ungrab_all (Widget w, Time ungrabtime) |
44750
2e7603e0c455
Add calls to Grab/UngrabKeyboard to remove strange interactions with
Jan Djärv <jan.h.d@swipnet.se>
parents:
44713
diff
changeset
|
283 { |
2e7603e0c455
Add calls to Grab/UngrabKeyboard to remove strange interactions with
Jan Djärv <jan.h.d@swipnet.se>
parents:
44713
diff
changeset
|
284 XtUngrabPointer (w, ungrabtime); |
44931
18616c930588
Do not grab keyboard if installation-directory is
Jan Djärv <jan.h.d@swipnet.se>
parents:
44750
diff
changeset
|
285 if (GRAB_KEYBOARD) XtUngrabKeyboard (w, ungrabtime); |
44750
2e7603e0c455
Add calls to Grab/UngrabKeyboard to remove strange interactions with
Jan Djärv <jan.h.d@swipnet.se>
parents:
44713
diff
changeset
|
286 } |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
287 |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
288 /* Like abort, but remove grabs from widget W before. */ |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
289 |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
290 static void |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
291 abort_gracefully (Widget w) |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
292 { |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
293 if (XtIsShell (XtParent (w))) |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
294 XtRemoveGrab (w); |
44750
2e7603e0c455
Add calls to Grab/UngrabKeyboard to remove strange interactions with
Jan Djärv <jan.h.d@swipnet.se>
parents:
44713
diff
changeset
|
295 ungrab_all (w, CurrentTime); |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
296 abort (); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
297 } |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
298 |
5626 | 299 static void |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
300 push_new_stack (XlwMenuWidget mw, widget_value *val) |
5626 | 301 { |
302 if (!mw->menu.new_stack) | |
303 { | |
304 mw->menu.new_stack_length = 10; | |
305 mw->menu.new_stack = | |
306 (widget_value**)XtCalloc (mw->menu.new_stack_length, | |
307 sizeof (widget_value*)); | |
308 } | |
309 else if (mw->menu.new_depth == mw->menu.new_stack_length) | |
310 { | |
311 mw->menu.new_stack_length *= 2; | |
312 mw->menu.new_stack = | |
313 (widget_value**)XtRealloc ((char*)mw->menu.new_stack, | |
314 mw->menu.new_stack_length * sizeof (widget_value*)); | |
315 } | |
316 mw->menu.new_stack [mw->menu.new_depth++] = val; | |
317 } | |
318 | |
319 static void | |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
320 pop_new_stack_if_no_contents (XlwMenuWidget mw) |
5626 | 321 { |
48929
d81c005163cb
(pop_new_stack_if_no_contents): Do nothing if new_depth is 1.
Richard M. Stallman <rms@gnu.org>
parents:
48479
diff
changeset
|
322 if (mw->menu.new_depth > 1) |
5626 | 323 { |
324 if (!mw->menu.new_stack [mw->menu.new_depth - 1]->contents) | |
325 mw->menu.new_depth -= 1; | |
326 } | |
327 } | |
328 | |
329 static void | |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
330 make_old_stack_space (XlwMenuWidget mw, int n) |
5626 | 331 { |
332 if (!mw->menu.old_stack) | |
333 { | |
334 mw->menu.old_stack_length = 10; | |
335 mw->menu.old_stack = | |
336 (widget_value**)XtCalloc (mw->menu.old_stack_length, | |
337 sizeof (widget_value*)); | |
338 } | |
339 else if (mw->menu.old_stack_length < n) | |
340 { | |
341 mw->menu.old_stack_length *= 2; | |
342 mw->menu.old_stack = | |
343 (widget_value**)XtRealloc ((char*)mw->menu.old_stack, | |
344 mw->menu.old_stack_length * sizeof (widget_value*)); | |
345 } | |
346 } | |
347 | |
348 /* Size code */ | |
70850
b90abedf3b79
* xlwmenu.c: Include xterm.h if emacs instead of declaring functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68640
diff
changeset
|
349 static int |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
350 string_width (XlwMenuWidget mw, char *s) |
5626 | 351 { |
61209
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
352 XCharStruct xcs; |
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
353 int drop; |
107804
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
354 #ifdef HAVE_XFT |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
355 if (mw->menu.xft_font) |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
356 { |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
357 XGlyphInfo gi; |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
358 XftTextExtentsUtf8 (XtDisplay (mw), mw->menu.xft_font, |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
359 (FcChar8 *) s, |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
360 strlen (s), &gi); |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
361 return gi.width; |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
362 } |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
363 #endif |
60698
3e557e11645e
Add support for I18N to Lucid menus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59100
diff
changeset
|
364 #ifdef HAVE_X_I18N |
61209
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
365 if (mw->menu.fontSet) |
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
366 { |
107804
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
367 XRectangle ink, logical; |
61209
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
368 XmbTextExtents (mw->menu.fontSet, s, strlen (s), &ink, &logical); |
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
369 return logical.width; |
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
370 } |
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
371 #endif |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
372 |
5626 | 373 XTextExtents (mw->menu.font, s, strlen (s), &drop, &drop, &drop, &xcs); |
374 return xcs.width; | |
61209
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
375 |
5626 | 376 } |
377 | |
107804
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
378 #ifdef HAVE_XFT |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
379 #define MENU_FONT_HEIGHT(mw) \ |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
380 ((mw)->menu.xft_font != NULL \ |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
381 ? (mw)->menu.xft_font->height \ |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
382 : ((mw)->menu.fontSet != NULL \ |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
383 ? (mw)->menu.font_extents->max_logical_extent.height \ |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
384 : (mw)->menu.font->ascent + (mw)->menu.font->descent)) |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
385 #define MENU_FONT_ASCENT(mw) \ |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
386 ((mw)->menu.xft_font != NULL \ |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
387 ? (mw)->menu.xft_font->ascent \ |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
388 : ((mw)->menu.fontSet != NULL \ |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
389 ? - (mw)->menu.font_extents->max_logical_extent.y \ |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
390 : (mw)->menu.font->ascent)) |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
391 #else |
60698
3e557e11645e
Add support for I18N to Lucid menus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59100
diff
changeset
|
392 #ifdef HAVE_X_I18N |
3e557e11645e
Add support for I18N to Lucid menus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59100
diff
changeset
|
393 #define MENU_FONT_HEIGHT(mw) \ |
61209
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
394 ((mw)->menu.fontSet != NULL \ |
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
395 ? (mw)->menu.font_extents->max_logical_extent.height \ |
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
396 : (mw)->menu.font->ascent + (mw)->menu.font->descent) |
60700
2610d09357c8
(MENU_FONT_ASCENT) [HAVE_X_I18N]: Try to be more correct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60698
diff
changeset
|
397 #define MENU_FONT_ASCENT(mw) \ |
61209
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
398 ((mw)->menu.fontSet != NULL \ |
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
399 ? - (mw)->menu.font_extents->max_logical_extent.y \ |
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
400 : (mw)->menu.font->ascent) |
60698
3e557e11645e
Add support for I18N to Lucid menus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59100
diff
changeset
|
401 #else |
3e557e11645e
Add support for I18N to Lucid menus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59100
diff
changeset
|
402 #define MENU_FONT_HEIGHT(mw) \ |
3e557e11645e
Add support for I18N to Lucid menus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59100
diff
changeset
|
403 ((mw)->menu.font->ascent + (mw)->menu.font->descent) |
3e557e11645e
Add support for I18N to Lucid menus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59100
diff
changeset
|
404 #define MENU_FONT_ASCENT(mw) ((mw)->menu.font->ascent) |
3e557e11645e
Add support for I18N to Lucid menus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59100
diff
changeset
|
405 #endif |
107804
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
406 #endif |
60698
3e557e11645e
Add support for I18N to Lucid menus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59100
diff
changeset
|
407 |
5626 | 408 static int |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
409 arrow_width (XlwMenuWidget mw) |
5626 | 410 { |
60698
3e557e11645e
Add support for I18N to Lucid menus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59100
diff
changeset
|
411 return (MENU_FONT_ASCENT (mw) * 3/4) | 1; |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
412 } |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
413 |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
414 /* Return the width of toggle buttons of widget MW. */ |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
415 |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
416 static int |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
417 toggle_button_width (XlwMenuWidget mw) |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
418 { |
60698
3e557e11645e
Add support for I18N to Lucid menus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59100
diff
changeset
|
419 return (MENU_FONT_HEIGHT (mw) * 2 / 3) | 1; |
5626 | 420 } |
421 | |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
422 |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
423 /* Return the width of radio buttons of widget MW. */ |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
424 |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
425 static int |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
426 radio_button_width (XlwMenuWidget mw) |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
427 { |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
428 return toggle_button_width (mw) * 1.41; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
429 } |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
430 |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
431 |
5626 | 432 static XtResource |
433 nameResource[] = | |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
434 { |
5626 | 435 {"labelString", "LabelString", XtRString, sizeof(String), |
436 0, XtRImmediate, 0}, | |
437 }; | |
438 | |
439 static char* | |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
440 resource_widget_value (XlwMenuWidget mw, widget_value *val) |
5626 | 441 { |
442 if (!val->toolkit_data) | |
443 { | |
444 char* resourced_name = NULL; | |
445 char* complete_name; | |
446 XtGetSubresources ((Widget) mw, | |
447 (XtPointer) &resourced_name, | |
448 val->name, val->name, | |
449 nameResource, 1, NULL, 0); | |
450 if (!resourced_name) | |
451 resourced_name = val->name; | |
452 if (!val->value) | |
5654
f84dac6453db
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
5626
diff
changeset
|
453 { |
f84dac6453db
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
5626
diff
changeset
|
454 complete_name = (char *) XtMalloc (strlen (resourced_name) + 1); |
f84dac6453db
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
5626
diff
changeset
|
455 strcpy (complete_name, resourced_name); |
f84dac6453db
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
5626
diff
changeset
|
456 } |
5626 | 457 else |
458 { | |
459 int complete_length = | |
460 strlen (resourced_name) + strlen (val->value) + 2; | |
461 complete_name = XtMalloc (complete_length); | |
462 *complete_name = 0; | |
463 strcat (complete_name, resourced_name); | |
464 strcat (complete_name, " "); | |
465 strcat (complete_name, val->value); | |
466 } | |
467 | |
468 val->toolkit_data = complete_name; | |
469 val->free_toolkit_data = True; | |
470 } | |
471 return (char*)val->toolkit_data; | |
472 } | |
473 | |
474 /* Returns the sizes of an item */ | |
475 static void | |
109173
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
476 size_menu_item (XlwMenuWidget mw, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
477 widget_value* val, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
478 int horizontal_p, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
479 int* label_width, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
480 int* rest_width, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
481 int* button_width, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
482 int* height) |
5626 | 483 { |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
484 enum menu_separator separator; |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
485 |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
486 if (lw_separator_p (val->name, &separator, 0)) |
5626 | 487 { |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
488 *height = separator_height (separator); |
5626 | 489 *label_width = 1; |
490 *rest_width = 0; | |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
491 *button_width = 0; |
5626 | 492 } |
493 else | |
494 { | |
60698
3e557e11645e
Add support for I18N to Lucid menus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59100
diff
changeset
|
495 *height = MENU_FONT_HEIGHT (mw) |
3e557e11645e
Add support for I18N to Lucid menus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59100
diff
changeset
|
496 + 2 * mw->menu.vertical_spacing + 2 * mw->menu.shadow_thickness; |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
497 |
5626 | 498 *label_width = |
499 string_width (mw, resource_widget_value (mw, val)) | |
500 + mw->menu.horizontal_spacing + mw->menu.shadow_thickness; | |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
501 |
5626 | 502 *rest_width = mw->menu.horizontal_spacing + mw->menu.shadow_thickness; |
503 if (!horizontal_p) | |
504 { | |
505 if (val->contents) | |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
506 /* Add width of the arrow displayed for submenus. */ |
5626 | 507 *rest_width += arrow_width (mw) + mw->menu.arrow_spacing; |
508 else if (val->key) | |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
509 /* Add width of key equivalent string. */ |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
510 *rest_width += (string_width (mw, val->key) |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
511 + mw->menu.arrow_spacing); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
512 |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
513 if (val->button_type == BUTTON_TYPE_TOGGLE) |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
514 *button_width = (toggle_button_width (mw) |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
515 + mw->menu.horizontal_spacing); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
516 else if (val->button_type == BUTTON_TYPE_RADIO) |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
517 *button_width = (radio_button_width (mw) |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
518 + mw->menu.horizontal_spacing); |
5626 | 519 } |
520 } | |
521 } | |
522 | |
523 static void | |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
524 size_menu (XlwMenuWidget mw, int level) |
5626 | 525 { |
109173
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
526 int label_width = 0; |
5626 | 527 int rest_width = 0; |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
528 int button_width = 0; |
5626 | 529 int max_rest_width = 0; |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
530 int max_button_width = 0; |
109173
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
531 int height = 0; |
5626 | 532 int horizontal_p = mw->menu.horizontal && (level == 0); |
533 widget_value* val; | |
534 window_state* ws; | |
535 | |
536 if (level >= mw->menu.old_depth) | |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
537 abort_gracefully ((Widget) mw); |
5626 | 538 |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
539 ws = &mw->menu.windows [level]; |
5626 | 540 ws->width = 0; |
541 ws->height = 0; | |
542 ws->label_width = 0; | |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
543 ws->button_width = 0; |
5626 | 544 |
545 for (val = mw->menu.old_stack [level]->contents; val; val = val->next) | |
546 { | |
547 size_menu_item (mw, val, horizontal_p, &label_width, &rest_width, | |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
548 &button_width, &height); |
5626 | 549 if (horizontal_p) |
550 { | |
551 ws->width += label_width + rest_width; | |
552 if (height > ws->height) | |
553 ws->height = height; | |
554 } | |
555 else | |
556 { | |
557 if (label_width > ws->label_width) | |
558 ws->label_width = label_width; | |
559 if (rest_width > max_rest_width) | |
560 max_rest_width = rest_width; | |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
561 if (button_width > max_button_width) |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
562 max_button_width = button_width; |
5626 | 563 ws->height += height; |
564 } | |
565 } | |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
566 |
5626 | 567 if (horizontal_p) |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
568 ws->label_width = ws->button_width = 0; |
5626 | 569 else |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
570 { |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
571 ws->width = ws->label_width + max_rest_width + max_button_width; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
572 ws->button_width = max_button_width; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
573 } |
5626 | 574 |
575 ws->width += 2 * mw->menu.shadow_thickness; | |
576 ws->height += 2 * mw->menu.shadow_thickness; | |
107804
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
577 ws->max_rest_width = max_rest_width; |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
578 |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
579 if (horizontal_p) |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
580 { |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
581 ws->width += 2 * mw->menu.margin; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
582 ws->height += 2 * mw->menu.margin; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
583 } |
5626 | 584 } |
585 | |
586 | |
587 /* Display code */ | |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
588 |
5626 | 589 static void |
109173
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
590 draw_arrow (XlwMenuWidget mw, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
591 Window window, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
592 GC gc, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
593 int x, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
594 int y, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
595 int width, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
596 int down_p) |
5626 | 597 { |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
598 Display *dpy = XtDisplay (mw); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
599 GC top_gc = mw->menu.shadow_top_gc; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
600 GC bottom_gc = mw->menu.shadow_bottom_gc; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
601 int thickness = mw->menu.shadow_thickness; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
602 int height = width; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
603 XPoint pt[10]; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
604 /* alpha = atan (0.5) |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
605 factor = (1 + sin (alpha)) / cos (alpha) */ |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
606 double factor = 1.62; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
607 int thickness2 = thickness * factor; |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
608 |
60698
3e557e11645e
Add support for I18N to Lucid menus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59100
diff
changeset
|
609 y += (MENU_FONT_HEIGHT (mw) - height) / 2; |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
610 |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
611 if (down_p) |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
612 { |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
613 GC temp; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
614 temp = top_gc; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
615 top_gc = bottom_gc; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
616 bottom_gc = temp; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
617 } |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
618 |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
619 pt[0].x = x; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
620 pt[0].y = y + height; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
621 pt[1].x = x + thickness; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
622 pt[1].y = y + height - thickness2; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
623 pt[2].x = x + thickness2; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
624 pt[2].y = y + thickness2; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
625 pt[3].x = x; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
626 pt[3].y = y; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
627 XFillPolygon (dpy, window, top_gc, pt, 4, Convex, CoordModeOrigin); |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
628 |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
629 pt[0].x = x; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
630 pt[0].y = y; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
631 pt[1].x = x + thickness; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
632 pt[1].y = y + thickness2; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
633 pt[2].x = x + width - thickness2; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
634 pt[2].y = y + height / 2; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
635 pt[3].x = x + width; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
636 pt[3].y = y + height / 2; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
637 XFillPolygon (dpy, window, top_gc, pt, 4, Convex, CoordModeOrigin); |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
638 |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
639 pt[0].x = x; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
640 pt[0].y = y + height; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
641 pt[1].x = x + thickness; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
642 pt[1].y = y + height - thickness2; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
643 pt[2].x = x + width - thickness2; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
644 pt[2].y = y + height / 2; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
645 pt[3].x = x + width; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
646 pt[3].y = y + height / 2; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
647 XFillPolygon (dpy, window, bottom_gc, pt, 4, Convex, CoordModeOrigin); |
5626 | 648 } |
649 | |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
650 |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
651 |
5626 | 652 static void |
109173
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
653 draw_shadow_rectangle (XlwMenuWidget mw, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
654 Window window, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
655 int x, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
656 int y, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
657 int width, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
658 int height, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
659 int erase_p, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
660 int down_p) |
5626 | 661 { |
662 Display *dpy = XtDisplay (mw); | |
663 GC top_gc = !erase_p ? mw->menu.shadow_top_gc : mw->menu.background_gc; | |
664 GC bottom_gc = !erase_p ? mw->menu.shadow_bottom_gc : mw->menu.background_gc; | |
665 int thickness = mw->menu.shadow_thickness; | |
666 XPoint points [4]; | |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
667 |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
668 if (!erase_p && down_p) |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
669 { |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
670 GC temp; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
671 temp = top_gc; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
672 top_gc = bottom_gc; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
673 bottom_gc = temp; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
674 } |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
675 |
5626 | 676 points [0].x = x; |
677 points [0].y = y; | |
678 points [1].x = x + width; | |
679 points [1].y = y; | |
680 points [2].x = x + width - thickness; | |
681 points [2].y = y + thickness; | |
682 points [3].x = x; | |
683 points [3].y = y + thickness; | |
684 XFillPolygon (dpy, window, top_gc, points, 4, Convex, CoordModeOrigin); | |
685 points [0].x = x; | |
686 points [0].y = y + thickness; | |
687 points [1].x = x; | |
688 points [1].y = y + height; | |
689 points [2].x = x + thickness; | |
690 points [2].y = y + height - thickness; | |
691 points [3].x = x + thickness; | |
692 points [3].y = y + thickness; | |
693 XFillPolygon (dpy, window, top_gc, points, 4, Convex, CoordModeOrigin); | |
694 points [0].x = x + width; | |
695 points [0].y = y; | |
696 points [1].x = x + width - thickness; | |
697 points [1].y = y + thickness; | |
698 points [2].x = x + width - thickness; | |
699 points [2].y = y + height - thickness; | |
700 points [3].x = x + width; | |
701 points [3].y = y + height - thickness; | |
702 XFillPolygon (dpy, window, bottom_gc, points, 4, Convex, CoordModeOrigin); | |
703 points [0].x = x; | |
704 points [0].y = y + height; | |
705 points [1].x = x + width; | |
706 points [1].y = y + height; | |
707 points [2].x = x + width; | |
708 points [2].y = y + height - thickness; | |
709 points [3].x = x + thickness; | |
710 points [3].y = y + height - thickness; | |
711 XFillPolygon (dpy, window, bottom_gc, points, 4, Convex, CoordModeOrigin); | |
712 } | |
713 | |
714 | |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
715 static void |
109173
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
716 draw_shadow_rhombus (XlwMenuWidget mw, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
717 Window window, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
718 int x, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
719 int y, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
720 int width, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
721 int height, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
722 int erase_p, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
723 int down_p) |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
724 { |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
725 Display *dpy = XtDisplay (mw); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
726 GC top_gc = !erase_p ? mw->menu.shadow_top_gc : mw->menu.background_gc; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
727 GC bottom_gc = !erase_p ? mw->menu.shadow_bottom_gc : mw->menu.background_gc; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
728 int thickness = mw->menu.shadow_thickness; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
729 XPoint points [4]; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
730 |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
731 if (!erase_p && down_p) |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
732 { |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
733 GC temp; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
734 temp = top_gc; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
735 top_gc = bottom_gc; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
736 bottom_gc = temp; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
737 } |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
738 |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
739 points [0].x = x; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
740 points [0].y = y + height / 2; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
741 points [1].x = x + thickness; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
742 points [1].y = y + height / 2; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
743 points [2].x = x + width / 2; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
744 points [2].y = y + thickness; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
745 points [3].x = x + width / 2; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
746 points [3].y = y; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
747 XFillPolygon (dpy, window, top_gc, points, 4, Convex, CoordModeOrigin); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
748 points [0].x = x + width / 2; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
749 points [0].y = y; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
750 points [1].x = x + width / 2; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
751 points [1].y = y + thickness; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
752 points [2].x = x + width - thickness; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
753 points [2].y = y + height / 2; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
754 points [3].x = x + width; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
755 points [3].y = y + height / 2; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
756 XFillPolygon (dpy, window, top_gc, points, 4, Convex, CoordModeOrigin); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
757 points [0].x = x; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
758 points [0].y = y + height / 2; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
759 points [1].x = x + thickness; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
760 points [1].y = y + height / 2; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
761 points [2].x = x + width / 2; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
762 points [2].y = y + height - thickness; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
763 points [3].x = x + width / 2; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
764 points [3].y = y + height; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
765 XFillPolygon (dpy, window, bottom_gc, points, 4, Convex, CoordModeOrigin); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
766 points [0].x = x + width / 2; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
767 points [0].y = y + height; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
768 points [1].x = x + width / 2; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
769 points [1].y = y + height - thickness; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
770 points [2].x = x + width - thickness; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
771 points [2].y = y + height / 2; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
772 points [3].x = x + width; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
773 points [3].y = y + height / 2; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
774 XFillPolygon (dpy, window, bottom_gc, points, 4, Convex, CoordModeOrigin); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
775 } |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
776 |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
777 |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
778 /* Draw a toggle button on widget MW, X window WINDOW. X/Y is the |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
779 top-left corner of the menu item. SELECTED_P non-zero means the |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
780 toggle button is selected. */ |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
781 |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
782 static void |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
783 draw_toggle (XlwMenuWidget mw, Window window, int x, int y, int selected_p) |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
784 { |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
785 int width, height; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
786 |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
787 width = toggle_button_width (mw); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
788 height = width; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
789 x += mw->menu.horizontal_spacing; |
60698
3e557e11645e
Add support for I18N to Lucid menus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59100
diff
changeset
|
790 y += (MENU_FONT_ASCENT (mw) - height) / 2; |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
791 draw_shadow_rectangle (mw, window, x, y, width, height, False, selected_p); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
792 } |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
793 |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
794 |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
795 /* Draw a radio button on widget MW, X window WINDOW. X/Y is the |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
796 top-left corner of the menu item. SELECTED_P non-zero means the |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
797 toggle button is selected. */ |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
798 |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
799 static void |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
800 draw_radio (XlwMenuWidget mw, Window window, int x, int y, int selected_p) |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
801 { |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
802 int width, height; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
803 |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
804 width = radio_button_width (mw); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
805 height = width; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
806 x += mw->menu.horizontal_spacing; |
60698
3e557e11645e
Add support for I18N to Lucid menus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59100
diff
changeset
|
807 y += (MENU_FONT_ASCENT (mw) - height) / 2; |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
808 draw_shadow_rhombus (mw, window, x, y, width, height, False, selected_p); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
809 } |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
810 |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
811 |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
812 /* Draw a menu separator on widget MW, X window WINDOW. X/Y is the |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
813 top-left corner of the menu item. WIDTH is the width of the |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
814 separator to draw. TYPE is the separator type. */ |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
815 |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
816 static void |
109173
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
817 draw_separator (XlwMenuWidget mw, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
818 Window window, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
819 int x, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
820 int y, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
821 int width, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
822 enum menu_separator type) |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
823 { |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
824 Display *dpy = XtDisplay (mw); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
825 XGCValues xgcv; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
826 |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
827 switch (type) |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
828 { |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
829 case SEPARATOR_NO_LINE: |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
830 break; |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
831 |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
832 case SEPARATOR_SINGLE_LINE: |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
833 XDrawLine (dpy, window, mw->menu.foreground_gc, |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
834 x, y, x + width, y); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
835 break; |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
836 |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
837 case SEPARATOR_DOUBLE_LINE: |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
838 draw_separator (mw, window, x, y, width, SEPARATOR_SINGLE_LINE); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
839 draw_separator (mw, window, x, y + 2, width, SEPARATOR_SINGLE_LINE); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
840 break; |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
841 |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
842 case SEPARATOR_SINGLE_DASHED_LINE: |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
843 xgcv.line_style = LineOnOffDash; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
844 XChangeGC (dpy, mw->menu.foreground_gc, GCLineStyle, &xgcv); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
845 XDrawLine (dpy, window, mw->menu.foreground_gc, |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
846 x, y, x + width, y); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
847 xgcv.line_style = LineSolid; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
848 XChangeGC (dpy, mw->menu.foreground_gc, GCLineStyle, &xgcv); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
849 break; |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
850 |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
851 case SEPARATOR_DOUBLE_DASHED_LINE: |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
852 draw_separator (mw, window, x, y, width, |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
853 SEPARATOR_SINGLE_DASHED_LINE); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
854 draw_separator (mw, window, x, y + 2, width, |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
855 SEPARATOR_SINGLE_DASHED_LINE); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
856 break; |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
857 |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
858 case SEPARATOR_SHADOW_ETCHED_IN: |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
859 XDrawLine (dpy, window, mw->menu.shadow_bottom_gc, |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
860 x, y, x + width, y); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
861 XDrawLine (dpy, window, mw->menu.shadow_top_gc, |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
862 x, y + 1, x + width, y + 1); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
863 break; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
864 |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
865 case SEPARATOR_SHADOW_ETCHED_OUT: |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
866 XDrawLine (dpy, window, mw->menu.shadow_top_gc, |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
867 x, y, x + width, y); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
868 XDrawLine (dpy, window, mw->menu.shadow_bottom_gc, |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
869 x, y + 1, x + width, y + 1); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
870 break; |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
871 |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
872 case SEPARATOR_SHADOW_ETCHED_IN_DASH: |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
873 xgcv.line_style = LineOnOffDash; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
874 XChangeGC (dpy, mw->menu.shadow_bottom_gc, GCLineStyle, &xgcv); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
875 XChangeGC (dpy, mw->menu.shadow_top_gc, GCLineStyle, &xgcv); |
34436
a27cc46a67b4
(draw_separator) <SEPARATOR_SHADOW_ETCHED_IN_DASH>:
Dave Love <fx@gnu.org>
parents:
33714
diff
changeset
|
876 draw_separator (mw, window, x, y, width, SEPARATOR_SHADOW_ETCHED_IN); |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
877 xgcv.line_style = LineSolid; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
878 XChangeGC (dpy, mw->menu.shadow_bottom_gc, GCLineStyle, &xgcv); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
879 XChangeGC (dpy, mw->menu.shadow_top_gc, GCLineStyle, &xgcv); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
880 break; |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
881 |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
882 case SEPARATOR_SHADOW_ETCHED_OUT_DASH: |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
883 xgcv.line_style = LineOnOffDash; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
884 XChangeGC (dpy, mw->menu.shadow_bottom_gc, GCLineStyle, &xgcv); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
885 XChangeGC (dpy, mw->menu.shadow_top_gc, GCLineStyle, &xgcv); |
34436
a27cc46a67b4
(draw_separator) <SEPARATOR_SHADOW_ETCHED_IN_DASH>:
Dave Love <fx@gnu.org>
parents:
33714
diff
changeset
|
886 draw_separator (mw, window, x, y, width, SEPARATOR_SHADOW_ETCHED_OUT); |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
887 xgcv.line_style = LineSolid; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
888 XChangeGC (dpy, mw->menu.shadow_bottom_gc, GCLineStyle, &xgcv); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
889 XChangeGC (dpy, mw->menu.shadow_top_gc, GCLineStyle, &xgcv); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
890 break; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
891 |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
892 case SEPARATOR_SHADOW_DOUBLE_ETCHED_IN: |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
893 draw_separator (mw, window, x, y, width, SEPARATOR_SHADOW_ETCHED_IN); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
894 draw_separator (mw, window, x, y + 3, width, SEPARATOR_SHADOW_ETCHED_IN); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
895 break; |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
896 |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
897 case SEPARATOR_SHADOW_DOUBLE_ETCHED_OUT: |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
898 draw_separator (mw, window, x, y, width, |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
899 SEPARATOR_SHADOW_ETCHED_OUT); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
900 draw_separator (mw, window, x, y + 3, width, |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
901 SEPARATOR_SHADOW_ETCHED_OUT); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
902 break; |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
903 |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
904 case SEPARATOR_SHADOW_DOUBLE_ETCHED_IN_DASH: |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
905 xgcv.line_style = LineOnOffDash; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
906 XChangeGC (dpy, mw->menu.shadow_bottom_gc, GCLineStyle, &xgcv); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
907 XChangeGC (dpy, mw->menu.shadow_top_gc, GCLineStyle, &xgcv); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
908 draw_separator (mw, window, x, y, width, |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
909 SEPARATOR_SHADOW_DOUBLE_ETCHED_IN); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
910 xgcv.line_style = LineSolid; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
911 XChangeGC (dpy, mw->menu.shadow_bottom_gc, GCLineStyle, &xgcv); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
912 XChangeGC (dpy, mw->menu.shadow_top_gc, GCLineStyle, &xgcv); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
913 break; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
914 |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
915 case SEPARATOR_SHADOW_DOUBLE_ETCHED_OUT_DASH: |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
916 xgcv.line_style = LineOnOffDash; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
917 XChangeGC (dpy, mw->menu.shadow_bottom_gc, GCLineStyle, &xgcv); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
918 XChangeGC (dpy, mw->menu.shadow_top_gc, GCLineStyle, &xgcv); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
919 draw_separator (mw, window, x, y, width, |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
920 SEPARATOR_SHADOW_DOUBLE_ETCHED_OUT); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
921 xgcv.line_style = LineSolid; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
922 XChangeGC (dpy, mw->menu.shadow_bottom_gc, GCLineStyle, &xgcv); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
923 XChangeGC (dpy, mw->menu.shadow_top_gc, GCLineStyle, &xgcv); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
924 break; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
925 |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
926 default: |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
927 abort (); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
928 } |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
929 } |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
930 |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
931 |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
932 /* Return the pixel height of menu separator SEPARATOR. */ |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
933 |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
934 static int |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
935 separator_height (enum menu_separator separator) |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
936 { |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
937 switch (separator) |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
938 { |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
939 case SEPARATOR_NO_LINE: |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
940 return 2; |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
941 |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
942 case SEPARATOR_SINGLE_LINE: |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
943 case SEPARATOR_SINGLE_DASHED_LINE: |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
944 return 1; |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
945 |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
946 case SEPARATOR_DOUBLE_LINE: |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
947 case SEPARATOR_DOUBLE_DASHED_LINE: |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
948 return 3; |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
949 |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
950 case SEPARATOR_SHADOW_ETCHED_IN: |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
951 case SEPARATOR_SHADOW_ETCHED_OUT: |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
952 case SEPARATOR_SHADOW_ETCHED_IN_DASH: |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
953 case SEPARATOR_SHADOW_ETCHED_OUT_DASH: |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
954 return 2; |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
955 |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
956 case SEPARATOR_SHADOW_DOUBLE_ETCHED_IN: |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
957 case SEPARATOR_SHADOW_DOUBLE_ETCHED_OUT: |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
958 case SEPARATOR_SHADOW_DOUBLE_ETCHED_IN_DASH: |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
959 case SEPARATOR_SHADOW_DOUBLE_ETCHED_OUT_DASH: |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
960 return 5; |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
961 |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
962 default: |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
963 abort (); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
964 } |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
965 } |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
966 |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
967 |
5626 | 968 /* Display the menu item and increment where.x and where.y to show how large |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
969 the menu item was. */ |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
970 |
5626 | 971 static void |
109173
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
972 display_menu_item (XlwMenuWidget mw, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
973 widget_value* val, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
974 window_state* ws, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
975 XPoint* where, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
976 Boolean highlighted_p, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
977 Boolean horizontal_p, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
978 Boolean just_compute_p) |
5626 | 979 { |
980 GC deco_gc; | |
981 GC text_gc; | |
60698
3e557e11645e
Add support for I18N to Lucid menus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59100
diff
changeset
|
982 int font_height = MENU_FONT_HEIGHT (mw); |
3e557e11645e
Add support for I18N to Lucid menus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59100
diff
changeset
|
983 int font_ascent = MENU_FONT_ASCENT (mw); |
5626 | 984 int shadow = mw->menu.shadow_thickness; |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
985 int margin = mw->menu.margin; |
5626 | 986 int h_spacing = mw->menu.horizontal_spacing; |
987 int v_spacing = mw->menu.vertical_spacing; | |
988 int label_width; | |
989 int rest_width; | |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
990 int button_width; |
5626 | 991 int height; |
992 int width; | |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
993 enum menu_separator separator; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
994 int separator_p = lw_separator_p (val->name, &separator, 0); |
107804
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
995 #ifdef HAVE_XFT |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
996 XftColor *xftfg; |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
997 #endif |
5626 | 998 |
999 /* compute the sizes of the item */ | |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
1000 size_menu_item (mw, val, horizontal_p, &label_width, &rest_width, |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
1001 &button_width, &height); |
5626 | 1002 |
1003 if (horizontal_p) | |
1004 width = label_width + rest_width; | |
1005 else | |
1006 { | |
1007 label_width = ws->label_width; | |
1008 width = ws->width - 2 * shadow; | |
1009 } | |
1010 | |
1011 /* Only highlight an enabled item that has a callback. */ | |
1012 if (highlighted_p) | |
1013 if (!val->enabled || !(val->call_data || val->contents)) | |
1014 highlighted_p = 0; | |
1015 | |
1016 /* do the drawing. */ | |
1017 if (!just_compute_p) | |
1018 { | |
1019 /* Add the shadow border of the containing menu */ | |
1020 int x = where->x + shadow; | |
1021 int y = where->y + shadow; | |
1022 | |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
1023 if (horizontal_p) |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
1024 { |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
1025 x += margin; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
1026 y += margin; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
1027 } |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
1028 |
5626 | 1029 /* pick the foreground and background GC. */ |
1030 if (val->enabled) | |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
1031 text_gc = mw->menu.foreground_gc; |
5626 | 1032 else |
45147
e10cf8f440ae
(xlwMenuResources): New resource.
Pavel Janík <Pavel@Janik.cz>
parents:
44966
diff
changeset
|
1033 text_gc = mw->menu.disabled_gc; |
5626 | 1034 deco_gc = mw->menu.foreground_gc; |
107804
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1035 #ifdef HAVE_XFT |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1036 xftfg = val->enabled ? &mw->menu.xft_fg : &mw->menu.xft_disabled_fg; |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1037 #endif |
5626 | 1038 |
1039 if (separator_p) | |
1040 { | |
107886
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1041 draw_separator (mw, ws->pixmap, x, y, width, separator); |
5626 | 1042 } |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
1043 else |
5626 | 1044 { |
9227
968bb25ec1af
(display_menu_item): Add support for displaying the title in pop up menus.
Paul Reilly <pmr@pajato.com>
parents:
9092
diff
changeset
|
1045 int x_offset = x + h_spacing + shadow; |
5626 | 1046 char* display_string = resource_widget_value (mw, val); |
107886
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1047 draw_shadow_rectangle (mw, ws->pixmap, x, y, width, height, True, |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
1048 False); |
9227
968bb25ec1af
(display_menu_item): Add support for displaying the title in pop up menus.
Paul Reilly <pmr@pajato.com>
parents:
9092
diff
changeset
|
1049 |
968bb25ec1af
(display_menu_item): Add support for displaying the title in pop up menus.
Paul Reilly <pmr@pajato.com>
parents:
9092
diff
changeset
|
1050 /* Deal with centering a menu title. */ |
968bb25ec1af
(display_menu_item): Add support for displaying the title in pop up menus.
Paul Reilly <pmr@pajato.com>
parents:
9092
diff
changeset
|
1051 if (!horizontal_p && !val->contents && !val->call_data) |
968bb25ec1af
(display_menu_item): Add support for displaying the title in pop up menus.
Paul Reilly <pmr@pajato.com>
parents:
9092
diff
changeset
|
1052 { |
968bb25ec1af
(display_menu_item): Add support for displaying the title in pop up menus.
Paul Reilly <pmr@pajato.com>
parents:
9092
diff
changeset
|
1053 int l = string_width (mw, display_string); |
968bb25ec1af
(display_menu_item): Add support for displaying the title in pop up menus.
Paul Reilly <pmr@pajato.com>
parents:
9092
diff
changeset
|
1054 |
968bb25ec1af
(display_menu_item): Add support for displaying the title in pop up menus.
Paul Reilly <pmr@pajato.com>
parents:
9092
diff
changeset
|
1055 if (width > l) |
968bb25ec1af
(display_menu_item): Add support for displaying the title in pop up menus.
Paul Reilly <pmr@pajato.com>
parents:
9092
diff
changeset
|
1056 x_offset = (width - l) >> 1; |
968bb25ec1af
(display_menu_item): Add support for displaying the title in pop up menus.
Paul Reilly <pmr@pajato.com>
parents:
9092
diff
changeset
|
1057 } |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
1058 else if (!horizontal_p && ws->button_width) |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
1059 x_offset += ws->button_width; |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
1060 |
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
1061 |
107804
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1062 #ifdef HAVE_XFT |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1063 if (ws->xft_draw) |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1064 { |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1065 int draw_y = y + v_spacing + shadow; |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1066 XftDrawStringUtf8 (ws->xft_draw, xftfg, |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1067 mw->menu.xft_font, |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1068 x_offset, draw_y + font_ascent, |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1069 (unsigned char *) display_string, |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1070 strlen (display_string)); |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1071 } |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1072 else |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1073 #endif |
60698
3e557e11645e
Add support for I18N to Lucid menus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59100
diff
changeset
|
1074 #ifdef HAVE_X_I18N |
61209
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
1075 if (mw->menu.fontSet) |
107886
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1076 XmbDrawString (XtDisplay (mw), ws->pixmap, mw->menu.fontSet, |
61209
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
1077 text_gc, x_offset, |
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
1078 y + v_spacing + shadow + font_ascent, |
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
1079 display_string, strlen (display_string)); |
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
1080 else |
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
1081 #endif |
107886
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1082 XDrawString (XtDisplay (mw), ws->pixmap, |
60698
3e557e11645e
Add support for I18N to Lucid menus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59100
diff
changeset
|
1083 text_gc, x_offset, |
5626 | 1084 y + v_spacing + shadow + font_ascent, |
1085 display_string, strlen (display_string)); | |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
1086 |
5626 | 1087 if (!horizontal_p) |
1088 { | |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
1089 if (val->button_type == BUTTON_TYPE_TOGGLE) |
107886
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1090 draw_toggle (mw, ws->pixmap, x, y + v_spacing + shadow, |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
1091 val->selected); |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
1092 else if (val->button_type == BUTTON_TYPE_RADIO) |
107886
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1093 draw_radio (mw, ws->pixmap, x, y + v_spacing + shadow, |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
1094 val->selected); |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
1095 |
5626 | 1096 if (val->contents) |
1097 { | |
1098 int a_w = arrow_width (mw); | |
107886
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1099 draw_arrow (mw, ws->pixmap, deco_gc, |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
1100 x + width - a_w |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
1101 - mw->menu.horizontal_spacing |
8860 | 1102 - mw->menu.shadow_thickness, |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
1103 y + v_spacing + shadow, a_w, |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
1104 highlighted_p); |
5626 | 1105 } |
1106 else if (val->key) | |
1107 { | |
107804
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1108 #ifdef HAVE_XFT |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1109 if (ws->xft_draw) |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1110 { |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1111 int draw_x = ws->width - ws->max_rest_width |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1112 + mw->menu.arrow_spacing; |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1113 int draw_y = y + v_spacing + shadow + font_ascent; |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1114 XftDrawStringUtf8 (ws->xft_draw, xftfg, |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1115 mw->menu.xft_font, |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1116 draw_x, draw_y, |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1117 (unsigned char *) val->key, |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1118 strlen (val->key)); |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1119 } |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1120 else |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1121 #endif |
60698
3e557e11645e
Add support for I18N to Lucid menus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59100
diff
changeset
|
1122 #ifdef HAVE_X_I18N |
61209
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
1123 if (mw->menu.fontSet) |
107886
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1124 XmbDrawString (XtDisplay (mw), ws->pixmap, |
61209
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
1125 mw->menu.fontSet, |
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
1126 text_gc, |
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
1127 x + label_width + mw->menu.arrow_spacing, |
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
1128 y + v_spacing + shadow + font_ascent, |
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
1129 val->key, strlen (val->key)); |
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
1130 else |
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
1131 #endif |
107886
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1132 XDrawString (XtDisplay (mw), ws->pixmap, |
60698
3e557e11645e
Add support for I18N to Lucid menus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59100
diff
changeset
|
1133 text_gc, |
5626 | 1134 x + label_width + mw->menu.arrow_spacing, |
1135 y + v_spacing + shadow + font_ascent, | |
1136 val->key, strlen (val->key)); | |
1137 } | |
1138 } | |
8860 | 1139 else |
1140 { | |
107886
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1141 XDrawRectangle (XtDisplay (mw), ws->pixmap, |
8860 | 1142 mw->menu.background_gc, |
1143 x + shadow, y + shadow, | |
1144 label_width + h_spacing - 1, | |
60698
3e557e11645e
Add support for I18N to Lucid menus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59100
diff
changeset
|
1145 font_height + 2 * v_spacing - 1); |
107886
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1146 draw_shadow_rectangle (mw, ws->pixmap, x, y, width, height, |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
1147 True, False); |
8860 | 1148 } |
5626 | 1149 |
1150 if (highlighted_p) | |
107886
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1151 draw_shadow_rectangle (mw, ws->pixmap, x, y, width, height, False, |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
1152 False); |
5626 | 1153 } |
1154 } | |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
1155 |
5626 | 1156 where->x += width; |
1157 where->y += height; | |
1158 } | |
1159 | |
1160 static void | |
109173
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
1161 display_menu (XlwMenuWidget mw, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
1162 int level, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
1163 Boolean just_compute_p, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
1164 XPoint *highlighted_pos, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
1165 XPoint *hit, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
1166 widget_value **hit_return) |
5626 | 1167 { |
1168 widget_value* val; | |
1169 widget_value* following_item; | |
1170 window_state* ws; | |
1171 XPoint where; | |
1172 int horizontal_p = mw->menu.horizontal && (level == 0); | |
1173 int highlighted_p; | |
18993
c3bfd473a4d3
(display_menu): If an item is disabled,
Richard M. Stallman <rms@gnu.org>
parents:
17622
diff
changeset
|
1174 int no_return = 0; |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
1175 enum menu_separator separator; |
5626 | 1176 |
1177 if (level >= mw->menu.old_depth) | |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
1178 abort_gracefully ((Widget) mw); |
5626 | 1179 |
1180 if (level < mw->menu.old_depth - 1) | |
1181 following_item = mw->menu.old_stack [level + 1]; | |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
1182 else |
5626 | 1183 following_item = NULL; |
1184 | |
1185 if (hit) | |
1186 *hit_return = NULL; | |
1187 | |
1188 where.x = 0; | |
1189 where.y = 0; | |
1190 | |
1191 ws = &mw->menu.windows [level]; | |
107886
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1192 |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1193 if (!just_compute_p) |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1194 XFillRectangle (XtDisplay (mw), ws->pixmap, mw->menu.background_gc, |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1195 0, 0, ws->width, ws->height); |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1196 |
5626 | 1197 for (val = mw->menu.old_stack [level]->contents; val; val = val->next) |
1198 { | |
1199 highlighted_p = val == following_item; | |
1200 if (highlighted_p && highlighted_pos) | |
1201 { | |
1202 if (horizontal_p) | |
1203 highlighted_pos->x = where.x; | |
1204 else | |
1205 highlighted_pos->y = where.y; | |
1206 } | |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
1207 |
5626 | 1208 display_menu_item (mw, val, ws, &where, highlighted_p, horizontal_p, |
107886
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1209 just_compute_p); |
5626 | 1210 |
1211 if (highlighted_p && highlighted_pos) | |
1212 { | |
1213 if (horizontal_p) | |
1214 highlighted_pos->y = where.y; | |
1215 else | |
1216 highlighted_pos->x = where.x; | |
1217 } | |
1218 | |
1219 if (hit | |
1220 && !*hit_return | |
1221 && (horizontal_p ? hit->x < where.x : hit->y < where.y) | |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
1222 && !lw_separator_p (val->name, &separator, 0) |
18993
c3bfd473a4d3
(display_menu): If an item is disabled,
Richard M. Stallman <rms@gnu.org>
parents:
17622
diff
changeset
|
1223 && !no_return) |
c3bfd473a4d3
(display_menu): If an item is disabled,
Richard M. Stallman <rms@gnu.org>
parents:
17622
diff
changeset
|
1224 { |
c3bfd473a4d3
(display_menu): If an item is disabled,
Richard M. Stallman <rms@gnu.org>
parents:
17622
diff
changeset
|
1225 if (val->enabled) |
c3bfd473a4d3
(display_menu): If an item is disabled,
Richard M. Stallman <rms@gnu.org>
parents:
17622
diff
changeset
|
1226 *hit_return = val; |
75018
d263801b3ca8
(xlwMenuResources): Add XtNleaveCallback, XtNenterCallback.
Jan Djärv <jan.h.d@swipnet.se>
parents:
70850
diff
changeset
|
1227 else |
d263801b3ca8
(xlwMenuResources): Add XtNleaveCallback, XtNenterCallback.
Jan Djärv <jan.h.d@swipnet.se>
parents:
70850
diff
changeset
|
1228 no_return = 1; |
d263801b3ca8
(xlwMenuResources): Add XtNleaveCallback, XtNenterCallback.
Jan Djärv <jan.h.d@swipnet.se>
parents:
70850
diff
changeset
|
1229 if (mw->menu.inside_entry != val) |
d263801b3ca8
(xlwMenuResources): Add XtNleaveCallback, XtNenterCallback.
Jan Djärv <jan.h.d@swipnet.se>
parents:
70850
diff
changeset
|
1230 { |
d263801b3ca8
(xlwMenuResources): Add XtNleaveCallback, XtNenterCallback.
Jan Djärv <jan.h.d@swipnet.se>
parents:
70850
diff
changeset
|
1231 if (mw->menu.inside_entry) |
d263801b3ca8
(xlwMenuResources): Add XtNleaveCallback, XtNenterCallback.
Jan Djärv <jan.h.d@swipnet.se>
parents:
70850
diff
changeset
|
1232 XtCallCallbackList ((Widget)mw, mw->menu.leave, |
d263801b3ca8
(xlwMenuResources): Add XtNleaveCallback, XtNenterCallback.
Jan Djärv <jan.h.d@swipnet.se>
parents:
70850
diff
changeset
|
1233 (XtPointer) mw->menu.inside_entry); |
d263801b3ca8
(xlwMenuResources): Add XtNleaveCallback, XtNenterCallback.
Jan Djärv <jan.h.d@swipnet.se>
parents:
70850
diff
changeset
|
1234 mw->menu.inside_entry = val; |
d263801b3ca8
(xlwMenuResources): Add XtNleaveCallback, XtNenterCallback.
Jan Djärv <jan.h.d@swipnet.se>
parents:
70850
diff
changeset
|
1235 XtCallCallbackList ((Widget)mw, mw->menu.enter, |
d263801b3ca8
(xlwMenuResources): Add XtNleaveCallback, XtNenterCallback.
Jan Djärv <jan.h.d@swipnet.se>
parents:
70850
diff
changeset
|
1236 (XtPointer) mw->menu.inside_entry); |
d263801b3ca8
(xlwMenuResources): Add XtNleaveCallback, XtNenterCallback.
Jan Djärv <jan.h.d@swipnet.se>
parents:
70850
diff
changeset
|
1237 } |
18993
c3bfd473a4d3
(display_menu): If an item is disabled,
Richard M. Stallman <rms@gnu.org>
parents:
17622
diff
changeset
|
1238 } |
5626 | 1239 |
1240 if (horizontal_p) | |
1241 where.y = 0; | |
1242 else | |
1243 where.x = 0; | |
1244 } | |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
1245 |
5626 | 1246 if (!just_compute_p) |
107886
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1247 { |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1248 draw_shadow_rectangle (mw, ws->pixmap, 0, 0, ws->width, ws->height, |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1249 False, False); |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1250 XCopyArea (XtDisplay (mw), ws->pixmap, ws->window, |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1251 mw->menu.foreground_gc, 0, 0, ws->width, ws->height, 0, 0); |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1252 } |
5626 | 1253 } |
1254 | |
1255 /* Motion code */ | |
1256 static void | |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1257 set_new_state (XlwMenuWidget mw, widget_value *val, int level) |
5626 | 1258 { |
1259 int i; | |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
1260 |
5626 | 1261 mw->menu.new_depth = 0; |
1262 for (i = 0; i < level; i++) | |
1263 push_new_stack (mw, mw->menu.old_stack [i]); | |
1264 push_new_stack (mw, val); | |
1265 } | |
1266 | |
1267 static void | |
107886
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1268 expose_cb (Widget widget, |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1269 XtPointer closure, |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1270 XEvent* event, |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1271 Boolean* continue_to_dispatch) |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1272 { |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1273 XlwMenuWidget mw = (XlwMenuWidget) closure; |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1274 int i; |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1275 |
108023
150fd3d78f5a
Declarations before code (Bug#5993).
Jan D. <jan.h.d@swipnet.se>
parents:
107888
diff
changeset
|
1276 *continue_to_dispatch = False; |
107886
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1277 for (i = 0; i < mw->menu.windows_length; ++i) |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1278 if (mw->menu.windows [i].w == widget) break; |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1279 if (i < mw->menu.windows_length && i < mw->menu.old_depth) |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1280 display_menu (mw, i, False, NULL, NULL, NULL); |
107886
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1281 } |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1282 |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1283 static void |
107888
32fc68b9d103
Set _NET_WM_WINDOW_TYPE in menus. Looks bad with compiz otherwise.
Jan D. <jan.h.d@swipnet.se>
parents:
107886
diff
changeset
|
1284 set_window_type (Widget w, XlwMenuWidget mw) |
32fc68b9d103
Set _NET_WM_WINDOW_TYPE in menus. Looks bad with compiz otherwise.
Jan D. <jan.h.d@swipnet.se>
parents:
107886
diff
changeset
|
1285 { |
32fc68b9d103
Set _NET_WM_WINDOW_TYPE in menus. Looks bad with compiz otherwise.
Jan D. <jan.h.d@swipnet.se>
parents:
107886
diff
changeset
|
1286 int popup_menu_p = mw->menu.top_depth == 1; |
32fc68b9d103
Set _NET_WM_WINDOW_TYPE in menus. Looks bad with compiz otherwise.
Jan D. <jan.h.d@swipnet.se>
parents:
107886
diff
changeset
|
1287 Atom type = XInternAtom (XtDisplay (w), |
32fc68b9d103
Set _NET_WM_WINDOW_TYPE in menus. Looks bad with compiz otherwise.
Jan D. <jan.h.d@swipnet.se>
parents:
107886
diff
changeset
|
1288 popup_menu_p |
32fc68b9d103
Set _NET_WM_WINDOW_TYPE in menus. Looks bad with compiz otherwise.
Jan D. <jan.h.d@swipnet.se>
parents:
107886
diff
changeset
|
1289 ? "_NET_WM_WINDOW_TYPE_POPUP_MENU" |
32fc68b9d103
Set _NET_WM_WINDOW_TYPE in menus. Looks bad with compiz otherwise.
Jan D. <jan.h.d@swipnet.se>
parents:
107886
diff
changeset
|
1290 : "_NET_WM_WINDOW_TYPE_DROPDOWN_MENU", |
32fc68b9d103
Set _NET_WM_WINDOW_TYPE in menus. Looks bad with compiz otherwise.
Jan D. <jan.h.d@swipnet.se>
parents:
107886
diff
changeset
|
1291 False); |
32fc68b9d103
Set _NET_WM_WINDOW_TYPE in menus. Looks bad with compiz otherwise.
Jan D. <jan.h.d@swipnet.se>
parents:
107886
diff
changeset
|
1292 |
32fc68b9d103
Set _NET_WM_WINDOW_TYPE in menus. Looks bad with compiz otherwise.
Jan D. <jan.h.d@swipnet.se>
parents:
107886
diff
changeset
|
1293 XChangeProperty (XtDisplay (w), XtWindow (w), |
32fc68b9d103
Set _NET_WM_WINDOW_TYPE in menus. Looks bad with compiz otherwise.
Jan D. <jan.h.d@swipnet.se>
parents:
107886
diff
changeset
|
1294 XInternAtom (XtDisplay (w), "_NET_WM_WINDOW_TYPE", False), |
32fc68b9d103
Set _NET_WM_WINDOW_TYPE in menus. Looks bad with compiz otherwise.
Jan D. <jan.h.d@swipnet.se>
parents:
107886
diff
changeset
|
1295 XA_ATOM, 32, PropModeReplace, |
32fc68b9d103
Set _NET_WM_WINDOW_TYPE in menus. Looks bad with compiz otherwise.
Jan D. <jan.h.d@swipnet.se>
parents:
107886
diff
changeset
|
1296 (unsigned char *)&type, 1); |
32fc68b9d103
Set _NET_WM_WINDOW_TYPE in menus. Looks bad with compiz otherwise.
Jan D. <jan.h.d@swipnet.se>
parents:
107886
diff
changeset
|
1297 } |
32fc68b9d103
Set _NET_WM_WINDOW_TYPE in menus. Looks bad with compiz otherwise.
Jan D. <jan.h.d@swipnet.se>
parents:
107886
diff
changeset
|
1298 |
32fc68b9d103
Set _NET_WM_WINDOW_TYPE in menus. Looks bad with compiz otherwise.
Jan D. <jan.h.d@swipnet.se>
parents:
107886
diff
changeset
|
1299 |
32fc68b9d103
Set _NET_WM_WINDOW_TYPE in menus. Looks bad with compiz otherwise.
Jan D. <jan.h.d@swipnet.se>
parents:
107886
diff
changeset
|
1300 static void |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1301 make_windows_if_needed (XlwMenuWidget mw, int n) |
5626 | 1302 { |
1303 int i; | |
1304 int start_at; | |
1305 window_state* windows; | |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
1306 |
5626 | 1307 if (mw->menu.windows_length >= n) |
1308 return; | |
1309 | |
1310 if (!mw->menu.windows) | |
1311 { | |
1312 mw->menu.windows = | |
1313 (window_state*)XtMalloc (n * sizeof (window_state)); | |
1314 start_at = 0; | |
1315 } | |
1316 else | |
1317 { | |
1318 mw->menu.windows = | |
1319 (window_state*)XtRealloc ((char*)mw->menu.windows, | |
1320 n * sizeof (window_state)); | |
1321 start_at = mw->menu.windows_length; | |
1322 } | |
1323 mw->menu.windows_length = n; | |
1324 | |
1325 windows = mw->menu.windows; | |
1326 | |
1327 for (i = start_at; i < n; i++) | |
1328 { | |
107886
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1329 Arg av[10]; |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1330 int ac = 0; |
5626 | 1331 windows [i].x = 0; |
1332 windows [i].y = 0; | |
1333 windows [i].width = 1; | |
1334 windows [i].height = 1; | |
107804
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1335 windows [i].max_rest_width = 0; |
107886
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1336 XtSetArg (av[ac], XtNwidth, 1); ++ac; |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1337 XtSetArg (av[ac], XtNheight, 1); ++ac; |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1338 XtSetArg (av[ac], XtNsaveUnder, True); ++ac; |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1339 XtSetArg (av[ac], XtNbackground, mw->core.background_pixel); ++ac; |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1340 XtSetArg (av[ac], XtNborderColor, mw->core.border_pixel); ++ac; |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1341 XtSetArg (av[ac], XtNborderWidth, mw->core.border_width); ++ac; |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1342 XtSetArg (av[ac], XtNcursor, mw->menu.cursor_shape); ++ac; |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1343 windows [i].w = |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1344 XtCreatePopupShell ("sub", overrideShellWidgetClass, |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1345 (Widget) mw, av, ac); |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1346 XtRealizeWidget (windows [i].w); |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1347 XtAddEventHandler (windows [i].w, ExposureMask, False, expose_cb, mw); |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1348 windows [i].window = XtWindow (windows [i].w); |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1349 windows [i].pixmap = None; |
107804
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1350 #ifdef HAVE_XFT |
107886
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1351 windows [i].xft_draw = 0; |
107804
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1352 #endif |
107888
32fc68b9d103
Set _NET_WM_WINDOW_TYPE in menus. Looks bad with compiz otherwise.
Jan D. <jan.h.d@swipnet.se>
parents:
107886
diff
changeset
|
1353 set_window_type (windows [i].w, mw); |
107804
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1354 } |
5626 | 1355 } |
1356 | |
37524
f0a59a792f7d
(xlwmenu_window_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34557
diff
changeset
|
1357 /* Value is non-zero if WINDOW is part of menu bar widget W. */ |
f0a59a792f7d
(xlwmenu_window_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34557
diff
changeset
|
1358 |
f0a59a792f7d
(xlwmenu_window_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34557
diff
changeset
|
1359 int |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1360 xlwmenu_window_p (Widget w, Window window) |
37524
f0a59a792f7d
(xlwmenu_window_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34557
diff
changeset
|
1361 { |
f0a59a792f7d
(xlwmenu_window_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34557
diff
changeset
|
1362 XlwMenuWidget mw = (XlwMenuWidget) w; |
f0a59a792f7d
(xlwmenu_window_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34557
diff
changeset
|
1363 int i; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48929
diff
changeset
|
1364 |
37524
f0a59a792f7d
(xlwmenu_window_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34557
diff
changeset
|
1365 for (i = 0; i < mw->menu.windows_length; ++i) |
f0a59a792f7d
(xlwmenu_window_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34557
diff
changeset
|
1366 if (window == mw->menu.windows[i].window) |
f0a59a792f7d
(xlwmenu_window_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34557
diff
changeset
|
1367 break; |
f0a59a792f7d
(xlwmenu_window_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34557
diff
changeset
|
1368 |
f0a59a792f7d
(xlwmenu_window_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34557
diff
changeset
|
1369 return i < mw->menu.windows_length; |
f0a59a792f7d
(xlwmenu_window_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34557
diff
changeset
|
1370 } |
f0a59a792f7d
(xlwmenu_window_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
34557
diff
changeset
|
1371 |
5626 | 1372 /* Make the window fit in the screen */ |
1373 static void | |
109173
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
1374 fit_to_screen (XlwMenuWidget mw, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
1375 window_state *ws, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
1376 window_state *previous_ws, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
1377 Boolean horizontal_p) |
5626 | 1378 { |
11461
65c12e57f119
(size_menu): Make height and label_width unsigned.
Richard M. Stallman <rms@gnu.org>
parents:
9746
diff
changeset
|
1379 unsigned int screen_width = WidthOfScreen (XtScreen (mw)); |
65c12e57f119
(size_menu): Make height and label_width unsigned.
Richard M. Stallman <rms@gnu.org>
parents:
9746
diff
changeset
|
1380 unsigned int screen_height = HeightOfScreen (XtScreen (mw)); |
16917
5aabcff9fdd3
(enriched-translations): Add top' and choice' everywhere so that *
Richard M. Stallman <rms@gnu.org>
parents:
15742
diff
changeset
|
1381 /* 1 if we are unable to avoid an overlap between |
5aabcff9fdd3
(enriched-translations): Add top' and choice' everywhere so that *
Richard M. Stallman <rms@gnu.org>
parents:
15742
diff
changeset
|
1382 this menu and the parent menu in the X dimension. */ |
5aabcff9fdd3
(enriched-translations): Add top' and choice' everywhere so that *
Richard M. Stallman <rms@gnu.org>
parents:
15742
diff
changeset
|
1383 int horizontal_overlap = 0; |
5626 | 1384 |
1385 if (ws->x < 0) | |
1386 ws->x = 0; | |
1387 else if (ws->x + ws->width > screen_width) | |
1388 { | |
1389 if (!horizontal_p) | |
31370 | 1390 /* The addition of shadow-thickness for a sub-menu's position is |
1391 to reflect a similar adjustment when the menu is displayed to | |
1392 the right of the invoking menu-item; it makes the sub-menu | |
1393 look more `attached' to the menu-item. */ | |
1394 ws->x = previous_ws->x - ws->width + mw->menu.shadow_thickness; | |
5626 | 1395 else |
1396 ws->x = screen_width - ws->width; | |
9395
d954daf0a213
(fit_to_screen): Don't put the menu off the left or top.
Richard M. Stallman <rms@gnu.org>
parents:
9227
diff
changeset
|
1397 if (ws->x < 0) |
16917
5aabcff9fdd3
(enriched-translations): Add top' and choice' everywhere so that *
Richard M. Stallman <rms@gnu.org>
parents:
15742
diff
changeset
|
1398 { |
5aabcff9fdd3
(enriched-translations): Add top' and choice' everywhere so that *
Richard M. Stallman <rms@gnu.org>
parents:
15742
diff
changeset
|
1399 ws->x = 0; |
5aabcff9fdd3
(enriched-translations): Add top' and choice' everywhere so that *
Richard M. Stallman <rms@gnu.org>
parents:
15742
diff
changeset
|
1400 horizontal_overlap = 1; |
5aabcff9fdd3
(enriched-translations): Add top' and choice' everywhere so that *
Richard M. Stallman <rms@gnu.org>
parents:
15742
diff
changeset
|
1401 } |
5626 | 1402 } |
16917
5aabcff9fdd3
(enriched-translations): Add top' and choice' everywhere so that *
Richard M. Stallman <rms@gnu.org>
parents:
15742
diff
changeset
|
1403 /* If we overlap in X, try to avoid overlap in Y. */ |
5aabcff9fdd3
(enriched-translations): Add top' and choice' everywhere so that *
Richard M. Stallman <rms@gnu.org>
parents:
15742
diff
changeset
|
1404 if (horizontal_overlap |
5aabcff9fdd3
(enriched-translations): Add top' and choice' everywhere so that *
Richard M. Stallman <rms@gnu.org>
parents:
15742
diff
changeset
|
1405 && ws->y < previous_ws->y + previous_ws->height |
5aabcff9fdd3
(enriched-translations): Add top' and choice' everywhere so that *
Richard M. Stallman <rms@gnu.org>
parents:
15742
diff
changeset
|
1406 && previous_ws->y < ws->y + ws->height) |
5aabcff9fdd3
(enriched-translations): Add top' and choice' everywhere so that *
Richard M. Stallman <rms@gnu.org>
parents:
15742
diff
changeset
|
1407 { |
5aabcff9fdd3
(enriched-translations): Add top' and choice' everywhere so that *
Richard M. Stallman <rms@gnu.org>
parents:
15742
diff
changeset
|
1408 /* Put this menu right below or right above PREVIOUS_WS |
5aabcff9fdd3
(enriched-translations): Add top' and choice' everywhere so that *
Richard M. Stallman <rms@gnu.org>
parents:
15742
diff
changeset
|
1409 if there's room. */ |
5aabcff9fdd3
(enriched-translations): Add top' and choice' everywhere so that *
Richard M. Stallman <rms@gnu.org>
parents:
15742
diff
changeset
|
1410 if (previous_ws->y + previous_ws->height + ws->height < screen_height) |
5aabcff9fdd3
(enriched-translations): Add top' and choice' everywhere so that *
Richard M. Stallman <rms@gnu.org>
parents:
15742
diff
changeset
|
1411 ws->y = previous_ws->y + previous_ws->height; |
5aabcff9fdd3
(enriched-translations): Add top' and choice' everywhere so that *
Richard M. Stallman <rms@gnu.org>
parents:
15742
diff
changeset
|
1412 else if (previous_ws->y - ws->height > 0) |
5aabcff9fdd3
(enriched-translations): Add top' and choice' everywhere so that *
Richard M. Stallman <rms@gnu.org>
parents:
15742
diff
changeset
|
1413 ws->y = previous_ws->y - ws->height; |
5aabcff9fdd3
(enriched-translations): Add top' and choice' everywhere so that *
Richard M. Stallman <rms@gnu.org>
parents:
15742
diff
changeset
|
1414 } |
5aabcff9fdd3
(enriched-translations): Add top' and choice' everywhere so that *
Richard M. Stallman <rms@gnu.org>
parents:
15742
diff
changeset
|
1415 |
5626 | 1416 if (ws->y < 0) |
1417 ws->y = 0; | |
1418 else if (ws->y + ws->height > screen_height) | |
1419 { | |
1420 if (horizontal_p) | |
1421 ws->y = previous_ws->y - ws->height; | |
1422 else | |
1423 ws->y = screen_height - ws->height; | |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
1424 if (ws->y < 0) |
9395
d954daf0a213
(fit_to_screen): Don't put the menu off the left or top.
Richard M. Stallman <rms@gnu.org>
parents:
9227
diff
changeset
|
1425 ws->y = 0; |
5626 | 1426 } |
1427 } | |
1428 | |
107886
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1429 static void |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1430 create_pixmap_for_menu (window_state* ws, XlwMenuWidget mw) |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1431 { |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1432 if (ws->pixmap != None) |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1433 { |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1434 XFreePixmap (XtDisplay (ws->w), ws->pixmap); |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1435 ws->pixmap = None; |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1436 } |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1437 ws->pixmap = XCreatePixmap (XtDisplay (ws->w), ws->window, |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1438 ws->width, ws->height, |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1439 DefaultDepthOfScreen (XtScreen (ws->w))); |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1440 #ifdef HAVE_XFT |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1441 if (ws->xft_draw) |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1442 XftDrawDestroy (ws->xft_draw); |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1443 if (mw->menu.xft_font) |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1444 { |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1445 int screen = XScreenNumberOfScreen (mw->core.screen); |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1446 ws->xft_draw = XftDrawCreate (XtDisplay (ws->w), |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1447 ws->pixmap, |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1448 DefaultVisual (XtDisplay (ws->w), screen), |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1449 mw->core.colormap); |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1450 } |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1451 else |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1452 ws->xft_draw = 0; |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1453 #endif |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1454 } |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1455 |
5626 | 1456 /* Updates old_stack from new_stack and redisplays. */ |
1457 static void | |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1458 remap_menubar (XlwMenuWidget mw) |
5626 | 1459 { |
1460 int i; | |
1461 int last_same; | |
1462 XPoint selection_position; | |
1463 int old_depth = mw->menu.old_depth; | |
1464 int new_depth = mw->menu.new_depth; | |
1465 widget_value** old_stack; | |
1466 widget_value** new_stack; | |
1467 window_state* windows; | |
1468 widget_value* old_selection; | |
1469 widget_value* new_selection; | |
1470 | |
1471 /* Check that enough windows and old_stack are ready. */ | |
1472 make_windows_if_needed (mw, new_depth); | |
1473 make_old_stack_space (mw, new_depth); | |
1474 windows = mw->menu.windows; | |
1475 old_stack = mw->menu.old_stack; | |
1476 new_stack = mw->menu.new_stack; | |
1477 | |
1478 /* compute the last identical different entry */ | |
1479 for (i = 1; i < old_depth && i < new_depth; i++) | |
1480 if (old_stack [i] != new_stack [i]) | |
1481 break; | |
1482 last_same = i - 1; | |
1483 | |
1484 /* Memorize the previously selected item to be able to refresh it */ | |
1485 old_selection = last_same + 1 < old_depth ? old_stack [last_same + 1] : NULL; | |
1486 if (old_selection && !old_selection->enabled) | |
1487 old_selection = NULL; | |
1488 new_selection = last_same + 1 < new_depth ? new_stack [last_same + 1] : NULL; | |
1489 if (new_selection && !new_selection->enabled) | |
1490 new_selection = NULL; | |
1491 | |
27338
58f8eee82765
(xlwMenuResources): All XtNhighlightCallback.
Gerd Moellmann <gerd@gnu.org>
parents:
26087
diff
changeset
|
1492 /* Call callback when the hightlighted item changes. */ |
58f8eee82765
(xlwMenuResources): All XtNhighlightCallback.
Gerd Moellmann <gerd@gnu.org>
parents:
26087
diff
changeset
|
1493 if (old_selection || new_selection) |
58f8eee82765
(xlwMenuResources): All XtNhighlightCallback.
Gerd Moellmann <gerd@gnu.org>
parents:
26087
diff
changeset
|
1494 XtCallCallbackList ((Widget)mw, mw->menu.highlight, |
58f8eee82765
(xlwMenuResources): All XtNhighlightCallback.
Gerd Moellmann <gerd@gnu.org>
parents:
26087
diff
changeset
|
1495 (XtPointer) new_selection); |
58f8eee82765
(xlwMenuResources): All XtNhighlightCallback.
Gerd Moellmann <gerd@gnu.org>
parents:
26087
diff
changeset
|
1496 |
5626 | 1497 /* updates old_state from new_state. It has to be done now because |
1498 display_menu (called below) uses the old_stack to know what to display. */ | |
1499 for (i = last_same + 1; i < new_depth; i++) | |
107886
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1500 { |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1501 XtPopdown (mw->menu.windows [i].w); |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1502 old_stack [i] = new_stack [i]; |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1503 } |
5626 | 1504 mw->menu.old_depth = new_depth; |
1505 | |
14018 | 1506 /* refresh the last selection */ |
5626 | 1507 selection_position.x = 0; |
1508 selection_position.y = 0; | |
1509 display_menu (mw, last_same, new_selection == old_selection, | |
107886
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1510 &selection_position, NULL, NULL); |
5626 | 1511 |
16917
5aabcff9fdd3
(enriched-translations): Add top' and choice' everywhere so that *
Richard M. Stallman <rms@gnu.org>
parents:
15742
diff
changeset
|
1512 /* Now place the new menus. */ |
5aabcff9fdd3
(enriched-translations): Add top' and choice' everywhere so that *
Richard M. Stallman <rms@gnu.org>
parents:
15742
diff
changeset
|
1513 for (i = last_same + 1; i < new_depth && new_stack[i]->contents; i++) |
5626 | 1514 { |
16917
5aabcff9fdd3
(enriched-translations): Add top' and choice' everywhere so that *
Richard M. Stallman <rms@gnu.org>
parents:
15742
diff
changeset
|
1515 window_state *previous_ws = &windows[i - 1]; |
5aabcff9fdd3
(enriched-translations): Add top' and choice' everywhere so that *
Richard M. Stallman <rms@gnu.org>
parents:
15742
diff
changeset
|
1516 window_state *ws = &windows[i]; |
5626 | 1517 |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
1518 ws->x = (previous_ws->x + selection_position.x |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
1519 + mw->menu.shadow_thickness); |
31370 | 1520 if (mw->menu.horizontal && i == 1) |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
1521 ws->x += mw->menu.margin; |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
1522 |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
1523 #if 0 |
5626 | 1524 if (!mw->menu.horizontal || i > 1) |
1525 ws->x += mw->menu.shadow_thickness; | |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
1526 #endif |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
1527 |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
1528 ws->y = (previous_ws->y + selection_position.y |
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
1529 + mw->menu.shadow_thickness); |
31370 | 1530 if (mw->menu.horizontal && i == 1) |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
1531 ws->y += mw->menu.margin; |
5626 | 1532 |
1533 size_menu (mw, i); | |
1534 | |
1535 fit_to_screen (mw, ws, previous_ws, mw->menu.horizontal && i == 1); | |
1536 | |
107886
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1537 XtVaSetValues (ws->w, XtNwidth, ws->width, XtNheight, ws->height, |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1538 XtNx, ws->x, XtNy, ws->y, NULL); |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1539 create_pixmap_for_menu (ws, mw); |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1540 XtPopup (ws->w, XtGrabNone); |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1541 display_menu (mw, i, False, &selection_position, NULL, NULL); |
5626 | 1542 } |
1543 | |
1544 /* unmap the menus that popped down */ | |
1545 for (i = new_depth - 1; i < old_depth; i++) | |
48929
d81c005163cb
(pop_new_stack_if_no_contents): Do nothing if new_depth is 1.
Richard M. Stallman <rms@gnu.org>
parents:
48479
diff
changeset
|
1546 if (i >= new_depth || (i > 0 && !new_stack[i]->contents)) |
107886
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1547 XtPopdown (windows[i].w); |
5626 | 1548 } |
1549 | |
1550 static Boolean | |
109173
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
1551 motion_event_is_in_menu (XlwMenuWidget mw, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
1552 XMotionEvent *ev, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
1553 int level, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
1554 XPoint *relative_pos) |
5626 | 1555 { |
1556 window_state* ws = &mw->menu.windows [level]; | |
19960
38172783650b
(motion_event_is_in_menu): Extend the left and
Richard M. Stallman <rms@gnu.org>
parents:
18993
diff
changeset
|
1557 int shadow = level == 0 ? 0 : mw->menu.shadow_thickness; |
38172783650b
(motion_event_is_in_menu): Extend the left and
Richard M. Stallman <rms@gnu.org>
parents:
18993
diff
changeset
|
1558 int x = ws->x + shadow; |
38172783650b
(motion_event_is_in_menu): Extend the left and
Richard M. Stallman <rms@gnu.org>
parents:
18993
diff
changeset
|
1559 int y = ws->y + shadow; |
5626 | 1560 relative_pos->x = ev->x_root - x; |
1561 relative_pos->y = ev->y_root - y; | |
19960
38172783650b
(motion_event_is_in_menu): Extend the left and
Richard M. Stallman <rms@gnu.org>
parents:
18993
diff
changeset
|
1562 return (x - shadow < ev->x_root && ev->x_root < x + ws->width |
75018
d263801b3ca8
(xlwMenuResources): Add XtNleaveCallback, XtNenterCallback.
Jan Djärv <jan.h.d@swipnet.se>
parents:
70850
diff
changeset
|
1563 && y - shadow < ev->y_root && ev->y_root < y + ws->height); |
5626 | 1564 } |
1565 | |
1566 static Boolean | |
109173
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
1567 map_event_to_widget_value (XlwMenuWidget mw, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
1568 XMotionEvent *ev, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
1569 widget_value **val, |
33021b778d4d
Change function definition from K&R to prototype. Fix prototype warnings.
Jan D <jan.h.d@swipnet.se>
parents:
109165
diff
changeset
|
1570 int *level) |
5626 | 1571 { |
1572 int i; | |
1573 XPoint relative_pos; | |
1574 window_state* ws; | |
75018
d263801b3ca8
(xlwMenuResources): Add XtNleaveCallback, XtNenterCallback.
Jan Djärv <jan.h.d@swipnet.se>
parents:
70850
diff
changeset
|
1575 int inside = 0; |
5626 | 1576 |
1577 *val = NULL; | |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
1578 |
5626 | 1579 /* Find the window */ |
1580 for (i = mw->menu.old_depth - 1; i >= 0; i--) | |
1581 { | |
1582 ws = &mw->menu.windows [i]; | |
1583 if (ws && motion_event_is_in_menu (mw, ev, i, &relative_pos)) | |
1584 { | |
75018
d263801b3ca8
(xlwMenuResources): Add XtNleaveCallback, XtNenterCallback.
Jan Djärv <jan.h.d@swipnet.se>
parents:
70850
diff
changeset
|
1585 inside = 1; |
107886
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1586 display_menu (mw, i, True, NULL, &relative_pos, val); |
5626 | 1587 |
1588 if (*val) | |
1589 { | |
1590 *level = i + 1; | |
1591 return True; | |
1592 } | |
1593 } | |
1594 } | |
75018
d263801b3ca8
(xlwMenuResources): Add XtNleaveCallback, XtNenterCallback.
Jan Djärv <jan.h.d@swipnet.se>
parents:
70850
diff
changeset
|
1595 |
d263801b3ca8
(xlwMenuResources): Add XtNleaveCallback, XtNenterCallback.
Jan Djärv <jan.h.d@swipnet.se>
parents:
70850
diff
changeset
|
1596 if (!inside) |
d263801b3ca8
(xlwMenuResources): Add XtNleaveCallback, XtNenterCallback.
Jan Djärv <jan.h.d@swipnet.se>
parents:
70850
diff
changeset
|
1597 { |
d263801b3ca8
(xlwMenuResources): Add XtNleaveCallback, XtNenterCallback.
Jan Djärv <jan.h.d@swipnet.se>
parents:
70850
diff
changeset
|
1598 if (mw->menu.inside_entry != NULL) |
d263801b3ca8
(xlwMenuResources): Add XtNleaveCallback, XtNenterCallback.
Jan Djärv <jan.h.d@swipnet.se>
parents:
70850
diff
changeset
|
1599 XtCallCallbackList ((Widget)mw, mw->menu.leave, |
d263801b3ca8
(xlwMenuResources): Add XtNleaveCallback, XtNenterCallback.
Jan Djärv <jan.h.d@swipnet.se>
parents:
70850
diff
changeset
|
1600 (XtPointer) mw->menu.inside_entry); |
d263801b3ca8
(xlwMenuResources): Add XtNleaveCallback, XtNenterCallback.
Jan Djärv <jan.h.d@swipnet.se>
parents:
70850
diff
changeset
|
1601 mw->menu.inside_entry = NULL; |
d263801b3ca8
(xlwMenuResources): Add XtNleaveCallback, XtNenterCallback.
Jan Djärv <jan.h.d@swipnet.se>
parents:
70850
diff
changeset
|
1602 } |
d263801b3ca8
(xlwMenuResources): Add XtNleaveCallback, XtNenterCallback.
Jan Djärv <jan.h.d@swipnet.se>
parents:
70850
diff
changeset
|
1603 |
5626 | 1604 return False; |
1605 } | |
1606 | |
1607 /* Procedures */ | |
1608 static void | |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1609 make_drawing_gcs (XlwMenuWidget mw) |
5626 | 1610 { |
1611 XGCValues xgcv; | |
45152
0e9984418269
(make_drawing_gcs): The scaling factor passed to
Pavel Janík <Pavel@Janik.cz>
parents:
45147
diff
changeset
|
1612 float scale; |
61209
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
1613 XtGCMask mask = GCForeground | GCBackground; |
5626 | 1614 |
61209
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
1615 #ifdef HAVE_X_I18N |
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
1616 if (!mw->menu.fontSet) |
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
1617 { |
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
1618 xgcv.font = mw->menu.font->fid; |
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
1619 mask |= GCFont; |
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
1620 } |
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
1621 #else |
5626 | 1622 xgcv.font = mw->menu.font->fid; |
61209
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
1623 mask |= GCFont; |
60698
3e557e11645e
Add support for I18N to Lucid menus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59100
diff
changeset
|
1624 #endif |
5626 | 1625 xgcv.foreground = mw->menu.foreground; |
1626 xgcv.background = mw->core.background_pixel; | |
61209
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
1627 mw->menu.foreground_gc = XtGetGC ((Widget)mw, mask, &xgcv); |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
1628 |
5626 | 1629 xgcv.foreground = mw->menu.button_foreground; |
61209
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
1630 mw->menu.button_gc = XtGetGC ((Widget)mw, mask, &xgcv); |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
1631 |
5626 | 1632 xgcv.background = mw->core.background_pixel; |
45147
e10cf8f440ae
(xlwMenuResources): New resource.
Pavel Janík <Pavel@Janik.cz>
parents:
44966
diff
changeset
|
1633 |
e10cf8f440ae
(xlwMenuResources): New resource.
Pavel Janík <Pavel@Janik.cz>
parents:
44966
diff
changeset
|
1634 #define BRIGHTNESS(color) (((color) & 0xff) + (((color) >> 8) & 0xff) + (((color) >> 16) & 0xff)) |
e10cf8f440ae
(xlwMenuResources): New resource.
Pavel Janík <Pavel@Janik.cz>
parents:
44966
diff
changeset
|
1635 |
e10cf8f440ae
(xlwMenuResources): New resource.
Pavel Janík <Pavel@Janik.cz>
parents:
44966
diff
changeset
|
1636 /* Allocate color for disabled menu-items. */ |
45152
0e9984418269
(make_drawing_gcs): The scaling factor passed to
Pavel Janík <Pavel@Janik.cz>
parents:
45147
diff
changeset
|
1637 mw->menu.disabled_foreground = mw->menu.foreground; |
45147
e10cf8f440ae
(xlwMenuResources): New resource.
Pavel Janík <Pavel@Janik.cz>
parents:
44966
diff
changeset
|
1638 if (BRIGHTNESS(mw->menu.foreground) < BRIGHTNESS(mw->core.background_pixel)) |
45152
0e9984418269
(make_drawing_gcs): The scaling factor passed to
Pavel Janík <Pavel@Janik.cz>
parents:
45147
diff
changeset
|
1639 scale = 2.3; |
45147
e10cf8f440ae
(xlwMenuResources): New resource.
Pavel Janík <Pavel@Janik.cz>
parents:
44966
diff
changeset
|
1640 else |
45152
0e9984418269
(make_drawing_gcs): The scaling factor passed to
Pavel Janík <Pavel@Janik.cz>
parents:
45147
diff
changeset
|
1641 scale = 0.55; |
45147
e10cf8f440ae
(xlwMenuResources): New resource.
Pavel Janík <Pavel@Janik.cz>
parents:
44966
diff
changeset
|
1642 |
e10cf8f440ae
(xlwMenuResources): New resource.
Pavel Janík <Pavel@Janik.cz>
parents:
44966
diff
changeset
|
1643 x_alloc_lighter_color_for_widget ((Widget) mw, XtDisplay ((Widget) mw), |
e10cf8f440ae
(xlwMenuResources): New resource.
Pavel Janík <Pavel@Janik.cz>
parents:
44966
diff
changeset
|
1644 mw->core.colormap, |
45152
0e9984418269
(make_drawing_gcs): The scaling factor passed to
Pavel Janík <Pavel@Janik.cz>
parents:
45147
diff
changeset
|
1645 &mw->menu.disabled_foreground, |
0e9984418269
(make_drawing_gcs): The scaling factor passed to
Pavel Janík <Pavel@Janik.cz>
parents:
45147
diff
changeset
|
1646 scale, |
45147
e10cf8f440ae
(xlwMenuResources): New resource.
Pavel Janík <Pavel@Janik.cz>
parents:
44966
diff
changeset
|
1647 0x8000); |
e10cf8f440ae
(xlwMenuResources): New resource.
Pavel Janík <Pavel@Janik.cz>
parents:
44966
diff
changeset
|
1648 |
e10cf8f440ae
(xlwMenuResources): New resource.
Pavel Janík <Pavel@Janik.cz>
parents:
44966
diff
changeset
|
1649 if (mw->menu.foreground == mw->menu.disabled_foreground |
e10cf8f440ae
(xlwMenuResources): New resource.
Pavel Janík <Pavel@Janik.cz>
parents:
44966
diff
changeset
|
1650 || mw->core.background_pixel == mw->menu.disabled_foreground) |
e10cf8f440ae
(xlwMenuResources): New resource.
Pavel Janík <Pavel@Janik.cz>
parents:
44966
diff
changeset
|
1651 { |
e10cf8f440ae
(xlwMenuResources): New resource.
Pavel Janík <Pavel@Janik.cz>
parents:
44966
diff
changeset
|
1652 /* Too few colors, use stipple. */ |
e10cf8f440ae
(xlwMenuResources): New resource.
Pavel Janík <Pavel@Janik.cz>
parents:
44966
diff
changeset
|
1653 xgcv.foreground = mw->menu.foreground; |
e10cf8f440ae
(xlwMenuResources): New resource.
Pavel Janík <Pavel@Janik.cz>
parents:
44966
diff
changeset
|
1654 xgcv.fill_style = FillStippled; |
e10cf8f440ae
(xlwMenuResources): New resource.
Pavel Janík <Pavel@Janik.cz>
parents:
44966
diff
changeset
|
1655 xgcv.stipple = mw->menu.gray_pixmap; |
61209
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
1656 mw->menu.disabled_gc = XtGetGC ((Widget)mw, mask |
60698
3e557e11645e
Add support for I18N to Lucid menus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59100
diff
changeset
|
1657 | GCFillStyle | GCStipple, &xgcv); |
45147
e10cf8f440ae
(xlwMenuResources): New resource.
Pavel Janík <Pavel@Janik.cz>
parents:
44966
diff
changeset
|
1658 } |
e10cf8f440ae
(xlwMenuResources): New resource.
Pavel Janík <Pavel@Janik.cz>
parents:
44966
diff
changeset
|
1659 else |
e10cf8f440ae
(xlwMenuResources): New resource.
Pavel Janík <Pavel@Janik.cz>
parents:
44966
diff
changeset
|
1660 { |
e10cf8f440ae
(xlwMenuResources): New resource.
Pavel Janík <Pavel@Janik.cz>
parents:
44966
diff
changeset
|
1661 /* Many colors available, use disabled pixel. */ |
e10cf8f440ae
(xlwMenuResources): New resource.
Pavel Janík <Pavel@Janik.cz>
parents:
44966
diff
changeset
|
1662 xgcv.foreground = mw->menu.disabled_foreground; |
61209
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
1663 mw->menu.disabled_gc = XtGetGC ((Widget)mw, mask, &xgcv); |
45147
e10cf8f440ae
(xlwMenuResources): New resource.
Pavel Janík <Pavel@Janik.cz>
parents:
44966
diff
changeset
|
1664 } |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
1665 |
5626 | 1666 xgcv.foreground = mw->menu.button_foreground; |
1667 xgcv.background = mw->core.background_pixel; | |
1668 xgcv.fill_style = FillStippled; | |
1669 xgcv.stipple = mw->menu.gray_pixmap; | |
61209
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
1670 mw->menu.inactive_button_gc = XtGetGC ((Widget)mw, mask |
60698
3e557e11645e
Add support for I18N to Lucid menus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59100
diff
changeset
|
1671 | GCFillStyle | GCStipple, &xgcv); |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
1672 |
5626 | 1673 xgcv.foreground = mw->core.background_pixel; |
1674 xgcv.background = mw->menu.foreground; | |
61209
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
1675 mw->menu.background_gc = XtGetGC ((Widget)mw, mask, &xgcv); |
5626 | 1676 } |
1677 | |
1678 static void | |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1679 release_drawing_gcs (XlwMenuWidget mw) |
5626 | 1680 { |
1681 XtReleaseGC ((Widget) mw, mw->menu.foreground_gc); | |
1682 XtReleaseGC ((Widget) mw, mw->menu.button_gc); | |
45147
e10cf8f440ae
(xlwMenuResources): New resource.
Pavel Janík <Pavel@Janik.cz>
parents:
44966
diff
changeset
|
1683 XtReleaseGC ((Widget) mw, mw->menu.disabled_gc); |
5626 | 1684 XtReleaseGC ((Widget) mw, mw->menu.inactive_button_gc); |
1685 XtReleaseGC ((Widget) mw, mw->menu.background_gc); | |
1686 /* let's get some segvs if we try to use these... */ | |
1687 mw->menu.foreground_gc = (GC) -1; | |
1688 mw->menu.button_gc = (GC) -1; | |
45147
e10cf8f440ae
(xlwMenuResources): New resource.
Pavel Janík <Pavel@Janik.cz>
parents:
44966
diff
changeset
|
1689 mw->menu.disabled_gc = (GC) -1; |
5626 | 1690 mw->menu.inactive_button_gc = (GC) -1; |
1691 mw->menu.background_gc = (GC) -1; | |
1692 } | |
1693 | |
1694 #define MINL(x,y) ((((unsigned long) (x)) < ((unsigned long) (y))) \ | |
1695 ? ((unsigned long) (x)) : ((unsigned long) (y))) | |
1696 | |
1697 static void | |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1698 make_shadow_gcs (XlwMenuWidget mw) |
5626 | 1699 { |
1700 XGCValues xgcv; | |
1701 unsigned long pm = 0; | |
1702 Display *dpy = XtDisplay ((Widget) mw); | |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
1703 Screen *screen = XtScreen ((Widget) mw); |
27988
817a3a4058a0
(make_shadow_gcs): Use the widget's colormap instead
Gerd Moellmann <gerd@gnu.org>
parents:
27338
diff
changeset
|
1704 Colormap cmap = mw->core.colormap; |
5626 | 1705 XColor topc, botc; |
1706 int top_frobbed = 0, bottom_frobbed = 0; | |
1707 | |
29700
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1708 mw->menu.free_top_shadow_color_p = 0; |
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1709 mw->menu.free_bottom_shadow_color_p = 0; |
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1710 |
5626 | 1711 if (mw->menu.top_shadow_color == -1) |
1712 mw->menu.top_shadow_color = mw->core.background_pixel; | |
29700
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1713 else |
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1714 mw->menu.top_shadow_color = mw->menu.top_shadow_color; |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
1715 |
5626 | 1716 if (mw->menu.bottom_shadow_color == -1) |
1717 mw->menu.bottom_shadow_color = mw->menu.foreground; | |
29700
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1718 else |
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1719 mw->menu.bottom_shadow_color = mw->menu.bottom_shadow_color; |
5626 | 1720 |
1721 if (mw->menu.top_shadow_color == mw->core.background_pixel || | |
1722 mw->menu.top_shadow_color == mw->menu.foreground) | |
1723 { | |
1724 topc.pixel = mw->core.background_pixel; | |
31341
1c5d68acbded
(x_alloc_lighter_color_for_widget):
Miles Bader <miles@gnu.org>
parents:
31287
diff
changeset
|
1725 #ifdef emacs |
1c5d68acbded
(x_alloc_lighter_color_for_widget):
Miles Bader <miles@gnu.org>
parents:
31287
diff
changeset
|
1726 if (x_alloc_lighter_color_for_widget ((Widget) mw, dpy, cmap, |
1c5d68acbded
(x_alloc_lighter_color_for_widget):
Miles Bader <miles@gnu.org>
parents:
31287
diff
changeset
|
1727 &topc.pixel, |
1c5d68acbded
(x_alloc_lighter_color_for_widget):
Miles Bader <miles@gnu.org>
parents:
31287
diff
changeset
|
1728 1.2, 0x8000)) |
1c5d68acbded
(x_alloc_lighter_color_for_widget):
Miles Bader <miles@gnu.org>
parents:
31287
diff
changeset
|
1729 #else |
5626 | 1730 XQueryColor (dpy, cmap, &topc); |
1731 /* don't overflow/wrap! */ | |
1732 topc.red = MINL (65535, topc.red * 1.2); | |
1733 topc.green = MINL (65535, topc.green * 1.2); | |
1734 topc.blue = MINL (65535, topc.blue * 1.2); | |
1735 if (XAllocColor (dpy, cmap, &topc)) | |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
1736 #endif |
5626 | 1737 { |
1738 mw->menu.top_shadow_color = topc.pixel; | |
29700
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1739 mw->menu.free_top_shadow_color_p = 1; |
5626 | 1740 top_frobbed = 1; |
1741 } | |
1742 } | |
1743 if (mw->menu.bottom_shadow_color == mw->menu.foreground || | |
1744 mw->menu.bottom_shadow_color == mw->core.background_pixel) | |
1745 { | |
1746 botc.pixel = mw->core.background_pixel; | |
31341
1c5d68acbded
(x_alloc_lighter_color_for_widget):
Miles Bader <miles@gnu.org>
parents:
31287
diff
changeset
|
1747 #ifdef emacs |
1c5d68acbded
(x_alloc_lighter_color_for_widget):
Miles Bader <miles@gnu.org>
parents:
31287
diff
changeset
|
1748 if (x_alloc_lighter_color_for_widget ((Widget) mw, dpy, cmap, |
1c5d68acbded
(x_alloc_lighter_color_for_widget):
Miles Bader <miles@gnu.org>
parents:
31287
diff
changeset
|
1749 &botc.pixel, |
1c5d68acbded
(x_alloc_lighter_color_for_widget):
Miles Bader <miles@gnu.org>
parents:
31287
diff
changeset
|
1750 0.6, 0x4000)) |
1c5d68acbded
(x_alloc_lighter_color_for_widget):
Miles Bader <miles@gnu.org>
parents:
31287
diff
changeset
|
1751 #else |
5626 | 1752 XQueryColor (dpy, cmap, &botc); |
1753 botc.red *= 0.6; | |
1754 botc.green *= 0.6; | |
1755 botc.blue *= 0.6; | |
1756 if (XAllocColor (dpy, cmap, &botc)) | |
25034
305d2ac394ae
(make_shadow_gcs) ]emacs]: Use x_alloc_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents:
19960
diff
changeset
|
1757 #endif |
5626 | 1758 { |
1759 mw->menu.bottom_shadow_color = botc.pixel; | |
29700
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1760 mw->menu.free_bottom_shadow_color_p = 1; |
5626 | 1761 bottom_frobbed = 1; |
1762 } | |
1763 } | |
1764 | |
1765 if (top_frobbed && bottom_frobbed) | |
1766 { | |
31341
1c5d68acbded
(x_alloc_lighter_color_for_widget):
Miles Bader <miles@gnu.org>
parents:
31287
diff
changeset
|
1767 if (topc.pixel == botc.pixel) |
5626 | 1768 { |
1769 if (botc.pixel == mw->menu.foreground) | |
29602
d13e7c93d265
(make_shadow_gcs): Free and copy colors so that
Gerd Moellmann <gerd@gnu.org>
parents:
29469
diff
changeset
|
1770 { |
29700
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1771 if (mw->menu.free_top_shadow_color_p) |
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1772 { |
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1773 x_free_dpy_colors (dpy, screen, cmap, |
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1774 &mw->menu.top_shadow_color, 1); |
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1775 mw->menu.free_top_shadow_color_p = 0; |
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1776 } |
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1777 mw->menu.top_shadow_color = mw->core.background_pixel; |
29602
d13e7c93d265
(make_shadow_gcs): Free and copy colors so that
Gerd Moellmann <gerd@gnu.org>
parents:
29469
diff
changeset
|
1778 } |
5626 | 1779 else |
29602
d13e7c93d265
(make_shadow_gcs): Free and copy colors so that
Gerd Moellmann <gerd@gnu.org>
parents:
29469
diff
changeset
|
1780 { |
29700
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1781 if (mw->menu.free_bottom_shadow_color_p) |
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1782 { |
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1783 x_free_dpy_colors (dpy, screen, cmap, |
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1784 &mw->menu.bottom_shadow_color, 1); |
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1785 mw->menu.free_bottom_shadow_color_p = 0; |
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1786 } |
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1787 mw->menu.bottom_shadow_color = mw->menu.foreground; |
29602
d13e7c93d265
(make_shadow_gcs): Free and copy colors so that
Gerd Moellmann <gerd@gnu.org>
parents:
29469
diff
changeset
|
1788 } |
5626 | 1789 } |
1790 } | |
1791 | |
1792 if (!mw->menu.top_shadow_pixmap && | |
1793 mw->menu.top_shadow_color == mw->core.background_pixel) | |
1794 { | |
1795 mw->menu.top_shadow_pixmap = mw->menu.gray_pixmap; | |
29700
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1796 if (mw->menu.free_top_shadow_color_p) |
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1797 { |
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1798 x_free_dpy_colors (dpy, screen, cmap, &mw->menu.top_shadow_color, 1); |
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1799 mw->menu.free_top_shadow_color_p = 0; |
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1800 } |
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1801 mw->menu.top_shadow_color = mw->menu.foreground; |
5626 | 1802 } |
1803 if (!mw->menu.bottom_shadow_pixmap && | |
1804 mw->menu.bottom_shadow_color == mw->core.background_pixel) | |
1805 { | |
1806 mw->menu.bottom_shadow_pixmap = mw->menu.gray_pixmap; | |
29700
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1807 if (mw->menu.free_bottom_shadow_color_p) |
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1808 { |
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1809 x_free_dpy_colors (dpy, screen, cmap, |
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1810 &mw->menu.bottom_shadow_color, 1); |
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1811 mw->menu.free_bottom_shadow_color_p = 0; |
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1812 } |
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1813 mw->menu.bottom_shadow_color = mw->menu.foreground; |
5626 | 1814 } |
1815 | |
1816 xgcv.fill_style = FillStippled; | |
1817 xgcv.foreground = mw->menu.top_shadow_color; | |
1818 xgcv.stipple = mw->menu.top_shadow_pixmap; | |
1819 pm = (xgcv.stipple ? GCStipple|GCFillStyle : 0); | |
1820 mw->menu.shadow_top_gc = XtGetGC ((Widget)mw, GCForeground | pm, &xgcv); | |
1821 | |
1822 xgcv.foreground = mw->menu.bottom_shadow_color; | |
1823 xgcv.stipple = mw->menu.bottom_shadow_pixmap; | |
1824 pm = (xgcv.stipple ? GCStipple|GCFillStyle : 0); | |
1825 mw->menu.shadow_bottom_gc = XtGetGC ((Widget)mw, GCForeground | pm, &xgcv); | |
1826 } | |
1827 | |
1828 | |
1829 static void | |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1830 release_shadow_gcs (XlwMenuWidget mw) |
5626 | 1831 { |
29602
d13e7c93d265
(make_shadow_gcs): Free and copy colors so that
Gerd Moellmann <gerd@gnu.org>
parents:
29469
diff
changeset
|
1832 Display *dpy = XtDisplay ((Widget) mw); |
d13e7c93d265
(make_shadow_gcs): Free and copy colors so that
Gerd Moellmann <gerd@gnu.org>
parents:
29469
diff
changeset
|
1833 Screen *screen = XtScreen ((Widget) mw); |
d13e7c93d265
(make_shadow_gcs): Free and copy colors so that
Gerd Moellmann <gerd@gnu.org>
parents:
29469
diff
changeset
|
1834 Colormap cmap = mw->core.colormap; |
d13e7c93d265
(make_shadow_gcs): Free and copy colors so that
Gerd Moellmann <gerd@gnu.org>
parents:
29469
diff
changeset
|
1835 Pixel px[2]; |
29700
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1836 int i = 0; |
29602
d13e7c93d265
(make_shadow_gcs): Free and copy colors so that
Gerd Moellmann <gerd@gnu.org>
parents:
29469
diff
changeset
|
1837 |
29700
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1838 if (mw->menu.free_top_shadow_color_p) |
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1839 px[i++] = mw->menu.top_shadow_color; |
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1840 if (mw->menu.free_bottom_shadow_color_p) |
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1841 px[i++] = mw->menu.bottom_shadow_color; |
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1842 if (i > 0) |
1e88ad071a1a
(make_shadow_gcs): Set free_top_shadow_color_p
Gerd Moellmann <gerd@gnu.org>
parents:
29602
diff
changeset
|
1843 x_free_dpy_colors (dpy, screen, cmap, px, i); |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
1844 |
5626 | 1845 XtReleaseGC ((Widget) mw, mw->menu.shadow_top_gc); |
1846 XtReleaseGC ((Widget) mw, mw->menu.shadow_bottom_gc); | |
1847 } | |
1848 | |
107804
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1849 #ifdef HAVE_XFT |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1850 static int |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1851 openXftFont (XlwMenuWidget mw) |
107804
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1852 { |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1853 char *fname = mw->menu.faceName; |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1854 |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1855 mw->menu.xft_font = 0; |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1856 mw->menu.default_face = fname && strcmp (fname, DEFAULT_FACENAME) == 0; |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1857 |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1858 if (fname && strcmp (fname, "none") != 0) |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1859 { |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1860 int screen = XScreenNumberOfScreen (mw->core.screen); |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1861 int len = strlen (fname), i = len-1; |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1862 /* Try to convert Gtk-syntax (Sans 9) to Xft syntax Sans-9. */ |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1863 while (i > 0 && isdigit (fname[i])) |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1864 --i; |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1865 if (fname[i] == ' ') |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1866 { |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1867 fname = xstrdup (mw->menu.faceName); |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1868 fname[i] = '-'; |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1869 } |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1870 |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1871 mw->menu.xft_font = XftFontOpenName (XtDisplay (mw), screen, fname); |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1872 if (!mw->menu.xft_font) |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1873 { |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1874 fprintf (stderr, "Can't find font '%s'\n", fname); |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1875 mw->menu.xft_font = XftFontOpenName (XtDisplay (mw), screen, |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1876 DEFAULT_FACENAME); |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1877 } |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1878 } |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1879 |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1880 if (fname != mw->menu.faceName) free (fname); |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1881 |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1882 return mw->menu.xft_font != 0; |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1883 } |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1884 #endif |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1885 |
5626 | 1886 static void |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109123
diff
changeset
|
1887 XlwMenuInitialize (Widget request, Widget w, ArgList args, Cardinal *num_args) |
5626 | 1888 { |
1889 /* Get the GCs and the widget size */ | |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109123
diff
changeset
|
1890 XlwMenuWidget mw = (XlwMenuWidget) w; |
5626 | 1891 Window window = RootWindowOfScreen (DefaultScreenOfDisplay (XtDisplay (mw))); |
1892 Display* display = XtDisplay (mw); | |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
1893 |
8860 | 1894 #if 0 |
1895 widget_value *tem = (widget_value *) XtMalloc (sizeof (widget_value)); | |
1896 | |
1897 /* _XtCreate is freeing the object that was passed to us, | |
1898 so make a copy that we will actually keep. */ | |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109141
diff
changeset
|
1899 memcpy (tem, mw->menu.contents, sizeof (widget_value)); |
8860 | 1900 mw->menu.contents = tem; |
1901 #endif | |
1902 | |
107804
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1903 /* mw->menu.cursor = XCreateFontCursor (display, mw->menu.cursor_shape); */ |
5626 | 1904 mw->menu.cursor = mw->menu.cursor_shape; |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
1905 |
11885
c686f5539749
(XlwMenuInitialize): Cast XCreatePixmapFromBitmapData args.
Karl Heuer <kwzh@gnu.org>
parents:
11461
diff
changeset
|
1906 mw->menu.gray_pixmap |
30324
d4713daa6716
Don't include <X11/bitmaps/gray> because that
Gerd Moellmann <gerd@gnu.org>
parents:
29700
diff
changeset
|
1907 = XCreatePixmapFromBitmapData (display, window, gray_bitmap_bits, |
d4713daa6716
Don't include <X11/bitmaps/gray> because that
Gerd Moellmann <gerd@gnu.org>
parents:
29700
diff
changeset
|
1908 gray_bitmap_width, gray_bitmap_height, |
11885
c686f5539749
(XlwMenuInitialize): Cast XCreatePixmapFromBitmapData args.
Karl Heuer <kwzh@gnu.org>
parents:
11461
diff
changeset
|
1909 (unsigned long)1, (unsigned long)0, 1); |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
1910 |
107804
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1911 #ifdef HAVE_XFT |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1912 if (openXftFont (mw)) |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1913 ; |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1914 else |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1915 #endif |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1916 |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1917 if (!mw->menu.font) |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1918 { |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1919 if (!xlwmenu_default_font) |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1920 xlwmenu_default_font = XLoadQueryFont (display, "fixed"); |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1921 mw->menu.font = xlwmenu_default_font; |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1922 if (!mw->menu.font) |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1923 { |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1924 fprintf (stderr, "Menu font fixed not found, can't continue.\n"); |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1925 abort (); |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1926 } |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1927 } |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1928 |
61209
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
1929 #ifdef HAVE_X_I18N |
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
1930 if (mw->menu.fontSet) |
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
1931 mw->menu.font_extents = XExtentsOfFontSet (mw->menu.fontSet); |
60698
3e557e11645e
Add support for I18N to Lucid menus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59100
diff
changeset
|
1932 #endif |
3e557e11645e
Add support for I18N to Lucid menus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59100
diff
changeset
|
1933 |
5626 | 1934 make_drawing_gcs (mw); |
1935 make_shadow_gcs (mw); | |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
1936 |
5626 | 1937 mw->menu.popped_up = False; |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
1938 |
5626 | 1939 mw->menu.old_depth = 1; |
1940 mw->menu.old_stack = (widget_value**)XtMalloc (sizeof (widget_value*)); | |
1941 mw->menu.old_stack_length = 1; | |
1942 mw->menu.old_stack [0] = mw->menu.contents; | |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
1943 |
5626 | 1944 mw->menu.new_depth = 0; |
1945 mw->menu.new_stack = 0; | |
1946 mw->menu.new_stack_length = 0; | |
1947 push_new_stack (mw, mw->menu.contents); | |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
1948 |
5626 | 1949 mw->menu.windows = (window_state*)XtMalloc (sizeof (window_state)); |
1950 mw->menu.windows_length = 1; | |
1951 mw->menu.windows [0].x = 0; | |
1952 mw->menu.windows [0].y = 0; | |
1953 mw->menu.windows [0].width = 0; | |
1954 mw->menu.windows [0].height = 0; | |
107804
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1955 mw->menu.windows [0].max_rest_width = 0; |
107886
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1956 mw->menu.windows [0].pixmap = None; |
107804
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1957 #ifdef HAVE_XFT |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1958 mw->menu.windows [0].xft_draw = 0; |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1959 #endif |
5626 | 1960 size_menu (mw, 0); |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
1961 |
5626 | 1962 mw->core.width = mw->menu.windows [0].width; |
1963 mw->core.height = mw->menu.windows [0].height; | |
1964 } | |
1965 | |
1966 static void | |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1967 XlwMenuClassInitialize (void) |
5626 | 1968 { |
107804
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1969 xlwmenu_default_font = 0; |
5626 | 1970 } |
1971 | |
1972 static void | |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1973 XlwMenuRealize (Widget w, Mask *valueMask, XSetWindowAttributes *attributes) |
5626 | 1974 { |
1975 XlwMenuWidget mw = (XlwMenuWidget)w; | |
1976 XSetWindowAttributes xswa; | |
1977 int mask; | |
1978 | |
1979 (*xlwMenuWidgetClass->core_class.superclass->core_class.realize) | |
1980 (w, valueMask, attributes); | |
1981 | |
1982 xswa.save_under = True; | |
1983 xswa.cursor = mw->menu.cursor_shape; | |
1984 mask = CWSaveUnder | CWCursor; | |
83443
4d989ab8dad8
Install workaround for "X protocol error: BadCursor (invalid Cursor parameter) on protocol request 2"
Karoly Lorentey <lorentey@elte.hu>
parents:
65713
diff
changeset
|
1985 /* I sometimes get random BadCursor errors while creating the first |
4d989ab8dad8
Install workaround for "X protocol error: BadCursor (invalid Cursor parameter) on protocol request 2"
Karoly Lorentey <lorentey@elte.hu>
parents:
65713
diff
changeset
|
1986 frame on a display. I can not find their reason, but they are |
4d989ab8dad8
Install workaround for "X protocol error: BadCursor (invalid Cursor parameter) on protocol request 2"
Karoly Lorentey <lorentey@elte.hu>
parents:
65713
diff
changeset
|
1987 annoying so for now let's ignore any errors here. -- lorentey */ |
4d989ab8dad8
Install workaround for "X protocol error: BadCursor (invalid Cursor parameter) on protocol request 2"
Karoly Lorentey <lorentey@elte.hu>
parents:
65713
diff
changeset
|
1988 #ifdef emacs |
83528
a43b5a268ea1
Fix compilation error in lwlib/xlwmenu.c.
Karoly Lorentey <lorentey@elte.hu>
parents:
83527
diff
changeset
|
1989 x_catch_errors (XtDisplay (w)); |
83443
4d989ab8dad8
Install workaround for "X protocol error: BadCursor (invalid Cursor parameter) on protocol request 2"
Karoly Lorentey <lorentey@elte.hu>
parents:
65713
diff
changeset
|
1990 #endif |
5626 | 1991 XChangeWindowAttributes (XtDisplay (w), XtWindow (w), mask, &xswa); |
83443
4d989ab8dad8
Install workaround for "X protocol error: BadCursor (invalid Cursor parameter) on protocol request 2"
Karoly Lorentey <lorentey@elte.hu>
parents:
65713
diff
changeset
|
1992 #ifdef emacs |
83528
a43b5a268ea1
Fix compilation error in lwlib/xlwmenu.c.
Karoly Lorentey <lorentey@elte.hu>
parents:
83527
diff
changeset
|
1993 x_uncatch_errors (); |
83443
4d989ab8dad8
Install workaround for "X protocol error: BadCursor (invalid Cursor parameter) on protocol request 2"
Karoly Lorentey <lorentey@elte.hu>
parents:
65713
diff
changeset
|
1994 #endif |
5626 | 1995 |
107886
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
1996 mw->menu.windows [0].w = w; |
5626 | 1997 mw->menu.windows [0].window = XtWindow (w); |
1998 mw->menu.windows [0].x = w->core.x; | |
1999 mw->menu.windows [0].y = w->core.y; | |
2000 mw->menu.windows [0].width = w->core.width; | |
2001 mw->menu.windows [0].height = w->core.height; | |
107804
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2002 |
107888
32fc68b9d103
Set _NET_WM_WINDOW_TYPE in menus. Looks bad with compiz otherwise.
Jan D. <jan.h.d@swipnet.se>
parents:
107886
diff
changeset
|
2003 set_window_type (mw->menu.windows [0].w, mw); |
107886
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
2004 create_pixmap_for_menu (&mw->menu.windows [0], mw); |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
2005 |
107804
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2006 #ifdef HAVE_XFT |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2007 if (mw->menu.xft_font) |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2008 { |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2009 XColor colors[3]; |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2010 colors[0].pixel = mw->menu.xft_fg.pixel = mw->menu.foreground; |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2011 colors[1].pixel = mw->menu.xft_bg.pixel = mw->core.background_pixel; |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2012 colors[2].pixel = mw->menu.xft_disabled_fg.pixel |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2013 = mw->menu.disabled_foreground; |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2014 XQueryColors (XtDisplay (mw), mw->core.colormap, colors, 3); |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2015 mw->menu.xft_fg.color.alpha = 0xFFFF; |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2016 mw->menu.xft_fg.color.red = colors[0].red; |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2017 mw->menu.xft_fg.color.green = colors[0].green; |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2018 mw->menu.xft_fg.color.blue = colors[0].blue; |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2019 mw->menu.xft_bg.color.alpha = 0xFFFF; |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2020 mw->menu.xft_bg.color.red = colors[1].red; |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2021 mw->menu.xft_bg.color.green = colors[1].green; |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2022 mw->menu.xft_bg.color.blue = colors[1].blue; |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2023 mw->menu.xft_disabled_fg.color.alpha = 0xFFFF; |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2024 mw->menu.xft_disabled_fg.color.red = colors[2].red; |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2025 mw->menu.xft_disabled_fg.color.green = colors[2].green; |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2026 mw->menu.xft_disabled_fg.color.blue = colors[2].blue; |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2027 } |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2028 #endif |
5626 | 2029 } |
2030 | |
2031 /* Only the toplevel menubar/popup is a widget so it's the only one that | |
2032 receives expose events through Xt. So we repaint all the other panes | |
2033 when receiving an Expose event. */ | |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
2034 static void |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2035 XlwMenuRedisplay (Widget w, XEvent *ev, Region region) |
5626 | 2036 { |
2037 XlwMenuWidget mw = (XlwMenuWidget)w; | |
2038 | |
8860 | 2039 /* If we have a depth beyond 1, it's because a submenu was displayed. |
2040 If the submenu has been destroyed, set the depth back to 1. */ | |
2041 if (submenu_destroyed) | |
2042 { | |
2043 mw->menu.old_depth = 1; | |
2044 submenu_destroyed = 0; | |
2045 } | |
2046 | |
107886
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
2047 display_menu (mw, 0, False, NULL, NULL, NULL); |
5626 | 2048 } |
2049 | |
33714
f957a9063fb1
(xlwmenu_redisplay): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31963
diff
changeset
|
2050 |
f957a9063fb1
(xlwmenu_redisplay): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31963
diff
changeset
|
2051 /* Part of a hack to make the menu redisplay when a tooltip frame |
f957a9063fb1
(xlwmenu_redisplay): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31963
diff
changeset
|
2052 over a menu item is unmapped. */ |
f957a9063fb1
(xlwmenu_redisplay): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31963
diff
changeset
|
2053 |
f957a9063fb1
(xlwmenu_redisplay): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31963
diff
changeset
|
2054 void |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2055 xlwmenu_redisplay (Widget w) |
33714
f957a9063fb1
(xlwmenu_redisplay): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31963
diff
changeset
|
2056 { |
f957a9063fb1
(xlwmenu_redisplay): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31963
diff
changeset
|
2057 XlwMenuRedisplay (w, NULL, None); |
f957a9063fb1
(xlwmenu_redisplay): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31963
diff
changeset
|
2058 } |
f957a9063fb1
(xlwmenu_redisplay): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31963
diff
changeset
|
2059 |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
2060 static void |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2061 XlwMenuDestroy (Widget w) |
5626 | 2062 { |
2063 int i; | |
2064 XlwMenuWidget mw = (XlwMenuWidget) w; | |
2065 | |
8860 | 2066 if (pointer_grabbed) |
44750
2e7603e0c455
Add calls to Grab/UngrabKeyboard to remove strange interactions with
Jan Djärv <jan.h.d@swipnet.se>
parents:
44713
diff
changeset
|
2067 ungrab_all ((Widget)w, CurrentTime); |
8860 | 2068 pointer_grabbed = 0; |
2069 | |
2070 submenu_destroyed = 1; | |
2071 | |
5626 | 2072 release_drawing_gcs (mw); |
2073 release_shadow_gcs (mw); | |
2074 | |
2075 /* this doesn't come from the resource db but is created explicitly | |
2076 so we must free it ourselves. */ | |
2077 XFreePixmap (XtDisplay (mw), mw->menu.gray_pixmap); | |
2078 mw->menu.gray_pixmap = (Pixmap) -1; | |
2079 | |
8860 | 2080 #if 0 |
2081 /* Do free mw->menu.contents because nowadays we copy it | |
2082 during initialization. */ | |
2083 XtFree (mw->menu.contents); | |
2084 #endif | |
2085 | |
5626 | 2086 /* Don't free mw->menu.contents because that comes from our creator. |
2087 The `*_stack' elements are just pointers into `contents' so leave | |
2088 that alone too. But free the stacks themselves. */ | |
2089 if (mw->menu.old_stack) XtFree ((char *) mw->menu.old_stack); | |
2090 if (mw->menu.new_stack) XtFree ((char *) mw->menu.new_stack); | |
2091 | |
2092 /* Remember, you can't free anything that came from the resource | |
2093 database. This includes: | |
2094 mw->menu.cursor | |
2095 mw->menu.top_shadow_pixmap | |
2096 mw->menu.bottom_shadow_pixmap | |
2097 mw->menu.font | |
2098 Also the color cells of top_shadow_color, bottom_shadow_color, | |
2099 foreground, and button_foreground will never be freed until this | |
2100 client exits. Nice, eh? | |
2101 */ | |
2102 | |
107804
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2103 #ifdef HAVE_XFT |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2104 if (mw->menu.windows [0].xft_draw) |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2105 XftDrawDestroy (mw->menu.windows [0].xft_draw); |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2106 if (mw->menu.xft_font) |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2107 XftFontClose (XtDisplay (mw), mw->menu.xft_font); |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2108 #endif |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2109 |
107886
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
2110 if (mw->menu.windows [0].pixmap != None) |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
2111 XFreePixmap (XtDisplay (mw), mw->menu.windows [0].pixmap); |
5626 | 2112 /* start from 1 because the one in slot 0 is w->core.window */ |
2113 for (i = 1; i < mw->menu.windows_length; i++) | |
107804
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2114 { |
107886
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
2115 if (mw->menu.windows [i].pixmap != None) |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
2116 XFreePixmap (XtDisplay (mw), mw->menu.windows [i].pixmap); |
107804
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2117 #ifdef HAVE_XFT |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2118 if (mw->menu.windows [i].xft_draw) |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2119 XftDrawDestroy (mw->menu.windows [i].xft_draw); |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2120 #endif |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2121 } |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2122 |
5626 | 2123 if (mw->menu.windows) |
2124 XtFree ((char *) mw->menu.windows); | |
2125 } | |
2126 | |
107873
b88763a1166b
xlwmenu.c (facename_changed): Put function in #ifdef HAVE_XFT.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
107804
diff
changeset
|
2127 #ifdef HAVE_XFT |
107804
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2128 static int |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2129 facename_changed (XlwMenuWidget newmw, |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2130 XlwMenuWidget oldmw) |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2131 { |
107886
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
2132 /* This will fore a new XftFont even if the same string is set. |
107804
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2133 This is good, as rendering parameters may have changed and |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2134 we just want to do a redisplay. */ |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2135 return newmw->menu.faceName != oldmw->menu.faceName; |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2136 } |
107873
b88763a1166b
xlwmenu.c (facename_changed): Put function in #ifdef HAVE_XFT.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
107804
diff
changeset
|
2137 #endif |
107804
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2138 |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
2139 static Boolean |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109123
diff
changeset
|
2140 XlwMenuSetValues (Widget current, Widget request, Widget new, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109123
diff
changeset
|
2141 ArgList args, Cardinal *num_args) |
5626 | 2142 { |
2143 XlwMenuWidget oldmw = (XlwMenuWidget)current; | |
2144 XlwMenuWidget newmw = (XlwMenuWidget)new; | |
2145 Boolean redisplay = False; | |
2146 int i; | |
2147 | |
2148 if (newmw->menu.contents | |
2149 && newmw->menu.contents->contents | |
2150 && newmw->menu.contents->contents->change >= VISIBLE_CHANGE) | |
2151 redisplay = True; | |
13899
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
2152 /* Do redisplay if the contents are entirely eliminated. */ |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
2153 if (newmw->menu.contents |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
2154 && newmw->menu.contents->contents == 0 |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
2155 && newmw->menu.contents->change >= VISIBLE_CHANGE) |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
2156 redisplay = True; |
5626 | 2157 |
2158 if (newmw->core.background_pixel != oldmw->core.background_pixel | |
8860 | 2159 || newmw->menu.foreground != oldmw->menu.foreground |
107804
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2160 #ifdef HAVE_XFT |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2161 || facename_changed (newmw, oldmw) |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2162 #endif |
61209
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
2163 #ifdef HAVE_X_I18N |
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
2164 || newmw->menu.fontSet != oldmw->menu.fontSet |
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
2165 || (newmw->menu.fontSet == NULL && newmw->menu.font != oldmw->menu.font) |
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
2166 #else |
60698
3e557e11645e
Add support for I18N to Lucid menus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59100
diff
changeset
|
2167 || newmw->menu.font != oldmw->menu.font |
3e557e11645e
Add support for I18N to Lucid menus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59100
diff
changeset
|
2168 #endif |
3e557e11645e
Add support for I18N to Lucid menus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59100
diff
changeset
|
2169 ) |
5626 | 2170 { |
2171 release_drawing_gcs (newmw); | |
2172 make_drawing_gcs (newmw); | |
31287 | 2173 |
2174 release_shadow_gcs (newmw); | |
2175 /* Cause the shadow colors to be recalculated. */ | |
2176 newmw->menu.top_shadow_color = -1; | |
2177 newmw->menu.bottom_shadow_color = -1; | |
2178 make_shadow_gcs (newmw); | |
2179 | |
5626 | 2180 redisplay = True; |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
2181 |
31369
6aa8a6e72c0f
(XlwMenuSetValues): Pass the correct pointer type to XtIsRealized.
Miles Bader <miles@gnu.org>
parents:
31364
diff
changeset
|
2182 if (XtIsRealized (current)) |
31364
8bafcf2cfd57
(XlwMenuSetValues): Only frob the display if the menu is actually displayed.
Miles Bader <miles@gnu.org>
parents:
31341
diff
changeset
|
2183 /* If the menu is currently displayed, change the display. */ |
8bafcf2cfd57
(XlwMenuSetValues): Only frob the display if the menu is actually displayed.
Miles Bader <miles@gnu.org>
parents:
31341
diff
changeset
|
2184 for (i = 0; i < oldmw->menu.windows_length; i++) |
8bafcf2cfd57
(XlwMenuSetValues): Only frob the display if the menu is actually displayed.
Miles Bader <miles@gnu.org>
parents:
31341
diff
changeset
|
2185 { |
8bafcf2cfd57
(XlwMenuSetValues): Only frob the display if the menu is actually displayed.
Miles Bader <miles@gnu.org>
parents:
31341
diff
changeset
|
2186 XSetWindowBackground (XtDisplay (oldmw), |
8bafcf2cfd57
(XlwMenuSetValues): Only frob the display if the menu is actually displayed.
Miles Bader <miles@gnu.org>
parents:
31341
diff
changeset
|
2187 oldmw->menu.windows [i].window, |
8bafcf2cfd57
(XlwMenuSetValues): Only frob the display if the menu is actually displayed.
Miles Bader <miles@gnu.org>
parents:
31341
diff
changeset
|
2188 newmw->core.background_pixel); |
8bafcf2cfd57
(XlwMenuSetValues): Only frob the display if the menu is actually displayed.
Miles Bader <miles@gnu.org>
parents:
31341
diff
changeset
|
2189 /* clear windows and generate expose events */ |
8bafcf2cfd57
(XlwMenuSetValues): Only frob the display if the menu is actually displayed.
Miles Bader <miles@gnu.org>
parents:
31341
diff
changeset
|
2190 XClearArea (XtDisplay (oldmw), oldmw->menu.windows[i].window, |
8bafcf2cfd57
(XlwMenuSetValues): Only frob the display if the menu is actually displayed.
Miles Bader <miles@gnu.org>
parents:
31341
diff
changeset
|
2191 0, 0, 0, 0, True); |
8bafcf2cfd57
(XlwMenuSetValues): Only frob the display if the menu is actually displayed.
Miles Bader <miles@gnu.org>
parents:
31341
diff
changeset
|
2192 } |
5626 | 2193 } |
2194 | |
107804
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2195 #ifdef HAVE_XFT |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2196 if (facename_changed (newmw, oldmw)) |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2197 { |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2198 int i; |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2199 int screen = XScreenNumberOfScreen (newmw->core.screen); |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2200 if (newmw->menu.xft_font) |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2201 XftFontClose (XtDisplay (newmw), newmw->menu.xft_font); |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2202 openXftFont (newmw); |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2203 for (i = 0; i < newmw->menu.windows_length; i++) |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2204 { |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2205 if (newmw->menu.windows [i].xft_draw) |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2206 XftDrawDestroy (newmw->menu.windows [i].xft_draw); |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2207 newmw->menu.windows [i].xft_draw = 0; |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2208 } |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2209 if (newmw->menu.xft_font) |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2210 for (i = 0; i < newmw->menu.windows_length; i++) |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2211 newmw->menu.windows [i].xft_draw |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2212 = XftDrawCreate (XtDisplay (newmw), |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2213 newmw->menu.windows [i].window, |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2214 DefaultVisual (XtDisplay (newmw), screen), |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2215 newmw->core.colormap); |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2216 } |
24c4451bcaf7
Lucid menus can now use Xft for fonts.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
2217 #endif |
60698
3e557e11645e
Add support for I18N to Lucid menus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59100
diff
changeset
|
2218 #ifdef HAVE_X_I18N |
61209
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
2219 if (newmw->menu.fontSet != oldmw->menu.fontSet && newmw->menu.fontSet != NULL) |
60698
3e557e11645e
Add support for I18N to Lucid menus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59100
diff
changeset
|
2220 { |
3e557e11645e
Add support for I18N to Lucid menus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59100
diff
changeset
|
2221 redisplay = True; |
61209
0769f2fae9d0
* xlwmenu.c (string_width):
Jan Djärv <jan.h.d@swipnet.se>
parents:
60829
diff
changeset
|
2222 newmw->menu.font_extents = XExtentsOfFontSet (newmw->menu.fontSet); |
60698
3e557e11645e
Add support for I18N to Lucid menus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59100
diff
changeset
|
2223 } |
3e557e11645e
Add support for I18N to Lucid menus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59100
diff
changeset
|
2224 #endif |
3e557e11645e
Add support for I18N to Lucid menus.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59100
diff
changeset
|
2225 |
5626 | 2226 return redisplay; |
2227 } | |
2228 | |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
2229 static void |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2230 XlwMenuResize (Widget w) |
5626 | 2231 { |
2232 XlwMenuWidget mw = (XlwMenuWidget)w; | |
2233 | |
8860 | 2234 if (mw->menu.popped_up) |
2235 { | |
2236 /* Don't allow the popup menu to resize itself. */ | |
2237 mw->core.width = mw->menu.windows [0].width; | |
2238 mw->core.height = mw->menu.windows [0].height; | |
107886
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
2239 mw->core.parent->core.width = mw->core.width; |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
2240 mw->core.parent->core.height = mw->core.height; |
8860 | 2241 } |
2242 else | |
2243 { | |
2244 mw->menu.windows [0].width = mw->core.width; | |
2245 mw->menu.windows [0].height = mw->core.height; | |
107886
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
2246 create_pixmap_for_menu (&mw->menu.windows [0], mw); |
8860 | 2247 } |
5626 | 2248 } |
2249 | |
2250 /* Action procedures */ | |
2251 static void | |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2252 handle_single_motion_event (XlwMenuWidget mw, XMotionEvent *ev) |
5626 | 2253 { |
2254 widget_value* val; | |
2255 int level; | |
2256 | |
2257 if (!map_event_to_widget_value (mw, ev, &val, &level)) | |
2258 pop_new_stack_if_no_contents (mw); | |
2259 else | |
2260 set_new_state (mw, val, level); | |
2261 remap_menubar (mw); | |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
2262 |
5626 | 2263 /* Sync with the display. Makes it feel better on X terms. */ |
2264 XSync (XtDisplay (mw), False); | |
2265 } | |
2266 | |
2267 static void | |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2268 handle_motion_event (XlwMenuWidget mw, XMotionEvent *ev) |
5626 | 2269 { |
2270 int x = ev->x_root; | |
2271 int y = ev->y_root; | |
2272 int state = ev->state; | |
107886
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
2273 XMotionEvent oldev = *ev; |
5626 | 2274 |
2275 /* allow motion events to be generated again */ | |
2276 if (ev->is_hint | |
2277 && XQueryPointer (XtDisplay (mw), ev->window, | |
2278 &ev->root, &ev->subwindow, | |
2279 &ev->x_root, &ev->y_root, | |
2280 &ev->x, &ev->y, | |
2281 &ev->state) | |
2282 && ev->state == state | |
2283 && (ev->x_root != x || ev->y_root != y)) | |
2284 handle_single_motion_event (mw, ev); | |
107886
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
2285 else |
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
2286 handle_single_motion_event (mw, &oldev); |
5626 | 2287 } |
2288 | |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
2289 static void |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2290 Start (Widget w, XEvent *ev, String *params, Cardinal *num_params) |
5626 | 2291 { |
2292 XlwMenuWidget mw = (XlwMenuWidget)w; | |
2293 | |
8860 | 2294 if (!mw->menu.popped_up) |
2295 { | |
2296 menu_post_event = *ev; | |
53564
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2297 /* If event is set to CurrentTime, get the last known time stamp. |
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2298 This is for calculating if (popup) menus should stay up after |
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2299 a fast click. */ |
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2300 if (menu_post_event.xbutton.time == CurrentTime) |
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2301 menu_post_event.xbutton.time |
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2302 = XtLastTimestampProcessed (XtDisplay (w)); |
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2303 |
29469
f9b5fe053f7c
(x_alloc_nearest_color_for_widget, x_catch_errors, x_uncatch_errors)
Dave Love <fx@gnu.org>
parents:
27988
diff
changeset
|
2304 pop_up_menu (mw, (XButtonPressedEvent*) ev); |
8860 | 2305 } |
2306 else | |
9027 | 2307 { |
2308 /* If we push a button while the menu is posted semipermanently, | |
2309 releasing the button should always pop the menu down. */ | |
2310 next_release_must_exit = 1; | |
5626 | 2311 |
9027 | 2312 /* notes the absolute position of the menubar window */ |
2313 mw->menu.windows [0].x = ev->xmotion.x_root - ev->xmotion.x; | |
2314 mw->menu.windows [0].y = ev->xmotion.y_root - ev->xmotion.y; | |
2315 | |
2316 /* handles the down like a move, slots are compatible */ | |
70850
b90abedf3b79
* xlwmenu.c: Include xterm.h if emacs instead of declaring functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68640
diff
changeset
|
2317 ev->xmotion.is_hint = 0; |
9027 | 2318 handle_motion_event (mw, &ev->xmotion); |
2319 } | |
5626 | 2320 } |
2321 | |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
2322 static void |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2323 Drag (Widget w, XEvent *ev, String *params, Cardinal *num_params) |
5626 | 2324 { |
2325 XlwMenuWidget mw = (XlwMenuWidget)w; | |
11987
9619c1121b43
(Drag): Do nothing unless menu.popped_up field is set.
Karl Heuer <kwzh@gnu.org>
parents:
11885
diff
changeset
|
2326 if (mw->menu.popped_up) |
9619c1121b43
(Drag): Do nothing unless menu.popped_up field is set.
Karl Heuer <kwzh@gnu.org>
parents:
11885
diff
changeset
|
2327 handle_motion_event (mw, &ev->xmotion); |
5626 | 2328 } |
2329 | |
13899
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
2330 /* Do nothing. |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
2331 This is how we handle presses and releases of modifier keys. */ |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
2332 static void |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2333 Nothing (Widget w, XEvent *ev, String *params, Cardinal *num_params) |
13899
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
2334 { |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
2335 } |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
2336 |
53564
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2337 static widget_value * |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2338 find_first_selectable (XlwMenuWidget mw, widget_value *item, int skip_titles) |
44713
a05c8614feee
(find_next_selectable): New function.
Pavel Janík <Pavel@Janik.cz>
parents:
44707
diff
changeset
|
2339 { |
a05c8614feee
(find_next_selectable): New function.
Pavel Janík <Pavel@Janik.cz>
parents:
44707
diff
changeset
|
2340 widget_value *current = item; |
a05c8614feee
(find_next_selectable): New function.
Pavel Janík <Pavel@Janik.cz>
parents:
44707
diff
changeset
|
2341 enum menu_separator separator; |
a05c8614feee
(find_next_selectable): New function.
Pavel Janík <Pavel@Janik.cz>
parents:
44707
diff
changeset
|
2342 |
53564
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2343 while (lw_separator_p (current->name, &separator, 0) || !current->enabled |
57842
2c65a9fc7dec
* xlwmenu.c (find_first_selectable, find_next_selectable)
Jan Djärv <jan.h.d@swipnet.se>
parents:
53564
diff
changeset
|
2344 || (skip_titles && !current->call_data && !current->contents)) |
44713
a05c8614feee
(find_next_selectable): New function.
Pavel Janík <Pavel@Janik.cz>
parents:
44707
diff
changeset
|
2345 if (current->next) |
a05c8614feee
(find_next_selectable): New function.
Pavel Janík <Pavel@Janik.cz>
parents:
44707
diff
changeset
|
2346 current=current->next; |
a05c8614feee
(find_next_selectable): New function.
Pavel Janík <Pavel@Janik.cz>
parents:
44707
diff
changeset
|
2347 else |
57842
2c65a9fc7dec
* xlwmenu.c (find_first_selectable, find_next_selectable)
Jan Djärv <jan.h.d@swipnet.se>
parents:
53564
diff
changeset
|
2348 return NULL; |
44713
a05c8614feee
(find_next_selectable): New function.
Pavel Janík <Pavel@Janik.cz>
parents:
44707
diff
changeset
|
2349 |
a05c8614feee
(find_next_selectable): New function.
Pavel Janík <Pavel@Janik.cz>
parents:
44707
diff
changeset
|
2350 return current; |
a05c8614feee
(find_next_selectable): New function.
Pavel Janík <Pavel@Janik.cz>
parents:
44707
diff
changeset
|
2351 } |
a05c8614feee
(find_next_selectable): New function.
Pavel Janík <Pavel@Janik.cz>
parents:
44707
diff
changeset
|
2352 |
53564
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2353 static widget_value * |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2354 find_next_selectable (XlwMenuWidget mw, widget_value *item, int skip_titles) |
44707
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2355 { |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2356 widget_value *current = item; |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2357 enum menu_separator separator; |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2358 |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2359 while (current->next && (current=current->next) && |
53564
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2360 (lw_separator_p (current->name, &separator, 0) || !current->enabled |
57842
2c65a9fc7dec
* xlwmenu.c (find_first_selectable, find_next_selectable)
Jan Djärv <jan.h.d@swipnet.se>
parents:
53564
diff
changeset
|
2361 || (skip_titles && !current->call_data && !current->contents))) |
44707
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2362 ; |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2363 |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2364 if (current == item) |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2365 { |
45147
e10cf8f440ae
(xlwMenuResources): New resource.
Pavel Janík <Pavel@Janik.cz>
parents:
44966
diff
changeset
|
2366 if (mw->menu.old_depth < 2) |
e10cf8f440ae
(xlwMenuResources): New resource.
Pavel Janík <Pavel@Janik.cz>
parents:
44966
diff
changeset
|
2367 return current; |
44707
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2368 current = mw->menu.old_stack [mw->menu.old_depth - 2]->contents; |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2369 |
53564
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2370 while (lw_separator_p (current->name, &separator, 0) |
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2371 || !current->enabled |
57842
2c65a9fc7dec
* xlwmenu.c (find_first_selectable, find_next_selectable)
Jan Djärv <jan.h.d@swipnet.se>
parents:
53564
diff
changeset
|
2372 || (skip_titles && !current->call_data |
2c65a9fc7dec
* xlwmenu.c (find_first_selectable, find_next_selectable)
Jan Djärv <jan.h.d@swipnet.se>
parents:
53564
diff
changeset
|
2373 && !current->contents)) |
44713
a05c8614feee
(find_next_selectable): New function.
Pavel Janík <Pavel@Janik.cz>
parents:
44707
diff
changeset
|
2374 { |
a05c8614feee
(find_next_selectable): New function.
Pavel Janík <Pavel@Janik.cz>
parents:
44707
diff
changeset
|
2375 if (current->next) |
a05c8614feee
(find_next_selectable): New function.
Pavel Janík <Pavel@Janik.cz>
parents:
44707
diff
changeset
|
2376 current=current->next; |
a05c8614feee
(find_next_selectable): New function.
Pavel Janík <Pavel@Janik.cz>
parents:
44707
diff
changeset
|
2377 |
a05c8614feee
(find_next_selectable): New function.
Pavel Janík <Pavel@Janik.cz>
parents:
44707
diff
changeset
|
2378 if (current == item) |
a05c8614feee
(find_next_selectable): New function.
Pavel Janík <Pavel@Janik.cz>
parents:
44707
diff
changeset
|
2379 break; |
a05c8614feee
(find_next_selectable): New function.
Pavel Janík <Pavel@Janik.cz>
parents:
44707
diff
changeset
|
2380 } |
a05c8614feee
(find_next_selectable): New function.
Pavel Janík <Pavel@Janik.cz>
parents:
44707
diff
changeset
|
2381 |
44707
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2382 } |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2383 |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2384 return current; |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2385 } |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2386 |
53564
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2387 static widget_value * |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2388 find_prev_selectable (XlwMenuWidget mw, widget_value *item, int skip_titles) |
44707
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2389 { |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2390 widget_value *current = item; |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2391 widget_value *prev = item; |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2392 |
57842
2c65a9fc7dec
* xlwmenu.c (find_first_selectable, find_next_selectable)
Jan Djärv <jan.h.d@swipnet.se>
parents:
53564
diff
changeset
|
2393 while ((current=find_next_selectable (mw, current, skip_titles)) |
53564
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2394 != item) |
44713
a05c8614feee
(find_next_selectable): New function.
Pavel Janík <Pavel@Janik.cz>
parents:
44707
diff
changeset
|
2395 { |
a05c8614feee
(find_next_selectable): New function.
Pavel Janík <Pavel@Janik.cz>
parents:
44707
diff
changeset
|
2396 if (prev == current) |
a05c8614feee
(find_next_selectable): New function.
Pavel Janík <Pavel@Janik.cz>
parents:
44707
diff
changeset
|
2397 break; |
44707
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2398 prev=current; |
44713
a05c8614feee
(find_next_selectable): New function.
Pavel Janík <Pavel@Janik.cz>
parents:
44707
diff
changeset
|
2399 } |
44707
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2400 |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2401 return prev; |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2402 } |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2403 |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2404 static void |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2405 Down (Widget w, XEvent *ev, String *params, Cardinal *num_params) |
44707
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2406 { |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2407 XlwMenuWidget mw = (XlwMenuWidget) w; |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2408 widget_value* selected_item = mw->menu.old_stack [mw->menu.old_depth - 1]; |
53564
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2409 int popup_menu_p = mw->menu.top_depth == 1; |
44707
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2410 |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2411 /* Inside top-level menu-bar? */ |
53564
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2412 if (mw->menu.old_depth == mw->menu.top_depth) |
44707
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2413 /* When <down> in the menu-bar is pressed, display the corresponding |
53564
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2414 sub-menu and select the first selectable menu item there. |
57842
2c65a9fc7dec
* xlwmenu.c (find_first_selectable, find_next_selectable)
Jan Djärv <jan.h.d@swipnet.se>
parents:
53564
diff
changeset
|
2415 If this is a popup menu, skip title item of the popup. */ |
53564
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2416 set_new_state (mw, |
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2417 find_first_selectable (mw, |
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2418 selected_item->contents, |
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2419 popup_menu_p), |
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2420 mw->menu.old_depth); |
44707
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2421 else |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2422 /* Highlight next possible (enabled and not separator) menu item. */ |
53564
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2423 set_new_state (mw, find_next_selectable (mw, selected_item, popup_menu_p), |
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2424 mw->menu.old_depth - 1); |
44707
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2425 |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2426 remap_menubar (mw); |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2427 } |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2428 |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2429 static void |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2430 Up (Widget w, XEvent *ev, String *params, Cardinal *num_params) |
44707
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2431 { |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2432 XlwMenuWidget mw = (XlwMenuWidget) w; |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2433 widget_value* selected_item = mw->menu.old_stack [mw->menu.old_depth - 1]; |
53564
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2434 int popup_menu_p = mw->menu.top_depth == 1; |
44707
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2435 |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2436 /* Inside top-level menu-bar? */ |
53564
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2437 if (mw->menu.old_depth == mw->menu.top_depth) |
44707
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2438 { |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2439 /* FIXME: this is tricky. <up> in the menu-bar should select the |
44713
a05c8614feee
(find_next_selectable): New function.
Pavel Janík <Pavel@Janik.cz>
parents:
44707
diff
changeset
|
2440 last selectable item in the list. So we select the first |
a05c8614feee
(find_next_selectable): New function.
Pavel Janík <Pavel@Janik.cz>
parents:
44707
diff
changeset
|
2441 selectable one and find the previous selectable item. Is there |
a05c8614feee
(find_next_selectable): New function.
Pavel Janík <Pavel@Janik.cz>
parents:
44707
diff
changeset
|
2442 a better way? */ |
57842
2c65a9fc7dec
* xlwmenu.c (find_first_selectable, find_next_selectable)
Jan Djärv <jan.h.d@swipnet.se>
parents:
53564
diff
changeset
|
2443 /* If this is a popup menu, skip title item of the popup. */ |
53564
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2444 set_new_state (mw, |
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2445 find_first_selectable (mw, |
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2446 selected_item->contents, |
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2447 popup_menu_p), |
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2448 mw->menu.old_depth); |
44707
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2449 remap_menubar (mw); |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2450 selected_item = mw->menu.old_stack [mw->menu.old_depth - 1]; |
53564
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2451 set_new_state (mw, |
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2452 find_prev_selectable (mw, |
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2453 selected_item, |
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2454 popup_menu_p), |
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2455 mw->menu.old_depth - 1); |
44707
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2456 } |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2457 else |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2458 /* Highlight previous (enabled and not separator) menu item. */ |
53564
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2459 set_new_state (mw, find_prev_selectable (mw, selected_item, popup_menu_p), |
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2460 mw->menu.old_depth - 1); |
44707
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2461 |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2462 remap_menubar (mw); |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2463 } |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2464 |
53564
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2465 void |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2466 Left (Widget w, XEvent *ev, String *params, Cardinal *num_params) |
44707
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2467 { |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2468 XlwMenuWidget mw = (XlwMenuWidget) w; |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2469 widget_value* selected_item = mw->menu.old_stack [mw->menu.old_depth - 1]; |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2470 |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2471 /* Inside top-level menu-bar? */ |
53564
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2472 if (mw->menu.old_depth == mw->menu.top_depth) |
44707
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2473 /* When <left> in the menu-bar is pressed, display the previous item on |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2474 the menu-bar. If the current item is the first one, highlight the |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2475 last item in the menubar (probably Help). */ |
53564
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2476 set_new_state (mw, find_prev_selectable (mw, selected_item, 0), |
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2477 mw->menu.old_depth - 1); |
48929
d81c005163cb
(pop_new_stack_if_no_contents): Do nothing if new_depth is 1.
Richard M. Stallman <rms@gnu.org>
parents:
48479
diff
changeset
|
2478 else if (mw->menu.old_depth == 1 |
d81c005163cb
(pop_new_stack_if_no_contents): Do nothing if new_depth is 1.
Richard M. Stallman <rms@gnu.org>
parents:
48479
diff
changeset
|
2479 && selected_item->contents) /* Is this menu item expandable? */ |
d81c005163cb
(pop_new_stack_if_no_contents): Do nothing if new_depth is 1.
Richard M. Stallman <rms@gnu.org>
parents:
48479
diff
changeset
|
2480 { |
d81c005163cb
(pop_new_stack_if_no_contents): Do nothing if new_depth is 1.
Richard M. Stallman <rms@gnu.org>
parents:
48479
diff
changeset
|
2481 set_new_state (mw, selected_item->contents, mw->menu.old_depth); |
d81c005163cb
(pop_new_stack_if_no_contents): Do nothing if new_depth is 1.
Richard M. Stallman <rms@gnu.org>
parents:
48479
diff
changeset
|
2482 remap_menubar (mw); |
d81c005163cb
(pop_new_stack_if_no_contents): Do nothing if new_depth is 1.
Richard M. Stallman <rms@gnu.org>
parents:
48479
diff
changeset
|
2483 selected_item = mw->menu.old_stack [mw->menu.old_depth - 1]; |
53564
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2484 if (!selected_item->enabled && find_first_selectable (mw, |
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2485 selected_item, |
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2486 0)) |
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2487 set_new_state (mw, find_first_selectable (mw, selected_item, 0), |
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2488 mw->menu.old_depth - 1); |
48929
d81c005163cb
(pop_new_stack_if_no_contents): Do nothing if new_depth is 1.
Richard M. Stallman <rms@gnu.org>
parents:
48479
diff
changeset
|
2489 } |
d81c005163cb
(pop_new_stack_if_no_contents): Do nothing if new_depth is 1.
Richard M. Stallman <rms@gnu.org>
parents:
48479
diff
changeset
|
2490 |
44707
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2491 else |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2492 { |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2493 pop_new_stack_if_no_contents (mw); |
53564
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2494 set_new_state (mw, mw->menu.old_stack [mw->menu.old_depth - 2], |
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2495 mw->menu.old_depth - 2); |
44707
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2496 } |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2497 |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2498 remap_menubar (mw); |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2499 } |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2500 |
53564
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2501 void |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2502 Right (Widget w, XEvent *ev, String *params, Cardinal *num_params) |
44707
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2503 { |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2504 XlwMenuWidget mw = (XlwMenuWidget) w; |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2505 widget_value* selected_item = mw->menu.old_stack [mw->menu.old_depth - 1]; |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2506 |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2507 /* Inside top-level menu-bar? */ |
53564
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2508 if (mw->menu.old_depth == mw->menu.top_depth) |
44707
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2509 /* When <right> in the menu-bar is pressed, display the next item on |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2510 the menu-bar. If the current item is the last one, highlight the |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2511 first item (probably File). */ |
53564
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2512 set_new_state (mw, find_next_selectable (mw, selected_item, 0), |
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2513 mw->menu.old_depth - 1); |
44707
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2514 else if (selected_item->contents) /* Is this menu item expandable? */ |
44713
a05c8614feee
(find_next_selectable): New function.
Pavel Janík <Pavel@Janik.cz>
parents:
44707
diff
changeset
|
2515 { |
a05c8614feee
(find_next_selectable): New function.
Pavel Janík <Pavel@Janik.cz>
parents:
44707
diff
changeset
|
2516 set_new_state (mw, selected_item->contents, mw->menu.old_depth); |
a05c8614feee
(find_next_selectable): New function.
Pavel Janík <Pavel@Janik.cz>
parents:
44707
diff
changeset
|
2517 remap_menubar (mw); |
a05c8614feee
(find_next_selectable): New function.
Pavel Janík <Pavel@Janik.cz>
parents:
44707
diff
changeset
|
2518 selected_item = mw->menu.old_stack [mw->menu.old_depth - 1]; |
53564
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2519 if (!selected_item->enabled && find_first_selectable (mw, |
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2520 selected_item, |
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2521 0)) |
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2522 set_new_state (mw, find_first_selectable (mw, selected_item, 0), |
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2523 mw->menu.old_depth - 1); |
44713
a05c8614feee
(find_next_selectable): New function.
Pavel Janík <Pavel@Janik.cz>
parents:
44707
diff
changeset
|
2524 } |
44707
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2525 else |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2526 { |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2527 pop_new_stack_if_no_contents (mw); |
53564
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2528 set_new_state (mw, mw->menu.old_stack [mw->menu.old_depth - 2], |
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2529 mw->menu.old_depth - 2); |
44707
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2530 } |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2531 |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2532 remap_menubar (mw); |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2533 } |
3444517c6483
(xlwMenuTranslations, xlwMenuActionsList): Add translations for cursor keys
Pavel Janík <Pavel@Janik.cz>
parents:
41767
diff
changeset
|
2534 |
13899
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
2535 /* Handle key press and release events while menu is popped up. |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
2536 Our action is to get rid of the menu. */ |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
2537 static void |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2538 Key (Widget w, XEvent *ev, String *params, Cardinal *num_params) |
13899
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
2539 { |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
2540 XlwMenuWidget mw = (XlwMenuWidget)w; |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
2541 |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
2542 /* Pop down everything. */ |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
2543 mw->menu.new_depth = 1; |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
2544 remap_menubar (mw); |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
2545 |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
2546 if (mw->menu.popped_up) |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
2547 { |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
2548 mw->menu.popped_up = False; |
44750
2e7603e0c455
Add calls to Grab/UngrabKeyboard to remove strange interactions with
Jan Djärv <jan.h.d@swipnet.se>
parents:
44713
diff
changeset
|
2549 ungrab_all ((Widget)mw, ev->xmotion.time); |
13899
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
2550 if (XtIsShell (XtParent ((Widget) mw))) |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
2551 XtPopdown (XtParent ((Widget) mw)); |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
2552 else |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
2553 { |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
2554 XtRemoveGrab ((Widget) mw); |
107886
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
2555 display_menu (mw, 0, False, NULL, NULL, NULL); |
13899
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
2556 } |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
2557 } |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
2558 |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
2559 /* callback */ |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
2560 XtCallCallbackList ((Widget)mw, mw->menu.select, (XtPointer)0); |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
2561 } |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
2562 |
3fbe9b840379
(xlwMenuActionsList): Add "key" and "nothing".
Richard M. Stallman <rms@gnu.org>
parents:
13560
diff
changeset
|
2563 static void |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2564 Select (Widget w, XEvent *ev, String *params, Cardinal *num_params) |
5626 | 2565 { |
2566 XlwMenuWidget mw = (XlwMenuWidget)w; | |
2567 widget_value* selected_item = mw->menu.old_stack [mw->menu.old_depth - 1]; | |
31963
833428005bf6
* xlwmenu.c: Before including <X11/Xos.h> on SUN, define SUNOS41
Sam Steingold <sds@gnu.org>
parents:
31370
diff
changeset
|
2568 |
8860 | 2569 /* If user releases the button quickly, without selecting anything, |
2570 after the initial down-click that brought the menu up, | |
2571 do nothing. */ | |
2572 if ((selected_item == 0 | |
2573 || ((widget_value *) selected_item)->call_data == 0) | |
2574 && !next_release_must_exit | |
2575 && (ev->xbutton.time - menu_post_event.xbutton.time | |
2576 < XtGetMultiClickTime (XtDisplay (w)))) | |
2577 return; | |
2578 | |
2579 /* pop down everything. */ | |
5626 | 2580 mw->menu.new_depth = 1; |
2581 remap_menubar (mw); | |
2582 | |
2583 if (mw->menu.popped_up) | |
2584 { | |
2585 mw->menu.popped_up = False; | |
44750
2e7603e0c455
Add calls to Grab/UngrabKeyboard to remove strange interactions with
Jan Djärv <jan.h.d@swipnet.se>
parents:
44713
diff
changeset
|
2586 ungrab_all ((Widget)mw, ev->xmotion.time); |
9033 | 2587 if (XtIsShell (XtParent ((Widget) mw))) |
2588 XtPopdown (XtParent ((Widget) mw)); | |
9027 | 2589 else |
2590 { | |
2591 XtRemoveGrab ((Widget) mw); | |
107886
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
2592 display_menu (mw, 0, False, NULL, NULL, NULL); |
9027 | 2593 } |
5626 | 2594 } |
2595 | |
2596 /* callback */ | |
2597 XtCallCallbackList ((Widget)mw, mw->menu.select, (XtPointer)selected_item); | |
2598 } | |
2599 | |
2600 | |
2601 /* Special code to pop-up a menu */ | |
53564
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2602 static void |
109123
384b3408c143
Convert function definitions in lwlib files to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2603 pop_up_menu (XlwMenuWidget mw, XButtonPressedEvent *event) |
5626 | 2604 { |
2605 int x = event->x_root; | |
2606 int y = event->y_root; | |
2607 int w; | |
2608 int h; | |
2609 int borderwidth = mw->menu.shadow_thickness; | |
2610 Screen* screen = XtScreen (mw); | |
9700
d09dc2f44ecb
(pop_up_menu): Pass a Display * to x_catch_errors, etc.
Richard M. Stallman <rms@gnu.org>
parents:
9395
diff
changeset
|
2611 Display *display = XtDisplay (mw); |
5626 | 2612 |
8860 | 2613 next_release_must_exit = 0; |
2614 | |
75018
d263801b3ca8
(xlwMenuResources): Add XtNleaveCallback, XtNenterCallback.
Jan Djärv <jan.h.d@swipnet.se>
parents:
70850
diff
changeset
|
2615 mw->menu.inside_entry = NULL; |
5626 | 2616 XtCallCallbackList ((Widget)mw, mw->menu.open, NULL); |
2617 | |
9033 | 2618 if (XtIsShell (XtParent ((Widget)mw))) |
9027 | 2619 size_menu (mw, 0); |
5626 | 2620 |
2621 w = mw->menu.windows [0].width; | |
2622 h = mw->menu.windows [0].height; | |
2623 | |
2624 x -= borderwidth; | |
2625 y -= borderwidth; | |
2626 if (x < borderwidth) | |
2627 x = borderwidth; | |
2628 if (x + w + 2 * borderwidth > WidthOfScreen (screen)) | |
2629 x = WidthOfScreen (screen) - w - 2 * borderwidth; | |
2630 if (y < borderwidth) | |
2631 y = borderwidth; | |
2632 if (y + h + 2 * borderwidth> HeightOfScreen (screen)) | |
2633 y = HeightOfScreen (screen) - h - 2 * borderwidth; | |
2634 | |
2635 mw->menu.popped_up = True; | |
9033 | 2636 if (XtIsShell (XtParent ((Widget)mw))) |
9027 | 2637 { |
9033 | 2638 XtConfigureWidget (XtParent ((Widget)mw), x, y, w, h, |
2639 XtParent ((Widget)mw)->core.border_width); | |
2640 XtPopup (XtParent ((Widget)mw), XtGrabExclusive); | |
107886
9a798edc503b
Don't redraw lucid menus more than needed. Use double buffer to reduce flicker.
Jan D <jan.h.d@swipnet.se>
parents:
107873
diff
changeset
|
2641 display_menu (mw, 0, False, NULL, NULL, NULL); |
9027 | 2642 mw->menu.windows [0].x = x + borderwidth; |
2643 mw->menu.windows [0].y = y + borderwidth; | |
53564
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2644 mw->menu.top_depth = 1; /* Popup menus don't have a bar so top is 1 */ |
9027 | 2645 } |
2646 else | |
2647 { | |
2648 XEvent *ev = (XEvent *) event; | |
2649 | |
9092
0033f98d2ffd
Clean up of temporary changes used to try to find a workaround for the
Paul Reilly <pmr@pajato.com>
parents:
9086
diff
changeset
|
2650 XtAddGrab ((Widget) mw, True, True); |
9027 | 2651 |
2652 /* notes the absolute position of the menubar window */ | |
2653 mw->menu.windows [0].x = ev->xmotion.x_root - ev->xmotion.x; | |
2654 mw->menu.windows [0].y = ev->xmotion.y_root - ev->xmotion.y; | |
53564
609ef1718642
Changes for lucid popup menus (keyboard traversal enabled) and dialogs
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2655 mw->menu.top_depth = 2; |
9027 | 2656 } |
2657 | |
8860 | 2658 #ifdef emacs |
70850
b90abedf3b79
* xlwmenu.c: Include xterm.h if emacs instead of declaring functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68640
diff
changeset
|
2659 x_catch_errors (display); |
8860 | 2660 #endif |
44750
2e7603e0c455
Add calls to Grab/UngrabKeyboard to remove strange interactions with
Jan Djärv <jan.h.d@swipnet.se>
parents:
44713
diff
changeset
|
2661 if (XtGrabPointer ((Widget)mw, False, |
2e7603e0c455
Add calls to Grab/UngrabKeyboard to remove strange interactions with
Jan Djärv <jan.h.d@swipnet.se>
parents:
44713
diff
changeset
|
2662 (PointerMotionMask |
2e7603e0c455
Add calls to Grab/UngrabKeyboard to remove strange interactions with
Jan Djärv <jan.h.d@swipnet.se>
parents:
44713
diff
changeset
|
2663 | PointerMotionHintMask |
2e7603e0c455
Add calls to Grab/UngrabKeyboard to remove strange interactions with
Jan Djärv <jan.h.d@swipnet.se>
parents:
44713
diff
changeset
|
2664 | ButtonReleaseMask |
2e7603e0c455
Add calls to Grab/UngrabKeyboard to remove strange interactions with
Jan Djärv <jan.h.d@swipnet.se>
parents:
44713
diff
changeset
|
2665 | ButtonPressMask), |
2e7603e0c455
Add calls to Grab/UngrabKeyboard to remove strange interactions with
Jan Djärv <jan.h.d@swipnet.se>
parents:
44713
diff
changeset
|
2666 GrabModeAsync, GrabModeAsync, None, |
2e7603e0c455
Add calls to Grab/UngrabKeyboard to remove strange interactions with
Jan Djärv <jan.h.d@swipnet.se>
parents:
44713
diff
changeset
|
2667 mw->menu.cursor_shape, |
2e7603e0c455
Add calls to Grab/UngrabKeyboard to remove strange interactions with
Jan Djärv <jan.h.d@swipnet.se>
parents:
44713
diff
changeset
|
2668 event->time) == Success) |
2e7603e0c455
Add calls to Grab/UngrabKeyboard to remove strange interactions with
Jan Djärv <jan.h.d@swipnet.se>
parents:
44713
diff
changeset
|
2669 { |
44931
18616c930588
Do not grab keyboard if installation-directory is
Jan Djärv <jan.h.d@swipnet.se>
parents:
44750
diff
changeset
|
2670 if (! GRAB_KEYBOARD |
44750
2e7603e0c455
Add calls to Grab/UngrabKeyboard to remove strange interactions with
Jan Djärv <jan.h.d@swipnet.se>
parents:
44713
diff
changeset
|
2671 || XtGrabKeyboard ((Widget)mw, False, GrabModeAsync, |
2e7603e0c455
Add calls to Grab/UngrabKeyboard to remove strange interactions with
Jan Djärv <jan.h.d@swipnet.se>
parents:
44713
diff
changeset
|
2672 GrabModeAsync, event->time) == Success) |
2e7603e0c455
Add calls to Grab/UngrabKeyboard to remove strange interactions with
Jan Djärv <jan.h.d@swipnet.se>
parents:
44713
diff
changeset
|
2673 { |
2e7603e0c455
Add calls to Grab/UngrabKeyboard to remove strange interactions with
Jan Djärv <jan.h.d@swipnet.se>
parents:
44713
diff
changeset
|
2674 XtSetKeyboardFocus((Widget)mw, None); |
2e7603e0c455
Add calls to Grab/UngrabKeyboard to remove strange interactions with
Jan Djärv <jan.h.d@swipnet.se>
parents:
44713
diff
changeset
|
2675 pointer_grabbed = 1; |
2e7603e0c455
Add calls to Grab/UngrabKeyboard to remove strange interactions with
Jan Djärv <jan.h.d@swipnet.se>
parents:
44713
diff
changeset
|
2676 } |
2e7603e0c455
Add calls to Grab/UngrabKeyboard to remove strange interactions with
Jan Djärv <jan.h.d@swipnet.se>
parents:
44713
diff
changeset
|
2677 else |
2e7603e0c455
Add calls to Grab/UngrabKeyboard to remove strange interactions with
Jan Djärv <jan.h.d@swipnet.se>
parents:
44713
diff
changeset
|
2678 XtUngrabPointer ((Widget)mw, event->time); |
2e7603e0c455
Add calls to Grab/UngrabKeyboard to remove strange interactions with
Jan Djärv <jan.h.d@swipnet.se>
parents:
44713
diff
changeset
|
2679 } |
2e7603e0c455
Add calls to Grab/UngrabKeyboard to remove strange interactions with
Jan Djärv <jan.h.d@swipnet.se>
parents:
44713
diff
changeset
|
2680 |
8860 | 2681 #ifdef emacs |
9700
d09dc2f44ecb
(pop_up_menu): Pass a Display * to x_catch_errors, etc.
Richard M. Stallman <rms@gnu.org>
parents:
9395
diff
changeset
|
2682 if (x_had_errors_p (display)) |
8860 | 2683 { |
2684 pointer_grabbed = 0; | |
2685 XtUngrabPointer ((Widget)mw, event->time); | |
2686 } | |
70850
b90abedf3b79
* xlwmenu.c: Include xterm.h if emacs instead of declaring functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68640
diff
changeset
|
2687 x_uncatch_errors (); |
8860 | 2688 #endif |
5626 | 2689 |
70850
b90abedf3b79
* xlwmenu.c: Include xterm.h if emacs instead of declaring functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68640
diff
changeset
|
2690 ((XMotionEvent*)event)->is_hint = 0; |
5626 | 2691 handle_motion_event (mw, (XMotionEvent*)event); |
2692 } | |
52401 | 2693 |
2694 /* arch-tag: 657f43dd-dfd0-4cc9-910c-52935f01176e | |
2695 (do not change this comment) */ |