Mercurial > emacs
annotate src/gtkutil.c @ 109668:d9a022ec322c
Remove extern declarations in .c files, .h files have them.
* src/xterm.c:
* src/xdisp.c:
* src/process.c:
* src/msdos.c:
* src/image.c:
* src/gtkutil.c:
* src/fileio.c:
* src/eval.c: Remove declarations.
author | Dan Nicolaescu <dann@ics.uci.edu> |
---|---|
date | Fri, 06 Aug 2010 12:07:16 -0700 |
parents | c4c8e4a16194 |
children | 8949aad5e992 |
rev | line source |
---|---|
49323 | 1 /* Functions for creating and updating GTK widgets. |
106815 | 2 Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
79759 | 3 Free Software Foundation, Inc. |
49323 | 4 |
5 This file is part of GNU Emacs. | |
6 | |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93427
diff
changeset
|
7 GNU Emacs is free software: you can redistribute it and/or modify |
49323 | 8 it under the terms of the GNU General Public License as published by |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93427
diff
changeset
|
9 the Free Software Foundation, either version 3 of the License, or |
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93427
diff
changeset
|
10 (at your option) any later version. |
49323 | 11 |
12 GNU Emacs is distributed in the hope that it will be useful, | |
13 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
15 GNU General Public License for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93427
diff
changeset
|
18 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
49323 | 19 |
80608
83a48972e1ea
Include <config.h> instead of "config.h".
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
79759
diff
changeset
|
20 #include <config.h> |
49323 | 21 |
22 #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
|
23 #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
|
24 #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
|
25 #include <stdio.h> |
105669
68dd71358159
* alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105522
diff
changeset
|
26 #include <setjmp.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 "gtkutil.h" | |
33 #include "termhooks.h" | |
51408
8f1bed1dee3c
Include keyboard.h, charset.h, coding.h.
Dave Love <fx@gnu.org>
parents:
51211
diff
changeset
|
34 #include "keyboard.h" |
8f1bed1dee3c
Include keyboard.h, charset.h, coding.h.
Dave Love <fx@gnu.org>
parents:
51211
diff
changeset
|
35 #include "charset.h" |
8f1bed1dee3c
Include keyboard.h, charset.h, coding.h.
Dave Love <fx@gnu.org>
parents:
51211
diff
changeset
|
36 #include "coding.h" |
49323 | 37 #include <gdk/gdkkeysyms.h> |
108082
38a6893c8b9e
* gtkutil.c: Include xsettings.h for Ftool_bar_get_system_style.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108024
diff
changeset
|
38 #include "xsettings.h" |
49323 | 39 |
97059
984f2ac5a637
* lisp.h (init_weak_hash_tables, syms_of_font)
Andreas Schwab <schwab@suse.de>
parents:
97056
diff
changeset
|
40 #ifdef HAVE_XFT |
984f2ac5a637
* lisp.h (init_weak_hash_tables, syms_of_font)
Andreas Schwab <schwab@suse.de>
parents:
97056
diff
changeset
|
41 #include <X11/Xft/Xft.h> |
984f2ac5a637
* lisp.h (init_weak_hash_tables, syms_of_font)
Andreas Schwab <schwab@suse.de>
parents:
97056
diff
changeset
|
42 #endif |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
43 |
49323 | 44 #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
|
45 (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
|
46 |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
47 #define FRAME_TOTAL_PIXEL_WIDTH(f) \ |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
48 (FRAME_PIXEL_WIDTH (f) + FRAME_TOOLBAR_WIDTH (f)) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
49 |
67528
c5c00342184b
* gtkutil.c (SSDATA): New macro to remove compiler warnings.
Jan Djärv <jan.h.d@swipnet.se>
parents:
65628
diff
changeset
|
50 /* 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
|
51 #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
|
52 |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
53 #ifndef HAVE_GTK_WIDGET_SET_HAS_WINDOW |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
54 #define gtk_widget_set_has_window(w, b) \ |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
55 (gtk_fixed_set_has_window (GTK_FIXED (w), b)) |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
56 #endif |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
57 #ifndef HAVE_GTK_DIALOG_GET_ACTION_AREA |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
58 #define gtk_dialog_get_action_area(w) ((w)->action_area) |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
59 #define gtk_dialog_get_content_area(w) ((w)->vbox) |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
60 #endif |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
61 #ifndef HAVE_GTK_WIDGET_GET_SENSITIVE |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
62 #define gtk_widget_get_sensitive(w) (GTK_WIDGET_SENSITIVE (w)) |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
63 #endif |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
64 #ifndef HAVE_GTK_ADJUSTMENT_GET_PAGE_SIZE |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
65 #define gtk_adjustment_set_page_size(w, s) ((w)->page_size = (s)) |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
66 #define gtk_adjustment_set_page_increment(w, s) ((w)->page_increment = (s)) |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
67 #define gtk_adjustment_get_step_increment(w) ((w)->step_increment) |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
68 #define gtk_adjustment_set_step_increment(w, s) ((w)->step_increment = (s)) |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
69 #endif |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
70 #if GTK_MAJOR_VERSION > 2 || GTK_MINOR_VERSION > 11 |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
71 #define remove_submenu(w) gtk_menu_item_set_submenu ((w), NULL) |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
72 #else |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
73 #define remove_submenu(w) gtk_menu_item_remove_submenu ((w)) |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
74 #endif |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
75 |
53069
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 /*********************************************************************** |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
78 Display handling functions |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
79 ***********************************************************************/ |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
80 |
98555
440d088b9a23
(xg_display_open): Reset default display if none exists.
Chong Yidong <cyd@stupidchicken.com>
parents:
98545
diff
changeset
|
81 /* Keep track of the default display, or NULL if there is none. Emacs |
440d088b9a23
(xg_display_open): Reset default display if none exists.
Chong Yidong <cyd@stupidchicken.com>
parents:
98545
diff
changeset
|
82 may close all its displays. */ |
84621 | 83 |
84 static GdkDisplay *gdpy_def; | |
85 | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
86 /* 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
|
87 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
|
88 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
|
89 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
90 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
91 xg_set_screen (GtkWidget *w, FRAME_PTR f) |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
92 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
93 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
|
94 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
95 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
|
96 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
|
97 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
98 if (GTK_IS_MENU (w)) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
99 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
|
100 else |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
101 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
|
102 } |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
103 } |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
104 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
105 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
106 /* 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
|
107 *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
|
108 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
109 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
|
110 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
|
111 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
|
112 |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
113 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
114 xg_display_open (char *display_name, Display **dpy) |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
115 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
116 GdkDisplay *gdpy; |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
117 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
118 gdpy = gdk_display_open (display_name); |
102705
36389825b3d8
gtkutil.c (xg_display_open): Assign a value to gdpy_def, check
Jan Djärv <jan.h.d@swipnet.se>
parents:
102549
diff
changeset
|
119 if (!gdpy_def && gdpy) |
36389825b3d8
gtkutil.c (xg_display_open): Assign a value to gdpy_def, check
Jan Djärv <jan.h.d@swipnet.se>
parents:
102549
diff
changeset
|
120 { |
36389825b3d8
gtkutil.c (xg_display_open): Assign a value to gdpy_def, check
Jan Djärv <jan.h.d@swipnet.se>
parents:
102549
diff
changeset
|
121 gdpy_def = gdpy; |
36389825b3d8
gtkutil.c (xg_display_open): Assign a value to gdpy_def, check
Jan Djärv <jan.h.d@swipnet.se>
parents:
102549
diff
changeset
|
122 gdk_display_manager_set_default_display (gdk_display_manager_get (), |
36389825b3d8
gtkutil.c (xg_display_open): Assign a value to gdpy_def, check
Jan Djärv <jan.h.d@swipnet.se>
parents:
102549
diff
changeset
|
123 gdpy); |
36389825b3d8
gtkutil.c (xg_display_open): Assign a value to gdpy_def, check
Jan Djärv <jan.h.d@swipnet.se>
parents:
102549
diff
changeset
|
124 } |
98555
440d088b9a23
(xg_display_open): Reset default display if none exists.
Chong Yidong <cyd@stupidchicken.com>
parents:
98545
diff
changeset
|
125 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
126 *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
|
127 } |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
128 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
129 |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
130 /* 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
|
131 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
132 void |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
133 xg_display_close (Display *dpy) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
134 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
135 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
|
136 |
98555
440d088b9a23
(xg_display_open): Reset default display if none exists.
Chong Yidong <cyd@stupidchicken.com>
parents:
98545
diff
changeset
|
137 /* If this is the default display, try to change it before closing. |
440d088b9a23
(xg_display_open): Reset default display if none exists.
Chong Yidong <cyd@stupidchicken.com>
parents:
98545
diff
changeset
|
138 If there is no other display to use, gdpy_def is set to NULL, and |
440d088b9a23
(xg_display_open): Reset default display if none exists.
Chong Yidong <cyd@stupidchicken.com>
parents:
98545
diff
changeset
|
139 the next call to xg_display_open resets the default display. */ |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
140 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
|
141 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
142 struct x_display_info *dpyinfo; |
98555
440d088b9a23
(xg_display_open): Reset default display if none exists.
Chong Yidong <cyd@stupidchicken.com>
parents:
98545
diff
changeset
|
143 GdkDisplay *gdpy_new = NULL; |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
144 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
145 /* Find another display. */ |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
146 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
|
147 if (dpyinfo->display != dpy) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
148 { |
98555
440d088b9a23
(xg_display_open): Reset default display if none exists.
Chong Yidong <cyd@stupidchicken.com>
parents:
98545
diff
changeset
|
149 gdpy_new = gdk_x11_lookup_xdisplay (dpyinfo->display); |
440d088b9a23
(xg_display_open): Reset default display if none exists.
Chong Yidong <cyd@stupidchicken.com>
parents:
98545
diff
changeset
|
150 gdk_display_manager_set_default_display (gdk_display_manager_get (), |
440d088b9a23
(xg_display_open): Reset default display if none exists.
Chong Yidong <cyd@stupidchicken.com>
parents:
98545
diff
changeset
|
151 gdpy_new); |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
152 break; |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
153 } |
98555
440d088b9a23
(xg_display_open): Reset default display if none exists.
Chong Yidong <cyd@stupidchicken.com>
parents:
98545
diff
changeset
|
154 gdpy_def = gdpy_new; |
53069
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 #if GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION < 10 |
98555
440d088b9a23
(xg_display_open): Reset default display if none exists.
Chong Yidong <cyd@stupidchicken.com>
parents:
98545
diff
changeset
|
158 /* GTK 2.2-2.8 has a bug that makes gdk_display_close crash (bug |
440d088b9a23
(xg_display_open): Reset default display if none exists.
Chong Yidong <cyd@stupidchicken.com>
parents:
98545
diff
changeset
|
159 http://bugzilla.gnome.org/show_bug.cgi?id=85715). This way we |
440d088b9a23
(xg_display_open): Reset default display if none exists.
Chong Yidong <cyd@stupidchicken.com>
parents:
98545
diff
changeset
|
160 can continue running, but there will be memory leaks. */ |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
161 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
|
162 #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
|
163 /* 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
|
164 gdk_display_close (gdpy); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
165 #endif |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
166 } |
50129
d0142038feaa
Reduce flicker in GTK scrollbars.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50112
diff
changeset
|
167 |
49323 | 168 |
169 /*********************************************************************** | |
170 Utility functions | |
171 ***********************************************************************/ | |
172 /* The next two variables and functions are taken from lwlib. */ | |
173 static widget_value *widget_value_free_list; | |
174 static int malloc_cpt; | |
175 | |
176 /* Allocate a widget_value structure, either by taking one from the | |
177 widget_value_free_list or by malloc:ing a new one. | |
178 | |
179 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
|
180 |
49323 | 181 widget_value * |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
182 malloc_widget_value (void) |
49323 | 183 { |
184 widget_value *wv; | |
185 if (widget_value_free_list) | |
186 { | |
187 wv = widget_value_free_list; | |
188 widget_value_free_list = wv->free_list; | |
189 wv->free_list = 0; | |
190 } | |
191 else | |
192 { | |
69025
5d9232b72d14
(malloc_widget_value): Use xmalloc.
Richard M. Stallman <rms@gnu.org>
parents:
68922
diff
changeset
|
193 wv = (widget_value *) xmalloc (sizeof (widget_value)); |
49323 | 194 malloc_cpt++; |
195 } | |
196 memset (wv, 0, sizeof (widget_value)); | |
197 return wv; | |
198 } | |
199 | |
200 /* This is analogous to free. It frees only what was allocated | |
201 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
|
202 |
49323 | 203 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
204 free_widget_value (widget_value *wv) |
49323 | 205 { |
206 if (wv->free_list) | |
207 abort (); | |
208 | |
209 if (malloc_cpt > 25) | |
210 { | |
211 /* When the number of already allocated cells is too big, | |
212 We free it. */ | |
100633
5395c014feb8
* buffer.c (init_buffer): Use realloc instead of xrealloc.
Andreas Schwab <schwab@suse.de>
parents:
100501
diff
changeset
|
213 xfree (wv); |
49323 | 214 malloc_cpt--; |
215 } | |
216 else | |
217 { | |
218 wv->free_list = widget_value_free_list; | |
219 widget_value_free_list = wv; | |
220 } | |
221 } | |
222 | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
223 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
224 /* 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
|
225 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
|
226 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
227 GdkCursor * |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
228 xg_create_default_cursor (Display *dpy) |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
229 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
230 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
|
231 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
|
232 } |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
233 |
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
|
234 /* 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
|
235 |
65006
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
236 static GdkPixbuf * |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
237 xg_get_pixbuf_from_pix_and_mask (GdkPixmap *gpix, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
238 GdkPixmap *gmask, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
239 GdkColormap *cmap) |
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
|
240 { |
107219
07507204ac6f
Move declarations before statements.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
241 int width, height; |
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
|
242 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
|
243 |
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 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
|
245 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
|
246 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
|
247 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
|
248 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
|
249 |
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 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
|
251 { |
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 *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
|
253 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
|
254 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
|
255 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
|
256 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 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
|
258 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
|
259 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
|
260 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
|
261 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
|
262 |
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 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
|
264 { |
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 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
|
266 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
|
267 |
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 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
|
269 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
|
270 |
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 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
|
272 { |
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 /* 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
|
274 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
|
275 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
|
276 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
|
277 |
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 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
|
279 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
|
280 } |
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 } |
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 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
|
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 |
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 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
|
287 } |
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 |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
289 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
290 file_for_image (Lisp_Object image) |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
291 { |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
292 Lisp_Object specified_file = Qnil; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
293 Lisp_Object tail; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
294 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
295 for (tail = XCDR (image); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
296 NILP (specified_file) && CONSP (tail) && CONSP (XCDR (tail)); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
297 tail = XCDR (XCDR (tail))) |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
298 if (EQ (XCAR (tail), QCfile)) |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
299 specified_file = XCAR (XCDR (tail)); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
300 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
301 return specified_file; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
302 } |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
303 |
56112
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
304 /* 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
|
305 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
|
306 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
|
307 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
|
308 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
|
309 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
|
310 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
|
311 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
|
312 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
|
313 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
|
314 |
56112
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
315 static GtkWidget * |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
316 xg_get_image_for_pixmap (FRAME_PTR f, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
317 struct image *img, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
318 GtkWidget *widget, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
319 GtkImage *old_widget) |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
320 { |
56112
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
321 GdkPixmap *gpix; |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
322 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
|
323 GdkDisplay *gdpy; |
78809
c1d129148b98
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
78787
diff
changeset
|
324 GdkColormap *cmap; |
c1d129148b98
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
78787
diff
changeset
|
325 GdkPixbuf *icon_buf; |
56269
4f8b4f60e748
(xg_get_image_for_pixmap): Add workaround for monochrome displays
Jan Djärv <jan.h.d@swipnet.se>
parents:
56268
diff
changeset
|
326 |
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
|
327 /* 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
|
328 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
|
329 look good in all cases. */ |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
330 Lisp_Object specified_file = file_for_image (img->spec); |
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
|
331 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
|
332 |
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
|
333 /* 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
|
334 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
|
335 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
|
336 |
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 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
|
338 && 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
|
339 { |
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
|
340 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
|
341 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
|
342 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
|
343 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
|
344 |
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 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
|
346 } |
4f8b4f60e748
(xg_get_image_for_pixmap): Add workaround for monochrome displays
Jan Djärv <jan.h.d@swipnet.se>
parents:
56268
diff
changeset
|
347 |
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
|
348 /* 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
|
349 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
|
350 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
|
351 |
56269
4f8b4f60e748
(xg_get_image_for_pixmap): Add workaround for monochrome displays
Jan Djärv <jan.h.d@swipnet.se>
parents:
56268
diff
changeset
|
352 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
|
353 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
|
354 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
|
355 |
78809
c1d129148b98
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
78787
diff
changeset
|
356 /* This is a workaround to make icons look good on pseudo color |
c1d129148b98
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
78787
diff
changeset
|
357 displays. Apparently GTK expects the images to have an alpha |
c1d129148b98
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
78787
diff
changeset
|
358 channel. If they don't, insensitive and activated icons will |
c1d129148b98
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
78787
diff
changeset
|
359 look bad. This workaround does not work on monochrome displays, |
c1d129148b98
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
78787
diff
changeset
|
360 and is strictly not needed on true color/static color displays (i.e. |
c1d129148b98
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
78787
diff
changeset
|
361 16 bits and higher). But we do it anyway so we get a pixbuf that is |
c1d129148b98
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
78787
diff
changeset
|
362 not associated with the img->pixmap. The img->pixmap may be removed |
c1d129148b98
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
78787
diff
changeset
|
363 by clearing the image cache and then the tool bar redraw fails, since |
c1d129148b98
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
78787
diff
changeset
|
364 Gtk+ assumes the pixmap is always there. */ |
c1d129148b98
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
78787
diff
changeset
|
365 cmap = gtk_widget_get_colormap (widget); |
c1d129148b98
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
78787
diff
changeset
|
366 icon_buf = xg_get_pixbuf_from_pix_and_mask (gpix, gmask, cmap); |
c1d129148b98
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
78787
diff
changeset
|
367 |
c1d129148b98
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
78787
diff
changeset
|
368 if (! old_widget) |
c1d129148b98
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
78787
diff
changeset
|
369 old_widget = GTK_IMAGE (gtk_image_new_from_pixbuf (icon_buf)); |
56112
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
370 else |
78809
c1d129148b98
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
78787
diff
changeset
|
371 gtk_image_set_from_pixbuf (old_widget, icon_buf); |
c1d129148b98
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
78787
diff
changeset
|
372 |
c1d129148b98
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
78787
diff
changeset
|
373 g_object_unref (G_OBJECT (icon_buf)); |
56112
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
374 |
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
|
375 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
|
376 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
|
377 |
56112
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
378 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
|
379 } |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
380 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
381 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
382 /* Set CURSOR on W and all widgets W contain. We must do like this |
49323 | 383 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
|
384 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
|
385 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
386 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
387 xg_set_cursor (GtkWidget *w, GdkCursor *cursor) |
49323 | 388 { |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
389 GdkWindow *window = gtk_widget_get_window(w); |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
390 GList *children = gdk_window_peek_children (window); |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
391 |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
392 gdk_window_set_cursor (window, cursor); |
49323 | 393 |
394 /* The scroll bar widget has more than one GDK window (had to look at | |
395 the source to figure this out), and there is no way to set cursor | |
396 on widgets in GTK. So we must set the cursor for all GDK windows. | |
397 Ditto for menus. */ | |
398 | |
399 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
|
400 gdk_window_set_cursor (GDK_WINDOW (children->data), cursor); |
49323 | 401 } |
402 | |
403 /* 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
|
404 |
49323 | 405 static void |
406 xg_list_insert (xg_list_node *list, xg_list_node *node) | |
407 { | |
408 xg_list_node *list_start = list->next; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
409 |
49323 | 410 if (list_start) list_start->prev = node; |
411 node->next = list_start; | |
412 node->prev = 0; | |
413 list->next = node; | |
414 } | |
415 | |
416 /* 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
|
417 |
49323 | 418 static void |
419 xg_list_remove (xg_list_node *list, xg_list_node *node) | |
420 { | |
421 xg_list_node *list_start = list->next; | |
422 if (node == list_start) | |
423 { | |
424 list->next = node->next; | |
425 if (list->next) list->next->prev = 0; | |
426 } | |
427 else | |
428 { | |
429 node->prev->next = node->next; | |
430 if (node->next) node->next->prev = node->prev; | |
431 } | |
432 } | |
433 | |
434 /* Allocate and return a utf8 version of STR. If STR is already | |
435 utf8 or NULL, just return STR. | |
436 If not, a new string is allocated and the caller must free the result | |
437 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
|
438 |
49323 | 439 static char * |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
440 get_utf8_string (char *str) |
49323 | 441 { |
442 char *utf8_str = str; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
443 |
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
|
444 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
|
445 |
49323 | 446 /* 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
|
447 if (!g_utf8_validate (str, -1, NULL)) |
49323 | 448 utf8_str = g_locale_to_utf8 (str, -1, 0, 0, 0); |
449 | |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
450 if (!utf8_str) |
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
|
451 { |
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
|
452 /* 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
|
453 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
|
454 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
|
455 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
|
456 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
|
457 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
|
458 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
|
459 |
73389
7b5c0104efb0
* gtkutil.c (get_utf8_string): Remove warnings with casts.
Jan Djärv <jan.h.d@swipnet.se>
parents:
73066
diff
changeset
|
460 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
|
461 &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
|
462 && 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
|
463 { |
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
|
464 ++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
|
465 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
|
466 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
|
467 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
|
468 } |
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
|
469 |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
470 if (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
|
471 { |
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
|
472 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
|
473 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
|
474 } |
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
|
475 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
|
476 |
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
|
477 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
|
478 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
|
479 |
7b5c0104efb0
* gtkutil.c (get_utf8_string): Remove warnings with casts.
Jan Djärv <jan.h.d@swipnet.se>
parents:
73066
diff
changeset
|
480 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
|
481 &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
|
482 && 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
|
483 { |
73389
7b5c0104efb0
* gtkutil.c (get_utf8_string): Remove warnings with casts.
Jan Djärv <jan.h.d@swipnet.se>
parents:
73066
diff
changeset
|
484 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
|
485 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
|
486 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
|
487 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
|
488 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
|
489 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
|
490 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
|
491 } |
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
|
492 |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
493 if (cp) |
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
|
494 { |
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
|
495 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
|
496 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
|
497 } |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
498 if (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
|
499 { |
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
|
500 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
|
501 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
|
502 } |
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
|
503 } |
49323 | 504 return utf8_str; |
505 } | |
506 | |
507 | |
508 | |
509 /*********************************************************************** | |
109604
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
510 Tooltips |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
511 ***********************************************************************/ |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
512 /* Gtk+ calls this callback when the parent of our tooltip dummy changes. |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
513 We use that to pop down the tooltip. This happens if Gtk+ for some |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
514 reason wants to change or hide the tooltip. */ |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
515 |
109615
09adf0d4c6d9
Don't use Gtk+ tooltip unless Gtk+ version => 2.14.
Jan D. <jan.h.d@swipnet.se>
parents:
109604
diff
changeset
|
516 #ifdef USE_GTK_TOOLTIP |
09adf0d4c6d9
Don't use Gtk+ tooltip unless Gtk+ version => 2.14.
Jan D. <jan.h.d@swipnet.se>
parents:
109604
diff
changeset
|
517 |
109604
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
518 static void |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
519 hierarchy_ch_cb (GtkWidget *widget, |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
520 GtkWidget *previous_toplevel, |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
521 gpointer user_data) |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
522 { |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
523 FRAME_PTR f = (FRAME_PTR) user_data; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
524 struct x_output *x = f->output_data.x; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
525 GtkWidget *top = gtk_widget_get_toplevel (x->ttip_lbl); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
526 |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
527 if (! top || ! GTK_IS_WINDOW (top)) |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
528 gtk_widget_hide (previous_toplevel); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
529 } |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
530 |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
531 /* Callback called when Gtk+ thinks a tooltip should be displayed. |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
532 We use it to get the tooltip window and the tooltip widget so |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
533 we can manipulate the ourselves. |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
534 |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
535 Return FALSE ensures that the tooltip is not shown. */ |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
536 |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
537 static gboolean |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
538 qttip_cb (GtkWidget *widget, |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
539 gint xpos, |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
540 gint ypos, |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
541 gboolean keyboard_mode, |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
542 GtkTooltip *tooltip, |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
543 gpointer user_data) |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
544 { |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
545 FRAME_PTR f = (FRAME_PTR) user_data; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
546 struct x_output *x = f->output_data.x; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
547 if (x->ttip_widget == NULL) |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
548 { |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
549 g_object_set (G_OBJECT (widget), "has-tooltip", FALSE, NULL); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
550 x->ttip_widget = tooltip; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
551 g_object_ref (G_OBJECT (tooltip)); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
552 x->ttip_lbl = gtk_label_new (""); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
553 g_object_ref (G_OBJECT (x->ttip_lbl)); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
554 gtk_tooltip_set_custom (tooltip, x->ttip_lbl); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
555 x->ttip_window = GTK_WINDOW (gtk_widget_get_toplevel (x->ttip_lbl)); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
556 /* Realize so we can safely get screen later on. */ |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
557 gtk_widget_realize (GTK_WIDGET (x->ttip_window)); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
558 gtk_widget_realize (x->ttip_lbl); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
559 |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
560 g_signal_connect (x->ttip_lbl, "hierarchy-changed", |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
561 G_CALLBACK (hierarchy_ch_cb), f); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
562 } |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
563 return FALSE; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
564 } |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
565 |
109615
09adf0d4c6d9
Don't use Gtk+ tooltip unless Gtk+ version => 2.14.
Jan D. <jan.h.d@swipnet.se>
parents:
109604
diff
changeset
|
566 #endif /* USE_GTK_TOOLTIP */ |
09adf0d4c6d9
Don't use Gtk+ tooltip unless Gtk+ version => 2.14.
Jan D. <jan.h.d@swipnet.se>
parents:
109604
diff
changeset
|
567 |
109604
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
568 /* Prepare a tooltip to be shown, i.e. calculate WIDTH and HEIGHT. |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
569 Return zero if no system tooltip available, non-zero otherwise. */ |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
570 |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
571 int |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
572 xg_prepare_tooltip (FRAME_PTR f, |
109615
09adf0d4c6d9
Don't use Gtk+ tooltip unless Gtk+ version => 2.14.
Jan D. <jan.h.d@swipnet.se>
parents:
109604
diff
changeset
|
573 Lisp_Object string, |
09adf0d4c6d9
Don't use Gtk+ tooltip unless Gtk+ version => 2.14.
Jan D. <jan.h.d@swipnet.se>
parents:
109604
diff
changeset
|
574 int *width, |
109604
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
575 int *height) |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
576 { |
109615
09adf0d4c6d9
Don't use Gtk+ tooltip unless Gtk+ version => 2.14.
Jan D. <jan.h.d@swipnet.se>
parents:
109604
diff
changeset
|
577 #ifndef USE_GTK_TOOLTIP |
09adf0d4c6d9
Don't use Gtk+ tooltip unless Gtk+ version => 2.14.
Jan D. <jan.h.d@swipnet.se>
parents:
109604
diff
changeset
|
578 return 0; |
09adf0d4c6d9
Don't use Gtk+ tooltip unless Gtk+ version => 2.14.
Jan D. <jan.h.d@swipnet.se>
parents:
109604
diff
changeset
|
579 #else |
109604
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
580 struct x_output *x = f->output_data.x; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
581 GtkWidget *widget; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
582 GdkWindow *gwin; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
583 GdkScreen *screen; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
584 GtkSettings *settings; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
585 gboolean tt_enabled = TRUE; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
586 GtkRequisition req; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
587 Lisp_Object encoded_string; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
588 |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
589 if (!x->ttip_lbl) return 0; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
590 |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
591 BLOCK_INPUT; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
592 encoded_string = ENCODE_UTF_8 (string); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
593 widget = GTK_WIDGET (x->ttip_lbl); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
594 gwin = gtk_widget_get_window (GTK_WIDGET (x->ttip_window)); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
595 screen = gdk_drawable_get_screen (gwin); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
596 settings = gtk_settings_get_for_screen (screen); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
597 g_object_get (settings, "gtk-enable-tooltips", &tt_enabled, NULL); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
598 if (tt_enabled) |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
599 { |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
600 g_object_set (settings, "gtk-enable-tooltips", FALSE, NULL); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
601 /* Record that we disabled it so it can be enabled again. */ |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
602 g_object_set_data (G_OBJECT (x->ttip_window), "restore-tt", |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
603 (gpointer)f); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
604 } |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
605 |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
606 /* Prevent Gtk+ from hiding tooltip on mouse move and such. */ |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
607 g_object_set_data (G_OBJECT |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
608 (gtk_widget_get_display (GTK_WIDGET (x->ttip_window))), |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
609 "gdk-display-current-tooltip", NULL); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
610 |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
611 /* Put out dummy widget in so we can get callbacks for unrealize and |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
612 hierarchy-changed. */ |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
613 gtk_tooltip_set_custom (x->ttip_widget, widget); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
614 |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
615 gtk_tooltip_set_text (x->ttip_widget, SDATA (encoded_string)); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
616 gtk_widget_size_request (GTK_WIDGET (x->ttip_window), &req); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
617 if (width) *width = req.width; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
618 if (height) *height = req.height; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
619 |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
620 UNBLOCK_INPUT; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
621 |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
622 return 1; |
109615
09adf0d4c6d9
Don't use Gtk+ tooltip unless Gtk+ version => 2.14.
Jan D. <jan.h.d@swipnet.se>
parents:
109604
diff
changeset
|
623 #endif /* USE_GTK_TOOLTIP */ |
109604
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
624 } |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
625 |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
626 /* Show the tooltip at ROOT_X and ROOT_Y. |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
627 xg_prepare_tooltip must have been called before this function. */ |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
628 |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
629 void |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
630 xg_show_tooltip (FRAME_PTR f, int root_x, int root_y) |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
631 { |
109615
09adf0d4c6d9
Don't use Gtk+ tooltip unless Gtk+ version => 2.14.
Jan D. <jan.h.d@swipnet.se>
parents:
109604
diff
changeset
|
632 #ifdef USE_GTK_TOOLTIP |
109604
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
633 struct x_output *x = f->output_data.x; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
634 if (x->ttip_window) |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
635 { |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
636 BLOCK_INPUT; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
637 gtk_window_move (x->ttip_window, root_x, root_y); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
638 gtk_widget_show_all (GTK_WIDGET (x->ttip_window)); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
639 UNBLOCK_INPUT; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
640 } |
109615
09adf0d4c6d9
Don't use Gtk+ tooltip unless Gtk+ version => 2.14.
Jan D. <jan.h.d@swipnet.se>
parents:
109604
diff
changeset
|
641 #endif |
109604
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
642 } |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
643 |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
644 /* Hide tooltip if shown. Do nothing if not shown. |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
645 Return non-zero if tip was hidden, non-ero if not (i.e. not using |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
646 system tooltips). */ |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
647 |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
648 int |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
649 xg_hide_tooltip (FRAME_PTR f) |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
650 { |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
651 int ret = 0; |
109615
09adf0d4c6d9
Don't use Gtk+ tooltip unless Gtk+ version => 2.14.
Jan D. <jan.h.d@swipnet.se>
parents:
109604
diff
changeset
|
652 #ifdef USE_GTK_TOOLTIP |
109604
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
653 if (f->output_data.x->ttip_window) |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
654 { |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
655 GtkWindow *win = f->output_data.x->ttip_window; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
656 BLOCK_INPUT; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
657 gtk_widget_hide (GTK_WIDGET (win)); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
658 |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
659 if (g_object_get_data (G_OBJECT (win), "restore-tt")) |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
660 { |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
661 GdkWindow *gwin = gtk_widget_get_window (GTK_WIDGET (win)); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
662 GdkScreen *screen = gdk_drawable_get_screen (gwin); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
663 GtkSettings *settings = gtk_settings_get_for_screen (screen); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
664 g_object_set (settings, "gtk-enable-tooltips", TRUE, NULL); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
665 } |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
666 UNBLOCK_INPUT; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
667 |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
668 ret = 1; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
669 } |
109615
09adf0d4c6d9
Don't use Gtk+ tooltip unless Gtk+ version => 2.14.
Jan D. <jan.h.d@swipnet.se>
parents:
109604
diff
changeset
|
670 #endif |
109604
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
671 return ret; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
672 } |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
673 |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
674 |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
675 /*********************************************************************** |
49323 | 676 General functions for creating widgets, resizing, events, e.t.c. |
677 ***********************************************************************/ | |
678 | |
679 /* Make a geometry string and pass that to GTK. It seems this is the | |
680 only way to get geometry position right if the user explicitly | |
681 asked for a position when starting Emacs. | |
682 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
|
683 |
49323 | 684 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
685 xg_set_geometry (FRAME_PTR f) |
49323 | 686 { |
107851
2a74858bccc0
Fix so top -10 and left -10 in frame parameters work.
Jan D. <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
687 if (f->size_hint_flags & (USPosition | PPosition)) |
93427
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
688 { |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
689 int left = f->left_pos; |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
690 int xneg = f->size_hint_flags & XNegative; |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
691 int top = f->top_pos; |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
692 int yneg = f->size_hint_flags & YNegative; |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
693 char geom_str[32]; |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
694 |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
695 if (xneg) |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
696 left = -left; |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
697 if (yneg) |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
698 top = -top; |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
699 |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
700 sprintf (geom_str, "=%dx%d%c%d%c%d", |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
701 FRAME_PIXEL_WIDTH (f), |
107891
bf5fce1e8e34
Set USER_POS in hint_flags to work around Cygwin problem.
Jan D. <jan.h.d@swipnet.se>
parents:
107851
diff
changeset
|
702 FRAME_PIXEL_HEIGHT (f), |
93427
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
703 (xneg ? '-' : '+'), left, |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
704 (yneg ? '-' : '+'), top); |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
705 |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
706 if (!gtk_window_parse_geometry (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)), |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
707 geom_str)) |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
708 fprintf (stderr, "Failed to parse: '%s'\n", geom_str); |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
709 } |
49323 | 710 } |
711 | |
106720
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
712 /* Clear under internal border if any. As we use a mix of Gtk+ and X calls |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
713 and use a GtkFixed widget, this doesn't happen automatically. */ |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
714 |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
715 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
716 xg_clear_under_internal_border (FRAME_PTR f) |
106720
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
717 { |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
718 if (FRAME_INTERNAL_BORDER_WIDTH (f) > 0) |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
719 { |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
720 GtkWidget *wfixed = f->output_data.x->edit_widget; |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
721 gtk_widget_queue_draw (wfixed); |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
722 gdk_window_process_all_updates (); |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
723 x_clear_area (FRAME_X_DISPLAY (f), |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
724 FRAME_X_WINDOW (f), |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
725 0, 0, |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
726 FRAME_PIXEL_WIDTH (f), |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
727 FRAME_INTERNAL_BORDER_WIDTH (f), 0); |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
728 x_clear_area (FRAME_X_DISPLAY (f), |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
729 FRAME_X_WINDOW (f), |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
730 0, 0, |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
731 FRAME_INTERNAL_BORDER_WIDTH (f), |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
732 FRAME_PIXEL_HEIGHT (f), 0); |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
733 x_clear_area (FRAME_X_DISPLAY (f), |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
734 FRAME_X_WINDOW (f), |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
735 0, FRAME_PIXEL_HEIGHT (f) - FRAME_INTERNAL_BORDER_WIDTH (f), |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
736 FRAME_PIXEL_WIDTH (f), |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
737 FRAME_INTERNAL_BORDER_WIDTH (f), 0); |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
738 x_clear_area (FRAME_X_DISPLAY (f), |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
739 FRAME_X_WINDOW (f), |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
740 FRAME_PIXEL_WIDTH (f) - FRAME_INTERNAL_BORDER_WIDTH (f), |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
741 0, |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
742 FRAME_INTERNAL_BORDER_WIDTH (f), |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
743 FRAME_PIXEL_HEIGHT (f), 0); |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
744 } |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
745 } |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
746 |
92366
39b38c867ca4
(xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents:
91632
diff
changeset
|
747 /* Function to handle resize of our frame. As we have a Gtk+ tool bar |
39b38c867ca4
(xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents:
91632
diff
changeset
|
748 and a Gtk+ menu bar, we get resize events for the edit part of the |
39b38c867ca4
(xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents:
91632
diff
changeset
|
749 frame only. We let Gtk+ deal with the Gtk+ parts. |
49323 | 750 F is the frame to resize. |
751 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
|
752 |
49323 | 753 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
754 xg_frame_resized (FRAME_PTR f, int pixelwidth, int pixelheight) |
49323 | 755 { |
103690
6cf0c4de552b
* gtkutil.c (xg_frame_set_char_size): Do set width/height if the
Jan Djärv <jan.h.d@swipnet.se>
parents:
103688
diff
changeset
|
756 int rows, columns; |
6cf0c4de552b
* gtkutil.c (xg_frame_set_char_size): Do set width/height if the
Jan Djärv <jan.h.d@swipnet.se>
parents:
103688
diff
changeset
|
757 |
6cf0c4de552b
* gtkutil.c (xg_frame_set_char_size): Do set width/height if the
Jan Djärv <jan.h.d@swipnet.se>
parents:
103688
diff
changeset
|
758 if (pixelwidth == -1 && pixelheight == -1) |
6cf0c4de552b
* gtkutil.c (xg_frame_set_char_size): Do set width/height if the
Jan Djärv <jan.h.d@swipnet.se>
parents:
103688
diff
changeset
|
759 { |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
760 if (FRAME_GTK_WIDGET (f) && gtk_widget_get_mapped (FRAME_GTK_WIDGET (f))) |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
761 gdk_window_get_geometry (gtk_widget_get_window (FRAME_GTK_WIDGET (f)), |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
762 0, 0, |
106720
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
763 &pixelwidth, &pixelheight, 0); |
103690
6cf0c4de552b
* gtkutil.c (xg_frame_set_char_size): Do set width/height if the
Jan Djärv <jan.h.d@swipnet.se>
parents:
103688
diff
changeset
|
764 else return; |
6cf0c4de552b
* gtkutil.c (xg_frame_set_char_size): Do set width/height if the
Jan Djärv <jan.h.d@swipnet.se>
parents:
103688
diff
changeset
|
765 } |
6cf0c4de552b
* gtkutil.c (xg_frame_set_char_size): Do set width/height if the
Jan Djärv <jan.h.d@swipnet.se>
parents:
103688
diff
changeset
|
766 |
6cf0c4de552b
* gtkutil.c (xg_frame_set_char_size): Do set width/height if the
Jan Djärv <jan.h.d@swipnet.se>
parents:
103688
diff
changeset
|
767 |
6cf0c4de552b
* gtkutil.c (xg_frame_set_char_size): Do set width/height if the
Jan Djärv <jan.h.d@swipnet.se>
parents:
103688
diff
changeset
|
768 rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, pixelheight); |
6cf0c4de552b
* gtkutil.c (xg_frame_set_char_size): Do set width/height if the
Jan Djärv <jan.h.d@swipnet.se>
parents:
103688
diff
changeset
|
769 columns = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, pixelwidth); |
6cf0c4de552b
* gtkutil.c (xg_frame_set_char_size): Do set width/height if the
Jan Djärv <jan.h.d@swipnet.se>
parents:
103688
diff
changeset
|
770 |
6cf0c4de552b
* gtkutil.c (xg_frame_set_char_size): Do set width/height if the
Jan Djärv <jan.h.d@swipnet.se>
parents:
103688
diff
changeset
|
771 if (columns != FRAME_COLS (f) |
6cf0c4de552b
* gtkutil.c (xg_frame_set_char_size): Do set width/height if the
Jan Djärv <jan.h.d@swipnet.se>
parents:
103688
diff
changeset
|
772 || rows != FRAME_LINES (f) |
6cf0c4de552b
* gtkutil.c (xg_frame_set_char_size): Do set width/height if the
Jan Djärv <jan.h.d@swipnet.se>
parents:
103688
diff
changeset
|
773 || pixelwidth != FRAME_PIXEL_WIDTH (f) |
6cf0c4de552b
* gtkutil.c (xg_frame_set_char_size): Do set width/height if the
Jan Djärv <jan.h.d@swipnet.se>
parents:
103688
diff
changeset
|
774 || pixelheight != FRAME_PIXEL_HEIGHT (f)) |
49323 | 775 { |
92366
39b38c867ca4
(xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents:
91632
diff
changeset
|
776 FRAME_PIXEL_WIDTH (f) = pixelwidth; |
39b38c867ca4
(xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents:
91632
diff
changeset
|
777 FRAME_PIXEL_HEIGHT (f) = pixelheight; |
39b38c867ca4
(xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents:
91632
diff
changeset
|
778 |
106720
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
779 xg_clear_under_internal_border (f); |
100498
b5964e7e169b
(xg_frame_resized): Remove check if rows/columns have
Jan Djärv <jan.h.d@swipnet.se>
parents:
100100
diff
changeset
|
780 change_frame_size (f, rows, columns, 0, 1, 0); |
b5964e7e169b
(xg_frame_resized): Remove check if rows/columns have
Jan Djärv <jan.h.d@swipnet.se>
parents:
100100
diff
changeset
|
781 SET_FRAME_GARBAGED (f); |
b5964e7e169b
(xg_frame_resized): Remove check if rows/columns have
Jan Djärv <jan.h.d@swipnet.se>
parents:
100100
diff
changeset
|
782 cancel_mouse_face (f); |
49323 | 783 } |
784 } | |
785 | |
93427
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
786 /* Resize the outer window of frame F after chainging the height. |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
787 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
|
788 |
49323 | 789 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
790 xg_frame_set_char_size (FRAME_PTR f, int cols, int rows) |
49323 | 791 { |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
792 int pixelheight = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, rows) |
49323 | 793 + 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
|
794 int pixelwidth; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
795 |
92366
39b38c867ca4
(xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents:
91632
diff
changeset
|
796 if (FRAME_PIXEL_HEIGHT (f) == 0) |
39b38c867ca4
(xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents:
91632
diff
changeset
|
797 return; |
39b38c867ca4
(xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents:
91632
diff
changeset
|
798 |
49323 | 799 /* Take into account the size of the scroll bar. Always use the |
800 number of columns occupied by the scroll bar here otherwise we | |
801 might end up with a frame width that is not a multiple of the | |
802 frame's character width which is bad for vertically split | |
803 windows. */ | |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
804 f->scroll_bar_actual_width |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
805 = FRAME_SCROLL_BAR_COLS (f) * FRAME_COLUMN_WIDTH (f); |
49323 | 806 |
50099
a62497b91c74
Use generic compute_fringe_widths.
Kim F. Storm <storm@cua.dk>
parents:
50063
diff
changeset
|
807 compute_fringe_widths (f, 0); |
49323 | 808 |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
809 /* 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
|
810 after calculating that value. */ |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
811 pixelwidth = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, cols) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
812 + FRAME_TOOLBAR_WIDTH (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
|
813 |
106720
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
814 |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
815 /* Do this before resize, as we don't know yet if we will be resized. */ |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
816 xg_clear_under_internal_border (f); |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
817 |
49323 | 818 /* Must resize our top level widget. Font size may have changed, |
103665
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103198
diff
changeset
|
819 but not rows/cols. */ |
49323 | 820 gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)), |
821 pixelwidth, pixelheight); | |
103665
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103198
diff
changeset
|
822 x_wm_set_size_hint (f, 0, 0); |
103198
f63bce93c7a1
* gtkutil.c (xg_frame_set_char_size): Set frame pixel width/height to
Jan Djärv <jan.h.d@swipnet.se>
parents:
103022
diff
changeset
|
823 |
105693
964ff7cbc8a6
Fix resize due to font change on a maximized/xmonad-controlled frame.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105669
diff
changeset
|
824 SET_FRAME_GARBAGED (f); |
964ff7cbc8a6
Fix resize due to font change on a maximized/xmonad-controlled frame.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105669
diff
changeset
|
825 cancel_mouse_face (f); |
964ff7cbc8a6
Fix resize due to font change on a maximized/xmonad-controlled frame.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105669
diff
changeset
|
826 |
103690
6cf0c4de552b
* gtkutil.c (xg_frame_set_char_size): Do set width/height if the
Jan Djärv <jan.h.d@swipnet.se>
parents:
103688
diff
changeset
|
827 /* We can not call change_frame_size for a mapped frame, |
6cf0c4de552b
* gtkutil.c (xg_frame_set_char_size): Do set width/height if the
Jan Djärv <jan.h.d@swipnet.se>
parents:
103688
diff
changeset
|
828 we can not set pixel width/height either. The window manager may |
6cf0c4de552b
* gtkutil.c (xg_frame_set_char_size): Do set width/height if the
Jan Djärv <jan.h.d@swipnet.se>
parents:
103688
diff
changeset
|
829 override our resize request, XMonad does this all the time. |
6cf0c4de552b
* gtkutil.c (xg_frame_set_char_size): Do set width/height if the
Jan Djärv <jan.h.d@swipnet.se>
parents:
103688
diff
changeset
|
830 The best we can do is try to sync, so lisp code sees the updated |
6cf0c4de552b
* gtkutil.c (xg_frame_set_char_size): Do set width/height if the
Jan Djärv <jan.h.d@swipnet.se>
parents:
103688
diff
changeset
|
831 size as fast as possible. |
6cf0c4de552b
* gtkutil.c (xg_frame_set_char_size): Do set width/height if the
Jan Djärv <jan.h.d@swipnet.se>
parents:
103688
diff
changeset
|
832 For unmapped windows, we can set rows/cols. When |
6cf0c4de552b
* gtkutil.c (xg_frame_set_char_size): Do set width/height if the
Jan Djärv <jan.h.d@swipnet.se>
parents:
103688
diff
changeset
|
833 the frame is mapped again we will (hopefully) get the correct size. */ |
6cf0c4de552b
* gtkutil.c (xg_frame_set_char_size): Do set width/height if the
Jan Djärv <jan.h.d@swipnet.se>
parents:
103688
diff
changeset
|
834 if (f->async_visible) |
105693
964ff7cbc8a6
Fix resize due to font change on a maximized/xmonad-controlled frame.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105669
diff
changeset
|
835 { |
964ff7cbc8a6
Fix resize due to font change on a maximized/xmonad-controlled frame.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105669
diff
changeset
|
836 /* Must call this to flush out events */ |
964ff7cbc8a6
Fix resize due to font change on a maximized/xmonad-controlled frame.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105669
diff
changeset
|
837 (void)gtk_events_pending (); |
964ff7cbc8a6
Fix resize due to font change on a maximized/xmonad-controlled frame.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105669
diff
changeset
|
838 gdk_flush (); |
964ff7cbc8a6
Fix resize due to font change on a maximized/xmonad-controlled frame.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105669
diff
changeset
|
839 x_wait_for_event (f, ConfigureNotify); |
964ff7cbc8a6
Fix resize due to font change on a maximized/xmonad-controlled frame.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105669
diff
changeset
|
840 } |
103690
6cf0c4de552b
* gtkutil.c (xg_frame_set_char_size): Do set width/height if the
Jan Djärv <jan.h.d@swipnet.se>
parents:
103688
diff
changeset
|
841 else |
6cf0c4de552b
* gtkutil.c (xg_frame_set_char_size): Do set width/height if the
Jan Djärv <jan.h.d@swipnet.se>
parents:
103688
diff
changeset
|
842 { |
105693
964ff7cbc8a6
Fix resize due to font change on a maximized/xmonad-controlled frame.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105669
diff
changeset
|
843 change_frame_size (f, rows, cols, 0, 1, 0); |
103690
6cf0c4de552b
* gtkutil.c (xg_frame_set_char_size): Do set width/height if the
Jan Djärv <jan.h.d@swipnet.se>
parents:
103688
diff
changeset
|
844 FRAME_PIXEL_WIDTH (f) = pixelwidth; |
6cf0c4de552b
* gtkutil.c (xg_frame_set_char_size): Do set width/height if the
Jan Djärv <jan.h.d@swipnet.se>
parents:
103688
diff
changeset
|
845 FRAME_PIXEL_HEIGHT (f) = pixelheight; |
6cf0c4de552b
* gtkutil.c (xg_frame_set_char_size): Do set width/height if the
Jan Djärv <jan.h.d@swipnet.se>
parents:
103688
diff
changeset
|
846 } |
103665
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103198
diff
changeset
|
847 } |
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103198
diff
changeset
|
848 |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
849 /* Handle height/width changes (i.e. add/remove/move menu/toolbar). |
103665
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103198
diff
changeset
|
850 The policy is to keep the number of editable lines. */ |
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103198
diff
changeset
|
851 |
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103198
diff
changeset
|
852 static void |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
853 xg_height_or_width_changed (FRAME_PTR f) |
103665
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103198
diff
changeset
|
854 { |
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103198
diff
changeset
|
855 gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)), |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
856 FRAME_TOTAL_PIXEL_WIDTH (f), |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
857 FRAME_TOTAL_PIXEL_HEIGHT (f)); |
103665
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103198
diff
changeset
|
858 f->output_data.x->hint_flags = 0; |
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
|
859 x_wm_set_size_hint (f, 0, 0); |
49323 | 860 } |
861 | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
862 /* Convert an X Window WSESC on display DPY to its corresponding GtkWidget. |
49323 | 863 Must be done like this, because GtkWidget:s can have "hidden" |
864 X Window that aren't accessible. | |
865 | |
866 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
|
867 |
49323 | 868 GtkWidget * |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
869 xg_win_to_widget (Display *dpy, Window wdesc) |
49323 | 870 { |
871 gpointer gdkwin; | |
872 GtkWidget *gwdesc = 0; | |
873 | |
874 BLOCK_INPUT; | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
875 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
876 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
|
877 wdesc); |
49323 | 878 if (gdkwin) |
879 { | |
880 GdkEvent event; | |
881 event.any.window = gdkwin; | |
882 gwdesc = gtk_get_event_widget (&event); | |
883 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
884 |
49323 | 885 UNBLOCK_INPUT; |
886 return gwdesc; | |
887 } | |
888 | |
889 /* Fill in the GdkColor C so that it represents PIXEL. | |
890 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
|
891 |
49323 | 892 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
893 xg_pix_to_gcolor (GtkWidget *w, long unsigned int pixel, GdkColor *c) |
49323 | 894 { |
895 GdkColormap *map = gtk_widget_get_colormap (w); | |
896 gdk_colormap_query_color (map, pixel, c); | |
897 } | |
898 | |
899 /* Create and set up the GTK widgets for frame F. | |
900 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
|
901 |
49323 | 902 int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
903 xg_create_frame_widgets (FRAME_PTR f) |
49323 | 904 { |
905 GtkWidget *wtop; | |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
906 GtkWidget *wvbox, *whbox; |
49323 | 907 GtkWidget *wfixed; |
908 GdkColor bg; | |
909 GtkRcStyle *style; | |
910 char *title = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
911 |
49323 | 912 BLOCK_INPUT; |
913 | |
91632
370f67c176eb
(xg_create_frame_widgets): If frame is embedded, call
Jan Djärv <jan.h.d@swipnet.se>
parents:
87649
diff
changeset
|
914 if (FRAME_X_EMBEDDED_P (f)) |
370f67c176eb
(xg_create_frame_widgets): If frame is embedded, call
Jan Djärv <jan.h.d@swipnet.se>
parents:
87649
diff
changeset
|
915 wtop = gtk_plug_new (f->output_data.x->parent_desc); |
370f67c176eb
(xg_create_frame_widgets): If frame is embedded, call
Jan Djärv <jan.h.d@swipnet.se>
parents:
87649
diff
changeset
|
916 else |
370f67c176eb
(xg_create_frame_widgets): If frame is embedded, call
Jan Djärv <jan.h.d@swipnet.se>
parents:
87649
diff
changeset
|
917 wtop = gtk_window_new (GTK_WINDOW_TOPLEVEL); |
370f67c176eb
(xg_create_frame_widgets): If frame is embedded, call
Jan Djärv <jan.h.d@swipnet.se>
parents:
87649
diff
changeset
|
918 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
919 xg_set_screen (wtop, f); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
920 |
49323 | 921 wvbox = gtk_vbox_new (FALSE, 0); |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
922 whbox = gtk_hbox_new (FALSE, 0); |
49323 | 923 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
|
924 |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
925 if (! wtop || ! wvbox || ! whbox || ! wfixed) |
49323 | 926 { |
927 if (wtop) gtk_widget_destroy (wtop); | |
928 if (wvbox) gtk_widget_destroy (wvbox); | |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
929 if (whbox) gtk_widget_destroy (whbox); |
49323 | 930 if (wfixed) gtk_widget_destroy (wfixed); |
931 | |
60185
391f44959566
(xg_create_frame_widgets): UNBLOCK_INPUT on error.
Kim F. Storm <storm@cua.dk>
parents:
59913
diff
changeset
|
932 UNBLOCK_INPUT; |
49323 | 933 return 0; |
934 } | |
935 | |
936 /* Use same names as the Xt port does. I.e. Emacs.pane.emacs by default */ | |
937 gtk_widget_set_name (wtop, EMACS_CLASS); | |
938 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
|
939 gtk_widget_set_name (wfixed, SSDATA (Vx_resource_name)); |
49323 | 940 |
941 /* 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
|
942 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
|
943 else if (! NILP (f->name)) title = SSDATA (ENCODE_UTF_8 (f->name)); |
49323 | 944 |
945 if (title) gtk_window_set_title (GTK_WINDOW (wtop), title); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
946 |
49323 | 947 FRAME_GTK_OUTER_WIDGET (f) = wtop; |
948 FRAME_GTK_WIDGET (f) = wfixed; | |
949 f->output_data.x->vbox_widget = wvbox; | |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
950 f->output_data.x->hbox_widget = whbox; |
49323 | 951 |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
952 gtk_widget_set_has_window (wfixed, TRUE); |
49323 | 953 |
954 gtk_container_add (GTK_CONTAINER (wtop), wvbox); | |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
955 gtk_box_pack_start (GTK_BOX (wvbox), whbox, TRUE, TRUE, 0); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
956 gtk_box_pack_start (GTK_BOX (whbox), wfixed, TRUE, TRUE, 0); |
49323 | 957 |
958 if (FRAME_EXTERNAL_TOOL_BAR (f)) | |
959 update_frame_tool_bar (f); | |
960 | |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
961 /* 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
|
962 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
|
963 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
|
964 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
|
965 a lot, so we turn off double buffering. */ |
49323 | 966 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
|
967 |
49323 | 968 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
|
969 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
|
970 SSDATA (Vx_resource_class)); |
49323 | 971 |
972 /* Add callback to do nothing on WM_DELETE_WINDOW. The default in | |
973 GTK is to destroy the widget. We want Emacs to do that instead. */ | |
974 g_signal_connect (G_OBJECT (wtop), "delete-event", | |
975 G_CALLBACK (gtk_true), 0); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
976 |
49323 | 977 /* Convert our geometry parameters into a geometry string |
978 and specify it. | |
979 GTK will itself handle calculating the real position this way. */ | |
980 xg_set_geometry (f); | |
107219
07507204ac6f
Move declarations before statements.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
981 f->win_gravity |
07507204ac6f
Move declarations before statements.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
982 = gtk_window_get_gravity (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f))); |
49323 | 983 |
984 gtk_widget_add_events (wfixed, | |
985 GDK_POINTER_MOTION_MASK | |
986 | GDK_EXPOSURE_MASK | |
987 | GDK_BUTTON_PRESS_MASK | |
988 | GDK_BUTTON_RELEASE_MASK | |
989 | GDK_KEY_PRESS_MASK | |
990 | GDK_ENTER_NOTIFY_MASK | |
991 | GDK_LEAVE_NOTIFY_MASK | |
992 | GDK_FOCUS_CHANGE_MASK | |
993 | GDK_STRUCTURE_MASK | |
994 | GDK_VISIBILITY_NOTIFY_MASK); | |
995 | |
996 /* Must realize the windows so the X window gets created. It is used | |
997 by callers of this function. */ | |
998 gtk_widget_realize (wfixed); | |
999 FRAME_X_WINDOW (f) = GTK_WIDGET_TO_X_WIN (wfixed); | |
1000 | |
1001 /* Since GTK clears its window by filling with the background color, | |
1002 we must keep X and GTK background in sync. */ | |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
1003 xg_pix_to_gcolor (wfixed, FRAME_BACKGROUND_PIXEL (f), &bg); |
49323 | 1004 gtk_widget_modify_bg (wfixed, GTK_STATE_NORMAL, &bg); |
1005 | |
1006 /* Also, do not let any background pixmap to be set, this looks very | |
1007 bad as Emacs overwrites the background pixmap with its own idea | |
1008 of background color. */ | |
1009 style = gtk_widget_get_modifier_style (wfixed); | |
1010 | |
1011 /* Must use g_strdup because gtk_widget_modify_style does g_free. */ | |
1012 style->bg_pixmap_name[GTK_STATE_NORMAL] = g_strdup ("<none>"); | |
1013 gtk_widget_modify_style (wfixed, style); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1014 |
109615
09adf0d4c6d9
Don't use Gtk+ tooltip unless Gtk+ version => 2.14.
Jan D. <jan.h.d@swipnet.se>
parents:
109604
diff
changeset
|
1015 #ifdef USE_GTK_TOOLTIP |
109604
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1016 /* Steal a tool tip window we can move ourselves. */ |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1017 f->output_data.x->ttip_widget = 0; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1018 f->output_data.x->ttip_lbl = 0; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1019 f->output_data.x->ttip_window = 0; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1020 gtk_widget_set_tooltip_text (wtop, "Dummy text"); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1021 g_signal_connect (wtop, "query-tooltip", G_CALLBACK (qttip_cb), f); |
109615
09adf0d4c6d9
Don't use Gtk+ tooltip unless Gtk+ version => 2.14.
Jan D. <jan.h.d@swipnet.se>
parents:
109604
diff
changeset
|
1022 #endif |
49323 | 1023 |
1024 UNBLOCK_INPUT; | |
1025 | |
1026 return 1; | |
1027 } | |
1028 | |
109604
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1029 void |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1030 xg_free_frame_widgets (FRAME_PTR f) |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1031 { |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1032 if (FRAME_GTK_OUTER_WIDGET (f)) |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1033 { |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1034 struct x_output *x = f->output_data.x; |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1035 gtk_widget_destroy (FRAME_GTK_OUTER_WIDGET (f)); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1036 FRAME_X_WINDOW (f) = 0; /* Set to avoid XDestroyWindow in xterm.c */ |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1037 FRAME_GTK_OUTER_WIDGET (f) = 0; |
109615
09adf0d4c6d9
Don't use Gtk+ tooltip unless Gtk+ version => 2.14.
Jan D. <jan.h.d@swipnet.se>
parents:
109604
diff
changeset
|
1038 #ifdef USE_GTK_TOOLTIP |
109604
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1039 if (x->ttip_lbl) |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1040 gtk_widget_destroy (x->ttip_lbl); |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1041 if (x->ttip_widget) |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1042 g_object_unref (G_OBJECT (x->ttip_widget)); |
109615
09adf0d4c6d9
Don't use Gtk+ tooltip unless Gtk+ version => 2.14.
Jan D. <jan.h.d@swipnet.se>
parents:
109604
diff
changeset
|
1043 #endif |
109604
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1044 } |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1045 } |
43eca6c9f493
Use Gtk+ tooltips by default for Gtk+ Emacs.
Jan D <jan.h.d@swipnet.se>
parents:
109581
diff
changeset
|
1046 |
49323 | 1047 /* Set the normal size hints for the window manager, for frame F. |
1048 FLAGS is the flags word to use--or 0 meaning preserve the flags | |
1049 that the window now has. | |
1050 If USER_POSITION is nonzero, we set the User Position | |
1051 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
|
1052 |
49323 | 1053 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1054 x_wm_set_size_hint (FRAME_PTR f, long int flags, int user_position) |
49323 | 1055 { |
98545
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1056 /* Must use GTK routines here, otherwise GTK resets the size hints |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1057 to its own defaults. */ |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1058 GdkGeometry size_hints; |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1059 gint hint_flags = 0; |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1060 int base_width, base_height; |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1061 int min_rows = 0, min_cols = 0; |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1062 int win_gravity = f->win_gravity; |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1063 |
107219
07507204ac6f
Move declarations before statements.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1064 /* Don't set size hints during initialization; that apparently leads |
07507204ac6f
Move declarations before statements.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1065 to a race condition. See the thread at |
07507204ac6f
Move declarations before statements.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1066 http://lists.gnu.org/archive/html/emacs-devel/2008-10/msg00033.html */ |
07507204ac6f
Move declarations before statements.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1067 if (NILP (Vafter_init_time) || !FRAME_GTK_OUTER_WIDGET (f)) |
07507204ac6f
Move declarations before statements.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1068 return; |
07507204ac6f
Move declarations before statements.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1069 |
98545
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1070 if (flags) |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1071 { |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1072 memset (&size_hints, 0, sizeof (size_hints)); |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1073 f->output_data.x->size_hints = size_hints; |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1074 f->output_data.x->hint_flags = hint_flags; |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1075 } |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1076 else |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1077 flags = f->size_hint_flags; |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1078 |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1079 size_hints = f->output_data.x->size_hints; |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1080 hint_flags = f->output_data.x->hint_flags; |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1081 |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1082 hint_flags |= GDK_HINT_RESIZE_INC | GDK_HINT_MIN_SIZE; |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1083 size_hints.width_inc = FRAME_COLUMN_WIDTH (f); |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1084 size_hints.height_inc = FRAME_LINE_HEIGHT (f); |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1085 |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1086 hint_flags |= GDK_HINT_BASE_SIZE; |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
1087 base_width = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, 0) + FRAME_TOOLBAR_WIDTH (f); |
98545
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1088 base_height = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, 0) |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1089 + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f); |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1090 |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1091 check_frame_size (f, &min_rows, &min_cols); |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1092 |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1093 size_hints.base_width = base_width; |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1094 size_hints.base_height = base_height; |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1095 size_hints.min_width = base_width + min_cols * size_hints.width_inc; |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1096 size_hints.min_height = base_height + min_rows * size_hints.height_inc; |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1097 |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1098 /* These currently have a one to one mapping with the X values, but I |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1099 don't think we should rely on that. */ |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1100 hint_flags |= GDK_HINT_WIN_GRAVITY; |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1101 size_hints.win_gravity = 0; |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1102 if (win_gravity == NorthWestGravity) |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1103 size_hints.win_gravity = GDK_GRAVITY_NORTH_WEST; |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1104 else if (win_gravity == NorthGravity) |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1105 size_hints.win_gravity = GDK_GRAVITY_NORTH; |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1106 else if (win_gravity == NorthEastGravity) |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1107 size_hints.win_gravity = GDK_GRAVITY_NORTH_EAST; |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1108 else if (win_gravity == WestGravity) |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1109 size_hints.win_gravity = GDK_GRAVITY_WEST; |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1110 else if (win_gravity == CenterGravity) |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1111 size_hints.win_gravity = GDK_GRAVITY_CENTER; |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1112 else if (win_gravity == EastGravity) |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1113 size_hints.win_gravity = GDK_GRAVITY_EAST; |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1114 else if (win_gravity == SouthWestGravity) |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1115 size_hints.win_gravity = GDK_GRAVITY_SOUTH_WEST; |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1116 else if (win_gravity == SouthGravity) |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1117 size_hints.win_gravity = GDK_GRAVITY_SOUTH; |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1118 else if (win_gravity == SouthEastGravity) |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1119 size_hints.win_gravity = GDK_GRAVITY_SOUTH_EAST; |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1120 else if (win_gravity == StaticGravity) |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1121 size_hints.win_gravity = GDK_GRAVITY_STATIC; |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1122 |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1123 if (user_position) |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1124 { |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1125 hint_flags &= ~GDK_HINT_POS; |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1126 hint_flags |= GDK_HINT_USER_POS; |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1127 } |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1128 |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1129 if (hint_flags != f->output_data.x->hint_flags |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1130 || memcmp (&size_hints, |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1131 &f->output_data.x->size_hints, |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1132 sizeof (size_hints)) != 0) |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1133 { |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1134 BLOCK_INPUT; |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1135 gtk_window_set_geometry_hints (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)), |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1136 NULL, &size_hints, hint_flags); |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1137 f->output_data.x->size_hints = size_hints; |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1138 f->output_data.x->hint_flags = hint_flags; |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1139 UNBLOCK_INPUT; |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
1140 } |
49323 | 1141 } |
1142 | |
1143 /* Change background color of a frame. | |
96363
f9d35151b907
American English spelling fix.
Glenn Morris <rgm@gnu.org>
parents:
95954
diff
changeset
|
1144 Since GTK uses the background color to clear the window, we must |
49323 | 1145 keep the GTK and X colors in sync. |
1146 F is the frame to change, | |
1147 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
|
1148 |
49323 | 1149 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1150 xg_set_background_color (FRAME_PTR f, long unsigned int bg) |
49323 | 1151 { |
1152 if (FRAME_GTK_WIDGET (f)) | |
1153 { | |
1154 GdkColor gdk_bg; | |
1155 | |
1156 BLOCK_INPUT; | |
1157 xg_pix_to_gcolor (FRAME_GTK_WIDGET (f), bg, &gdk_bg); | |
1158 gtk_widget_modify_bg (FRAME_GTK_WIDGET (f), GTK_STATE_NORMAL, &gdk_bg); | |
1159 UNBLOCK_INPUT; | |
1160 } | |
1161 } | |
1162 | |
1163 | |
65006
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1164 /* 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
|
1165 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
|
1166 |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1167 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1168 xg_set_frame_icon (FRAME_PTR f, Pixmap icon_pixmap, Pixmap icon_mask) |
65006
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1169 { |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1170 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
|
1171 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
|
1172 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
|
1173 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
|
1174 |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1175 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
|
1176 } |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1177 |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1178 |
49323 | 1179 |
1180 /*********************************************************************** | |
1181 Dialog functions | |
1182 ***********************************************************************/ | |
1183 /* Return the dialog title to use for a dialog of type KEY. | |
1184 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
|
1185 |
49323 | 1186 static char * |
1187 get_dialog_title (char key) | |
1188 { | |
1189 char *title = ""; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1190 |
49323 | 1191 switch (key) { |
1192 case 'E': case 'e': | |
1193 title = "Error"; | |
1194 break; | |
1195 | |
1196 case 'I': case 'i': | |
1197 title = "Information"; | |
1198 break; | |
1199 | |
1200 case 'L': case 'l': | |
1201 title = "Prompt"; | |
1202 break; | |
1203 | |
1204 case 'P': case 'p': | |
1205 title = "Prompt"; | |
1206 break; | |
1207 | |
1208 case 'Q': case 'q': | |
1209 title = "Question"; | |
1210 break; | |
1211 } | |
1212 | |
1213 return title; | |
1214 } | |
1215 | |
1216 /* Callback for dialogs that get WM_DELETE_WINDOW. We pop down | |
1217 the dialog, but return TRUE so the event does not propagate further | |
1218 in GTK. This prevents GTK from destroying the dialog widget automatically | |
1219 and we can always destrou the widget manually, regardles of how | |
1220 it was popped down (button press or WM_DELETE_WINDOW). | |
1221 W is the dialog widget. | |
1222 EVENT is the GdkEvent that represents WM_DELETE_WINDOW (not used). | |
1223 user_data is NULL (not used). | |
1224 | |
1225 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
|
1226 |
49323 | 1227 static gboolean |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1228 dialog_delete_callback (GtkWidget *w, GdkEvent *event, gpointer user_data) |
49323 | 1229 { |
1230 gtk_widget_unmap (w); | |
1231 return TRUE; | |
1232 } | |
1233 | |
1234 /* Create a popup dialog window. See also xg_create_widget below. | |
1235 WV is a widget_value describing the dialog. | |
1236 SELECT_CB is the callback to use when a button has been pressed. | |
1237 DEACTIVATE_CB is the callback to use when the dialog pops down. | |
1238 | |
1239 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
|
1240 |
49323 | 1241 static GtkWidget * |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
1242 create_dialog (widget_value *wv, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
1243 GCallback select_cb, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
1244 GCallback deactivate_cb) |
49323 | 1245 { |
1246 char *title = get_dialog_title (wv->name[0]); | |
1247 int total_buttons = wv->name[1] - '0'; | |
1248 int right_buttons = wv->name[4] - '0'; | |
1249 int left_buttons; | |
1250 int button_nr = 0; | |
1251 int button_spacing = 10; | |
1252 GtkWidget *wdialog = gtk_dialog_new (); | |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
1253 GtkDialog *wd = GTK_DIALOG (wdialog); |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
1254 GtkBox *cur_box = GTK_BOX (gtk_dialog_get_action_area (wd)); |
49323 | 1255 widget_value *item; |
1256 GtkWidget *wvbox; | |
1257 GtkWidget *whbox_up; | |
1258 GtkWidget *whbox_down; | |
1259 | |
1260 /* If the number of buttons is greater than 4, make two rows of buttons | |
1261 instead. This looks better. */ | |
1262 int make_two_rows = total_buttons > 4; | |
1263 | |
1264 if (right_buttons == 0) right_buttons = total_buttons/2; | |
1265 left_buttons = total_buttons - right_buttons; | |
1266 | |
1267 gtk_window_set_title (GTK_WINDOW (wdialog), title); | |
1268 gtk_widget_set_name (wdialog, "emacs-dialog"); | |
1269 | |
1270 | |
1271 if (make_two_rows) | |
1272 { | |
1273 wvbox = gtk_vbox_new (TRUE, button_spacing); | |
1274 whbox_up = gtk_hbox_new (FALSE, 0); | |
1275 whbox_down = gtk_hbox_new (FALSE, 0); | |
1276 | |
1277 gtk_box_pack_start (cur_box, wvbox, FALSE, FALSE, 0); | |
1278 gtk_box_pack_start (GTK_BOX (wvbox), whbox_up, FALSE, FALSE, 0); | |
1279 gtk_box_pack_start (GTK_BOX (wvbox), whbox_down, FALSE, FALSE, 0); | |
1280 | |
1281 cur_box = GTK_BOX (whbox_up); | |
1282 } | |
1283 | |
1284 g_signal_connect (G_OBJECT (wdialog), "delete-event", | |
1285 G_CALLBACK (dialog_delete_callback), 0); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1286 |
49323 | 1287 if (deactivate_cb) |
1288 { | |
1289 g_signal_connect (G_OBJECT (wdialog), "close", deactivate_cb, 0); | |
1290 g_signal_connect (G_OBJECT (wdialog), "response", deactivate_cb, 0); | |
1291 } | |
1292 | |
1293 for (item = wv->contents; item; item = item->next) | |
1294 { | |
1295 char *utf8_label = get_utf8_string (item->value); | |
1296 GtkWidget *w; | |
1297 GtkRequisition req; | |
1298 | |
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
|
1299 if (item->name && strcmp (item->name, "message") == 0) |
49323 | 1300 { |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
1301 GtkBox *wvbox = GTK_BOX (gtk_dialog_get_content_area (wd)); |
49323 | 1302 /* This is the text part of the dialog. */ |
1303 w = gtk_label_new (utf8_label); | |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
1304 gtk_box_pack_start (wvbox, gtk_label_new (""), FALSE, FALSE, 0); |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
1305 gtk_box_pack_start (wvbox, w, TRUE, TRUE, 0); |
49323 | 1306 gtk_misc_set_alignment (GTK_MISC (w), 0.1, 0.5); |
1307 | |
1308 /* Try to make dialog look better. Must realize first so | |
1309 the widget can calculate the size it needs. */ | |
1310 gtk_widget_realize (w); | |
1311 gtk_widget_size_request (w, &req); | |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
1312 gtk_box_set_spacing (wvbox, 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
|
1313 if (item->value && strlen (item->value) > 0) |
49323 | 1314 button_spacing = 2*req.width/strlen (item->value); |
1315 } | |
1316 else | |
1317 { | |
1318 /* 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
|
1319 w = gtk_button_new_with_label (utf8_label); |
49323 | 1320 if (! item->enabled) |
1321 gtk_widget_set_sensitive (w, FALSE); | |
1322 if (select_cb) | |
1323 g_signal_connect (G_OBJECT (w), "clicked", | |
1324 select_cb, item->call_data); | |
1325 | |
1326 gtk_box_pack_start (cur_box, w, TRUE, TRUE, button_spacing); | |
1327 if (++button_nr == left_buttons) | |
1328 { | |
1329 if (make_two_rows) | |
1330 cur_box = GTK_BOX (whbox_down); | |
1331 else | |
1332 gtk_box_pack_start (cur_box, | |
1333 gtk_label_new (""), | |
1334 TRUE, TRUE, | |
1335 button_spacing); | |
1336 } | |
1337 } | |
1338 | |
1339 if (utf8_label && utf8_label != item->value) | |
1340 g_free (utf8_label); | |
1341 } | |
1342 | |
1343 return wdialog; | |
1344 } | |
1345 | |
105936
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1346 struct xg_dialog_data |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1347 { |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1348 GMainLoop *loop; |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1349 int response; |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1350 GtkWidget *w; |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1351 guint timerid; |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1352 }; |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1353 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1354 /* Function that is called when the file or font dialogs pop down. |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1355 W is the dialog widget, RESPONSE is the response code. |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1356 USER_DATA is what we passed in to g_signal_connect. */ |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1357 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1358 static void |
109139
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1359 xg_dialog_response_cb (GtkDialog *w, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1360 gint response, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1361 gpointer user_data) |
105936
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1362 { |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1363 struct xg_dialog_data *dd = (struct xg_dialog_data *)user_data; |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1364 dd->response = response; |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1365 g_main_loop_quit (dd->loop); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1366 } |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1367 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1368 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1369 /* Destroy the dialog. This makes it pop down. */ |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1370 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1371 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1372 pop_down_dialog (Lisp_Object arg) |
105936
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1373 { |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1374 struct Lisp_Save_Value *p = XSAVE_VALUE (arg); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1375 struct xg_dialog_data *dd = (struct xg_dialog_data *) p->pointer; |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1376 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1377 BLOCK_INPUT; |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1378 if (dd->w) gtk_widget_destroy (dd->w); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1379 if (dd->timerid != 0) g_source_remove (dd->timerid); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1380 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1381 g_main_loop_quit (dd->loop); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1382 g_main_loop_unref (dd->loop); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1383 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1384 UNBLOCK_INPUT; |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1385 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1386 return Qnil; |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1387 } |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1388 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1389 /* If there are any emacs timers pending, add a timeout to main loop in DATA. |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1390 We pass in DATA as gpointer* so we can use this as a callback. */ |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1391 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1392 static gboolean |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1393 xg_maybe_add_timer (gpointer data) |
105936
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1394 { |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1395 struct xg_dialog_data *dd = (struct xg_dialog_data *) data; |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1396 EMACS_TIME next_time = timer_check (1); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1397 long secs = EMACS_SECS (next_time); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1398 long usecs = EMACS_USECS (next_time); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1399 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1400 dd->timerid = 0; |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1401 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1402 if (secs >= 0 && usecs >= 0 && secs < ((guint)-1)/1000) |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1403 { |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1404 dd->timerid = g_timeout_add (secs * 1000 + usecs/1000, |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1405 xg_maybe_add_timer, |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1406 dd); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1407 } |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1408 return FALSE; |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1409 } |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1410 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1411 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1412 /* Pops up a modal dialog W and waits for response. |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1413 We don't use gtk_dialog_run because we want to process emacs timers. |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1414 The dialog W is not destroyed when this function returns. */ |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1415 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1416 static int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1417 xg_dialog_run (FRAME_PTR f, GtkWidget *w) |
105936
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1418 { |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1419 int count = SPECPDL_INDEX (); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1420 struct xg_dialog_data dd; |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1421 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1422 xg_set_screen (w, f); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1423 gtk_window_set_transient_for (GTK_WINDOW (w), |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1424 GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f))); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1425 gtk_window_set_destroy_with_parent (GTK_WINDOW (w), TRUE); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1426 gtk_window_set_modal (GTK_WINDOW (w), TRUE); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1427 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1428 dd.loop = g_main_loop_new (NULL, FALSE); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1429 dd.response = GTK_RESPONSE_CANCEL; |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1430 dd.w = w; |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1431 dd.timerid = 0; |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1432 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1433 g_signal_connect (G_OBJECT (w), |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1434 "response", |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1435 G_CALLBACK (xg_dialog_response_cb), |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1436 &dd); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1437 /* Don't destroy the widget if closed by the window manager close button. */ |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1438 g_signal_connect (G_OBJECT (w), "delete-event", G_CALLBACK (gtk_true), NULL); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1439 gtk_widget_show (w); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1440 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1441 record_unwind_protect (pop_down_dialog, make_save_value (&dd, 0)); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1442 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1443 (void) xg_maybe_add_timer (&dd); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1444 g_main_loop_run (dd.loop); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1445 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1446 dd.w = 0; |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1447 unbind_to (count, Qnil); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1448 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1449 return dd.response; |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1450 } |
49323 | 1451 |
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
|
1452 |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1453 /*********************************************************************** |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1454 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
|
1455 ***********************************************************************/ |
67761
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1456 /* 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
|
1457 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
|
1458 |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1459 int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1460 xg_uses_old_file_dialog (void) |
67761
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1461 { |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
1462 #ifdef HAVE_GTK_FILE_SELECTION_NEW |
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
|
1463 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
|
1464 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
|
1465 #else |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1466 return 0; |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1467 #endif |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1468 } |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1469 |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1470 |
109100
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109067
diff
changeset
|
1471 typedef char * (*xg_get_file_func) (GtkWidget *); |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1472 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1473 /* 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
|
1474 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
|
1475 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1476 static char * |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1477 xg_get_file_name_from_chooser (GtkWidget *w) |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1478 { |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1479 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
|
1480 } |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1481 |
68100
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1482 /* 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
|
1483 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
|
1484 |
67843
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1485 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1486 xg_toggle_visibility_cb (GtkWidget *widget, gpointer data) |
67843
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1487 { |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1488 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
|
1489 gboolean visible; |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1490 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
|
1491 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
|
1492 } |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1493 |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1494 |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1495 /* 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
|
1496 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
|
1497 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
|
1498 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
|
1499 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
|
1500 |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1501 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1502 xg_toggle_notify_cb (GObject *gobject, GParamSpec *arg1, gpointer user_data) |
68100
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1503 { |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1504 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
|
1505 |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1506 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
|
1507 { |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1508 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
|
1509 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
|
1510 |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1511 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
|
1512 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
|
1513 |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1514 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
|
1515 { |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1516 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
|
1517 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
|
1518 gobject); |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1519 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
|
1520 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
|
1521 (G_OBJECT (wtoggle), |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1522 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
|
1523 gobject); |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1524 } |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1525 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
|
1526 } |
67843
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1527 } |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1528 |
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
|
1529 /* 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
|
1530 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
|
1531 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
|
1532 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
|
1533 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
|
1534 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
|
1535 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
|
1536 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1537 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
|
1538 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1539 static GtkWidget * |
109139
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1540 xg_get_file_with_chooser (FRAME_PTR f, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1541 char *prompt, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1542 char *default_filename, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1543 int mustmatch_p, int only_dir_p, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1544 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
|
1545 { |
67843
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1546 char message[1024]; |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1547 |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1548 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
|
1549 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
|
1550 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
|
1551 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
|
1552 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
|
1553 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
|
1554 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
|
1555 |
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
|
1556 |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1557 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
|
1558 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
|
1559 |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1560 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
|
1561 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
|
1562 (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
|
1563 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
|
1564 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
|
1565 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
|
1566 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
|
1567 |
67843
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1568 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
|
1569 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
|
1570 wtoggle = gtk_check_button_new_with_label ("Show hidden files."); |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
1571 |
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
1572 if (x_gtk_show_hidden_files) |
67843
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1573 { |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1574 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
|
1575 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
|
1576 } |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1577 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
|
1578 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
|
1579 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
|
1580 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
|
1581 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
|
1582 |
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
|
1583 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
|
1584 { |
0ee8cea94c25
* gtkutil.c (xg_get_file_with_chooser): Check
Jan Djärv <jan.h.d@swipnet.se>
parents:
72928
diff
changeset
|
1585 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
|
1586 /* 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
|
1587 Show the C-l help text only for versions < 2.10. */ |
73066 | 1588 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
|
1589 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
|
1590 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
|
1591 "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
|
1592 "use-file-dialog to turn it off."); |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
1593 |
72931
0ee8cea94c25
* gtkutil.c (xg_get_file_with_chooser): Check
Jan Djärv <jan.h.d@swipnet.se>
parents:
72928
diff
changeset
|
1594 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
|
1595 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
|
1596 } |
0ee8cea94c25
* gtkutil.c (xg_get_file_with_chooser): Check
Jan Djärv <jan.h.d@swipnet.se>
parents:
72928
diff
changeset
|
1597 |
67843
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1598 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
|
1599 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
|
1600 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
|
1601 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
|
1602 |
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
|
1603 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
|
1604 { |
a3fa0e63dd67
* gtkutil.c (xg_get_file_with_chooser): Expand DEFAULT_FILENAME if
Jan Djärv <jan.h.d@swipnet.se>
parents:
57900
diff
changeset
|
1605 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
|
1606 struct gcpro gcpro1; |
78781
415fda17ec8f
(xg_get_file_with_chooser): Move GCPRO1 after declarations
Jan Djärv <jan.h.d@swipnet.se>
parents:
78762
diff
changeset
|
1607 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
|
1608 GCPRO1 (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
|
1609 |
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
|
1610 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
|
1611 |
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
|
1612 /* 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
|
1613 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
|
1614 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
|
1615 file = Fexpand_file_name (file, Qnil); |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
1616 |
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
|
1617 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
|
1618 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
|
1619 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
|
1620 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
|
1621 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
|
1622 { |
af91ff74c754
* gtkutil.c (xg_get_file_with_chooser): Change file chooser message
Jan Djärv <jan.h.d@swipnet.se>
parents:
71160
diff
changeset
|
1623 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
|
1624 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
|
1625 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
|
1626 { |
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
|
1627 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
|
1628 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
|
1629 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
|
1630 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
|
1631 } |
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
|
1632 } |
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
|
1633 |
a3fa0e63dd67
* gtkutil.c (xg_get_file_with_chooser): Expand DEFAULT_FILENAME if
Jan Djärv <jan.h.d@swipnet.se>
parents:
57900
diff
changeset
|
1634 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
|
1635 } |
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
|
1636 |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1637 *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
|
1638 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
|
1639 } |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1640 |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1641 #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
|
1642 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1643 /* 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
|
1644 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
|
1645 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1646 static char * |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1647 xg_get_file_name_from_selector (GtkWidget *w) |
49323 | 1648 { |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1649 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
|
1650 return xstrdup ((char*) gtk_file_selection_get_filename (filesel)); |
49323 | 1651 } |
1652 | |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1653 /* Create a file selection dialog. |
49323 | 1654 F is the current frame. |
1655 PROMPT is a prompt to show to the user. May not be NULL. | |
1656 DEFAULT_FILENAME is a default selection to be displayed. May be NULL. | |
1657 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
|
1658 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
|
1659 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
|
1660 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1661 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
|
1662 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1663 static GtkWidget * |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
1664 xg_get_file_with_selection (FRAME_PTR f, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
1665 char *prompt, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
1666 char *default_filename, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
1667 int mustmatch_p, int only_dir_p, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
1668 xg_get_file_func *func) |
49323 | 1669 { |
1670 GtkWidget *filewin; | |
1671 GtkFileSelection *filesel; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1672 |
49323 | 1673 filewin = gtk_file_selection_new (prompt); |
1674 filesel = GTK_FILE_SELECTION (filewin); | |
1675 | |
1676 if (default_filename) | |
1677 gtk_file_selection_set_filename (filesel, default_filename); | |
1678 | |
1679 if (mustmatch_p) | |
1680 { | |
1681 /* The selection_entry part of filesel is not documented. */ | |
1682 gtk_widget_set_sensitive (filesel->selection_entry, FALSE); | |
1683 gtk_file_selection_hide_fileop_buttons (filesel); | |
1684 } | |
1685 | |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1686 *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
|
1687 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1688 return filewin; |
49323 | 1689 } |
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
|
1690 #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
|
1691 |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1692 /* 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
|
1693 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
|
1694 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
|
1695 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
|
1696 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
|
1697 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
|
1698 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
|
1699 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
|
1700 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
|
1701 |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1702 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
|
1703 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
|
1704 |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1705 char * |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
1706 xg_get_file_name (FRAME_PTR f, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
1707 char *prompt, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
1708 char *default_filename, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
1709 int mustmatch_p, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
1710 int only_dir_p) |
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
|
1711 { |
58284
10efc827e15c
* gtkutil.c (xg_get_file_name): Fix typo in
Jan Djärv <jan.h.d@swipnet.se>
parents:
58201
diff
changeset
|
1712 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
|
1713 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
|
1714 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
|
1715 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
|
1716 |
58818
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
1717 #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
|
1718 /* 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
|
1719 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
|
1720 threads. */ |
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
1721 sigblock (sigmask (__SIGRTMIN)); |
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
1722 #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
|
1723 |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
1724 #ifdef HAVE_GTK_FILE_SELECTION_NEW |
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
|
1725 |
67761
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1726 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
|
1727 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
|
1728 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
|
1729 else |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1730 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
|
1731 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
|
1732 |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
1733 #else /* not 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
|
1734 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
|
1735 mustmatch_p, only_dir_p, &func); |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
1736 #endif /* not 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
|
1737 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1738 gtk_widget_set_name (w, "emacs-filedialog"); |
105936
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1739 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1740 filesel_done = xg_dialog_run (f, w); |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1741 |
58818
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
1742 #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
|
1743 sigunblock (sigmask (__SIGRTMIN)); |
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
1744 #endif |
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
1745 |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1746 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
|
1747 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
|
1748 |
105936
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1749 gtk_widget_destroy (w); |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1750 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
|
1751 } |
49323 | 1752 |
95794
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1753 #ifdef HAVE_FREETYPE |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1754 /* Pop up a GTK font selector and return the name of the font the user |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1755 selects, as a C string. The returned font name follows GTK's own |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1756 format: |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1757 |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1758 `FAMILY [VALUE1 VALUE2] SIZE' |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1759 |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1760 This can be parsed using font_parse_fcname in font.c. |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1761 DEFAULT_NAME, if non-zero, is the default font name. */ |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1762 |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1763 char * |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1764 xg_get_font_name (FRAME_PTR f, char *default_name) |
95794
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1765 { |
105936
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1766 GtkWidget *w; |
95794
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1767 char *fontname = NULL; |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1768 int done = 0; |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1769 |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1770 #if defined (HAVE_GTK_AND_PTHREAD) && defined (__SIGRTMIN) |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1771 sigblock (sigmask (__SIGRTMIN)); |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1772 #endif /* HAVE_GTK_AND_PTHREAD */ |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1773 |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1774 w = gtk_font_selection_dialog_new ("Pick a font"); |
105693
964ff7cbc8a6
Fix resize due to font change on a maximized/xmonad-controlled frame.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105669
diff
changeset
|
1775 if (!default_name) |
964ff7cbc8a6
Fix resize due to font change on a maximized/xmonad-controlled frame.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105669
diff
changeset
|
1776 default_name = "Monospace 10"; |
964ff7cbc8a6
Fix resize due to font change on a maximized/xmonad-controlled frame.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105669
diff
changeset
|
1777 gtk_font_selection_dialog_set_font_name (GTK_FONT_SELECTION_DIALOG (w), |
964ff7cbc8a6
Fix resize due to font change on a maximized/xmonad-controlled frame.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105669
diff
changeset
|
1778 default_name); |
95794
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1779 |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1780 gtk_widget_set_name (w, "emacs-fontdialog"); |
105936
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1781 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1782 done = xg_dialog_run (f, w); |
95794
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1783 |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1784 #if defined (HAVE_GTK_AND_PTHREAD) && defined (__SIGRTMIN) |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1785 sigunblock (sigmask (__SIGRTMIN)); |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1786 #endif |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1787 |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1788 if (done == GTK_RESPONSE_OK) |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1789 fontname = gtk_font_selection_dialog_get_font_name |
105936
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1790 (GTK_FONT_SELECTION_DIALOG (w)); |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1791 |
45191c90be7e
Bug #4574. Common code for file/font dialog. Handle timers with glib-timers.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105880
diff
changeset
|
1792 gtk_widget_destroy (w); |
95794
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1793 return fontname; |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1794 } |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1795 #endif /* HAVE_FREETYPE */ |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1796 |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1797 |
49323 | 1798 |
1799 /*********************************************************************** | |
1800 Menu functions. | |
1801 ***********************************************************************/ | |
1802 | |
96971
8a07ea5be91d
(xg_get_font_name): Cast w to GTK_FONT_SELECTION_DIALOG.
Jan Djärv <jan.h.d@swipnet.se>
parents:
96774
diff
changeset
|
1803 /* The name of menu items that can be used for customization. Since GTK |
49323 | 1804 RC files are very crude and primitive, we have to set this on all |
96971
8a07ea5be91d
(xg_get_font_name): Cast w to GTK_FONT_SELECTION_DIALOG.
Jan Djärv <jan.h.d@swipnet.se>
parents:
96774
diff
changeset
|
1805 menu item names so a user can easily customize menu items. */ |
49323 | 1806 |
1807 #define MENU_ITEM_NAME "emacs-menuitem" | |
1808 | |
1809 | |
1810 /* Linked list of all allocated struct xg_menu_cb_data. Used for marking | |
1811 during GC. The next member points to the items. */ | |
1812 static xg_list_node xg_menu_cb_list; | |
1813 | |
1814 /* Linked list of all allocated struct xg_menu_item_cb_data. Used for marking | |
1815 during GC. The next member points to the items. */ | |
1816 static xg_list_node xg_menu_item_cb_list; | |
1817 | |
1818 /* Allocate and initialize CL_DATA if NULL, otherwise increase ref_count. | |
1819 F is the frame CL_DATA will be initialized for. | |
1820 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. | |
1821 | |
1822 The menu bar and all sub menus under the menu bar in a frame | |
1823 share the same structure, hence the reference count. | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1824 |
49323 | 1825 Returns CL_DATA if CL_DATA is not NULL, or a pointer to a newly |
1826 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
|
1827 |
49323 | 1828 static xg_menu_cb_data * |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1829 make_cl_data (xg_menu_cb_data *cl_data, FRAME_PTR f, GCallback highlight_cb) |
49323 | 1830 { |
1831 if (! cl_data) | |
1832 { | |
1833 cl_data = (xg_menu_cb_data*) xmalloc (sizeof (*cl_data)); | |
1834 cl_data->f = f; | |
1835 cl_data->menu_bar_vector = f->menu_bar_vector; | |
1836 cl_data->menu_bar_items_used = f->menu_bar_items_used; | |
1837 cl_data->highlight_cb = highlight_cb; | |
1838 cl_data->ref_count = 0; | |
1839 | |
1840 xg_list_insert (&xg_menu_cb_list, &cl_data->ptrs); | |
1841 } | |
1842 | |
1843 cl_data->ref_count++; | |
1844 | |
1845 return cl_data; | |
1846 } | |
1847 | |
1848 /* Update CL_DATA with values from frame F and with HIGHLIGHT_CB. | |
1849 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. | |
1850 | |
1851 When the menu bar is updated, menu items may have been added and/or | |
1852 removed, so menu_bar_vector and menu_bar_items_used change. We must | |
1853 then update CL_DATA since it is used to determine which menu | |
1854 item that is invoked in the menu. | |
1855 HIGHLIGHT_CB could change, there is no check that the same | |
1856 function is given when modifying a menu bar as was given when | |
1857 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
|
1858 |
49323 | 1859 static void |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
1860 update_cl_data (xg_menu_cb_data *cl_data, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
1861 FRAME_PTR f, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
1862 GCallback highlight_cb) |
49323 | 1863 { |
1864 if (cl_data) | |
1865 { | |
1866 cl_data->f = f; | |
1867 cl_data->menu_bar_vector = f->menu_bar_vector; | |
1868 cl_data->menu_bar_items_used = f->menu_bar_items_used; | |
1869 cl_data->highlight_cb = highlight_cb; | |
1870 } | |
1871 } | |
1872 | |
1873 /* Decrease reference count for CL_DATA. | |
1874 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
|
1875 |
49323 | 1876 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1877 unref_cl_data (xg_menu_cb_data *cl_data) |
49323 | 1878 { |
1879 if (cl_data && cl_data->ref_count > 0) | |
1880 { | |
1881 cl_data->ref_count--; | |
1882 if (cl_data->ref_count == 0) | |
1883 { | |
1884 xg_list_remove (&xg_menu_cb_list, &cl_data->ptrs); | |
1885 xfree (cl_data); | |
1886 } | |
1887 } | |
1888 } | |
1889 | |
1890 /* 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
|
1891 |
49323 | 1892 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1893 xg_mark_data (void) |
49323 | 1894 { |
1895 xg_list_node *iter; | |
1896 | |
1897 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
|
1898 mark_object (((xg_menu_cb_data *) iter)->menu_bar_vector); |
49323 | 1899 |
1900 for (iter = xg_menu_item_cb_list.next; iter; iter = iter->next) | |
1901 { | |
1902 xg_menu_item_cb_data *cb_data = (xg_menu_item_cb_data *) iter; | |
1903 | |
1904 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
|
1905 mark_object (cb_data->help); |
49323 | 1906 } |
1907 } | |
1908 | |
1909 | |
1910 /* Callback called when a menu item is destroyed. Used to free data. | |
1911 W is the widget that is being destroyed (not used). | |
1912 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
|
1913 |
49323 | 1914 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1915 menuitem_destroy_callback (GtkWidget *w, gpointer client_data) |
49323 | 1916 { |
1917 if (client_data) | |
1918 { | |
1919 xg_menu_item_cb_data *data = (xg_menu_item_cb_data*) client_data; | |
1920 xg_list_remove (&xg_menu_item_cb_list, &data->ptrs); | |
1921 xfree (data); | |
1922 } | |
1923 } | |
1924 | |
1925 /* Callback called when the pointer enters/leaves a menu item. | |
75040
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
1926 W is the parent of the menu item. |
49323 | 1927 EVENT is either an enter event or leave event. |
75040
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
1928 CLIENT_DATA is not used. |
49323 | 1929 |
1930 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
|
1931 |
49323 | 1932 static gboolean |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
1933 menuitem_highlight_callback (GtkWidget *w, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
1934 GdkEventCrossing *event, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
1935 gpointer client_data) |
49323 | 1936 { |
75040
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
1937 GdkEvent ev; |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
1938 GtkWidget *subwidget; |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
1939 xg_menu_item_cb_data *data; |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
1940 |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
1941 ev.crossing = *event; |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
1942 subwidget = gtk_get_event_widget (&ev); |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
1943 data = (xg_menu_item_cb_data *) g_object_get_data (G_OBJECT (subwidget), |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
1944 XG_ITEM_DATA); |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
1945 if (data) |
49323 | 1946 { |
1947 if (! NILP (data->help) && data->cl_data->highlight_cb) | |
1948 { | |
75040
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
1949 gpointer call_data = event->type == GDK_LEAVE_NOTIFY ? 0 : data; |
49323 | 1950 GtkCallback func = (GtkCallback) data->cl_data->highlight_cb; |
75040
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
1951 (*func) (subwidget, call_data); |
49323 | 1952 } |
1953 } | |
1954 | |
1955 return FALSE; | |
1956 } | |
1957 | |
1958 /* Callback called when a menu is destroyed. Used to free data. | |
1959 W is the widget that is being destroyed (not used). | |
1960 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
|
1961 |
49323 | 1962 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1963 menu_destroy_callback (GtkWidget *w, gpointer client_data) |
49323 | 1964 { |
1965 unref_cl_data ((xg_menu_cb_data*) client_data); | |
1966 } | |
1967 | |
1968 /* Make a GTK widget that contains both UTF8_LABEL and UTF8_KEY (both | |
1969 must be non-NULL) and can be inserted into a menu item. | |
1970 | |
1971 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
|
1972 |
49323 | 1973 static GtkWidget * |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1974 make_widget_for_menu_item (char *utf8_label, char *utf8_key) |
49323 | 1975 { |
1976 GtkWidget *wlbl; | |
1977 GtkWidget *wkey; | |
1978 GtkWidget *wbox; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1979 |
49323 | 1980 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
|
1981 wlbl = gtk_label_new (utf8_label); |
49323 | 1982 wkey = gtk_label_new (utf8_key); |
1983 | |
1984 gtk_misc_set_alignment (GTK_MISC (wlbl), 0.0, 0.5); | |
1985 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
|
1986 |
49323 | 1987 gtk_box_pack_start (GTK_BOX (wbox), wlbl, TRUE, TRUE, 0); |
1988 gtk_box_pack_start (GTK_BOX (wbox), wkey, FALSE, FALSE, 0); | |
1989 | |
1990 gtk_widget_set_name (wlbl, MENU_ITEM_NAME); | |
1991 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
|
1992 gtk_widget_set_name (wbox, MENU_ITEM_NAME); |
49323 | 1993 |
1994 return wbox; | |
1995 } | |
1996 | |
1997 /* Make and return a menu item widget with the key to the right. | |
1998 UTF8_LABEL is the text for the menu item (GTK uses UTF8 internally). | |
1999 UTF8_KEY is the text representing the key binding. | |
2000 ITEM is the widget_value describing the menu item. | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2001 |
49323 | 2002 GROUP is an in/out parameter. If the menu item to be created is not |
2003 part of any radio menu group, *GROUP contains NULL on entry and exit. | |
2004 If the menu item to be created is part of a radio menu group, on entry | |
2005 *GROUP contains the group to use, or NULL if this is the first item | |
2006 in the group. On exit, *GROUP contains the radio item group. | |
2007 | |
2008 Unfortunately, keys don't line up as nicely as in Motif, | |
2009 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
|
2010 |
49323 | 2011 static GtkWidget * |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2012 make_menu_item (char *utf8_label, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2013 char *utf8_key, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2014 widget_value *item, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2015 GSList **group) |
49323 | 2016 { |
2017 GtkWidget *w; | |
2018 GtkWidget *wtoadd = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2019 |
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
|
2020 /* 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
|
2021 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
|
2022 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
|
2023 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
|
2024 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
|
2025 |
49323 | 2026 if (utf8_key) |
2027 wtoadd = make_widget_for_menu_item (utf8_label, utf8_key); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2028 |
49323 | 2029 if (item->button_type == BUTTON_TYPE_TOGGLE) |
2030 { | |
2031 *group = NULL; | |
2032 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
|
2033 else w = gtk_check_menu_item_new_with_label (utf8_label); |
49323 | 2034 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (w), item->selected); |
2035 } | |
2036 else if (item->button_type == BUTTON_TYPE_RADIO) | |
2037 { | |
2038 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
|
2039 else w = gtk_radio_menu_item_new_with_label (*group, utf8_label); |
49323 | 2040 *group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (w)); |
2041 if (item->selected) | |
2042 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (w), TRUE); | |
2043 } | |
2044 else | |
2045 { | |
2046 *group = NULL; | |
2047 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
|
2048 else w = gtk_menu_item_new_with_label (utf8_label); |
49323 | 2049 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2050 |
49323 | 2051 if (wtoadd) gtk_container_add (GTK_CONTAINER (w), wtoadd); |
2052 if (! item->enabled) gtk_widget_set_sensitive (w, FALSE); | |
2053 | |
2054 return w; | |
2055 } | |
2056 | |
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
|
2057 /* Return non-zero if LABEL specifies a separator (GTK only has one |
49323 | 2058 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
|
2059 |
105959
ba3ffbd9c422
* process.c (ifflag_def): Make flag_sym constant.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105936
diff
changeset
|
2060 static const char* separator_names[] = { |
78787
96a27ec4e6c5
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
78781
diff
changeset
|
2061 "space", |
96a27ec4e6c5
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
78781
diff
changeset
|
2062 "no-line", |
96a27ec4e6c5
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
78781
diff
changeset
|
2063 "single-line", |
96a27ec4e6c5
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
78781
diff
changeset
|
2064 "double-line", |
96a27ec4e6c5
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
78781
diff
changeset
|
2065 "single-dashed-line", |
96a27ec4e6c5
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
78781
diff
changeset
|
2066 "double-dashed-line", |
96a27ec4e6c5
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
78781
diff
changeset
|
2067 "shadow-etched-in", |
96a27ec4e6c5
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
78781
diff
changeset
|
2068 "shadow-etched-out", |
96a27ec4e6c5
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
78781
diff
changeset
|
2069 "shadow-etched-in-dash", |
96a27ec4e6c5
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
78781
diff
changeset
|
2070 "shadow-etched-out-dash", |
96a27ec4e6c5
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
78781
diff
changeset
|
2071 "shadow-double-etched-in", |
96a27ec4e6c5
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
78781
diff
changeset
|
2072 "shadow-double-etched-out", |
96a27ec4e6c5
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
78781
diff
changeset
|
2073 "shadow-double-etched-in-dash", |
96a27ec4e6c5
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
78781
diff
changeset
|
2074 "shadow-double-etched-out-dash", |
96a27ec4e6c5
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
78781
diff
changeset
|
2075 0, |
96a27ec4e6c5
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
78781
diff
changeset
|
2076 }; |
96a27ec4e6c5
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
78781
diff
changeset
|
2077 |
49323 | 2078 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
|
2079 xg_separator_p (char *label) |
49323 | 2080 { |
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
|
2081 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
|
2082 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
|
2083 && 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
|
2084 && 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
|
2085 { |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
2086 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
|
2087 |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
2088 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
|
2089 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
|
2090 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
|
2091 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
|
2092 } |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
2093 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
|
2094 { |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
2095 /* 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
|
2096 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
|
2097 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
|
2098 ++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
|
2099 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
|
2100 } |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
2101 |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
2102 return 0; |
49323 | 2103 } |
2104 | |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2105 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
|
2106 |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2107 /* 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
|
2108 |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2109 int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2110 xg_have_tear_offs (void) |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2111 { |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2112 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
|
2113 } |
49323 | 2114 |
2115 /* 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
|
2116 decrease the xg_detached_menus count. |
49323 | 2117 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
|
2118 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
|
2119 |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2120 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2121 tearoff_remove (GtkWidget *widget, gpointer client_data) |
49323 | 2122 { |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2123 if (xg_detached_menus > 0) --xg_detached_menus; |
49323 | 2124 } |
2125 | |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2126 /* 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
|
2127 xg_detached_menus count. |
49323 | 2128 WIDGET is the GtkTearoffMenuItem. |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2129 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
|
2130 |
49323 | 2131 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2132 tearoff_activate (GtkWidget *widget, gpointer client_data) |
49323 | 2133 { |
2134 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
|
2135 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
|
2136 { |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2137 ++xg_detached_menus; |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2138 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
|
2139 "destroy", |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2140 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
|
2141 } |
49323 | 2142 } |
2143 | |
2144 | |
2145 /* Create a menu item widget, and connect the callbacks. | |
2146 ITEM decribes the menu item. | |
2147 F is the frame the created menu belongs to. | |
2148 SELECT_CB is the callback to use when a menu item is selected. | |
2149 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. | |
2150 CL_DATA points to the callback data to be used for this menu. | |
2151 GROUP is an in/out parameter. If the menu item to be created is not | |
2152 part of any radio menu group, *GROUP contains NULL on entry and exit. | |
2153 If the menu item to be created is part of a radio menu group, on entry | |
2154 *GROUP contains the group to use, or NULL if this is the first item | |
2155 in the group. On exit, *GROUP contains the radio item group. | |
2156 | |
2157 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
|
2158 |
49323 | 2159 static GtkWidget * |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2160 xg_create_one_menuitem (widget_value *item, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2161 FRAME_PTR f, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2162 GCallback select_cb, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2163 GCallback highlight_cb, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2164 xg_menu_cb_data *cl_data, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2165 GSList **group) |
49323 | 2166 { |
2167 char *utf8_label; | |
2168 char *utf8_key; | |
2169 GtkWidget *w; | |
2170 xg_menu_item_cb_data *cb_data; | |
2171 | |
2172 utf8_label = get_utf8_string (item->name); | |
2173 utf8_key = get_utf8_string (item->key); | |
2174 | |
2175 w = make_menu_item (utf8_label, utf8_key, item, group); | |
2176 | |
2177 if (utf8_label && utf8_label != item->name) g_free (utf8_label); | |
2178 if (utf8_key && utf8_key != item->key) g_free (utf8_key); | |
2179 | |
2180 cb_data = xmalloc (sizeof (xg_menu_item_cb_data)); | |
2181 | |
2182 xg_list_insert (&xg_menu_item_cb_list, &cb_data->ptrs); | |
2183 | |
75040
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
2184 cb_data->select_id = 0; |
49323 | 2185 cb_data->help = item->help; |
2186 cb_data->cl_data = cl_data; | |
2187 cb_data->call_data = item->call_data; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2188 |
49323 | 2189 g_signal_connect (G_OBJECT (w), |
2190 "destroy", | |
2191 G_CALLBACK (menuitem_destroy_callback), | |
2192 cb_data); | |
2193 | |
2194 /* Put cb_data in widget, so we can get at it when modifying menubar */ | |
2195 g_object_set_data (G_OBJECT (w), XG_ITEM_DATA, cb_data); | |
2196 | |
2197 /* final item, not a submenu */ | |
2198 if (item->call_data && ! item->contents) | |
2199 { | |
2200 if (select_cb) | |
2201 cb_data->select_id | |
2202 = g_signal_connect (G_OBJECT (w), "activate", select_cb, cb_data); | |
2203 } | |
2204 | |
2205 return w; | |
2206 } | |
2207 | |
2208 /* Create a full menu tree specified by DATA. | |
2209 F is the frame the created menu belongs to. | |
2210 SELECT_CB is the callback to use when a menu item is selected. | |
2211 DEACTIVATE_CB is the callback to use when a sub menu is not shown anymore. | |
2212 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. | |
2213 POP_UP_P is non-zero if we shall create a popup menu. | |
2214 MENU_BAR_P is non-zero if we shall create a menu bar. | |
2215 ADD_TEAROFF_P is non-zero if we shall add a teroff menu item. Ignored | |
2216 if MENU_BAR_P is non-zero. | |
2217 TOPMENU is the topmost GtkWidget that others shall be placed under. | |
2218 It may be NULL, in that case we create the appropriate widget | |
2219 (menu bar or menu item depending on POP_UP_P and MENU_BAR_P) | |
2220 CL_DATA is the callback data we shall use for this menu, or NULL | |
2221 if we haven't set the first callback yet. | |
2222 NAME is the name to give to the top level menu if this function | |
2223 creates it. May be NULL to not set any name. | |
2224 | |
2225 Returns the top level GtkWidget. This is TOPLEVEL if TOPLEVEL is | |
2226 not NULL. | |
2227 | |
2228 This function calls itself to create submenus. */ | |
2229 | |
2230 static GtkWidget * | |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2231 create_menus (widget_value *data, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2232 FRAME_PTR f, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2233 GCallback select_cb, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2234 GCallback deactivate_cb, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2235 GCallback highlight_cb, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2236 int pop_up_p, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2237 int menu_bar_p, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2238 int add_tearoff_p, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2239 GtkWidget *topmenu, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2240 xg_menu_cb_data *cl_data, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2241 char *name) |
49323 | 2242 { |
2243 widget_value *item; | |
2244 GtkWidget *wmenu = topmenu; | |
2245 GSList *group = NULL; | |
2246 | |
2247 if (! topmenu) | |
2248 { | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2249 if (! menu_bar_p) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2250 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2251 wmenu = gtk_menu_new (); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2252 xg_set_screen (wmenu, f); |
75040
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
2253 /* Connect this to the menu instead of items so we get enter/leave for |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
2254 disabled items also. TODO: Still does not get enter/leave for |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
2255 disabled items in detached menus. */ |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
2256 g_signal_connect (G_OBJECT (wmenu), |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
2257 "enter-notify-event", |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
2258 G_CALLBACK (menuitem_highlight_callback), |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
2259 NULL); |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
2260 g_signal_connect (G_OBJECT (wmenu), |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
2261 "leave-notify-event", |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
2262 G_CALLBACK (menuitem_highlight_callback), |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
2263 NULL); |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2264 } |
105522
695dbf5b3bb9
gtkutil.c (create_menus): Call gtk_widget_set_size_request for
Jan Djärv <jan.h.d@swipnet.se>
parents:
103916
diff
changeset
|
2265 else |
695dbf5b3bb9
gtkutil.c (create_menus): Call gtk_widget_set_size_request for
Jan Djärv <jan.h.d@swipnet.se>
parents:
103916
diff
changeset
|
2266 { |
695dbf5b3bb9
gtkutil.c (create_menus): Call gtk_widget_set_size_request for
Jan Djärv <jan.h.d@swipnet.se>
parents:
103916
diff
changeset
|
2267 wmenu = gtk_menu_bar_new (); |
106186
9b6f45dd8386
Use a select wrapper around the GLib event loop, thus taking into account GLib
Jan Djärv <jan.h.d@swipnet.se>
parents:
106161
diff
changeset
|
2268 /* Set width of menu bar to a small value so it doesn't enlarge |
9b6f45dd8386
Use a select wrapper around the GLib event loop, thus taking into account GLib
Jan Djärv <jan.h.d@swipnet.se>
parents:
106161
diff
changeset
|
2269 a small initial frame size. The width will be set to the |
9b6f45dd8386
Use a select wrapper around the GLib event loop, thus taking into account GLib
Jan Djärv <jan.h.d@swipnet.se>
parents:
106161
diff
changeset
|
2270 width of the frame later on when it is added to a container. |
9b6f45dd8386
Use a select wrapper around the GLib event loop, thus taking into account GLib
Jan Djärv <jan.h.d@swipnet.se>
parents:
106161
diff
changeset
|
2271 height -1: Natural height. */ |
105522
695dbf5b3bb9
gtkutil.c (create_menus): Call gtk_widget_set_size_request for
Jan Djärv <jan.h.d@swipnet.se>
parents:
103916
diff
changeset
|
2272 gtk_widget_set_size_request (wmenu, 1, -1); |
695dbf5b3bb9
gtkutil.c (create_menus): Call gtk_widget_set_size_request for
Jan Djärv <jan.h.d@swipnet.se>
parents:
103916
diff
changeset
|
2273 } |
49323 | 2274 |
2275 /* Put cl_data on the top menu for easier access. */ | |
2276 cl_data = make_cl_data (cl_data, f, highlight_cb); | |
2277 g_object_set_data (G_OBJECT (wmenu), XG_FRAME_DATA, (gpointer)cl_data); | |
2278 g_signal_connect (G_OBJECT (wmenu), "destroy", | |
2279 G_CALLBACK (menu_destroy_callback), cl_data); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2280 |
49323 | 2281 if (name) |
2282 gtk_widget_set_name (wmenu, name); | |
2283 | |
2284 if (deactivate_cb) | |
2285 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
|
2286 "selection-done", deactivate_cb, 0); |
49323 | 2287 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2288 |
49323 | 2289 if (! menu_bar_p && add_tearoff_p) |
2290 { | |
2291 GtkWidget *tearoff = gtk_tearoff_menu_item_new (); | |
2292 gtk_menu_shell_append (GTK_MENU_SHELL (wmenu), tearoff); | |
2293 | |
2294 g_signal_connect (G_OBJECT (tearoff), "activate", | |
2295 G_CALLBACK (tearoff_activate), 0); | |
2296 } | |
2297 | |
2298 for (item = data; item; item = item->next) | |
2299 { | |
2300 GtkWidget *w; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2301 |
49323 | 2302 if (pop_up_p && !item->contents && !item->call_data |
2303 && !xg_separator_p (item->name)) | |
2304 { | |
2305 char *utf8_label; | |
2306 /* A title for a popup. We do the same as GTK does when | |
2307 creating titles, but it does not look good. */ | |
2308 group = NULL; | |
2309 utf8_label = get_utf8_string (item->name); | |
2310 | |
2311 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
|
2312 w = gtk_menu_item_new_with_label (utf8_label); |
49323 | 2313 gtk_widget_set_sensitive (w, FALSE); |
2314 if (utf8_label && utf8_label != item->name) g_free (utf8_label); | |
2315 } | |
2316 else if (xg_separator_p (item->name)) | |
2317 { | |
2318 group = NULL; | |
2319 /* GTK only have one separator type. */ | |
2320 w = gtk_separator_menu_item_new (); | |
2321 } | |
2322 else | |
2323 { | |
2324 w = xg_create_one_menuitem (item, | |
2325 f, | |
2326 item->contents ? 0 : select_cb, | |
2327 highlight_cb, | |
2328 cl_data, | |
2329 &group); | |
2330 | |
77511
1962a74982ce
(xg_update_menubar, create_menus): Create empty
Jan Djärv <jan.h.d@swipnet.se>
parents:
76906
diff
changeset
|
2331 /* Create a possibly empty submenu for menu bar items, since some |
1962a74982ce
(xg_update_menubar, create_menus): Create empty
Jan Djärv <jan.h.d@swipnet.se>
parents:
76906
diff
changeset
|
2332 themes don't highlight items correctly without it. */ |
1962a74982ce
(xg_update_menubar, create_menus): Create empty
Jan Djärv <jan.h.d@swipnet.se>
parents:
76906
diff
changeset
|
2333 if (item->contents || menu_bar_p) |
49323 | 2334 { |
2335 GtkWidget *submenu = create_menus (item->contents, | |
2336 f, | |
2337 select_cb, | |
2338 deactivate_cb, | |
2339 highlight_cb, | |
2340 0, | |
2341 0, | |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2342 add_tearoff_p, |
49323 | 2343 0, |
2344 cl_data, | |
2345 0); | |
2346 gtk_menu_item_set_submenu (GTK_MENU_ITEM (w), submenu); | |
2347 } | |
2348 } | |
2349 | |
2350 gtk_menu_shell_append (GTK_MENU_SHELL (wmenu), w); | |
2351 gtk_widget_set_name (w, MENU_ITEM_NAME); | |
2352 } | |
2353 | |
2354 return wmenu; | |
2355 } | |
2356 | |
2357 /* Create a menubar, popup menu or dialog, depending on the TYPE argument. | |
2358 TYPE can be "menubar", "popup" for popup menu, or "dialog" for a dialog | |
2359 with some text and buttons. | |
2360 F is the frame the created item belongs to. | |
2361 NAME is the name to use for the top widget. | |
2362 VAL is a widget_value structure describing items to be created. | |
2363 SELECT_CB is the callback to use when a menu item is selected or | |
2364 a dialog button is pressed. | |
2365 DEACTIVATE_CB is the callback to use when an item is deactivated. | |
2366 For a menu, when a sub menu is not shown anymore, for a dialog it is | |
2367 called when the dialog is popped down. | |
2368 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. | |
2369 | |
2370 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
|
2371 |
49323 | 2372 GtkWidget * |
109364
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109141
diff
changeset
|
2373 xg_create_widget (char *type, char *name, FRAME_PTR f, widget_value *val, |
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109141
diff
changeset
|
2374 GCallback select_cb, GCallback deactivate_cb, |
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109141
diff
changeset
|
2375 GCallback highlight_cb) |
49323 | 2376 { |
2377 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
|
2378 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
|
2379 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
|
2380 |
49323 | 2381 if (strcmp (type, "dialog") == 0) |
2382 { | |
2383 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
|
2384 xg_set_screen (w, f); |
49323 | 2385 gtk_window_set_transient_for (GTK_WINDOW (w), |
2386 GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f))); | |
2387 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
|
2388 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
|
2389 gtk_window_set_modal (GTK_WINDOW (w), TRUE); |
49323 | 2390 } |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2391 else if (menu_bar_p || pop_up_p) |
49323 | 2392 { |
2393 w = create_menus (val->contents, | |
2394 f, | |
2395 select_cb, | |
2396 deactivate_cb, | |
2397 highlight_cb, | |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2398 pop_up_p, |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2399 menu_bar_p, |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2400 menu_bar_p, |
49323 | 2401 0, |
2402 0, | |
2403 name); | |
2404 | |
2405 /* Set the cursor to an arrow for popup menus when they are mapped. | |
2406 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
|
2407 if (pop_up_p) |
49323 | 2408 { |
2409 /* Must realize so the GdkWindow inside the widget is created. */ | |
2410 gtk_widget_realize (w); | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2411 xg_set_cursor (w, FRAME_X_DISPLAY_INFO (f)->xg_cursor); |
49323 | 2412 } |
2413 } | |
2414 else | |
2415 { | |
2416 fprintf (stderr, "bad type in xg_create_widget: %s, doing nothing\n", | |
2417 type); | |
2418 } | |
2419 | |
2420 return w; | |
2421 } | |
2422 | |
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
|
2423 /* 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
|
2424 |
49323 | 2425 static const char * |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2426 xg_get_menu_item_label (GtkMenuItem *witem) |
49323 | 2427 { |
2428 GtkLabel *wlabel = GTK_LABEL (gtk_bin_get_child (GTK_BIN (witem))); | |
2429 return gtk_label_get_label (wlabel); | |
2430 } | |
2431 | |
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
|
2432 /* 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
|
2433 |
49323 | 2434 static int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2435 xg_item_label_same_p (GtkMenuItem *witem, char *label) |
49323 | 2436 { |
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
|
2437 int is_same = 0; |
49323 | 2438 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
|
2439 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
|
2440 |
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2441 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
|
2442 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
|
2443 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
|
2444 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
|
2445 |
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2446 if (utf8_label && utf8_label != label) g_free (utf8_label); |
49323 | 2447 |
2448 return is_same; | |
2449 } | |
2450 | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2451 /* 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
|
2452 |
49323 | 2453 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2454 xg_destroy_widgets (GList *list) |
49323 | 2455 { |
2456 GList *iter; | |
2457 | |
49572 | 2458 for (iter = list; iter; iter = g_list_next (iter)) |
49323 | 2459 { |
2460 GtkWidget *w = GTK_WIDGET (iter->data); | |
2461 | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2462 /* Destroying the widget will remove it from the container it is in. */ |
49323 | 2463 gtk_widget_destroy (w); |
2464 } | |
2465 } | |
2466 | |
2467 /* Update the top level names in MENUBAR (i.e. not submenus). | |
2468 F is the frame the menu bar belongs to. | |
49572 | 2469 *LIST is a list with the current menu bar names (menu item widgets). |
2470 ITER is the item within *LIST that shall be updated. | |
2471 POS is the numerical position, starting at 0, of ITER in *LIST. | |
49323 | 2472 VAL describes what the menu bar shall look like after the update. |
2473 SELECT_CB is the callback to use when a menu item is selected. | |
2474 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. | |
49572 | 2475 CL_DATA points to the callback data to be used for this menu bar. |
49323 | 2476 |
2477 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
|
2478 |
49323 | 2479 static void |
109139
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
2480 xg_update_menubar (GtkWidget *menubar, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
2481 FRAME_PTR f, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
2482 GList **list, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
2483 GList *iter, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
2484 int pos, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
2485 widget_value *val, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
2486 GCallback select_cb, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
2487 GCallback deactivate_cb, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
2488 GCallback highlight_cb, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
2489 xg_menu_cb_data *cl_data) |
49323 | 2490 { |
49572 | 2491 if (! iter && ! val) |
49323 | 2492 return; |
49572 | 2493 else if (iter && ! val) |
49323 | 2494 { |
49572 | 2495 /* 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
|
2496 xg_destroy_widgets (iter); |
49323 | 2497 |
106161
0ea716305b13
gtkutil.c (xg_modify_menubar_widgets): If menubar is totally empty
Jan Djärv <jan.h.d@swipnet.se>
parents:
106012
diff
changeset
|
2498 /* Add a blank entry so the menubar doesn't collapse to nothing. */ |
0ea716305b13
gtkutil.c (xg_modify_menubar_widgets): If menubar is totally empty
Jan Djärv <jan.h.d@swipnet.se>
parents:
106012
diff
changeset
|
2499 gtk_menu_shell_insert (GTK_MENU_SHELL (menubar), |
0ea716305b13
gtkutil.c (xg_modify_menubar_widgets): If menubar is totally empty
Jan Djärv <jan.h.d@swipnet.se>
parents:
106012
diff
changeset
|
2500 gtk_menu_item_new_with_label (""), |
0ea716305b13
gtkutil.c (xg_modify_menubar_widgets): If menubar is totally empty
Jan Djärv <jan.h.d@swipnet.se>
parents:
106012
diff
changeset
|
2501 0); |
49323 | 2502 /* All updated. */ |
2503 val = 0; | |
49572 | 2504 iter = 0; |
49323 | 2505 } |
49572 | 2506 else if (! iter && val) |
49323 | 2507 { |
2508 /* Item(s) added. Add all new items in one call. */ | |
96971
8a07ea5be91d
(xg_get_font_name): Cast w to GTK_FONT_SELECTION_DIALOG.
Jan Djärv <jan.h.d@swipnet.se>
parents:
96774
diff
changeset
|
2509 create_menus (val, f, select_cb, deactivate_cb, highlight_cb, |
49323 | 2510 0, 1, 0, menubar, cl_data, 0); |
2511 | |
2512 /* All updated. */ | |
2513 val = 0; | |
49572 | 2514 iter = 0; |
49323 | 2515 } |
49572 | 2516 /* Below this neither iter or val is NULL */ |
2517 else if (xg_item_label_same_p (GTK_MENU_ITEM (iter->data), val->name)) | |
49323 | 2518 { |
2519 /* This item is still the same, check next item. */ | |
2520 val = val->next; | |
49572 | 2521 iter = g_list_next (iter); |
2522 ++pos; | |
49323 | 2523 } |
2524 else /* This item is changed. */ | |
2525 { | |
49572 | 2526 GtkMenuItem *witem = GTK_MENU_ITEM (iter->data); |
49323 | 2527 GtkMenuItem *witem2 = 0; |
2528 int val_in_menubar = 0; | |
49572 | 2529 int iter_in_new_menubar = 0; |
2530 GList *iter2; | |
49323 | 2531 widget_value *cur; |
2532 | |
2533 /* See if the changed entry (val) is present later in the menu bar */ | |
49572 | 2534 for (iter2 = iter; |
2535 iter2 && ! val_in_menubar; | |
2536 iter2 = g_list_next (iter2)) | |
49323 | 2537 { |
49572 | 2538 witem2 = GTK_MENU_ITEM (iter2->data); |
49323 | 2539 val_in_menubar = xg_item_label_same_p (witem2, val->name); |
2540 } | |
2541 | |
49572 | 2542 /* See if the current entry (iter) is present later in the |
49323 | 2543 specification for the new menu bar. */ |
49572 | 2544 for (cur = val; cur && ! iter_in_new_menubar; cur = cur->next) |
2545 iter_in_new_menubar = xg_item_label_same_p (witem, cur->name); | |
2546 | |
2547 if (val_in_menubar && ! iter_in_new_menubar) | |
49323 | 2548 { |
49572 | 2549 int nr = pos; |
2550 | |
49323 | 2551 /* This corresponds to: |
2552 Current: A B C | |
2553 New: A C | |
2554 Remove B. */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2555 |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
2556 g_object_ref (G_OBJECT (witem)); |
49323 | 2557 gtk_container_remove (GTK_CONTAINER (menubar), GTK_WIDGET (witem)); |
2558 gtk_widget_destroy (GTK_WIDGET (witem)); | |
2559 | |
2560 /* Must get new list since the old changed. */ | |
49572 | 2561 g_list_free (*list); |
2562 *list = iter = gtk_container_get_children (GTK_CONTAINER (menubar)); | |
2563 while (nr-- > 0) iter = g_list_next (iter); | |
49323 | 2564 } |
49572 | 2565 else if (! val_in_menubar && ! iter_in_new_menubar) |
49323 | 2566 { |
2567 /* This corresponds to: | |
2568 Current: A B C | |
2569 New: A X C | |
2570 Rename B to X. This might seem to be a strange thing to do, | |
2571 since if there is a menu under B it will be totally wrong for X. | |
2572 But consider editing a C file. Then there is a C-mode menu | |
2573 (corresponds to B above). | |
2574 If then doing C-x C-f the minibuf menu (X above) replaces the | |
2575 C-mode menu. When returning from the minibuffer, we get | |
2576 back the C-mode menu. Thus we do: | |
2577 Rename B to X (C-mode to minibuf menu) | |
2578 Rename X to B (minibuf to C-mode menu). | |
2579 If the X menu hasn't been invoked, the menu under B | |
2580 is up to date when leaving the minibuffer. */ | |
2581 GtkLabel *wlabel = GTK_LABEL (gtk_bin_get_child (GTK_BIN (witem))); | |
2582 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
|
2583 GtkWidget *submenu = gtk_menu_item_get_submenu (witem); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2584 |
50778
f30e6f029d65
* gtkutil.c (create_dialog, make_widget_for_menu_item)
Jan Djärv <jan.h.d@swipnet.se>
parents:
50521
diff
changeset
|
2585 gtk_label_set_text (wlabel, utf8_label); |
49323 | 2586 |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2587 /* 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
|
2588 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
|
2589 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
|
2590 /* 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
|
2591 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
|
2592 |
49572 | 2593 iter = g_list_next (iter); |
49323 | 2594 val = val->next; |
49572 | 2595 ++pos; |
49323 | 2596 } |
49572 | 2597 else if (! val_in_menubar && iter_in_new_menubar) |
49323 | 2598 { |
2599 /* This corresponds to: | |
2600 Current: A B C | |
2601 New: A X B C | |
2602 Insert X. */ | |
2603 | |
49572 | 2604 int nr = pos; |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2605 GSList *group = 0; |
49323 | 2606 GtkWidget *w = xg_create_one_menuitem (val, |
2607 f, | |
2608 select_cb, | |
2609 highlight_cb, | |
2610 cl_data, | |
2611 &group); | |
2612 | |
77511
1962a74982ce
(xg_update_menubar, create_menus): Create empty
Jan Djärv <jan.h.d@swipnet.se>
parents:
76906
diff
changeset
|
2613 /* Create a possibly empty submenu for menu bar items, since some |
1962a74982ce
(xg_update_menubar, create_menus): Create empty
Jan Djärv <jan.h.d@swipnet.se>
parents:
76906
diff
changeset
|
2614 themes don't highlight items correctly without it. */ |
1962a74982ce
(xg_update_menubar, create_menus): Create empty
Jan Djärv <jan.h.d@swipnet.se>
parents:
76906
diff
changeset
|
2615 GtkWidget *submenu = create_menus (NULL, f, |
96971
8a07ea5be91d
(xg_get_font_name): Cast w to GTK_FONT_SELECTION_DIALOG.
Jan Djärv <jan.h.d@swipnet.se>
parents:
96774
diff
changeset
|
2616 select_cb, deactivate_cb, |
8a07ea5be91d
(xg_get_font_name): Cast w to GTK_FONT_SELECTION_DIALOG.
Jan Djärv <jan.h.d@swipnet.se>
parents:
96774
diff
changeset
|
2617 highlight_cb, |
77511
1962a74982ce
(xg_update_menubar, create_menus): Create empty
Jan Djärv <jan.h.d@swipnet.se>
parents:
76906
diff
changeset
|
2618 0, 0, 0, 0, cl_data, 0); |
49323 | 2619 gtk_widget_set_name (w, MENU_ITEM_NAME); |
2620 gtk_menu_shell_insert (GTK_MENU_SHELL (menubar), w, pos); | |
77511
1962a74982ce
(xg_update_menubar, create_menus): Create empty
Jan Djärv <jan.h.d@swipnet.se>
parents:
76906
diff
changeset
|
2621 gtk_menu_item_set_submenu (GTK_MENU_ITEM (w), submenu); |
49323 | 2622 |
49572 | 2623 g_list_free (*list); |
2624 *list = iter = gtk_container_get_children (GTK_CONTAINER (menubar)); | |
2625 while (nr-- > 0) iter = g_list_next (iter); | |
2626 iter = g_list_next (iter); | |
49323 | 2627 val = val->next; |
49572 | 2628 ++pos; |
49323 | 2629 } |
49572 | 2630 else /* if (val_in_menubar && iter_in_new_menubar) */ |
49323 | 2631 { |
49572 | 2632 int nr = pos; |
49323 | 2633 /* This corresponds to: |
2634 Current: A B C | |
2635 New: A C B | |
2636 Move C before B */ | |
2637 | |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
2638 g_object_ref (G_OBJECT (witem2)); |
49323 | 2639 gtk_container_remove (GTK_CONTAINER (menubar), GTK_WIDGET (witem2)); |
2640 gtk_menu_shell_insert (GTK_MENU_SHELL (menubar), | |
2641 GTK_WIDGET (witem2), pos); | |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
2642 g_object_unref (G_OBJECT (witem2)); |
49323 | 2643 |
49572 | 2644 g_list_free (*list); |
2645 *list = iter = gtk_container_get_children (GTK_CONTAINER (menubar)); | |
2646 while (nr-- > 0) iter = g_list_next (iter); | |
76906
bb6e75c27940
(xg_update_menubar): Call g_list_next after moving
Jan Djärv <jan.h.d@swipnet.se>
parents:
75576
diff
changeset
|
2647 if (iter) iter = g_list_next (iter); |
49323 | 2648 val = val->next; |
49572 | 2649 ++pos; |
49323 | 2650 } |
2651 } | |
2652 | |
2653 /* Update the rest of the menu bar. */ | |
49572 | 2654 xg_update_menubar (menubar, f, list, iter, pos, val, |
96971
8a07ea5be91d
(xg_get_font_name): Cast w to GTK_FONT_SELECTION_DIALOG.
Jan Djärv <jan.h.d@swipnet.se>
parents:
96774
diff
changeset
|
2655 select_cb, deactivate_cb, highlight_cb, cl_data); |
49323 | 2656 } |
2657 | |
2658 /* Update the menu item W so it corresponds to VAL. | |
2659 SELECT_CB is the callback to use when a menu item is selected. | |
2660 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. | |
102358 | 2661 CL_DATA is the data to set in the widget for menu invocation. */ |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2662 |
49323 | 2663 static void |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2664 xg_update_menu_item (widget_value *val, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2665 GtkWidget *w, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2666 GCallback select_cb, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2667 GCallback highlight_cb, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2668 xg_menu_cb_data *cl_data) |
49323 | 2669 { |
2670 GtkWidget *wchild; | |
2671 GtkLabel *wlbl = 0; | |
2672 GtkLabel *wkey = 0; | |
2673 char *utf8_label; | |
2674 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
|
2675 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
|
2676 const char *old_key = 0; |
49323 | 2677 xg_menu_item_cb_data *cb_data; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2678 |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2679 wchild = gtk_bin_get_child (GTK_BIN (w)); |
49323 | 2680 utf8_label = get_utf8_string (val->name); |
2681 utf8_key = get_utf8_string (val->key); | |
2682 | |
2683 /* See if W is a menu item with a key. See make_menu_item above. */ | |
2684 if (GTK_IS_HBOX (wchild)) | |
2685 { | |
2686 GList *list = gtk_container_get_children (GTK_CONTAINER (wchild)); | |
2687 | |
2688 wlbl = GTK_LABEL (list->data); | |
2689 wkey = GTK_LABEL (list->next->data); | |
49572 | 2690 g_list_free (list); |
2691 | |
49323 | 2692 if (! utf8_key) |
2693 { | |
2694 /* Remove the key and keep just the label. */ | |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
2695 g_object_ref (G_OBJECT (wlbl)); |
49323 | 2696 gtk_container_remove (GTK_CONTAINER (w), wchild); |
2697 gtk_container_add (GTK_CONTAINER (w), GTK_WIDGET (wlbl)); | |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
2698 g_object_unref (G_OBJECT (wlbl)); |
49323 | 2699 wkey = 0; |
2700 } | |
49572 | 2701 |
49323 | 2702 } |
2703 else /* Just a label. */ | |
2704 { | |
2705 wlbl = GTK_LABEL (wchild); | |
2706 | |
2707 /* Check if there is now a key. */ | |
2708 if (utf8_key) | |
2709 { | |
2710 GtkWidget *wtoadd = make_widget_for_menu_item (utf8_label, utf8_key); | |
2711 GList *list = gtk_container_get_children (GTK_CONTAINER (wtoadd)); | |
49572 | 2712 |
49323 | 2713 wlbl = GTK_LABEL (list->data); |
2714 wkey = GTK_LABEL (list->next->data); | |
49572 | 2715 g_list_free (list); |
49323 | 2716 |
2717 gtk_container_remove (GTK_CONTAINER (w), wchild); | |
2718 gtk_container_add (GTK_CONTAINER (w), wtoadd); | |
2719 } | |
2720 } | |
2721 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2722 |
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
|
2723 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
|
2724 if (wlbl) old_label = gtk_label_get_label (wlbl); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2725 |
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
|
2726 if (wkey && utf8_key && (! old_key || strcmp (utf8_key, old_key) != 0)) |
49323 | 2727 gtk_label_set_text (wkey, utf8_key); |
2728 | |
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
|
2729 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
|
2730 gtk_label_set_text (wlbl, utf8_label); |
49323 | 2731 |
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
|
2732 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
|
2733 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
|
2734 |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
2735 if (! val->enabled && gtk_widget_get_sensitive (w)) |
49323 | 2736 gtk_widget_set_sensitive (w, FALSE); |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
2737 else if (val->enabled && ! gtk_widget_get_sensitive (w)) |
49323 | 2738 gtk_widget_set_sensitive (w, TRUE); |
2739 | |
2740 cb_data = (xg_menu_item_cb_data*) g_object_get_data (G_OBJECT (w), | |
2741 XG_ITEM_DATA); | |
2742 if (cb_data) | |
2743 { | |
2744 cb_data->call_data = val->call_data; | |
2745 cb_data->help = val->help; | |
2746 cb_data->cl_data = cl_data; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2747 |
49323 | 2748 /* We assume the callback functions don't change. */ |
2749 if (val->call_data && ! val->contents) | |
2750 { | |
2751 /* This item shall have a select callback. */ | |
2752 if (! cb_data->select_id) | |
2753 cb_data->select_id | |
2754 = g_signal_connect (G_OBJECT (w), "activate", | |
2755 select_cb, cb_data); | |
2756 } | |
2757 else if (cb_data->select_id) | |
2758 { | |
2759 g_signal_handler_disconnect (w, cb_data->select_id); | |
2760 cb_data->select_id = 0; | |
2761 } | |
2762 } | |
2763 } | |
2764 | |
2765 /* 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
|
2766 |
49323 | 2767 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2768 xg_update_toggle_item (widget_value *val, GtkWidget *w) |
49323 | 2769 { |
2770 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (w), val->selected); | |
2771 } | |
2772 | |
2773 /* 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
|
2774 |
49323 | 2775 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2776 xg_update_radio_item (widget_value *val, GtkWidget *w) |
49323 | 2777 { |
2778 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (w), val->selected); | |
2779 } | |
2780 | |
2781 /* Update the sub menu SUBMENU and all its children so it corresponds to VAL. | |
2782 SUBMENU may be NULL, in that case a new menu is created. | |
2783 F is the frame the menu bar belongs to. | |
2784 VAL describes the contents of the menu bar. | |
2785 SELECT_CB is the callback to use when a menu item is selected. | |
2786 DEACTIVATE_CB is the callback to use when a sub menu is not shown anymore. | |
2787 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. | |
2788 CL_DATA is the call back data to use for any newly created items. | |
2789 | |
2790 Returns the updated submenu widget, that is SUBMENU unless SUBMENU | |
2791 was NULL. */ | |
2792 | |
2793 static GtkWidget * | |
109139
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
2794 xg_update_submenu (GtkWidget *submenu, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
2795 FRAME_PTR f, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
2796 widget_value *val, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
2797 GCallback select_cb, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
2798 GCallback deactivate_cb, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
2799 GCallback highlight_cb, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
2800 xg_menu_cb_data *cl_data) |
49323 | 2801 { |
2802 GtkWidget *newsub = submenu; | |
2803 GList *list = 0; | |
2804 GList *iter; | |
2805 widget_value *cur; | |
2806 int has_tearoff_p = 0; | |
2807 GList *first_radio = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2808 |
49323 | 2809 if (submenu) |
2810 list = gtk_container_get_children (GTK_CONTAINER (submenu)); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2811 |
49323 | 2812 for (cur = val, iter = list; |
2813 cur && iter; | |
2814 iter = g_list_next (iter), cur = cur->next) | |
2815 { | |
2816 GtkWidget *w = GTK_WIDGET (iter->data); | |
2817 | |
2818 /* Skip tearoff items, they have no counterpart in val. */ | |
2819 if (GTK_IS_TEAROFF_MENU_ITEM (w)) | |
2820 { | |
2821 has_tearoff_p = 1; | |
2822 iter = g_list_next (iter); | |
2823 if (iter) w = GTK_WIDGET (iter->data); | |
2824 else break; | |
2825 } | |
2826 | |
2827 /* Remember first radio button in a group. If we get a mismatch in | |
2828 a radio group we must rebuild the whole group so that the connections | |
2829 in GTK becomes correct. */ | |
2830 if (cur->button_type == BUTTON_TYPE_RADIO && ! first_radio) | |
2831 first_radio = iter; | |
2832 else if (cur->button_type != BUTTON_TYPE_RADIO | |
2833 && ! GTK_IS_RADIO_MENU_ITEM (w)) | |
2834 first_radio = 0; | |
2835 | |
2836 if (GTK_IS_SEPARATOR_MENU_ITEM (w)) | |
2837 { | |
2838 if (! xg_separator_p (cur->name)) | |
2839 break; | |
2840 } | |
2841 else if (GTK_IS_CHECK_MENU_ITEM (w)) | |
2842 { | |
2843 if (cur->button_type != BUTTON_TYPE_TOGGLE) | |
2844 break; | |
2845 xg_update_toggle_item (cur, w); | |
2846 xg_update_menu_item (cur, w, select_cb, highlight_cb, cl_data); | |
2847 } | |
2848 else if (GTK_IS_RADIO_MENU_ITEM (w)) | |
2849 { | |
2850 if (cur->button_type != BUTTON_TYPE_RADIO) | |
2851 break; | |
2852 xg_update_radio_item (cur, w); | |
2853 xg_update_menu_item (cur, w, select_cb, highlight_cb, cl_data); | |
2854 } | |
2855 else if (GTK_IS_MENU_ITEM (w)) | |
2856 { | |
2857 GtkMenuItem *witem = GTK_MENU_ITEM (w); | |
2858 GtkWidget *sub; | |
2859 | |
2860 if (cur->button_type != BUTTON_TYPE_NONE || | |
2861 xg_separator_p (cur->name)) | |
2862 break; | |
2863 | |
2864 xg_update_menu_item (cur, w, select_cb, highlight_cb, cl_data); | |
2865 | |
2866 sub = gtk_menu_item_get_submenu (witem); | |
2867 if (sub && ! cur->contents) | |
2868 { | |
2869 /* Not a submenu anymore. */ | |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
2870 g_object_ref (G_OBJECT (sub)); |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
2871 remove_submenu (witem); |
49323 | 2872 gtk_widget_destroy (sub); |
2873 } | |
2874 else if (cur->contents) | |
2875 { | |
2876 GtkWidget *nsub; | |
2877 | |
2878 nsub = xg_update_submenu (sub, f, cur->contents, | |
2879 select_cb, deactivate_cb, | |
2880 highlight_cb, cl_data); | |
2881 | |
2882 /* If this item just became a submenu, we must set it. */ | |
2883 if (nsub != sub) | |
2884 gtk_menu_item_set_submenu (witem, nsub); | |
2885 } | |
2886 } | |
2887 else | |
2888 { | |
2889 /* Structural difference. Remove everything from here and down | |
2890 in SUBMENU. */ | |
2891 break; | |
2892 } | |
2893 } | |
2894 | |
2895 /* Remove widgets from first structual change. */ | |
2896 if (iter) | |
2897 { | |
2898 /* If we are adding new menu items below, we must remove from | |
2899 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
|
2900 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
|
2901 else xg_destroy_widgets (iter); |
49323 | 2902 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2903 |
49323 | 2904 if (cur) |
2905 { | |
2906 /* More items added. Create them. */ | |
2907 newsub = create_menus (cur, | |
2908 f, | |
2909 select_cb, | |
2910 deactivate_cb, | |
2911 highlight_cb, | |
2912 0, | |
2913 0, | |
2914 ! has_tearoff_p, | |
2915 submenu, | |
2916 cl_data, | |
2917 0); | |
2918 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2919 |
49572 | 2920 if (list) g_list_free (list); |
2921 | |
49323 | 2922 return newsub; |
2923 } | |
2924 | |
2925 /* Update the MENUBAR. | |
2926 F is the frame the menu bar belongs to. | |
2927 VAL describes the contents of the menu bar. | |
2928 If DEEP_P is non-zero, rebuild all but the top level menu names in | |
2929 the MENUBAR. If DEEP_P is zero, just rebuild the names in the menubar. | |
2930 SELECT_CB is the callback to use when a menu item is selected. | |
2931 DEACTIVATE_CB is the callback to use when a sub menu is not shown anymore. | |
2932 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
|
2933 |
49323 | 2934 void |
109364
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109141
diff
changeset
|
2935 xg_modify_menubar_widgets (GtkWidget *menubar, FRAME_PTR f, widget_value *val, |
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109141
diff
changeset
|
2936 int deep_p, |
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109141
diff
changeset
|
2937 GCallback select_cb, GCallback deactivate_cb, |
89a16701cde1
Convert old-style definitions
Andreas Schwab <schwab@linux-m68k.org>
parents:
109141
diff
changeset
|
2938 GCallback highlight_cb) |
49323 | 2939 { |
2940 xg_menu_cb_data *cl_data; | |
2941 GList *list = gtk_container_get_children (GTK_CONTAINER (menubar)); | |
2942 | |
2943 if (! list) return; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2944 |
49323 | 2945 cl_data = (xg_menu_cb_data*) g_object_get_data (G_OBJECT (menubar), |
2946 XG_FRAME_DATA); | |
2947 | |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2948 xg_update_menubar (menubar, f, &list, list, 0, val->contents, |
96971
8a07ea5be91d
(xg_get_font_name): Cast w to GTK_FONT_SELECTION_DIALOG.
Jan Djärv <jan.h.d@swipnet.se>
parents:
96774
diff
changeset
|
2949 select_cb, deactivate_cb, highlight_cb, cl_data); |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2950 |
64783
0975467abc17
* gtkutil.c (xg_modify_menubar_widgets): Remove semicolon that
Jan Djärv <jan.h.d@swipnet.se>
parents:
64770
diff
changeset
|
2951 if (deep_p) |
49323 | 2952 { |
2953 widget_value *cur; | |
2954 | |
2955 /* 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
|
2956 We must keep the submenus (GTK menu item widgets) since the |
49323 | 2957 X Window in the XEvent that activates the menu are those widgets. */ |
2958 | |
2959 /* Update cl_data, menu_item things in F may have changed. */ | |
2960 update_cl_data (cl_data, f, highlight_cb); | |
2961 | |
2962 for (cur = val->contents; cur; cur = cur->next) | |
2963 { | |
49572 | 2964 GList *iter; |
49323 | 2965 GtkWidget *sub = 0; |
2966 GtkWidget *newsub; | |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2967 GtkMenuItem *witem = 0; |
49323 | 2968 |
2969 /* Find sub menu that corresponds to val and update it. */ | |
2970 for (iter = list ; iter; iter = g_list_next (iter)) | |
2971 { | |
2972 witem = GTK_MENU_ITEM (iter->data); | |
2973 if (xg_item_label_same_p (witem, cur->name)) | |
2974 { | |
2975 sub = gtk_menu_item_get_submenu (witem); | |
2976 break; | |
2977 } | |
2978 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2979 |
49323 | 2980 newsub = xg_update_submenu (sub, |
2981 f, | |
2982 cur->contents, | |
2983 select_cb, | |
2984 deactivate_cb, | |
2985 highlight_cb, | |
2986 cl_data); | |
2987 /* sub may still be NULL. If we just updated non deep and added | |
2988 a new menu bar item, it has no sub menu yet. So we set the | |
2989 newly created sub menu under witem. */ | |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
2990 if (newsub != sub && witem != 0) |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2991 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2992 xg_set_screen (newsub, f); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2993 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
|
2994 } |
49323 | 2995 } |
2996 } | |
2997 | |
49572 | 2998 g_list_free (list); |
49323 | 2999 gtk_widget_show_all (menubar); |
3000 } | |
3001 | |
3002 /* Recompute all the widgets of frame F, when the menu bar has been | |
3003 changed. Value is non-zero if widgets were updated. */ | |
3004 | |
3005 int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3006 xg_update_frame_menubar (FRAME_PTR f) |
49323 | 3007 { |
3008 struct x_output *x = f->output_data.x; | |
3009 GtkRequisition req; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3010 |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3011 if (!x->menubar_widget || gtk_widget_get_mapped (x->menubar_widget)) |
49323 | 3012 return 0; |
3013 | |
106012
fae53e3bfda0
gtkutil.c (xg_update_frame_menubar): Do nothing if menubar already has a parent.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105959
diff
changeset
|
3014 if (x->menubar_widget && gtk_widget_get_parent (x->menubar_widget)) |
fae53e3bfda0
gtkutil.c (xg_update_frame_menubar): Do nothing if menubar already has a parent.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105959
diff
changeset
|
3015 return 0; /* Already done this, happens for frames created invisible. */ |
fae53e3bfda0
gtkutil.c (xg_update_frame_menubar): Do nothing if menubar already has a parent.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105959
diff
changeset
|
3016 |
49323 | 3017 BLOCK_INPUT; |
3018 | |
3019 gtk_box_pack_start (GTK_BOX (x->vbox_widget), x->menubar_widget, | |
3020 FALSE, FALSE, 0); | |
3021 gtk_box_reorder_child (GTK_BOX (x->vbox_widget), x->menubar_widget, 0); | |
3022 | |
3023 gtk_widget_show_all (x->menubar_widget); | |
3024 gtk_widget_size_request (x->menubar_widget, &req); | |
3025 FRAME_MENUBAR_HEIGHT (f) = req.height; | |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3026 xg_height_or_width_changed (f); |
49323 | 3027 UNBLOCK_INPUT; |
50106
5675d6a0080c
(xg_update_frame_menubar): Add missing return value.
Andreas Schwab <schwab@suse.de>
parents:
50099
diff
changeset
|
3028 |
5675d6a0080c
(xg_update_frame_menubar): Add missing return value.
Andreas Schwab <schwab@suse.de>
parents:
50099
diff
changeset
|
3029 return 1; |
49323 | 3030 } |
3031 | |
3032 /* Get rid of the menu bar of frame F, and free its storage. | |
3033 This is used when deleting a frame, and when turning off the menu bar. */ | |
3034 | |
3035 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3036 free_frame_menubar (FRAME_PTR f) |
49323 | 3037 { |
3038 struct x_output *x = f->output_data.x; | |
3039 | |
3040 if (x->menubar_widget) | |
3041 { | |
3042 BLOCK_INPUT; | |
3043 | |
3044 gtk_container_remove (GTK_CONTAINER (x->vbox_widget), x->menubar_widget); | |
3045 /* The menubar and its children shall be deleted when removed from | |
3046 the container. */ | |
3047 x->menubar_widget = 0; | |
3048 FRAME_MENUBAR_HEIGHT (f) = 0; | |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3049 xg_height_or_width_changed (f); |
49323 | 3050 UNBLOCK_INPUT; |
3051 } | |
3052 } | |
3053 | |
109327
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3054 int |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3055 xg_event_is_for_menubar (FRAME_PTR f, XEvent *event) |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3056 { |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3057 struct x_output *x = f->output_data.x; |
109332
507549811e3e
* gtkutil.c (xg_event_is_for_menubar): Also check that event window
Jan D <jan.h.d@swipnet.se>
parents:
109327
diff
changeset
|
3058 GList *iter; |
507549811e3e
* gtkutil.c (xg_event_is_for_menubar): Also check that event window
Jan D <jan.h.d@swipnet.se>
parents:
109327
diff
changeset
|
3059 GdkRectangle rec; |
507549811e3e
* gtkutil.c (xg_event_is_for_menubar): Also check that event window
Jan D <jan.h.d@swipnet.se>
parents:
109327
diff
changeset
|
3060 GList *list; |
507549811e3e
* gtkutil.c (xg_event_is_for_menubar): Also check that event window
Jan D <jan.h.d@swipnet.se>
parents:
109327
diff
changeset
|
3061 GdkDisplay *gdpy; |
507549811e3e
* gtkutil.c (xg_event_is_for_menubar): Also check that event window
Jan D <jan.h.d@swipnet.se>
parents:
109327
diff
changeset
|
3062 GdkWindow *gw; |
507549811e3e
* gtkutil.c (xg_event_is_for_menubar): Also check that event window
Jan D <jan.h.d@swipnet.se>
parents:
109327
diff
changeset
|
3063 GdkEvent gevent; |
507549811e3e
* gtkutil.c (xg_event_is_for_menubar): Also check that event window
Jan D <jan.h.d@swipnet.se>
parents:
109327
diff
changeset
|
3064 GtkWidget *gwdesc; |
109327
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3065 |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3066 if (! x->menubar_widget) return 0; |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3067 |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3068 if (! (event->xbutton.x >= 0 |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3069 && event->xbutton.x < FRAME_PIXEL_WIDTH (f) |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3070 && event->xbutton.y >= 0 |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3071 && event->xbutton.y < f->output_data.x->menubar_height |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3072 && event->xbutton.same_screen)) |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3073 return 0; |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3074 |
109332
507549811e3e
* gtkutil.c (xg_event_is_for_menubar): Also check that event window
Jan D <jan.h.d@swipnet.se>
parents:
109327
diff
changeset
|
3075 gdpy = gdk_x11_lookup_xdisplay (FRAME_X_DISPLAY (f)); |
507549811e3e
* gtkutil.c (xg_event_is_for_menubar): Also check that event window
Jan D <jan.h.d@swipnet.se>
parents:
109327
diff
changeset
|
3076 gw = gdk_xid_table_lookup_for_display (gdpy, event->xbutton.window); |
507549811e3e
* gtkutil.c (xg_event_is_for_menubar): Also check that event window
Jan D <jan.h.d@swipnet.se>
parents:
109327
diff
changeset
|
3077 if (! gw) return 0; |
507549811e3e
* gtkutil.c (xg_event_is_for_menubar): Also check that event window
Jan D <jan.h.d@swipnet.se>
parents:
109327
diff
changeset
|
3078 gevent.any.window = gw; |
507549811e3e
* gtkutil.c (xg_event_is_for_menubar): Also check that event window
Jan D <jan.h.d@swipnet.se>
parents:
109327
diff
changeset
|
3079 gwdesc = gtk_get_event_widget (&gevent); |
507549811e3e
* gtkutil.c (xg_event_is_for_menubar): Also check that event window
Jan D <jan.h.d@swipnet.se>
parents:
109327
diff
changeset
|
3080 if (! gwdesc) return 0; |
507549811e3e
* gtkutil.c (xg_event_is_for_menubar): Also check that event window
Jan D <jan.h.d@swipnet.se>
parents:
109327
diff
changeset
|
3081 if (! GTK_IS_MENU_BAR (gwdesc) |
507549811e3e
* gtkutil.c (xg_event_is_for_menubar): Also check that event window
Jan D <jan.h.d@swipnet.se>
parents:
109327
diff
changeset
|
3082 && ! GTK_IS_MENU_ITEM (gwdesc) |
507549811e3e
* gtkutil.c (xg_event_is_for_menubar): Also check that event window
Jan D <jan.h.d@swipnet.se>
parents:
109327
diff
changeset
|
3083 && ! gtk_widget_is_ancestor (x->menubar_widget, gwdesc)) |
507549811e3e
* gtkutil.c (xg_event_is_for_menubar): Also check that event window
Jan D <jan.h.d@swipnet.se>
parents:
109327
diff
changeset
|
3084 return 0; |
507549811e3e
* gtkutil.c (xg_event_is_for_menubar): Also check that event window
Jan D <jan.h.d@swipnet.se>
parents:
109327
diff
changeset
|
3085 |
507549811e3e
* gtkutil.c (xg_event_is_for_menubar): Also check that event window
Jan D <jan.h.d@swipnet.se>
parents:
109327
diff
changeset
|
3086 list = gtk_container_get_children (GTK_CONTAINER (x->menubar_widget)); |
109327
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3087 if (! list) return 0; |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3088 rec.x = event->xbutton.x; |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3089 rec.y = event->xbutton.y; |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3090 rec.width = 1; |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3091 rec.height = 1; |
109332
507549811e3e
* gtkutil.c (xg_event_is_for_menubar): Also check that event window
Jan D <jan.h.d@swipnet.se>
parents:
109327
diff
changeset
|
3092 |
109327
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3093 for (iter = list ; iter; iter = g_list_next (iter)) |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3094 { |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3095 GtkWidget *w = GTK_WIDGET (iter->data); |
109454
514fed5c0ded
* gtkutil.c (xg_frame_resized): GTK_IS_MAPPED => gtk_widget_get_mapped, for Gtk 3.0
Jan D <jan.h.d@swipnet.se>
parents:
109452
diff
changeset
|
3096 if (gtk_widget_get_mapped (w) && gtk_widget_intersect (w, &rec, NULL)) |
109327
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3097 break; |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3098 } |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3099 g_list_free (list); |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3100 return iter == 0 ? 0 : 1; |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3101 } |
60266cf487b0
Fix menus as per bug 6499 and 6608.
Jan D <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
3102 |
49323 | 3103 |
3104 | |
3105 /*********************************************************************** | |
3106 Scroll bar functions | |
3107 ***********************************************************************/ | |
3108 | |
3109 | |
3110 /* Setting scroll bar values invokes the callback. Use this variable | |
3111 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
|
3112 |
49323 | 3113 int xg_ignore_gtk_scrollbar; |
3114 | |
86161
3408ab8b4152
* xterm.h (struct scroll_bar): Only use Lisp_Object for lisp data.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85938
diff
changeset
|
3115 /* Xlib's `Window' fits in 32 bits. But we want to store pointers, and they |
3408ab8b4152
* xterm.h (struct scroll_bar): Only use Lisp_Object for lisp data.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85938
diff
changeset
|
3116 may be larger than 32 bits. Keep a mapping from integer index to widget |
3408ab8b4152
* xterm.h (struct scroll_bar): Only use Lisp_Object for lisp data.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85938
diff
changeset
|
3117 pointers 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
|
3118 |
49323 | 3119 static struct |
3120 { | |
3121 GtkWidget **widgets; | |
3122 int max_size; | |
3123 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
|
3124 } id_to_widget; |
49323 | 3125 |
3126 /* 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
|
3127 |
49323 | 3128 #define ID_TO_WIDGET_INCR 32 |
3129 | |
3130 /* 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
|
3131 |
49323 | 3132 static int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3133 xg_store_widget_in_map (GtkWidget *w) |
49323 | 3134 { |
3135 int i; | |
3136 | |
3137 if (id_to_widget.max_size == id_to_widget.used) | |
3138 { | |
3139 int new_size = id_to_widget.max_size + ID_TO_WIDGET_INCR; | |
3140 | |
3141 id_to_widget.widgets = xrealloc (id_to_widget.widgets, | |
3142 sizeof (GtkWidget *)*new_size); | |
3143 | |
3144 for (i = id_to_widget.max_size; i < new_size; ++i) | |
3145 id_to_widget.widgets[i] = 0; | |
3146 id_to_widget.max_size = new_size; | |
3147 } | |
3148 | |
3149 /* Just loop over the array and find a free place. After all, | |
3150 how many scroll bars are we creating? Should be a small number. | |
3151 The check above guarantees we will find a free place. */ | |
3152 for (i = 0; i < id_to_widget.max_size; ++i) | |
3153 { | |
3154 if (! id_to_widget.widgets[i]) | |
3155 { | |
3156 id_to_widget.widgets[i] = w; | |
3157 ++id_to_widget.used; | |
3158 | |
3159 return i; | |
3160 } | |
3161 } | |
3162 | |
3163 /* Should never end up here */ | |
3164 abort (); | |
3165 } | |
3166 | |
3167 /* Remove pointer at IDX from id_to_widget. | |
3168 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
|
3169 |
49323 | 3170 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3171 xg_remove_widget_from_map (int idx) |
49323 | 3172 { |
3173 if (idx < id_to_widget.max_size && id_to_widget.widgets[idx] != 0) | |
3174 { | |
3175 id_to_widget.widgets[idx] = 0; | |
3176 --id_to_widget.used; | |
3177 } | |
3178 } | |
3179 | |
3180 /* 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
|
3181 |
49323 | 3182 static GtkWidget * |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3183 xg_get_widget_from_map (int idx) |
49323 | 3184 { |
3185 if (idx < id_to_widget.max_size && id_to_widget.widgets[idx] != 0) | |
3186 return id_to_widget.widgets[idx]; | |
3187 | |
3188 return 0; | |
3189 } | |
3190 | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
3191 /* Return the scrollbar id for X Window WID on display DPY. |
50063 | 3192 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
|
3193 |
50063 | 3194 int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3195 xg_get_scroll_id_for_window (Display *dpy, Window wid) |
50063 | 3196 { |
3197 int idx; | |
3198 GtkWidget *w; | |
3199 | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
3200 w = xg_win_to_widget (dpy, wid); |
50063 | 3201 |
3202 if (w) | |
3203 { | |
3204 for (idx = 0; idx < id_to_widget.max_size; ++idx) | |
3205 if (id_to_widget.widgets[idx] == w) | |
3206 return idx; | |
3207 } | |
3208 | |
3209 return -1; | |
3210 } | |
3211 | |
49323 | 3212 /* Callback invoked when scroll bar WIDGET is destroyed. |
3213 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
|
3214 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
|
3215 |
49323 | 3216 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3217 xg_gtk_scroll_destroy (GtkWidget *widget, gpointer data) |
49323 | 3218 { |
59411
ecb6689e04bf
* gtkutil.c (xg_gtk_scroll_destroy, xg_create_scroll_bar)
Jan Djärv <jan.h.d@swipnet.se>
parents:
59102
diff
changeset
|
3219 int id = (int) (EMACS_INT) data; /* The EMACS_INT cast avoids a warning. */ |
49323 | 3220 xg_remove_widget_from_map (id); |
3221 } | |
3222 | |
3223 /* Create a scroll bar widget for frame F. Store the scroll bar | |
3224 in BAR. | |
3225 SCROLL_CALLBACK is the callback to invoke when the value of the | |
3226 bar changes. | |
106559
bac7488df503
Bug 5177: Scroll bar thumb did not move when scrolling with mouse wheel.
Jan Djärv <jan.h.d@swipnet.se>
parents:
106549
diff
changeset
|
3227 END_CALLBACK is the callback to invoke when scrolling ends. |
49323 | 3228 SCROLL_BAR_NAME is the name we use for the scroll bar. Can be used |
3229 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
|
3230 |
49323 | 3231 void |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3232 xg_create_scroll_bar (FRAME_PTR f, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3233 struct scroll_bar *bar, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3234 GCallback scroll_callback, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3235 GCallback end_callback, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3236 char *scroll_bar_name) |
49323 | 3237 { |
3238 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
|
3239 GtkWidget *webox; |
49323 | 3240 GtkObject *vadj; |
3241 int scroll_id; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3242 |
49323 | 3243 /* Page, step increment values are not so important here, they |
3244 will be corrected in x_set_toolkit_scroll_bar_thumb. */ | |
3245 vadj = gtk_adjustment_new (XG_SB_MIN, XG_SB_MIN, XG_SB_MAX, | |
3246 0.1, 0.1, 0.1); | |
3247 | |
3248 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
|
3249 webox = gtk_event_box_new (); |
49323 | 3250 gtk_widget_set_name (wscroll, scroll_bar_name); |
3251 gtk_range_set_update_policy (GTK_RANGE (wscroll), GTK_UPDATE_CONTINUOUS); | |
106559
bac7488df503
Bug 5177: Scroll bar thumb did not move when scrolling with mouse wheel.
Jan Djärv <jan.h.d@swipnet.se>
parents:
106549
diff
changeset
|
3252 g_object_set_data (G_OBJECT (wscroll), XG_FRAME_DATA, (gpointer)f); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3253 |
49323 | 3254 scroll_id = xg_store_widget_in_map (wscroll); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3255 |
59411
ecb6689e04bf
* gtkutil.c (xg_gtk_scroll_destroy, xg_create_scroll_bar)
Jan Djärv <jan.h.d@swipnet.se>
parents:
59102
diff
changeset
|
3256 /* The EMACS_INT cast avoids a warning. */ |
49323 | 3257 g_signal_connect (G_OBJECT (wscroll), |
3258 "destroy", | |
3259 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
|
3260 (gpointer) (EMACS_INT) scroll_id); |
106559
bac7488df503
Bug 5177: Scroll bar thumb did not move when scrolling with mouse wheel.
Jan Djärv <jan.h.d@swipnet.se>
parents:
106549
diff
changeset
|
3261 g_signal_connect (G_OBJECT (wscroll), |
bac7488df503
Bug 5177: Scroll bar thumb did not move when scrolling with mouse wheel.
Jan Djärv <jan.h.d@swipnet.se>
parents:
106549
diff
changeset
|
3262 "change-value", |
bac7488df503
Bug 5177: Scroll bar thumb did not move when scrolling with mouse wheel.
Jan Djärv <jan.h.d@swipnet.se>
parents:
106549
diff
changeset
|
3263 scroll_callback, |
bac7488df503
Bug 5177: Scroll bar thumb did not move when scrolling with mouse wheel.
Jan Djärv <jan.h.d@swipnet.se>
parents:
106549
diff
changeset
|
3264 (gpointer) bar); |
106549
3acd32c3e0ac
gtkutil.c: Scroll bar thumb not updated properly (bug #5177).
Jan Djärv <jan.h.d@swipnet.se>
parents:
106512
diff
changeset
|
3265 g_signal_connect (G_OBJECT (wscroll), |
3acd32c3e0ac
gtkutil.c: Scroll bar thumb not updated properly (bug #5177).
Jan Djärv <jan.h.d@swipnet.se>
parents:
106512
diff
changeset
|
3266 "button-release-event", |
106559
bac7488df503
Bug 5177: Scroll bar thumb did not move when scrolling with mouse wheel.
Jan Djärv <jan.h.d@swipnet.se>
parents:
106549
diff
changeset
|
3267 end_callback, |
106549
3acd32c3e0ac
gtkutil.c: Scroll bar thumb not updated properly (bug #5177).
Jan Djärv <jan.h.d@swipnet.se>
parents:
106512
diff
changeset
|
3268 (gpointer) bar); |
3acd32c3e0ac
gtkutil.c: Scroll bar thumb not updated properly (bug #5177).
Jan Djärv <jan.h.d@swipnet.se>
parents:
106512
diff
changeset
|
3269 |
57597
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
3270 /* 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
|
3271 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
|
3272 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
|
3273 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
|
3274 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
|
3275 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
|
3276 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
|
3277 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
|
3278 |
49323 | 3279 |
3280 /* 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
|
3281 xg_set_cursor (webox, FRAME_X_DISPLAY_INFO (f)->xg_cursor); |
49323 | 3282 |
86161
3408ab8b4152
* xterm.h (struct scroll_bar): Only use Lisp_Object for lisp data.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85938
diff
changeset
|
3283 bar->x_window = scroll_id; |
49323 | 3284 } |
3285 | |
3286 /* 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
|
3287 |
49323 | 3288 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3289 xg_remove_scroll_bar (FRAME_PTR f, int scrollbar_id) |
49323 | 3290 { |
3291 GtkWidget *w = xg_get_widget_from_map (scrollbar_id); | |
3292 if (w) | |
3293 { | |
57597
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
3294 GtkWidget *wparent = gtk_widget_get_parent (w); |
49323 | 3295 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
|
3296 gtk_widget_destroy (wparent); |
49323 | 3297 SET_FRAME_GARBAGED (f); |
3298 } | |
3299 } | |
3300 | |
3301 /* Update the position of the vertical scroll bar represented by SCROLLBAR_ID | |
3302 in frame F. | |
3303 TOP/LEFT are the new pixel positions where the bar shall appear. | |
3304 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
|
3305 |
49323 | 3306 void |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3307 xg_update_scrollbar_pos (FRAME_PTR f, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3308 int scrollbar_id, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3309 int top, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3310 int left, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3311 int width, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3312 int height) |
49323 | 3313 { |
49572 | 3314 |
3315 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
|
3316 |
49572 | 3317 if (wscroll) |
3318 { | |
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
|
3319 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
|
3320 GtkWidget *wparent = gtk_widget_get_parent (wscroll); |
109040
98796fa1a7f8
src/gtkutil.c (xg_update_scrollbar_pos): Avoid C99 mid-block variable declaration.
Juanma Barranquero <lekktu@gmail.com>
parents:
109037
diff
changeset
|
3321 gint msl; |
106720
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
3322 |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
3323 /* Clear out old position. */ |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
3324 int oldx = -1, oldy = -1, oldw, oldh; |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3325 if (gtk_widget_get_parent (wparent) == wfixed) |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3326 { |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3327 gtk_container_child_get (GTK_CONTAINER (wfixed), wparent, |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3328 "x", &oldx, "y", &oldy, NULL); |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3329 gtk_widget_get_size_request (wscroll, &oldw, &oldh); |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3330 } |
55342
44d086f5e08a
* gtkutil.c (xg_update_scrollbar_pos): Call XClearWindow to clear
Jan Djärv <jan.h.d@swipnet.se>
parents:
53275
diff
changeset
|
3331 |
44d086f5e08a
* gtkutil.c (xg_update_scrollbar_pos): Call XClearWindow to clear
Jan Djärv <jan.h.d@swipnet.se>
parents:
53275
diff
changeset
|
3332 /* 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
|
3333 gtk_fixed_move (GTK_FIXED (wfixed), wparent, left, top); |
109037
3e9a832a5533
Hide scroll bar when window is too small to avoid Gtk+ warning.
Jan D. <jan.h.d@swipnet.se>
parents:
108315
diff
changeset
|
3334 gtk_widget_style_get (wscroll, "min-slider-length", &msl, NULL); |
3e9a832a5533
Hide scroll bar when window is too small to avoid Gtk+ warning.
Jan D. <jan.h.d@swipnet.se>
parents:
108315
diff
changeset
|
3335 if (msl > height) |
3e9a832a5533
Hide scroll bar when window is too small to avoid Gtk+ warning.
Jan D. <jan.h.d@swipnet.se>
parents:
108315
diff
changeset
|
3336 { |
3e9a832a5533
Hide scroll bar when window is too small to avoid Gtk+ warning.
Jan D. <jan.h.d@swipnet.se>
parents:
108315
diff
changeset
|
3337 /* No room. Hide scroll bar as some themes output a warning if |
3e9a832a5533
Hide scroll bar when window is too small to avoid Gtk+ warning.
Jan D. <jan.h.d@swipnet.se>
parents:
108315
diff
changeset
|
3338 the height is less than the min size. */ |
3e9a832a5533
Hide scroll bar when window is too small to avoid Gtk+ warning.
Jan D. <jan.h.d@swipnet.se>
parents:
108315
diff
changeset
|
3339 gtk_widget_hide (wparent); |
3e9a832a5533
Hide scroll bar when window is too small to avoid Gtk+ warning.
Jan D. <jan.h.d@swipnet.se>
parents:
108315
diff
changeset
|
3340 gtk_widget_hide (wscroll); |
3e9a832a5533
Hide scroll bar when window is too small to avoid Gtk+ warning.
Jan D. <jan.h.d@swipnet.se>
parents:
108315
diff
changeset
|
3341 } |
3e9a832a5533
Hide scroll bar when window is too small to avoid Gtk+ warning.
Jan D. <jan.h.d@swipnet.se>
parents:
108315
diff
changeset
|
3342 else |
3e9a832a5533
Hide scroll bar when window is too small to avoid Gtk+ warning.
Jan D. <jan.h.d@swipnet.se>
parents:
108315
diff
changeset
|
3343 { |
3e9a832a5533
Hide scroll bar when window is too small to avoid Gtk+ warning.
Jan D. <jan.h.d@swipnet.se>
parents:
108315
diff
changeset
|
3344 gtk_widget_show_all (wparent); |
3e9a832a5533
Hide scroll bar when window is too small to avoid Gtk+ warning.
Jan D. <jan.h.d@swipnet.se>
parents:
108315
diff
changeset
|
3345 gtk_widget_set_size_request (wscroll, width, height); |
3e9a832a5533
Hide scroll bar when window is too small to avoid Gtk+ warning.
Jan D. <jan.h.d@swipnet.se>
parents:
108315
diff
changeset
|
3346 } |
106720
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
3347 gtk_widget_queue_draw (wfixed); |
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
|
3348 gdk_window_process_all_updates (); |
109037
3e9a832a5533
Hide scroll bar when window is too small to avoid Gtk+ warning.
Jan D. <jan.h.d@swipnet.se>
parents:
108315
diff
changeset
|
3349 if (oldx != -1 && oldw > 0 && oldh > 0) |
106720
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
3350 { |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
3351 /* Clear under old scroll bar position. This must be done after |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
3352 the gtk_widget_queue_draw and gdk_window_process_all_updates |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
3353 above. */ |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
3354 x_clear_area (FRAME_X_DISPLAY (f), |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
3355 FRAME_X_WINDOW (f), |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
3356 oldx, oldy, oldw, oldh, 0); |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
3357 } |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
3358 |
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
|
3359 /* 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
|
3360 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
|
3361 here to get some events. */ |
106720
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
3362 |
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
|
3363 x_sync (f); |
49572 | 3364 SET_FRAME_GARBAGED (f); |
3365 cancel_mouse_face (f); | |
3366 } | |
49323 | 3367 } |
3368 | |
3369 /* Set the thumb size and position of scroll bar BAR. We are currently | |
3370 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
|
3371 |
49323 | 3372 void |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3373 xg_set_toolkit_scroll_bar_thumb (struct scroll_bar *bar, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3374 int portion, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3375 int position, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3376 int whole) |
49323 | 3377 { |
86161
3408ab8b4152
* xterm.h (struct scroll_bar): Only use Lisp_Object for lisp data.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85938
diff
changeset
|
3378 GtkWidget *wscroll = xg_get_widget_from_map (bar->x_window); |
49323 | 3379 |
3380 FRAME_PTR f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window))); | |
3381 | |
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
|
3382 if (wscroll && NILP (bar->dragging)) |
49323 | 3383 { |
3384 GtkAdjustment *adj; | |
3385 gdouble shown; | |
3386 gdouble top; | |
3387 int size, value; | |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3388 int new_step; |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3389 int changed = 0; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3390 |
49323 | 3391 adj = gtk_range_get_adjustment (GTK_RANGE (wscroll)); |
3392 | |
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
|
3393 /* 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
|
3394 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
|
3395 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
|
3396 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
|
3397 /* 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
|
3398 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
|
3399 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
|
3400 |
49323 | 3401 if (whole <= 0) |
3402 top = 0, shown = 1; | |
3403 else | |
3404 { | |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3405 top = (gdouble) position / whole; |
49323 | 3406 shown = (gdouble) portion / whole; |
3407 } | |
3408 | |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3409 size = shown * XG_SB_RANGE; |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3410 size = min (size, XG_SB_RANGE); |
49323 | 3411 size = max (size, 1); |
3412 | |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3413 value = top * XG_SB_RANGE; |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3414 value = min (value, XG_SB_MAX - size); |
49323 | 3415 value = max (value, XG_SB_MIN); |
3416 | |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3417 /* 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
|
3418 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
|
3419 |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3420 if ((int) gtk_adjustment_get_page_size (adj) != size |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3421 || (int) gtk_adjustment_get_step_increment (adj) != 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
|
3422 { |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3423 gtk_adjustment_set_page_size (adj, size); |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3424 gtk_adjustment_set_step_increment (adj, 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
|
3425 /* Assume a page increment is about 95% of the page size */ |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3426 gtk_adjustment_set_page_increment (adj,(int) (0.95*size)); |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3427 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
|
3428 } |
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
|
3429 |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3430 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
|
3431 { |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3432 BLOCK_INPUT; |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3433 |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3434 /* 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
|
3435 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
|
3436 xg_ignore_gtk_scrollbar = 1; |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3437 |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3438 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
|
3439 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
|
3440 else if (changed) |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3441 gtk_adjustment_changed (adj); |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3442 |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3443 xg_ignore_gtk_scrollbar = 0; |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3444 |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3445 UNBLOCK_INPUT; |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3446 } |
49323 | 3447 } |
3448 } | |
3449 | |
105880
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3450 /* Return non-zero if EVENT is for a scroll bar in frame F. |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3451 When the same X window is used for several Gtk+ widgets, we cannot |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3452 say for sure based on the X window alone if an event is for the |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3453 frame. This function does additional checks. |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3454 |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3455 Return non-zero if the event is for a scroll bar, zero otherwise. */ |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3456 |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3457 int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3458 xg_event_is_for_scrollbar (FRAME_PTR f, XEvent *event) |
105880
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3459 { |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3460 int retval = 0; |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3461 |
106559
bac7488df503
Bug 5177: Scroll bar thumb did not move when scrolling with mouse wheel.
Jan Djärv <jan.h.d@swipnet.se>
parents:
106549
diff
changeset
|
3462 if (f && event->type == ButtonPress && event->xbutton.button < 4) |
105880
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3463 { |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3464 /* Check if press occurred outside the edit widget. */ |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3465 GdkDisplay *gdpy = gdk_x11_lookup_xdisplay (FRAME_X_DISPLAY (f)); |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3466 retval = gdk_display_get_window_at_pointer (gdpy, NULL, NULL) |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3467 != gtk_widget_get_window (f->output_data.x->edit_widget); |
105880
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3468 } |
106559
bac7488df503
Bug 5177: Scroll bar thumb did not move when scrolling with mouse wheel.
Jan Djärv <jan.h.d@swipnet.se>
parents:
106549
diff
changeset
|
3469 else if (f |
bac7488df503
Bug 5177: Scroll bar thumb did not move when scrolling with mouse wheel.
Jan Djärv <jan.h.d@swipnet.se>
parents:
106549
diff
changeset
|
3470 && ((event->type == ButtonRelease && event->xbutton.button < 4) |
bac7488df503
Bug 5177: Scroll bar thumb did not move when scrolling with mouse wheel.
Jan Djärv <jan.h.d@swipnet.se>
parents:
106549
diff
changeset
|
3471 || event->type == MotionNotify)) |
105880
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3472 { |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3473 /* If we are releasing or moving the scroll bar, it has the grab. */ |
107997
d94009e7a0cc
gtkutils.c (xg_event_is_for_scrollbar): Check if grabbed widget is a scrollbar.
Jan D. <jan.h.d@swipnet.se>
parents:
107891
diff
changeset
|
3474 GtkWidget *w = gtk_grab_get_current (); |
d94009e7a0cc
gtkutils.c (xg_event_is_for_scrollbar): Check if grabbed widget is a scrollbar.
Jan D. <jan.h.d@swipnet.se>
parents:
107891
diff
changeset
|
3475 retval = w != 0 && GTK_IS_SCROLLBAR (w); |
105880
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3476 } |
106549
3acd32c3e0ac
gtkutil.c: Scroll bar thumb not updated properly (bug #5177).
Jan Djärv <jan.h.d@swipnet.se>
parents:
106512
diff
changeset
|
3477 |
105880
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3478 return retval; |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3479 } |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3480 |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3481 |
49323 | 3482 |
3483 /*********************************************************************** | |
3484 Tool bar functions | |
3485 ***********************************************************************/ | |
3486 /* The key for the data we put in the GtkImage widgets. The data is | |
3487 the image used by Emacs. We use this to see if we need to update | |
3488 the GtkImage with a new image. */ | |
3489 #define XG_TOOL_BAR_IMAGE_DATA "emacs-tool-bar-image" | |
3490 | |
68874
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3491 /* 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
|
3492 get them. */ |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3493 #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
|
3494 |
75009
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3495 /* The key for storing the button widget in its proxy menu item. */ |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3496 #define XG_TOOL_BAR_PROXY_BUTTON "emacs-tool-bar-proxy-button" |
68874
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3497 |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3498 /* The key for the data we put in the GtkImage widgets. The data is |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3499 the stock name used by Emacs. We use this to see if we need to update |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3500 the GtkImage with a new image. */ |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3501 #define XG_TOOL_BAR_STOCK_NAME "emacs-tool-bar-stock-name" |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3502 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3503 /* As above, but this is used for named theme widgets, as opposed to |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3504 stock items. */ |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3505 #define XG_TOOL_BAR_ICON_NAME "emacs-tool-bar-icon-name" |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3506 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3507 /* Callback function invoked when a tool bar item is pressed. |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3508 W is the button widget in the tool bar that got pressed, |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3509 CLIENT_DATA is an integer that is the index of the button in the |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3510 tool bar. 0 is the first button. */ |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3511 |
68874
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3512 static gboolean |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3513 xg_tool_bar_button_cb (GtkWidget *widget, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3514 GdkEventButton *event, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3515 gpointer user_data) |
68874
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3516 { |
73389
7b5c0104efb0
* gtkutil.c (get_utf8_string): Remove warnings with casts.
Jan Djärv <jan.h.d@swipnet.se>
parents:
73066
diff
changeset
|
3517 /* 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
|
3518 gpointer ptr = (gpointer) (EMACS_INT) event->state; |
74990
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
3519 g_object_set_data (G_OBJECT (widget), XG_TOOL_BAR_LAST_MODIFIER, ptr); |
68922 | 3520 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
|
3521 } |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3522 |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3523 |
74990
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
3524 /* Callback function invoked when a tool bar item is pressed. |
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
3525 W is the button widget in the tool bar that got pressed, |
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
3526 CLIENT_DATA is an integer that is the index of the button in the |
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
3527 tool bar. 0 is the first button. */ |
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
3528 |
49323 | 3529 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3530 xg_tool_bar_callback (GtkWidget *w, gpointer client_data) |
49323 | 3531 { |
59411
ecb6689e04bf
* gtkutil.c (xg_gtk_scroll_destroy, xg_create_scroll_bar)
Jan Djärv <jan.h.d@swipnet.se>
parents:
59102
diff
changeset
|
3532 /* 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
|
3533 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
|
3534 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
|
3535 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
|
3536 |
49323 | 3537 FRAME_PTR f = (FRAME_PTR) g_object_get_data (G_OBJECT (w), XG_FRAME_DATA); |
3538 Lisp_Object key, frame; | |
3539 struct input_event event; | |
51569
e7bd8581e306
(xg_tool_bar_callback): Don't pass uninitialized
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51432
diff
changeset
|
3540 EVENT_INIT (event); |
49323 | 3541 |
3542 if (! f || ! f->n_tool_bar_items || NILP (f->tool_bar_items)) | |
3543 return; | |
3544 | |
3545 idx *= TOOL_BAR_ITEM_NSLOTS; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3546 |
49323 | 3547 key = AREF (f->tool_bar_items, idx + TOOL_BAR_ITEM_KEY); |
3548 XSETFRAME (frame, f); | |
78538
2fcf45c12927
(update_frame_tool_bar): Use -1 as index
Jan Djärv <jan.h.d@swipnet.se>
parents:
78260
diff
changeset
|
3549 |
2fcf45c12927
(update_frame_tool_bar): Use -1 as index
Jan Djärv <jan.h.d@swipnet.se>
parents:
78260
diff
changeset
|
3550 /* We generate two events here. The first one is to set the prefix |
2fcf45c12927
(update_frame_tool_bar): Use -1 as index
Jan Djärv <jan.h.d@swipnet.se>
parents:
78260
diff
changeset
|
3551 to `(tool_bar)', see keyboard.c. */ |
49323 | 3552 event.kind = TOOL_BAR_EVENT; |
3553 event.frame_or_window = frame; | |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
3554 event.arg = frame; |
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
3555 kbd_buffer_store_event (&event); |
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
3556 |
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
3557 event.kind = TOOL_BAR_EVENT; |
49323 | 3558 event.frame_or_window = frame; |
3559 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
|
3560 /* Convert between the modifier bits GDK uses and the modifier bits |
102549
f737bc68655e
* gtkutil.c (xg_tool_bar_callback): Set focus back to the frame
Jan Djärv <jan.h.d@swipnet.se>
parents:
102358
diff
changeset
|
3561 Emacs uses. This assumes GDK and X masks are the same, which they are when |
68874
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3562 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
|
3563 event.modifiers = x_x_to_emacs_modifiers (FRAME_X_DISPLAY_INFO (f), mod); |
49323 | 3564 kbd_buffer_store_event (&event); |
102549
f737bc68655e
* gtkutil.c (xg_tool_bar_callback): Set focus back to the frame
Jan Djärv <jan.h.d@swipnet.se>
parents:
102358
diff
changeset
|
3565 |
f737bc68655e
* gtkutil.c (xg_tool_bar_callback): Set focus back to the frame
Jan Djärv <jan.h.d@swipnet.se>
parents:
102358
diff
changeset
|
3566 /* Return focus to the frame after we have clicked on a detached |
f737bc68655e
* gtkutil.c (xg_tool_bar_callback): Set focus back to the frame
Jan Djärv <jan.h.d@swipnet.se>
parents:
102358
diff
changeset
|
3567 tool bar button. */ |
f737bc68655e
* gtkutil.c (xg_tool_bar_callback): Set focus back to the frame
Jan Djärv <jan.h.d@swipnet.se>
parents:
102358
diff
changeset
|
3568 Fx_focus_frame (frame); |
49323 | 3569 } |
3570 | |
75009
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3571 /* Callback function invoked when a tool bar item is pressed in a detached |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3572 tool bar or the overflow drop down menu. |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3573 We just call xg_tool_bar_callback. |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3574 W is the menu item widget that got pressed, |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3575 CLIENT_DATA is an integer that is the index of the button in the |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3576 tool bar. 0 is the first button. */ |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3577 |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3578 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3579 xg_tool_bar_proxy_callback (GtkWidget *w, gpointer client_data) |
75009
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3580 { |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3581 GtkWidget *wbutton = GTK_WIDGET (g_object_get_data (G_OBJECT (w), |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3582 XG_TOOL_BAR_PROXY_BUTTON)); |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3583 xg_tool_bar_callback (wbutton, client_data); |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3584 } |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3585 |
103673
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3586 |
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3587 static gboolean |
109100
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109067
diff
changeset
|
3588 xg_tool_bar_help_callback (GtkWidget *w, |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109067
diff
changeset
|
3589 GdkEventCrossing *event, |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
109067
diff
changeset
|
3590 gpointer client_data); |
103673
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3591 |
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3592 /* This callback is called when a help is to be shown for an item in |
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3593 the detached tool bar when the detached tool bar it is not expanded. */ |
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3594 |
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3595 static gboolean |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3596 xg_tool_bar_proxy_help_callback (GtkWidget *w, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3597 GdkEventCrossing *event, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3598 gpointer client_data) |
103673
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3599 { |
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3600 GtkWidget *wbutton = GTK_WIDGET (g_object_get_data (G_OBJECT (w), |
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3601 XG_TOOL_BAR_PROXY_BUTTON)); |
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3602 |
106512
471e6932ea09
(xg_tool_bar_proxy_help_callback): Fix missing return.
Andreas Schwab <schwab@linux-m68k.org>
parents:
106186
diff
changeset
|
3603 return xg_tool_bar_help_callback (wbutton, event, client_data); |
103673
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3604 } |
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3605 |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3606 static GtkWidget * |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3607 xg_get_tool_bar_widgets (GtkWidget *vb, GtkWidget **wimage) |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3608 { |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3609 GList *clist = gtk_container_get_children (GTK_CONTAINER (vb)); |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3610 GtkWidget *c1 = (GtkWidget *) clist->data; |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3611 GtkWidget *c2 = (GtkWidget *) clist->next->data; |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3612 *wimage = GTK_IS_IMAGE (c1) ? c1 : c2; |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3613 g_list_free (clist); |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3614 return GTK_IS_LABEL (c1) ? c1 : c2; |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3615 } |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3616 |
103673
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3617 |
75009
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3618 /* This callback is called when a tool item should create a proxy item, |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3619 such as for the overflow menu. Also called when the tool bar is detached. |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3620 If we don't create a proxy menu item, the detached tool bar will be |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3621 blank. */ |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3622 |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3623 static gboolean |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3624 xg_tool_bar_menu_proxy (GtkToolItem *toolitem, gpointer user_data) |
75009
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3625 { |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3626 GtkWidget *weventbox = gtk_bin_get_child (GTK_BIN (toolitem)); |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3627 GtkButton *wbutton = GTK_BUTTON (gtk_bin_get_child (GTK_BIN (weventbox))); |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3628 GtkWidget *vb = gtk_bin_get_child (GTK_BIN (wbutton)); |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3629 GtkWidget *c1; |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3630 GtkLabel *wlbl = GTK_LABEL (xg_get_tool_bar_widgets (vb, &c1)); |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3631 GtkImage *wimage = GTK_IMAGE (c1); |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3632 GtkWidget *wmenuitem = gtk_image_menu_item_new_with_label |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3633 (gtk_label_get_text (wlbl)); |
75009
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3634 GtkWidget *wmenuimage; |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3635 |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3636 |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
3637 if (gtk_button_get_use_stock (wbutton)) |
75009
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3638 wmenuimage = gtk_image_new_from_stock (gtk_button_get_label (wbutton), |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3639 GTK_ICON_SIZE_MENU); |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3640 else |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3641 { |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3642 GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (wbutton)); |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3643 GtkImageType store_type = gtk_image_get_storage_type (wimage); |
85938
d7e05ac913d8
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
84621
diff
changeset
|
3644 |
75009
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3645 if (store_type == GTK_IMAGE_STOCK) |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3646 { |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3647 gchar *stock_id; |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3648 gtk_image_get_stock (wimage, &stock_id, NULL); |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3649 wmenuimage = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_MENU); |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3650 } |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3651 else if (store_type == GTK_IMAGE_ICON_SET) |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3652 { |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3653 GtkIconSet *icon_set; |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3654 gtk_image_get_icon_set (wimage, &icon_set, NULL); |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3655 wmenuimage = gtk_image_new_from_icon_set (icon_set, |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3656 GTK_ICON_SIZE_MENU); |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3657 } |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3658 else if (store_type == GTK_IMAGE_PIXBUF) |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3659 { |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3660 gint width, height; |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
3661 |
75009
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3662 if (settings && |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3663 gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_MENU, |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3664 &width, &height)) |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3665 { |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3666 GdkPixbuf *src_pixbuf, *dest_pixbuf; |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3667 |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3668 src_pixbuf = gtk_image_get_pixbuf (wimage); |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3669 dest_pixbuf = gdk_pixbuf_scale_simple (src_pixbuf, width, height, |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3670 GDK_INTERP_BILINEAR); |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3671 |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3672 wmenuimage = gtk_image_new_from_pixbuf (dest_pixbuf); |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3673 } |
79340
7c710af0ae5e
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
78809
diff
changeset
|
3674 else |
7c710af0ae5e
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
78809
diff
changeset
|
3675 { |
7c710af0ae5e
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
78809
diff
changeset
|
3676 fprintf (stderr, "internal error: GTK_IMAGE_PIXBUF failed\n"); |
7c710af0ae5e
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
78809
diff
changeset
|
3677 abort (); |
7c710af0ae5e
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
78809
diff
changeset
|
3678 } |
7c710af0ae5e
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
78809
diff
changeset
|
3679 } |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
3680 else if (store_type == GTK_IMAGE_ICON_NAME) |
79340
7c710af0ae5e
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
78809
diff
changeset
|
3681 { |
7c710af0ae5e
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
78809
diff
changeset
|
3682 const gchar *icon_name; |
7c710af0ae5e
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
78809
diff
changeset
|
3683 GtkIconSize icon_size; |
7c710af0ae5e
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
78809
diff
changeset
|
3684 |
7c710af0ae5e
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
78809
diff
changeset
|
3685 gtk_image_get_icon_name (wimage, &icon_name, &icon_size); |
7c710af0ae5e
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
78809
diff
changeset
|
3686 wmenuimage = gtk_image_new_from_icon_name (icon_name, |
7c710af0ae5e
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
78809
diff
changeset
|
3687 GTK_ICON_SIZE_MENU); |
7c710af0ae5e
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
78809
diff
changeset
|
3688 } |
7c710af0ae5e
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
78809
diff
changeset
|
3689 else |
7c710af0ae5e
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
78809
diff
changeset
|
3690 { |
7c710af0ae5e
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
78809
diff
changeset
|
3691 fprintf (stderr, "internal error: store_type is %d\n", store_type); |
7c710af0ae5e
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
78809
diff
changeset
|
3692 abort (); |
75009
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3693 } |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3694 } |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3695 if (wmenuimage) |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3696 gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (wmenuitem), wmenuimage); |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3697 |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3698 g_signal_connect (G_OBJECT (wmenuitem), |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3699 "activate", |
103022
15bf0d8a6099
Make Emacs compile when Gtk+ and -DGTK_DISABLE_DEPRECATED is used.
Jan Djärv <jan.h.d@swipnet.se>
parents:
102705
diff
changeset
|
3700 G_CALLBACK (xg_tool_bar_proxy_callback), |
75009
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3701 user_data); |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3702 |
103673
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3703 |
75009
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3704 g_object_set_data (G_OBJECT (wmenuitem), XG_TOOL_BAR_PROXY_BUTTON, |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3705 (gpointer) wbutton); |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3706 gtk_tool_item_set_proxy_menu_item (toolitem, "Emacs toolbar item", wmenuitem); |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3707 gtk_widget_set_sensitive (wmenuitem, |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3708 gtk_widget_get_sensitive (GTK_WIDGET (wbutton))); |
103673
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3709 |
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3710 /* Use enter/leave notify to show help. We use the events |
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3711 rather than the GtkButton specific signals "enter" and |
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3712 "leave", so we can have only one callback. The event |
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3713 will tell us what kind of event it is. */ |
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3714 g_signal_connect (G_OBJECT (wmenuitem), |
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3715 "enter-notify-event", |
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3716 G_CALLBACK (xg_tool_bar_proxy_help_callback), |
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3717 user_data); |
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3718 g_signal_connect (G_OBJECT (wmenuitem), |
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3719 "leave-notify-event", |
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3720 G_CALLBACK (xg_tool_bar_proxy_help_callback), |
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3721 user_data); |
75009
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3722 |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3723 return TRUE; |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3724 } |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3725 |
49323 | 3726 /* This callback is called when a tool bar is detached. We must set |
3727 the height of the tool bar to zero when this happens so frame sizes | |
3728 are correctly calculated. | |
3729 WBOX is the handle box widget that enables detach/attach of the tool bar. | |
3730 W is the tool bar widget. | |
3731 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
|
3732 |
49323 | 3733 static void |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3734 xg_tool_bar_detach_callback (GtkHandleBox *wbox, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3735 GtkWidget *w, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3736 gpointer client_data) |
49323 | 3737 { |
3738 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
|
3739 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
|
3740 |
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
|
3741 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
|
3742 NULL); |
49323 | 3743 |
3744 if (f) | |
3745 { | |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3746 GtkRequisition req, req2; |
59420
eb72706060ad
* xterm.h (struct x_output): New member, toolbar_detached.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59411
diff
changeset
|
3747 FRAME_X_OUTPUT (f)->toolbar_detached = 1; |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3748 gtk_widget_size_request (GTK_WIDGET (wbox), &req); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3749 gtk_widget_size_request (w, &req2); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3750 req.width -= req2.width; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3751 req.height -= req2.height; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3752 if (FRAME_TOOLBAR_TOP_HEIGHT (f) != 0) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3753 FRAME_TOOLBAR_TOP_HEIGHT (f) = req.height; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3754 else if (FRAME_TOOLBAR_BOTTOM_HEIGHT (f) != 0) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3755 FRAME_TOOLBAR_BOTTOM_HEIGHT (f) = req.height; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3756 else if (FRAME_TOOLBAR_RIGHT_WIDTH (f) != 0) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3757 FRAME_TOOLBAR_RIGHT_WIDTH (f) = req.width; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3758 else if (FRAME_TOOLBAR_LEFT_WIDTH (f) != 0) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3759 FRAME_TOOLBAR_LEFT_WIDTH (f) = req.width; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3760 xg_height_or_width_changed (f); |
49323 | 3761 } |
3762 } | |
3763 | |
3764 /* This callback is called when a tool bar is reattached. We must set | |
3765 the height of the tool bar when this happens so frame sizes | |
3766 are correctly calculated. | |
3767 WBOX is the handle box widget that enables detach/attach of the tool bar. | |
3768 W is the tool bar widget. | |
3769 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
|
3770 |
49323 | 3771 static void |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3772 xg_tool_bar_attach_callback (GtkHandleBox *wbox, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3773 GtkWidget *w, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3774 gpointer client_data) |
49323 | 3775 { |
3776 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
|
3777 g_object_set (G_OBJECT (w), "show-arrow", TRUE, NULL); |
49323 | 3778 |
3779 if (f) | |
3780 { | |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3781 GtkRequisition req, req2; |
59420
eb72706060ad
* xterm.h (struct x_output): New member, toolbar_detached.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59411
diff
changeset
|
3782 FRAME_X_OUTPUT (f)->toolbar_detached = 0; |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3783 gtk_widget_size_request (GTK_WIDGET (wbox), &req); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3784 gtk_widget_size_request (w, &req2); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3785 req.width += req2.width; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3786 req.height += req2.height; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3787 if (FRAME_TOOLBAR_TOP_HEIGHT (f) != 0) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3788 FRAME_TOOLBAR_TOP_HEIGHT (f) = req.height; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3789 else if (FRAME_TOOLBAR_BOTTOM_HEIGHT (f) != 0) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3790 FRAME_TOOLBAR_BOTTOM_HEIGHT (f) = req.height; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3791 else if (FRAME_TOOLBAR_RIGHT_WIDTH (f) != 0) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3792 FRAME_TOOLBAR_RIGHT_WIDTH (f) = req.width; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3793 else if (FRAME_TOOLBAR_LEFT_WIDTH (f) != 0) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3794 FRAME_TOOLBAR_LEFT_WIDTH (f) = req.width; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3795 xg_height_or_width_changed (f); |
49323 | 3796 } |
3797 } | |
3798 | |
3799 /* This callback is called when the mouse enters or leaves a tool bar item. | |
3800 It is used for displaying and hiding the help text. | |
3801 W is the tool bar item, a button. | |
3802 EVENT is either an enter event or leave event. | |
3803 CLIENT_DATA is an integer that is the index of the button in the | |
3804 tool bar. 0 is the first button. | |
3805 | |
3806 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
|
3807 |
49323 | 3808 static gboolean |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3809 xg_tool_bar_help_callback (GtkWidget *w, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3810 GdkEventCrossing *event, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3811 gpointer client_data) |
49323 | 3812 { |
59411
ecb6689e04bf
* gtkutil.c (xg_gtk_scroll_destroy, xg_create_scroll_bar)
Jan Djärv <jan.h.d@swipnet.se>
parents:
59102
diff
changeset
|
3813 /* 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
|
3814 int idx = (int) (EMACS_INT) client_data; |
49323 | 3815 FRAME_PTR f = (FRAME_PTR) g_object_get_data (G_OBJECT (w), XG_FRAME_DATA); |
3816 Lisp_Object help, frame; | |
3817 | |
3818 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
|
3819 return FALSE; |
49323 | 3820 |
3821 if (event->type == GDK_ENTER_NOTIFY) | |
3822 { | |
3823 idx *= TOOL_BAR_ITEM_NSLOTS; | |
3824 help = AREF (f->tool_bar_items, idx + TOOL_BAR_ITEM_HELP); | |
3825 | |
3826 if (NILP (help)) | |
3827 help = AREF (f->tool_bar_items, idx + TOOL_BAR_ITEM_CAPTION); | |
3828 } | |
3829 else | |
3830 help = Qnil; | |
3831 | |
3832 XSETFRAME (frame, f); | |
3833 kbd_buffer_store_help_event (frame, help); | |
3834 | |
3835 return FALSE; | |
3836 } | |
3837 | |
3838 | |
49826
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3839 /* 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
|
3840 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
|
3841 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
|
3842 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
|
3843 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
|
3844 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
|
3845 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
|
3846 |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3847 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
|
3848 |
49826
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3849 static gboolean |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3850 xg_tool_bar_item_expose_callback (GtkWidget *w, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3851 GdkEventExpose *event, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
3852 gpointer 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
|
3853 { |
50333
60da21fd968b
* gtkutil.c (xg_tool_bar_item_expose_callback): Reduce size
Jan Djärv <jan.h.d@swipnet.se>
parents:
50318
diff
changeset
|
3854 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
|
3855 |
60da21fd968b
* gtkutil.c (xg_tool_bar_item_expose_callback): Reduce size
Jan Djärv <jan.h.d@swipnet.se>
parents:
50318
diff
changeset
|
3856 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
|
3857 |
60da21fd968b
* gtkutil.c (xg_tool_bar_item_expose_callback): Reduce size
Jan Djärv <jan.h.d@swipnet.se>
parents:
50318
diff
changeset
|
3858 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
|
3859 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
|
3860 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
3861 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
|
3862 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
|
3863 |
50333
60da21fd968b
* gtkutil.c (xg_tool_bar_item_expose_callback): Reduce size
Jan Djärv <jan.h.d@swipnet.se>
parents:
50318
diff
changeset
|
3864 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
|
3865 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
|
3866 |
49826
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3867 return FALSE; |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3868 } |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3869 |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3870 #ifdef HAVE_GTK_ORIENTABLE_SET_ORIENTATION |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3871 #define toolbar_set_orientation(w, o) \ |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3872 gtk_orientable_set_orientation (GTK_ORIENTABLE (w), o) |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3873 #else |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3874 #define toolbar_set_orientation(w, o) \ |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3875 gtk_toolbar_set_orientation (GTK_TOOLBAR (w), o) |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3876 #endif |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3877 |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3878 /* Attach a tool bar to frame F. */ |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3879 |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3880 static void |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3881 xg_pack_tool_bar (FRAME_PTR f, Lisp_Object pos) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3882 { |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3883 struct x_output *x = f->output_data.x; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3884 int into_hbox = EQ (pos, Qleft) || EQ (pos, Qright); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3885 |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3886 toolbar_set_orientation (x->toolbar_widget, |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3887 into_hbox |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3888 ? GTK_ORIENTATION_VERTICAL |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3889 : GTK_ORIENTATION_HORIZONTAL); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3890 if (!x->handlebox_widget) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3891 { |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3892 x->handlebox_widget = gtk_handle_box_new (); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3893 g_signal_connect (G_OBJECT (x->handlebox_widget), "child-detached", |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3894 G_CALLBACK (xg_tool_bar_detach_callback), f); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3895 g_signal_connect (G_OBJECT (x->handlebox_widget), "child-attached", |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3896 G_CALLBACK (xg_tool_bar_attach_callback), f); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3897 gtk_container_add (GTK_CONTAINER (x->handlebox_widget), |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3898 x->toolbar_widget); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3899 } |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3900 |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3901 if (into_hbox) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3902 { |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3903 gtk_box_pack_start (GTK_BOX (x->hbox_widget), x->handlebox_widget, |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3904 FALSE, FALSE, 0); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3905 |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3906 if (EQ (pos, Qleft)) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3907 gtk_box_reorder_child (GTK_BOX (x->hbox_widget), |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3908 x->handlebox_widget, |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3909 0); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3910 x->toolbar_in_hbox = 1; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3911 } |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3912 else |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3913 { |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3914 int vbox_pos = x->menubar_widget ? 1 : 0; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3915 gtk_box_pack_start (GTK_BOX (x->vbox_widget), x->handlebox_widget, |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3916 FALSE, FALSE, 0); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3917 |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3918 if (EQ (pos, Qtop)) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3919 gtk_box_reorder_child (GTK_BOX (x->vbox_widget), |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3920 x->handlebox_widget, |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3921 vbox_pos); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3922 x->toolbar_in_hbox = 0; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3923 } |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3924 } |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3925 |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3926 /* Create a tool bar for frame F. */ |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
3927 |
49323 | 3928 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3929 xg_create_tool_bar (FRAME_PTR f) |
49323 | 3930 { |
3931 struct x_output *x = f->output_data.x; | |
3932 | |
3933 x->toolbar_widget = gtk_toolbar_new (); | |
59420
eb72706060ad
* xterm.h (struct x_output): New member, toolbar_detached.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59411
diff
changeset
|
3934 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
|
3935 |
49826
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3936 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
|
3937 |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3938 gtk_toolbar_set_style (GTK_TOOLBAR (x->toolbar_widget), GTK_TOOLBAR_ICONS); |
109566
d03bc4a3fced
Add tool bar style text-image-horiz (text to the left of the image).
Jan D. <jan.h.d@swipnet.se>
parents:
109454
diff
changeset
|
3939 toolbar_set_orientation (x->toolbar_widget, GTK_ORIENTATION_HORIZONTAL); |
49323 | 3940 } |
3941 | |
92366
39b38c867ca4
(xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents:
91632
diff
changeset
|
3942 |
39b38c867ca4
(xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents:
91632
diff
changeset
|
3943 #define PROP(IDX) AREF (f->tool_bar_items, i * TOOL_BAR_ITEM_NSLOTS + (IDX)) |
39b38c867ca4
(xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents:
91632
diff
changeset
|
3944 |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3945 /* Find the right-to-left image named by RTL in the tool bar images for F. |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3946 Returns IMAGE if RTL is not found. */ |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3947 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3948 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
3949 find_rtl_image (FRAME_PTR f, Lisp_Object image, Lisp_Object rtl) |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3950 { |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3951 int i; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3952 Lisp_Object file, rtl_name; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3953 struct gcpro gcpro1, gcpro2; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3954 GCPRO2 (file, rtl_name); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3955 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3956 rtl_name = Ffile_name_nondirectory (rtl); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3957 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3958 for (i = 0; i < f->n_tool_bar_items; ++i) |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3959 { |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3960 Lisp_Object rtl_image = PROP (TOOL_BAR_ITEM_IMAGES); |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
3961 if (!NILP (file = file_for_image (rtl_image))) |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3962 { |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3963 file = call1 (intern ("file-name-sans-extension"), |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3964 Ffile_name_nondirectory (file)); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3965 if (EQ (Fequal (file, rtl_name), Qt)) |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3966 { |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3967 image = rtl_image; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3968 break; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3969 } |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3970 } |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3971 } |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3972 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3973 return image; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3974 } |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3975 |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3976 static GtkToolItem * |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3977 xg_make_tool_item (FRAME_PTR f, |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3978 GtkWidget *wimage, |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3979 GtkWidget **wbutton, |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3980 char *label, |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3981 int i) |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3982 { |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3983 GtkToolItem *ti = gtk_tool_item_new (); |
109566
d03bc4a3fced
Add tool bar style text-image-horiz (text to the left of the image).
Jan D. <jan.h.d@swipnet.se>
parents:
109454
diff
changeset
|
3984 Lisp_Object style = Ftool_bar_get_system_style (); |
d03bc4a3fced
Add tool bar style text-image-horiz (text to the left of the image).
Jan D. <jan.h.d@swipnet.se>
parents:
109454
diff
changeset
|
3985 int both_horiz = EQ (style, Qboth_horiz); |
d03bc4a3fced
Add tool bar style text-image-horiz (text to the left of the image).
Jan D. <jan.h.d@swipnet.se>
parents:
109454
diff
changeset
|
3986 int text_image = EQ (style, Qtext_image_horiz); |
d03bc4a3fced
Add tool bar style text-image-horiz (text to the left of the image).
Jan D. <jan.h.d@swipnet.se>
parents:
109454
diff
changeset
|
3987 |
d03bc4a3fced
Add tool bar style text-image-horiz (text to the left of the image).
Jan D. <jan.h.d@swipnet.se>
parents:
109454
diff
changeset
|
3988 GtkWidget *vb = both_horiz || text_image |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3989 ? gtk_hbox_new (FALSE, 0) : gtk_vbox_new (FALSE, 0); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3990 GtkWidget *wb = gtk_button_new (); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3991 GtkWidget *weventbox = gtk_event_box_new (); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3992 |
109566
d03bc4a3fced
Add tool bar style text-image-horiz (text to the left of the image).
Jan D. <jan.h.d@swipnet.se>
parents:
109454
diff
changeset
|
3993 if (wimage && ! text_image) |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3994 gtk_box_pack_start (GTK_BOX (vb), wimage, TRUE, TRUE, 0); |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3995 |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
3996 gtk_box_pack_start (GTK_BOX (vb), gtk_label_new (label), TRUE, TRUE, 0); |
109566
d03bc4a3fced
Add tool bar style text-image-horiz (text to the left of the image).
Jan D. <jan.h.d@swipnet.se>
parents:
109454
diff
changeset
|
3997 |
d03bc4a3fced
Add tool bar style text-image-horiz (text to the left of the image).
Jan D. <jan.h.d@swipnet.se>
parents:
109454
diff
changeset
|
3998 if (wimage && text_image) |
d03bc4a3fced
Add tool bar style text-image-horiz (text to the left of the image).
Jan D. <jan.h.d@swipnet.se>
parents:
109454
diff
changeset
|
3999 gtk_box_pack_start (GTK_BOX (vb), wimage, TRUE, TRUE, 0); |
d03bc4a3fced
Add tool bar style text-image-horiz (text to the left of the image).
Jan D. <jan.h.d@swipnet.se>
parents:
109454
diff
changeset
|
4000 |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4001 gtk_button_set_focus_on_click (GTK_BUTTON (wb), FALSE); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4002 gtk_button_set_relief (GTK_BUTTON (wb), GTK_RELIEF_NONE); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4003 gtk_container_add (GTK_CONTAINER (wb), vb); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4004 gtk_container_add (GTK_CONTAINER (weventbox), wb); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4005 gtk_container_add (GTK_CONTAINER (ti), weventbox); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4006 |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4007 if (wimage) |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4008 { |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4009 /* The EMACS_INT cast avoids a warning. */ |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4010 g_signal_connect (G_OBJECT (ti), "create-menu-proxy", |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4011 G_CALLBACK (xg_tool_bar_menu_proxy), |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4012 (gpointer) (EMACS_INT) i); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4013 |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4014 g_signal_connect (G_OBJECT (wb), "clicked", |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4015 G_CALLBACK (xg_tool_bar_callback), |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4016 (gpointer) (EMACS_INT) i); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4017 |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4018 g_object_set_data (G_OBJECT (weventbox), XG_FRAME_DATA, (gpointer)f); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4019 |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4020 /* Catch expose events to overcome an annoying redraw bug, see |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4021 comment for xg_tool_bar_item_expose_callback. */ |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4022 g_signal_connect (G_OBJECT (ti), |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4023 "expose-event", |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4024 G_CALLBACK (xg_tool_bar_item_expose_callback), |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4025 0); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4026 |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4027 gtk_tool_item_set_homogeneous (ti, FALSE); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4028 |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4029 /* Callback to save modifyer mask (Shift/Control, etc). GTK makes |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4030 no distinction based on modifiers in the activate callback, |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4031 so we have to do it ourselves. */ |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4032 g_signal_connect (wb, "button-release-event", |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4033 G_CALLBACK (xg_tool_bar_button_cb), |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4034 NULL); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4035 |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4036 g_object_set_data (G_OBJECT (wb), XG_FRAME_DATA, (gpointer)f); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4037 |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4038 /* Use enter/leave notify to show help. We use the events |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4039 rather than the GtkButton specific signals "enter" and |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4040 "leave", so we can have only one callback. The event |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4041 will tell us what kind of event it is. */ |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4042 /* The EMACS_INT cast avoids a warning. */ |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4043 g_signal_connect (G_OBJECT (weventbox), |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4044 "enter-notify-event", |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4045 G_CALLBACK (xg_tool_bar_help_callback), |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4046 (gpointer) (EMACS_INT) i); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4047 g_signal_connect (G_OBJECT (weventbox), |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4048 "leave-notify-event", |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4049 G_CALLBACK (xg_tool_bar_help_callback), |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4050 (gpointer) (EMACS_INT) i); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4051 } |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4052 |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4053 if (wbutton) *wbutton = wb; |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4054 |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4055 return ti; |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4056 } |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4057 |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4058 static void |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4059 xg_show_toolbar_item (GtkToolItem *ti) |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4060 { |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4061 Lisp_Object style = Ftool_bar_get_system_style (); |
109566
d03bc4a3fced
Add tool bar style text-image-horiz (text to the left of the image).
Jan D. <jan.h.d@swipnet.se>
parents:
109454
diff
changeset
|
4062 int both_horiz = EQ (style, Qboth_horiz); |
d03bc4a3fced
Add tool bar style text-image-horiz (text to the left of the image).
Jan D. <jan.h.d@swipnet.se>
parents:
109454
diff
changeset
|
4063 int text_image = EQ (style, Qtext_image_horiz); |
d03bc4a3fced
Add tool bar style text-image-horiz (text to the left of the image).
Jan D. <jan.h.d@swipnet.se>
parents:
109454
diff
changeset
|
4064 |
d03bc4a3fced
Add tool bar style text-image-horiz (text to the left of the image).
Jan D. <jan.h.d@swipnet.se>
parents:
109454
diff
changeset
|
4065 int horiz = both_horiz || text_image; |
d03bc4a3fced
Add tool bar style text-image-horiz (text to the left of the image).
Jan D. <jan.h.d@swipnet.se>
parents:
109454
diff
changeset
|
4066 int show_label = ! EQ (style, Qimage); |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4067 int show_image = ! EQ (style, Qtext); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4068 |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4069 GtkWidget *weventbox = gtk_bin_get_child (GTK_BIN (ti)); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4070 GtkWidget *wbutton = gtk_bin_get_child (GTK_BIN (weventbox)); |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
4071 GtkWidget *vb = gtk_bin_get_child (GTK_BIN (wbutton)); |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
4072 GtkWidget *wimage; |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
4073 GtkWidget *wlbl = xg_get_tool_bar_widgets (vb, &wimage); |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4074 GtkWidget *new_box = NULL; |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4075 |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4076 if (GTK_IS_VBOX (vb) && horiz) |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4077 new_box = gtk_hbox_new (FALSE, 0); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4078 else if (GTK_IS_HBOX (vb) && !horiz && show_label && show_image) |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4079 new_box = gtk_vbox_new (FALSE, 0); |
109566
d03bc4a3fced
Add tool bar style text-image-horiz (text to the left of the image).
Jan D. <jan.h.d@swipnet.se>
parents:
109454
diff
changeset
|
4080 |
d03bc4a3fced
Add tool bar style text-image-horiz (text to the left of the image).
Jan D. <jan.h.d@swipnet.se>
parents:
109454
diff
changeset
|
4081 if (!new_box && horiz) |
d03bc4a3fced
Add tool bar style text-image-horiz (text to the left of the image).
Jan D. <jan.h.d@swipnet.se>
parents:
109454
diff
changeset
|
4082 gtk_box_reorder_child (GTK_BOX (vb), wlbl, text_image ? 0 : 1); |
d03bc4a3fced
Add tool bar style text-image-horiz (text to the left of the image).
Jan D. <jan.h.d@swipnet.se>
parents:
109454
diff
changeset
|
4083 else if (new_box) |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4084 { |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
4085 g_object_ref (G_OBJECT (wimage)); |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
4086 g_object_ref (G_OBJECT (wlbl)); |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4087 gtk_container_remove (GTK_CONTAINER (vb), wimage); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4088 gtk_container_remove (GTK_CONTAINER (vb), wlbl); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4089 gtk_widget_destroy (GTK_WIDGET (vb)); |
109566
d03bc4a3fced
Add tool bar style text-image-horiz (text to the left of the image).
Jan D. <jan.h.d@swipnet.se>
parents:
109454
diff
changeset
|
4090 if (! text_image) |
d03bc4a3fced
Add tool bar style text-image-horiz (text to the left of the image).
Jan D. <jan.h.d@swipnet.se>
parents:
109454
diff
changeset
|
4091 gtk_box_pack_start (GTK_BOX (new_box), wimage, TRUE, TRUE, 0); |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
4092 gtk_box_pack_start (GTK_BOX (new_box), wlbl, TRUE, TRUE, 0); |
109566
d03bc4a3fced
Add tool bar style text-image-horiz (text to the left of the image).
Jan D. <jan.h.d@swipnet.se>
parents:
109454
diff
changeset
|
4093 if (text_image) |
d03bc4a3fced
Add tool bar style text-image-horiz (text to the left of the image).
Jan D. <jan.h.d@swipnet.se>
parents:
109454
diff
changeset
|
4094 gtk_box_pack_start (GTK_BOX (new_box), wimage, TRUE, TRUE, 0); |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4095 gtk_container_add (GTK_CONTAINER (wbutton), new_box); |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
4096 g_object_unref (G_OBJECT (wimage)); |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
4097 g_object_unref (G_OBJECT (wlbl)); |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
4098 vb = new_box; |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4099 } |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4100 |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4101 if (show_label) gtk_widget_show (wlbl); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4102 else gtk_widget_hide (wlbl); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4103 if (show_image) gtk_widget_show (wimage); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4104 else gtk_widget_hide (wimage); |
108315
8bb62bdbd80a
Fix bug #6139, text is briefly shown in tool bar on startup.
Jan D <jan.h.d@swipnet.se>
parents:
108082
diff
changeset
|
4105 gtk_widget_show (GTK_WIDGET (weventbox)); |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4106 gtk_widget_show (GTK_WIDGET (vb)); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4107 gtk_widget_show (GTK_WIDGET (wbutton)); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4108 gtk_widget_show (GTK_WIDGET (ti)); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4109 } |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4110 |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4111 static int |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4112 xg_update_tool_bar_sizes (FRAME_PTR f) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4113 { |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4114 struct x_output *x = f->output_data.x; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4115 GtkRequisition req; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4116 int nl = 0, nr = 0, nt = 0, nb = 0; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4117 |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4118 gtk_widget_size_request (GTK_WIDGET (x->handlebox_widget), &req); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4119 if (x->toolbar_in_hbox) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4120 { |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4121 int pos; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4122 gtk_container_child_get (GTK_CONTAINER (x->hbox_widget), |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4123 x->handlebox_widget, |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4124 "position", &pos, NULL); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4125 if (pos == 0) nl = req.width; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4126 else nr = req.width; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4127 } |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4128 else |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4129 { |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4130 int pos; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4131 gtk_container_child_get (GTK_CONTAINER (x->vbox_widget), |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4132 x->handlebox_widget, |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4133 "position", &pos, NULL); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4134 if (pos == 0 || (pos == 1 && x->menubar_widget)) nt = req.height; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4135 else nb = req.height; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4136 } |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4137 |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4138 if (nl != FRAME_TOOLBAR_LEFT_WIDTH (f) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4139 || nr != FRAME_TOOLBAR_RIGHT_WIDTH (f) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4140 || nt != FRAME_TOOLBAR_TOP_HEIGHT (f) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4141 || nb != FRAME_TOOLBAR_BOTTOM_HEIGHT (f)) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4142 { |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4143 FRAME_TOOLBAR_RIGHT_WIDTH (f) = FRAME_TOOLBAR_LEFT_WIDTH (f) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4144 = FRAME_TOOLBAR_TOP_HEIGHT (f) = FRAME_TOOLBAR_BOTTOM_HEIGHT (f) = 0; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4145 FRAME_TOOLBAR_LEFT_WIDTH (f) = nl; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4146 FRAME_TOOLBAR_RIGHT_WIDTH (f) = nr; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4147 FRAME_TOOLBAR_TOP_HEIGHT (f) = nt; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4148 FRAME_TOOLBAR_BOTTOM_HEIGHT (f) = nb; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4149 return 1; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4150 } |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4151 |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4152 return 0; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4153 } |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4154 |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4155 |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
4156 /* 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
|
4157 |
49323 | 4158 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
4159 update_frame_tool_bar (FRAME_PTR f) |
49323 | 4160 { |
4161 int i; | |
4162 struct x_output *x = f->output_data.x; | |
75576
e852dba095f9
(update_frame_tool_bar): Initialize h/vmargin to 0.
Jan Djärv <jan.h.d@swipnet.se>
parents:
75417
diff
changeset
|
4163 int hmargin = 0, vmargin = 0; |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4164 GtkToolbar *wtoolbar; |
74990
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
4165 GtkToolItem *ti; |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4166 GtkTextDirection dir; |
92366
39b38c867ca4
(xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents:
91632
diff
changeset
|
4167 int pack_tool_bar = x->handlebox_widget == NULL; |
49323 | 4168 |
4169 if (! FRAME_GTK_WIDGET (f)) | |
4170 return; | |
4171 | |
4172 BLOCK_INPUT; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
4173 |
59084
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
4174 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
|
4175 && 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
|
4176 { |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
4177 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
|
4178 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
|
4179 } |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
4180 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
|
4181 { |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
4182 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
|
4183 && 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
|
4184 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
|
4185 |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
4186 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
|
4187 && 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
|
4188 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
|
4189 } |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
4190 |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
4191 /* 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
|
4192 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
|
4193 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
|
4194 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
|
4195 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
|
4196 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
|
4197 |
49323 | 4198 if (! x->toolbar_widget) |
4199 xg_create_tool_bar (f); | |
4200 | |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4201 wtoolbar = GTK_TOOLBAR (x->toolbar_widget); |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4202 dir = gtk_widget_get_direction (GTK_WIDGET (wtoolbar)); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4203 |
49323 | 4204 for (i = 0; i < f->n_tool_bar_items; ++i) |
4205 { | |
4206 int enabled_p = !NILP (PROP (TOOL_BAR_ITEM_ENABLED_P)); | |
4207 int selected_p = !NILP (PROP (TOOL_BAR_ITEM_SELECTED_P)); | |
4208 int idx; | |
4209 int img_id; | |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4210 int icon_size = 0; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4211 struct image *img = NULL; |
49323 | 4212 Lisp_Object image; |
100100
f5d2a2e44839
(update_frame_tool_bar): Initialize variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
98555
diff
changeset
|
4213 Lisp_Object stock = Qnil; |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4214 GtkStockItem stock_item; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4215 char *stock_name = NULL; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4216 char *icon_name = NULL; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4217 Lisp_Object rtl; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4218 GtkWidget *wbutton = NULL; |
74990
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
4219 GtkWidget *weventbox; |
79460
1d493051aed3
(update_frame_tool_bar): Don't call x-gtk-map-stock if
Jan Djärv <jan.h.d@swipnet.se>
parents:
79340
diff
changeset
|
4220 Lisp_Object specified_file; |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4221 char *label = SSDATA (PROP (TOOL_BAR_ITEM_LABEL)); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4222 |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4223 ti = gtk_toolbar_get_nth_item (GTK_TOOLBAR (wtoolbar), i); |
74990
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
4224 |
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
4225 if (ti) |
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
4226 { |
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
4227 weventbox = gtk_bin_get_child (GTK_BIN (ti)); |
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
4228 wbutton = gtk_bin_get_child (GTK_BIN (weventbox)); |
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
4229 } |
49323 | 4230 |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4231 |
49323 | 4232 image = PROP (TOOL_BAR_ITEM_IMAGES); |
4233 | |
4234 /* Ignore invalid image specifications. */ | |
4235 if (!valid_image_p (image)) | |
4236 { | |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4237 if (wbutton) gtk_widget_hide (wbutton); |
49323 | 4238 continue; |
4239 } | |
4240 | |
79460
1d493051aed3
(update_frame_tool_bar): Don't call x-gtk-map-stock if
Jan Djärv <jan.h.d@swipnet.se>
parents:
79340
diff
changeset
|
4241 specified_file = file_for_image (image); |
103916
9653887b5cd0
* xterm.c (Qx_gtk_map_stock): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
103690
diff
changeset
|
4242 if (!NILP (specified_file) && !NILP (Ffboundp (Qx_gtk_map_stock))) |
9653887b5cd0
* xterm.c (Qx_gtk_map_stock): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
103690
diff
changeset
|
4243 stock = call1 (Qx_gtk_map_stock, specified_file); |
9653887b5cd0
* xterm.c (Qx_gtk_map_stock): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
103690
diff
changeset
|
4244 |
9653887b5cd0
* xterm.c (Qx_gtk_map_stock): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
103690
diff
changeset
|
4245 if (STRINGP (stock)) |
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
|
4246 { |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4247 stock_name = SSDATA (stock); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4248 if (stock_name[0] == 'n' && stock_name[1] == ':') |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4249 { |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4250 GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (wtoolbar)); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4251 GtkIconTheme *icon_theme = gtk_icon_theme_get_for_screen (screen); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4252 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4253 icon_name = stock_name + 2; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4254 stock_name = NULL; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4255 stock = Qnil; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4256 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4257 if (! gtk_icon_theme_has_icon (icon_theme, icon_name)) |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4258 icon_name = NULL; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4259 else |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4260 icon_size = gtk_toolbar_get_icon_size (wtoolbar); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4261 } |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4262 else if (gtk_stock_lookup (SSDATA (stock), &stock_item)) |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4263 icon_size = gtk_toolbar_get_icon_size (wtoolbar); |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
4264 else |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4265 { |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4266 stock = Qnil; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4267 stock_name = NULL; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4268 } |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4269 } |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4270 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4271 if (stock_name == NULL && icon_name == NULL) |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4272 { |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4273 /* No stock image, or stock item not known. Try regular image. */ |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4274 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4275 /* If image is a vector, choose the image according to the |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4276 button state. */ |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4277 if (dir == GTK_TEXT_DIR_RTL |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4278 && !NILP (rtl = PROP (TOOL_BAR_ITEM_RTL_IMAGE)) |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4279 && STRINGP (rtl)) |
74990
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
4280 { |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4281 image = find_rtl_image (f, image, rtl); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4282 } |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4283 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4284 if (VECTORP (image)) |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4285 { |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4286 if (enabled_p) |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4287 idx = (selected_p |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4288 ? TOOL_BAR_IMAGE_ENABLED_SELECTED |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4289 : TOOL_BAR_IMAGE_ENABLED_DESELECTED); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4290 else |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4291 idx = (selected_p |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4292 ? TOOL_BAR_IMAGE_DISABLED_SELECTED |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4293 : TOOL_BAR_IMAGE_DISABLED_DESELECTED); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4294 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4295 xassert (ASIZE (image) >= idx); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4296 image = AREF (image, idx); |
74990
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
4297 } |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4298 else |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4299 idx = -1; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4300 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4301 img_id = lookup_image (f, image); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4302 img = IMAGE_FROM_ID (f, img_id); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4303 prepare_image_for_display (f, img); |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
4304 |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4305 if (img->load_failed_p || img->pixmap == None) |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4306 { |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4307 if (ti) |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4308 gtk_widget_hide_all (GTK_WIDGET (ti)); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4309 else |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4310 { |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4311 /* Insert an empty (non-image) button */ |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4312 ti = xg_make_tool_item (f, NULL, NULL, "", i); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4313 gtk_toolbar_insert (GTK_TOOLBAR (wtoolbar), ti, -1); |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4314 } |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4315 continue; |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4316 } |
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
|
4317 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
4318 |
74990
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
4319 if (ti == NULL) |
49323 | 4320 { |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4321 GtkWidget *w; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4322 if (stock_name) |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4323 { |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4324 w = gtk_image_new_from_stock (stock_name, icon_size); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4325 g_object_set_data_full (G_OBJECT (w), XG_TOOL_BAR_STOCK_NAME, |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4326 (gpointer) xstrdup (stock_name), |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4327 (GDestroyNotify) xfree); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4328 } |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
4329 else if (icon_name) |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4330 { |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4331 w = gtk_image_new_from_icon_name (icon_name, icon_size); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4332 g_object_set_data_full (G_OBJECT (w), XG_TOOL_BAR_ICON_NAME, |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4333 (gpointer) xstrdup (icon_name), |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4334 (GDestroyNotify) xfree); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4335 } |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4336 else |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4337 { |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4338 w = xg_get_image_for_pixmap (f, img, x->widget, NULL); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4339 /* Save the image so we can see if an update is needed when |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4340 this function is called again. */ |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4341 g_object_set_data (G_OBJECT (w), XG_TOOL_BAR_IMAGE_DATA, |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4342 (gpointer)img->pixmap); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4343 } |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4344 |
59084
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
4345 gtk_misc_set_padding (GTK_MISC (w), hmargin, vmargin); |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4346 ti = xg_make_tool_item (f, w, &wbutton, label, i); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4347 gtk_toolbar_insert (GTK_TOOLBAR (wtoolbar), ti, -1); |
74990
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
4348 gtk_widget_set_sensitive (wbutton, enabled_p); |
49323 | 4349 } |
4350 else | |
4351 { | |
109067
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
4352 GtkWidget *vb = gtk_bin_get_child (GTK_BIN (wbutton)); |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
4353 GtkWidget *wimage; |
b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
Jan D <jan.h.d@swipnet.se>
parents:
109040
diff
changeset
|
4354 GtkWidget *wlbl = xg_get_tool_bar_widgets (vb, &wimage); |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4355 |
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
|
4356 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
|
4357 XG_TOOL_BAR_IMAGE_DATA); |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4358 gpointer old_stock_name = g_object_get_data (G_OBJECT (wimage), |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4359 XG_TOOL_BAR_STOCK_NAME); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4360 gpointer old_icon_name = g_object_get_data (G_OBJECT (wimage), |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4361 XG_TOOL_BAR_ICON_NAME); |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4362 gtk_label_set_text (GTK_LABEL (wlbl), label); |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4363 if (stock_name && |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4364 (! old_stock_name || strcmp (old_stock_name, stock_name) != 0)) |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4365 { |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4366 gtk_image_set_from_stock (GTK_IMAGE (wimage), |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4367 stock_name, icon_size); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4368 g_object_set_data_full (G_OBJECT (wimage), XG_TOOL_BAR_STOCK_NAME, |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4369 (gpointer) xstrdup (stock_name), |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4370 (GDestroyNotify) xfree); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4371 g_object_set_data (G_OBJECT (wimage), XG_TOOL_BAR_IMAGE_DATA, |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4372 NULL); |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4373 g_object_set_data (G_OBJECT (wimage), XG_TOOL_BAR_ICON_NAME, |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4374 NULL); |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4375 } |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4376 else if (icon_name && |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4377 (! old_icon_name || strcmp (old_icon_name, icon_name) != 0)) |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4378 { |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4379 gtk_image_set_from_icon_name (GTK_IMAGE (wimage), |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4380 icon_name, icon_size); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4381 g_object_set_data_full (G_OBJECT (wimage), XG_TOOL_BAR_ICON_NAME, |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4382 (gpointer) xstrdup (icon_name), |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4383 (GDestroyNotify) xfree); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4384 g_object_set_data (G_OBJECT (wimage), XG_TOOL_BAR_IMAGE_DATA, |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4385 NULL); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4386 g_object_set_data (G_OBJECT (wimage), XG_TOOL_BAR_STOCK_NAME, |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4387 NULL); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4388 } |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4389 else if (img && old_img != img->pixmap) |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4390 { |
109141
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
4391 (void) xg_get_image_for_pixmap (f, img, x->widget, |
fa173b9bd9ce
Fix some bad prototypes and formatting after conversion from K&R declaration.
Jan D <jan.h.d@swipnet.se>
parents:
109139
diff
changeset
|
4392 GTK_IMAGE (wimage)); |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4393 g_object_set_data (G_OBJECT (wimage), XG_TOOL_BAR_IMAGE_DATA, |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4394 (gpointer)img->pixmap); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4395 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4396 g_object_set_data (G_OBJECT (wimage), XG_TOOL_BAR_STOCK_NAME, |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4397 NULL); |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4398 g_object_set_data (G_OBJECT (wimage), XG_TOOL_BAR_ICON_NAME, |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4399 NULL); |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4400 } |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4401 |
59084
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
4402 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
|
4403 |
74990
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
4404 gtk_widget_set_sensitive (wbutton, enabled_p); |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4405 } |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4406 xg_show_toolbar_item (ti); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
4407 |
49323 | 4408 #undef PROP |
4409 } | |
4410 | |
4411 /* Remove buttons not longer needed. We just hide them so they | |
4412 can be reused later on. */ | |
74990
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
4413 do |
49323 | 4414 { |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4415 ti = gtk_toolbar_get_nth_item (GTK_TOOLBAR (wtoolbar), i++); |
74990
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
4416 if (ti) gtk_widget_hide_all (GTK_WIDGET (ti)); |
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
4417 } while (ti != NULL); |
49323 | 4418 |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4419 if (f->n_tool_bar_items != 0) |
49323 | 4420 { |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4421 if (pack_tool_bar) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4422 xg_pack_tool_bar (f, f->tool_bar_position); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4423 gtk_widget_show (x->toolbar_widget); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4424 gtk_widget_show (x->handlebox_widget); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4425 if (xg_update_tool_bar_sizes (f)) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4426 xg_height_or_width_changed (f); |
49323 | 4427 } |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4428 |
49323 | 4429 UNBLOCK_INPUT; |
4430 } | |
4431 | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
4432 /* 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
|
4433 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
|
4434 |
49323 | 4435 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
4436 free_frame_tool_bar (FRAME_PTR f) |
49323 | 4437 { |
4438 struct x_output *x = f->output_data.x; | |
4439 | |
4440 if (x->toolbar_widget) | |
4441 { | |
93030
d38f7962c052
(free_frame_tool_bar): Only call gtk_container_remove if
Jan Djärv <jan.h.d@swipnet.se>
parents:
92366
diff
changeset
|
4442 int is_packed = x->handlebox_widget != 0; |
49323 | 4443 BLOCK_INPUT; |
93030
d38f7962c052
(free_frame_tool_bar): Only call gtk_container_remove if
Jan Djärv <jan.h.d@swipnet.se>
parents:
92366
diff
changeset
|
4444 /* We may have created the toolbar_widget in xg_create_tool_bar, but |
d38f7962c052
(free_frame_tool_bar): Only call gtk_container_remove if
Jan Djärv <jan.h.d@swipnet.se>
parents:
92366
diff
changeset
|
4445 not the x->handlebox_widget which is created in xg_pack_tool_bar. */ |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4446 if (is_packed) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4447 { |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4448 if (x->toolbar_in_hbox) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4449 gtk_container_remove (GTK_CONTAINER (x->hbox_widget), |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4450 x->handlebox_widget); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4451 else |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4452 gtk_container_remove (GTK_CONTAINER (x->vbox_widget), |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4453 x->handlebox_widget); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4454 } |
93030
d38f7962c052
(free_frame_tool_bar): Only call gtk_container_remove if
Jan Djärv <jan.h.d@swipnet.se>
parents:
92366
diff
changeset
|
4455 else |
d38f7962c052
(free_frame_tool_bar): Only call gtk_container_remove if
Jan Djärv <jan.h.d@swipnet.se>
parents:
92366
diff
changeset
|
4456 gtk_widget_destroy (x->toolbar_widget); |
d38f7962c052
(free_frame_tool_bar): Only call gtk_container_remove if
Jan Djärv <jan.h.d@swipnet.se>
parents:
92366
diff
changeset
|
4457 |
49323 | 4458 x->toolbar_widget = 0; |
4459 x->handlebox_widget = 0; | |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4460 FRAME_TOOLBAR_TOP_HEIGHT (f) = FRAME_TOOLBAR_BOTTOM_HEIGHT (f) = 0; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4461 FRAME_TOOLBAR_LEFT_WIDTH (f) = FRAME_TOOLBAR_RIGHT_WIDTH (f) = 0; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4462 |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4463 xg_height_or_width_changed (f); |
103665
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103198
diff
changeset
|
4464 |
49323 | 4465 UNBLOCK_INPUT; |
4466 } | |
4467 } | |
4468 | |
109581
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4469 int |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4470 xg_change_toolbar_position (FRAME_PTR f, Lisp_Object pos) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4471 { |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4472 struct x_output *x = f->output_data.x; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4473 |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4474 if (! x->toolbar_widget || ! x->handlebox_widget) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4475 return 1; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4476 |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4477 BLOCK_INPUT; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4478 g_object_ref (x->handlebox_widget); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4479 if (x->toolbar_in_hbox) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4480 gtk_container_remove (GTK_CONTAINER (x->hbox_widget), |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4481 x->handlebox_widget); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4482 else |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4483 gtk_container_remove (GTK_CONTAINER (x->vbox_widget), |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4484 x->handlebox_widget); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4485 xg_pack_tool_bar (f, pos); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4486 g_object_unref (x->handlebox_widget); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4487 if (xg_update_tool_bar_sizes (f)) |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4488 xg_height_or_width_changed (f); |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4489 |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4490 UNBLOCK_INPUT; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4491 return 1; |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4492 } |
06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
Jan D. <jan.h.d@swipnet.se>
parents:
109566
diff
changeset
|
4493 |
49323 | 4494 |
4495 | |
4496 /*********************************************************************** | |
4497 Initializing | |
108024
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4498 ***********************************************************************/ |
49323 | 4499 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
4500 xg_initialize (void) |
49323 | 4501 { |
59102
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59084
diff
changeset
|
4502 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
|
4503 |
75417
c21d47d727f3
(xg_initialize): Call XftInit if HAVE_XFT.
Jan Djärv <jan.h.d@swipnet.se>
parents:
75348
diff
changeset
|
4504 #if HAVE_XFT |
c21d47d727f3
(xg_initialize): Call XftInit if HAVE_XFT.
Jan Djärv <jan.h.d@swipnet.se>
parents:
75348
diff
changeset
|
4505 /* Work around a bug with corrupted data if libXft gets unloaded. This way |
c21d47d727f3
(xg_initialize): Call XftInit if HAVE_XFT.
Jan Djärv <jan.h.d@swipnet.se>
parents:
75348
diff
changeset
|
4506 we keep it permanently linked in. */ |
c21d47d727f3
(xg_initialize): Call XftInit if HAVE_XFT.
Jan Djärv <jan.h.d@swipnet.se>
parents:
75348
diff
changeset
|
4507 XftInit (0); |
c21d47d727f3
(xg_initialize): Call XftInit if HAVE_XFT.
Jan Djärv <jan.h.d@swipnet.se>
parents:
75348
diff
changeset
|
4508 #endif |
84621 | 4509 |
4510 gdpy_def = NULL; | |
49323 | 4511 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
|
4512 xg_detached_menus = 0; |
49323 | 4513 xg_menu_cb_list.prev = xg_menu_cb_list.next = |
4514 xg_menu_item_cb_list.prev = xg_menu_item_cb_list.next = 0; | |
4515 | |
49419
6562bb5f04aa
gtkutil.c (xg_initialize): Initialize id_to_widget here instead
Jan Djärv <jan.h.d@swipnet.se>
parents:
49359
diff
changeset
|
4516 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
|
4517 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
|
4518 |
49323 | 4519 /* Remove F10 as a menu accelerator, it does not mix well with Emacs key |
4520 bindings. It doesn't seem to be any way to remove properties, | |
4521 so we set it to VoidSymbol which in X means "no key". */ | |
4522 gtk_settings_set_string_property (gtk_settings_get_default (), | |
4523 "gtk-menu-bar-accel", | |
4524 "VoidSymbol", | |
4525 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
|
4526 |
6562bb5f04aa
gtkutil.c (xg_initialize): Initialize id_to_widget here instead
Jan Djärv <jan.h.d@swipnet.se>
parents:
49359
diff
changeset
|
4527 /* 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
|
4528 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
|
4529 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
|
4530 "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
|
4531 "Emacs", |
6562bb5f04aa
gtkutil.c (xg_initialize): Initialize id_to_widget here instead
Jan Djärv <jan.h.d@swipnet.se>
parents:
49359
diff
changeset
|
4532 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
|
4533 |
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59084
diff
changeset
|
4534 /* 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
|
4535 dialog, this works for them also. */ |
103022
15bf0d8a6099
Make Emacs compile when Gtk+ and -DGTK_DISABLE_DEPRECATED is used.
Jan Djärv <jan.h.d@swipnet.se>
parents:
102705
diff
changeset
|
4536 binding_set = gtk_binding_set_by_class (g_type_class_ref (GTK_TYPE_DIALOG)); |
59102
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59084
diff
changeset
|
4537 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
|
4538 "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
|
4539 |
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59084
diff
changeset
|
4540 /* Make menus close on C-g. */ |
103022
15bf0d8a6099
Make Emacs compile when Gtk+ and -DGTK_DISABLE_DEPRECATED is used.
Jan Djärv <jan.h.d@swipnet.se>
parents:
102705
diff
changeset
|
4541 binding_set = gtk_binding_set_by_class (g_type_class_ref |
15bf0d8a6099
Make Emacs compile when Gtk+ and -DGTK_DISABLE_DEPRECATED is used.
Jan Djärv <jan.h.d@swipnet.se>
parents:
102705
diff
changeset
|
4542 (GTK_TYPE_MENU_SHELL)); |
59102
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59084
diff
changeset
|
4543 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
|
4544 "cancel", 0); |
49323 | 4545 } |
4546 | |
4547 #endif /* USE_GTK */ | |
52401 | 4548 |
4549 /* arch-tag: fe7104da-bc1e-4aba-9bd1-f349c528f7e3 | |
4550 (do not change this comment) */ |