Mercurial > emacs
annotate src/gtkutil.c @ 74473:24483ef2f3e2
*** empty log message ***
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Thu, 07 Dec 2006 18:11:33 +0000 |
parents | 42ad3938ee1a |
children | de706755c4d7 f1d13e615070 |
rev | line source |
---|---|
49323 | 1 /* Functions for creating and updating GTK widgets. |
68651
3bd95f4f2941
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68500
diff
changeset
|
2 Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. |
49323 | 3 |
4 This file is part of GNU Emacs. | |
5 | |
6 GNU Emacs is free software; you can redistribute it and/or modify | |
7 it under the terms of the GNU General Public License as published by | |
8 the Free Software Foundation; either version 2, or (at your option) | |
9 any later version. | |
10 | |
11 GNU Emacs is distributed in the hope that it will be useful, | |
12 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
14 GNU General Public License for more details. | |
15 | |
16 You should have received a copy of the GNU General Public License | |
17 along with GNU Emacs; see the file COPYING. If not, write to | |
64084 | 18 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
19 Boston, MA 02110-1301, USA. */ | |
49323 | 20 |
21 #include "config.h" | |
22 | |
23 #ifdef USE_GTK | |
49359
14cf50ecf91a
gtkutil.c: Must include stdio.h before termhooks.h
Jan Djärv <jan.h.d@swipnet.se>
parents:
49325
diff
changeset
|
24 #include <string.h> |
58818
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
25 #include <signal.h> |
49359
14cf50ecf91a
gtkutil.c: Must include stdio.h before termhooks.h
Jan Djärv <jan.h.d@swipnet.se>
parents:
49325
diff
changeset
|
26 #include <stdio.h> |
49323 | 27 #include "lisp.h" |
28 #include "xterm.h" | |
29 #include "blockinput.h" | |
58818
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
30 #include "syssignal.h" |
49323 | 31 #include "window.h" |
32 #include "atimer.h" | |
33 #include "gtkutil.h" | |
34 #include "termhooks.h" | |
51408
8f1bed1dee3c
Include keyboard.h, charset.h, coding.h.
Dave Love <fx@gnu.org>
parents:
51211
diff
changeset
|
35 #include "keyboard.h" |
8f1bed1dee3c
Include keyboard.h, charset.h, coding.h.
Dave Love <fx@gnu.org>
parents:
51211
diff
changeset
|
36 #include "charset.h" |
8f1bed1dee3c
Include keyboard.h, charset.h, coding.h.
Dave Love <fx@gnu.org>
parents:
51211
diff
changeset
|
37 #include "coding.h" |
49323 | 38 #include <gdk/gdkkeysyms.h> |
39 | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
40 |
49323 | 41 #define FRAME_TOTAL_PIXEL_HEIGHT(f) \ |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
42 (FRAME_PIXEL_HEIGHT (f) + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f)) |
50129
d0142038feaa
Reduce flicker in GTK scrollbars.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50112
diff
changeset
|
43 |
67528
c5c00342184b
* gtkutil.c (SSDATA): New macro to remove compiler warnings.
Jan Djärv <jan.h.d@swipnet.se>
parents:
65628
diff
changeset
|
44 /* Avoid "differ in sign" warnings */ |
c5c00342184b
* gtkutil.c (SSDATA): New macro to remove compiler warnings.
Jan Djärv <jan.h.d@swipnet.se>
parents:
65628
diff
changeset
|
45 #define SSDATA(x) ((char *) SDATA (x)) |
c5c00342184b
* gtkutil.c (SSDATA): New macro to remove compiler warnings.
Jan Djärv <jan.h.d@swipnet.se>
parents:
65628
diff
changeset
|
46 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
47 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
48 /*********************************************************************** |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
49 Display handling functions |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
50 ***********************************************************************/ |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
51 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
52 #ifdef HAVE_GTK_MULTIDISPLAY |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
53 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
54 /* Return the GdkDisplay that corresponds to the X display DPY. */ |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
55 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
56 static GdkDisplay * |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
57 xg_get_gdk_display (dpy) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
58 Display *dpy; |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
59 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
60 return gdk_x11_lookup_xdisplay (dpy); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
61 } |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
62 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
63 /* When the GTK widget W is to be created on a display for F that |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
64 is not the default display, set the display for W. |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
65 W can be a GtkMenu or a GtkWindow widget. */ |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
66 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
67 static void |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
68 xg_set_screen (w, f) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
69 GtkWidget *w; |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
70 FRAME_PTR f; |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
71 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
72 if (FRAME_X_DISPLAY (f) != GDK_DISPLAY ()) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
73 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
74 GdkDisplay *gdpy = gdk_x11_lookup_xdisplay (FRAME_X_DISPLAY (f)); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
75 GdkScreen *gscreen = gdk_display_get_default_screen (gdpy); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
76 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
77 if (GTK_IS_MENU (w)) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
78 gtk_menu_set_screen (GTK_MENU (w), gscreen); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
79 else |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
80 gtk_window_set_screen (GTK_WINDOW (w), gscreen); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
81 } |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
82 } |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
83 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
84 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
85 #else /* not HAVE_GTK_MULTIDISPLAY */ |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
86 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
87 /* Make some defines so we can use the GTK 2.2 functions when |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
88 compiling with GTK 2.0. */ |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
89 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
90 #define xg_set_screen(w, f) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
91 #define gdk_xid_table_lookup_for_display(dpy, w) gdk_xid_table_lookup (w) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
92 #define gdk_pixmap_foreign_new_for_display(dpy, p) gdk_pixmap_foreign_new (p) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
93 #define gdk_cursor_new_for_display(dpy, c) gdk_cursor_new (c) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
94 #define gdk_x11_lookup_xdisplay(dpy) 0 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
95 #define GdkDisplay void |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
96 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
97 #endif /* not HAVE_GTK_MULTIDISPLAY */ |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
98 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
99 /* Open a display named by DISPLAY_NAME. The display is returned in *DPY. |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
100 *DPY is set to NULL if the display can't be opened. |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
101 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
102 Returns non-zero if display could be opened, zero if display could not |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
103 be opened, and less than zero if the GTK version doesn't support |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
104 multipe displays. */ |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
105 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
106 int |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
107 xg_display_open (display_name, dpy) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
108 char *display_name; |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
109 Display **dpy; |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
110 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
111 #ifdef HAVE_GTK_MULTIDISPLAY |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
112 GdkDisplay *gdpy; |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
113 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
114 gdpy = gdk_display_open (display_name); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
115 *dpy = gdpy ? GDK_DISPLAY_XDISPLAY (gdpy) : NULL; |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
116 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
117 return gdpy != NULL; |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
118 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
119 #else /* not HAVE_GTK_MULTIDISPLAY */ |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
120 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
121 return -1; |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
122 #endif /* not HAVE_GTK_MULTIDISPLAY */ |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
123 } |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
124 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
125 |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
126 /* Close display DPY. */ |
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
127 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
128 void |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
129 xg_display_close (Display *dpy) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
130 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
131 #ifdef HAVE_GTK_MULTIDISPLAY |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
132 GdkDisplay *gdpy = gdk_x11_lookup_xdisplay (dpy); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
133 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
134 /* If this is the default display, we must change it before calling |
72778
ab6be05ddfb1
* gtkutil.c (xg_display_close): Always change default display if needed,
Jan Djärv <jan.h.d@swipnet.se>
parents:
72637
diff
changeset
|
135 dispose, otherwise it will crash on some Gtk+ versions. */ |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
136 if (gdk_display_get_default () == gdpy) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
137 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
138 struct x_display_info *dpyinfo; |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
139 Display *new_dpy = 0; |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
140 GdkDisplay *gdpy_new; |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
141 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
142 /* Find another display. */ |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
143 for (dpyinfo = x_display_list; dpyinfo; dpyinfo = dpyinfo->next) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
144 if (dpyinfo->display != dpy) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
145 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
146 new_dpy = dpyinfo->display; |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
147 break; |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
148 } |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
149 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
150 if (! new_dpy) return; /* Emacs will exit anyway. */ |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
151 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
152 gdpy_new = gdk_x11_lookup_xdisplay (new_dpy); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
153 gdk_display_manager_set_default_display (gdk_display_manager_get (), |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
154 gdpy_new); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
155 } |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
156 |
72778
ab6be05ddfb1
* gtkutil.c (xg_display_close): Always change default display if needed,
Jan Djärv <jan.h.d@swipnet.se>
parents:
72637
diff
changeset
|
157 /* GTK 2.2-2.8 has a bug that makes gdk_display_close crash (bug |
ab6be05ddfb1
* gtkutil.c (xg_display_close): Always change default display if needed,
Jan Djärv <jan.h.d@swipnet.se>
parents:
72637
diff
changeset
|
158 http://bugzilla.gnome.org/show_bug.cgi?id=85715). This way |
ab6be05ddfb1
* gtkutil.c (xg_display_close): Always change default display if needed,
Jan Djärv <jan.h.d@swipnet.se>
parents:
72637
diff
changeset
|
159 we can continue running, but there will be memory leaks. */ |
ab6be05ddfb1
* gtkutil.c (xg_display_close): Always change default display if needed,
Jan Djärv <jan.h.d@swipnet.se>
parents:
72637
diff
changeset
|
160 |
ab6be05ddfb1
* gtkutil.c (xg_display_close): Always change default display if needed,
Jan Djärv <jan.h.d@swipnet.se>
parents:
72637
diff
changeset
|
161 #if GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION < 10 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
162 g_object_run_dispose (G_OBJECT (gdpy)); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
163 #else |
72778
ab6be05ddfb1
* gtkutil.c (xg_display_close): Always change default display if needed,
Jan Djärv <jan.h.d@swipnet.se>
parents:
72637
diff
changeset
|
164 /* This seems to be fixed in GTK 2.10. */ |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
165 gdk_display_close (gdpy); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
166 #endif |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
167 #endif /* HAVE_GTK_MULTIDISPLAY */ |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
168 } |
50129
d0142038feaa
Reduce flicker in GTK scrollbars.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50112
diff
changeset
|
169 |
49323 | 170 |
171 /*********************************************************************** | |
172 Utility functions | |
173 ***********************************************************************/ | |
174 /* The timer for scroll bar repetition and menu bar timeouts. | |
175 NULL if no timer is started. */ | |
176 static struct atimer *xg_timer; | |
177 | |
178 | |
179 /* The next two variables and functions are taken from lwlib. */ | |
180 static widget_value *widget_value_free_list; | |
181 static int malloc_cpt; | |
182 | |
183 /* Allocate a widget_value structure, either by taking one from the | |
184 widget_value_free_list or by malloc:ing a new one. | |
185 | |
186 Return a pointer to the allocated structure. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
187 |
49323 | 188 widget_value * |
189 malloc_widget_value () | |
190 { | |
191 widget_value *wv; | |
192 if (widget_value_free_list) | |
193 { | |
194 wv = widget_value_free_list; | |
195 widget_value_free_list = wv->free_list; | |
196 wv->free_list = 0; | |
197 } | |
198 else | |
199 { | |
69025
5d9232b72d14
(malloc_widget_value): Use xmalloc.
Richard M. Stallman <rms@gnu.org>
parents:
68922
diff
changeset
|
200 wv = (widget_value *) xmalloc (sizeof (widget_value)); |
49323 | 201 malloc_cpt++; |
202 } | |
203 memset (wv, 0, sizeof (widget_value)); | |
204 return wv; | |
205 } | |
206 | |
207 /* This is analogous to free. It frees only what was allocated | |
208 by malloc_widget_value, and no substructures. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
209 |
49323 | 210 void |
211 free_widget_value (wv) | |
212 widget_value *wv; | |
213 { | |
214 if (wv->free_list) | |
215 abort (); | |
216 | |
217 if (malloc_cpt > 25) | |
218 { | |
219 /* When the number of already allocated cells is too big, | |
220 We free it. */ | |
221 free (wv); | |
222 malloc_cpt--; | |
223 } | |
224 else | |
225 { | |
226 wv->free_list = widget_value_free_list; | |
227 widget_value_free_list = wv; | |
228 } | |
229 } | |
230 | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
231 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
232 /* Create and return the cursor to be used for popup menus and |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
233 scroll bars on display DPY. */ |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
234 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
235 GdkCursor * |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
236 xg_create_default_cursor (dpy) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
237 Display *dpy; |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
238 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
239 GdkDisplay *gdpy = gdk_x11_lookup_xdisplay (dpy); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
240 return gdk_cursor_new_for_display (gdpy, GDK_LEFT_PTR); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
241 } |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
242 |
64936
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
243 /* Apply GMASK to GPIX and return a GdkPixbuf with an alpha channel. */ |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
244 |
65006
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
245 static GdkPixbuf * |
64936
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
246 xg_get_pixbuf_from_pix_and_mask (gpix, gmask, cmap) |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
247 GdkPixmap *gpix; |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
248 GdkPixmap *gmask; |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
249 GdkColormap *cmap; |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
250 { |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
251 int x, y, width, height, rowstride, mask_rowstride; |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
252 GdkPixbuf *icon_buf, *tmp_buf; |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
253 guchar *pixels; |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
254 guchar *mask_pixels; |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
255 |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
256 gdk_drawable_get_size (gpix, &width, &height); |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
257 tmp_buf = gdk_pixbuf_get_from_drawable (NULL, gpix, cmap, |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
258 0, 0, 0, 0, width, height); |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
259 icon_buf = gdk_pixbuf_add_alpha (tmp_buf, FALSE, 0, 0, 0); |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
260 g_object_unref (G_OBJECT (tmp_buf)); |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
261 |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
262 if (gmask) |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
263 { |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
264 GdkPixbuf *mask_buf = gdk_pixbuf_get_from_drawable (NULL, |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
265 gmask, |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
266 NULL, |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
267 0, 0, 0, 0, |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
268 width, height); |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
269 guchar *pixels = gdk_pixbuf_get_pixels (icon_buf); |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
270 guchar *mask_pixels = gdk_pixbuf_get_pixels (mask_buf); |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
271 int rowstride = gdk_pixbuf_get_rowstride (icon_buf); |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
272 int mask_rowstride = gdk_pixbuf_get_rowstride (mask_buf); |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
273 int y; |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
274 |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
275 for (y = 0; y < height; ++y) |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
276 { |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
277 guchar *iconptr, *maskptr; |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
278 int x; |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
279 |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
280 iconptr = pixels + y * rowstride; |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
281 maskptr = mask_pixels + y * mask_rowstride; |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
282 |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
283 for (x = 0; x < width; ++x) |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
284 { |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
285 /* In a bitmap, RGB is either 255/255/255 or 0/0/0. Checking |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
286 just R is sufficient. */ |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
287 if (maskptr[0] == 0) |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
288 iconptr[3] = 0; /* 0, 1, 2 is R, G, B. 3 is alpha. */ |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
289 |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
290 iconptr += rowstride/width; |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
291 maskptr += mask_rowstride/width; |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
292 } |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
293 } |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
294 |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
295 g_object_unref (G_OBJECT (mask_buf)); |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
296 } |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
297 |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
298 return icon_buf; |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
299 } |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
300 |
56112
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
301 /* For the image defined in IMG, make and return a GtkImage. For displays with |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
302 8 planes or less we must make a GdkPixbuf and apply the mask manually. |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
303 Otherwise the highlightning and dimming the tool bar code in GTK does |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
304 will look bad. For display with more than 8 planes we just use the |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
305 pixmap and mask directly. For monochrome displays, GTK doesn't seem |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
306 able to use external pixmaps, it looks bad whatever we do. |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
307 The image is defined on the display where frame F is. |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
308 WIDGET is used to find the GdkColormap to use for the GdkPixbuf. |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
309 If OLD_WIDGET is NULL, a new widget is constructed and returned. |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
310 If OLD_WIDGET is not NULL, that widget is modified. */ |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
311 |
56112
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
312 static GtkWidget * |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
313 xg_get_image_for_pixmap (f, img, widget, old_widget) |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
314 FRAME_PTR f; |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
315 struct image *img; |
56112
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
316 GtkWidget *widget; |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
317 GtkImage *old_widget; |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
318 { |
56112
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
319 GdkPixmap *gpix; |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
320 GdkPixmap *gmask; |
56269
4f8b4f60e748
(xg_get_image_for_pixmap): Add workaround for monochrome displays
Jan Djärv <jan.h.d@swipnet.se>
parents:
56268
diff
changeset
|
321 GdkDisplay *gdpy; |
4f8b4f60e748
(xg_get_image_for_pixmap): Add workaround for monochrome displays
Jan Djärv <jan.h.d@swipnet.se>
parents:
56268
diff
changeset
|
322 |
68027
606e8e24acfe
* gtkutil.c (xg_get_image_for_pixmap): If the image is from a file,
Jan Djärv <jan.h.d@swipnet.se>
parents:
67875
diff
changeset
|
323 /* If we have a file, let GTK do all the image handling. |
56269
4f8b4f60e748
(xg_get_image_for_pixmap): Add workaround for monochrome displays
Jan Djärv <jan.h.d@swipnet.se>
parents:
56268
diff
changeset
|
324 This seems to be the only way to make insensitive and activated icons |
68027
606e8e24acfe
* gtkutil.c (xg_get_image_for_pixmap): If the image is from a file,
Jan Djärv <jan.h.d@swipnet.se>
parents:
67875
diff
changeset
|
325 look good in all cases. */ |
606e8e24acfe
* gtkutil.c (xg_get_image_for_pixmap): If the image is from a file,
Jan Djärv <jan.h.d@swipnet.se>
parents:
67875
diff
changeset
|
326 Lisp_Object specified_file = Qnil; |
606e8e24acfe
* gtkutil.c (xg_get_image_for_pixmap): If the image is from a file,
Jan Djärv <jan.h.d@swipnet.se>
parents:
67875
diff
changeset
|
327 Lisp_Object tail; |
69141
6b335e9ea577
* gtkutil.c (xg_get_image_for_pixmap): If x_find_image_file returns
Jan Djärv <jan.h.d@swipnet.se>
parents:
69025
diff
changeset
|
328 Lisp_Object file; |
68027
606e8e24acfe
* gtkutil.c (xg_get_image_for_pixmap): If the image is from a file,
Jan Djärv <jan.h.d@swipnet.se>
parents:
67875
diff
changeset
|
329 extern Lisp_Object QCfile; |
606e8e24acfe
* gtkutil.c (xg_get_image_for_pixmap): If the image is from a file,
Jan Djärv <jan.h.d@swipnet.se>
parents:
67875
diff
changeset
|
330 |
606e8e24acfe
* gtkutil.c (xg_get_image_for_pixmap): If the image is from a file,
Jan Djärv <jan.h.d@swipnet.se>
parents:
67875
diff
changeset
|
331 for (tail = XCDR (img->spec); |
606e8e24acfe
* gtkutil.c (xg_get_image_for_pixmap): If the image is from a file,
Jan Djärv <jan.h.d@swipnet.se>
parents:
67875
diff
changeset
|
332 NILP (specified_file) && CONSP (tail) && CONSP (XCDR (tail)); |
606e8e24acfe
* gtkutil.c (xg_get_image_for_pixmap): If the image is from a file,
Jan Djärv <jan.h.d@swipnet.se>
parents:
67875
diff
changeset
|
333 tail = XCDR (XCDR (tail))) |
606e8e24acfe
* gtkutil.c (xg_get_image_for_pixmap): If the image is from a file,
Jan Djärv <jan.h.d@swipnet.se>
parents:
67875
diff
changeset
|
334 if (EQ (XCAR (tail), QCfile)) |
606e8e24acfe
* gtkutil.c (xg_get_image_for_pixmap): If the image is from a file,
Jan Djärv <jan.h.d@swipnet.se>
parents:
67875
diff
changeset
|
335 specified_file = XCAR (XCDR (tail)); |
606e8e24acfe
* gtkutil.c (xg_get_image_for_pixmap): If the image is from a file,
Jan Djärv <jan.h.d@swipnet.se>
parents:
67875
diff
changeset
|
336 |
69141
6b335e9ea577
* gtkutil.c (xg_get_image_for_pixmap): If x_find_image_file returns
Jan Djärv <jan.h.d@swipnet.se>
parents:
69025
diff
changeset
|
337 /* We already loaded the image once before calling this |
6b335e9ea577
* gtkutil.c (xg_get_image_for_pixmap): If x_find_image_file returns
Jan Djärv <jan.h.d@swipnet.se>
parents:
69025
diff
changeset
|
338 function, so this only fails if the image file has been removed. |
6b335e9ea577
* gtkutil.c (xg_get_image_for_pixmap): If x_find_image_file returns
Jan Djärv <jan.h.d@swipnet.se>
parents:
69025
diff
changeset
|
339 In that case, use the pixmap already loaded. */ |
6b335e9ea577
* gtkutil.c (xg_get_image_for_pixmap): If x_find_image_file returns
Jan Djärv <jan.h.d@swipnet.se>
parents:
69025
diff
changeset
|
340 |
6b335e9ea577
* gtkutil.c (xg_get_image_for_pixmap): If x_find_image_file returns
Jan Djärv <jan.h.d@swipnet.se>
parents:
69025
diff
changeset
|
341 if (STRINGP (specified_file) |
6b335e9ea577
* gtkutil.c (xg_get_image_for_pixmap): If x_find_image_file returns
Jan Djärv <jan.h.d@swipnet.se>
parents:
69025
diff
changeset
|
342 && STRINGP (file = x_find_image_file (specified_file))) |
56269
4f8b4f60e748
(xg_get_image_for_pixmap): Add workaround for monochrome displays
Jan Djärv <jan.h.d@swipnet.se>
parents:
56268
diff
changeset
|
343 { |
68027
606e8e24acfe
* gtkutil.c (xg_get_image_for_pixmap): If the image is from a file,
Jan Djärv <jan.h.d@swipnet.se>
parents:
67875
diff
changeset
|
344 if (! old_widget) |
606e8e24acfe
* gtkutil.c (xg_get_image_for_pixmap): If the image is from a file,
Jan Djärv <jan.h.d@swipnet.se>
parents:
67875
diff
changeset
|
345 old_widget = GTK_IMAGE (gtk_image_new_from_file (SSDATA (file))); |
606e8e24acfe
* gtkutil.c (xg_get_image_for_pixmap): If the image is from a file,
Jan Djärv <jan.h.d@swipnet.se>
parents:
67875
diff
changeset
|
346 else |
606e8e24acfe
* gtkutil.c (xg_get_image_for_pixmap): If the image is from a file,
Jan Djärv <jan.h.d@swipnet.se>
parents:
67875
diff
changeset
|
347 gtk_image_set_from_file (old_widget, SSDATA (file)); |
606e8e24acfe
* gtkutil.c (xg_get_image_for_pixmap): If the image is from a file,
Jan Djärv <jan.h.d@swipnet.se>
parents:
67875
diff
changeset
|
348 |
606e8e24acfe
* gtkutil.c (xg_get_image_for_pixmap): If the image is from a file,
Jan Djärv <jan.h.d@swipnet.se>
parents:
67875
diff
changeset
|
349 return GTK_WIDGET (old_widget); |
56269
4f8b4f60e748
(xg_get_image_for_pixmap): Add workaround for monochrome displays
Jan Djärv <jan.h.d@swipnet.se>
parents:
56268
diff
changeset
|
350 } |
4f8b4f60e748
(xg_get_image_for_pixmap): Add workaround for monochrome displays
Jan Djärv <jan.h.d@swipnet.se>
parents:
56268
diff
changeset
|
351 |
68027
606e8e24acfe
* gtkutil.c (xg_get_image_for_pixmap): If the image is from a file,
Jan Djärv <jan.h.d@swipnet.se>
parents:
67875
diff
changeset
|
352 /* No file, do the image handling ourselves. This will look very bad |
606e8e24acfe
* gtkutil.c (xg_get_image_for_pixmap): If the image is from a file,
Jan Djärv <jan.h.d@swipnet.se>
parents:
67875
diff
changeset
|
353 on a monochrome display, and sometimes bad on all displays with |
606e8e24acfe
* gtkutil.c (xg_get_image_for_pixmap): If the image is from a file,
Jan Djärv <jan.h.d@swipnet.se>
parents:
67875
diff
changeset
|
354 certain themes. */ |
606e8e24acfe
* gtkutil.c (xg_get_image_for_pixmap): If the image is from a file,
Jan Djärv <jan.h.d@swipnet.se>
parents:
67875
diff
changeset
|
355 |
56269
4f8b4f60e748
(xg_get_image_for_pixmap): Add workaround for monochrome displays
Jan Djärv <jan.h.d@swipnet.se>
parents:
56268
diff
changeset
|
356 gdpy = gdk_x11_lookup_xdisplay (FRAME_X_DISPLAY (f)); |
56112
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
357 gpix = gdk_pixmap_foreign_new_for_display (gdpy, img->pixmap); |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
358 gmask = img->mask ? gdk_pixmap_foreign_new_for_display (gdpy, img->mask) : 0; |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
359 |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
360 if (x_screen_planes (f) > 8 || x_screen_planes (f) == 1) |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
361 { |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
362 if (! old_widget) |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
363 old_widget = GTK_IMAGE (gtk_image_new_from_pixmap (gpix, gmask)); |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
364 else |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
365 gtk_image_set_from_pixmap (old_widget, gpix, gmask); |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
366 } |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
367 else |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
368 { |
64936
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
369 |
56269
4f8b4f60e748
(xg_get_image_for_pixmap): Add workaround for monochrome displays
Jan Djärv <jan.h.d@swipnet.se>
parents:
56268
diff
changeset
|
370 /* This is a workaround to make icons look good on pseudo color |
4f8b4f60e748
(xg_get_image_for_pixmap): Add workaround for monochrome displays
Jan Djärv <jan.h.d@swipnet.se>
parents:
56268
diff
changeset
|
371 displays. Apparently GTK expects the images to have an alpha |
4f8b4f60e748
(xg_get_image_for_pixmap): Add workaround for monochrome displays
Jan Djärv <jan.h.d@swipnet.se>
parents:
56268
diff
changeset
|
372 channel. If they don't, insensitive and activated icons will |
4f8b4f60e748
(xg_get_image_for_pixmap): Add workaround for monochrome displays
Jan Djärv <jan.h.d@swipnet.se>
parents:
56268
diff
changeset
|
373 look bad. This workaround does not work on monochrome displays, |
4f8b4f60e748
(xg_get_image_for_pixmap): Add workaround for monochrome displays
Jan Djärv <jan.h.d@swipnet.se>
parents:
56268
diff
changeset
|
374 and is not needed on true color/static color displays (i.e. |
4f8b4f60e748
(xg_get_image_for_pixmap): Add workaround for monochrome displays
Jan Djärv <jan.h.d@swipnet.se>
parents:
56268
diff
changeset
|
375 16 bits and higher). */ |
64936
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
376 GdkColormap *cmap = gtk_widget_get_colormap (widget); |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
377 GdkPixbuf *icon_buf = xg_get_pixbuf_from_pix_and_mask (gpix, gmask, cmap); |
56112
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
378 |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
379 if (! old_widget) |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
380 old_widget = GTK_IMAGE (gtk_image_new_from_pixbuf (icon_buf)); |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
381 else |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
382 gtk_image_set_from_pixbuf (old_widget, icon_buf); |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
383 |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
384 g_object_unref (G_OBJECT (icon_buf)); |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
385 } |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
386 |
56268
9853134cd610
* gtkutil.c (xg_get_image_for_pixmap): Call g_object_unref on
Jan Djärv <jan.h.d@swipnet.se>
parents:
56112
diff
changeset
|
387 g_object_unref (G_OBJECT (gpix)); |
9853134cd610
* gtkutil.c (xg_get_image_for_pixmap): Call g_object_unref on
Jan Djärv <jan.h.d@swipnet.se>
parents:
56112
diff
changeset
|
388 if (gmask) g_object_unref (G_OBJECT (gmask)); |
9853134cd610
* gtkutil.c (xg_get_image_for_pixmap): Call g_object_unref on
Jan Djärv <jan.h.d@swipnet.se>
parents:
56112
diff
changeset
|
389 |
56112
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
390 return GTK_WIDGET (old_widget); |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
391 } |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
392 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
393 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
394 /* Set CURSOR on W and all widgets W contain. We must do like this |
49323 | 395 for scroll bars and menu because they create widgets internally, |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
396 and it is those widgets that are visible. */ |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
397 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
398 static void |
49323 | 399 xg_set_cursor (w, cursor) |
400 GtkWidget *w; | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
401 GdkCursor *cursor; |
49323 | 402 { |
403 GList *children = gdk_window_peek_children (w->window); | |
404 | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
405 gdk_window_set_cursor (w->window, cursor); |
49323 | 406 |
407 /* The scroll bar widget has more than one GDK window (had to look at | |
408 the source to figure this out), and there is no way to set cursor | |
409 on widgets in GTK. So we must set the cursor for all GDK windows. | |
410 Ditto for menus. */ | |
411 | |
412 for ( ; children; children = g_list_next (children)) | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
413 gdk_window_set_cursor (GDK_WINDOW (children->data), cursor); |
49323 | 414 } |
415 | |
416 /* Timer function called when a timeout occurs for xg_timer. | |
417 This function processes all GTK events in a recursive event loop. | |
418 This is done because GTK timer events are not seen by Emacs event | |
419 detection, Emacs only looks for X events. When a scroll bar has the | |
420 pointer (detected by button press/release events below) an Emacs | |
421 timer is started, and this function can then check if the GTK timer | |
422 has expired by calling the GTK event loop. | |
423 Also, when a menu is active, it has a small timeout before it | |
424 pops down the sub menu under it. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
425 |
49323 | 426 static void |
427 xg_process_timeouts (timer) | |
428 struct atimer *timer; | |
429 { | |
430 BLOCK_INPUT; | |
431 /* Ideally we would like to just handle timer events, like the Xt version | |
432 of this does in xterm.c, but there is no such feature in GTK. */ | |
433 while (gtk_events_pending ()) | |
434 gtk_main_iteration (); | |
435 UNBLOCK_INPUT; | |
436 } | |
437 | |
438 /* Start the xg_timer with an interval of 0.1 seconds, if not already started. | |
439 xg_process_timeouts is called when the timer expires. The timer | |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
440 started is continuous, i.e. runs until xg_stop_timer is called. */ |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
441 |
49323 | 442 static void |
443 xg_start_timer () | |
444 { | |
445 if (! xg_timer) | |
446 { | |
447 EMACS_TIME interval; | |
448 EMACS_SET_SECS_USECS (interval, 0, 100000); | |
449 xg_timer = start_atimer (ATIMER_CONTINUOUS, | |
450 interval, | |
451 xg_process_timeouts, | |
452 0); | |
453 } | |
454 } | |
455 | |
456 /* Stop the xg_timer if started. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
457 |
49323 | 458 static void |
459 xg_stop_timer () | |
460 { | |
461 if (xg_timer) | |
462 { | |
463 cancel_atimer (xg_timer); | |
464 xg_timer = 0; | |
465 } | |
466 } | |
467 | |
468 /* Insert NODE into linked LIST. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
469 |
49323 | 470 static void |
471 xg_list_insert (xg_list_node *list, xg_list_node *node) | |
472 { | |
473 xg_list_node *list_start = list->next; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
474 |
49323 | 475 if (list_start) list_start->prev = node; |
476 node->next = list_start; | |
477 node->prev = 0; | |
478 list->next = node; | |
479 } | |
480 | |
481 /* Remove NODE from linked LIST. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
482 |
49323 | 483 static void |
484 xg_list_remove (xg_list_node *list, xg_list_node *node) | |
485 { | |
486 xg_list_node *list_start = list->next; | |
487 if (node == list_start) | |
488 { | |
489 list->next = node->next; | |
490 if (list->next) list->next->prev = 0; | |
491 } | |
492 else | |
493 { | |
494 node->prev->next = node->next; | |
495 if (node->next) node->next->prev = node->prev; | |
496 } | |
497 } | |
498 | |
499 /* Allocate and return a utf8 version of STR. If STR is already | |
500 utf8 or NULL, just return STR. | |
501 If not, a new string is allocated and the caller must free the result | |
502 with g_free. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
503 |
49323 | 504 static char * |
505 get_utf8_string (str) | |
506 char *str; | |
507 { | |
508 char *utf8_str = str; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
509 |
72928
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
510 if (!str) return NULL; |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
511 |
49323 | 512 /* If not UTF-8, try current locale. */ |
72928
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
513 if (!g_utf8_validate (str, -1, NULL)) |
49323 | 514 utf8_str = g_locale_to_utf8 (str, -1, 0, 0, 0); |
515 | |
72928
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
516 if (!utf8_str) |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
517 { |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
518 /* Probably some control characters in str. Escape them. */ |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
519 size_t nr_bad = 0; |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
520 gsize bytes_read; |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
521 gsize bytes_written; |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
522 unsigned char *p = (unsigned char *)str; |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
523 char *cp, *up; |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
524 GError *error = NULL; |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
525 |
73389
7b5c0104efb0
* gtkutil.c (get_utf8_string): Remove warnings with casts.
Jan Djärv <jan.h.d@swipnet.se>
parents:
73066
diff
changeset
|
526 while (! (cp = g_locale_to_utf8 ((char *)p, -1, &bytes_read, |
7b5c0104efb0
* gtkutil.c (get_utf8_string): Remove warnings with casts.
Jan Djärv <jan.h.d@swipnet.se>
parents:
73066
diff
changeset
|
527 &bytes_written, &error)) |
72928
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
528 && error->code == G_CONVERT_ERROR_ILLEGAL_SEQUENCE) |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
529 { |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
530 ++nr_bad; |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
531 p += bytes_written+1; |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
532 g_error_free (error); |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
533 error = NULL; |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
534 } |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
535 |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
536 if (error) |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
537 { |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
538 g_error_free (error); |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
539 error = NULL; |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
540 } |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
541 if (cp) g_free (cp); |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
542 |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
543 up = utf8_str = xmalloc (strlen (str) + nr_bad * 4 + 1); |
73389
7b5c0104efb0
* gtkutil.c (get_utf8_string): Remove warnings with casts.
Jan Djärv <jan.h.d@swipnet.se>
parents:
73066
diff
changeset
|
544 p = (unsigned char *)str; |
7b5c0104efb0
* gtkutil.c (get_utf8_string): Remove warnings with casts.
Jan Djärv <jan.h.d@swipnet.se>
parents:
73066
diff
changeset
|
545 |
7b5c0104efb0
* gtkutil.c (get_utf8_string): Remove warnings with casts.
Jan Djärv <jan.h.d@swipnet.se>
parents:
73066
diff
changeset
|
546 while (! (cp = g_locale_to_utf8 ((char *)p, -1, &bytes_read, |
72928
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
547 &bytes_written, &error)) |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
548 && error->code == G_CONVERT_ERROR_ILLEGAL_SEQUENCE) |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
549 { |
73389
7b5c0104efb0
* gtkutil.c (get_utf8_string): Remove warnings with casts.
Jan Djärv <jan.h.d@swipnet.se>
parents:
73066
diff
changeset
|
550 strncpy (up, (char *)p, bytes_written); |
72928
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
551 sprintf (up + bytes_written, "\\%03o", p[bytes_written]); |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
552 up[bytes_written+4] = '\0'; |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
553 up += bytes_written+4; |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
554 p += bytes_written+1; |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
555 g_error_free (error); |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
556 error = NULL; |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
557 } |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
558 |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
559 if (cp) |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
560 { |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
561 strcat (utf8_str, cp); |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
562 g_free (cp); |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
563 } |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
564 if (error) |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
565 { |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
566 g_error_free (error); |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
567 error = NULL; |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
568 } |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
569 } |
49323 | 570 return utf8_str; |
571 } | |
572 | |
573 | |
574 | |
575 /*********************************************************************** | |
576 General functions for creating widgets, resizing, events, e.t.c. | |
577 ***********************************************************************/ | |
578 | |
579 /* Make a geometry string and pass that to GTK. It seems this is the | |
580 only way to get geometry position right if the user explicitly | |
581 asked for a position when starting Emacs. | |
582 F is the frame we shall set geometry for. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
583 |
49323 | 584 static void |
585 xg_set_geometry (f) | |
586 FRAME_PTR f; | |
587 { | |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
588 if (f->size_hint_flags & USPosition) |
49323 | 589 { |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
590 int left = f->left_pos; |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
591 int xneg = f->size_hint_flags & XNegative; |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
592 int top = f->top_pos; |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
593 int yneg = f->size_hint_flags & YNegative; |
49323 | 594 char geom_str[32]; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
595 |
49323 | 596 if (xneg) |
597 left = -left; | |
598 if (yneg) | |
599 top = -top; | |
600 | |
601 sprintf (geom_str, "=%dx%d%c%d%c%d", | |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
602 FRAME_PIXEL_WIDTH (f), |
49323 | 603 FRAME_TOTAL_PIXEL_HEIGHT (f), |
604 (xneg ? '-' : '+'), left, | |
605 (yneg ? '-' : '+'), top); | |
606 | |
607 if (!gtk_window_parse_geometry (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)), | |
608 geom_str)) | |
609 fprintf (stderr, "Failed to parse: '%s'\n", geom_str); | |
65628
a998f173b21a
* gtkutil.c (xg_set_geometry): Do a gtk_window_move if program
Jan Djärv <jan.h.d@swipnet.se>
parents:
65006
diff
changeset
|
610 } else if (f->size_hint_flags & PPosition) { |
a998f173b21a
* gtkutil.c (xg_set_geometry): Do a gtk_window_move if program
Jan Djärv <jan.h.d@swipnet.se>
parents:
65006
diff
changeset
|
611 gtk_window_move (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)), |
a998f173b21a
* gtkutil.c (xg_set_geometry): Do a gtk_window_move if program
Jan Djärv <jan.h.d@swipnet.se>
parents:
65006
diff
changeset
|
612 f->left_pos, f->top_pos); |
49323 | 613 } |
614 } | |
615 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
616 |
49323 | 617 /* Resize the outer window of frame F after chainging the height. |
618 This happend when the menu bar or the tool bar is added or removed. | |
619 COLUMNS/ROWS is the size the edit area shall have after the resize. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
620 |
49323 | 621 static void |
622 xg_resize_outer_widget (f, columns, rows) | |
623 FRAME_PTR f; | |
624 int columns; | |
625 int rows; | |
626 { | |
627 /* If we are not mapped yet, set geometry once again, as window | |
628 height now have changed. */ | |
629 if (! GTK_WIDGET_MAPPED (FRAME_GTK_OUTER_WIDGET (f))) | |
630 xg_set_geometry (f); | |
631 | |
632 xg_frame_set_char_size (f, columns, rows); | |
633 gdk_window_process_all_updates (); | |
634 } | |
635 | |
636 /* Function to handle resize of our widgets. Since Emacs has some layouts | |
637 that does not fit well with GTK standard containers, we do most layout | |
638 manually. | |
639 F is the frame to resize. | |
640 PIXELWIDTH, PIXELHEIGHT is the new size in pixels. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
641 |
49323 | 642 void |
643 xg_resize_widgets (f, pixelwidth, pixelheight) | |
644 FRAME_PTR f; | |
645 int pixelwidth, pixelheight; | |
646 { | |
647 int mbheight = FRAME_MENUBAR_HEIGHT (f); | |
648 int tbheight = FRAME_TOOLBAR_HEIGHT (f); | |
60185
391f44959566
(xg_create_frame_widgets): UNBLOCK_INPUT on error.
Kim F. Storm <storm@cua.dk>
parents:
59913
diff
changeset
|
649 int rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, (pixelheight |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
650 - mbheight - tbheight)); |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
651 int columns = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, pixelwidth); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
652 |
49323 | 653 if (FRAME_GTK_WIDGET (f) |
60185
391f44959566
(xg_create_frame_widgets): UNBLOCK_INPUT on error.
Kim F. Storm <storm@cua.dk>
parents:
59913
diff
changeset
|
654 && (columns != FRAME_COLS (f) |
57597
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
655 || rows != FRAME_LINES (f) |
60185
391f44959566
(xg_create_frame_widgets): UNBLOCK_INPUT on error.
Kim F. Storm <storm@cua.dk>
parents:
59913
diff
changeset
|
656 || pixelwidth != FRAME_PIXEL_WIDTH (f) |
57597
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
657 || pixelheight != FRAME_PIXEL_HEIGHT (f))) |
49323 | 658 { |
659 struct x_output *x = f->output_data.x; | |
660 GtkAllocation all; | |
661 | |
662 all.y = mbheight + tbheight; | |
663 all.x = 0; | |
664 | |
665 all.width = pixelwidth; | |
666 all.height = pixelheight - mbheight - tbheight; | |
667 | |
668 gtk_widget_size_allocate (x->edit_widget, &all); | |
50129
d0142038feaa
Reduce flicker in GTK scrollbars.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50112
diff
changeset
|
669 |
49323 | 670 change_frame_size (f, rows, columns, 0, 1, 0); |
671 SET_FRAME_GARBAGED (f); | |
672 cancel_mouse_face (f); | |
673 } | |
674 } | |
675 | |
676 | |
677 /* Update our widget size to be COLS/ROWS characters for frame F. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
678 |
49323 | 679 void |
680 xg_frame_set_char_size (f, cols, rows) | |
681 FRAME_PTR f; | |
682 int cols; | |
683 int rows; | |
684 { | |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
685 int pixelheight = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, rows) |
49323 | 686 + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f); |
50318
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
687 int pixelwidth; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
688 |
49323 | 689 /* Take into account the size of the scroll bar. Always use the |
690 number of columns occupied by the scroll bar here otherwise we | |
691 might end up with a frame width that is not a multiple of the | |
692 frame's character width which is bad for vertically split | |
693 windows. */ | |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
694 f->scroll_bar_actual_width |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
695 = FRAME_SCROLL_BAR_COLS (f) * FRAME_COLUMN_WIDTH (f); |
49323 | 696 |
50099
a62497b91c74
Use generic compute_fringe_widths.
Kim F. Storm <storm@cua.dk>
parents:
50063
diff
changeset
|
697 compute_fringe_widths (f, 0); |
49323 | 698 |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
699 /* FRAME_TEXT_COLS_TO_PIXEL_WIDTH uses scroll_bar_actual_width, so call it |
50318
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
700 after calculating that value. */ |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
701 pixelwidth = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, cols); |
50318
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
702 |
49323 | 703 /* Must resize our top level widget. Font size may have changed, |
704 but not rows/cols. */ | |
705 gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)), | |
706 pixelwidth, pixelheight); | |
707 xg_resize_widgets (f, pixelwidth, pixelheight); | |
53275
a07a0bae1990
* gtkutil.c (xg_frame_set_char_size): Call x_wm_set_size_hint.
Jan Djärv <jan.h.d@swipnet.se>
parents:
53069
diff
changeset
|
708 x_wm_set_size_hint (f, 0, 0); |
50318
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
709 SET_FRAME_GARBAGED (f); |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
710 cancel_mouse_face (f); |
49323 | 711 } |
712 | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
713 /* Convert an X Window WSESC on display DPY to its corresponding GtkWidget. |
49323 | 714 Must be done like this, because GtkWidget:s can have "hidden" |
715 X Window that aren't accessible. | |
716 | |
717 Return 0 if no widget match WDESC. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
718 |
49323 | 719 GtkWidget * |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
720 xg_win_to_widget (dpy, wdesc) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
721 Display *dpy; |
49323 | 722 Window wdesc; |
723 { | |
724 gpointer gdkwin; | |
725 GtkWidget *gwdesc = 0; | |
726 | |
727 BLOCK_INPUT; | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
728 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
729 gdkwin = gdk_xid_table_lookup_for_display (gdk_x11_lookup_xdisplay (dpy), |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
730 wdesc); |
49323 | 731 if (gdkwin) |
732 { | |
733 GdkEvent event; | |
734 event.any.window = gdkwin; | |
735 gwdesc = gtk_get_event_widget (&event); | |
736 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
737 |
49323 | 738 UNBLOCK_INPUT; |
739 return gwdesc; | |
740 } | |
741 | |
742 /* Fill in the GdkColor C so that it represents PIXEL. | |
743 W is the widget that color will be used for. Used to find colormap. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
744 |
49323 | 745 static void |
746 xg_pix_to_gcolor (w, pixel, c) | |
747 GtkWidget *w; | |
748 unsigned long pixel; | |
749 GdkColor *c; | |
750 { | |
751 GdkColormap *map = gtk_widget_get_colormap (w); | |
752 gdk_colormap_query_color (map, pixel, c); | |
753 } | |
754 | |
755 /* Create and set up the GTK widgets for frame F. | |
756 Return 0 if creation failed, non-zero otherwise. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
757 |
49323 | 758 int |
759 xg_create_frame_widgets (f) | |
760 FRAME_PTR f; | |
761 { | |
762 GtkWidget *wtop; | |
763 GtkWidget *wvbox; | |
764 GtkWidget *wfixed; | |
765 GdkColor bg; | |
766 GtkRcStyle *style; | |
767 int i; | |
768 char *title = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
769 |
49323 | 770 BLOCK_INPUT; |
771 | |
772 wtop = gtk_window_new (GTK_WINDOW_TOPLEVEL); | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
773 xg_set_screen (wtop, f); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
774 |
49323 | 775 wvbox = gtk_vbox_new (FALSE, 0); |
776 wfixed = gtk_fixed_new (); /* Must have this to place scroll bars */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
777 |
49323 | 778 if (! wtop || ! wvbox || ! wfixed) |
779 { | |
780 if (wtop) gtk_widget_destroy (wtop); | |
781 if (wvbox) gtk_widget_destroy (wvbox); | |
782 if (wfixed) gtk_widget_destroy (wfixed); | |
783 | |
60185
391f44959566
(xg_create_frame_widgets): UNBLOCK_INPUT on error.
Kim F. Storm <storm@cua.dk>
parents:
59913
diff
changeset
|
784 UNBLOCK_INPUT; |
49323 | 785 return 0; |
786 } | |
787 | |
788 /* Use same names as the Xt port does. I.e. Emacs.pane.emacs by default */ | |
789 gtk_widget_set_name (wtop, EMACS_CLASS); | |
790 gtk_widget_set_name (wvbox, "pane"); | |
67528
c5c00342184b
* gtkutil.c (SSDATA): New macro to remove compiler warnings.
Jan Djärv <jan.h.d@swipnet.se>
parents:
65628
diff
changeset
|
791 gtk_widget_set_name (wfixed, SSDATA (Vx_resource_name)); |
49323 | 792 |
793 /* If this frame has a title or name, set it in the title bar. */ | |
67528
c5c00342184b
* gtkutil.c (SSDATA): New macro to remove compiler warnings.
Jan Djärv <jan.h.d@swipnet.se>
parents:
65628
diff
changeset
|
794 if (! NILP (f->title)) title = SSDATA (ENCODE_UTF_8 (f->title)); |
c5c00342184b
* gtkutil.c (SSDATA): New macro to remove compiler warnings.
Jan Djärv <jan.h.d@swipnet.se>
parents:
65628
diff
changeset
|
795 else if (! NILP (f->name)) title = SSDATA (ENCODE_UTF_8 (f->name)); |
49323 | 796 |
797 if (title) gtk_window_set_title (GTK_WINDOW (wtop), title); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
798 |
49323 | 799 FRAME_GTK_OUTER_WIDGET (f) = wtop; |
800 FRAME_GTK_WIDGET (f) = wfixed; | |
801 f->output_data.x->vbox_widget = wvbox; | |
802 | |
803 gtk_fixed_set_has_window (GTK_FIXED (wfixed), TRUE); | |
804 | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
805 gtk_widget_set_size_request (wfixed, FRAME_PIXEL_WIDTH (f), |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
806 FRAME_PIXEL_HEIGHT (f)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
807 |
49323 | 808 gtk_container_add (GTK_CONTAINER (wtop), wvbox); |
809 gtk_box_pack_end (GTK_BOX (wvbox), wfixed, TRUE, TRUE, 0); | |
810 | |
811 if (FRAME_EXTERNAL_TOOL_BAR (f)) | |
812 update_frame_tool_bar (f); | |
813 | |
814 /* The tool bar is created but first there are no items in it. | |
815 This causes it to be zero height. Later items are added, but then | |
816 the frame is already mapped, so there is a "jumping" resize. | |
817 This makes geometry handling difficult, for example -0-0 will end | |
818 up in the wrong place as tool bar height has not been taken into account. | |
819 So we cheat a bit by setting a height that is what it will have | |
820 later on when tool bar items are added. */ | |
56804
3f2598db97ac
* gtkutil.c (xg_create_frame_widgets): Compensate for tool bar when
Jan Djärv <jan.h.d@swipnet.se>
parents:
56269
diff
changeset
|
821 if (FRAME_EXTERNAL_TOOL_BAR (f) && f->n_tool_bar_items == 0) |
59420
eb72706060ad
* xterm.h (struct x_output): New member, toolbar_detached.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59411
diff
changeset
|
822 FRAME_TOOLBAR_HEIGHT (f) = 38; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
823 |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
824 |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
825 /* We don't want this widget double buffered, because we draw on it |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
826 with regular X drawing primitives, so from a GTK/GDK point of |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
827 view, the widget is totally blank. When an expose comes, this |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
828 will make the widget blank, and then Emacs redraws it. This flickers |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
829 a lot, so we turn off double buffering. */ |
49323 | 830 gtk_widget_set_double_buffered (wfixed, FALSE); |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
831 |
49323 | 832 /* GTK documents says use gtk_window_set_resizable. But then a user |
833 can't shrink the window from its starting size. */ | |
834 gtk_window_set_policy (GTK_WINDOW (wtop), TRUE, TRUE, TRUE); | |
835 gtk_window_set_wmclass (GTK_WINDOW (wtop), | |
67528
c5c00342184b
* gtkutil.c (SSDATA): New macro to remove compiler warnings.
Jan Djärv <jan.h.d@swipnet.se>
parents:
65628
diff
changeset
|
836 SSDATA (Vx_resource_name), |
c5c00342184b
* gtkutil.c (SSDATA): New macro to remove compiler warnings.
Jan Djärv <jan.h.d@swipnet.se>
parents:
65628
diff
changeset
|
837 SSDATA (Vx_resource_class)); |
49323 | 838 |
839 /* Add callback to do nothing on WM_DELETE_WINDOW. The default in | |
840 GTK is to destroy the widget. We want Emacs to do that instead. */ | |
841 g_signal_connect (G_OBJECT (wtop), "delete-event", | |
842 G_CALLBACK (gtk_true), 0); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
843 |
49323 | 844 /* Convert our geometry parameters into a geometry string |
845 and specify it. | |
846 GTK will itself handle calculating the real position this way. */ | |
847 xg_set_geometry (f); | |
848 | |
849 gtk_widget_add_events (wfixed, | |
850 GDK_POINTER_MOTION_MASK | |
851 | GDK_EXPOSURE_MASK | |
852 | GDK_BUTTON_PRESS_MASK | |
853 | GDK_BUTTON_RELEASE_MASK | |
854 | GDK_KEY_PRESS_MASK | |
855 | GDK_ENTER_NOTIFY_MASK | |
856 | GDK_LEAVE_NOTIFY_MASK | |
857 | GDK_FOCUS_CHANGE_MASK | |
858 | GDK_STRUCTURE_MASK | |
859 | GDK_VISIBILITY_NOTIFY_MASK); | |
860 | |
861 /* Must realize the windows so the X window gets created. It is used | |
862 by callers of this function. */ | |
863 gtk_widget_realize (wfixed); | |
864 FRAME_X_WINDOW (f) = GTK_WIDGET_TO_X_WIN (wfixed); | |
865 | |
866 /* Since GTK clears its window by filling with the background color, | |
867 we must keep X and GTK background in sync. */ | |
868 xg_pix_to_gcolor (wfixed, f->output_data.x->background_pixel, &bg); | |
869 gtk_widget_modify_bg (wfixed, GTK_STATE_NORMAL, &bg); | |
870 | |
871 /* Also, do not let any background pixmap to be set, this looks very | |
872 bad as Emacs overwrites the background pixmap with its own idea | |
873 of background color. */ | |
874 style = gtk_widget_get_modifier_style (wfixed); | |
875 | |
876 /* Must use g_strdup because gtk_widget_modify_style does g_free. */ | |
877 style->bg_pixmap_name[GTK_STATE_NORMAL] = g_strdup ("<none>"); | |
878 gtk_widget_modify_style (wfixed, style); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
879 |
49323 | 880 /* GTK does not set any border, and they look bad with GTK. */ |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
881 f->border_width = 0; |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
882 f->internal_border_width = 0; |
49323 | 883 |
884 UNBLOCK_INPUT; | |
885 | |
886 return 1; | |
887 } | |
888 | |
889 /* Set the normal size hints for the window manager, for frame F. | |
890 FLAGS is the flags word to use--or 0 meaning preserve the flags | |
891 that the window now has. | |
892 If USER_POSITION is nonzero, we set the User Position | |
893 flag (this is useful when FLAGS is 0). */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
894 |
49323 | 895 void |
896 x_wm_set_size_hint (f, flags, user_position) | |
897 FRAME_PTR f; | |
898 long flags; | |
899 int user_position; | |
900 { | |
901 if (FRAME_GTK_OUTER_WIDGET (f)) | |
902 { | |
903 /* Must use GTK routines here, otherwise GTK resets the size hints | |
904 to its own defaults. */ | |
905 GdkGeometry size_hints; | |
906 gint hint_flags = 0; | |
907 int base_width, base_height; | |
908 int min_rows = 0, min_cols = 0; | |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
909 int win_gravity = f->win_gravity; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
910 |
49323 | 911 if (flags) |
912 { | |
913 memset (&size_hints, 0, sizeof (size_hints)); | |
914 f->output_data.x->size_hints = size_hints; | |
915 f->output_data.x->hint_flags = hint_flags; | |
916 } | |
917 else | |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
918 flags = f->size_hint_flags; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
919 |
49323 | 920 size_hints = f->output_data.x->size_hints; |
921 hint_flags = f->output_data.x->hint_flags; | |
922 | |
923 hint_flags |= GDK_HINT_RESIZE_INC | GDK_HINT_MIN_SIZE; | |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
924 size_hints.width_inc = FRAME_COLUMN_WIDTH (f); |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
925 size_hints.height_inc = FRAME_LINE_HEIGHT (f); |
49323 | 926 |
927 hint_flags |= GDK_HINT_BASE_SIZE; | |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
928 base_width = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, 0); |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
929 base_height = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, 0) |
49323 | 930 + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f); |
931 | |
932 check_frame_size (f, &min_rows, &min_cols); | |
933 | |
934 size_hints.base_width = base_width; | |
935 size_hints.base_height = base_height; | |
936 size_hints.min_width = base_width + min_cols * size_hints.width_inc; | |
937 size_hints.min_height = base_height + min_rows * size_hints.height_inc; | |
938 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
939 |
49323 | 940 /* These currently have a one to one mapping with the X values, but I |
941 don't think we should rely on that. */ | |
942 hint_flags |= GDK_HINT_WIN_GRAVITY; | |
943 size_hints.win_gravity = 0; | |
944 if (win_gravity == NorthWestGravity) | |
945 size_hints.win_gravity = GDK_GRAVITY_NORTH_WEST; | |
946 else if (win_gravity == NorthGravity) | |
947 size_hints.win_gravity = GDK_GRAVITY_NORTH; | |
948 else if (win_gravity == NorthEastGravity) | |
949 size_hints.win_gravity = GDK_GRAVITY_NORTH_EAST; | |
950 else if (win_gravity == WestGravity) | |
951 size_hints.win_gravity = GDK_GRAVITY_WEST; | |
952 else if (win_gravity == CenterGravity) | |
953 size_hints.win_gravity = GDK_GRAVITY_CENTER; | |
954 else if (win_gravity == EastGravity) | |
955 size_hints.win_gravity = GDK_GRAVITY_EAST; | |
956 else if (win_gravity == SouthWestGravity) | |
957 size_hints.win_gravity = GDK_GRAVITY_SOUTH_WEST; | |
958 else if (win_gravity == SouthGravity) | |
959 size_hints.win_gravity = GDK_GRAVITY_SOUTH; | |
960 else if (win_gravity == SouthEastGravity) | |
961 size_hints.win_gravity = GDK_GRAVITY_SOUTH_EAST; | |
962 else if (win_gravity == StaticGravity) | |
963 size_hints.win_gravity = GDK_GRAVITY_STATIC; | |
964 | |
965 if (flags & PPosition) hint_flags |= GDK_HINT_POS; | |
966 if (flags & USPosition) hint_flags |= GDK_HINT_USER_POS; | |
967 if (flags & USSize) hint_flags |= GDK_HINT_USER_SIZE; | |
968 | |
969 if (user_position) | |
970 { | |
971 hint_flags &= ~GDK_HINT_POS; | |
972 hint_flags |= GDK_HINT_USER_POS; | |
973 } | |
974 | |
975 BLOCK_INPUT; | |
976 | |
977 gtk_window_set_geometry_hints (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)), | |
978 FRAME_GTK_OUTER_WIDGET (f), | |
979 &size_hints, | |
980 hint_flags); | |
981 | |
982 f->output_data.x->size_hints = size_hints; | |
983 f->output_data.x->hint_flags = hint_flags; | |
984 UNBLOCK_INPUT; | |
985 } | |
986 } | |
987 | |
988 /* Change background color of a frame. | |
989 Since GTK uses the background colour to clear the window, we must | |
990 keep the GTK and X colors in sync. | |
991 F is the frame to change, | |
992 BG is the pixel value to change to. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
993 |
49323 | 994 void |
995 xg_set_background_color (f, bg) | |
996 FRAME_PTR f; | |
997 unsigned long bg; | |
998 { | |
999 if (FRAME_GTK_WIDGET (f)) | |
1000 { | |
1001 GdkColor gdk_bg; | |
1002 | |
1003 BLOCK_INPUT; | |
1004 xg_pix_to_gcolor (FRAME_GTK_WIDGET (f), bg, &gdk_bg); | |
1005 gtk_widget_modify_bg (FRAME_GTK_WIDGET (f), GTK_STATE_NORMAL, &gdk_bg); | |
1006 UNBLOCK_INPUT; | |
1007 } | |
1008 } | |
1009 | |
1010 | |
65006
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1011 /* Set the frame icon to ICON_PIXMAP/MASK. This must be done with GTK |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1012 functions so GTK does not overwrite the icon. */ |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1013 |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1014 void |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1015 xg_set_frame_icon (f, icon_pixmap, icon_mask) |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1016 FRAME_PTR f; |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1017 Pixmap icon_pixmap; |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1018 Pixmap icon_mask; |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1019 { |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1020 GdkDisplay *gdpy = gdk_x11_lookup_xdisplay (FRAME_X_DISPLAY (f)); |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1021 GdkPixmap *gpix = gdk_pixmap_foreign_new_for_display (gdpy, icon_pixmap); |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1022 GdkPixmap *gmask = gdk_pixmap_foreign_new_for_display (gdpy, icon_mask); |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1023 GdkPixbuf *gp = xg_get_pixbuf_from_pix_and_mask (gpix, gmask, NULL); |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1024 |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1025 gtk_window_set_icon (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)), gp); |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1026 } |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1027 |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1028 |
49323 | 1029 |
1030 /*********************************************************************** | |
1031 Dialog functions | |
1032 ***********************************************************************/ | |
1033 /* Return the dialog title to use for a dialog of type KEY. | |
1034 This is the encoding used by lwlib. We use the same for GTK. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
1035 |
49323 | 1036 static char * |
1037 get_dialog_title (char key) | |
1038 { | |
1039 char *title = ""; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1040 |
49323 | 1041 switch (key) { |
1042 case 'E': case 'e': | |
1043 title = "Error"; | |
1044 break; | |
1045 | |
1046 case 'I': case 'i': | |
1047 title = "Information"; | |
1048 break; | |
1049 | |
1050 case 'L': case 'l': | |
1051 title = "Prompt"; | |
1052 break; | |
1053 | |
1054 case 'P': case 'p': | |
1055 title = "Prompt"; | |
1056 break; | |
1057 | |
1058 case 'Q': case 'q': | |
1059 title = "Question"; | |
1060 break; | |
1061 } | |
1062 | |
1063 return title; | |
1064 } | |
1065 | |
1066 /* Callback for dialogs that get WM_DELETE_WINDOW. We pop down | |
1067 the dialog, but return TRUE so the event does not propagate further | |
1068 in GTK. This prevents GTK from destroying the dialog widget automatically | |
1069 and we can always destrou the widget manually, regardles of how | |
1070 it was popped down (button press or WM_DELETE_WINDOW). | |
1071 W is the dialog widget. | |
1072 EVENT is the GdkEvent that represents WM_DELETE_WINDOW (not used). | |
1073 user_data is NULL (not used). | |
1074 | |
1075 Returns TRUE to end propagation of event. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
1076 |
49323 | 1077 static gboolean |
1078 dialog_delete_callback (w, event, user_data) | |
1079 GtkWidget *w; | |
1080 GdkEvent *event; | |
1081 gpointer user_data; | |
1082 { | |
1083 gtk_widget_unmap (w); | |
1084 return TRUE; | |
1085 } | |
1086 | |
1087 /* Create a popup dialog window. See also xg_create_widget below. | |
1088 WV is a widget_value describing the dialog. | |
1089 SELECT_CB is the callback to use when a button has been pressed. | |
1090 DEACTIVATE_CB is the callback to use when the dialog pops down. | |
1091 | |
1092 Returns the GTK dialog widget. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
1093 |
49323 | 1094 static GtkWidget * |
1095 create_dialog (wv, select_cb, deactivate_cb) | |
1096 widget_value *wv; | |
1097 GCallback select_cb; | |
1098 GCallback deactivate_cb; | |
1099 { | |
1100 char *title = get_dialog_title (wv->name[0]); | |
1101 int total_buttons = wv->name[1] - '0'; | |
1102 int right_buttons = wv->name[4] - '0'; | |
1103 int left_buttons; | |
1104 int button_nr = 0; | |
1105 int button_spacing = 10; | |
1106 GtkWidget *wdialog = gtk_dialog_new (); | |
1107 widget_value *item; | |
1108 GtkBox *cur_box; | |
1109 GtkWidget *wvbox; | |
1110 GtkWidget *whbox_up; | |
1111 GtkWidget *whbox_down; | |
1112 | |
1113 /* If the number of buttons is greater than 4, make two rows of buttons | |
1114 instead. This looks better. */ | |
1115 int make_two_rows = total_buttons > 4; | |
1116 | |
1117 if (right_buttons == 0) right_buttons = total_buttons/2; | |
1118 left_buttons = total_buttons - right_buttons; | |
1119 | |
1120 gtk_window_set_title (GTK_WINDOW (wdialog), title); | |
1121 gtk_widget_set_name (wdialog, "emacs-dialog"); | |
1122 | |
1123 cur_box = GTK_BOX (GTK_DIALOG (wdialog)->action_area); | |
1124 | |
1125 if (make_two_rows) | |
1126 { | |
1127 wvbox = gtk_vbox_new (TRUE, button_spacing); | |
1128 whbox_up = gtk_hbox_new (FALSE, 0); | |
1129 whbox_down = gtk_hbox_new (FALSE, 0); | |
1130 | |
1131 gtk_box_pack_start (cur_box, wvbox, FALSE, FALSE, 0); | |
1132 gtk_box_pack_start (GTK_BOX (wvbox), whbox_up, FALSE, FALSE, 0); | |
1133 gtk_box_pack_start (GTK_BOX (wvbox), whbox_down, FALSE, FALSE, 0); | |
1134 | |
1135 cur_box = GTK_BOX (whbox_up); | |
1136 } | |
1137 | |
1138 g_signal_connect (G_OBJECT (wdialog), "delete-event", | |
1139 G_CALLBACK (dialog_delete_callback), 0); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1140 |
49323 | 1141 if (deactivate_cb) |
1142 { | |
1143 g_signal_connect (G_OBJECT (wdialog), "close", deactivate_cb, 0); | |
1144 g_signal_connect (G_OBJECT (wdialog), "response", deactivate_cb, 0); | |
1145 } | |
1146 | |
1147 for (item = wv->contents; item; item = item->next) | |
1148 { | |
1149 char *utf8_label = get_utf8_string (item->value); | |
1150 GtkWidget *w; | |
1151 GtkRequisition req; | |
1152 | |
49488
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
1153 if (item->name && strcmp (item->name, "message") == 0) |
49323 | 1154 { |
1155 /* This is the text part of the dialog. */ | |
1156 w = gtk_label_new (utf8_label); | |
1157 gtk_box_pack_start (GTK_BOX (GTK_DIALOG (wdialog)->vbox), | |
1158 gtk_label_new (""), | |
1159 FALSE, FALSE, 0); | |
1160 gtk_box_pack_start (GTK_BOX (GTK_DIALOG (wdialog)->vbox), w, | |
1161 TRUE, TRUE, 0); | |
1162 gtk_misc_set_alignment (GTK_MISC (w), 0.1, 0.5); | |
1163 | |
1164 /* Try to make dialog look better. Must realize first so | |
1165 the widget can calculate the size it needs. */ | |
1166 gtk_widget_realize (w); | |
1167 gtk_widget_size_request (w, &req); | |
1168 gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (wdialog)->vbox), | |
1169 req.height); | |
49488
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
1170 if (item->value && strlen (item->value) > 0) |
49323 | 1171 button_spacing = 2*req.width/strlen (item->value); |
1172 } | |
1173 else | |
1174 { | |
1175 /* This is one button to add to the dialog. */ | |
50778
f30e6f029d65
* gtkutil.c (create_dialog, make_widget_for_menu_item)
Jan Djärv <jan.h.d@swipnet.se>
parents:
50521
diff
changeset
|
1176 w = gtk_button_new_with_label (utf8_label); |
49323 | 1177 if (! item->enabled) |
1178 gtk_widget_set_sensitive (w, FALSE); | |
1179 if (select_cb) | |
1180 g_signal_connect (G_OBJECT (w), "clicked", | |
1181 select_cb, item->call_data); | |
1182 | |
1183 gtk_box_pack_start (cur_box, w, TRUE, TRUE, button_spacing); | |
1184 if (++button_nr == left_buttons) | |
1185 { | |
1186 if (make_two_rows) | |
1187 cur_box = GTK_BOX (whbox_down); | |
1188 else | |
1189 gtk_box_pack_start (cur_box, | |
1190 gtk_label_new (""), | |
1191 TRUE, TRUE, | |
1192 button_spacing); | |
1193 } | |
1194 } | |
1195 | |
1196 if (utf8_label && utf8_label != item->value) | |
1197 g_free (utf8_label); | |
1198 } | |
1199 | |
1200 return wdialog; | |
1201 } | |
1202 | |
1203 | |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1204 |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1205 /*********************************************************************** |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1206 File dialog functions |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1207 ***********************************************************************/ |
67761
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1208 /* Return non-zero if the old file selection dialog is being used. |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1209 Return zero if not. */ |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1210 |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1211 int |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1212 xg_uses_old_file_dialog () |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1213 { |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1214 #ifdef HAVE_GTK_FILE_BOTH |
72963
e5e5fcf4397e
* gtkutil.c (xg_uses_old_file_dialog): Rename x-use-old-gtk-file-dialog
Jan Djärv <jan.h.d@swipnet.se>
parents:
72931
diff
changeset
|
1215 extern int x_gtk_use_old_file_dialog; |
e5e5fcf4397e
* gtkutil.c (xg_uses_old_file_dialog): Rename x-use-old-gtk-file-dialog
Jan Djärv <jan.h.d@swipnet.se>
parents:
72931
diff
changeset
|
1216 return x_gtk_use_old_file_dialog; |
67761
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1217 #else /* ! HAVE_GTK_FILE_BOTH */ |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1218 |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1219 #ifdef HAVE_GTK_FILE_SELECTION_NEW |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1220 return 1; |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1221 #else |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1222 return 0; |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1223 #endif |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1224 |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1225 #endif /* ! HAVE_GTK_FILE_BOTH */ |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1226 } |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1227 |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1228 |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1229 /* Function that is called when the file dialog pops down. |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1230 W is the dialog widget, RESPONSE is the response code. |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1231 USER_DATA is what we passed in to g_signal_connect (pointer to int). */ |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1232 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1233 static void |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1234 xg_file_response_cb (w, |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1235 response, |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1236 user_data) |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1237 GtkDialog *w; |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1238 gint response; |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1239 gpointer user_data; |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1240 { |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1241 int *ptr = (int *) user_data; |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1242 *ptr = response; |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1243 } |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1244 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1245 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1246 /* Destroy the dialog. This makes it pop down. */ |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1247 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1248 static Lisp_Object |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1249 pop_down_file_dialog (arg) |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1250 Lisp_Object arg; |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1251 { |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1252 struct Lisp_Save_Value *p = XSAVE_VALUE (arg); |
58201
d433adb0e42c
Add BLOCK_INPUT in pop_down_file_dialog.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58200
diff
changeset
|
1253 BLOCK_INPUT; |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1254 gtk_widget_destroy (GTK_WIDGET (p->pointer)); |
58201
d433adb0e42c
Add BLOCK_INPUT in pop_down_file_dialog.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58200
diff
changeset
|
1255 UNBLOCK_INPUT; |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1256 return Qnil; |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1257 } |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1258 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1259 typedef char * (*xg_get_file_func) P_ ((GtkWidget *)); |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1260 |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1261 #ifdef HAVE_GTK_FILE_CHOOSER_DIALOG_NEW |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1262 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1263 /* Return the selected file for file chooser dialog W. |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1264 The returned string must be free:d. */ |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1265 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1266 static char * |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1267 xg_get_file_name_from_chooser (w) |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1268 GtkWidget *w; |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1269 { |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1270 return gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (w)); |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1271 } |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1272 |
68100
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1273 /* Callback called when the "Show hidden files" toggle is pressed. |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1274 WIDGET is the toggle widget, DATA is the file chooser dialog. */ |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1275 |
67843
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1276 static void |
67849 | 1277 xg_toggle_visibility_cb (widget, data) |
67843
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1278 GtkWidget *widget; |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1279 gpointer data; |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1280 { |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1281 GtkFileChooser *dialog = GTK_FILE_CHOOSER (data); |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1282 gboolean visible; |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1283 g_object_get (G_OBJECT (dialog), "show-hidden", &visible, NULL); |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1284 g_object_set (G_OBJECT (dialog), "show-hidden", !visible, NULL); |
68100
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1285 } |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1286 |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1287 |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1288 /* Callback called when a property changes in a file chooser. |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1289 GOBJECT is the file chooser dialog, ARG1 describes the property. |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1290 USER_DATA is the toggle widget in the file chooser dialog. |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1291 We use this to update the "Show hidden files" toggle when the user |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1292 changes that property by right clicking in the file list. */ |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1293 |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1294 static void |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1295 xg_toggle_notify_cb (gobject, arg1, user_data) |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1296 GObject *gobject; |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1297 GParamSpec *arg1; |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1298 gpointer user_data; |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1299 { |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1300 extern int x_gtk_show_hidden_files; |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1301 |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1302 if (strcmp (arg1->name, "show-hidden") == 0) |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1303 { |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1304 GtkFileChooser *dialog = GTK_FILE_CHOOSER (gobject); |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1305 GtkWidget *wtoggle = GTK_WIDGET (user_data); |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1306 gboolean visible, toggle_on; |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1307 |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1308 g_object_get (G_OBJECT (gobject), "show-hidden", &visible, NULL); |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1309 toggle_on = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (wtoggle)); |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1310 |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1311 if (!!visible != !!toggle_on) |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1312 { |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1313 g_signal_handlers_block_by_func (G_OBJECT (wtoggle), |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1314 G_CALLBACK (xg_toggle_visibility_cb), |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1315 gobject); |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1316 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (wtoggle), visible); |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1317 g_signal_handlers_unblock_by_func |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1318 (G_OBJECT (wtoggle), |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1319 G_CALLBACK (xg_toggle_visibility_cb), |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1320 gobject); |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1321 } |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1322 x_gtk_show_hidden_files = visible; |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1323 } |
67843
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1324 } |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1325 |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1326 /* Read a file name from the user using a file chooser dialog. |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1327 F is the current frame. |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1328 PROMPT is a prompt to show to the user. May not be NULL. |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1329 DEFAULT_FILENAME is a default selection to be displayed. May be NULL. |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1330 If MUSTMATCH_P is non-zero, the returned file name must be an existing |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1331 file. *FUNC is set to a function that can be used to retrieve the |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1332 selected file name from the returned widget. |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1333 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1334 Returns the created widget. */ |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1335 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1336 static GtkWidget * |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1337 xg_get_file_with_chooser (f, prompt, default_filename, |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1338 mustmatch_p, only_dir_p, func) |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1339 FRAME_PTR f; |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1340 char *prompt; |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1341 char *default_filename; |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1342 int mustmatch_p, only_dir_p; |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1343 xg_get_file_func *func; |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1344 { |
67843
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1345 char message[1024]; |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1346 |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1347 GtkWidget *filewin, *wtoggle, *wbox, *wmessage; |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1348 GtkWindow *gwin = GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)); |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1349 GtkFileChooserAction action = (mustmatch_p ? |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1350 GTK_FILE_CHOOSER_ACTION_OPEN : |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1351 GTK_FILE_CHOOSER_ACTION_SAVE); |
67843
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1352 extern int x_gtk_show_hidden_files; |
72968
13a9a628ff21
* gtkutil.c (xg_get_file_with_chooser): Rename x_gtk_show_chooser_help_text to
Jan Djärv <jan.h.d@swipnet.se>
parents:
72963
diff
changeset
|
1353 extern int x_gtk_file_dialog_help_text; |
72931
0ee8cea94c25
* gtkutil.c (xg_get_file_with_chooser): Check
Jan Djärv <jan.h.d@swipnet.se>
parents:
72928
diff
changeset
|
1354 |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1355 |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1356 if (only_dir_p) |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1357 action = GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER; |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1358 |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1359 filewin = gtk_file_chooser_dialog_new (prompt, gwin, action, |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1360 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1361 (mustmatch_p || only_dir_p ? |
57900
a76858072e78
* gtkutil.c (xg_get_file_with_chooser): Use GTK_STOCK_OK instead
Jan Djärv <jan.h.d@swipnet.se>
parents:
57868
diff
changeset
|
1362 GTK_STOCK_OPEN : GTK_STOCK_OK), |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1363 GTK_RESPONSE_OK, |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1364 NULL); |
58817
65f1b18b7f66
* gtkutil.c (xg_get_file_with_chooser): Handle local files only.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58463
diff
changeset
|
1365 gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (filewin), TRUE); |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1366 |
67843
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1367 wbox = gtk_vbox_new (FALSE, 0); |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1368 gtk_widget_show (wbox); |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1369 wtoggle = gtk_check_button_new_with_label ("Show hidden files."); |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1370 |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1371 if (x_gtk_show_hidden_files) |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1372 { |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1373 g_object_set (G_OBJECT (filewin), "show-hidden", TRUE, NULL); |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1374 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (wtoggle), TRUE); |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1375 } |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1376 gtk_widget_show (wtoggle); |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1377 g_signal_connect (G_OBJECT (wtoggle), "clicked", |
68100
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1378 G_CALLBACK (xg_toggle_visibility_cb), filewin); |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1379 g_signal_connect (G_OBJECT (filewin), "notify", |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1380 G_CALLBACK (xg_toggle_notify_cb), wtoggle); |
67843
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1381 |
72968
13a9a628ff21
* gtkutil.c (xg_get_file_with_chooser): Rename x_gtk_show_chooser_help_text to
Jan Djärv <jan.h.d@swipnet.se>
parents:
72963
diff
changeset
|
1382 if (x_gtk_file_dialog_help_text) |
72931
0ee8cea94c25
* gtkutil.c (xg_get_file_with_chooser): Check
Jan Djärv <jan.h.d@swipnet.se>
parents:
72928
diff
changeset
|
1383 { |
0ee8cea94c25
* gtkutil.c (xg_get_file_with_chooser): Check
Jan Djärv <jan.h.d@swipnet.se>
parents:
72928
diff
changeset
|
1384 message[0] = '\0'; |
73048
4a83c4a89b5e
* gtkutil.c (xg_get_file_with_chooser): Only chow C-l help for
Jan Djärv <jan.h.d@swipnet.se>
parents:
72968
diff
changeset
|
1385 /* Gtk+ 2.10 has the file name text entry box integrated in the dialog. |
4a83c4a89b5e
* gtkutil.c (xg_get_file_with_chooser): Only chow C-l help for
Jan Djärv <jan.h.d@swipnet.se>
parents:
72968
diff
changeset
|
1386 Show the C-l help text only for versions < 2.10. */ |
73066 | 1387 if (gtk_check_version (2, 10, 0) && action != GTK_FILE_CHOOSER_ACTION_SAVE) |
72931
0ee8cea94c25
* gtkutil.c (xg_get_file_with_chooser): Check
Jan Djärv <jan.h.d@swipnet.se>
parents:
72928
diff
changeset
|
1388 strcat (message, "\nType C-l to display a file name text entry box.\n"); |
0ee8cea94c25
* gtkutil.c (xg_get_file_with_chooser): Check
Jan Djärv <jan.h.d@swipnet.se>
parents:
72928
diff
changeset
|
1389 strcat (message, "\nIf you don't like this file selector, use the " |
0ee8cea94c25
* gtkutil.c (xg_get_file_with_chooser): Check
Jan Djärv <jan.h.d@swipnet.se>
parents:
72928
diff
changeset
|
1390 "corresponding\nkey binding or customize " |
0ee8cea94c25
* gtkutil.c (xg_get_file_with_chooser): Check
Jan Djärv <jan.h.d@swipnet.se>
parents:
72928
diff
changeset
|
1391 "use-file-dialog to turn it off."); |
72614
af91ff74c754
* gtkutil.c (xg_get_file_with_chooser): Change file chooser message
Jan Djärv <jan.h.d@swipnet.se>
parents:
71160
diff
changeset
|
1392 |
72931
0ee8cea94c25
* gtkutil.c (xg_get_file_with_chooser): Check
Jan Djärv <jan.h.d@swipnet.se>
parents:
72928
diff
changeset
|
1393 wmessage = gtk_label_new (message); |
0ee8cea94c25
* gtkutil.c (xg_get_file_with_chooser): Check
Jan Djärv <jan.h.d@swipnet.se>
parents:
72928
diff
changeset
|
1394 gtk_widget_show (wmessage); |
0ee8cea94c25
* gtkutil.c (xg_get_file_with_chooser): Check
Jan Djärv <jan.h.d@swipnet.se>
parents:
72928
diff
changeset
|
1395 } |
0ee8cea94c25
* gtkutil.c (xg_get_file_with_chooser): Check
Jan Djärv <jan.h.d@swipnet.se>
parents:
72928
diff
changeset
|
1396 |
67843
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1397 gtk_box_pack_start (GTK_BOX (wbox), wtoggle, FALSE, FALSE, 0); |
72968
13a9a628ff21
* gtkutil.c (xg_get_file_with_chooser): Rename x_gtk_show_chooser_help_text to
Jan Djärv <jan.h.d@swipnet.se>
parents:
72963
diff
changeset
|
1398 if (x_gtk_file_dialog_help_text) |
72931
0ee8cea94c25
* gtkutil.c (xg_get_file_with_chooser): Check
Jan Djärv <jan.h.d@swipnet.se>
parents:
72928
diff
changeset
|
1399 gtk_box_pack_start (GTK_BOX (wbox), wmessage, FALSE, FALSE, 0); |
67843
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1400 gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (filewin), wbox); |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1401 |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1402 if (default_filename) |
57940
a3fa0e63dd67
* gtkutil.c (xg_get_file_with_chooser): Expand DEFAULT_FILENAME if
Jan Djärv <jan.h.d@swipnet.se>
parents:
57900
diff
changeset
|
1403 { |
a3fa0e63dd67
* gtkutil.c (xg_get_file_with_chooser): Expand DEFAULT_FILENAME if
Jan Djärv <jan.h.d@swipnet.se>
parents:
57900
diff
changeset
|
1404 Lisp_Object file; |
a3fa0e63dd67
* gtkutil.c (xg_get_file_with_chooser): Expand DEFAULT_FILENAME if
Jan Djärv <jan.h.d@swipnet.se>
parents:
57900
diff
changeset
|
1405 struct gcpro gcpro1; |
a3fa0e63dd67
* gtkutil.c (xg_get_file_with_chooser): Expand DEFAULT_FILENAME if
Jan Djärv <jan.h.d@swipnet.se>
parents:
57900
diff
changeset
|
1406 GCPRO1 (file); |
72614
af91ff74c754
* gtkutil.c (xg_get_file_with_chooser): Change file chooser message
Jan Djärv <jan.h.d@swipnet.se>
parents:
71160
diff
changeset
|
1407 char *utf8_filename; |
57940
a3fa0e63dd67
* gtkutil.c (xg_get_file_with_chooser): Expand DEFAULT_FILENAME if
Jan Djärv <jan.h.d@swipnet.se>
parents:
57900
diff
changeset
|
1408 |
58817
65f1b18b7f66
* gtkutil.c (xg_get_file_with_chooser): Handle local files only.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58463
diff
changeset
|
1409 file = build_string (default_filename); |
65f1b18b7f66
* gtkutil.c (xg_get_file_with_chooser): Handle local files only.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58463
diff
changeset
|
1410 |
57940
a3fa0e63dd67
* gtkutil.c (xg_get_file_with_chooser): Expand DEFAULT_FILENAME if
Jan Djärv <jan.h.d@swipnet.se>
parents:
57900
diff
changeset
|
1411 /* File chooser does not understand ~/... in the file name. It must be |
a3fa0e63dd67
* gtkutil.c (xg_get_file_with_chooser): Expand DEFAULT_FILENAME if
Jan Djärv <jan.h.d@swipnet.se>
parents:
57900
diff
changeset
|
1412 an absolute name starting with /. */ |
a3fa0e63dd67
* gtkutil.c (xg_get_file_with_chooser): Expand DEFAULT_FILENAME if
Jan Djärv <jan.h.d@swipnet.se>
parents:
57900
diff
changeset
|
1413 if (default_filename[0] != '/') |
58817
65f1b18b7f66
* gtkutil.c (xg_get_file_with_chooser): Handle local files only.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58463
diff
changeset
|
1414 file = Fexpand_file_name (file, Qnil); |
72614
af91ff74c754
* gtkutil.c (xg_get_file_with_chooser): Change file chooser message
Jan Djärv <jan.h.d@swipnet.se>
parents:
71160
diff
changeset
|
1415 |
af91ff74c754
* gtkutil.c (xg_get_file_with_chooser): Change file chooser message
Jan Djärv <jan.h.d@swipnet.se>
parents:
71160
diff
changeset
|
1416 utf8_filename = SSDATA (ENCODE_UTF_8 (file)); |
af91ff74c754
* gtkutil.c (xg_get_file_with_chooser): Change file chooser message
Jan Djärv <jan.h.d@swipnet.se>
parents:
71160
diff
changeset
|
1417 if (! NILP (Ffile_directory_p (file))) |
58817
65f1b18b7f66
* gtkutil.c (xg_get_file_with_chooser): Handle local files only.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58463
diff
changeset
|
1418 gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (filewin), |
72614
af91ff74c754
* gtkutil.c (xg_get_file_with_chooser): Change file chooser message
Jan Djärv <jan.h.d@swipnet.se>
parents:
71160
diff
changeset
|
1419 utf8_filename); |
58817
65f1b18b7f66
* gtkutil.c (xg_get_file_with_chooser): Handle local files only.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58463
diff
changeset
|
1420 else |
72614
af91ff74c754
* gtkutil.c (xg_get_file_with_chooser): Change file chooser message
Jan Djärv <jan.h.d@swipnet.se>
parents:
71160
diff
changeset
|
1421 { |
af91ff74c754
* gtkutil.c (xg_get_file_with_chooser): Change file chooser message
Jan Djärv <jan.h.d@swipnet.se>
parents:
71160
diff
changeset
|
1422 gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (filewin), |
af91ff74c754
* gtkutil.c (xg_get_file_with_chooser): Change file chooser message
Jan Djärv <jan.h.d@swipnet.se>
parents:
71160
diff
changeset
|
1423 utf8_filename); |
72637
9db8c9a68f0f
* gtkutil.c (xg_get_file_with_chooser): Don't mention specific keys in
Jan Djärv <jan.h.d@swipnet.se>
parents:
72614
diff
changeset
|
1424 if (action == GTK_FILE_CHOOSER_ACTION_SAVE) |
9db8c9a68f0f
* gtkutil.c (xg_get_file_with_chooser): Don't mention specific keys in
Jan Djärv <jan.h.d@swipnet.se>
parents:
72614
diff
changeset
|
1425 { |
9db8c9a68f0f
* gtkutil.c (xg_get_file_with_chooser): Don't mention specific keys in
Jan Djärv <jan.h.d@swipnet.se>
parents:
72614
diff
changeset
|
1426 char *cp = strrchr (utf8_filename, '/'); |
9db8c9a68f0f
* gtkutil.c (xg_get_file_with_chooser): Don't mention specific keys in
Jan Djärv <jan.h.d@swipnet.se>
parents:
72614
diff
changeset
|
1427 if (cp) ++cp; |
9db8c9a68f0f
* gtkutil.c (xg_get_file_with_chooser): Don't mention specific keys in
Jan Djärv <jan.h.d@swipnet.se>
parents:
72614
diff
changeset
|
1428 else cp = utf8_filename; |
9db8c9a68f0f
* gtkutil.c (xg_get_file_with_chooser): Don't mention specific keys in
Jan Djärv <jan.h.d@swipnet.se>
parents:
72614
diff
changeset
|
1429 gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (filewin), cp); |
9db8c9a68f0f
* gtkutil.c (xg_get_file_with_chooser): Don't mention specific keys in
Jan Djärv <jan.h.d@swipnet.se>
parents:
72614
diff
changeset
|
1430 } |
72614
af91ff74c754
* gtkutil.c (xg_get_file_with_chooser): Change file chooser message
Jan Djärv <jan.h.d@swipnet.se>
parents:
71160
diff
changeset
|
1431 } |
57940
a3fa0e63dd67
* gtkutil.c (xg_get_file_with_chooser): Expand DEFAULT_FILENAME if
Jan Djärv <jan.h.d@swipnet.se>
parents:
57900
diff
changeset
|
1432 |
a3fa0e63dd67
* gtkutil.c (xg_get_file_with_chooser): Expand DEFAULT_FILENAME if
Jan Djärv <jan.h.d@swipnet.se>
parents:
57900
diff
changeset
|
1433 UNGCPRO; |
a3fa0e63dd67
* gtkutil.c (xg_get_file_with_chooser): Expand DEFAULT_FILENAME if
Jan Djärv <jan.h.d@swipnet.se>
parents:
57900
diff
changeset
|
1434 } |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1435 |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1436 *func = xg_get_file_name_from_chooser; |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1437 return filewin; |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1438 } |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1439 #endif /* HAVE_GTK_FILE_CHOOSER_DIALOG_NEW */ |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1440 |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1441 #ifdef HAVE_GTK_FILE_SELECTION_NEW |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1442 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1443 /* Return the selected file for file selector dialog W. |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1444 The returned string must be free:d. */ |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1445 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1446 static char * |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1447 xg_get_file_name_from_selector (w) |
49323 | 1448 GtkWidget *w; |
1449 { | |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1450 GtkFileSelection *filesel = GTK_FILE_SELECTION (w); |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1451 return xstrdup ((char*) gtk_file_selection_get_filename (filesel)); |
49323 | 1452 } |
1453 | |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1454 /* Create a file selection dialog. |
49323 | 1455 F is the current frame. |
1456 PROMPT is a prompt to show to the user. May not be NULL. | |
1457 DEFAULT_FILENAME is a default selection to be displayed. May be NULL. | |
1458 If MUSTMATCH_P is non-zero, the returned file name must be an existing | |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1459 file. *FUNC is set to a function that can be used to retrieve the |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1460 selected file name from the returned widget. |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1461 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1462 Returns the created widget. */ |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1463 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1464 static GtkWidget * |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1465 xg_get_file_with_selection (f, prompt, default_filename, |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1466 mustmatch_p, only_dir_p, func) |
49323 | 1467 FRAME_PTR f; |
1468 char *prompt; | |
1469 char *default_filename; | |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1470 int mustmatch_p, only_dir_p; |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1471 xg_get_file_func *func; |
49323 | 1472 { |
1473 GtkWidget *filewin; | |
1474 GtkFileSelection *filesel; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1475 |
49323 | 1476 filewin = gtk_file_selection_new (prompt); |
1477 filesel = GTK_FILE_SELECTION (filewin); | |
1478 | |
1479 if (default_filename) | |
1480 gtk_file_selection_set_filename (filesel, default_filename); | |
1481 | |
1482 if (mustmatch_p) | |
1483 { | |
1484 /* The selection_entry part of filesel is not documented. */ | |
1485 gtk_widget_set_sensitive (filesel->selection_entry, FALSE); | |
1486 gtk_file_selection_hide_fileop_buttons (filesel); | |
1487 } | |
1488 | |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1489 *func = xg_get_file_name_from_selector; |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1490 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1491 return filewin; |
49323 | 1492 } |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1493 #endif /* HAVE_GTK_FILE_SELECTION_NEW */ |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1494 |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1495 /* Read a file name from the user using a file dialog, either the old |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1496 file selection dialog, or the new file chooser dialog. Which to use |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1497 depends on what the GTK version used has, and what the value of |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1498 gtk-use-old-file-dialog. |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1499 F is the current frame. |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1500 PROMPT is a prompt to show to the user. May not be NULL. |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1501 DEFAULT_FILENAME is a default selection to be displayed. May be NULL. |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1502 If MUSTMATCH_P is non-zero, the returned file name must be an existing |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1503 file. |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1504 |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1505 Returns a file name or NULL if no file was selected. |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1506 The returned string must be freed by the caller. */ |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1507 |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1508 char * |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1509 xg_get_file_name (f, prompt, default_filename, mustmatch_p, only_dir_p) |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1510 FRAME_PTR f; |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1511 char *prompt; |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1512 char *default_filename; |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1513 int mustmatch_p, only_dir_p; |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1514 { |
58284
10efc827e15c
* gtkutil.c (xg_get_file_name): Fix typo in
Jan Djärv <jan.h.d@swipnet.se>
parents:
58201
diff
changeset
|
1515 GtkWidget *w = 0; |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1516 int count = SPECPDL_INDEX (); |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1517 char *fn = 0; |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1518 int filesel_done = 0; |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1519 xg_get_file_func func; |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1520 |
58818
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
1521 #if defined (HAVE_GTK_AND_PTHREAD) && defined (__SIGRTMIN) |
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
1522 /* I really don't know why this is needed, but without this the GLIBC add on |
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
1523 library linuxthreads hangs when the Gnome file chooser backend creates |
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
1524 threads. */ |
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
1525 sigblock (sigmask (__SIGRTMIN)); |
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
1526 #endif /* HAVE_GTK_AND_PTHREAD */ |
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
1527 |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1528 #ifdef HAVE_GTK_FILE_BOTH |
58463
86fddd350b35
* gtkutil.c (xg_get_file_name): Rename use-old-gtk-file-dialog to
Jan Djärv <jan.h.d@swipnet.se>
parents:
58284
diff
changeset
|
1529 |
67761
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1530 if (xg_uses_old_file_dialog ()) |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1531 w = xg_get_file_with_selection (f, prompt, default_filename, |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1532 mustmatch_p, only_dir_p, &func); |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1533 else |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1534 w = xg_get_file_with_chooser (f, prompt, default_filename, |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1535 mustmatch_p, only_dir_p, &func); |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1536 |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1537 #else /* not HAVE_GTK_FILE_BOTH */ |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1538 |
58284
10efc827e15c
* gtkutil.c (xg_get_file_name): Fix typo in
Jan Djärv <jan.h.d@swipnet.se>
parents:
58201
diff
changeset
|
1539 #ifdef HAVE_GTK_FILE_SELECTION_NEW |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1540 w = xg_get_file_with_selection (f, prompt, default_filename, |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1541 mustmatch_p, only_dir_p, &func); |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1542 #endif |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1543 #ifdef HAVE_GTK_FILE_CHOOSER_DIALOG_NEW |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1544 w = xg_get_file_with_chooser (f, prompt, default_filename, |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1545 mustmatch_p, only_dir_p, &func); |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1546 #endif |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1547 |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1548 #endif /* HAVE_GTK_FILE_BOTH */ |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1549 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1550 xg_set_screen (w, f); |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1551 gtk_widget_set_name (w, "emacs-filedialog"); |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1552 gtk_window_set_transient_for (GTK_WINDOW (w), |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1553 GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f))); |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1554 gtk_window_set_destroy_with_parent (GTK_WINDOW (w), TRUE); |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1555 gtk_window_set_modal (GTK_WINDOW (w), TRUE); |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1556 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1557 g_signal_connect (G_OBJECT (w), |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1558 "response", |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1559 G_CALLBACK (xg_file_response_cb), |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1560 &filesel_done); |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1561 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1562 /* Don't destroy the widget if closed by the window manager close button. */ |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1563 g_signal_connect (G_OBJECT (w), "delete-event", G_CALLBACK (gtk_true), NULL); |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1564 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1565 gtk_widget_show (w); |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1566 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1567 record_unwind_protect (pop_down_file_dialog, make_save_value (w, 0)); |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1568 while (! filesel_done) |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1569 { |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1570 x_menu_wait_for_event (0); |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1571 gtk_main_iteration (); |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1572 } |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1573 |
58818
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
1574 #if defined (HAVE_GTK_AND_PTHREAD) && defined (__SIGRTMIN) |
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
1575 sigunblock (sigmask (__SIGRTMIN)); |
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
1576 #endif |
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
1577 |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1578 if (filesel_done == GTK_RESPONSE_OK) |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1579 fn = (*func) (w); |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1580 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1581 unbind_to (count, Qnil); |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1582 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1583 return fn; |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1584 } |
49323 | 1585 |
1586 | |
1587 /*********************************************************************** | |
1588 Menu functions. | |
1589 ***********************************************************************/ | |
1590 | |
1591 /* The name of menu items that can be used for citomization. Since GTK | |
1592 RC files are very crude and primitive, we have to set this on all | |
1593 menu item names so a user can easily cutomize menu items. */ | |
1594 | |
1595 #define MENU_ITEM_NAME "emacs-menuitem" | |
1596 | |
1597 | |
1598 /* Linked list of all allocated struct xg_menu_cb_data. Used for marking | |
1599 during GC. The next member points to the items. */ | |
1600 static xg_list_node xg_menu_cb_list; | |
1601 | |
1602 /* Linked list of all allocated struct xg_menu_item_cb_data. Used for marking | |
1603 during GC. The next member points to the items. */ | |
1604 static xg_list_node xg_menu_item_cb_list; | |
1605 | |
1606 /* Allocate and initialize CL_DATA if NULL, otherwise increase ref_count. | |
1607 F is the frame CL_DATA will be initialized for. | |
1608 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. | |
1609 | |
1610 The menu bar and all sub menus under the menu bar in a frame | |
1611 share the same structure, hence the reference count. | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1612 |
49323 | 1613 Returns CL_DATA if CL_DATA is not NULL, or a pointer to a newly |
1614 allocated xg_menu_cb_data if CL_DATA is NULL. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
1615 |
49323 | 1616 static xg_menu_cb_data * |
1617 make_cl_data (cl_data, f, highlight_cb) | |
1618 xg_menu_cb_data *cl_data; | |
1619 FRAME_PTR f; | |
1620 GCallback highlight_cb; | |
1621 { | |
1622 if (! cl_data) | |
1623 { | |
1624 cl_data = (xg_menu_cb_data*) xmalloc (sizeof (*cl_data)); | |
1625 cl_data->f = f; | |
1626 cl_data->menu_bar_vector = f->menu_bar_vector; | |
1627 cl_data->menu_bar_items_used = f->menu_bar_items_used; | |
1628 cl_data->highlight_cb = highlight_cb; | |
1629 cl_data->ref_count = 0; | |
1630 | |
1631 xg_list_insert (&xg_menu_cb_list, &cl_data->ptrs); | |
1632 } | |
1633 | |
1634 cl_data->ref_count++; | |
1635 | |
1636 return cl_data; | |
1637 } | |
1638 | |
1639 /* Update CL_DATA with values from frame F and with HIGHLIGHT_CB. | |
1640 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. | |
1641 | |
1642 When the menu bar is updated, menu items may have been added and/or | |
1643 removed, so menu_bar_vector and menu_bar_items_used change. We must | |
1644 then update CL_DATA since it is used to determine which menu | |
1645 item that is invoked in the menu. | |
1646 HIGHLIGHT_CB could change, there is no check that the same | |
1647 function is given when modifying a menu bar as was given when | |
1648 creating the menu bar. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
1649 |
49323 | 1650 static void |
1651 update_cl_data (cl_data, f, highlight_cb) | |
1652 xg_menu_cb_data *cl_data; | |
1653 FRAME_PTR f; | |
1654 GCallback highlight_cb; | |
1655 { | |
1656 if (cl_data) | |
1657 { | |
1658 cl_data->f = f; | |
1659 cl_data->menu_bar_vector = f->menu_bar_vector; | |
1660 cl_data->menu_bar_items_used = f->menu_bar_items_used; | |
1661 cl_data->highlight_cb = highlight_cb; | |
1662 } | |
1663 } | |
1664 | |
1665 /* Decrease reference count for CL_DATA. | |
1666 If reference count is zero, free CL_DATA. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
1667 |
49323 | 1668 static void |
1669 unref_cl_data (cl_data) | |
1670 xg_menu_cb_data *cl_data; | |
1671 { | |
1672 if (cl_data && cl_data->ref_count > 0) | |
1673 { | |
1674 cl_data->ref_count--; | |
1675 if (cl_data->ref_count == 0) | |
1676 { | |
1677 xg_list_remove (&xg_menu_cb_list, &cl_data->ptrs); | |
1678 xfree (cl_data); | |
1679 } | |
1680 } | |
1681 } | |
1682 | |
1683 /* Function that marks all lisp data during GC. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
1684 |
49323 | 1685 void |
1686 xg_mark_data () | |
1687 { | |
1688 xg_list_node *iter; | |
1689 | |
1690 for (iter = xg_menu_cb_list.next; iter; iter = iter->next) | |
52080
c150d4a7aa36
gtkutil.c (xg_mark_data): Update calls to mark_object.
Jan Djärv <jan.h.d@swipnet.se>
parents:
51569
diff
changeset
|
1691 mark_object (((xg_menu_cb_data *) iter)->menu_bar_vector); |
49323 | 1692 |
1693 for (iter = xg_menu_item_cb_list.next; iter; iter = iter->next) | |
1694 { | |
1695 xg_menu_item_cb_data *cb_data = (xg_menu_item_cb_data *) iter; | |
1696 | |
1697 if (! NILP (cb_data->help)) | |
52080
c150d4a7aa36
gtkutil.c (xg_mark_data): Update calls to mark_object.
Jan Djärv <jan.h.d@swipnet.se>
parents:
51569
diff
changeset
|
1698 mark_object (cb_data->help); |
49323 | 1699 } |
1700 } | |
1701 | |
1702 | |
1703 /* Callback called when a menu item is destroyed. Used to free data. | |
1704 W is the widget that is being destroyed (not used). | |
1705 CLIENT_DATA points to the xg_menu_item_cb_data associated with the W. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
1706 |
49323 | 1707 static void |
1708 menuitem_destroy_callback (w, client_data) | |
1709 GtkWidget *w; | |
1710 gpointer client_data; | |
1711 { | |
1712 if (client_data) | |
1713 { | |
1714 xg_menu_item_cb_data *data = (xg_menu_item_cb_data*) client_data; | |
1715 xg_list_remove (&xg_menu_item_cb_list, &data->ptrs); | |
1716 xfree (data); | |
1717 } | |
1718 } | |
1719 | |
1720 /* Callback called when the pointer enters/leaves a menu item. | |
1721 W is the menu item. | |
1722 EVENT is either an enter event or leave event. | |
1723 CLIENT_DATA points to the xg_menu_item_cb_data associated with the W. | |
1724 | |
1725 Returns FALSE to tell GTK to keep processing this event. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
1726 |
49323 | 1727 static gboolean |
1728 menuitem_highlight_callback (w, event, client_data) | |
1729 GtkWidget *w; | |
1730 GdkEventCrossing *event; | |
1731 gpointer client_data; | |
1732 { | |
1733 if (client_data) | |
1734 { | |
1735 xg_menu_item_cb_data *data = (xg_menu_item_cb_data*) client_data; | |
1736 gpointer call_data = event->type == GDK_LEAVE_NOTIFY ? 0 : client_data; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1737 |
49323 | 1738 if (! NILP (data->help) && data->cl_data->highlight_cb) |
1739 { | |
1740 GtkCallback func = (GtkCallback) data->cl_data->highlight_cb; | |
1741 (*func) (w, call_data); | |
1742 } | |
1743 } | |
1744 | |
1745 return FALSE; | |
1746 } | |
1747 | |
1748 /* Callback called when a menu is destroyed. Used to free data. | |
1749 W is the widget that is being destroyed (not used). | |
1750 CLIENT_DATA points to the xg_menu_cb_data associated with W. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
1751 |
49323 | 1752 static void |
1753 menu_destroy_callback (w, client_data) | |
1754 GtkWidget *w; | |
1755 gpointer client_data; | |
1756 { | |
1757 unref_cl_data ((xg_menu_cb_data*) client_data); | |
1758 } | |
1759 | |
1760 /* Callback called when a menu does a grab or ungrab. That means the | |
1761 menu has been activated or deactivated. | |
1762 Used to start a timer so the small timeout the menus in GTK uses before | |
1763 popping down a menu is seen by Emacs (see xg_process_timeouts above). | |
1764 W is the widget that does the grab (not used). | |
1765 UNGRAB_P is TRUE if this is an ungrab, FALSE if it is a grab. | |
1766 CLIENT_DATA is NULL (not used). */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
1767 |
49323 | 1768 static void |
1769 menu_grab_callback (GtkWidget *widget, | |
1770 gboolean ungrab_p, | |
1771 gpointer client_data) | |
1772 { | |
1773 /* Keep track of total number of grabs. */ | |
1774 static int cnt; | |
1775 | |
1776 if (ungrab_p) cnt--; | |
1777 else cnt++; | |
1778 | |
1779 if (cnt > 0 && ! xg_timer) xg_start_timer (); | |
1780 else if (cnt == 0 && xg_timer) xg_stop_timer (); | |
1781 } | |
1782 | |
1783 /* Make a GTK widget that contains both UTF8_LABEL and UTF8_KEY (both | |
1784 must be non-NULL) and can be inserted into a menu item. | |
1785 | |
1786 Returns the GtkHBox. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
1787 |
49323 | 1788 static GtkWidget * |
1789 make_widget_for_menu_item (utf8_label, utf8_key) | |
1790 char *utf8_label; | |
1791 char *utf8_key; | |
1792 { | |
1793 GtkWidget *wlbl; | |
1794 GtkWidget *wkey; | |
1795 GtkWidget *wbox; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1796 |
49323 | 1797 wbox = gtk_hbox_new (FALSE, 0); |
50778
f30e6f029d65
* gtkutil.c (create_dialog, make_widget_for_menu_item)
Jan Djärv <jan.h.d@swipnet.se>
parents:
50521
diff
changeset
|
1798 wlbl = gtk_label_new (utf8_label); |
49323 | 1799 wkey = gtk_label_new (utf8_key); |
1800 | |
1801 gtk_misc_set_alignment (GTK_MISC (wlbl), 0.0, 0.5); | |
1802 gtk_misc_set_alignment (GTK_MISC (wkey), 0.0, 0.5); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1803 |
49323 | 1804 gtk_box_pack_start (GTK_BOX (wbox), wlbl, TRUE, TRUE, 0); |
1805 gtk_box_pack_start (GTK_BOX (wbox), wkey, FALSE, FALSE, 0); | |
1806 | |
1807 gtk_widget_set_name (wlbl, MENU_ITEM_NAME); | |
1808 gtk_widget_set_name (wkey, MENU_ITEM_NAME); | |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
1809 gtk_widget_set_name (wbox, MENU_ITEM_NAME); |
49323 | 1810 |
1811 return wbox; | |
1812 } | |
1813 | |
1814 /* Make and return a menu item widget with the key to the right. | |
1815 UTF8_LABEL is the text for the menu item (GTK uses UTF8 internally). | |
1816 UTF8_KEY is the text representing the key binding. | |
1817 ITEM is the widget_value describing the menu item. | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1818 |
49323 | 1819 GROUP is an in/out parameter. If the menu item to be created is not |
1820 part of any radio menu group, *GROUP contains NULL on entry and exit. | |
1821 If the menu item to be created is part of a radio menu group, on entry | |
1822 *GROUP contains the group to use, or NULL if this is the first item | |
1823 in the group. On exit, *GROUP contains the radio item group. | |
1824 | |
1825 Unfortunately, keys don't line up as nicely as in Motif, | |
1826 but the MacOS X version doesn't either, so I guess that is OK. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
1827 |
49323 | 1828 static GtkWidget * |
1829 make_menu_item (utf8_label, utf8_key, item, group) | |
1830 char *utf8_label; | |
1831 char *utf8_key; | |
1832 widget_value *item; | |
1833 GSList **group; | |
1834 { | |
1835 GtkWidget *w; | |
1836 GtkWidget *wtoadd = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1837 |
51432
6db55492aca9
* gtkutil.c (make_menu_item): Make sure we don't crash on a NULL
Jan Djärv <jan.h.d@swipnet.se>
parents:
51408
diff
changeset
|
1838 /* It has been observed that some menu items have a NULL name field. |
6db55492aca9
* gtkutil.c (make_menu_item): Make sure we don't crash on a NULL
Jan Djärv <jan.h.d@swipnet.se>
parents:
51408
diff
changeset
|
1839 This will lead to this function being called with a NULL utf8_label. |
6db55492aca9
* gtkutil.c (make_menu_item): Make sure we don't crash on a NULL
Jan Djärv <jan.h.d@swipnet.se>
parents:
51408
diff
changeset
|
1840 GTK crashes on that so we set a blank label. Why there is a NULL |
6db55492aca9
* gtkutil.c (make_menu_item): Make sure we don't crash on a NULL
Jan Djärv <jan.h.d@swipnet.se>
parents:
51408
diff
changeset
|
1841 name remains to be investigated. */ |
6db55492aca9
* gtkutil.c (make_menu_item): Make sure we don't crash on a NULL
Jan Djärv <jan.h.d@swipnet.se>
parents:
51408
diff
changeset
|
1842 if (! utf8_label) utf8_label = " "; |
6db55492aca9
* gtkutil.c (make_menu_item): Make sure we don't crash on a NULL
Jan Djärv <jan.h.d@swipnet.se>
parents:
51408
diff
changeset
|
1843 |
49323 | 1844 if (utf8_key) |
1845 wtoadd = make_widget_for_menu_item (utf8_label, utf8_key); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1846 |
49323 | 1847 if (item->button_type == BUTTON_TYPE_TOGGLE) |
1848 { | |
1849 *group = NULL; | |
1850 if (utf8_key) w = gtk_check_menu_item_new (); | |
50778
f30e6f029d65
* gtkutil.c (create_dialog, make_widget_for_menu_item)
Jan Djärv <jan.h.d@swipnet.se>
parents:
50521
diff
changeset
|
1851 else w = gtk_check_menu_item_new_with_label (utf8_label); |
49323 | 1852 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (w), item->selected); |
1853 } | |
1854 else if (item->button_type == BUTTON_TYPE_RADIO) | |
1855 { | |
1856 if (utf8_key) w = gtk_radio_menu_item_new (*group); | |
50778
f30e6f029d65
* gtkutil.c (create_dialog, make_widget_for_menu_item)
Jan Djärv <jan.h.d@swipnet.se>
parents:
50521
diff
changeset
|
1857 else w = gtk_radio_menu_item_new_with_label (*group, utf8_label); |
49323 | 1858 *group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (w)); |
1859 if (item->selected) | |
1860 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (w), TRUE); | |
1861 } | |
1862 else | |
1863 { | |
1864 *group = NULL; | |
1865 if (utf8_key) w = gtk_menu_item_new (); | |
50778
f30e6f029d65
* gtkutil.c (create_dialog, make_widget_for_menu_item)
Jan Djärv <jan.h.d@swipnet.se>
parents:
50521
diff
changeset
|
1866 else w = gtk_menu_item_new_with_label (utf8_label); |
49323 | 1867 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1868 |
49323 | 1869 if (wtoadd) gtk_container_add (GTK_CONTAINER (w), wtoadd); |
1870 if (! item->enabled) gtk_widget_set_sensitive (w, FALSE); | |
1871 | |
1872 return w; | |
1873 } | |
1874 | |
50318
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1875 /* Return non-zero if LABEL specifies a separator (GTK only has one |
49323 | 1876 separator type) */ |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
1877 |
49323 | 1878 static int |
50318
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1879 xg_separator_p (char *label) |
49323 | 1880 { |
50318
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1881 if (! label) return 0; |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1882 else if (strlen (label) > 3 |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1883 && strncmp (label, "--", 2) == 0 |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1884 && label[2] != '-') |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1885 { |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1886 static char* separator_names[] = { |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1887 "space", |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1888 "no-line", |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1889 "single-line", |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1890 "double-line", |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1891 "single-dashed-line", |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1892 "double-dashed-line", |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1893 "shadow-etched-in", |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1894 "shadow-etched-out", |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1895 "shadow-etched-in-dash", |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1896 "shadow-etched-out-dash", |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1897 "shadow-double-etched-in", |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1898 "shadow-double-etched-out", |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1899 "shadow-double-etched-in-dash", |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1900 "shadow-double-etched-out-dash", |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1901 0, |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1902 }; |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1903 |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1904 int i; |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1905 |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1906 label += 2; |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1907 for (i = 0; separator_names[i]; ++i) |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1908 if (strcmp (label, separator_names[i]) == 0) |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1909 return 1; |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1910 } |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1911 else |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1912 { |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1913 /* Old-style separator, maybe. It's a separator if it contains |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1914 only dashes. */ |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1915 while (*label == '-') |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1916 ++label; |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1917 if (*label == 0) return 1; |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1918 } |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1919 |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1920 return 0; |
49323 | 1921 } |
1922 | |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1923 static int xg_detached_menus; |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1924 |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1925 /* Returns non-zero if there are detached menus. */ |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
1926 |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1927 int |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1928 xg_have_tear_offs () |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1929 { |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1930 return xg_detached_menus > 0; |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1931 } |
49323 | 1932 |
1933 /* Callback invoked when a detached menu window is removed. Here we | |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1934 decrease the xg_detached_menus count. |
49323 | 1935 WIDGET is the top level window that is removed (the parent of the menu). |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1936 CLIENT_DATA is not used. */ |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
1937 |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1938 static void |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1939 tearoff_remove (widget, client_data) |
49323 | 1940 GtkWidget *widget; |
1941 gpointer client_data; | |
1942 { | |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1943 if (xg_detached_menus > 0) --xg_detached_menus; |
49323 | 1944 } |
1945 | |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1946 /* Callback invoked when a menu is detached. It increases the |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1947 xg_detached_menus count. |
49323 | 1948 WIDGET is the GtkTearoffMenuItem. |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1949 CLIENT_DATA is not used. */ |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
1950 |
49323 | 1951 static void |
1952 tearoff_activate (widget, client_data) | |
1953 GtkWidget *widget; | |
1954 gpointer client_data; | |
1955 { | |
1956 GtkWidget *menu = gtk_widget_get_parent (widget); | |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1957 if (gtk_menu_get_tearoff_state (GTK_MENU (menu))) |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1958 { |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1959 ++xg_detached_menus; |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1960 g_signal_connect (G_OBJECT (gtk_widget_get_toplevel (widget)), |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1961 "destroy", |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1962 G_CALLBACK (tearoff_remove), 0); |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1963 } |
49323 | 1964 } |
1965 | |
1966 | |
1967 /* Create a menu item widget, and connect the callbacks. | |
1968 ITEM decribes the menu item. | |
1969 F is the frame the created menu belongs to. | |
1970 SELECT_CB is the callback to use when a menu item is selected. | |
1971 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. | |
1972 CL_DATA points to the callback data to be used for this menu. | |
1973 GROUP is an in/out parameter. If the menu item to be created is not | |
1974 part of any radio menu group, *GROUP contains NULL on entry and exit. | |
1975 If the menu item to be created is part of a radio menu group, on entry | |
1976 *GROUP contains the group to use, or NULL if this is the first item | |
1977 in the group. On exit, *GROUP contains the radio item group. | |
1978 | |
1979 Returns the created GtkWidget. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
1980 |
49323 | 1981 static GtkWidget * |
1982 xg_create_one_menuitem (item, f, select_cb, highlight_cb, cl_data, group) | |
1983 widget_value *item; | |
1984 FRAME_PTR f; | |
1985 GCallback select_cb; | |
1986 GCallback highlight_cb; | |
1987 xg_menu_cb_data *cl_data; | |
1988 GSList **group; | |
1989 { | |
1990 char *utf8_label; | |
1991 char *utf8_key; | |
1992 GtkWidget *w; | |
1993 xg_menu_item_cb_data *cb_data; | |
1994 | |
1995 utf8_label = get_utf8_string (item->name); | |
1996 utf8_key = get_utf8_string (item->key); | |
1997 | |
1998 w = make_menu_item (utf8_label, utf8_key, item, group); | |
1999 | |
2000 if (utf8_label && utf8_label != item->name) g_free (utf8_label); | |
2001 if (utf8_key && utf8_key != item->key) g_free (utf8_key); | |
2002 | |
2003 cb_data = xmalloc (sizeof (xg_menu_item_cb_data)); | |
2004 | |
2005 xg_list_insert (&xg_menu_item_cb_list, &cb_data->ptrs); | |
2006 | |
2007 cb_data->unhighlight_id = cb_data->highlight_id = cb_data->select_id = 0; | |
2008 cb_data->help = item->help; | |
2009 cb_data->cl_data = cl_data; | |
2010 cb_data->call_data = item->call_data; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2011 |
49323 | 2012 g_signal_connect (G_OBJECT (w), |
2013 "destroy", | |
2014 G_CALLBACK (menuitem_destroy_callback), | |
2015 cb_data); | |
2016 | |
2017 /* Put cb_data in widget, so we can get at it when modifying menubar */ | |
2018 g_object_set_data (G_OBJECT (w), XG_ITEM_DATA, cb_data); | |
2019 | |
2020 /* final item, not a submenu */ | |
2021 if (item->call_data && ! item->contents) | |
2022 { | |
2023 if (select_cb) | |
2024 cb_data->select_id | |
2025 = g_signal_connect (G_OBJECT (w), "activate", select_cb, cb_data); | |
2026 } | |
2027 | |
2028 if (! NILP (item->help) && highlight_cb) | |
2029 { | |
2030 /* We use enter/leave notify instead of select/deselect because | |
2031 select/deselect doesn't go well with detached menus. */ | |
2032 cb_data->highlight_id | |
2033 = g_signal_connect (G_OBJECT (w), | |
2034 "enter-notify-event", | |
2035 G_CALLBACK (menuitem_highlight_callback), | |
2036 cb_data); | |
2037 cb_data->unhighlight_id | |
2038 = g_signal_connect (G_OBJECT (w), | |
2039 "leave-notify-event", | |
2040 G_CALLBACK (menuitem_highlight_callback), | |
2041 cb_data); | |
2042 } | |
2043 | |
2044 return w; | |
2045 } | |
2046 | |
71132
162d493b1e5c
* gtkutil.c (menu_nav_ended): Change x-menu-bar-start to menu-bar-open.
Jan Djärv <jan.h.d@swipnet.se>
parents:
71056
diff
changeset
|
2047 /* Callback called when keyboard traversal (started by menu-bar-open) ends. |
71056
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2048 WMENU is the menu for which traversal has been done. DATA points to the |
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2049 frame for WMENU. We must release grabs, some bad interaction between GTK |
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2050 and Emacs makes the menus keep the grabs. */ |
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2051 |
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2052 static void |
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2053 menu_nav_ended (wmenu, data) |
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2054 GtkMenuShell *wmenu; |
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2055 gpointer data; |
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2056 { |
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2057 FRAME_PTR f = (FRAME_PTR) data; |
71160
070b40db0b2a
* gtkutil.c (menu_nav_ended): Check that menubar_widget is not NULL.
Jan Djärv <jan.h.d@swipnet.se>
parents:
71132
diff
changeset
|
2058 |
070b40db0b2a
* gtkutil.c (menu_nav_ended): Check that menubar_widget is not NULL.
Jan Djärv <jan.h.d@swipnet.se>
parents:
71132
diff
changeset
|
2059 if (FRAME_X_OUTPUT (f)->menubar_widget) |
070b40db0b2a
* gtkutil.c (menu_nav_ended): Check that menubar_widget is not NULL.
Jan Djärv <jan.h.d@swipnet.se>
parents:
71132
diff
changeset
|
2060 { |
71056
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2061 GtkMenuShell *w = GTK_MENU_SHELL (FRAME_X_OUTPUT (f)->menubar_widget); |
71160
070b40db0b2a
* gtkutil.c (menu_nav_ended): Check that menubar_widget is not NULL.
Jan Djärv <jan.h.d@swipnet.se>
parents:
71132
diff
changeset
|
2062 Display *dpy = FRAME_X_DISPLAY (f); |
070b40db0b2a
* gtkutil.c (menu_nav_ended): Check that menubar_widget is not NULL.
Jan Djärv <jan.h.d@swipnet.se>
parents:
71132
diff
changeset
|
2063 |
070b40db0b2a
* gtkutil.c (menu_nav_ended): Check that menubar_widget is not NULL.
Jan Djärv <jan.h.d@swipnet.se>
parents:
71132
diff
changeset
|
2064 BLOCK_INPUT; |
71056
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2065 gtk_menu_shell_deactivate (w); |
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2066 gtk_menu_shell_deselect (w); |
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2067 |
71160
070b40db0b2a
* gtkutil.c (menu_nav_ended): Check that menubar_widget is not NULL.
Jan Djärv <jan.h.d@swipnet.se>
parents:
71132
diff
changeset
|
2068 XUngrabKeyboard (dpy, CurrentTime); |
070b40db0b2a
* gtkutil.c (menu_nav_ended): Check that menubar_widget is not NULL.
Jan Djärv <jan.h.d@swipnet.se>
parents:
71132
diff
changeset
|
2069 XUngrabPointer (dpy, CurrentTime); |
070b40db0b2a
* gtkutil.c (menu_nav_ended): Check that menubar_widget is not NULL.
Jan Djärv <jan.h.d@swipnet.se>
parents:
71132
diff
changeset
|
2070 UNBLOCK_INPUT; |
070b40db0b2a
* gtkutil.c (menu_nav_ended): Check that menubar_widget is not NULL.
Jan Djärv <jan.h.d@swipnet.se>
parents:
71132
diff
changeset
|
2071 } |
71056
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2072 } |
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2073 |
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2074 |
50112
50df9e41f1a3
Add prototype for create_menus.
Andreas Schwab <schwab@suse.de>
parents:
50108
diff
changeset
|
2075 static GtkWidget *create_menus P_ ((widget_value *, FRAME_PTR, GCallback, |
50df9e41f1a3
Add prototype for create_menus.
Andreas Schwab <schwab@suse.de>
parents:
50108
diff
changeset
|
2076 GCallback, GCallback, int, int, int, |
50df9e41f1a3
Add prototype for create_menus.
Andreas Schwab <schwab@suse.de>
parents:
50108
diff
changeset
|
2077 GtkWidget *, xg_menu_cb_data *, char *)); |
50df9e41f1a3
Add prototype for create_menus.
Andreas Schwab <schwab@suse.de>
parents:
50108
diff
changeset
|
2078 |
49323 | 2079 /* Create a full menu tree specified by DATA. |
2080 F is the frame the created menu belongs to. | |
2081 SELECT_CB is the callback to use when a menu item is selected. | |
2082 DEACTIVATE_CB is the callback to use when a sub menu is not shown anymore. | |
2083 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. | |
2084 POP_UP_P is non-zero if we shall create a popup menu. | |
2085 MENU_BAR_P is non-zero if we shall create a menu bar. | |
2086 ADD_TEAROFF_P is non-zero if we shall add a teroff menu item. Ignored | |
2087 if MENU_BAR_P is non-zero. | |
2088 TOPMENU is the topmost GtkWidget that others shall be placed under. | |
2089 It may be NULL, in that case we create the appropriate widget | |
2090 (menu bar or menu item depending on POP_UP_P and MENU_BAR_P) | |
2091 CL_DATA is the callback data we shall use for this menu, or NULL | |
2092 if we haven't set the first callback yet. | |
2093 NAME is the name to give to the top level menu if this function | |
2094 creates it. May be NULL to not set any name. | |
2095 | |
2096 Returns the top level GtkWidget. This is TOPLEVEL if TOPLEVEL is | |
2097 not NULL. | |
2098 | |
2099 This function calls itself to create submenus. */ | |
2100 | |
2101 static GtkWidget * | |
2102 create_menus (data, f, select_cb, deactivate_cb, highlight_cb, | |
2103 pop_up_p, menu_bar_p, add_tearoff_p, topmenu, cl_data, name) | |
2104 widget_value *data; | |
2105 FRAME_PTR f; | |
2106 GCallback select_cb; | |
2107 GCallback deactivate_cb; | |
2108 GCallback highlight_cb; | |
2109 int pop_up_p; | |
2110 int menu_bar_p; | |
2111 int add_tearoff_p; | |
2112 GtkWidget *topmenu; | |
2113 xg_menu_cb_data *cl_data; | |
2114 char *name; | |
2115 { | |
2116 widget_value *item; | |
2117 GtkWidget *wmenu = topmenu; | |
2118 GSList *group = NULL; | |
2119 | |
2120 if (! topmenu) | |
2121 { | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2122 if (! menu_bar_p) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2123 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2124 wmenu = gtk_menu_new (); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2125 xg_set_screen (wmenu, f); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2126 } |
49323 | 2127 else wmenu = gtk_menu_bar_new (); |
2128 | |
71056
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2129 /* Fix up grabs after keyboard traversal ends. */ |
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2130 g_signal_connect (G_OBJECT (wmenu), |
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2131 "selection-done", |
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2132 G_CALLBACK (menu_nav_ended), |
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2133 f); |
3e5c40f72a04
Connect menu_nav_ended to "selection-done" to fix grabs
Jan Djärv <jan.h.d@swipnet.se>
parents:
69141
diff
changeset
|
2134 |
49323 | 2135 /* Put cl_data on the top menu for easier access. */ |
2136 cl_data = make_cl_data (cl_data, f, highlight_cb); | |
2137 g_object_set_data (G_OBJECT (wmenu), XG_FRAME_DATA, (gpointer)cl_data); | |
2138 g_signal_connect (G_OBJECT (wmenu), "destroy", | |
2139 G_CALLBACK (menu_destroy_callback), cl_data); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2140 |
49323 | 2141 if (name) |
2142 gtk_widget_set_name (wmenu, name); | |
2143 | |
2144 if (deactivate_cb) | |
2145 g_signal_connect (G_OBJECT (wmenu), | |
59913
b3664fca53d1
* gtkutil.c (create_menus): Connect selection-done event instead of
Jan Djärv <jan.h.d@swipnet.se>
parents:
59666
diff
changeset
|
2146 "selection-done", deactivate_cb, 0); |
49323 | 2147 |
2148 g_signal_connect (G_OBJECT (wmenu), | |
2149 "grab-notify", G_CALLBACK (menu_grab_callback), 0); | |
2150 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2151 |
49323 | 2152 if (! menu_bar_p && add_tearoff_p) |
2153 { | |
2154 GtkWidget *tearoff = gtk_tearoff_menu_item_new (); | |
2155 gtk_menu_shell_append (GTK_MENU_SHELL (wmenu), tearoff); | |
2156 | |
2157 g_signal_connect (G_OBJECT (tearoff), "activate", | |
2158 G_CALLBACK (tearoff_activate), 0); | |
2159 } | |
2160 | |
2161 for (item = data; item; item = item->next) | |
2162 { | |
2163 GtkWidget *w; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2164 |
49323 | 2165 if (pop_up_p && !item->contents && !item->call_data |
2166 && !xg_separator_p (item->name)) | |
2167 { | |
2168 char *utf8_label; | |
2169 /* A title for a popup. We do the same as GTK does when | |
2170 creating titles, but it does not look good. */ | |
2171 group = NULL; | |
2172 utf8_label = get_utf8_string (item->name); | |
2173 | |
2174 gtk_menu_set_title (GTK_MENU (wmenu), utf8_label); | |
50778
f30e6f029d65
* gtkutil.c (create_dialog, make_widget_for_menu_item)
Jan Djärv <jan.h.d@swipnet.se>
parents:
50521
diff
changeset
|
2175 w = gtk_menu_item_new_with_label (utf8_label); |
49323 | 2176 gtk_widget_set_sensitive (w, FALSE); |
2177 if (utf8_label && utf8_label != item->name) g_free (utf8_label); | |
2178 } | |
2179 else if (xg_separator_p (item->name)) | |
2180 { | |
2181 group = NULL; | |
2182 /* GTK only have one separator type. */ | |
2183 w = gtk_separator_menu_item_new (); | |
2184 } | |
2185 else | |
2186 { | |
2187 w = xg_create_one_menuitem (item, | |
2188 f, | |
2189 item->contents ? 0 : select_cb, | |
2190 highlight_cb, | |
2191 cl_data, | |
2192 &group); | |
2193 | |
2194 if (item->contents) | |
2195 { | |
2196 GtkWidget *submenu = create_menus (item->contents, | |
2197 f, | |
2198 select_cb, | |
2199 deactivate_cb, | |
2200 highlight_cb, | |
2201 0, | |
2202 0, | |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2203 add_tearoff_p, |
49323 | 2204 0, |
2205 cl_data, | |
2206 0); | |
2207 gtk_menu_item_set_submenu (GTK_MENU_ITEM (w), submenu); | |
2208 } | |
2209 } | |
2210 | |
2211 gtk_menu_shell_append (GTK_MENU_SHELL (wmenu), w); | |
2212 gtk_widget_set_name (w, MENU_ITEM_NAME); | |
2213 } | |
2214 | |
2215 return wmenu; | |
2216 } | |
2217 | |
2218 /* Create a menubar, popup menu or dialog, depending on the TYPE argument. | |
2219 TYPE can be "menubar", "popup" for popup menu, or "dialog" for a dialog | |
2220 with some text and buttons. | |
2221 F is the frame the created item belongs to. | |
2222 NAME is the name to use for the top widget. | |
2223 VAL is a widget_value structure describing items to be created. | |
2224 SELECT_CB is the callback to use when a menu item is selected or | |
2225 a dialog button is pressed. | |
2226 DEACTIVATE_CB is the callback to use when an item is deactivated. | |
2227 For a menu, when a sub menu is not shown anymore, for a dialog it is | |
2228 called when the dialog is popped down. | |
2229 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. | |
2230 | |
2231 Returns the widget created. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2232 |
49323 | 2233 GtkWidget * |
2234 xg_create_widget (type, name, f, val, | |
2235 select_cb, deactivate_cb, highlight_cb) | |
2236 char *type; | |
2237 char *name; | |
2238 FRAME_PTR f; | |
2239 widget_value *val; | |
2240 GCallback select_cb; | |
2241 GCallback deactivate_cb; | |
2242 GCallback highlight_cb; | |
2243 { | |
2244 GtkWidget *w = 0; | |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2245 int menu_bar_p = strcmp (type, "menubar") == 0; |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2246 int pop_up_p = strcmp (type, "popup") == 0; |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2247 |
49323 | 2248 if (strcmp (type, "dialog") == 0) |
2249 { | |
2250 w = create_dialog (val, select_cb, deactivate_cb); | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2251 xg_set_screen (w, f); |
49323 | 2252 gtk_window_set_transient_for (GTK_WINDOW (w), |
2253 GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f))); | |
2254 gtk_window_set_destroy_with_parent (GTK_WINDOW (w), TRUE); | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2255 gtk_widget_set_name (w, "emacs-dialog"); |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
2256 gtk_window_set_modal (GTK_WINDOW (w), TRUE); |
49323 | 2257 } |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2258 else if (menu_bar_p || pop_up_p) |
49323 | 2259 { |
2260 w = create_menus (val->contents, | |
2261 f, | |
2262 select_cb, | |
2263 deactivate_cb, | |
2264 highlight_cb, | |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2265 pop_up_p, |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2266 menu_bar_p, |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2267 menu_bar_p, |
49323 | 2268 0, |
2269 0, | |
2270 name); | |
2271 | |
2272 /* Set the cursor to an arrow for popup menus when they are mapped. | |
2273 This is done by default for menu bar menus. */ | |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2274 if (pop_up_p) |
49323 | 2275 { |
2276 /* Must realize so the GdkWindow inside the widget is created. */ | |
2277 gtk_widget_realize (w); | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2278 xg_set_cursor (w, FRAME_X_DISPLAY_INFO (f)->xg_cursor); |
49323 | 2279 } |
2280 } | |
2281 else | |
2282 { | |
2283 fprintf (stderr, "bad type in xg_create_widget: %s, doing nothing\n", | |
2284 type); | |
2285 } | |
2286 | |
2287 return w; | |
2288 } | |
2289 | |
49488
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2290 /* Return the label for menu item WITEM. */ |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2291 |
49323 | 2292 static const char * |
2293 xg_get_menu_item_label (witem) | |
2294 GtkMenuItem *witem; | |
2295 { | |
2296 GtkLabel *wlabel = GTK_LABEL (gtk_bin_get_child (GTK_BIN (witem))); | |
2297 return gtk_label_get_label (wlabel); | |
2298 } | |
2299 | |
49488
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2300 /* Return non-zero if the menu item WITEM has the text LABEL. */ |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2301 |
49323 | 2302 static int |
2303 xg_item_label_same_p (witem, label) | |
2304 GtkMenuItem *witem; | |
2305 char *label; | |
2306 { | |
49488
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2307 int is_same = 0; |
49323 | 2308 char *utf8_label = get_utf8_string (label); |
49488
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2309 const char *old_label = witem ? xg_get_menu_item_label (witem) : 0; |
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2310 |
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2311 if (! old_label && ! utf8_label) |
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2312 is_same = 1; |
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2313 else if (old_label && utf8_label) |
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2314 is_same = strcmp (utf8_label, old_label) == 0; |
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2315 |
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2316 if (utf8_label && utf8_label != label) g_free (utf8_label); |
49323 | 2317 |
2318 return is_same; | |
2319 } | |
2320 | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2321 /* Destroy widgets in LIST. */ |
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2322 |
49323 | 2323 static void |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2324 xg_destroy_widgets (list) |
49323 | 2325 GList *list; |
2326 { | |
2327 GList *iter; | |
2328 | |
49572 | 2329 for (iter = list; iter; iter = g_list_next (iter)) |
49323 | 2330 { |
2331 GtkWidget *w = GTK_WIDGET (iter->data); | |
2332 | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2333 /* Destroying the widget will remove it from the container it is in. */ |
49323 | 2334 gtk_widget_destroy (w); |
2335 } | |
2336 } | |
2337 | |
2338 /* Update the top level names in MENUBAR (i.e. not submenus). | |
2339 F is the frame the menu bar belongs to. | |
49572 | 2340 *LIST is a list with the current menu bar names (menu item widgets). |
2341 ITER is the item within *LIST that shall be updated. | |
2342 POS is the numerical position, starting at 0, of ITER in *LIST. | |
49323 | 2343 VAL describes what the menu bar shall look like after the update. |
2344 SELECT_CB is the callback to use when a menu item is selected. | |
2345 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. | |
49572 | 2346 CL_DATA points to the callback data to be used for this menu bar. |
49323 | 2347 |
2348 This function calls itself to walk through the menu bar names. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2349 |
49323 | 2350 static void |
49572 | 2351 xg_update_menubar (menubar, f, list, iter, pos, val, |
2352 select_cb, highlight_cb, cl_data) | |
49323 | 2353 GtkWidget *menubar; |
2354 FRAME_PTR f; | |
49572 | 2355 GList **list; |
2356 GList *iter; | |
2357 int pos; | |
49323 | 2358 widget_value *val; |
2359 GCallback select_cb; | |
2360 GCallback highlight_cb; | |
2361 xg_menu_cb_data *cl_data; | |
2362 { | |
49572 | 2363 if (! iter && ! val) |
49323 | 2364 return; |
49572 | 2365 else if (iter && ! val) |
49323 | 2366 { |
49572 | 2367 /* Item(s) have been removed. Remove all remaining items. */ |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2368 xg_destroy_widgets (iter); |
49323 | 2369 |
2370 /* All updated. */ | |
2371 val = 0; | |
49572 | 2372 iter = 0; |
49323 | 2373 } |
49572 | 2374 else if (! iter && val) |
49323 | 2375 { |
2376 /* Item(s) added. Add all new items in one call. */ | |
2377 create_menus (val, f, select_cb, 0, highlight_cb, | |
2378 0, 1, 0, menubar, cl_data, 0); | |
2379 | |
2380 /* All updated. */ | |
2381 val = 0; | |
49572 | 2382 iter = 0; |
49323 | 2383 } |
49572 | 2384 /* Below this neither iter or val is NULL */ |
2385 else if (xg_item_label_same_p (GTK_MENU_ITEM (iter->data), val->name)) | |
49323 | 2386 { |
2387 /* This item is still the same, check next item. */ | |
2388 val = val->next; | |
49572 | 2389 iter = g_list_next (iter); |
2390 ++pos; | |
49323 | 2391 } |
2392 else /* This item is changed. */ | |
2393 { | |
49572 | 2394 GtkMenuItem *witem = GTK_MENU_ITEM (iter->data); |
49323 | 2395 GtkMenuItem *witem2 = 0; |
2396 int val_in_menubar = 0; | |
49572 | 2397 int iter_in_new_menubar = 0; |
2398 GList *iter2; | |
49323 | 2399 widget_value *cur; |
2400 | |
2401 /* See if the changed entry (val) is present later in the menu bar */ | |
49572 | 2402 for (iter2 = iter; |
2403 iter2 && ! val_in_menubar; | |
2404 iter2 = g_list_next (iter2)) | |
49323 | 2405 { |
49572 | 2406 witem2 = GTK_MENU_ITEM (iter2->data); |
49323 | 2407 val_in_menubar = xg_item_label_same_p (witem2, val->name); |
2408 } | |
2409 | |
49572 | 2410 /* See if the current entry (iter) is present later in the |
49323 | 2411 specification for the new menu bar. */ |
49572 | 2412 for (cur = val; cur && ! iter_in_new_menubar; cur = cur->next) |
2413 iter_in_new_menubar = xg_item_label_same_p (witem, cur->name); | |
2414 | |
2415 if (val_in_menubar && ! iter_in_new_menubar) | |
49323 | 2416 { |
49572 | 2417 int nr = pos; |
2418 | |
49323 | 2419 /* This corresponds to: |
2420 Current: A B C | |
2421 New: A C | |
2422 Remove B. */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2423 |
49323 | 2424 gtk_widget_ref (GTK_WIDGET (witem)); |
2425 gtk_container_remove (GTK_CONTAINER (menubar), GTK_WIDGET (witem)); | |
2426 gtk_widget_destroy (GTK_WIDGET (witem)); | |
2427 | |
2428 /* Must get new list since the old changed. */ | |
49572 | 2429 g_list_free (*list); |
2430 *list = iter = gtk_container_get_children (GTK_CONTAINER (menubar)); | |
2431 while (nr-- > 0) iter = g_list_next (iter); | |
49323 | 2432 } |
49572 | 2433 else if (! val_in_menubar && ! iter_in_new_menubar) |
49323 | 2434 { |
2435 /* This corresponds to: | |
2436 Current: A B C | |
2437 New: A X C | |
2438 Rename B to X. This might seem to be a strange thing to do, | |
2439 since if there is a menu under B it will be totally wrong for X. | |
2440 But consider editing a C file. Then there is a C-mode menu | |
2441 (corresponds to B above). | |
2442 If then doing C-x C-f the minibuf menu (X above) replaces the | |
2443 C-mode menu. When returning from the minibuffer, we get | |
2444 back the C-mode menu. Thus we do: | |
2445 Rename B to X (C-mode to minibuf menu) | |
2446 Rename X to B (minibuf to C-mode menu). | |
2447 If the X menu hasn't been invoked, the menu under B | |
2448 is up to date when leaving the minibuffer. */ | |
2449 GtkLabel *wlabel = GTK_LABEL (gtk_bin_get_child (GTK_BIN (witem))); | |
2450 char *utf8_label = get_utf8_string (val->name); | |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2451 GtkWidget *submenu = gtk_menu_item_get_submenu (witem); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2452 |
50778
f30e6f029d65
* gtkutil.c (create_dialog, make_widget_for_menu_item)
Jan Djärv <jan.h.d@swipnet.se>
parents:
50521
diff
changeset
|
2453 gtk_label_set_text (wlabel, utf8_label); |
49323 | 2454 |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2455 /* If this item has a submenu that has been detached, change |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2456 the title in the WM decorations also. */ |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2457 if (submenu && gtk_menu_get_tearoff_state (GTK_MENU (submenu))) |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2458 /* Set the title of the detached window. */ |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2459 gtk_menu_set_title (GTK_MENU (submenu), utf8_label); |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2460 |
49572 | 2461 iter = g_list_next (iter); |
49323 | 2462 val = val->next; |
49572 | 2463 ++pos; |
49323 | 2464 } |
49572 | 2465 else if (! val_in_menubar && iter_in_new_menubar) |
49323 | 2466 { |
2467 /* This corresponds to: | |
2468 Current: A B C | |
2469 New: A X B C | |
2470 Insert X. */ | |
2471 | |
49572 | 2472 int nr = pos; |
49323 | 2473 GList *group = 0; |
2474 GtkWidget *w = xg_create_one_menuitem (val, | |
2475 f, | |
2476 select_cb, | |
2477 highlight_cb, | |
2478 cl_data, | |
2479 &group); | |
2480 | |
2481 gtk_widget_set_name (w, MENU_ITEM_NAME); | |
2482 gtk_menu_shell_insert (GTK_MENU_SHELL (menubar), w, pos); | |
2483 | |
49572 | 2484 g_list_free (*list); |
2485 *list = iter = gtk_container_get_children (GTK_CONTAINER (menubar)); | |
2486 while (nr-- > 0) iter = g_list_next (iter); | |
2487 iter = g_list_next (iter); | |
49323 | 2488 val = val->next; |
49572 | 2489 ++pos; |
49323 | 2490 } |
49572 | 2491 else /* if (val_in_menubar && iter_in_new_menubar) */ |
49323 | 2492 { |
49572 | 2493 int nr = pos; |
49323 | 2494 /* This corresponds to: |
2495 Current: A B C | |
2496 New: A C B | |
2497 Move C before B */ | |
2498 | |
2499 gtk_widget_ref (GTK_WIDGET (witem2)); | |
2500 gtk_container_remove (GTK_CONTAINER (menubar), GTK_WIDGET (witem2)); | |
2501 gtk_menu_shell_insert (GTK_MENU_SHELL (menubar), | |
2502 GTK_WIDGET (witem2), pos); | |
2503 gtk_widget_unref (GTK_WIDGET (witem2)); | |
2504 | |
49572 | 2505 g_list_free (*list); |
2506 *list = iter = gtk_container_get_children (GTK_CONTAINER (menubar)); | |
2507 while (nr-- > 0) iter = g_list_next (iter); | |
49323 | 2508 val = val->next; |
49572 | 2509 ++pos; |
49323 | 2510 } |
2511 } | |
2512 | |
2513 /* Update the rest of the menu bar. */ | |
49572 | 2514 xg_update_menubar (menubar, f, list, iter, pos, val, |
2515 select_cb, highlight_cb, cl_data); | |
49323 | 2516 } |
2517 | |
2518 /* Update the menu item W so it corresponds to VAL. | |
2519 SELECT_CB is the callback to use when a menu item is selected. | |
2520 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. | |
2521 CL_DATA is the data to set in the widget for menu invokation. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2522 |
49323 | 2523 static void |
2524 xg_update_menu_item (val, w, select_cb, highlight_cb, cl_data) | |
2525 widget_value *val; | |
2526 GtkWidget *w; | |
2527 GCallback select_cb; | |
2528 GCallback highlight_cb; | |
2529 xg_menu_cb_data *cl_data; | |
2530 { | |
2531 GtkWidget *wchild; | |
2532 GtkLabel *wlbl = 0; | |
2533 GtkLabel *wkey = 0; | |
2534 char *utf8_label; | |
2535 char *utf8_key; | |
49488
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2536 const char *old_label = 0; |
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2537 const char *old_key = 0; |
49323 | 2538 xg_menu_item_cb_data *cb_data; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2539 |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2540 wchild = gtk_bin_get_child (GTK_BIN (w)); |
49323 | 2541 utf8_label = get_utf8_string (val->name); |
2542 utf8_key = get_utf8_string (val->key); | |
2543 | |
2544 /* See if W is a menu item with a key. See make_menu_item above. */ | |
2545 if (GTK_IS_HBOX (wchild)) | |
2546 { | |
2547 GList *list = gtk_container_get_children (GTK_CONTAINER (wchild)); | |
2548 | |
2549 wlbl = GTK_LABEL (list->data); | |
2550 wkey = GTK_LABEL (list->next->data); | |
49572 | 2551 g_list_free (list); |
2552 | |
49323 | 2553 if (! utf8_key) |
2554 { | |
2555 /* Remove the key and keep just the label. */ | |
2556 gtk_widget_ref (GTK_WIDGET (wlbl)); | |
2557 gtk_container_remove (GTK_CONTAINER (w), wchild); | |
2558 gtk_container_add (GTK_CONTAINER (w), GTK_WIDGET (wlbl)); | |
2559 wkey = 0; | |
2560 } | |
49572 | 2561 |
49323 | 2562 } |
2563 else /* Just a label. */ | |
2564 { | |
2565 wlbl = GTK_LABEL (wchild); | |
2566 | |
2567 /* Check if there is now a key. */ | |
2568 if (utf8_key) | |
2569 { | |
2570 GtkWidget *wtoadd = make_widget_for_menu_item (utf8_label, utf8_key); | |
2571 GList *list = gtk_container_get_children (GTK_CONTAINER (wtoadd)); | |
49572 | 2572 |
49323 | 2573 wlbl = GTK_LABEL (list->data); |
2574 wkey = GTK_LABEL (list->next->data); | |
49572 | 2575 g_list_free (list); |
49323 | 2576 |
2577 gtk_container_remove (GTK_CONTAINER (w), wchild); | |
2578 gtk_container_add (GTK_CONTAINER (w), wtoadd); | |
2579 } | |
2580 } | |
2581 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2582 |
49488
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2583 if (wkey) old_key = gtk_label_get_label (wkey); |
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2584 if (wlbl) old_label = gtk_label_get_label (wlbl); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2585 |
49488
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2586 if (wkey && utf8_key && (! old_key || strcmp (utf8_key, old_key) != 0)) |
49323 | 2587 gtk_label_set_text (wkey, utf8_key); |
2588 | |
49488
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2589 if (! old_label || strcmp (utf8_label, old_label) != 0) |
50778
f30e6f029d65
* gtkutil.c (create_dialog, make_widget_for_menu_item)
Jan Djärv <jan.h.d@swipnet.se>
parents:
50521
diff
changeset
|
2590 gtk_label_set_text (wlbl, utf8_label); |
49323 | 2591 |
49488
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2592 if (utf8_key && utf8_key != val->key) g_free (utf8_key); |
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2593 if (utf8_label && utf8_label != val->name) g_free (utf8_label); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2594 |
49323 | 2595 if (! val->enabled && GTK_WIDGET_SENSITIVE (w)) |
2596 gtk_widget_set_sensitive (w, FALSE); | |
2597 else if (val->enabled && ! GTK_WIDGET_SENSITIVE (w)) | |
2598 gtk_widget_set_sensitive (w, TRUE); | |
2599 | |
2600 cb_data = (xg_menu_item_cb_data*) g_object_get_data (G_OBJECT (w), | |
2601 XG_ITEM_DATA); | |
2602 if (cb_data) | |
2603 { | |
2604 cb_data->call_data = val->call_data; | |
2605 cb_data->help = val->help; | |
2606 cb_data->cl_data = cl_data; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2607 |
49323 | 2608 /* We assume the callback functions don't change. */ |
2609 if (val->call_data && ! val->contents) | |
2610 { | |
2611 /* This item shall have a select callback. */ | |
2612 if (! cb_data->select_id) | |
2613 cb_data->select_id | |
2614 = g_signal_connect (G_OBJECT (w), "activate", | |
2615 select_cb, cb_data); | |
2616 } | |
2617 else if (cb_data->select_id) | |
2618 { | |
2619 g_signal_handler_disconnect (w, cb_data->select_id); | |
2620 cb_data->select_id = 0; | |
2621 } | |
2622 | |
2623 if (NILP (cb_data->help)) | |
2624 { | |
2625 /* Shall not have help. Remove if any existed previously. */ | |
2626 if (cb_data->highlight_id) | |
2627 { | |
2628 g_signal_handler_disconnect (G_OBJECT (w), | |
2629 cb_data->highlight_id); | |
2630 cb_data->highlight_id = 0; | |
2631 } | |
2632 if (cb_data->unhighlight_id) | |
2633 { | |
2634 g_signal_handler_disconnect (G_OBJECT (w), | |
2635 cb_data->unhighlight_id); | |
2636 cb_data->unhighlight_id = 0; | |
2637 } | |
2638 } | |
2639 else if (! cb_data->highlight_id && highlight_cb) | |
2640 { | |
2641 /* Have help now, but didn't previously. Add callback. */ | |
2642 cb_data->highlight_id | |
2643 = g_signal_connect (G_OBJECT (w), | |
2644 "enter-notify-event", | |
2645 G_CALLBACK (menuitem_highlight_callback), | |
2646 cb_data); | |
2647 cb_data->unhighlight_id | |
2648 = g_signal_connect (G_OBJECT (w), | |
2649 "leave-notify-event", | |
2650 G_CALLBACK (menuitem_highlight_callback), | |
2651 cb_data); | |
2652 } | |
2653 } | |
2654 } | |
2655 | |
2656 /* Update the toggle menu item W so it corresponds to VAL. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2657 |
49323 | 2658 static void |
2659 xg_update_toggle_item (val, w) | |
2660 widget_value *val; | |
2661 GtkWidget *w; | |
2662 { | |
2663 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (w), val->selected); | |
2664 } | |
2665 | |
2666 /* Update the radio menu item W so it corresponds to VAL. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2667 |
49323 | 2668 static void |
2669 xg_update_radio_item (val, w) | |
2670 widget_value *val; | |
2671 GtkWidget *w; | |
2672 { | |
2673 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (w), val->selected); | |
2674 } | |
2675 | |
2676 /* Update the sub menu SUBMENU and all its children so it corresponds to VAL. | |
2677 SUBMENU may be NULL, in that case a new menu is created. | |
2678 F is the frame the menu bar belongs to. | |
2679 VAL describes the contents of the menu bar. | |
2680 SELECT_CB is the callback to use when a menu item is selected. | |
2681 DEACTIVATE_CB is the callback to use when a sub menu is not shown anymore. | |
2682 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. | |
2683 CL_DATA is the call back data to use for any newly created items. | |
2684 | |
2685 Returns the updated submenu widget, that is SUBMENU unless SUBMENU | |
2686 was NULL. */ | |
2687 | |
2688 static GtkWidget * | |
2689 xg_update_submenu (submenu, f, val, | |
2690 select_cb, deactivate_cb, highlight_cb, cl_data) | |
2691 GtkWidget *submenu; | |
2692 FRAME_PTR f; | |
2693 widget_value *val; | |
2694 GCallback select_cb; | |
2695 GCallback deactivate_cb; | |
2696 GCallback highlight_cb; | |
2697 xg_menu_cb_data *cl_data; | |
2698 { | |
2699 GtkWidget *newsub = submenu; | |
2700 GList *list = 0; | |
2701 GList *iter; | |
2702 widget_value *cur; | |
2703 int has_tearoff_p = 0; | |
2704 GList *first_radio = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2705 |
49323 | 2706 if (submenu) |
2707 list = gtk_container_get_children (GTK_CONTAINER (submenu)); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2708 |
49323 | 2709 for (cur = val, iter = list; |
2710 cur && iter; | |
2711 iter = g_list_next (iter), cur = cur->next) | |
2712 { | |
2713 GtkWidget *w = GTK_WIDGET (iter->data); | |
2714 | |
2715 /* Skip tearoff items, they have no counterpart in val. */ | |
2716 if (GTK_IS_TEAROFF_MENU_ITEM (w)) | |
2717 { | |
2718 has_tearoff_p = 1; | |
2719 iter = g_list_next (iter); | |
2720 if (iter) w = GTK_WIDGET (iter->data); | |
2721 else break; | |
2722 } | |
2723 | |
2724 /* Remember first radio button in a group. If we get a mismatch in | |
2725 a radio group we must rebuild the whole group so that the connections | |
2726 in GTK becomes correct. */ | |
2727 if (cur->button_type == BUTTON_TYPE_RADIO && ! first_radio) | |
2728 first_radio = iter; | |
2729 else if (cur->button_type != BUTTON_TYPE_RADIO | |
2730 && ! GTK_IS_RADIO_MENU_ITEM (w)) | |
2731 first_radio = 0; | |
2732 | |
2733 if (GTK_IS_SEPARATOR_MENU_ITEM (w)) | |
2734 { | |
2735 if (! xg_separator_p (cur->name)) | |
2736 break; | |
2737 } | |
2738 else if (GTK_IS_CHECK_MENU_ITEM (w)) | |
2739 { | |
2740 if (cur->button_type != BUTTON_TYPE_TOGGLE) | |
2741 break; | |
2742 xg_update_toggle_item (cur, w); | |
2743 xg_update_menu_item (cur, w, select_cb, highlight_cb, cl_data); | |
2744 } | |
2745 else if (GTK_IS_RADIO_MENU_ITEM (w)) | |
2746 { | |
2747 if (cur->button_type != BUTTON_TYPE_RADIO) | |
2748 break; | |
2749 xg_update_radio_item (cur, w); | |
2750 xg_update_menu_item (cur, w, select_cb, highlight_cb, cl_data); | |
2751 } | |
2752 else if (GTK_IS_MENU_ITEM (w)) | |
2753 { | |
2754 GtkMenuItem *witem = GTK_MENU_ITEM (w); | |
2755 GtkWidget *sub; | |
2756 | |
2757 if (cur->button_type != BUTTON_TYPE_NONE || | |
2758 xg_separator_p (cur->name)) | |
2759 break; | |
2760 | |
2761 xg_update_menu_item (cur, w, select_cb, highlight_cb, cl_data); | |
2762 | |
2763 sub = gtk_menu_item_get_submenu (witem); | |
2764 if (sub && ! cur->contents) | |
2765 { | |
2766 /* Not a submenu anymore. */ | |
2767 gtk_widget_ref (sub); | |
2768 gtk_menu_item_remove_submenu (witem); | |
2769 gtk_widget_destroy (sub); | |
2770 } | |
2771 else if (cur->contents) | |
2772 { | |
2773 GtkWidget *nsub; | |
2774 | |
2775 nsub = xg_update_submenu (sub, f, cur->contents, | |
2776 select_cb, deactivate_cb, | |
2777 highlight_cb, cl_data); | |
2778 | |
2779 /* If this item just became a submenu, we must set it. */ | |
2780 if (nsub != sub) | |
2781 gtk_menu_item_set_submenu (witem, nsub); | |
2782 } | |
2783 } | |
2784 else | |
2785 { | |
2786 /* Structural difference. Remove everything from here and down | |
2787 in SUBMENU. */ | |
2788 break; | |
2789 } | |
2790 } | |
2791 | |
2792 /* Remove widgets from first structual change. */ | |
2793 if (iter) | |
2794 { | |
2795 /* If we are adding new menu items below, we must remove from | |
2796 first radio button so that radio groups become correct. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2797 if (cur && first_radio) xg_destroy_widgets (first_radio); |
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2798 else xg_destroy_widgets (iter); |
49323 | 2799 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2800 |
49323 | 2801 if (cur) |
2802 { | |
2803 /* More items added. Create them. */ | |
2804 newsub = create_menus (cur, | |
2805 f, | |
2806 select_cb, | |
2807 deactivate_cb, | |
2808 highlight_cb, | |
2809 0, | |
2810 0, | |
2811 ! has_tearoff_p, | |
2812 submenu, | |
2813 cl_data, | |
2814 0); | |
2815 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2816 |
49572 | 2817 if (list) g_list_free (list); |
2818 | |
49323 | 2819 return newsub; |
2820 } | |
2821 | |
2822 /* Update the MENUBAR. | |
2823 F is the frame the menu bar belongs to. | |
2824 VAL describes the contents of the menu bar. | |
2825 If DEEP_P is non-zero, rebuild all but the top level menu names in | |
2826 the MENUBAR. If DEEP_P is zero, just rebuild the names in the menubar. | |
2827 SELECT_CB is the callback to use when a menu item is selected. | |
2828 DEACTIVATE_CB is the callback to use when a sub menu is not shown anymore. | |
2829 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2830 |
49323 | 2831 void |
2832 xg_modify_menubar_widgets (menubar, f, val, deep_p, | |
2833 select_cb, deactivate_cb, highlight_cb) | |
2834 GtkWidget *menubar; | |
2835 FRAME_PTR f; | |
2836 widget_value *val; | |
2837 int deep_p; | |
2838 GCallback select_cb; | |
2839 GCallback deactivate_cb; | |
2840 GCallback highlight_cb; | |
2841 { | |
2842 xg_menu_cb_data *cl_data; | |
2843 GList *list = gtk_container_get_children (GTK_CONTAINER (menubar)); | |
2844 | |
2845 if (! list) return; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2846 |
49323 | 2847 cl_data = (xg_menu_cb_data*) g_object_get_data (G_OBJECT (menubar), |
2848 XG_FRAME_DATA); | |
2849 | |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2850 xg_update_menubar (menubar, f, &list, list, 0, val->contents, |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2851 select_cb, highlight_cb, cl_data); |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2852 |
64783
0975467abc17
* gtkutil.c (xg_modify_menubar_widgets): Remove semicolon that
Jan Djärv <jan.h.d@swipnet.se>
parents:
64770
diff
changeset
|
2853 if (deep_p) |
49323 | 2854 { |
2855 widget_value *cur; | |
2856 | |
2857 /* Update all sub menus. | |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2858 We must keep the submenus (GTK menu item widgets) since the |
49323 | 2859 X Window in the XEvent that activates the menu are those widgets. */ |
2860 | |
2861 /* Update cl_data, menu_item things in F may have changed. */ | |
2862 update_cl_data (cl_data, f, highlight_cb); | |
2863 | |
2864 for (cur = val->contents; cur; cur = cur->next) | |
2865 { | |
49572 | 2866 GList *iter; |
49323 | 2867 GtkWidget *sub = 0; |
2868 GtkWidget *newsub; | |
2869 GtkMenuItem *witem; | |
2870 | |
2871 /* Find sub menu that corresponds to val and update it. */ | |
2872 for (iter = list ; iter; iter = g_list_next (iter)) | |
2873 { | |
2874 witem = GTK_MENU_ITEM (iter->data); | |
2875 if (xg_item_label_same_p (witem, cur->name)) | |
2876 { | |
2877 sub = gtk_menu_item_get_submenu (witem); | |
2878 break; | |
2879 } | |
2880 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2881 |
49323 | 2882 newsub = xg_update_submenu (sub, |
2883 f, | |
2884 cur->contents, | |
2885 select_cb, | |
2886 deactivate_cb, | |
2887 highlight_cb, | |
2888 cl_data); | |
2889 /* sub may still be NULL. If we just updated non deep and added | |
2890 a new menu bar item, it has no sub menu yet. So we set the | |
2891 newly created sub menu under witem. */ | |
2892 if (newsub != sub) | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2893 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2894 xg_set_screen (newsub, f); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2895 gtk_menu_item_set_submenu (witem, newsub); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2896 } |
49323 | 2897 } |
2898 } | |
2899 | |
49572 | 2900 g_list_free (list); |
49323 | 2901 gtk_widget_show_all (menubar); |
2902 } | |
2903 | |
2904 /* Recompute all the widgets of frame F, when the menu bar has been | |
2905 changed. Value is non-zero if widgets were updated. */ | |
2906 | |
2907 int | |
2908 xg_update_frame_menubar (f) | |
2909 FRAME_PTR f; | |
2910 { | |
2911 struct x_output *x = f->output_data.x; | |
2912 GtkRequisition req; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2913 |
49323 | 2914 if (!x->menubar_widget || GTK_WIDGET_MAPPED (x->menubar_widget)) |
2915 return 0; | |
2916 | |
2917 BLOCK_INPUT; | |
2918 | |
2919 gtk_box_pack_start (GTK_BOX (x->vbox_widget), x->menubar_widget, | |
2920 FALSE, FALSE, 0); | |
2921 gtk_box_reorder_child (GTK_BOX (x->vbox_widget), x->menubar_widget, 0); | |
2922 | |
2923 gtk_widget_show_all (x->menubar_widget); | |
2924 gtk_widget_size_request (x->menubar_widget, &req); | |
2925 | |
2926 FRAME_MENUBAR_HEIGHT (f) = req.height; | |
2927 | |
2928 /* The height has changed, resize outer widget and set columns | |
2929 rows to what we had before adding the menu bar. */ | |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
2930 xg_resize_outer_widget (f, FRAME_COLS (f), FRAME_LINES (f)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2931 |
49323 | 2932 SET_FRAME_GARBAGED (f); |
2933 UNBLOCK_INPUT; | |
50106
5675d6a0080c
(xg_update_frame_menubar): Add missing return value.
Andreas Schwab <schwab@suse.de>
parents:
50099
diff
changeset
|
2934 |
5675d6a0080c
(xg_update_frame_menubar): Add missing return value.
Andreas Schwab <schwab@suse.de>
parents:
50099
diff
changeset
|
2935 return 1; |
49323 | 2936 } |
2937 | |
2938 /* Get rid of the menu bar of frame F, and free its storage. | |
2939 This is used when deleting a frame, and when turning off the menu bar. */ | |
2940 | |
2941 void | |
2942 free_frame_menubar (f) | |
2943 FRAME_PTR f; | |
2944 { | |
2945 struct x_output *x = f->output_data.x; | |
2946 | |
2947 if (x->menubar_widget) | |
2948 { | |
2949 BLOCK_INPUT; | |
2950 | |
2951 gtk_container_remove (GTK_CONTAINER (x->vbox_widget), x->menubar_widget); | |
2952 /* The menubar and its children shall be deleted when removed from | |
2953 the container. */ | |
2954 x->menubar_widget = 0; | |
2955 FRAME_MENUBAR_HEIGHT (f) = 0; | |
2956 | |
2957 /* The height has changed, resize outer widget and set columns | |
2958 rows to what we had before removing the menu bar. */ | |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
2959 xg_resize_outer_widget (f, FRAME_COLS (f), FRAME_LINES (f)); |
49323 | 2960 |
2961 SET_FRAME_GARBAGED (f); | |
2962 UNBLOCK_INPUT; | |
2963 } | |
2964 } | |
2965 | |
2966 | |
2967 | |
2968 /*********************************************************************** | |
2969 Scroll bar functions | |
2970 ***********************************************************************/ | |
2971 | |
2972 | |
2973 /* Setting scroll bar values invokes the callback. Use this variable | |
2974 to indicate that callback should do nothing. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2975 |
49323 | 2976 int xg_ignore_gtk_scrollbar; |
2977 | |
2978 /* SET_SCROLL_BAR_X_WINDOW assumes the second argument fits in | |
2979 32 bits. But we want to store pointers, and they may be larger | |
2980 than 32 bits. Keep a mapping from integer index to widget pointers | |
2981 to get around the 32 bit limitation. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2982 |
49323 | 2983 static struct |
2984 { | |
2985 GtkWidget **widgets; | |
2986 int max_size; | |
2987 int used; | |
49419
6562bb5f04aa
gtkutil.c (xg_initialize): Initialize id_to_widget here instead
Jan Djärv <jan.h.d@swipnet.se>
parents:
49359
diff
changeset
|
2988 } id_to_widget; |
49323 | 2989 |
2990 /* Grow this much every time we need to allocate more */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2991 |
49323 | 2992 #define ID_TO_WIDGET_INCR 32 |
2993 | |
2994 /* Store the widget pointer W in id_to_widget and return the integer index. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2995 |
49323 | 2996 static int |
2997 xg_store_widget_in_map (w) | |
2998 GtkWidget *w; | |
2999 { | |
3000 int i; | |
3001 | |
3002 if (id_to_widget.max_size == id_to_widget.used) | |
3003 { | |
3004 int new_size = id_to_widget.max_size + ID_TO_WIDGET_INCR; | |
3005 | |
3006 id_to_widget.widgets = xrealloc (id_to_widget.widgets, | |
3007 sizeof (GtkWidget *)*new_size); | |
3008 | |
3009 for (i = id_to_widget.max_size; i < new_size; ++i) | |
3010 id_to_widget.widgets[i] = 0; | |
3011 id_to_widget.max_size = new_size; | |
3012 } | |
3013 | |
3014 /* Just loop over the array and find a free place. After all, | |
3015 how many scroll bars are we creating? Should be a small number. | |
3016 The check above guarantees we will find a free place. */ | |
3017 for (i = 0; i < id_to_widget.max_size; ++i) | |
3018 { | |
3019 if (! id_to_widget.widgets[i]) | |
3020 { | |
3021 id_to_widget.widgets[i] = w; | |
3022 ++id_to_widget.used; | |
3023 | |
3024 return i; | |
3025 } | |
3026 } | |
3027 | |
3028 /* Should never end up here */ | |
3029 abort (); | |
3030 } | |
3031 | |
3032 /* Remove pointer at IDX from id_to_widget. | |
3033 Called when scroll bar is destroyed. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3034 |
49323 | 3035 static void |
3036 xg_remove_widget_from_map (idx) | |
3037 int idx; | |
3038 { | |
3039 if (idx < id_to_widget.max_size && id_to_widget.widgets[idx] != 0) | |
3040 { | |
3041 id_to_widget.widgets[idx] = 0; | |
3042 --id_to_widget.used; | |
3043 } | |
3044 } | |
3045 | |
3046 /* Get the widget pointer at IDX from id_to_widget. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3047 |
49323 | 3048 static GtkWidget * |
3049 xg_get_widget_from_map (idx) | |
3050 int idx; | |
3051 { | |
3052 if (idx < id_to_widget.max_size && id_to_widget.widgets[idx] != 0) | |
3053 return id_to_widget.widgets[idx]; | |
3054 | |
3055 return 0; | |
3056 } | |
3057 | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
3058 /* Return the scrollbar id for X Window WID on display DPY. |
50063 | 3059 Return -1 if WID not in id_to_widget. */ |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3060 |
50063 | 3061 int |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
3062 xg_get_scroll_id_for_window (dpy, wid) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
3063 Display *dpy; |
50063 | 3064 Window wid; |
3065 { | |
3066 int idx; | |
3067 GtkWidget *w; | |
3068 | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
3069 w = xg_win_to_widget (dpy, wid); |
50063 | 3070 |
3071 if (w) | |
3072 { | |
3073 for (idx = 0; idx < id_to_widget.max_size; ++idx) | |
3074 if (id_to_widget.widgets[idx] == w) | |
3075 return idx; | |
3076 } | |
3077 | |
3078 return -1; | |
3079 } | |
3080 | |
49323 | 3081 /* Callback invoked when scroll bar WIDGET is destroyed. |
3082 DATA is the index into id_to_widget for WIDGET. | |
50129
d0142038feaa
Reduce flicker in GTK scrollbars.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50112
diff
changeset
|
3083 We free pointer to last scroll bar values here and remove the index. */ |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3084 |
49323 | 3085 static void |
3086 xg_gtk_scroll_destroy (widget, data) | |
3087 GtkWidget *widget; | |
3088 gpointer data; | |
3089 { | |
3090 gpointer p; | |
59411
ecb6689e04bf
* gtkutil.c (xg_gtk_scroll_destroy, xg_create_scroll_bar)
Jan Djärv <jan.h.d@swipnet.se>
parents:
59102
diff
changeset
|
3091 int id = (int) (EMACS_INT) data; /* The EMACS_INT cast avoids a warning. */ |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3092 |
49323 | 3093 p = g_object_get_data (G_OBJECT (widget), XG_LAST_SB_DATA); |
3094 if (p) xfree (p); | |
3095 xg_remove_widget_from_map (id); | |
3096 } | |
3097 | |
3098 /* Callback for button press/release events. Used to start timer so that | |
3099 the scroll bar repetition timer in GTK gets handeled. | |
50177
297925dd73b1
New approach to scrolling and scroll bars for better redraw and smoother
Jan Djärv <jan.h.d@swipnet.se>
parents:
50130
diff
changeset
|
3100 Also, sets bar->dragging to Qnil when dragging (button release) is done. |
49323 | 3101 WIDGET is the scroll bar widget the event is for (not used). |
3102 EVENT contains the event. | |
50177
297925dd73b1
New approach to scrolling and scroll bars for better redraw and smoother
Jan Djärv <jan.h.d@swipnet.se>
parents:
50130
diff
changeset
|
3103 USER_DATA points to the struct scrollbar structure. |
49323 | 3104 |
3105 Returns FALSE to tell GTK that it shall continue propagate the event | |
3106 to widgets. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3107 |
49323 | 3108 static gboolean |
3109 scroll_bar_button_cb (widget, event, user_data) | |
3110 GtkWidget *widget; | |
3111 GdkEventButton *event; | |
3112 gpointer user_data; | |
3113 { | |
3114 if (event->type == GDK_BUTTON_PRESS && ! xg_timer) | |
3115 xg_start_timer (); | |
50177
297925dd73b1
New approach to scrolling and scroll bars for better redraw and smoother
Jan Djärv <jan.h.d@swipnet.se>
parents:
50130
diff
changeset
|
3116 else if (event->type == GDK_BUTTON_RELEASE) |
297925dd73b1
New approach to scrolling and scroll bars for better redraw and smoother
Jan Djärv <jan.h.d@swipnet.se>
parents:
50130
diff
changeset
|
3117 { |
297925dd73b1
New approach to scrolling and scroll bars for better redraw and smoother
Jan Djärv <jan.h.d@swipnet.se>
parents:
50130
diff
changeset
|
3118 struct scroll_bar *bar = (struct scroll_bar *) user_data; |
297925dd73b1
New approach to scrolling and scroll bars for better redraw and smoother
Jan Djärv <jan.h.d@swipnet.se>
parents:
50130
diff
changeset
|
3119 if (xg_timer) xg_stop_timer (); |
297925dd73b1
New approach to scrolling and scroll bars for better redraw and smoother
Jan Djärv <jan.h.d@swipnet.se>
parents:
50130
diff
changeset
|
3120 bar->dragging = Qnil; |
297925dd73b1
New approach to scrolling and scroll bars for better redraw and smoother
Jan Djärv <jan.h.d@swipnet.se>
parents:
50130
diff
changeset
|
3121 } |
60185
391f44959566
(xg_create_frame_widgets): UNBLOCK_INPUT on error.
Kim F. Storm <storm@cua.dk>
parents:
59913
diff
changeset
|
3122 |
49323 | 3123 return FALSE; |
3124 } | |
3125 | |
3126 /* Create a scroll bar widget for frame F. Store the scroll bar | |
3127 in BAR. | |
3128 SCROLL_CALLBACK is the callback to invoke when the value of the | |
3129 bar changes. | |
3130 SCROLL_BAR_NAME is the name we use for the scroll bar. Can be used | |
3131 to set resources for the widget. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3132 |
49323 | 3133 void |
3134 xg_create_scroll_bar (f, bar, scroll_callback, scroll_bar_name) | |
3135 FRAME_PTR f; | |
3136 struct scroll_bar *bar; | |
3137 GCallback scroll_callback; | |
3138 char *scroll_bar_name; | |
3139 { | |
3140 GtkWidget *wscroll; | |
57597
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
3141 GtkWidget *webox; |
49323 | 3142 GtkObject *vadj; |
3143 int scroll_id; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3144 |
49323 | 3145 /* Page, step increment values are not so important here, they |
3146 will be corrected in x_set_toolkit_scroll_bar_thumb. */ | |
3147 vadj = gtk_adjustment_new (XG_SB_MIN, XG_SB_MIN, XG_SB_MAX, | |
3148 0.1, 0.1, 0.1); | |
3149 | |
3150 wscroll = gtk_vscrollbar_new (GTK_ADJUSTMENT (vadj)); | |
57597
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
3151 webox = gtk_event_box_new (); |
49323 | 3152 gtk_widget_set_name (wscroll, scroll_bar_name); |
3153 gtk_range_set_update_policy (GTK_RANGE (wscroll), GTK_UPDATE_CONTINUOUS); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3154 |
49323 | 3155 scroll_id = xg_store_widget_in_map (wscroll); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3156 |
50521
3b4cda88d7ef
* xterm.c (xg_scroll_callback): Call gtk_range_get_adjustment to
Jan Djärv <jan.h.d@swipnet.se>
parents:
50333
diff
changeset
|
3157 g_signal_connect (G_OBJECT (wscroll), |
49323 | 3158 "value-changed", |
3159 scroll_callback, | |
50521
3b4cda88d7ef
* xterm.c (xg_scroll_callback): Call gtk_range_get_adjustment to
Jan Djärv <jan.h.d@swipnet.se>
parents:
50333
diff
changeset
|
3160 (gpointer) bar); |
59411
ecb6689e04bf
* gtkutil.c (xg_gtk_scroll_destroy, xg_create_scroll_bar)
Jan Djärv <jan.h.d@swipnet.se>
parents:
59102
diff
changeset
|
3161 /* The EMACS_INT cast avoids a warning. */ |
49323 | 3162 g_signal_connect (G_OBJECT (wscroll), |
3163 "destroy", | |
3164 G_CALLBACK (xg_gtk_scroll_destroy), | |
59411
ecb6689e04bf
* gtkutil.c (xg_gtk_scroll_destroy, xg_create_scroll_bar)
Jan Djärv <jan.h.d@swipnet.se>
parents:
59102
diff
changeset
|
3165 (gpointer) (EMACS_INT) scroll_id); |
49323 | 3166 |
3167 /* Connect to button press and button release to detect if any scroll bar | |
3168 has the pointer. */ | |
3169 g_signal_connect (G_OBJECT (wscroll), | |
3170 "button-press-event", | |
3171 G_CALLBACK (scroll_bar_button_cb), | |
50521
3b4cda88d7ef
* xterm.c (xg_scroll_callback): Call gtk_range_get_adjustment to
Jan Djärv <jan.h.d@swipnet.se>
parents:
50333
diff
changeset
|
3172 (gpointer) bar); |
49323 | 3173 g_signal_connect (G_OBJECT (wscroll), |
3174 "button-release-event", | |
3175 G_CALLBACK (scroll_bar_button_cb), | |
50521
3b4cda88d7ef
* xterm.c (xg_scroll_callback): Call gtk_range_get_adjustment to
Jan Djärv <jan.h.d@swipnet.se>
parents:
50333
diff
changeset
|
3176 (gpointer) bar); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3177 |
57597
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
3178 /* The scroll bar widget does not draw on a window of its own. Instead |
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
3179 it draws on the parent window, in this case the edit widget. So |
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
3180 whenever the edit widget is cleared, the scroll bar needs to redraw |
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
3181 also, which causes flicker. Put an event box between the edit widget |
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
3182 and the scroll bar, so the scroll bar instead draws itself on the |
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
3183 event box window. */ |
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
3184 gtk_fixed_put (GTK_FIXED (f->output_data.x->edit_widget), webox, -1, -1); |
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
3185 gtk_container_add (GTK_CONTAINER (webox), wscroll); |
60185
391f44959566
(xg_create_frame_widgets): UNBLOCK_INPUT on error.
Kim F. Storm <storm@cua.dk>
parents:
59913
diff
changeset
|
3186 |
49323 | 3187 |
3188 /* Set the cursor to an arrow. */ | |
57597
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
3189 xg_set_cursor (webox, FRAME_X_DISPLAY_INFO (f)->xg_cursor); |
49323 | 3190 |
3191 SET_SCROLL_BAR_X_WINDOW (bar, scroll_id); | |
3192 } | |
3193 | |
3194 /* Make the scroll bar represented by SCROLLBAR_ID visible. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3195 |
49323 | 3196 void |
3197 xg_show_scroll_bar (scrollbar_id) | |
3198 int scrollbar_id; | |
3199 { | |
3200 GtkWidget *w = xg_get_widget_from_map (scrollbar_id); | |
3201 if (w) | |
57597
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
3202 gtk_widget_show_all (gtk_widget_get_parent (w)); |
49323 | 3203 } |
3204 | |
3205 /* Remove the scroll bar represented by SCROLLBAR_ID from the frame F. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3206 |
49323 | 3207 void |
3208 xg_remove_scroll_bar (f, scrollbar_id) | |
3209 FRAME_PTR f; | |
3210 int scrollbar_id; | |
3211 { | |
3212 GtkWidget *w = xg_get_widget_from_map (scrollbar_id); | |
3213 if (w) | |
3214 { | |
57597
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
3215 GtkWidget *wparent = gtk_widget_get_parent (w); |
49323 | 3216 gtk_widget_destroy (w); |
57597
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
3217 gtk_widget_destroy (wparent); |
49323 | 3218 SET_FRAME_GARBAGED (f); |
3219 } | |
3220 } | |
3221 | |
3222 /* Update the position of the vertical scroll bar represented by SCROLLBAR_ID | |
3223 in frame F. | |
3224 TOP/LEFT are the new pixel positions where the bar shall appear. | |
3225 WIDTH, HEIGHT is the size in pixels the bar shall have. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3226 |
49323 | 3227 void |
57597
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
3228 xg_update_scrollbar_pos (f, scrollbar_id, top, left, width, height) |
49323 | 3229 FRAME_PTR f; |
3230 int scrollbar_id; | |
3231 int top; | |
3232 int left; | |
3233 int width; | |
3234 int height; | |
3235 { | |
49572 | 3236 |
3237 GtkWidget *wscroll = xg_get_widget_from_map (scrollbar_id); | |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3238 |
49572 | 3239 if (wscroll) |
3240 { | |
50177
297925dd73b1
New approach to scrolling and scroll bars for better redraw and smoother
Jan Djärv <jan.h.d@swipnet.se>
parents:
50130
diff
changeset
|
3241 GtkWidget *wfixed = f->output_data.x->edit_widget; |
57597
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
3242 GtkWidget *wparent = gtk_widget_get_parent (wscroll); |
55342
44d086f5e08a
* gtkutil.c (xg_update_scrollbar_pos): Call XClearWindow to clear
Jan Djärv <jan.h.d@swipnet.se>
parents:
53275
diff
changeset
|
3243 |
44d086f5e08a
* gtkutil.c (xg_update_scrollbar_pos): Call XClearWindow to clear
Jan Djärv <jan.h.d@swipnet.se>
parents:
53275
diff
changeset
|
3244 /* Move and resize to new values. */ |
60553
5ace6337c8fa
* gtkutil.c (xg_update_scrollbar_pos): Call x_sync so that the
Jan Djärv <jan.h.d@swipnet.se>
parents:
60291
diff
changeset
|
3245 gtk_fixed_move (GTK_FIXED (wfixed), wparent, left, top); |
55342
44d086f5e08a
* gtkutil.c (xg_update_scrollbar_pos): Call XClearWindow to clear
Jan Djärv <jan.h.d@swipnet.se>
parents:
53275
diff
changeset
|
3246 gtk_widget_set_size_request (wscroll, width, height); |
60553
5ace6337c8fa
* gtkutil.c (xg_update_scrollbar_pos): Call x_sync so that the
Jan Djärv <jan.h.d@swipnet.se>
parents:
60291
diff
changeset
|
3247 gtk_widget_queue_draw (wparent); |
5ace6337c8fa
* gtkutil.c (xg_update_scrollbar_pos): Call x_sync so that the
Jan Djärv <jan.h.d@swipnet.se>
parents:
60291
diff
changeset
|
3248 gdk_window_process_all_updates (); |
5ace6337c8fa
* gtkutil.c (xg_update_scrollbar_pos): Call x_sync so that the
Jan Djärv <jan.h.d@swipnet.se>
parents:
60291
diff
changeset
|
3249 /* GTK does not redraw until the main loop is entered again, but |
5ace6337c8fa
* gtkutil.c (xg_update_scrollbar_pos): Call x_sync so that the
Jan Djärv <jan.h.d@swipnet.se>
parents:
60291
diff
changeset
|
3250 if there are no X events pending we will not enter it. So we sync |
5ace6337c8fa
* gtkutil.c (xg_update_scrollbar_pos): Call x_sync so that the
Jan Djärv <jan.h.d@swipnet.se>
parents:
60291
diff
changeset
|
3251 here to get some events. */ |
5ace6337c8fa
* gtkutil.c (xg_update_scrollbar_pos): Call x_sync so that the
Jan Djärv <jan.h.d@swipnet.se>
parents:
60291
diff
changeset
|
3252 x_sync (f); |
49572 | 3253 SET_FRAME_GARBAGED (f); |
3254 cancel_mouse_face (f); | |
3255 } | |
49323 | 3256 } |
3257 | |
3258 /* Set the thumb size and position of scroll bar BAR. We are currently | |
3259 displaying PORTION out of a whole WHOLE, and our position POSITION. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3260 |
49323 | 3261 void |
3262 xg_set_toolkit_scroll_bar_thumb (bar, portion, position, whole) | |
3263 struct scroll_bar *bar; | |
3264 int portion, position, whole; | |
3265 { | |
3266 GtkWidget *wscroll = xg_get_widget_from_map (SCROLL_BAR_X_WINDOW (bar)); | |
3267 | |
3268 FRAME_PTR f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window))); | |
3269 | |
50177
297925dd73b1
New approach to scrolling and scroll bars for better redraw and smoother
Jan Djärv <jan.h.d@swipnet.se>
parents:
50130
diff
changeset
|
3270 if (wscroll && NILP (bar->dragging)) |
49323 | 3271 { |
3272 GtkAdjustment *adj; | |
3273 gdouble shown; | |
3274 gdouble top; | |
3275 int size, value; | |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3276 int new_step; |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3277 int changed = 0; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3278 |
49323 | 3279 adj = gtk_range_get_adjustment (GTK_RANGE (wscroll)); |
3280 | |
50177
297925dd73b1
New approach to scrolling and scroll bars for better redraw and smoother
Jan Djärv <jan.h.d@swipnet.se>
parents:
50130
diff
changeset
|
3281 /* We do the same as for MOTIF in xterm.c, assume 30 chars per line |
297925dd73b1
New approach to scrolling and scroll bars for better redraw and smoother
Jan Djärv <jan.h.d@swipnet.se>
parents:
50130
diff
changeset
|
3282 rather than the real portion value. This makes the thumb less likely |
297925dd73b1
New approach to scrolling and scroll bars for better redraw and smoother
Jan Djärv <jan.h.d@swipnet.se>
parents:
50130
diff
changeset
|
3283 to resize and that looks better. */ |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
3284 portion = WINDOW_TOTAL_LINES (XWINDOW (bar->window)) * 30; |
50177
297925dd73b1
New approach to scrolling and scroll bars for better redraw and smoother
Jan Djärv <jan.h.d@swipnet.se>
parents:
50130
diff
changeset
|
3285 /* When the thumb is at the bottom, position == whole. |
297925dd73b1
New approach to scrolling and scroll bars for better redraw and smoother
Jan Djärv <jan.h.d@swipnet.se>
parents:
50130
diff
changeset
|
3286 So we need to increase `whole' to make space for the thumb. */ |
297925dd73b1
New approach to scrolling and scroll bars for better redraw and smoother
Jan Djärv <jan.h.d@swipnet.se>
parents:
50130
diff
changeset
|
3287 whole += portion; |
297925dd73b1
New approach to scrolling and scroll bars for better redraw and smoother
Jan Djärv <jan.h.d@swipnet.se>
parents:
50130
diff
changeset
|
3288 |
49323 | 3289 if (whole <= 0) |
3290 top = 0, shown = 1; | |
3291 else | |
3292 { | |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3293 top = (gdouble) position / whole; |
49323 | 3294 shown = (gdouble) portion / whole; |
3295 } | |
3296 | |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3297 size = shown * XG_SB_RANGE; |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3298 size = min (size, XG_SB_RANGE); |
49323 | 3299 size = max (size, 1); |
3300 | |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3301 value = top * XG_SB_RANGE; |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3302 value = min (value, XG_SB_MAX - size); |
49323 | 3303 value = max (value, XG_SB_MIN); |
3304 | |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3305 /* Assume all lines are of equal size. */ |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
3306 new_step = size / max (1, FRAME_LINES (f)); |
50178
61194aef8668
* gtkutil.c (xg_set_toolkit_scroll_bar_thumb): Check if new values
Jan Djärv <jan.h.d@swipnet.se>
parents:
50177
diff
changeset
|
3307 |
61194aef8668
* gtkutil.c (xg_set_toolkit_scroll_bar_thumb): Check if new values
Jan Djärv <jan.h.d@swipnet.se>
parents:
50177
diff
changeset
|
3308 if ((int) adj->page_size != size |
61194aef8668
* gtkutil.c (xg_set_toolkit_scroll_bar_thumb): Check if new values
Jan Djärv <jan.h.d@swipnet.se>
parents:
50177
diff
changeset
|
3309 || (int) adj->step_increment != new_step) |
61194aef8668
* gtkutil.c (xg_set_toolkit_scroll_bar_thumb): Check if new values
Jan Djärv <jan.h.d@swipnet.se>
parents:
50177
diff
changeset
|
3310 { |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3311 adj->page_size = size; |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3312 adj->step_increment = new_step; |
50178
61194aef8668
* gtkutil.c (xg_set_toolkit_scroll_bar_thumb): Check if new values
Jan Djärv <jan.h.d@swipnet.se>
parents:
50177
diff
changeset
|
3313 /* Assume a page increment is about 95% of the page size */ |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3314 adj->page_increment = (int) (0.95*adj->page_size); |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3315 changed = 1; |
50178
61194aef8668
* gtkutil.c (xg_set_toolkit_scroll_bar_thumb): Check if new values
Jan Djärv <jan.h.d@swipnet.se>
parents:
50177
diff
changeset
|
3316 } |
61194aef8668
* gtkutil.c (xg_set_toolkit_scroll_bar_thumb): Check if new values
Jan Djärv <jan.h.d@swipnet.se>
parents:
50177
diff
changeset
|
3317 |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3318 if (changed || (int) gtk_range_get_value (GTK_RANGE (wscroll)) != value) |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3319 { |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3320 GtkWidget *wfixed = f->output_data.x->edit_widget; |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3321 |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3322 BLOCK_INPUT; |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3323 |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3324 /* gtk_range_set_value invokes the callback. Set |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3325 ignore_gtk_scrollbar to make the callback do nothing */ |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3326 xg_ignore_gtk_scrollbar = 1; |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3327 |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3328 if ((int) gtk_range_get_value (GTK_RANGE (wscroll)) != value) |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3329 gtk_range_set_value (GTK_RANGE (wscroll), (gdouble)value); |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3330 else if (changed) |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3331 gtk_adjustment_changed (adj); |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3332 |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3333 xg_ignore_gtk_scrollbar = 0; |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3334 |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3335 UNBLOCK_INPUT; |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3336 } |
49323 | 3337 } |
3338 } | |
3339 | |
3340 | |
3341 /*********************************************************************** | |
3342 Tool bar functions | |
3343 ***********************************************************************/ | |
3344 /* The key for the data we put in the GtkImage widgets. The data is | |
3345 the image used by Emacs. We use this to see if we need to update | |
3346 the GtkImage with a new image. */ | |
3347 #define XG_TOOL_BAR_IMAGE_DATA "emacs-tool-bar-image" | |
3348 | |
68874
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3349 /* The key for storing the latest modifiers so the activate callback can |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3350 get them. */ |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3351 #define XG_TOOL_BAR_LAST_MODIFIER "emacs-tool-bar-modifier" |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3352 |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3353 |
49323 | 3354 /* Callback function invoked when a tool bar item is pressed. |
3355 W is the button widget in the tool bar that got pressed, | |
3356 CLIENT_DATA is an integer that is the index of the button in the | |
3357 tool bar. 0 is the first button. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3358 |
68874
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3359 static gboolean |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3360 xg_tool_bar_button_cb (widget, event, user_data) |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3361 GtkWidget *widget; |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3362 GdkEventButton *event; |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3363 gpointer user_data; |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3364 { |
73389
7b5c0104efb0
* gtkutil.c (get_utf8_string): Remove warnings with casts.
Jan Djärv <jan.h.d@swipnet.se>
parents:
73066
diff
changeset
|
3365 /* Casts to avoid warnings when gpointer is 64 bits and int is 32 bits */ |
7b5c0104efb0
* gtkutil.c (get_utf8_string): Remove warnings with casts.
Jan Djärv <jan.h.d@swipnet.se>
parents:
73066
diff
changeset
|
3366 gpointer ptr = (gpointer) (EMACS_INT) event->state; |
7b5c0104efb0
* gtkutil.c (get_utf8_string): Remove warnings with casts.
Jan Djärv <jan.h.d@swipnet.se>
parents:
73066
diff
changeset
|
3367 g_object_set_data (G_OBJECT (user_data), XG_TOOL_BAR_LAST_MODIFIER, ptr); |
68922 | 3368 return FALSE; |
68874
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3369 } |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3370 |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3371 |
49323 | 3372 static void |
3373 xg_tool_bar_callback (w, client_data) | |
3374 GtkWidget *w; | |
3375 gpointer client_data; | |
3376 { | |
59411
ecb6689e04bf
* gtkutil.c (xg_gtk_scroll_destroy, xg_create_scroll_bar)
Jan Djärv <jan.h.d@swipnet.se>
parents:
59102
diff
changeset
|
3377 /* The EMACS_INT cast avoids a warning. */ |
ecb6689e04bf
* gtkutil.c (xg_gtk_scroll_destroy, xg_create_scroll_bar)
Jan Djärv <jan.h.d@swipnet.se>
parents:
59102
diff
changeset
|
3378 int idx = (int) (EMACS_INT) client_data; |
73389
7b5c0104efb0
* gtkutil.c (get_utf8_string): Remove warnings with casts.
Jan Djärv <jan.h.d@swipnet.se>
parents:
73066
diff
changeset
|
3379 int mod = (int) (EMACS_INT) g_object_get_data (G_OBJECT (w), |
7b5c0104efb0
* gtkutil.c (get_utf8_string): Remove warnings with casts.
Jan Djärv <jan.h.d@swipnet.se>
parents:
73066
diff
changeset
|
3380 XG_TOOL_BAR_LAST_MODIFIER); |
68874
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3381 |
49323 | 3382 FRAME_PTR f = (FRAME_PTR) g_object_get_data (G_OBJECT (w), XG_FRAME_DATA); |
3383 Lisp_Object key, frame; | |
3384 struct input_event event; | |
51569
e7bd8581e306
(xg_tool_bar_callback): Don't pass uninitialized
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51432
diff
changeset
|
3385 EVENT_INIT (event); |
49323 | 3386 |
3387 if (! f || ! f->n_tool_bar_items || NILP (f->tool_bar_items)) | |
3388 return; | |
3389 | |
3390 idx *= TOOL_BAR_ITEM_NSLOTS; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3391 |
49323 | 3392 key = AREF (f->tool_bar_items, idx + TOOL_BAR_ITEM_KEY); |
3393 XSETFRAME (frame, f); | |
3394 event.kind = TOOL_BAR_EVENT; | |
3395 event.frame_or_window = frame; | |
3396 event.arg = frame; | |
3397 kbd_buffer_store_event (&event); | |
3398 | |
3399 event.kind = TOOL_BAR_EVENT; | |
3400 event.frame_or_window = frame; | |
3401 event.arg = key; | |
68874
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3402 /* Convert between the modifier bits GDK uses and the modifier bits |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3403 Emacs uses. This assumes GDK an X masks are the same, which they are when |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3404 this is written. */ |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3405 event.modifiers = x_x_to_emacs_modifiers (FRAME_X_DISPLAY_INFO (f), mod); |
49323 | 3406 kbd_buffer_store_event (&event); |
3407 } | |
3408 | |
3409 /* This callback is called when a tool bar is detached. We must set | |
3410 the height of the tool bar to zero when this happens so frame sizes | |
3411 are correctly calculated. | |
3412 WBOX is the handle box widget that enables detach/attach of the tool bar. | |
3413 W is the tool bar widget. | |
3414 CLIENT_DATA is a pointer to the frame the tool bar belongs to. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3415 |
49323 | 3416 static void |
3417 xg_tool_bar_detach_callback (wbox, w, client_data) | |
3418 GtkHandleBox *wbox; | |
3419 GtkWidget *w; | |
3420 gpointer client_data; | |
3421 { | |
3422 FRAME_PTR f = (FRAME_PTR) client_data; | |
68879
3249a3dd3284
* gtkutil.c (xg_tool_bar_detach_callback): Set show-arrow to the
Jan Djärv <jan.h.d@swipnet.se>
parents:
68874
diff
changeset
|
3423 extern int x_gtk_whole_detached_tool_bar; |
3249a3dd3284
* gtkutil.c (xg_tool_bar_detach_callback): Set show-arrow to the
Jan Djärv <jan.h.d@swipnet.se>
parents:
68874
diff
changeset
|
3424 |
3249a3dd3284
* gtkutil.c (xg_tool_bar_detach_callback): Set show-arrow to the
Jan Djärv <jan.h.d@swipnet.se>
parents:
68874
diff
changeset
|
3425 g_object_set (G_OBJECT (w), "show-arrow", !x_gtk_whole_detached_tool_bar, |
3249a3dd3284
* gtkutil.c (xg_tool_bar_detach_callback): Set show-arrow to the
Jan Djärv <jan.h.d@swipnet.se>
parents:
68874
diff
changeset
|
3426 NULL); |
49323 | 3427 |
3428 if (f) | |
3429 { | |
59420
eb72706060ad
* xterm.h (struct x_output): New member, toolbar_detached.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59411
diff
changeset
|
3430 FRAME_X_OUTPUT (f)->toolbar_detached = 1; |
eb72706060ad
* xterm.h (struct x_output): New member, toolbar_detached.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59411
diff
changeset
|
3431 |
49323 | 3432 /* When detaching a tool bar, not everything dissapear. There are |
3433 a few pixels left that are used to drop the tool bar back into | |
3434 place. */ | |
3435 FRAME_TOOLBAR_HEIGHT (f) = 2; | |
3436 | |
3437 /* The height has changed, resize outer widget and set columns | |
3438 rows to what we had before detaching the tool bar. */ | |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
3439 xg_resize_outer_widget (f, FRAME_COLS (f), FRAME_LINES (f)); |
49323 | 3440 } |
3441 } | |
3442 | |
3443 /* This callback is called when a tool bar is reattached. We must set | |
3444 the height of the tool bar when this happens so frame sizes | |
3445 are correctly calculated. | |
3446 WBOX is the handle box widget that enables detach/attach of the tool bar. | |
3447 W is the tool bar widget. | |
3448 CLIENT_DATA is a pointer to the frame the tool bar belongs to. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3449 |
49323 | 3450 static void |
3451 xg_tool_bar_attach_callback (wbox, w, client_data) | |
3452 GtkHandleBox *wbox; | |
3453 GtkWidget *w; | |
3454 gpointer client_data; | |
3455 { | |
3456 FRAME_PTR f = (FRAME_PTR) client_data; | |
68879
3249a3dd3284
* gtkutil.c (xg_tool_bar_detach_callback): Set show-arrow to the
Jan Djärv <jan.h.d@swipnet.se>
parents:
68874
diff
changeset
|
3457 g_object_set (G_OBJECT (w), "show-arrow", TRUE, NULL); |
49323 | 3458 |
3459 if (f) | |
3460 { | |
3461 GtkRequisition req; | |
3462 | |
59420
eb72706060ad
* xterm.h (struct x_output): New member, toolbar_detached.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59411
diff
changeset
|
3463 FRAME_X_OUTPUT (f)->toolbar_detached = 0; |
eb72706060ad
* xterm.h (struct x_output): New member, toolbar_detached.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59411
diff
changeset
|
3464 |
49323 | 3465 gtk_widget_size_request (w, &req); |
3466 FRAME_TOOLBAR_HEIGHT (f) = req.height; | |
3467 | |
3468 /* The height has changed, resize outer widget and set columns | |
59420
eb72706060ad
* xterm.h (struct x_output): New member, toolbar_detached.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59411
diff
changeset
|
3469 rows to what we had before attaching the tool bar. */ |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
3470 xg_resize_outer_widget (f, FRAME_COLS (f), FRAME_LINES (f)); |
49323 | 3471 } |
3472 } | |
3473 | |
3474 /* This callback is called when the mouse enters or leaves a tool bar item. | |
3475 It is used for displaying and hiding the help text. | |
3476 W is the tool bar item, a button. | |
3477 EVENT is either an enter event or leave event. | |
3478 CLIENT_DATA is an integer that is the index of the button in the | |
3479 tool bar. 0 is the first button. | |
3480 | |
3481 Returns FALSE to tell GTK to keep processing this event. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3482 |
49323 | 3483 static gboolean |
3484 xg_tool_bar_help_callback (w, event, client_data) | |
3485 GtkWidget *w; | |
3486 GdkEventCrossing *event; | |
3487 gpointer client_data; | |
3488 { | |
59411
ecb6689e04bf
* gtkutil.c (xg_gtk_scroll_destroy, xg_create_scroll_bar)
Jan Djärv <jan.h.d@swipnet.se>
parents:
59102
diff
changeset
|
3489 /* The EMACS_INT cast avoids a warning. */ |
ecb6689e04bf
* gtkutil.c (xg_gtk_scroll_destroy, xg_create_scroll_bar)
Jan Djärv <jan.h.d@swipnet.se>
parents:
59102
diff
changeset
|
3490 int idx = (int) (EMACS_INT) client_data; |
49323 | 3491 FRAME_PTR f = (FRAME_PTR) g_object_get_data (G_OBJECT (w), XG_FRAME_DATA); |
3492 Lisp_Object help, frame; | |
3493 | |
3494 if (! GTK_IS_BUTTON (w)) | |
68500
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
3495 return FALSE; |
49323 | 3496 |
3497 if (! f || ! f->n_tool_bar_items || NILP (f->tool_bar_items)) | |
50108
a9ff586d3d09
(xg_tool_bar_help_callback): Add missing return value.
Andreas Schwab <schwab@suse.de>
parents:
50106
diff
changeset
|
3498 return FALSE; |
49323 | 3499 |
3500 if (event->type == GDK_ENTER_NOTIFY) | |
3501 { | |
3502 idx *= TOOL_BAR_ITEM_NSLOTS; | |
3503 help = AREF (f->tool_bar_items, idx + TOOL_BAR_ITEM_HELP); | |
3504 | |
3505 if (NILP (help)) | |
3506 help = AREF (f->tool_bar_items, idx + TOOL_BAR_ITEM_CAPTION); | |
3507 } | |
3508 else | |
3509 help = Qnil; | |
3510 | |
3511 XSETFRAME (frame, f); | |
3512 kbd_buffer_store_help_event (frame, help); | |
3513 | |
3514 return FALSE; | |
3515 } | |
3516 | |
3517 | |
49826
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3518 /* This callback is called when a tool bar item shall be redrawn. |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3519 It modifies the expose event so that the GtkImage widget redraws the |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3520 whole image. This to overcome a bug that makes GtkImage draw the image |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3521 in the wrong place when it tries to redraw just a part of the image. |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3522 W is the GtkImage to be redrawn. |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3523 EVENT is the expose event for W. |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3524 CLIENT_DATA is unused. |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3525 |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3526 Returns FALSE to tell GTK to keep processing this event. */ |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3527 |
49826
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3528 static gboolean |
50063 | 3529 xg_tool_bar_item_expose_callback (w, event, client_data) |
49826
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3530 GtkWidget *w; |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3531 GdkEventExpose *event; |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3532 gpointer client_data; |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3533 { |
50333
60da21fd968b
* gtkutil.c (xg_tool_bar_item_expose_callback): Reduce size
Jan Djärv <jan.h.d@swipnet.se>
parents:
50318
diff
changeset
|
3534 gint width, height; |
60da21fd968b
* gtkutil.c (xg_tool_bar_item_expose_callback): Reduce size
Jan Djärv <jan.h.d@swipnet.se>
parents:
50318
diff
changeset
|
3535 |
60da21fd968b
* gtkutil.c (xg_tool_bar_item_expose_callback): Reduce size
Jan Djärv <jan.h.d@swipnet.se>
parents:
50318
diff
changeset
|
3536 gdk_drawable_get_size (event->window, &width, &height); |
60da21fd968b
* gtkutil.c (xg_tool_bar_item_expose_callback): Reduce size
Jan Djärv <jan.h.d@swipnet.se>
parents:
50318
diff
changeset
|
3537 |
60da21fd968b
* gtkutil.c (xg_tool_bar_item_expose_callback): Reduce size
Jan Djärv <jan.h.d@swipnet.se>
parents:
50318
diff
changeset
|
3538 event->area.x -= width > event->area.width ? width-event->area.width : 0; |
60da21fd968b
* gtkutil.c (xg_tool_bar_item_expose_callback): Reduce size
Jan Djärv <jan.h.d@swipnet.se>
parents:
50318
diff
changeset
|
3539 event->area.y -= height > event->area.height ? height-event->area.height : 0; |
60da21fd968b
* gtkutil.c (xg_tool_bar_item_expose_callback): Reduce size
Jan Djärv <jan.h.d@swipnet.se>
parents:
50318
diff
changeset
|
3540 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
3541 event->area.x = max (0, event->area.x); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
3542 event->area.y = max (0, event->area.y); |
60185
391f44959566
(xg_create_frame_widgets): UNBLOCK_INPUT on error.
Kim F. Storm <storm@cua.dk>
parents:
59913
diff
changeset
|
3543 |
50333
60da21fd968b
* gtkutil.c (xg_tool_bar_item_expose_callback): Reduce size
Jan Djärv <jan.h.d@swipnet.se>
parents:
50318
diff
changeset
|
3544 event->area.width = max (width, event->area.width); |
60da21fd968b
* gtkutil.c (xg_tool_bar_item_expose_callback): Reduce size
Jan Djärv <jan.h.d@swipnet.se>
parents:
50318
diff
changeset
|
3545 event->area.height = max (height, event->area.height); |
60185
391f44959566
(xg_create_frame_widgets): UNBLOCK_INPUT on error.
Kim F. Storm <storm@cua.dk>
parents:
59913
diff
changeset
|
3546 |
49826
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3547 return FALSE; |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3548 } |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3549 |
50063 | 3550 /* This callback is called when a tool bar shall be redrawn. |
3551 We need to update the tool bar from here in case the image cache | |
3552 has deleted the pixmaps used in the tool bar. | |
3553 W is the GtkToolbar to be redrawn. | |
3554 EVENT is the expose event for W. | |
3555 CLIENT_DATA is pointing to the frame for this tool bar. | |
3556 | |
3557 Returns FALSE to tell GTK to keep processing this event. */ | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3558 |
50063 | 3559 static gboolean |
3560 xg_tool_bar_expose_callback (w, event, client_data) | |
3561 GtkWidget *w; | |
3562 GdkEventExpose *event; | |
3563 gpointer client_data; | |
3564 { | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
3565 update_frame_tool_bar ((FRAME_PTR) client_data); |
50063 | 3566 return FALSE; |
3567 } | |
3568 | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3569 /* Create a tool bar for frame F. */ |
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3570 |
49323 | 3571 static void |
3572 xg_create_tool_bar (f) | |
3573 FRAME_PTR f; | |
3574 { | |
3575 struct x_output *x = f->output_data.x; | |
3576 GtkRequisition req; | |
3577 int vbox_pos = x->menubar_widget ? 1 : 0; | |
3578 | |
3579 x->toolbar_widget = gtk_toolbar_new (); | |
3580 x->handlebox_widget = gtk_handle_box_new (); | |
59420
eb72706060ad
* xterm.h (struct x_output): New member, toolbar_detached.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59411
diff
changeset
|
3581 x->toolbar_detached = 0; |
eb72706060ad
* xterm.h (struct x_output): New member, toolbar_detached.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59411
diff
changeset
|
3582 |
49323 | 3583 gtk_container_add (GTK_CONTAINER (x->handlebox_widget), |
3584 x->toolbar_widget); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3585 |
49323 | 3586 gtk_box_pack_start (GTK_BOX (x->vbox_widget), x->handlebox_widget, |
3587 FALSE, FALSE, 0); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3588 |
49323 | 3589 gtk_box_reorder_child (GTK_BOX (x->vbox_widget), x->handlebox_widget, |
3590 vbox_pos); | |
3591 | |
49826
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3592 gtk_widget_set_name (x->toolbar_widget, "emacs-toolbar"); |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3593 |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3594 /* We only have icons, so override any user setting. We could |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3595 use the caption property of the toolbar item (see update_frame_tool_bar |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3596 below), but some of those strings are long, making the toolbar so |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3597 long it does not fit on the screen. The GtkToolbar widget makes every |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3598 item equal size, so the longest caption determine the size of every |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3599 tool bar item. I think the creators of the GtkToolbar widget |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3600 counted on 4 or 5 character long strings. */ |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3601 gtk_toolbar_set_style (GTK_TOOLBAR (x->toolbar_widget), GTK_TOOLBAR_ICONS); |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3602 gtk_toolbar_set_orientation (GTK_TOOLBAR (x->toolbar_widget), |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3603 GTK_ORIENTATION_HORIZONTAL); |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3604 |
49323 | 3605 g_signal_connect (G_OBJECT (x->handlebox_widget), "child-detached", |
3606 G_CALLBACK (xg_tool_bar_detach_callback), f); | |
3607 g_signal_connect (G_OBJECT (x->handlebox_widget), "child-attached", | |
3608 G_CALLBACK (xg_tool_bar_attach_callback), f); | |
50063 | 3609 g_signal_connect (G_OBJECT (x->toolbar_widget), |
3610 "expose-event", | |
3611 G_CALLBACK (xg_tool_bar_expose_callback), | |
3612 f); | |
49323 | 3613 |
3614 gtk_widget_show_all (x->handlebox_widget); | |
3615 | |
3616 gtk_widget_size_request (x->toolbar_widget, &req); | |
3617 FRAME_TOOLBAR_HEIGHT (f) = req.height; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3618 |
49323 | 3619 /* The height has changed, resize outer widget and set columns |
3620 rows to what we had before adding the tool bar. */ | |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
3621 xg_resize_outer_widget (f, FRAME_COLS (f), FRAME_LINES (f)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3622 |
49323 | 3623 SET_FRAME_GARBAGED (f); |
3624 } | |
3625 | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3626 /* Update the tool bar for frame F. Add new buttons and remove old. */ |
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3627 |
49323 | 3628 void |
3629 update_frame_tool_bar (f) | |
3630 FRAME_PTR f; | |
3631 { | |
3632 int i; | |
3633 GtkRequisition old_req, new_req; | |
3634 GList *icon_list; | |
49572 | 3635 GList *iter; |
49323 | 3636 struct x_output *x = f->output_data.x; |
59084
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3637 int hmargin, vmargin; |
49323 | 3638 |
3639 if (! FRAME_GTK_WIDGET (f)) | |
3640 return; | |
3641 | |
3642 BLOCK_INPUT; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3643 |
59084
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3644 if (INTEGERP (Vtool_bar_button_margin) |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3645 && XINT (Vtool_bar_button_margin) > 0) |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3646 { |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3647 hmargin = XFASTINT (Vtool_bar_button_margin); |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3648 vmargin = XFASTINT (Vtool_bar_button_margin); |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3649 } |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3650 else if (CONSP (Vtool_bar_button_margin)) |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3651 { |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3652 if (INTEGERP (XCAR (Vtool_bar_button_margin)) |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3653 && XINT (XCAR (Vtool_bar_button_margin)) > 0) |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3654 hmargin = XFASTINT (XCAR (Vtool_bar_button_margin)); |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3655 |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3656 if (INTEGERP (XCDR (Vtool_bar_button_margin)) |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3657 && XINT (XCDR (Vtool_bar_button_margin)) > 0) |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3658 vmargin = XFASTINT (XCDR (Vtool_bar_button_margin)); |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3659 } |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3660 |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3661 /* The natural size (i.e. when GTK uses 0 as margin) looks best, |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3662 so take DEFAULT_TOOL_BAR_BUTTON_MARGIN to mean "default for GTK", |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3663 i.e. zero. This means that margins less than |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3664 DEFAULT_TOOL_BAR_BUTTON_MARGIN has no effect. */ |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3665 hmargin = max (0, hmargin - DEFAULT_TOOL_BAR_BUTTON_MARGIN); |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3666 vmargin = max (0, vmargin - DEFAULT_TOOL_BAR_BUTTON_MARGIN); |
60185
391f44959566
(xg_create_frame_widgets): UNBLOCK_INPUT on error.
Kim F. Storm <storm@cua.dk>
parents:
59913
diff
changeset
|
3667 |
49323 | 3668 if (! x->toolbar_widget) |
3669 xg_create_tool_bar (f); | |
3670 | |
3671 gtk_widget_size_request (x->toolbar_widget, &old_req); | |
3672 | |
3673 icon_list = gtk_container_get_children (GTK_CONTAINER (x->toolbar_widget)); | |
49572 | 3674 iter = icon_list; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3675 |
49323 | 3676 for (i = 0; i < f->n_tool_bar_items; ++i) |
3677 { | |
3678 #define PROP(IDX) AREF (f->tool_bar_items, i * TOOL_BAR_ITEM_NSLOTS + (IDX)) | |
3679 | |
3680 int enabled_p = !NILP (PROP (TOOL_BAR_ITEM_ENABLED_P)); | |
3681 int selected_p = !NILP (PROP (TOOL_BAR_ITEM_SELECTED_P)); | |
3682 int idx; | |
3683 int img_id; | |
3684 struct image *img; | |
3685 Lisp_Object image; | |
49572 | 3686 GtkWidget *wicon = iter ? GTK_WIDGET (iter->data) : 0; |
74376
42ad3938ee1a
(update_frame_tool_bar): Handle modifying a toolbar item
Jan Djärv <jan.h.d@swipnet.se>
parents:
73661
diff
changeset
|
3687 GtkToolItem *ti = NULL; |
42ad3938ee1a
(update_frame_tool_bar): Handle modifying a toolbar item
Jan Djärv <jan.h.d@swipnet.se>
parents:
73661
diff
changeset
|
3688 GtkWidget *wvbox; |
42ad3938ee1a
(update_frame_tool_bar): Handle modifying a toolbar item
Jan Djärv <jan.h.d@swipnet.se>
parents:
73661
diff
changeset
|
3689 GList *chlist; |
50059
ffb4a4dbe4c0
* gtkutil.c (update_frame_tool_bar): Compare pixmap ID instead of
Jan Djärv <jan.h.d@swipnet.se>
parents:
49826
diff
changeset
|
3690 |
49572 | 3691 if (iter) iter = g_list_next (iter); |
49323 | 3692 |
3693 /* If image is a vector, choose the image according to the | |
3694 button state. */ | |
3695 image = PROP (TOOL_BAR_ITEM_IMAGES); | |
3696 if (VECTORP (image)) | |
3697 { | |
3698 if (enabled_p) | |
3699 idx = (selected_p | |
3700 ? TOOL_BAR_IMAGE_ENABLED_SELECTED | |
3701 : TOOL_BAR_IMAGE_ENABLED_DESELECTED); | |
3702 else | |
3703 idx = (selected_p | |
3704 ? TOOL_BAR_IMAGE_DISABLED_SELECTED | |
3705 : TOOL_BAR_IMAGE_DISABLED_DESELECTED); | |
3706 | |
3707 xassert (ASIZE (image) >= idx); | |
3708 image = AREF (image, idx); | |
3709 } | |
3710 else | |
3711 idx = -1; | |
3712 | |
3713 /* Ignore invalid image specifications. */ | |
3714 if (!valid_image_p (image)) | |
3715 { | |
3716 if (wicon) gtk_widget_hide (wicon); | |
3717 continue; | |
3718 } | |
3719 | |
3720 img_id = lookup_image (f, image); | |
3721 img = IMAGE_FROM_ID (f, img_id); | |
49468
f2be5cd8262f
gtkutil.c (update_frame_tool_bar): Call prepare_image_for_display
Jan Djärv <jan.h.d@swipnet.se>
parents:
49434
diff
changeset
|
3722 prepare_image_for_display (f, img); |
f2be5cd8262f
gtkutil.c (update_frame_tool_bar): Call prepare_image_for_display
Jan Djärv <jan.h.d@swipnet.se>
parents:
49434
diff
changeset
|
3723 |
f2be5cd8262f
gtkutil.c (update_frame_tool_bar): Call prepare_image_for_display
Jan Djärv <jan.h.d@swipnet.se>
parents:
49434
diff
changeset
|
3724 if (img->load_failed_p || img->pixmap == None) |
f2be5cd8262f
gtkutil.c (update_frame_tool_bar): Call prepare_image_for_display
Jan Djärv <jan.h.d@swipnet.se>
parents:
49434
diff
changeset
|
3725 { |
73661
7c60775b5a52
* gtkutil.c (update_frame_tool_bar): If icon image is invalid and
Chong Yidong <cyd@stupidchicken.com>
parents:
73389
diff
changeset
|
3726 if (wicon) |
7c60775b5a52
* gtkutil.c (update_frame_tool_bar): If icon image is invalid and
Chong Yidong <cyd@stupidchicken.com>
parents:
73389
diff
changeset
|
3727 gtk_widget_hide (wicon); |
7c60775b5a52
* gtkutil.c (update_frame_tool_bar): If icon image is invalid and
Chong Yidong <cyd@stupidchicken.com>
parents:
73389
diff
changeset
|
3728 else |
74376
42ad3938ee1a
(update_frame_tool_bar): Handle modifying a toolbar item
Jan Djärv <jan.h.d@swipnet.se>
parents:
73661
diff
changeset
|
3729 /* Insert an empty (non-image) button */ |
73661
7c60775b5a52
* gtkutil.c (update_frame_tool_bar): If icon image is invalid and
Chong Yidong <cyd@stupidchicken.com>
parents:
73389
diff
changeset
|
3730 gtk_toolbar_insert (GTK_TOOLBAR (x->toolbar_widget), |
7c60775b5a52
* gtkutil.c (update_frame_tool_bar): If icon image is invalid and
Chong Yidong <cyd@stupidchicken.com>
parents:
73389
diff
changeset
|
3731 gtk_tool_button_new (NULL, ""), |
7c60775b5a52
* gtkutil.c (update_frame_tool_bar): If icon image is invalid and
Chong Yidong <cyd@stupidchicken.com>
parents:
73389
diff
changeset
|
3732 i); |
49468
f2be5cd8262f
gtkutil.c (update_frame_tool_bar): Call prepare_image_for_display
Jan Djärv <jan.h.d@swipnet.se>
parents:
49434
diff
changeset
|
3733 continue; |
f2be5cd8262f
gtkutil.c (update_frame_tool_bar): Call prepare_image_for_display
Jan Djärv <jan.h.d@swipnet.se>
parents:
49434
diff
changeset
|
3734 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3735 |
74376
42ad3938ee1a
(update_frame_tool_bar): Handle modifying a toolbar item
Jan Djärv <jan.h.d@swipnet.se>
parents:
73661
diff
changeset
|
3736 if (wicon) |
42ad3938ee1a
(update_frame_tool_bar): Handle modifying a toolbar item
Jan Djärv <jan.h.d@swipnet.se>
parents:
73661
diff
changeset
|
3737 { |
42ad3938ee1a
(update_frame_tool_bar): Handle modifying a toolbar item
Jan Djärv <jan.h.d@swipnet.se>
parents:
73661
diff
changeset
|
3738 /* The child of the tool bar is a button. Inside that button |
42ad3938ee1a
(update_frame_tool_bar): Handle modifying a toolbar item
Jan Djärv <jan.h.d@swipnet.se>
parents:
73661
diff
changeset
|
3739 is a vbox. Inside that vbox is the GtkImage. */ |
42ad3938ee1a
(update_frame_tool_bar): Handle modifying a toolbar item
Jan Djärv <jan.h.d@swipnet.se>
parents:
73661
diff
changeset
|
3740 wvbox = gtk_bin_get_child (GTK_BIN (wicon)); |
42ad3938ee1a
(update_frame_tool_bar): Handle modifying a toolbar item
Jan Djärv <jan.h.d@swipnet.se>
parents:
73661
diff
changeset
|
3741 chlist = gtk_container_get_children (GTK_CONTAINER (wvbox)); |
42ad3938ee1a
(update_frame_tool_bar): Handle modifying a toolbar item
Jan Djärv <jan.h.d@swipnet.se>
parents:
73661
diff
changeset
|
3742 if (chlist == NULL) |
42ad3938ee1a
(update_frame_tool_bar): Handle modifying a toolbar item
Jan Djärv <jan.h.d@swipnet.se>
parents:
73661
diff
changeset
|
3743 /* In this case, we inserted an empty button (above) with no image */ |
42ad3938ee1a
(update_frame_tool_bar): Handle modifying a toolbar item
Jan Djärv <jan.h.d@swipnet.se>
parents:
73661
diff
changeset
|
3744 ti = GTK_TOOL_ITEM (wicon); |
42ad3938ee1a
(update_frame_tool_bar): Handle modifying a toolbar item
Jan Djärv <jan.h.d@swipnet.se>
parents:
73661
diff
changeset
|
3745 } |
42ad3938ee1a
(update_frame_tool_bar): Handle modifying a toolbar item
Jan Djärv <jan.h.d@swipnet.se>
parents:
73661
diff
changeset
|
3746 |
42ad3938ee1a
(update_frame_tool_bar): Handle modifying a toolbar item
Jan Djärv <jan.h.d@swipnet.se>
parents:
73661
diff
changeset
|
3747 if (! wicon || ti != NULL) |
49323 | 3748 { |
56112
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
3749 GtkWidget *w = xg_get_image_for_pixmap (f, img, x->widget, NULL); |
59084
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3750 gtk_misc_set_padding (GTK_MISC (w), hmargin, vmargin); |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3751 |
74376
42ad3938ee1a
(update_frame_tool_bar): Handle modifying a toolbar item
Jan Djärv <jan.h.d@swipnet.se>
parents:
73661
diff
changeset
|
3752 |
42ad3938ee1a
(update_frame_tool_bar): Handle modifying a toolbar item
Jan Djärv <jan.h.d@swipnet.se>
parents:
73661
diff
changeset
|
3753 if (ti == NULL) |
42ad3938ee1a
(update_frame_tool_bar): Handle modifying a toolbar item
Jan Djärv <jan.h.d@swipnet.se>
parents:
73661
diff
changeset
|
3754 { |
42ad3938ee1a
(update_frame_tool_bar): Handle modifying a toolbar item
Jan Djärv <jan.h.d@swipnet.se>
parents:
73661
diff
changeset
|
3755 ti = gtk_tool_button_new (w, ""); |
42ad3938ee1a
(update_frame_tool_bar): Handle modifying a toolbar item
Jan Djärv <jan.h.d@swipnet.se>
parents:
73661
diff
changeset
|
3756 |
42ad3938ee1a
(update_frame_tool_bar): Handle modifying a toolbar item
Jan Djärv <jan.h.d@swipnet.se>
parents:
73661
diff
changeset
|
3757 gtk_toolbar_insert (GTK_TOOLBAR (x->toolbar_widget), ti, i); |
42ad3938ee1a
(update_frame_tool_bar): Handle modifying a toolbar item
Jan Djärv <jan.h.d@swipnet.se>
parents:
73661
diff
changeset
|
3758 } |
42ad3938ee1a
(update_frame_tool_bar): Handle modifying a toolbar item
Jan Djärv <jan.h.d@swipnet.se>
parents:
73661
diff
changeset
|
3759 else |
42ad3938ee1a
(update_frame_tool_bar): Handle modifying a toolbar item
Jan Djärv <jan.h.d@swipnet.se>
parents:
73661
diff
changeset
|
3760 gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (ti), w); |
42ad3938ee1a
(update_frame_tool_bar): Handle modifying a toolbar item
Jan Djärv <jan.h.d@swipnet.se>
parents:
73661
diff
changeset
|
3761 |
42ad3938ee1a
(update_frame_tool_bar): Handle modifying a toolbar item
Jan Djärv <jan.h.d@swipnet.se>
parents:
73661
diff
changeset
|
3762 |
59411
ecb6689e04bf
* gtkutil.c (xg_gtk_scroll_destroy, xg_create_scroll_bar)
Jan Djärv <jan.h.d@swipnet.se>
parents:
59102
diff
changeset
|
3763 /* The EMACS_INT cast avoids a warning. */ |
68500
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
3764 g_signal_connect (GTK_WIDGET (ti), "clicked", |
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
3765 GTK_SIGNAL_FUNC (xg_tool_bar_callback), |
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
3766 (gpointer) (EMACS_INT) i); |
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
3767 |
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
3768 gtk_widget_show (GTK_WIDGET (ti)); |
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
3769 gtk_widget_show (GTK_WIDGET (w)); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3770 |
49323 | 3771 /* Save the image so we can see if an update is needed when |
3772 this function is called again. */ | |
3773 g_object_set_data (G_OBJECT (w), XG_TOOL_BAR_IMAGE_DATA, | |
50059
ffb4a4dbe4c0
* gtkutil.c (update_frame_tool_bar): Compare pixmap ID instead of
Jan Djärv <jan.h.d@swipnet.se>
parents:
49826
diff
changeset
|
3774 (gpointer)img->pixmap); |
49323 | 3775 |
68500
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
3776 g_object_set_data (G_OBJECT (ti), XG_FRAME_DATA, (gpointer)f); |
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
3777 |
49826
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3778 /* Catch expose events to overcome an annoying redraw bug, see |
50063 | 3779 comment for xg_tool_bar_item_expose_callback. */ |
68500
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
3780 g_signal_connect (G_OBJECT (ti), |
49826
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3781 "expose-event", |
50063 | 3782 G_CALLBACK (xg_tool_bar_item_expose_callback), |
49826
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3783 0); |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3784 |
68500
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
3785 gtk_widget_set_sensitive (GTK_WIDGET (ti), enabled_p); |
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
3786 gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (ti), FALSE); |
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
3787 |
49323 | 3788 while (! GTK_IS_BUTTON (w)) |
3789 w = gtk_widget_get_parent (w); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3790 |
68874
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3791 /* Callback to save modifyer mask (Shift/Control, etc). GTK makes |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3792 no distinction based on modifiers in the activate callback, |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3793 so we have to do it ourselves. */ |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3794 g_signal_connect (w, "button-release-event", |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3795 GTK_SIGNAL_FUNC (xg_tool_bar_button_cb), |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3796 ti); |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3797 |
68500
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
3798 g_object_set_data (G_OBJECT (w), XG_FRAME_DATA, (gpointer)f); |
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
3799 |
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
3800 /* Use enter/leave notify to show help. We use the events |
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
3801 rather than the GtkButton specific signals "enter" and |
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
3802 "leave", so we can have only one callback. The event |
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
3803 will tell us what kind of event it is. */ |
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
3804 /* The EMACS_INT cast avoids a warning. */ |
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
3805 g_signal_connect (G_OBJECT (w), |
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
3806 "enter-notify-event", |
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
3807 G_CALLBACK (xg_tool_bar_help_callback), |
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
3808 (gpointer) (EMACS_INT) i); |
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
3809 g_signal_connect (G_OBJECT (w), |
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
3810 "leave-notify-event", |
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
3811 G_CALLBACK (xg_tool_bar_help_callback), |
4e4d545ce006
* gtkutil.c (update_frame_tool_bar): Use new tool bar functions
Jan Djärv <jan.h.d@swipnet.se>
parents:
68100
diff
changeset
|
3812 (gpointer) (EMACS_INT) i); |
49323 | 3813 } |
3814 else | |
3815 { | |
3816 /* The child of the tool bar is a button. Inside that button | |
3817 is a vbox. Inside that vbox is the GtkImage. */ | |
3818 GtkWidget *wvbox = gtk_bin_get_child (GTK_BIN (wicon)); | |
49572 | 3819 GList *chlist = gtk_container_get_children (GTK_CONTAINER (wvbox)); |
3820 GtkImage *wimage = GTK_IMAGE (chlist->data); | |
50059
ffb4a4dbe4c0
* gtkutil.c (update_frame_tool_bar): Compare pixmap ID instead of
Jan Djärv <jan.h.d@swipnet.se>
parents:
49826
diff
changeset
|
3821 Pixmap old_img = (Pixmap)g_object_get_data (G_OBJECT (wimage), |
ffb4a4dbe4c0
* gtkutil.c (update_frame_tool_bar): Compare pixmap ID instead of
Jan Djärv <jan.h.d@swipnet.se>
parents:
49826
diff
changeset
|
3822 XG_TOOL_BAR_IMAGE_DATA); |
49572 | 3823 g_list_free (chlist); |
49323 | 3824 |
59084
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3825 gtk_misc_set_padding (GTK_MISC (wimage), hmargin, vmargin); |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3826 |
50059
ffb4a4dbe4c0
* gtkutil.c (update_frame_tool_bar): Compare pixmap ID instead of
Jan Djärv <jan.h.d@swipnet.se>
parents:
49826
diff
changeset
|
3827 if (old_img != img->pixmap) |
56112
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
3828 (void) xg_get_image_for_pixmap (f, img, x->widget, wimage); |
49323 | 3829 |
3830 g_object_set_data (G_OBJECT (wimage), XG_TOOL_BAR_IMAGE_DATA, | |
50059
ffb4a4dbe4c0
* gtkutil.c (update_frame_tool_bar): Compare pixmap ID instead of
Jan Djärv <jan.h.d@swipnet.se>
parents:
49826
diff
changeset
|
3831 (gpointer)img->pixmap); |
49323 | 3832 |
3833 gtk_widget_set_sensitive (wicon, enabled_p); | |
3834 gtk_widget_show (wicon); | |
3835 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3836 |
49323 | 3837 #undef PROP |
3838 } | |
3839 | |
3840 /* Remove buttons not longer needed. We just hide them so they | |
3841 can be reused later on. */ | |
49572 | 3842 while (iter) |
49323 | 3843 { |
49572 | 3844 GtkWidget *w = GTK_WIDGET (iter->data); |
49323 | 3845 gtk_widget_hide (w); |
49572 | 3846 iter = g_list_next (iter); |
49323 | 3847 } |
3848 | |
3849 gtk_widget_size_request (x->toolbar_widget, &new_req); | |
59420
eb72706060ad
* xterm.h (struct x_output): New member, toolbar_detached.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59411
diff
changeset
|
3850 if (old_req.height != new_req.height |
eb72706060ad
* xterm.h (struct x_output): New member, toolbar_detached.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59411
diff
changeset
|
3851 && ! FRAME_X_OUTPUT (f)->toolbar_detached) |
49323 | 3852 { |
3853 FRAME_TOOLBAR_HEIGHT (f) = new_req.height; | |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
3854 xg_resize_outer_widget (f, FRAME_COLS (f), FRAME_LINES (f)); |
49323 | 3855 } |
3856 | |
49572 | 3857 if (icon_list) g_list_free (icon_list); |
3858 | |
49323 | 3859 UNBLOCK_INPUT; |
3860 } | |
3861 | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3862 /* Deallocate all resources for the tool bar on frame F. |
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3863 Remove the tool bar. */ |
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3864 |
49323 | 3865 void |
3866 free_frame_tool_bar (f) | |
3867 FRAME_PTR f; | |
3868 { | |
3869 struct x_output *x = f->output_data.x; | |
3870 | |
3871 if (x->toolbar_widget) | |
3872 { | |
3873 BLOCK_INPUT; | |
3874 gtk_container_remove (GTK_CONTAINER (x->vbox_widget), | |
3875 x->handlebox_widget); | |
3876 x->toolbar_widget = 0; | |
3877 x->handlebox_widget = 0; | |
3878 FRAME_TOOLBAR_HEIGHT (f) = 0; | |
3879 | |
3880 /* The height has changed, resize outer widget and set columns | |
3881 rows to what we had before removing the tool bar. */ | |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
3882 xg_resize_outer_widget (f, FRAME_COLS (f), FRAME_LINES (f)); |
49323 | 3883 |
3884 SET_FRAME_GARBAGED (f); | |
3885 UNBLOCK_INPUT; | |
3886 } | |
3887 } | |
3888 | |
3889 | |
3890 | |
3891 /*********************************************************************** | |
3892 Initializing | |
3893 ***********************************************************************/ | |
3894 void | |
3895 xg_initialize () | |
3896 { | |
59102
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59084
diff
changeset
|
3897 GtkBindingSet *binding_set; |
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59084
diff
changeset
|
3898 |
49323 | 3899 xg_ignore_gtk_scrollbar = 0; |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
3900 xg_detached_menus = 0; |
49323 | 3901 xg_menu_cb_list.prev = xg_menu_cb_list.next = |
3902 xg_menu_item_cb_list.prev = xg_menu_item_cb_list.next = 0; | |
3903 | |
49419
6562bb5f04aa
gtkutil.c (xg_initialize): Initialize id_to_widget here instead
Jan Djärv <jan.h.d@swipnet.se>
parents:
49359
diff
changeset
|
3904 id_to_widget.max_size = id_to_widget.used = 0; |
6562bb5f04aa
gtkutil.c (xg_initialize): Initialize id_to_widget here instead
Jan Djärv <jan.h.d@swipnet.se>
parents:
49359
diff
changeset
|
3905 id_to_widget.widgets = 0; |
6562bb5f04aa
gtkutil.c (xg_initialize): Initialize id_to_widget here instead
Jan Djärv <jan.h.d@swipnet.se>
parents:
49359
diff
changeset
|
3906 |
49323 | 3907 /* Remove F10 as a menu accelerator, it does not mix well with Emacs key |
3908 bindings. It doesn't seem to be any way to remove properties, | |
3909 so we set it to VoidSymbol which in X means "no key". */ | |
3910 gtk_settings_set_string_property (gtk_settings_get_default (), | |
3911 "gtk-menu-bar-accel", | |
3912 "VoidSymbol", | |
3913 EMACS_CLASS); | |
49419
6562bb5f04aa
gtkutil.c (xg_initialize): Initialize id_to_widget here instead
Jan Djärv <jan.h.d@swipnet.se>
parents:
49359
diff
changeset
|
3914 |
6562bb5f04aa
gtkutil.c (xg_initialize): Initialize id_to_widget here instead
Jan Djärv <jan.h.d@swipnet.se>
parents:
49359
diff
changeset
|
3915 /* Make GTK text input widgets use Emacs style keybindings. This is |
6562bb5f04aa
gtkutil.c (xg_initialize): Initialize id_to_widget here instead
Jan Djärv <jan.h.d@swipnet.se>
parents:
49359
diff
changeset
|
3916 Emacs after all. */ |
6562bb5f04aa
gtkutil.c (xg_initialize): Initialize id_to_widget here instead
Jan Djärv <jan.h.d@swipnet.se>
parents:
49359
diff
changeset
|
3917 gtk_settings_set_string_property (gtk_settings_get_default (), |
6562bb5f04aa
gtkutil.c (xg_initialize): Initialize id_to_widget here instead
Jan Djärv <jan.h.d@swipnet.se>
parents:
49359
diff
changeset
|
3918 "gtk-key-theme-name", |
6562bb5f04aa
gtkutil.c (xg_initialize): Initialize id_to_widget here instead
Jan Djärv <jan.h.d@swipnet.se>
parents:
49359
diff
changeset
|
3919 "Emacs", |
6562bb5f04aa
gtkutil.c (xg_initialize): Initialize id_to_widget here instead
Jan Djärv <jan.h.d@swipnet.se>
parents:
49359
diff
changeset
|
3920 EMACS_CLASS); |
59102
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59084
diff
changeset
|
3921 |
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59084
diff
changeset
|
3922 /* Make dialogs close on C-g. Since file dialog inherits from |
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59084
diff
changeset
|
3923 dialog, this works for them also. */ |
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59084
diff
changeset
|
3924 binding_set = gtk_binding_set_by_class (gtk_type_class (GTK_TYPE_DIALOG)); |
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59084
diff
changeset
|
3925 gtk_binding_entry_add_signal (binding_set, GDK_g, GDK_CONTROL_MASK, |
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59084
diff
changeset
|
3926 "close", 0); |
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59084
diff
changeset
|
3927 |
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59084
diff
changeset
|
3928 /* Make menus close on C-g. */ |
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59084
diff
changeset
|
3929 binding_set = gtk_binding_set_by_class (gtk_type_class (GTK_TYPE_MENU_SHELL)); |
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59084
diff
changeset
|
3930 gtk_binding_entry_add_signal (binding_set, GDK_g, GDK_CONTROL_MASK, |
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59084
diff
changeset
|
3931 "cancel", 0); |
49323 | 3932 } |
3933 | |
3934 #endif /* USE_GTK */ | |
52401 | 3935 |
3936 /* arch-tag: fe7104da-bc1e-4aba-9bd1-f349c528f7e3 | |
3937 (do not change this comment) */ |