Mercurial > emacs
annotate src/gtkutil.c @ 109092:babf8e935ea8
Rename FRAME_NS_TOOLBAR_HEIGHT to FRAME_TOOLBAR_HEIGHT to aid common code.
* nsmenu.m (update_frame_tool_bar, free_frame_tool_bar): Update
FRAME_TOOLBAR_HEIGHT.
* nsterm.h (FRAME_NS_TOOLBAR_HEIGHT): Rename to FRAME_TOOLBAR_HEIGH
* nsterm.m (x_set_window_size, initFrameFromEmacs): Renamed
FRAME_NS_TOOLBAR_HEIGHT to FRAME_TOOLBAR_HEIGHT.
author | Jan D <jan.h.d@swipnet.se> |
---|---|
date | Thu, 01 Jul 2010 14:16:33 +0200 |
parents | b5f73bf59a4f |
children | 2bc9a0c04c87 |
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 |
67528
c5c00342184b
* gtkutil.c (SSDATA): New macro to remove compiler warnings.
Jan Djärv <jan.h.d@swipnet.se>
parents:
65628
diff
changeset
|
47 /* 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
|
48 #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
|
49 |
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
|
50 #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
|
51 #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
|
52 (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
|
53 #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
|
54 #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
|
55 #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
|
56 #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
|
57 #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
|
58 #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
|
59 #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
|
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_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
|
62 #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
|
63 #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
|
64 #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
|
65 #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
|
66 #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
|
67 #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
|
68 #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
|
69 #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
|
70 #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
|
71 #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
|
72 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
73 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
74 /*********************************************************************** |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
75 Display handling functions |
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 |
98555
440d088b9a23
(xg_display_open): Reset default display if none exists.
Chong Yidong <cyd@stupidchicken.com>
parents:
98545
diff
changeset
|
78 /* 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
|
79 may close all its displays. */ |
84621 | 80 |
81 static GdkDisplay *gdpy_def; | |
82 | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
83 /* 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
|
84 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
|
85 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
|
86 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
87 static void |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
88 xg_set_screen (w, f) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
89 GtkWidget *w; |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
90 FRAME_PTR f; |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
91 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
92 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
|
93 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
94 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
|
95 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
|
96 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
97 if (GTK_IS_MENU (w)) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
98 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
|
99 else |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
100 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
|
101 } |
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 /* 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
|
106 *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
|
107 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
108 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
|
109 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
|
110 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
|
111 |
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
|
112 void |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
113 xg_display_open (display_name, dpy) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
114 char *display_name; |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
115 Display **dpy; |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
116 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
117 GdkDisplay *gdpy; |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
118 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
119 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
|
120 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
|
121 { |
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 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
|
123 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
|
124 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
|
125 } |
98555
440d088b9a23
(xg_display_open): Reset default display if none exists.
Chong Yidong <cyd@stupidchicken.com>
parents:
98545
diff
changeset
|
126 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
127 *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
|
128 } |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
129 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
130 |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
131 /* 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
|
132 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
133 void |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
134 xg_display_close (Display *dpy) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
135 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
136 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
|
137 |
98555
440d088b9a23
(xg_display_open): Reset default display if none exists.
Chong Yidong <cyd@stupidchicken.com>
parents:
98545
diff
changeset
|
138 /* 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
|
139 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
|
140 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
|
141 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
|
142 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
143 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
|
144 GdkDisplay *gdpy_new = NULL; |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
145 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
146 /* Find another display. */ |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
147 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
|
148 if (dpyinfo->display != dpy) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
149 { |
98555
440d088b9a23
(xg_display_open): Reset default display if none exists.
Chong Yidong <cyd@stupidchicken.com>
parents:
98545
diff
changeset
|
150 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
|
151 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
|
152 gdpy_new); |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
153 break; |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
154 } |
98555
440d088b9a23
(xg_display_open): Reset default display if none exists.
Chong Yidong <cyd@stupidchicken.com>
parents:
98545
diff
changeset
|
155 gdpy_def = gdpy_new; |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
156 } |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
157 |
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
|
158 #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
|
159 /* 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
|
160 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
|
161 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
|
162 g_object_run_dispose (G_OBJECT (gdpy)); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
163 #else |
72778
ab6be05ddfb1
* gtkutil.c (xg_display_close): Always change default display if needed,
Jan Djärv <jan.h.d@swipnet.se>
parents:
72637
diff
changeset
|
164 /* This seems to be fixed in GTK 2.10. */ |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
165 gdk_display_close (gdpy); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
166 #endif |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
167 } |
50129
d0142038feaa
Reduce flicker in GTK scrollbars.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50112
diff
changeset
|
168 |
49323 | 169 |
170 /*********************************************************************** | |
171 Utility functions | |
172 ***********************************************************************/ | |
173 /* The next two variables and functions are taken from lwlib. */ | |
174 static widget_value *widget_value_free_list; | |
175 static int malloc_cpt; | |
176 | |
177 /* Allocate a widget_value structure, either by taking one from the | |
178 widget_value_free_list or by malloc:ing a new one. | |
179 | |
180 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
|
181 |
49323 | 182 widget_value * |
183 malloc_widget_value () | |
184 { | |
185 widget_value *wv; | |
186 if (widget_value_free_list) | |
187 { | |
188 wv = widget_value_free_list; | |
189 widget_value_free_list = wv->free_list; | |
190 wv->free_list = 0; | |
191 } | |
192 else | |
193 { | |
69025
5d9232b72d14
(malloc_widget_value): Use xmalloc.
Richard M. Stallman <rms@gnu.org>
parents:
68922
diff
changeset
|
194 wv = (widget_value *) xmalloc (sizeof (widget_value)); |
49323 | 195 malloc_cpt++; |
196 } | |
197 memset (wv, 0, sizeof (widget_value)); | |
198 return wv; | |
199 } | |
200 | |
201 /* This is analogous to free. It frees only what was allocated | |
202 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
|
203 |
49323 | 204 void |
205 free_widget_value (wv) | |
206 widget_value *wv; | |
207 { | |
208 if (wv->free_list) | |
209 abort (); | |
210 | |
211 if (malloc_cpt > 25) | |
212 { | |
213 /* When the number of already allocated cells is too big, | |
214 We free it. */ | |
100633
5395c014feb8
* buffer.c (init_buffer): Use realloc instead of xrealloc.
Andreas Schwab <schwab@suse.de>
parents:
100501
diff
changeset
|
215 xfree (wv); |
49323 | 216 malloc_cpt--; |
217 } | |
218 else | |
219 { | |
220 wv->free_list = widget_value_free_list; | |
221 widget_value_free_list = wv; | |
222 } | |
223 } | |
224 | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
225 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
226 /* 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
|
227 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
|
228 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
229 GdkCursor * |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
230 xg_create_default_cursor (dpy) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
231 Display *dpy; |
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 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
|
234 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
|
235 } |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
236 |
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
|
237 /* 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
|
238 |
65006
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
239 static GdkPixbuf * |
64936
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
240 xg_get_pixbuf_from_pix_and_mask (gpix, gmask, cmap) |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
241 GdkPixmap *gpix; |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
242 GdkPixmap *gmask; |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
243 GdkColormap *cmap; |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
244 { |
107219
07507204ac6f
Move declarations before statements.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
245 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
|
246 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
|
247 |
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 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
|
249 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
|
250 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
|
251 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
|
252 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
|
253 |
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 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
|
255 { |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
256 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
|
257 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
|
258 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
|
259 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
|
260 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
|
261 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
|
262 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
|
263 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
|
264 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
|
265 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
|
266 |
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 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
|
268 { |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
269 guchar *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
|
270 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
|
271 |
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 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
|
273 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
|
274 |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
275 for (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
|
276 { |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
277 /* 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
|
278 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
|
279 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
|
280 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
|
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 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
|
283 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
|
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 |
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 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
|
288 } |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
289 |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
290 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
|
291 } |
d5e998f50c2d
* gtkutil.c (xg_get_pixbuf_from_pix_and_mask): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64783
diff
changeset
|
292 |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
293 static Lisp_Object |
103665
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103198
diff
changeset
|
294 file_for_image (image) |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
295 Lisp_Object image; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
296 { |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
297 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
|
298 Lisp_Object tail; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
299 extern Lisp_Object QCfile; |
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 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
|
302 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
|
303 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
|
304 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
|
305 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
|
306 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
307 return specified_file; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
308 } |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
309 |
56112
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
310 /* 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
|
311 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
|
312 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
|
313 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
|
314 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
|
315 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
|
316 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
|
317 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
|
318 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
|
319 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
|
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 static GtkWidget * |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
322 xg_get_image_for_pixmap (f, img, widget, old_widget) |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
323 FRAME_PTR f; |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
324 struct image *img; |
56112
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
325 GtkWidget *widget; |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
326 GtkImage *old_widget; |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
327 { |
56112
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
328 GdkPixmap *gpix; |
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
329 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
|
330 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
|
331 GdkColormap *cmap; |
c1d129148b98
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
78787
diff
changeset
|
332 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
|
333 |
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
|
334 /* 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
|
335 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
|
336 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
|
337 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
|
338 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
|
339 |
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
|
340 /* 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
|
341 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
|
342 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
|
343 |
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
|
344 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
|
345 && 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
|
346 { |
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
|
347 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
|
348 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
|
349 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
|
350 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
|
351 |
606e8e24acfe
* gtkutil.c (xg_get_image_for_pixmap): If the image is from a file,
Jan Djärv <jan.h.d@swipnet.se>
parents:
67875
diff
changeset
|
352 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
|
353 } |
4f8b4f60e748
(xg_get_image_for_pixmap): Add workaround for monochrome displays
Jan Djärv <jan.h.d@swipnet.se>
parents:
56268
diff
changeset
|
354 |
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
|
355 /* 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
|
356 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
|
357 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
|
358 |
56269
4f8b4f60e748
(xg_get_image_for_pixmap): Add workaround for monochrome displays
Jan Djärv <jan.h.d@swipnet.se>
parents:
56268
diff
changeset
|
359 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
|
360 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
|
361 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
|
362 |
78809
c1d129148b98
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
78787
diff
changeset
|
363 /* 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
|
364 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
|
365 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
|
366 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
|
367 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
|
368 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
|
369 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
|
370 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
|
371 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
|
372 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
|
373 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
|
374 |
c1d129148b98
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
78787
diff
changeset
|
375 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
|
376 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
|
377 else |
78809
c1d129148b98
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
78787
diff
changeset
|
378 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
|
379 |
c1d129148b98
(xg_get_image_for_pixmap): Always create a GdkPixbuf
Jan Djärv <jan.h.d@swipnet.se>
parents:
78787
diff
changeset
|
380 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
|
381 |
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
|
382 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
|
383 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
|
384 |
56112
e4cfda8330d5
* gtkutil.c (xg_get_image_for_pixmap): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
55342
diff
changeset
|
385 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
|
386 } |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
387 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
388 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
389 /* Set CURSOR on W and all widgets W contain. We must do like this |
49323 | 390 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
|
391 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
|
392 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
393 static void |
49323 | 394 xg_set_cursor (w, cursor) |
395 GtkWidget *w; | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
396 GdkCursor *cursor; |
49323 | 397 { |
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
|
398 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
|
399 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
|
400 |
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
|
401 gdk_window_set_cursor (window, cursor); |
49323 | 402 |
403 /* The scroll bar widget has more than one GDK window (had to look at | |
404 the source to figure this out), and there is no way to set cursor | |
405 on widgets in GTK. So we must set the cursor for all GDK windows. | |
406 Ditto for menus. */ | |
407 | |
408 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
|
409 gdk_window_set_cursor (GDK_WINDOW (children->data), cursor); |
49323 | 410 } |
411 | |
412 /* 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
|
413 |
49323 | 414 static void |
415 xg_list_insert (xg_list_node *list, xg_list_node *node) | |
416 { | |
417 xg_list_node *list_start = list->next; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
418 |
49323 | 419 if (list_start) list_start->prev = node; |
420 node->next = list_start; | |
421 node->prev = 0; | |
422 list->next = node; | |
423 } | |
424 | |
425 /* 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
|
426 |
49323 | 427 static void |
428 xg_list_remove (xg_list_node *list, xg_list_node *node) | |
429 { | |
430 xg_list_node *list_start = list->next; | |
431 if (node == list_start) | |
432 { | |
433 list->next = node->next; | |
434 if (list->next) list->next->prev = 0; | |
435 } | |
436 else | |
437 { | |
438 node->prev->next = node->next; | |
439 if (node->next) node->next->prev = node->prev; | |
440 } | |
441 } | |
442 | |
443 /* Allocate and return a utf8 version of STR. If STR is already | |
444 utf8 or NULL, just return STR. | |
445 If not, a new string is allocated and the caller must free the result | |
446 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
|
447 |
49323 | 448 static char * |
449 get_utf8_string (str) | |
450 char *str; | |
451 { | |
452 char *utf8_str = str; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
453 |
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
|
454 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
|
455 |
49323 | 456 /* 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
|
457 if (!g_utf8_validate (str, -1, NULL)) |
49323 | 458 utf8_str = g_locale_to_utf8 (str, -1, 0, 0, 0); |
459 | |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
460 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
|
461 { |
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 /* 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
|
463 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
|
464 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
|
465 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
|
466 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
|
467 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
|
468 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
|
469 |
73389
7b5c0104efb0
* gtkutil.c (get_utf8_string): Remove warnings with casts.
Jan Djärv <jan.h.d@swipnet.se>
parents:
73066
diff
changeset
|
470 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
|
471 &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
|
472 && 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
|
473 { |
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 ++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
|
475 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
|
476 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
|
477 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
|
478 } |
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
|
479 |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
480 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
|
481 { |
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 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
|
483 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
|
484 } |
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 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
|
486 |
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 = 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
|
488 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
|
489 |
7b5c0104efb0
* gtkutil.c (get_utf8_string): Remove warnings with casts.
Jan Djärv <jan.h.d@swipnet.se>
parents:
73066
diff
changeset
|
490 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
|
491 &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
|
492 && 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
|
493 { |
73389
7b5c0104efb0
* gtkutil.c (get_utf8_string): Remove warnings with casts.
Jan Djärv <jan.h.d@swipnet.se>
parents:
73066
diff
changeset
|
494 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
|
495 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
|
496 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
|
497 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
|
498 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
|
499 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
|
500 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
|
501 } |
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 |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
503 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
|
504 { |
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
|
505 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
|
506 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
|
507 } |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
508 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
|
509 { |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
510 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
|
511 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
|
512 } |
790e14d9baae
* gtkutil.c (get_utf8_string): Try harder to convert to UTF8. Gtk+
Jan Djärv <jan.h.d@swipnet.se>
parents:
72778
diff
changeset
|
513 } |
49323 | 514 return utf8_str; |
515 } | |
516 | |
517 | |
518 | |
519 /*********************************************************************** | |
520 General functions for creating widgets, resizing, events, e.t.c. | |
521 ***********************************************************************/ | |
522 | |
523 /* Make a geometry string and pass that to GTK. It seems this is the | |
524 only way to get geometry position right if the user explicitly | |
525 asked for a position when starting Emacs. | |
526 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
|
527 |
49323 | 528 static void |
529 xg_set_geometry (f) | |
530 FRAME_PTR f; | |
531 { | |
107851
2a74858bccc0
Fix so top -10 and left -10 in frame parameters work.
Jan D. <jan.h.d@swipnet.se>
parents:
107219
diff
changeset
|
532 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
|
533 { |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
534 int left = f->left_pos; |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
535 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
|
536 int top = f->top_pos; |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
537 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
|
538 char geom_str[32]; |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
539 |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
540 if (xneg) |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
541 left = -left; |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
542 if (yneg) |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
543 top = -top; |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
544 |
107891
bf5fce1e8e34
Set USER_POS in hint_flags to work around Cygwin problem.
Jan D. <jan.h.d@swipnet.se>
parents:
107851
diff
changeset
|
545 sprintf (geom_str, "=%dx%d%c%d%c%d", |
bf5fce1e8e34
Set USER_POS in hint_flags to work around Cygwin problem.
Jan D. <jan.h.d@swipnet.se>
parents:
107851
diff
changeset
|
546 FRAME_PIXEL_WIDTH (f), |
bf5fce1e8e34
Set USER_POS in hint_flags to work around Cygwin problem.
Jan D. <jan.h.d@swipnet.se>
parents:
107851
diff
changeset
|
547 FRAME_PIXEL_HEIGHT (f), |
93427
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
548 (xneg ? '-' : '+'), left, |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
549 (yneg ? '-' : '+'), top); |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
550 |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
551 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
|
552 geom_str)) |
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
553 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
|
554 } |
49323 | 555 } |
556 | |
106720
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
557 /* 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
|
558 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
|
559 |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
560 static void |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
561 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
|
562 FRAME_PTR f; |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
563 { |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
564 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
|
565 { |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
566 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
|
567 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
|
568 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
|
569 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
|
570 FRAME_X_WINDOW (f), |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
571 0, 0, |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
572 FRAME_PIXEL_WIDTH (f), |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
573 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
|
574 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
|
575 FRAME_X_WINDOW (f), |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
576 0, 0, |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
577 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
|
578 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
|
579 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
|
580 FRAME_X_WINDOW (f), |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
581 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
|
582 FRAME_PIXEL_WIDTH (f), |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
583 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
|
584 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
|
585 FRAME_X_WINDOW (f), |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
586 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
|
587 0, |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
588 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
|
589 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
|
590 } |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
591 } |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
592 |
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
|
593 /* 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
|
594 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
|
595 frame only. We let Gtk+ deal with the Gtk+ parts. |
49323 | 596 F is the frame to resize. |
597 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
|
598 |
49323 | 599 void |
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
|
600 xg_frame_resized (f, pixelwidth, pixelheight) |
49323 | 601 FRAME_PTR f; |
602 int pixelwidth, pixelheight; | |
603 { | |
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
|
604 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
|
605 |
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
|
606 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
|
607 { |
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
|
608 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
|
609 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
|
610 0, 0, |
106720
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
611 &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
|
612 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
|
613 } |
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
|
614 |
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
|
615 |
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
|
616 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
|
617 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
|
618 |
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
|
619 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
|
620 || 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
|
621 || 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
|
622 || pixelheight != FRAME_PIXEL_HEIGHT (f)) |
49323 | 623 { |
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
|
624 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
|
625 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
|
626 |
106720
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
627 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
|
628 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
|
629 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
|
630 cancel_mouse_face (f); |
49323 | 631 } |
632 } | |
633 | |
93427
753ad51473c7
(xg_set_geometry): Fix indentation.
Jan Djärv <jan.h.d@swipnet.se>
parents:
93030
diff
changeset
|
634 /* 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
|
635 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
|
636 |
49323 | 637 void |
638 xg_frame_set_char_size (f, cols, rows) | |
639 FRAME_PTR f; | |
640 int cols; | |
641 int rows; | |
642 { | |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
643 int pixelheight = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, rows) |
49323 | 644 + 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
|
645 int pixelwidth; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
646 |
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
|
647 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
|
648 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
|
649 |
49323 | 650 /* Take into account the size of the scroll bar. Always use the |
651 number of columns occupied by the scroll bar here otherwise we | |
652 might end up with a frame width that is not a multiple of the | |
653 frame's character width which is bad for vertically split | |
654 windows. */ | |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
655 f->scroll_bar_actual_width |
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
656 = FRAME_SCROLL_BAR_COLS (f) * FRAME_COLUMN_WIDTH (f); |
49323 | 657 |
50099
a62497b91c74
Use generic compute_fringe_widths.
Kim F. Storm <storm@cua.dk>
parents:
50063
diff
changeset
|
658 compute_fringe_widths (f, 0); |
49323 | 659 |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
660 /* 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
|
661 after calculating that value. */ |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
662 pixelwidth = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, cols); |
50318
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
663 |
106720
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
664 |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
665 /* 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
|
666 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
|
667 |
49323 | 668 /* 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
|
669 but not rows/cols. */ |
49323 | 670 gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)), |
671 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
|
672 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
|
673 |
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
|
674 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
|
675 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
|
676 |
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
|
677 /* 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
|
678 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
|
679 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
|
680 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
|
681 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
|
682 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
|
683 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
|
684 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
|
685 { |
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
|
686 /* 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
|
687 (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
|
688 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
|
689 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
|
690 } |
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
|
691 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
|
692 { |
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
|
693 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
|
694 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
|
695 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
|
696 } |
103665
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103198
diff
changeset
|
697 } |
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103198
diff
changeset
|
698 |
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103198
diff
changeset
|
699 /* Handle height changes (i.e. add/remove menu/toolbar). |
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103198
diff
changeset
|
700 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
|
701 |
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103198
diff
changeset
|
702 static void |
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103198
diff
changeset
|
703 xg_height_changed (f) |
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103198
diff
changeset
|
704 FRAME_PTR f; |
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103198
diff
changeset
|
705 { |
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103198
diff
changeset
|
706 gtk_window_resize (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)), |
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103198
diff
changeset
|
707 FRAME_PIXEL_WIDTH (f), FRAME_TOTAL_PIXEL_HEIGHT (f)); |
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103198
diff
changeset
|
708 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
|
709 x_wm_set_size_hint (f, 0, 0); |
49323 | 710 } |
711 | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
712 /* Convert an X Window WSESC on display DPY to its corresponding GtkWidget. |
49323 | 713 Must be done like this, because GtkWidget:s can have "hidden" |
714 X Window that aren't accessible. | |
715 | |
716 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
|
717 |
49323 | 718 GtkWidget * |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
719 xg_win_to_widget (dpy, wdesc) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
720 Display *dpy; |
49323 | 721 Window wdesc; |
722 { | |
723 gpointer gdkwin; | |
724 GtkWidget *gwdesc = 0; | |
725 | |
726 BLOCK_INPUT; | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
727 |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
728 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
|
729 wdesc); |
49323 | 730 if (gdkwin) |
731 { | |
732 GdkEvent event; | |
733 event.any.window = gdkwin; | |
734 gwdesc = gtk_get_event_widget (&event); | |
735 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
736 |
49323 | 737 UNBLOCK_INPUT; |
738 return gwdesc; | |
739 } | |
740 | |
741 /* Fill in the GdkColor C so that it represents PIXEL. | |
742 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
|
743 |
49323 | 744 static void |
745 xg_pix_to_gcolor (w, pixel, c) | |
746 GtkWidget *w; | |
747 unsigned long pixel; | |
748 GdkColor *c; | |
749 { | |
750 GdkColormap *map = gtk_widget_get_colormap (w); | |
751 gdk_colormap_query_color (map, pixel, c); | |
752 } | |
753 | |
754 /* Create and set up the GTK widgets for frame F. | |
755 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
|
756 |
49323 | 757 int |
758 xg_create_frame_widgets (f) | |
759 FRAME_PTR f; | |
760 { | |
761 GtkWidget *wtop; | |
762 GtkWidget *wvbox; | |
763 GtkWidget *wfixed; | |
764 GdkColor bg; | |
765 GtkRcStyle *style; | |
766 char *title = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
767 |
49323 | 768 BLOCK_INPUT; |
769 | |
91632
370f67c176eb
(xg_create_frame_widgets): If frame is embedded, call
Jan Djärv <jan.h.d@swipnet.se>
parents:
87649
diff
changeset
|
770 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
|
771 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
|
772 else |
370f67c176eb
(xg_create_frame_widgets): If frame is embedded, call
Jan Djärv <jan.h.d@swipnet.se>
parents:
87649
diff
changeset
|
773 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
|
774 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
775 xg_set_screen (wtop, f); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
776 |
49323 | 777 wvbox = gtk_vbox_new (FALSE, 0); |
778 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
|
779 |
49323 | 780 if (! wtop || ! wvbox || ! wfixed) |
781 { | |
782 if (wtop) gtk_widget_destroy (wtop); | |
783 if (wvbox) gtk_widget_destroy (wvbox); | |
784 if (wfixed) gtk_widget_destroy (wfixed); | |
785 | |
60185
391f44959566
(xg_create_frame_widgets): UNBLOCK_INPUT on error.
Kim F. Storm <storm@cua.dk>
parents:
59913
diff
changeset
|
786 UNBLOCK_INPUT; |
49323 | 787 return 0; |
788 } | |
789 | |
790 /* Use same names as the Xt port does. I.e. Emacs.pane.emacs by default */ | |
791 gtk_widget_set_name (wtop, EMACS_CLASS); | |
792 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
|
793 gtk_widget_set_name (wfixed, SSDATA (Vx_resource_name)); |
49323 | 794 |
795 /* 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
|
796 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
|
797 else if (! NILP (f->name)) title = SSDATA (ENCODE_UTF_8 (f->name)); |
49323 | 798 |
799 if (title) gtk_window_set_title (GTK_WINDOW (wtop), title); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
800 |
49323 | 801 FRAME_GTK_OUTER_WIDGET (f) = wtop; |
802 FRAME_GTK_WIDGET (f) = wfixed; | |
803 f->output_data.x->vbox_widget = wvbox; | |
804 | |
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
|
805 gtk_widget_set_has_window (wfixed, TRUE); |
49323 | 806 |
807 gtk_container_add (GTK_CONTAINER (wtop), wvbox); | |
808 gtk_box_pack_end (GTK_BOX (wvbox), wfixed, TRUE, TRUE, 0); | |
809 | |
810 if (FRAME_EXTERNAL_TOOL_BAR (f)) | |
811 update_frame_tool_bar (f); | |
812 | |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
813 /* 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
|
814 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
|
815 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
|
816 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
|
817 a lot, so we turn off double buffering. */ |
49323 | 818 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
|
819 |
49323 | 820 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
|
821 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
|
822 SSDATA (Vx_resource_class)); |
49323 | 823 |
824 /* Add callback to do nothing on WM_DELETE_WINDOW. The default in | |
825 GTK is to destroy the widget. We want Emacs to do that instead. */ | |
826 g_signal_connect (G_OBJECT (wtop), "delete-event", | |
827 G_CALLBACK (gtk_true), 0); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
828 |
49323 | 829 /* Convert our geometry parameters into a geometry string |
830 and specify it. | |
831 GTK will itself handle calculating the real position this way. */ | |
832 xg_set_geometry (f); | |
107219
07507204ac6f
Move declarations before statements.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
833 f->win_gravity |
07507204ac6f
Move declarations before statements.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
834 = gtk_window_get_gravity (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f))); |
49323 | 835 |
836 gtk_widget_add_events (wfixed, | |
837 GDK_POINTER_MOTION_MASK | |
838 | GDK_EXPOSURE_MASK | |
839 | GDK_BUTTON_PRESS_MASK | |
840 | GDK_BUTTON_RELEASE_MASK | |
841 | GDK_KEY_PRESS_MASK | |
842 | GDK_ENTER_NOTIFY_MASK | |
843 | GDK_LEAVE_NOTIFY_MASK | |
844 | GDK_FOCUS_CHANGE_MASK | |
845 | GDK_STRUCTURE_MASK | |
846 | GDK_VISIBILITY_NOTIFY_MASK); | |
847 | |
848 /* Must realize the windows so the X window gets created. It is used | |
849 by callers of this function. */ | |
850 gtk_widget_realize (wfixed); | |
851 FRAME_X_WINDOW (f) = GTK_WIDGET_TO_X_WIN (wfixed); | |
852 | |
853 /* Since GTK clears its window by filling with the background color, | |
854 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
|
855 xg_pix_to_gcolor (wfixed, FRAME_BACKGROUND_PIXEL (f), &bg); |
49323 | 856 gtk_widget_modify_bg (wfixed, GTK_STATE_NORMAL, &bg); |
857 | |
858 /* Also, do not let any background pixmap to be set, this looks very | |
859 bad as Emacs overwrites the background pixmap with its own idea | |
860 of background color. */ | |
861 style = gtk_widget_get_modifier_style (wfixed); | |
862 | |
863 /* Must use g_strdup because gtk_widget_modify_style does g_free. */ | |
864 style->bg_pixmap_name[GTK_STATE_NORMAL] = g_strdup ("<none>"); | |
865 gtk_widget_modify_style (wfixed, style); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
866 |
49323 | 867 /* GTK does not set any border, and they look bad with GTK. */ |
95954
184aae567806
* xfns.c (Fx_create_frame): internal-border-width default to 0 for Gtk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95794
diff
changeset
|
868 /* That they look bad is no excuse for imposing this here. --Stef |
184aae567806
* xfns.c (Fx_create_frame): internal-border-width default to 0 for Gtk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95794
diff
changeset
|
869 It should be done by providing the proper default in Fx_create_Frame. |
51211
28ea05de2dc5
Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents:
50778
diff
changeset
|
870 f->border_width = 0; |
95954
184aae567806
* xfns.c (Fx_create_frame): internal-border-width default to 0 for Gtk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95794
diff
changeset
|
871 f->internal_border_width = 0; */ |
49323 | 872 |
873 UNBLOCK_INPUT; | |
874 | |
875 return 1; | |
876 } | |
877 | |
878 /* Set the normal size hints for the window manager, for frame F. | |
879 FLAGS is the flags word to use--or 0 meaning preserve the flags | |
880 that the window now has. | |
881 If USER_POSITION is nonzero, we set the User Position | |
882 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
|
883 |
49323 | 884 void |
885 x_wm_set_size_hint (f, flags, user_position) | |
886 FRAME_PTR f; | |
887 long flags; | |
888 int user_position; | |
889 { | |
98545
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
890 /* 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
|
891 to its own defaults. */ |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
892 GdkGeometry size_hints; |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
893 gint hint_flags = 0; |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
894 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
|
895 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
|
896 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
|
897 |
107219
07507204ac6f
Move declarations before statements.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
898 /* 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
|
899 to a race condition. See the thread at |
07507204ac6f
Move declarations before statements.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
900 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
|
901 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
|
902 return; |
07507204ac6f
Move declarations before statements.
Jan D. <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
903 |
98545
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
904 if (flags) |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
905 { |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
906 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
|
907 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
|
908 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
|
909 } |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
910 else |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
911 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
|
912 |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
913 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
|
914 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
|
915 |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
916 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
|
917 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
|
918 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
|
919 |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
920 hint_flags |= GDK_HINT_BASE_SIZE; |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
921 base_width = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, 0); |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
922 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
|
923 + 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
|
924 |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
925 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
|
926 |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
927 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
|
928 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
|
929 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
|
930 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
|
931 |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
932 /* 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
|
933 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
|
934 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
|
935 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
|
936 if (win_gravity == NorthWestGravity) |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
937 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
|
938 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
|
939 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
|
940 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
|
941 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
|
942 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
|
943 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
|
944 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
|
945 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
|
946 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
|
947 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
|
948 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
|
949 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
|
950 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
|
951 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
|
952 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
|
953 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
|
954 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
|
955 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
|
956 |
107891
bf5fce1e8e34
Set USER_POS in hint_flags to work around Cygwin problem.
Jan D. <jan.h.d@swipnet.se>
parents:
107851
diff
changeset
|
957 if (user_position) |
bf5fce1e8e34
Set USER_POS in hint_flags to work around Cygwin problem.
Jan D. <jan.h.d@swipnet.se>
parents:
107851
diff
changeset
|
958 { |
bf5fce1e8e34
Set USER_POS in hint_flags to work around Cygwin problem.
Jan D. <jan.h.d@swipnet.se>
parents:
107851
diff
changeset
|
959 hint_flags &= ~GDK_HINT_POS; |
bf5fce1e8e34
Set USER_POS in hint_flags to work around Cygwin problem.
Jan D. <jan.h.d@swipnet.se>
parents:
107851
diff
changeset
|
960 hint_flags |= GDK_HINT_USER_POS; |
bf5fce1e8e34
Set USER_POS in hint_flags to work around Cygwin problem.
Jan D. <jan.h.d@swipnet.se>
parents:
107851
diff
changeset
|
961 } |
bf5fce1e8e34
Set USER_POS in hint_flags to work around Cygwin problem.
Jan D. <jan.h.d@swipnet.se>
parents:
107851
diff
changeset
|
962 |
98545
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
963 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
|
964 || memcmp (&size_hints, |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
965 &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
|
966 sizeof (size_hints)) != 0) |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
967 { |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
968 BLOCK_INPUT; |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
969 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
|
970 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
|
971 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
|
972 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
|
973 UNBLOCK_INPUT; |
d19cd21bc42d
(x_wm_set_size_hint): Return immediately if called during
Chong Yidong <cyd@stupidchicken.com>
parents:
97076
diff
changeset
|
974 } |
49323 | 975 } |
976 | |
977 /* Change background color of a frame. | |
96363
f9d35151b907
American English spelling fix.
Glenn Morris <rgm@gnu.org>
parents:
95954
diff
changeset
|
978 Since GTK uses the background color to clear the window, we must |
49323 | 979 keep the GTK and X colors in sync. |
980 F is the frame to change, | |
981 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
|
982 |
49323 | 983 void |
984 xg_set_background_color (f, bg) | |
985 FRAME_PTR f; | |
986 unsigned long bg; | |
987 { | |
988 if (FRAME_GTK_WIDGET (f)) | |
989 { | |
990 GdkColor gdk_bg; | |
991 | |
992 BLOCK_INPUT; | |
993 xg_pix_to_gcolor (FRAME_GTK_WIDGET (f), bg, &gdk_bg); | |
994 gtk_widget_modify_bg (FRAME_GTK_WIDGET (f), GTK_STATE_NORMAL, &gdk_bg); | |
995 UNBLOCK_INPUT; | |
996 } | |
997 } | |
998 | |
999 | |
65006
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1000 /* 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
|
1001 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
|
1002 |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1003 void |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1004 xg_set_frame_icon (f, icon_pixmap, icon_mask) |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1005 FRAME_PTR f; |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1006 Pixmap icon_pixmap; |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1007 Pixmap icon_mask; |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1008 { |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1009 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
|
1010 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
|
1011 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
|
1012 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
|
1013 |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1014 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
|
1015 } |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1016 |
ec2fa2e1d4ea
* gtkutil.c (xg_set_frame_icon): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
64936
diff
changeset
|
1017 |
49323 | 1018 |
1019 /*********************************************************************** | |
1020 Dialog functions | |
1021 ***********************************************************************/ | |
1022 /* Return the dialog title to use for a dialog of type KEY. | |
1023 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
|
1024 |
49323 | 1025 static char * |
1026 get_dialog_title (char key) | |
1027 { | |
1028 char *title = ""; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1029 |
49323 | 1030 switch (key) { |
1031 case 'E': case 'e': | |
1032 title = "Error"; | |
1033 break; | |
1034 | |
1035 case 'I': case 'i': | |
1036 title = "Information"; | |
1037 break; | |
1038 | |
1039 case 'L': case 'l': | |
1040 title = "Prompt"; | |
1041 break; | |
1042 | |
1043 case 'P': case 'p': | |
1044 title = "Prompt"; | |
1045 break; | |
1046 | |
1047 case 'Q': case 'q': | |
1048 title = "Question"; | |
1049 break; | |
1050 } | |
1051 | |
1052 return title; | |
1053 } | |
1054 | |
1055 /* Callback for dialogs that get WM_DELETE_WINDOW. We pop down | |
1056 the dialog, but return TRUE so the event does not propagate further | |
1057 in GTK. This prevents GTK from destroying the dialog widget automatically | |
1058 and we can always destrou the widget manually, regardles of how | |
1059 it was popped down (button press or WM_DELETE_WINDOW). | |
1060 W is the dialog widget. | |
1061 EVENT is the GdkEvent that represents WM_DELETE_WINDOW (not used). | |
1062 user_data is NULL (not used). | |
1063 | |
1064 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
|
1065 |
49323 | 1066 static gboolean |
1067 dialog_delete_callback (w, event, user_data) | |
1068 GtkWidget *w; | |
1069 GdkEvent *event; | |
1070 gpointer user_data; | |
1071 { | |
1072 gtk_widget_unmap (w); | |
1073 return TRUE; | |
1074 } | |
1075 | |
1076 /* Create a popup dialog window. See also xg_create_widget below. | |
1077 WV is a widget_value describing the dialog. | |
1078 SELECT_CB is the callback to use when a button has been pressed. | |
1079 DEACTIVATE_CB is the callback to use when the dialog pops down. | |
1080 | |
1081 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
|
1082 |
49323 | 1083 static GtkWidget * |
1084 create_dialog (wv, select_cb, deactivate_cb) | |
1085 widget_value *wv; | |
1086 GCallback select_cb; | |
1087 GCallback deactivate_cb; | |
1088 { | |
1089 char *title = get_dialog_title (wv->name[0]); | |
1090 int total_buttons = wv->name[1] - '0'; | |
1091 int right_buttons = wv->name[4] - '0'; | |
1092 int left_buttons; | |
1093 int button_nr = 0; | |
1094 int button_spacing = 10; | |
1095 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
|
1096 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
|
1097 GtkBox *cur_box = GTK_BOX (gtk_dialog_get_action_area (wd)); |
49323 | 1098 widget_value *item; |
1099 GtkWidget *wvbox; | |
1100 GtkWidget *whbox_up; | |
1101 GtkWidget *whbox_down; | |
1102 | |
1103 /* If the number of buttons is greater than 4, make two rows of buttons | |
1104 instead. This looks better. */ | |
1105 int make_two_rows = total_buttons > 4; | |
1106 | |
1107 if (right_buttons == 0) right_buttons = total_buttons/2; | |
1108 left_buttons = total_buttons - right_buttons; | |
1109 | |
1110 gtk_window_set_title (GTK_WINDOW (wdialog), title); | |
1111 gtk_widget_set_name (wdialog, "emacs-dialog"); | |
1112 | |
1113 | |
1114 if (make_two_rows) | |
1115 { | |
1116 wvbox = gtk_vbox_new (TRUE, button_spacing); | |
1117 whbox_up = gtk_hbox_new (FALSE, 0); | |
1118 whbox_down = gtk_hbox_new (FALSE, 0); | |
1119 | |
1120 gtk_box_pack_start (cur_box, wvbox, FALSE, FALSE, 0); | |
1121 gtk_box_pack_start (GTK_BOX (wvbox), whbox_up, FALSE, FALSE, 0); | |
1122 gtk_box_pack_start (GTK_BOX (wvbox), whbox_down, FALSE, FALSE, 0); | |
1123 | |
1124 cur_box = GTK_BOX (whbox_up); | |
1125 } | |
1126 | |
1127 g_signal_connect (G_OBJECT (wdialog), "delete-event", | |
1128 G_CALLBACK (dialog_delete_callback), 0); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1129 |
49323 | 1130 if (deactivate_cb) |
1131 { | |
1132 g_signal_connect (G_OBJECT (wdialog), "close", deactivate_cb, 0); | |
1133 g_signal_connect (G_OBJECT (wdialog), "response", deactivate_cb, 0); | |
1134 } | |
1135 | |
1136 for (item = wv->contents; item; item = item->next) | |
1137 { | |
1138 char *utf8_label = get_utf8_string (item->value); | |
1139 GtkWidget *w; | |
1140 GtkRequisition req; | |
1141 | |
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
|
1142 if (item->name && strcmp (item->name, "message") == 0) |
49323 | 1143 { |
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
|
1144 GtkBox *wvbox = GTK_BOX (gtk_dialog_get_content_area (wd)); |
49323 | 1145 /* This is the text part of the dialog. */ |
1146 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
|
1147 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
|
1148 gtk_box_pack_start (wvbox, w, TRUE, TRUE, 0); |
49323 | 1149 gtk_misc_set_alignment (GTK_MISC (w), 0.1, 0.5); |
1150 | |
1151 /* Try to make dialog look better. Must realize first so | |
1152 the widget can calculate the size it needs. */ | |
1153 gtk_widget_realize (w); | |
1154 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
|
1155 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
|
1156 if (item->value && strlen (item->value) > 0) |
49323 | 1157 button_spacing = 2*req.width/strlen (item->value); |
1158 } | |
1159 else | |
1160 { | |
1161 /* 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
|
1162 w = gtk_button_new_with_label (utf8_label); |
49323 | 1163 if (! item->enabled) |
1164 gtk_widget_set_sensitive (w, FALSE); | |
1165 if (select_cb) | |
1166 g_signal_connect (G_OBJECT (w), "clicked", | |
1167 select_cb, item->call_data); | |
1168 | |
1169 gtk_box_pack_start (cur_box, w, TRUE, TRUE, button_spacing); | |
1170 if (++button_nr == left_buttons) | |
1171 { | |
1172 if (make_two_rows) | |
1173 cur_box = GTK_BOX (whbox_down); | |
1174 else | |
1175 gtk_box_pack_start (cur_box, | |
1176 gtk_label_new (""), | |
1177 TRUE, TRUE, | |
1178 button_spacing); | |
1179 } | |
1180 } | |
1181 | |
1182 if (utf8_label && utf8_label != item->value) | |
1183 g_free (utf8_label); | |
1184 } | |
1185 | |
1186 return wdialog; | |
1187 } | |
1188 | |
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
|
1189 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
|
1190 { |
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
|
1191 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
|
1192 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
|
1193 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
|
1194 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
|
1195 }; |
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
|
1196 |
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
|
1197 /* 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
|
1198 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
|
1199 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
|
1200 |
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
|
1201 static void |
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
|
1202 xg_dialog_response_cb (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
|
1203 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
|
1204 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
|
1205 GtkDialog *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
|
1206 gint 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
|
1207 gpointer 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
|
1208 { |
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
|
1209 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
|
1210 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
|
1211 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
|
1212 } |
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
|
1213 |
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
|
1214 |
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
|
1215 /* 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
|
1216 |
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
|
1217 static Lisp_Object |
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
|
1218 pop_down_dialog (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
|
1219 Lisp_Object 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
|
1220 { |
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
|
1221 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
|
1222 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
|
1223 |
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
|
1224 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
|
1225 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
|
1226 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
|
1227 |
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
|
1228 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
|
1229 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
|
1230 |
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
|
1231 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
|
1232 |
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
|
1233 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
|
1234 } |
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
|
1235 |
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
|
1236 /* 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
|
1237 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
|
1238 |
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
|
1239 static gboolean |
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
|
1240 xg_maybe_add_timer (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
|
1241 gpointer 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
|
1242 { |
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
|
1243 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
|
1244 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
|
1245 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
|
1246 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
|
1247 |
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
|
1248 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
|
1249 |
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
|
1250 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
|
1251 { |
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
|
1252 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
|
1253 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
|
1254 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
|
1255 } |
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
|
1256 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
|
1257 } |
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
|
1258 |
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
|
1259 |
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
|
1260 /* 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
|
1261 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
|
1262 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
|
1263 |
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
|
1264 static int |
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
|
1265 xg_dialog_run (f, 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
|
1266 FRAME_PTR 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
|
1267 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
|
1268 |
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
|
1269 { |
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
|
1270 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
|
1271 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
|
1272 |
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
|
1273 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
|
1274 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
|
1275 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
|
1276 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
|
1277 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
|
1278 |
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
|
1279 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
|
1280 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
|
1281 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
|
1282 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
|
1283 |
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
|
1284 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
|
1285 "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
|
1286 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
|
1287 &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
|
1288 /* 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
|
1289 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
|
1290 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
|
1291 |
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
|
1292 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
|
1293 |
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
|
1294 (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
|
1295 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
|
1296 |
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
|
1297 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
|
1298 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
|
1299 |
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
|
1300 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
|
1301 } |
49323 | 1302 |
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
|
1303 |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1304 /*********************************************************************** |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1305 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
|
1306 ***********************************************************************/ |
67761
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1307 /* 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
|
1308 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
|
1309 |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1310 int |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1311 xg_uses_old_file_dialog () |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1312 { |
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
|
1313 #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
|
1314 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
|
1315 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
|
1316 #else |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1317 return 0; |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1318 #endif |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1319 } |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1320 |
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1321 |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1322 typedef char * (*xg_get_file_func) P_ ((GtkWidget *)); |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1323 |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1324 /* 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
|
1325 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
|
1326 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1327 static char * |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1328 xg_get_file_name_from_chooser (w) |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1329 GtkWidget *w; |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1330 { |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1331 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
|
1332 } |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1333 |
68100
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1334 /* 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
|
1335 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
|
1336 |
67843
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1337 static void |
67849 | 1338 xg_toggle_visibility_cb (widget, data) |
67843
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1339 GtkWidget *widget; |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1340 gpointer data; |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1341 { |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1342 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
|
1343 gboolean visible; |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1344 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
|
1345 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
|
1346 } |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1347 |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1348 |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1349 /* 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
|
1350 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
|
1351 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
|
1352 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
|
1353 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
|
1354 |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1355 static void |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1356 xg_toggle_notify_cb (gobject, arg1, user_data) |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1357 GObject *gobject; |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1358 GParamSpec *arg1; |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1359 gpointer user_data; |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1360 { |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1361 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
|
1362 |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1363 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
|
1364 { |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1365 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
|
1366 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
|
1367 |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1368 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
|
1369 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
|
1370 |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1371 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
|
1372 { |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1373 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
|
1374 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
|
1375 gobject); |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1376 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
|
1377 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
|
1378 (G_OBJECT (wtoggle), |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1379 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
|
1380 gobject); |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1381 } |
e5611feba7f7
* gtkutil.c (xg_toggle_notify_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68027
diff
changeset
|
1382 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
|
1383 } |
67843
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1384 } |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1385 |
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
|
1386 /* 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
|
1387 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
|
1388 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
|
1389 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
|
1390 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
|
1391 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
|
1392 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
|
1393 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1394 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
|
1395 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1396 static GtkWidget * |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1397 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
|
1398 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
|
1399 FRAME_PTR f; |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1400 char *prompt; |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1401 char *default_filename; |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1402 int mustmatch_p, only_dir_p; |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1403 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
|
1404 { |
67843
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1405 char message[1024]; |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1406 |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1407 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
|
1408 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
|
1409 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
|
1410 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
|
1411 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
|
1412 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
|
1413 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
|
1414 |
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
|
1415 |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1416 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
|
1417 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
|
1418 |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1419 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
|
1420 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
|
1421 (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
|
1422 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
|
1423 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
|
1424 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
|
1425 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
|
1426 |
67843
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1427 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
|
1428 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
|
1429 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
|
1430 |
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
1431 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
|
1432 { |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1433 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
|
1434 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
|
1435 } |
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1436 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
|
1437 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
|
1438 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
|
1439 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
|
1440 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
|
1441 |
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
|
1442 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
|
1443 { |
0ee8cea94c25
* gtkutil.c (xg_get_file_with_chooser): Check
Jan Djärv <jan.h.d@swipnet.se>
parents:
72928
diff
changeset
|
1444 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
|
1445 /* 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
|
1446 Show the C-l help text only for versions < 2.10. */ |
73066 | 1447 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
|
1448 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
|
1449 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
|
1450 "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
|
1451 "use-file-dialog to turn it off."); |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
1452 |
72931
0ee8cea94c25
* gtkutil.c (xg_get_file_with_chooser): Check
Jan Djärv <jan.h.d@swipnet.se>
parents:
72928
diff
changeset
|
1453 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
|
1454 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
|
1455 } |
0ee8cea94c25
* gtkutil.c (xg_get_file_with_chooser): Check
Jan Djärv <jan.h.d@swipnet.se>
parents:
72928
diff
changeset
|
1456 |
67843
6cf5dc28bd1e
* gtkutil.c (xg_toggle_visibility_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67761
diff
changeset
|
1457 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
|
1458 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
|
1459 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
|
1460 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
|
1461 |
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
|
1462 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
|
1463 { |
a3fa0e63dd67
* gtkutil.c (xg_get_file_with_chooser): Expand DEFAULT_FILENAME if
Jan Djärv <jan.h.d@swipnet.se>
parents:
57900
diff
changeset
|
1464 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
|
1465 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
|
1466 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
|
1467 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
|
1468 |
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
|
1469 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
|
1470 |
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
|
1471 /* 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
|
1472 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
|
1473 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
|
1474 file = Fexpand_file_name (file, Qnil); |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
1475 |
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
|
1476 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
|
1477 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
|
1478 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
|
1479 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
|
1480 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
|
1481 { |
af91ff74c754
* gtkutil.c (xg_get_file_with_chooser): Change file chooser message
Jan Djärv <jan.h.d@swipnet.se>
parents:
71160
diff
changeset
|
1482 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
|
1483 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
|
1484 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
|
1485 { |
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
|
1486 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
|
1487 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
|
1488 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
|
1489 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
|
1490 } |
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
|
1491 } |
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
|
1492 |
a3fa0e63dd67
* gtkutil.c (xg_get_file_with_chooser): Expand DEFAULT_FILENAME if
Jan Djärv <jan.h.d@swipnet.se>
parents:
57900
diff
changeset
|
1493 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
|
1494 } |
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
|
1495 |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1496 *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
|
1497 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
|
1498 } |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1499 |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1500 #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
|
1501 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1502 /* 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
|
1503 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
|
1504 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1505 static char * |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1506 xg_get_file_name_from_selector (w) |
49323 | 1507 GtkWidget *w; |
1508 { | |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1509 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
|
1510 return xstrdup ((char*) gtk_file_selection_get_filename (filesel)); |
49323 | 1511 } |
1512 | |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1513 /* Create a file selection dialog. |
49323 | 1514 F is the current frame. |
1515 PROMPT is a prompt to show to the user. May not be NULL. | |
1516 DEFAULT_FILENAME is a default selection to be displayed. May be NULL. | |
1517 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
|
1518 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
|
1519 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
|
1520 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1521 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
|
1522 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1523 static GtkWidget * |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1524 xg_get_file_with_selection (f, prompt, default_filename, |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1525 mustmatch_p, only_dir_p, func) |
49323 | 1526 FRAME_PTR f; |
1527 char *prompt; | |
1528 char *default_filename; | |
57868
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1529 int mustmatch_p, only_dir_p; |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1530 xg_get_file_func *func; |
49323 | 1531 { |
1532 GtkWidget *filewin; | |
1533 GtkFileSelection *filesel; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1534 |
49323 | 1535 filewin = gtk_file_selection_new (prompt); |
1536 filesel = GTK_FILE_SELECTION (filewin); | |
1537 | |
1538 if (default_filename) | |
1539 gtk_file_selection_set_filename (filesel, default_filename); | |
1540 | |
1541 if (mustmatch_p) | |
1542 { | |
1543 /* The selection_entry part of filesel is not documented. */ | |
1544 gtk_widget_set_sensitive (filesel->selection_entry, FALSE); | |
1545 gtk_file_selection_hide_fileop_buttons (filesel); | |
1546 } | |
1547 | |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1548 *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
|
1549 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1550 return filewin; |
49323 | 1551 } |
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
|
1552 #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
|
1553 |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1554 /* 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
|
1555 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
|
1556 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
|
1557 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
|
1558 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
|
1559 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
|
1560 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
|
1561 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
|
1562 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
|
1563 |
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 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
|
1565 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
|
1566 |
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 char * |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1568 xg_get_file_name (f, prompt, default_filename, mustmatch_p, only_dir_p) |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1569 FRAME_PTR f; |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1570 char *prompt; |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1571 char *default_filename; |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1572 int mustmatch_p, only_dir_p; |
c955f6add62a
* fileio.c (Fread_file_name): Pass Qt as fifth parameter to
Jan Djärv <jan.h.d@swipnet.se>
parents:
57715
diff
changeset
|
1573 { |
58284
10efc827e15c
* gtkutil.c (xg_get_file_name): Fix typo in
Jan Djärv <jan.h.d@swipnet.se>
parents:
58201
diff
changeset
|
1574 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
|
1575 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
|
1576 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
|
1577 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
|
1578 |
58818
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
1579 #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
|
1580 /* 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
|
1581 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
|
1582 threads. */ |
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
1583 sigblock (sigmask (__SIGRTMIN)); |
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
1584 #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
|
1585 |
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
|
1586 #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
|
1587 |
67761
5b8799d65159
* xfns.c (Fx_uses_old_gtk_dialog): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
67528
diff
changeset
|
1588 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
|
1589 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
|
1590 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
|
1591 else |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1592 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
|
1593 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
|
1594 |
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
|
1595 #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
|
1596 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
|
1597 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
|
1598 #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
|
1599 |
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1600 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
|
1601 |
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
|
1602 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
|
1603 |
58818
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
1604 #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
|
1605 sigunblock (sigmask (__SIGRTMIN)); |
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
1606 #endif |
f8cddae7d959
* gtkutil.c: Include signal.h and syssignal.h.
Jan Djärv <jan.h.d@swipnet.se>
parents:
58817
diff
changeset
|
1607 |
58200
3608b64ba20f
* gtkutil.c (xg_file_sel_ok, xg_file_sel_cancel)
Jan Djärv <jan.h.d@swipnet.se>
parents:
57941
diff
changeset
|
1608 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
|
1609 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
|
1610 |
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
|
1611 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
|
1612 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
|
1613 } |
49323 | 1614 |
95794
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1615 #ifdef HAVE_FREETYPE |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1616 /* 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
|
1617 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
|
1618 format: |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1619 |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1620 `FAMILY [VALUE1 VALUE2] SIZE' |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1621 |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1622 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
|
1623 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
|
1624 |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1625 char * |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1626 xg_get_font_name (f, default_name) |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1627 FRAME_PTR f; |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1628 char *default_name; |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1629 { |
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
|
1630 GtkWidget *w; |
95794
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1631 char *fontname = NULL; |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1632 int done = 0; |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1633 |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1634 #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
|
1635 sigblock (sigmask (__SIGRTMIN)); |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1636 #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
|
1637 |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1638 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
|
1639 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
|
1640 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
|
1641 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
|
1642 default_name); |
95794
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1643 |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1644 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
|
1645 |
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
|
1646 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
|
1647 |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1648 #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
|
1649 sigunblock (sigmask (__SIGRTMIN)); |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1650 #endif |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1651 |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1652 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
|
1653 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
|
1654 (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
|
1655 |
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
|
1656 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
|
1657 return fontname; |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1658 } |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1659 #endif /* HAVE_FREETYPE */ |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1660 |
e4d692886628
(xg_dialog_response_cb): Rename from xg_file_response_callback.
Chong Yidong <cyd@stupidchicken.com>
parents:
95481
diff
changeset
|
1661 |
49323 | 1662 |
1663 /*********************************************************************** | |
1664 Menu functions. | |
1665 ***********************************************************************/ | |
1666 | |
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
|
1667 /* The name of menu items that can be used for customization. Since GTK |
49323 | 1668 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
|
1669 menu item names so a user can easily customize menu items. */ |
49323 | 1670 |
1671 #define MENU_ITEM_NAME "emacs-menuitem" | |
1672 | |
1673 | |
1674 /* Linked list of all allocated struct xg_menu_cb_data. Used for marking | |
1675 during GC. The next member points to the items. */ | |
1676 static xg_list_node xg_menu_cb_list; | |
1677 | |
1678 /* Linked list of all allocated struct xg_menu_item_cb_data. Used for marking | |
1679 during GC. The next member points to the items. */ | |
1680 static xg_list_node xg_menu_item_cb_list; | |
1681 | |
1682 /* Allocate and initialize CL_DATA if NULL, otherwise increase ref_count. | |
1683 F is the frame CL_DATA will be initialized for. | |
1684 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. | |
1685 | |
1686 The menu bar and all sub menus under the menu bar in a frame | |
1687 share the same structure, hence the reference count. | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1688 |
49323 | 1689 Returns CL_DATA if CL_DATA is not NULL, or a pointer to a newly |
1690 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
|
1691 |
49323 | 1692 static xg_menu_cb_data * |
1693 make_cl_data (cl_data, f, highlight_cb) | |
1694 xg_menu_cb_data *cl_data; | |
1695 FRAME_PTR f; | |
1696 GCallback highlight_cb; | |
1697 { | |
1698 if (! cl_data) | |
1699 { | |
1700 cl_data = (xg_menu_cb_data*) xmalloc (sizeof (*cl_data)); | |
1701 cl_data->f = f; | |
1702 cl_data->menu_bar_vector = f->menu_bar_vector; | |
1703 cl_data->menu_bar_items_used = f->menu_bar_items_used; | |
1704 cl_data->highlight_cb = highlight_cb; | |
1705 cl_data->ref_count = 0; | |
1706 | |
1707 xg_list_insert (&xg_menu_cb_list, &cl_data->ptrs); | |
1708 } | |
1709 | |
1710 cl_data->ref_count++; | |
1711 | |
1712 return cl_data; | |
1713 } | |
1714 | |
1715 /* Update CL_DATA with values from frame F and with HIGHLIGHT_CB. | |
1716 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. | |
1717 | |
1718 When the menu bar is updated, menu items may have been added and/or | |
1719 removed, so menu_bar_vector and menu_bar_items_used change. We must | |
1720 then update CL_DATA since it is used to determine which menu | |
1721 item that is invoked in the menu. | |
1722 HIGHLIGHT_CB could change, there is no check that the same | |
1723 function is given when modifying a menu bar as was given when | |
1724 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
|
1725 |
49323 | 1726 static void |
1727 update_cl_data (cl_data, f, highlight_cb) | |
1728 xg_menu_cb_data *cl_data; | |
1729 FRAME_PTR f; | |
1730 GCallback highlight_cb; | |
1731 { | |
1732 if (cl_data) | |
1733 { | |
1734 cl_data->f = f; | |
1735 cl_data->menu_bar_vector = f->menu_bar_vector; | |
1736 cl_data->menu_bar_items_used = f->menu_bar_items_used; | |
1737 cl_data->highlight_cb = highlight_cb; | |
1738 } | |
1739 } | |
1740 | |
1741 /* Decrease reference count for CL_DATA. | |
1742 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
|
1743 |
49323 | 1744 static void |
1745 unref_cl_data (cl_data) | |
1746 xg_menu_cb_data *cl_data; | |
1747 { | |
1748 if (cl_data && cl_data->ref_count > 0) | |
1749 { | |
1750 cl_data->ref_count--; | |
1751 if (cl_data->ref_count == 0) | |
1752 { | |
1753 xg_list_remove (&xg_menu_cb_list, &cl_data->ptrs); | |
1754 xfree (cl_data); | |
1755 } | |
1756 } | |
1757 } | |
1758 | |
1759 /* 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
|
1760 |
49323 | 1761 void |
1762 xg_mark_data () | |
1763 { | |
1764 xg_list_node *iter; | |
1765 | |
1766 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
|
1767 mark_object (((xg_menu_cb_data *) iter)->menu_bar_vector); |
49323 | 1768 |
1769 for (iter = xg_menu_item_cb_list.next; iter; iter = iter->next) | |
1770 { | |
1771 xg_menu_item_cb_data *cb_data = (xg_menu_item_cb_data *) iter; | |
1772 | |
1773 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
|
1774 mark_object (cb_data->help); |
49323 | 1775 } |
1776 } | |
1777 | |
1778 | |
1779 /* Callback called when a menu item is destroyed. Used to free data. | |
1780 W is the widget that is being destroyed (not used). | |
1781 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
|
1782 |
49323 | 1783 static void |
1784 menuitem_destroy_callback (w, client_data) | |
1785 GtkWidget *w; | |
1786 gpointer client_data; | |
1787 { | |
1788 if (client_data) | |
1789 { | |
1790 xg_menu_item_cb_data *data = (xg_menu_item_cb_data*) client_data; | |
1791 xg_list_remove (&xg_menu_item_cb_list, &data->ptrs); | |
1792 xfree (data); | |
1793 } | |
1794 } | |
1795 | |
1796 /* 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
|
1797 W is the parent of the menu item. |
49323 | 1798 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
|
1799 CLIENT_DATA is not used. |
49323 | 1800 |
1801 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
|
1802 |
49323 | 1803 static gboolean |
1804 menuitem_highlight_callback (w, event, client_data) | |
1805 GtkWidget *w; | |
1806 GdkEventCrossing *event; | |
1807 gpointer client_data; | |
1808 { | |
75040
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
1809 GdkEvent ev; |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
1810 GtkWidget *subwidget; |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
1811 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
|
1812 |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
1813 ev.crossing = *event; |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
1814 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
|
1815 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
|
1816 XG_ITEM_DATA); |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
1817 if (data) |
49323 | 1818 { |
1819 if (! NILP (data->help) && data->cl_data->highlight_cb) | |
1820 { | |
75040
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
1821 gpointer call_data = event->type == GDK_LEAVE_NOTIFY ? 0 : data; |
49323 | 1822 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
|
1823 (*func) (subwidget, call_data); |
49323 | 1824 } |
1825 } | |
1826 | |
1827 return FALSE; | |
1828 } | |
1829 | |
1830 /* Callback called when a menu is destroyed. Used to free data. | |
1831 W is the widget that is being destroyed (not used). | |
1832 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
|
1833 |
49323 | 1834 static void |
1835 menu_destroy_callback (w, client_data) | |
1836 GtkWidget *w; | |
1837 gpointer client_data; | |
1838 { | |
1839 unref_cl_data ((xg_menu_cb_data*) client_data); | |
1840 } | |
1841 | |
1842 /* Make a GTK widget that contains both UTF8_LABEL and UTF8_KEY (both | |
1843 must be non-NULL) and can be inserted into a menu item. | |
1844 | |
1845 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
|
1846 |
49323 | 1847 static GtkWidget * |
1848 make_widget_for_menu_item (utf8_label, utf8_key) | |
1849 char *utf8_label; | |
1850 char *utf8_key; | |
1851 { | |
1852 GtkWidget *wlbl; | |
1853 GtkWidget *wkey; | |
1854 GtkWidget *wbox; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1855 |
49323 | 1856 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
|
1857 wlbl = gtk_label_new (utf8_label); |
49323 | 1858 wkey = gtk_label_new (utf8_key); |
1859 | |
1860 gtk_misc_set_alignment (GTK_MISC (wlbl), 0.0, 0.5); | |
1861 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
|
1862 |
49323 | 1863 gtk_box_pack_start (GTK_BOX (wbox), wlbl, TRUE, TRUE, 0); |
1864 gtk_box_pack_start (GTK_BOX (wbox), wkey, FALSE, FALSE, 0); | |
1865 | |
1866 gtk_widget_set_name (wlbl, MENU_ITEM_NAME); | |
1867 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
|
1868 gtk_widget_set_name (wbox, MENU_ITEM_NAME); |
49323 | 1869 |
1870 return wbox; | |
1871 } | |
1872 | |
1873 /* Make and return a menu item widget with the key to the right. | |
1874 UTF8_LABEL is the text for the menu item (GTK uses UTF8 internally). | |
1875 UTF8_KEY is the text representing the key binding. | |
1876 ITEM is the widget_value describing the menu item. | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1877 |
49323 | 1878 GROUP is an in/out parameter. If the menu item to be created is not |
1879 part of any radio menu group, *GROUP contains NULL on entry and exit. | |
1880 If the menu item to be created is part of a radio menu group, on entry | |
1881 *GROUP contains the group to use, or NULL if this is the first item | |
1882 in the group. On exit, *GROUP contains the radio item group. | |
1883 | |
1884 Unfortunately, keys don't line up as nicely as in Motif, | |
1885 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
|
1886 |
49323 | 1887 static GtkWidget * |
1888 make_menu_item (utf8_label, utf8_key, item, group) | |
1889 char *utf8_label; | |
1890 char *utf8_key; | |
1891 widget_value *item; | |
1892 GSList **group; | |
1893 { | |
1894 GtkWidget *w; | |
1895 GtkWidget *wtoadd = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1896 |
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
|
1897 /* 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
|
1898 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
|
1899 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
|
1900 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
|
1901 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
|
1902 |
49323 | 1903 if (utf8_key) |
1904 wtoadd = make_widget_for_menu_item (utf8_label, utf8_key); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1905 |
49323 | 1906 if (item->button_type == BUTTON_TYPE_TOGGLE) |
1907 { | |
1908 *group = NULL; | |
1909 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
|
1910 else w = gtk_check_menu_item_new_with_label (utf8_label); |
49323 | 1911 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (w), item->selected); |
1912 } | |
1913 else if (item->button_type == BUTTON_TYPE_RADIO) | |
1914 { | |
1915 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
|
1916 else w = gtk_radio_menu_item_new_with_label (*group, utf8_label); |
49323 | 1917 *group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (w)); |
1918 if (item->selected) | |
1919 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (w), TRUE); | |
1920 } | |
1921 else | |
1922 { | |
1923 *group = NULL; | |
1924 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
|
1925 else w = gtk_menu_item_new_with_label (utf8_label); |
49323 | 1926 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
1927 |
49323 | 1928 if (wtoadd) gtk_container_add (GTK_CONTAINER (w), wtoadd); |
1929 if (! item->enabled) gtk_widget_set_sensitive (w, FALSE); | |
1930 | |
1931 return w; | |
1932 } | |
1933 | |
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
|
1934 /* Return non-zero if LABEL specifies a separator (GTK only has one |
49323 | 1935 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
|
1936 |
105959
ba3ffbd9c422
* process.c (ifflag_def): Make flag_sym constant.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105936
diff
changeset
|
1937 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
|
1938 "space", |
96a27ec4e6c5
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
78781
diff
changeset
|
1939 "no-line", |
96a27ec4e6c5
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
78781
diff
changeset
|
1940 "single-line", |
96a27ec4e6c5
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
78781
diff
changeset
|
1941 "double-line", |
96a27ec4e6c5
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
78781
diff
changeset
|
1942 "single-dashed-line", |
96a27ec4e6c5
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
78781
diff
changeset
|
1943 "double-dashed-line", |
96a27ec4e6c5
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
78781
diff
changeset
|
1944 "shadow-etched-in", |
96a27ec4e6c5
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
78781
diff
changeset
|
1945 "shadow-etched-out", |
96a27ec4e6c5
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
78781
diff
changeset
|
1946 "shadow-etched-in-dash", |
96a27ec4e6c5
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
78781
diff
changeset
|
1947 "shadow-etched-out-dash", |
96a27ec4e6c5
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
78781
diff
changeset
|
1948 "shadow-double-etched-in", |
96a27ec4e6c5
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
78781
diff
changeset
|
1949 "shadow-double-etched-out", |
96a27ec4e6c5
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
78781
diff
changeset
|
1950 "shadow-double-etched-in-dash", |
96a27ec4e6c5
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
78781
diff
changeset
|
1951 "shadow-double-etched-out-dash", |
96a27ec4e6c5
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
78781
diff
changeset
|
1952 0, |
96a27ec4e6c5
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
78781
diff
changeset
|
1953 }; |
96a27ec4e6c5
(xg_separator_p) <separator_names>: Move to file scope.
Glenn Morris <rgm@gnu.org>
parents:
78781
diff
changeset
|
1954 |
49323 | 1955 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
|
1956 xg_separator_p (char *label) |
49323 | 1957 { |
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
|
1958 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
|
1959 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
|
1960 && 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
|
1961 && 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
|
1962 { |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1963 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
|
1964 |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1965 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
|
1966 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
|
1967 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
|
1968 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
|
1969 } |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1970 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
|
1971 { |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1972 /* 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
|
1973 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
|
1974 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
|
1975 ++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
|
1976 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
|
1977 } |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1978 |
5b50d76d9211
* gtkutil.c (xg_resize_widgets): Don't call xg_frame_cleared.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50272
diff
changeset
|
1979 return 0; |
49323 | 1980 } |
1981 | |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1982 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
|
1983 |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1984 /* 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
|
1985 |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1986 int |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1987 xg_have_tear_offs () |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1988 { |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1989 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
|
1990 } |
49323 | 1991 |
1992 /* 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
|
1993 decrease the xg_detached_menus count. |
49323 | 1994 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
|
1995 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
|
1996 |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1997 static void |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
1998 tearoff_remove (widget, client_data) |
49323 | 1999 GtkWidget *widget; |
2000 gpointer client_data; | |
2001 { | |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2002 if (xg_detached_menus > 0) --xg_detached_menus; |
49323 | 2003 } |
2004 | |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2005 /* 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
|
2006 xg_detached_menus count. |
49323 | 2007 WIDGET is the GtkTearoffMenuItem. |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2008 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
|
2009 |
49323 | 2010 static void |
2011 tearoff_activate (widget, client_data) | |
2012 GtkWidget *widget; | |
2013 gpointer client_data; | |
2014 { | |
2015 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
|
2016 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
|
2017 { |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2018 ++xg_detached_menus; |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2019 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
|
2020 "destroy", |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2021 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
|
2022 } |
49323 | 2023 } |
2024 | |
2025 | |
2026 /* Create a menu item widget, and connect the callbacks. | |
2027 ITEM decribes the menu item. | |
2028 F is the frame the created menu belongs to. | |
2029 SELECT_CB is the callback to use when a menu item is selected. | |
2030 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. | |
2031 CL_DATA points to the callback data to be used for this menu. | |
2032 GROUP is an in/out parameter. If the menu item to be created is not | |
2033 part of any radio menu group, *GROUP contains NULL on entry and exit. | |
2034 If the menu item to be created is part of a radio menu group, on entry | |
2035 *GROUP contains the group to use, or NULL if this is the first item | |
2036 in the group. On exit, *GROUP contains the radio item group. | |
2037 | |
2038 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
|
2039 |
49323 | 2040 static GtkWidget * |
2041 xg_create_one_menuitem (item, f, select_cb, highlight_cb, cl_data, group) | |
2042 widget_value *item; | |
2043 FRAME_PTR f; | |
2044 GCallback select_cb; | |
2045 GCallback highlight_cb; | |
2046 xg_menu_cb_data *cl_data; | |
2047 GSList **group; | |
2048 { | |
2049 char *utf8_label; | |
2050 char *utf8_key; | |
2051 GtkWidget *w; | |
2052 xg_menu_item_cb_data *cb_data; | |
2053 | |
2054 utf8_label = get_utf8_string (item->name); | |
2055 utf8_key = get_utf8_string (item->key); | |
2056 | |
2057 w = make_menu_item (utf8_label, utf8_key, item, group); | |
2058 | |
2059 if (utf8_label && utf8_label != item->name) g_free (utf8_label); | |
2060 if (utf8_key && utf8_key != item->key) g_free (utf8_key); | |
2061 | |
2062 cb_data = xmalloc (sizeof (xg_menu_item_cb_data)); | |
2063 | |
2064 xg_list_insert (&xg_menu_item_cb_list, &cb_data->ptrs); | |
2065 | |
75040
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
2066 cb_data->select_id = 0; |
49323 | 2067 cb_data->help = item->help; |
2068 cb_data->cl_data = cl_data; | |
2069 cb_data->call_data = item->call_data; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2070 |
49323 | 2071 g_signal_connect (G_OBJECT (w), |
2072 "destroy", | |
2073 G_CALLBACK (menuitem_destroy_callback), | |
2074 cb_data); | |
2075 | |
2076 /* Put cb_data in widget, so we can get at it when modifying menubar */ | |
2077 g_object_set_data (G_OBJECT (w), XG_ITEM_DATA, cb_data); | |
2078 | |
2079 /* final item, not a submenu */ | |
2080 if (item->call_data && ! item->contents) | |
2081 { | |
2082 if (select_cb) | |
2083 cb_data->select_id | |
2084 = g_signal_connect (G_OBJECT (w), "activate", select_cb, cb_data); | |
2085 } | |
2086 | |
2087 return w; | |
2088 } | |
2089 | |
50112
50df9e41f1a3
Add prototype for create_menus.
Andreas Schwab <schwab@suse.de>
parents:
50108
diff
changeset
|
2090 static GtkWidget *create_menus P_ ((widget_value *, FRAME_PTR, GCallback, |
50df9e41f1a3
Add prototype for create_menus.
Andreas Schwab <schwab@suse.de>
parents:
50108
diff
changeset
|
2091 GCallback, GCallback, int, int, int, |
50df9e41f1a3
Add prototype for create_menus.
Andreas Schwab <schwab@suse.de>
parents:
50108
diff
changeset
|
2092 GtkWidget *, xg_menu_cb_data *, char *)); |
50df9e41f1a3
Add prototype for create_menus.
Andreas Schwab <schwab@suse.de>
parents:
50108
diff
changeset
|
2093 |
49323 | 2094 /* Create a full menu tree specified by DATA. |
2095 F is the frame the created menu belongs to. | |
2096 SELECT_CB is the callback to use when a menu item is selected. | |
2097 DEACTIVATE_CB is the callback to use when a sub menu is not shown anymore. | |
2098 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. | |
2099 POP_UP_P is non-zero if we shall create a popup menu. | |
2100 MENU_BAR_P is non-zero if we shall create a menu bar. | |
2101 ADD_TEAROFF_P is non-zero if we shall add a teroff menu item. Ignored | |
2102 if MENU_BAR_P is non-zero. | |
2103 TOPMENU is the topmost GtkWidget that others shall be placed under. | |
2104 It may be NULL, in that case we create the appropriate widget | |
2105 (menu bar or menu item depending on POP_UP_P and MENU_BAR_P) | |
2106 CL_DATA is the callback data we shall use for this menu, or NULL | |
2107 if we haven't set the first callback yet. | |
2108 NAME is the name to give to the top level menu if this function | |
2109 creates it. May be NULL to not set any name. | |
2110 | |
2111 Returns the top level GtkWidget. This is TOPLEVEL if TOPLEVEL is | |
2112 not NULL. | |
2113 | |
2114 This function calls itself to create submenus. */ | |
2115 | |
2116 static GtkWidget * | |
2117 create_menus (data, f, select_cb, deactivate_cb, highlight_cb, | |
2118 pop_up_p, menu_bar_p, add_tearoff_p, topmenu, cl_data, name) | |
2119 widget_value *data; | |
2120 FRAME_PTR f; | |
2121 GCallback select_cb; | |
2122 GCallback deactivate_cb; | |
2123 GCallback highlight_cb; | |
2124 int pop_up_p; | |
2125 int menu_bar_p; | |
2126 int add_tearoff_p; | |
2127 GtkWidget *topmenu; | |
2128 xg_menu_cb_data *cl_data; | |
2129 char *name; | |
2130 { | |
2131 widget_value *item; | |
2132 GtkWidget *wmenu = topmenu; | |
2133 GSList *group = NULL; | |
2134 | |
2135 if (! topmenu) | |
2136 { | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2137 if (! menu_bar_p) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2138 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2139 wmenu = gtk_menu_new (); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2140 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
|
2141 /* 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
|
2142 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
|
2143 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
|
2144 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
|
2145 "enter-notify-event", |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
2146 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
|
2147 NULL); |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
2148 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
|
2149 "leave-notify-event", |
37202e2fc35f
(menuitem_highlight_callback): Invoked widget is the
Jan Djärv <jan.h.d@swipnet.se>
parents:
75009
diff
changeset
|
2150 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
|
2151 NULL); |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2152 } |
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
|
2153 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
|
2154 { |
695dbf5b3bb9
gtkutil.c (create_menus): Call gtk_widget_set_size_request for
Jan Djärv <jan.h.d@swipnet.se>
parents:
103916
diff
changeset
|
2155 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
|
2156 /* 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
|
2157 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
|
2158 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
|
2159 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
|
2160 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
|
2161 } |
49323 | 2162 |
2163 /* Put cl_data on the top menu for easier access. */ | |
2164 cl_data = make_cl_data (cl_data, f, highlight_cb); | |
2165 g_object_set_data (G_OBJECT (wmenu), XG_FRAME_DATA, (gpointer)cl_data); | |
2166 g_signal_connect (G_OBJECT (wmenu), "destroy", | |
2167 G_CALLBACK (menu_destroy_callback), cl_data); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2168 |
49323 | 2169 if (name) |
2170 gtk_widget_set_name (wmenu, name); | |
2171 | |
2172 if (deactivate_cb) | |
2173 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
|
2174 "selection-done", deactivate_cb, 0); |
49323 | 2175 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2176 |
49323 | 2177 if (! menu_bar_p && add_tearoff_p) |
2178 { | |
2179 GtkWidget *tearoff = gtk_tearoff_menu_item_new (); | |
2180 gtk_menu_shell_append (GTK_MENU_SHELL (wmenu), tearoff); | |
2181 | |
2182 g_signal_connect (G_OBJECT (tearoff), "activate", | |
2183 G_CALLBACK (tearoff_activate), 0); | |
2184 } | |
2185 | |
2186 for (item = data; item; item = item->next) | |
2187 { | |
2188 GtkWidget *w; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2189 |
49323 | 2190 if (pop_up_p && !item->contents && !item->call_data |
2191 && !xg_separator_p (item->name)) | |
2192 { | |
2193 char *utf8_label; | |
2194 /* A title for a popup. We do the same as GTK does when | |
2195 creating titles, but it does not look good. */ | |
2196 group = NULL; | |
2197 utf8_label = get_utf8_string (item->name); | |
2198 | |
2199 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
|
2200 w = gtk_menu_item_new_with_label (utf8_label); |
49323 | 2201 gtk_widget_set_sensitive (w, FALSE); |
2202 if (utf8_label && utf8_label != item->name) g_free (utf8_label); | |
2203 } | |
2204 else if (xg_separator_p (item->name)) | |
2205 { | |
2206 group = NULL; | |
2207 /* GTK only have one separator type. */ | |
2208 w = gtk_separator_menu_item_new (); | |
2209 } | |
2210 else | |
2211 { | |
2212 w = xg_create_one_menuitem (item, | |
2213 f, | |
2214 item->contents ? 0 : select_cb, | |
2215 highlight_cb, | |
2216 cl_data, | |
2217 &group); | |
2218 | |
77511
1962a74982ce
(xg_update_menubar, create_menus): Create empty
Jan Djärv <jan.h.d@swipnet.se>
parents:
76906
diff
changeset
|
2219 /* 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
|
2220 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
|
2221 if (item->contents || menu_bar_p) |
49323 | 2222 { |
2223 GtkWidget *submenu = create_menus (item->contents, | |
2224 f, | |
2225 select_cb, | |
2226 deactivate_cb, | |
2227 highlight_cb, | |
2228 0, | |
2229 0, | |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2230 add_tearoff_p, |
49323 | 2231 0, |
2232 cl_data, | |
2233 0); | |
2234 gtk_menu_item_set_submenu (GTK_MENU_ITEM (w), submenu); | |
2235 } | |
2236 } | |
2237 | |
2238 gtk_menu_shell_append (GTK_MENU_SHELL (wmenu), w); | |
2239 gtk_widget_set_name (w, MENU_ITEM_NAME); | |
2240 } | |
2241 | |
2242 return wmenu; | |
2243 } | |
2244 | |
2245 /* Create a menubar, popup menu or dialog, depending on the TYPE argument. | |
2246 TYPE can be "menubar", "popup" for popup menu, or "dialog" for a dialog | |
2247 with some text and buttons. | |
2248 F is the frame the created item belongs to. | |
2249 NAME is the name to use for the top widget. | |
2250 VAL is a widget_value structure describing items to be created. | |
2251 SELECT_CB is the callback to use when a menu item is selected or | |
2252 a dialog button is pressed. | |
2253 DEACTIVATE_CB is the callback to use when an item is deactivated. | |
2254 For a menu, when a sub menu is not shown anymore, for a dialog it is | |
2255 called when the dialog is popped down. | |
2256 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. | |
2257 | |
2258 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
|
2259 |
49323 | 2260 GtkWidget * |
2261 xg_create_widget (type, name, f, val, | |
2262 select_cb, deactivate_cb, highlight_cb) | |
2263 char *type; | |
2264 char *name; | |
2265 FRAME_PTR f; | |
2266 widget_value *val; | |
2267 GCallback select_cb; | |
2268 GCallback deactivate_cb; | |
2269 GCallback highlight_cb; | |
2270 { | |
2271 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
|
2272 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
|
2273 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
|
2274 |
49323 | 2275 if (strcmp (type, "dialog") == 0) |
2276 { | |
2277 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
|
2278 xg_set_screen (w, f); |
49323 | 2279 gtk_window_set_transient_for (GTK_WINDOW (w), |
2280 GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f))); | |
2281 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
|
2282 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
|
2283 gtk_window_set_modal (GTK_WINDOW (w), TRUE); |
49323 | 2284 } |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2285 else if (menu_bar_p || pop_up_p) |
49323 | 2286 { |
2287 w = create_menus (val->contents, | |
2288 f, | |
2289 select_cb, | |
2290 deactivate_cb, | |
2291 highlight_cb, | |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2292 pop_up_p, |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2293 menu_bar_p, |
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2294 menu_bar_p, |
49323 | 2295 0, |
2296 0, | |
2297 name); | |
2298 | |
2299 /* Set the cursor to an arrow for popup menus when they are mapped. | |
2300 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
|
2301 if (pop_up_p) |
49323 | 2302 { |
2303 /* Must realize so the GdkWindow inside the widget is created. */ | |
2304 gtk_widget_realize (w); | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2305 xg_set_cursor (w, FRAME_X_DISPLAY_INFO (f)->xg_cursor); |
49323 | 2306 } |
2307 } | |
2308 else | |
2309 { | |
2310 fprintf (stderr, "bad type in xg_create_widget: %s, doing nothing\n", | |
2311 type); | |
2312 } | |
2313 | |
2314 return w; | |
2315 } | |
2316 | |
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
|
2317 /* 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
|
2318 |
49323 | 2319 static const char * |
2320 xg_get_menu_item_label (witem) | |
2321 GtkMenuItem *witem; | |
2322 { | |
2323 GtkLabel *wlabel = GTK_LABEL (gtk_bin_get_child (GTK_BIN (witem))); | |
2324 return gtk_label_get_label (wlabel); | |
2325 } | |
2326 | |
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
|
2327 /* 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
|
2328 |
49323 | 2329 static int |
2330 xg_item_label_same_p (witem, label) | |
2331 GtkMenuItem *witem; | |
2332 char *label; | |
2333 { | |
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
|
2334 int is_same = 0; |
49323 | 2335 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
|
2336 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
|
2337 |
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2338 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
|
2339 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
|
2340 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
|
2341 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
|
2342 |
da6abcaef15c
gtkutil.c: Check for NULL string before calling strcmp or strlen.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49468
diff
changeset
|
2343 if (utf8_label && utf8_label != label) g_free (utf8_label); |
49323 | 2344 |
2345 return is_same; | |
2346 } | |
2347 | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2348 /* 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
|
2349 |
49323 | 2350 static void |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2351 xg_destroy_widgets (list) |
49323 | 2352 GList *list; |
2353 { | |
2354 GList *iter; | |
2355 | |
49572 | 2356 for (iter = list; iter; iter = g_list_next (iter)) |
49323 | 2357 { |
2358 GtkWidget *w = GTK_WIDGET (iter->data); | |
2359 | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
2360 /* Destroying the widget will remove it from the container it is in. */ |
49323 | 2361 gtk_widget_destroy (w); |
2362 } | |
2363 } | |
2364 | |
2365 /* Update the top level names in MENUBAR (i.e. not submenus). | |
2366 F is the frame the menu bar belongs to. | |
49572 | 2367 *LIST is a list with the current menu bar names (menu item widgets). |
2368 ITER is the item within *LIST that shall be updated. | |
2369 POS is the numerical position, starting at 0, of ITER in *LIST. | |
49323 | 2370 VAL describes what the menu bar shall look like after the update. |
2371 SELECT_CB is the callback to use when a menu item is selected. | |
2372 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. | |
49572 | 2373 CL_DATA points to the callback data to be used for this menu bar. |
49323 | 2374 |
2375 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
|
2376 |
49323 | 2377 static void |
49572 | 2378 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
|
2379 select_cb, deactivate_cb, highlight_cb, cl_data) |
49323 | 2380 GtkWidget *menubar; |
2381 FRAME_PTR f; | |
49572 | 2382 GList **list; |
2383 GList *iter; | |
2384 int pos; | |
49323 | 2385 widget_value *val; |
2386 GCallback select_cb; | |
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
|
2387 GCallback deactivate_cb; |
49323 | 2388 GCallback highlight_cb; |
2389 xg_menu_cb_data *cl_data; | |
2390 { | |
49572 | 2391 if (! iter && ! val) |
49323 | 2392 return; |
49572 | 2393 else if (iter && ! val) |
49323 | 2394 { |
49572 | 2395 /* 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
|
2396 xg_destroy_widgets (iter); |
49323 | 2397 |
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
|
2398 /* 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
|
2399 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
|
2400 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
|
2401 0); |
49323 | 2402 /* All updated. */ |
2403 val = 0; | |
49572 | 2404 iter = 0; |
49323 | 2405 } |
49572 | 2406 else if (! iter && val) |
49323 | 2407 { |
2408 /* 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
|
2409 create_menus (val, f, select_cb, deactivate_cb, highlight_cb, |
49323 | 2410 0, 1, 0, menubar, cl_data, 0); |
2411 | |
2412 /* All updated. */ | |
2413 val = 0; | |
49572 | 2414 iter = 0; |
49323 | 2415 } |
49572 | 2416 /* Below this neither iter or val is NULL */ |
2417 else if (xg_item_label_same_p (GTK_MENU_ITEM (iter->data), val->name)) | |
49323 | 2418 { |
2419 /* This item is still the same, check next item. */ | |
2420 val = val->next; | |
49572 | 2421 iter = g_list_next (iter); |
2422 ++pos; | |
49323 | 2423 } |
2424 else /* This item is changed. */ | |
2425 { | |
49572 | 2426 GtkMenuItem *witem = GTK_MENU_ITEM (iter->data); |
49323 | 2427 GtkMenuItem *witem2 = 0; |
2428 int val_in_menubar = 0; | |
49572 | 2429 int iter_in_new_menubar = 0; |
2430 GList *iter2; | |
49323 | 2431 widget_value *cur; |
2432 | |
2433 /* See if the changed entry (val) is present later in the menu bar */ | |
49572 | 2434 for (iter2 = iter; |
2435 iter2 && ! val_in_menubar; | |
2436 iter2 = g_list_next (iter2)) | |
49323 | 2437 { |
49572 | 2438 witem2 = GTK_MENU_ITEM (iter2->data); |
49323 | 2439 val_in_menubar = xg_item_label_same_p (witem2, val->name); |
2440 } | |
2441 | |
49572 | 2442 /* See if the current entry (iter) is present later in the |
49323 | 2443 specification for the new menu bar. */ |
49572 | 2444 for (cur = val; cur && ! iter_in_new_menubar; cur = cur->next) |
2445 iter_in_new_menubar = xg_item_label_same_p (witem, cur->name); | |
2446 | |
2447 if (val_in_menubar && ! iter_in_new_menubar) | |
49323 | 2448 { |
49572 | 2449 int nr = pos; |
2450 | |
49323 | 2451 /* This corresponds to: |
2452 Current: A B C | |
2453 New: A C | |
2454 Remove B. */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2455 |
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
|
2456 g_object_ref (G_OBJECT (witem)); |
49323 | 2457 gtk_container_remove (GTK_CONTAINER (menubar), GTK_WIDGET (witem)); |
2458 gtk_widget_destroy (GTK_WIDGET (witem)); | |
2459 | |
2460 /* Must get new list since the old changed. */ | |
49572 | 2461 g_list_free (*list); |
2462 *list = iter = gtk_container_get_children (GTK_CONTAINER (menubar)); | |
2463 while (nr-- > 0) iter = g_list_next (iter); | |
49323 | 2464 } |
49572 | 2465 else if (! val_in_menubar && ! iter_in_new_menubar) |
49323 | 2466 { |
2467 /* This corresponds to: | |
2468 Current: A B C | |
2469 New: A X C | |
2470 Rename B to X. This might seem to be a strange thing to do, | |
2471 since if there is a menu under B it will be totally wrong for X. | |
2472 But consider editing a C file. Then there is a C-mode menu | |
2473 (corresponds to B above). | |
2474 If then doing C-x C-f the minibuf menu (X above) replaces the | |
2475 C-mode menu. When returning from the minibuffer, we get | |
2476 back the C-mode menu. Thus we do: | |
2477 Rename B to X (C-mode to minibuf menu) | |
2478 Rename X to B (minibuf to C-mode menu). | |
2479 If the X menu hasn't been invoked, the menu under B | |
2480 is up to date when leaving the minibuffer. */ | |
2481 GtkLabel *wlabel = GTK_LABEL (gtk_bin_get_child (GTK_BIN (witem))); | |
2482 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
|
2483 GtkWidget *submenu = gtk_menu_item_get_submenu (witem); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2484 |
50778
f30e6f029d65
* gtkutil.c (create_dialog, make_widget_for_menu_item)
Jan Djärv <jan.h.d@swipnet.se>
parents:
50521
diff
changeset
|
2485 gtk_label_set_text (wlabel, utf8_label); |
49323 | 2486 |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2487 /* 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
|
2488 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
|
2489 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
|
2490 /* 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
|
2491 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
|
2492 |
49572 | 2493 iter = g_list_next (iter); |
49323 | 2494 val = val->next; |
49572 | 2495 ++pos; |
49323 | 2496 } |
49572 | 2497 else if (! val_in_menubar && iter_in_new_menubar) |
49323 | 2498 { |
2499 /* This corresponds to: | |
2500 Current: A B C | |
2501 New: A X B C | |
2502 Insert X. */ | |
2503 | |
49572 | 2504 int nr = pos; |
49323 | 2505 GList *group = 0; |
2506 GtkWidget *w = xg_create_one_menuitem (val, | |
2507 f, | |
2508 select_cb, | |
2509 highlight_cb, | |
2510 cl_data, | |
2511 &group); | |
2512 | |
77511
1962a74982ce
(xg_update_menubar, create_menus): Create empty
Jan Djärv <jan.h.d@swipnet.se>
parents:
76906
diff
changeset
|
2513 /* 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
|
2514 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
|
2515 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
|
2516 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
|
2517 highlight_cb, |
77511
1962a74982ce
(xg_update_menubar, create_menus): Create empty
Jan Djärv <jan.h.d@swipnet.se>
parents:
76906
diff
changeset
|
2518 0, 0, 0, 0, cl_data, 0); |
49323 | 2519 gtk_widget_set_name (w, MENU_ITEM_NAME); |
2520 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
|
2521 gtk_menu_item_set_submenu (GTK_MENU_ITEM (w), submenu); |
49323 | 2522 |
49572 | 2523 g_list_free (*list); |
2524 *list = iter = gtk_container_get_children (GTK_CONTAINER (menubar)); | |
2525 while (nr-- > 0) iter = g_list_next (iter); | |
2526 iter = g_list_next (iter); | |
49323 | 2527 val = val->next; |
49572 | 2528 ++pos; |
49323 | 2529 } |
49572 | 2530 else /* if (val_in_menubar && iter_in_new_menubar) */ |
49323 | 2531 { |
49572 | 2532 int nr = pos; |
49323 | 2533 /* This corresponds to: |
2534 Current: A B C | |
2535 New: A C B | |
2536 Move C before B */ | |
2537 | |
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
|
2538 g_object_ref (G_OBJECT (witem2)); |
49323 | 2539 gtk_container_remove (GTK_CONTAINER (menubar), GTK_WIDGET (witem2)); |
2540 gtk_menu_shell_insert (GTK_MENU_SHELL (menubar), | |
2541 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
|
2542 g_object_unref (G_OBJECT (witem2)); |
49323 | 2543 |
49572 | 2544 g_list_free (*list); |
2545 *list = iter = gtk_container_get_children (GTK_CONTAINER (menubar)); | |
2546 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
|
2547 if (iter) iter = g_list_next (iter); |
49323 | 2548 val = val->next; |
49572 | 2549 ++pos; |
49323 | 2550 } |
2551 } | |
2552 | |
2553 /* Update the rest of the menu bar. */ | |
49572 | 2554 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
|
2555 select_cb, deactivate_cb, highlight_cb, cl_data); |
49323 | 2556 } |
2557 | |
2558 /* Update the menu item W so it corresponds to VAL. | |
2559 SELECT_CB is the callback to use when a menu item is selected. | |
2560 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. | |
102358 | 2561 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
|
2562 |
49323 | 2563 static void |
2564 xg_update_menu_item (val, w, select_cb, highlight_cb, cl_data) | |
2565 widget_value *val; | |
2566 GtkWidget *w; | |
2567 GCallback select_cb; | |
2568 GCallback highlight_cb; | |
2569 xg_menu_cb_data *cl_data; | |
2570 { | |
2571 GtkWidget *wchild; | |
2572 GtkLabel *wlbl = 0; | |
2573 GtkLabel *wkey = 0; | |
2574 char *utf8_label; | |
2575 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
|
2576 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
|
2577 const char *old_key = 0; |
49323 | 2578 xg_menu_item_cb_data *cb_data; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2579 |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2580 wchild = gtk_bin_get_child (GTK_BIN (w)); |
49323 | 2581 utf8_label = get_utf8_string (val->name); |
2582 utf8_key = get_utf8_string (val->key); | |
2583 | |
2584 /* See if W is a menu item with a key. See make_menu_item above. */ | |
2585 if (GTK_IS_HBOX (wchild)) | |
2586 { | |
2587 GList *list = gtk_container_get_children (GTK_CONTAINER (wchild)); | |
2588 | |
2589 wlbl = GTK_LABEL (list->data); | |
2590 wkey = GTK_LABEL (list->next->data); | |
49572 | 2591 g_list_free (list); |
2592 | |
49323 | 2593 if (! utf8_key) |
2594 { | |
2595 /* 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
|
2596 g_object_ref (G_OBJECT (wlbl)); |
49323 | 2597 gtk_container_remove (GTK_CONTAINER (w), wchild); |
2598 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
|
2599 g_object_unref (G_OBJECT (wlbl)); |
49323 | 2600 wkey = 0; |
2601 } | |
49572 | 2602 |
49323 | 2603 } |
2604 else /* Just a label. */ | |
2605 { | |
2606 wlbl = GTK_LABEL (wchild); | |
2607 | |
2608 /* Check if there is now a key. */ | |
2609 if (utf8_key) | |
2610 { | |
2611 GtkWidget *wtoadd = make_widget_for_menu_item (utf8_label, utf8_key); | |
2612 GList *list = gtk_container_get_children (GTK_CONTAINER (wtoadd)); | |
49572 | 2613 |
49323 | 2614 wlbl = GTK_LABEL (list->data); |
2615 wkey = GTK_LABEL (list->next->data); | |
49572 | 2616 g_list_free (list); |
49323 | 2617 |
2618 gtk_container_remove (GTK_CONTAINER (w), wchild); | |
2619 gtk_container_add (GTK_CONTAINER (w), wtoadd); | |
2620 } | |
2621 } | |
2622 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2623 |
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
|
2624 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
|
2625 if (wlbl) old_label = gtk_label_get_label (wlbl); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2626 |
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
|
2627 if (wkey && utf8_key && (! old_key || strcmp (utf8_key, old_key) != 0)) |
49323 | 2628 gtk_label_set_text (wkey, utf8_key); |
2629 | |
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
|
2630 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
|
2631 gtk_label_set_text (wlbl, utf8_label); |
49323 | 2632 |
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
|
2633 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
|
2634 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
|
2635 |
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
|
2636 if (! val->enabled && gtk_widget_get_sensitive (w)) |
49323 | 2637 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
|
2638 else if (val->enabled && ! gtk_widget_get_sensitive (w)) |
49323 | 2639 gtk_widget_set_sensitive (w, TRUE); |
2640 | |
2641 cb_data = (xg_menu_item_cb_data*) g_object_get_data (G_OBJECT (w), | |
2642 XG_ITEM_DATA); | |
2643 if (cb_data) | |
2644 { | |
2645 cb_data->call_data = val->call_data; | |
2646 cb_data->help = val->help; | |
2647 cb_data->cl_data = cl_data; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2648 |
49323 | 2649 /* We assume the callback functions don't change. */ |
2650 if (val->call_data && ! val->contents) | |
2651 { | |
2652 /* This item shall have a select callback. */ | |
2653 if (! cb_data->select_id) | |
2654 cb_data->select_id | |
2655 = g_signal_connect (G_OBJECT (w), "activate", | |
2656 select_cb, cb_data); | |
2657 } | |
2658 else if (cb_data->select_id) | |
2659 { | |
2660 g_signal_handler_disconnect (w, cb_data->select_id); | |
2661 cb_data->select_id = 0; | |
2662 } | |
2663 } | |
2664 } | |
2665 | |
2666 /* 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
|
2667 |
49323 | 2668 static void |
2669 xg_update_toggle_item (val, w) | |
2670 widget_value *val; | |
2671 GtkWidget *w; | |
2672 { | |
2673 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (w), val->selected); | |
2674 } | |
2675 | |
2676 /* Update the 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
|
2677 |
49323 | 2678 static void |
2679 xg_update_radio_item (val, w) | |
2680 widget_value *val; | |
2681 GtkWidget *w; | |
2682 { | |
2683 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (w), val->selected); | |
2684 } | |
2685 | |
2686 /* Update the sub menu SUBMENU and all its children so it corresponds to VAL. | |
2687 SUBMENU may be NULL, in that case a new menu is created. | |
2688 F is the frame the menu bar belongs to. | |
2689 VAL describes the contents of the menu bar. | |
2690 SELECT_CB is the callback to use when a menu item is selected. | |
2691 DEACTIVATE_CB is the callback to use when a sub menu is not shown anymore. | |
2692 HIGHLIGHT_CB is the callback to call when entering/leaving menu items. | |
2693 CL_DATA is the call back data to use for any newly created items. | |
2694 | |
2695 Returns the updated submenu widget, that is SUBMENU unless SUBMENU | |
2696 was NULL. */ | |
2697 | |
2698 static GtkWidget * | |
2699 xg_update_submenu (submenu, f, val, | |
2700 select_cb, deactivate_cb, highlight_cb, cl_data) | |
2701 GtkWidget *submenu; | |
2702 FRAME_PTR f; | |
2703 widget_value *val; | |
2704 GCallback select_cb; | |
2705 GCallback deactivate_cb; | |
2706 GCallback highlight_cb; | |
2707 xg_menu_cb_data *cl_data; | |
2708 { | |
2709 GtkWidget *newsub = submenu; | |
2710 GList *list = 0; | |
2711 GList *iter; | |
2712 widget_value *cur; | |
2713 int has_tearoff_p = 0; | |
2714 GList *first_radio = 0; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2715 |
49323 | 2716 if (submenu) |
2717 list = gtk_container_get_children (GTK_CONTAINER (submenu)); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2718 |
49323 | 2719 for (cur = val, iter = list; |
2720 cur && iter; | |
2721 iter = g_list_next (iter), cur = cur->next) | |
2722 { | |
2723 GtkWidget *w = GTK_WIDGET (iter->data); | |
2724 | |
2725 /* Skip tearoff items, they have no counterpart in val. */ | |
2726 if (GTK_IS_TEAROFF_MENU_ITEM (w)) | |
2727 { | |
2728 has_tearoff_p = 1; | |
2729 iter = g_list_next (iter); | |
2730 if (iter) w = GTK_WIDGET (iter->data); | |
2731 else break; | |
2732 } | |
2733 | |
2734 /* Remember first radio button in a group. If we get a mismatch in | |
2735 a radio group we must rebuild the whole group so that the connections | |
2736 in GTK becomes correct. */ | |
2737 if (cur->button_type == BUTTON_TYPE_RADIO && ! first_radio) | |
2738 first_radio = iter; | |
2739 else if (cur->button_type != BUTTON_TYPE_RADIO | |
2740 && ! GTK_IS_RADIO_MENU_ITEM (w)) | |
2741 first_radio = 0; | |
2742 | |
2743 if (GTK_IS_SEPARATOR_MENU_ITEM (w)) | |
2744 { | |
2745 if (! xg_separator_p (cur->name)) | |
2746 break; | |
2747 } | |
2748 else if (GTK_IS_CHECK_MENU_ITEM (w)) | |
2749 { | |
2750 if (cur->button_type != BUTTON_TYPE_TOGGLE) | |
2751 break; | |
2752 xg_update_toggle_item (cur, w); | |
2753 xg_update_menu_item (cur, w, select_cb, highlight_cb, cl_data); | |
2754 } | |
2755 else if (GTK_IS_RADIO_MENU_ITEM (w)) | |
2756 { | |
2757 if (cur->button_type != BUTTON_TYPE_RADIO) | |
2758 break; | |
2759 xg_update_radio_item (cur, w); | |
2760 xg_update_menu_item (cur, w, select_cb, highlight_cb, cl_data); | |
2761 } | |
2762 else if (GTK_IS_MENU_ITEM (w)) | |
2763 { | |
2764 GtkMenuItem *witem = GTK_MENU_ITEM (w); | |
2765 GtkWidget *sub; | |
2766 | |
2767 if (cur->button_type != BUTTON_TYPE_NONE || | |
2768 xg_separator_p (cur->name)) | |
2769 break; | |
2770 | |
2771 xg_update_menu_item (cur, w, select_cb, highlight_cb, cl_data); | |
2772 | |
2773 sub = gtk_menu_item_get_submenu (witem); | |
2774 if (sub && ! cur->contents) | |
2775 { | |
2776 /* 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
|
2777 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
|
2778 remove_submenu (witem); |
49323 | 2779 gtk_widget_destroy (sub); |
2780 } | |
2781 else if (cur->contents) | |
2782 { | |
2783 GtkWidget *nsub; | |
2784 | |
2785 nsub = xg_update_submenu (sub, f, cur->contents, | |
2786 select_cb, deactivate_cb, | |
2787 highlight_cb, cl_data); | |
2788 | |
2789 /* If this item just became a submenu, we must set it. */ | |
2790 if (nsub != sub) | |
2791 gtk_menu_item_set_submenu (witem, nsub); | |
2792 } | |
2793 } | |
2794 else | |
2795 { | |
2796 /* Structural difference. Remove everything from here and down | |
2797 in SUBMENU. */ | |
2798 break; | |
2799 } | |
2800 } | |
2801 | |
2802 /* Remove widgets from first structual change. */ | |
2803 if (iter) | |
2804 { | |
2805 /* If we are adding new menu items below, we must remove from | |
2806 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
|
2807 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
|
2808 else xg_destroy_widgets (iter); |
49323 | 2809 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2810 |
49323 | 2811 if (cur) |
2812 { | |
2813 /* More items added. Create them. */ | |
2814 newsub = create_menus (cur, | |
2815 f, | |
2816 select_cb, | |
2817 deactivate_cb, | |
2818 highlight_cb, | |
2819 0, | |
2820 0, | |
2821 ! has_tearoff_p, | |
2822 submenu, | |
2823 cl_data, | |
2824 0); | |
2825 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2826 |
49572 | 2827 if (list) g_list_free (list); |
2828 | |
49323 | 2829 return newsub; |
2830 } | |
2831 | |
2832 /* Update the MENUBAR. | |
2833 F is the frame the menu bar belongs to. | |
2834 VAL describes the contents of the menu bar. | |
2835 If DEEP_P is non-zero, rebuild all but the top level menu names in | |
2836 the MENUBAR. If DEEP_P is zero, just rebuild the names in the menubar. | |
2837 SELECT_CB is the callback to use when a menu item is selected. | |
2838 DEACTIVATE_CB is the callback to use when a sub menu is not shown anymore. | |
2839 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
|
2840 |
49323 | 2841 void |
2842 xg_modify_menubar_widgets (menubar, f, val, deep_p, | |
2843 select_cb, deactivate_cb, highlight_cb) | |
2844 GtkWidget *menubar; | |
2845 FRAME_PTR f; | |
2846 widget_value *val; | |
2847 int deep_p; | |
2848 GCallback select_cb; | |
2849 GCallback deactivate_cb; | |
2850 GCallback highlight_cb; | |
2851 { | |
2852 xg_menu_cb_data *cl_data; | |
2853 GList *list = gtk_container_get_children (GTK_CONTAINER (menubar)); | |
2854 | |
2855 if (! list) return; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2856 |
49323 | 2857 cl_data = (xg_menu_cb_data*) g_object_get_data (G_OBJECT (menubar), |
2858 XG_FRAME_DATA); | |
2859 | |
52981
54482f5ea7be
Remove tear off capability for GTK popup menus.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52401
diff
changeset
|
2860 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
|
2861 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
|
2862 |
64783
0975467abc17
* gtkutil.c (xg_modify_menubar_widgets): Remove semicolon that
Jan Djärv <jan.h.d@swipnet.se>
parents:
64770
diff
changeset
|
2863 if (deep_p) |
49323 | 2864 { |
2865 widget_value *cur; | |
2866 | |
2867 /* 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
|
2868 We must keep the submenus (GTK menu item widgets) since the |
49323 | 2869 X Window in the XEvent that activates the menu are those widgets. */ |
2870 | |
2871 /* Update cl_data, menu_item things in F may have changed. */ | |
2872 update_cl_data (cl_data, f, highlight_cb); | |
2873 | |
2874 for (cur = val->contents; cur; cur = cur->next) | |
2875 { | |
49572 | 2876 GList *iter; |
49323 | 2877 GtkWidget *sub = 0; |
2878 GtkWidget *newsub; | |
2879 GtkMenuItem *witem; | |
2880 | |
2881 /* Find sub menu that corresponds to val and update it. */ | |
2882 for (iter = list ; iter; iter = g_list_next (iter)) | |
2883 { | |
2884 witem = GTK_MENU_ITEM (iter->data); | |
2885 if (xg_item_label_same_p (witem, cur->name)) | |
2886 { | |
2887 sub = gtk_menu_item_get_submenu (witem); | |
2888 break; | |
2889 } | |
2890 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2891 |
49323 | 2892 newsub = xg_update_submenu (sub, |
2893 f, | |
2894 cur->contents, | |
2895 select_cb, | |
2896 deactivate_cb, | |
2897 highlight_cb, | |
2898 cl_data); | |
2899 /* sub may still be NULL. If we just updated non deep and added | |
2900 a new menu bar item, it has no sub menu yet. So we set the | |
2901 newly created sub menu under witem. */ | |
2902 if (newsub != sub) | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2903 { |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2904 xg_set_screen (newsub, f); |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
2905 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
|
2906 } |
49323 | 2907 } |
2908 } | |
2909 | |
49572 | 2910 g_list_free (list); |
49323 | 2911 gtk_widget_show_all (menubar); |
2912 } | |
2913 | |
2914 /* Recompute all the widgets of frame F, when the menu bar has been | |
2915 changed. Value is non-zero if widgets were updated. */ | |
2916 | |
2917 int | |
2918 xg_update_frame_menubar (f) | |
2919 FRAME_PTR f; | |
2920 { | |
2921 struct x_output *x = f->output_data.x; | |
2922 GtkRequisition req; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
2923 |
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
|
2924 if (!x->menubar_widget || gtk_widget_get_mapped (x->menubar_widget)) |
49323 | 2925 return 0; |
2926 | |
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
|
2927 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
|
2928 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
|
2929 |
49323 | 2930 BLOCK_INPUT; |
2931 | |
2932 gtk_box_pack_start (GTK_BOX (x->vbox_widget), x->menubar_widget, | |
2933 FALSE, FALSE, 0); | |
2934 gtk_box_reorder_child (GTK_BOX (x->vbox_widget), x->menubar_widget, 0); | |
2935 | |
2936 gtk_widget_show_all (x->menubar_widget); | |
2937 gtk_widget_size_request (x->menubar_widget, &req); | |
2938 FRAME_MENUBAR_HEIGHT (f) = req.height; | |
103665
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103198
diff
changeset
|
2939 xg_height_changed (f); |
49323 | 2940 UNBLOCK_INPUT; |
50106
5675d6a0080c
(xg_update_frame_menubar): Add missing return value.
Andreas Schwab <schwab@suse.de>
parents:
50099
diff
changeset
|
2941 |
5675d6a0080c
(xg_update_frame_menubar): Add missing return value.
Andreas Schwab <schwab@suse.de>
parents:
50099
diff
changeset
|
2942 return 1; |
49323 | 2943 } |
2944 | |
2945 /* Get rid of the menu bar of frame F, and free its storage. | |
2946 This is used when deleting a frame, and when turning off the menu bar. */ | |
2947 | |
2948 void | |
2949 free_frame_menubar (f) | |
2950 FRAME_PTR f; | |
2951 { | |
2952 struct x_output *x = f->output_data.x; | |
2953 | |
2954 if (x->menubar_widget) | |
2955 { | |
2956 BLOCK_INPUT; | |
2957 | |
2958 gtk_container_remove (GTK_CONTAINER (x->vbox_widget), x->menubar_widget); | |
2959 /* The menubar and its children shall be deleted when removed from | |
2960 the container. */ | |
2961 x->menubar_widget = 0; | |
2962 FRAME_MENUBAR_HEIGHT (f) = 0; | |
103665
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103198
diff
changeset
|
2963 xg_height_changed (f); |
49323 | 2964 UNBLOCK_INPUT; |
2965 } | |
2966 } | |
2967 | |
2968 | |
2969 | |
2970 /*********************************************************************** | |
2971 Scroll bar functions | |
2972 ***********************************************************************/ | |
2973 | |
2974 | |
2975 /* Setting scroll bar values invokes the callback. Use this variable | |
2976 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
|
2977 |
49323 | 2978 int xg_ignore_gtk_scrollbar; |
2979 | |
86161
3408ab8b4152
* xterm.h (struct scroll_bar): Only use Lisp_Object for lisp data.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85938
diff
changeset
|
2980 /* 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
|
2981 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
|
2982 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
|
2983 |
49323 | 2984 static struct |
2985 { | |
2986 GtkWidget **widgets; | |
2987 int max_size; | |
2988 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
|
2989 } id_to_widget; |
49323 | 2990 |
2991 /* 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
|
2992 |
49323 | 2993 #define ID_TO_WIDGET_INCR 32 |
2994 | |
2995 /* 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
|
2996 |
49323 | 2997 static int |
2998 xg_store_widget_in_map (w) | |
2999 GtkWidget *w; | |
3000 { | |
3001 int i; | |
3002 | |
3003 if (id_to_widget.max_size == id_to_widget.used) | |
3004 { | |
3005 int new_size = id_to_widget.max_size + ID_TO_WIDGET_INCR; | |
3006 | |
3007 id_to_widget.widgets = xrealloc (id_to_widget.widgets, | |
3008 sizeof (GtkWidget *)*new_size); | |
3009 | |
3010 for (i = id_to_widget.max_size; i < new_size; ++i) | |
3011 id_to_widget.widgets[i] = 0; | |
3012 id_to_widget.max_size = new_size; | |
3013 } | |
3014 | |
3015 /* Just loop over the array and find a free place. After all, | |
3016 how many scroll bars are we creating? Should be a small number. | |
3017 The check above guarantees we will find a free place. */ | |
3018 for (i = 0; i < id_to_widget.max_size; ++i) | |
3019 { | |
3020 if (! id_to_widget.widgets[i]) | |
3021 { | |
3022 id_to_widget.widgets[i] = w; | |
3023 ++id_to_widget.used; | |
3024 | |
3025 return i; | |
3026 } | |
3027 } | |
3028 | |
3029 /* Should never end up here */ | |
3030 abort (); | |
3031 } | |
3032 | |
3033 /* Remove pointer at IDX from id_to_widget. | |
3034 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
|
3035 |
49323 | 3036 static void |
3037 xg_remove_widget_from_map (idx) | |
3038 int idx; | |
3039 { | |
3040 if (idx < id_to_widget.max_size && id_to_widget.widgets[idx] != 0) | |
3041 { | |
3042 id_to_widget.widgets[idx] = 0; | |
3043 --id_to_widget.used; | |
3044 } | |
3045 } | |
3046 | |
3047 /* 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
|
3048 |
49323 | 3049 static GtkWidget * |
3050 xg_get_widget_from_map (idx) | |
3051 int idx; | |
3052 { | |
3053 if (idx < id_to_widget.max_size && id_to_widget.widgets[idx] != 0) | |
3054 return id_to_widget.widgets[idx]; | |
3055 | |
3056 return 0; | |
3057 } | |
3058 | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
3059 /* Return the scrollbar id for X Window WID on display DPY. |
50063 | 3060 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
|
3061 |
50063 | 3062 int |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
3063 xg_get_scroll_id_for_window (dpy, wid) |
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
3064 Display *dpy; |
50063 | 3065 Window wid; |
3066 { | |
3067 int idx; | |
3068 GtkWidget *w; | |
3069 | |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
3070 w = xg_win_to_widget (dpy, wid); |
50063 | 3071 |
3072 if (w) | |
3073 { | |
3074 for (idx = 0; idx < id_to_widget.max_size; ++idx) | |
3075 if (id_to_widget.widgets[idx] == w) | |
3076 return idx; | |
3077 } | |
3078 | |
3079 return -1; | |
3080 } | |
3081 | |
49323 | 3082 /* Callback invoked when scroll bar WIDGET is destroyed. |
3083 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
|
3084 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
|
3085 |
49323 | 3086 static void |
3087 xg_gtk_scroll_destroy (widget, data) | |
3088 GtkWidget *widget; | |
3089 gpointer data; | |
3090 { | |
59411
ecb6689e04bf
* gtkutil.c (xg_gtk_scroll_destroy, xg_create_scroll_bar)
Jan Djärv <jan.h.d@swipnet.se>
parents:
59102
diff
changeset
|
3091 int id = (int) (EMACS_INT) data; /* The EMACS_INT cast avoids a warning. */ |
49323 | 3092 xg_remove_widget_from_map (id); |
3093 } | |
3094 | |
3095 /* Create a scroll bar widget for frame F. Store the scroll bar | |
3096 in BAR. | |
3097 SCROLL_CALLBACK is the callback to invoke when the value of the | |
3098 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
|
3099 END_CALLBACK is the callback to invoke when scrolling ends. |
49323 | 3100 SCROLL_BAR_NAME is the name we use for the scroll bar. Can be used |
3101 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
|
3102 |
49323 | 3103 void |
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
|
3104 xg_create_scroll_bar (f, bar, scroll_callback, end_callback, scroll_bar_name) |
49323 | 3105 FRAME_PTR f; |
3106 struct scroll_bar *bar; | |
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
|
3107 GCallback scroll_callback, end_callback; |
49323 | 3108 char *scroll_bar_name; |
3109 { | |
3110 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
|
3111 GtkWidget *webox; |
49323 | 3112 GtkObject *vadj; |
3113 int scroll_id; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3114 |
49323 | 3115 /* Page, step increment values are not so important here, they |
3116 will be corrected in x_set_toolkit_scroll_bar_thumb. */ | |
3117 vadj = gtk_adjustment_new (XG_SB_MIN, XG_SB_MIN, XG_SB_MAX, | |
3118 0.1, 0.1, 0.1); | |
3119 | |
3120 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
|
3121 webox = gtk_event_box_new (); |
49323 | 3122 gtk_widget_set_name (wscroll, scroll_bar_name); |
3123 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
|
3124 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
|
3125 |
49323 | 3126 scroll_id = xg_store_widget_in_map (wscroll); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3127 |
59411
ecb6689e04bf
* gtkutil.c (xg_gtk_scroll_destroy, xg_create_scroll_bar)
Jan Djärv <jan.h.d@swipnet.se>
parents:
59102
diff
changeset
|
3128 /* The EMACS_INT cast avoids a warning. */ |
49323 | 3129 g_signal_connect (G_OBJECT (wscroll), |
3130 "destroy", | |
3131 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
|
3132 (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
|
3133 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
|
3134 "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
|
3135 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
|
3136 (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
|
3137 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
|
3138 "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
|
3139 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
|
3140 (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
|
3141 |
57597
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
3142 /* 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
|
3143 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
|
3144 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
|
3145 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
|
3146 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
|
3147 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
|
3148 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
|
3149 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
|
3150 |
49323 | 3151 |
3152 /* 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
|
3153 xg_set_cursor (webox, FRAME_X_DISPLAY_INFO (f)->xg_cursor); |
49323 | 3154 |
86161
3408ab8b4152
* xterm.h (struct scroll_bar): Only use Lisp_Object for lisp data.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85938
diff
changeset
|
3155 bar->x_window = scroll_id; |
49323 | 3156 } |
3157 | |
3158 /* 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
|
3159 |
49323 | 3160 void |
3161 xg_remove_scroll_bar (f, scrollbar_id) | |
3162 FRAME_PTR f; | |
3163 int scrollbar_id; | |
3164 { | |
3165 GtkWidget *w = xg_get_widget_from_map (scrollbar_id); | |
3166 if (w) | |
3167 { | |
57597
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
3168 GtkWidget *wparent = gtk_widget_get_parent (w); |
49323 | 3169 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
|
3170 gtk_widget_destroy (wparent); |
49323 | 3171 SET_FRAME_GARBAGED (f); |
3172 } | |
3173 } | |
3174 | |
3175 /* Update the position of the vertical scroll bar represented by SCROLLBAR_ID | |
3176 in frame F. | |
3177 TOP/LEFT are the new pixel positions where the bar shall appear. | |
3178 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
|
3179 |
49323 | 3180 void |
57597
754a6433f048
* gtkutil.c (xg_frame_cleared, xg_fixed_handle_expose,
Jan Djärv <jan.h.d@swipnet.se>
parents:
57575
diff
changeset
|
3181 xg_update_scrollbar_pos (f, scrollbar_id, top, left, width, height) |
49323 | 3182 FRAME_PTR f; |
3183 int scrollbar_id; | |
3184 int top; | |
3185 int left; | |
3186 int width; | |
3187 int height; | |
3188 { | |
49572 | 3189 |
3190 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
|
3191 |
49572 | 3192 if (wscroll) |
3193 { | |
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
|
3194 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
|
3195 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
|
3196 gint msl; |
106720
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
3197 |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
3198 /* Clear out old position. */ |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
3199 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
|
3200 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
|
3201 { |
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
|
3202 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
|
3203 "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
|
3204 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
|
3205 } |
55342
44d086f5e08a
* gtkutil.c (xg_update_scrollbar_pos): Call XClearWindow to clear
Jan Djärv <jan.h.d@swipnet.se>
parents:
53275
diff
changeset
|
3206 |
44d086f5e08a
* gtkutil.c (xg_update_scrollbar_pos): Call XClearWindow to clear
Jan Djärv <jan.h.d@swipnet.se>
parents:
53275
diff
changeset
|
3207 /* 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
|
3208 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
|
3209 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
|
3210 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
|
3211 { |
3e9a832a5533
Hide scroll bar when window is too small to avoid Gtk+ warning.
Jan D. <jan.h.d@swipnet.se>
parents:
108315
diff
changeset
|
3212 /* 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
|
3213 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
|
3214 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
|
3215 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
|
3216 } |
3e9a832a5533
Hide scroll bar when window is too small to avoid Gtk+ warning.
Jan D. <jan.h.d@swipnet.se>
parents:
108315
diff
changeset
|
3217 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
|
3218 { |
3e9a832a5533
Hide scroll bar when window is too small to avoid Gtk+ warning.
Jan D. <jan.h.d@swipnet.se>
parents:
108315
diff
changeset
|
3219 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
|
3220 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
|
3221 } |
106720
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
3222 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
|
3223 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
|
3224 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
|
3225 { |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
3226 /* 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
|
3227 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
|
3228 above. */ |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
3229 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
|
3230 FRAME_X_WINDOW (f), |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
3231 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
|
3232 } |
3db7e57ee4e9
Handle change of internal-border width when maximized.
Jan D. <jan.h.d@swipnet.se>
parents:
106559
diff
changeset
|
3233 |
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
|
3234 /* 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
|
3235 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
|
3236 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
|
3237 |
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
|
3238 x_sync (f); |
49572 | 3239 SET_FRAME_GARBAGED (f); |
3240 cancel_mouse_face (f); | |
3241 } | |
49323 | 3242 } |
3243 | |
3244 /* Set the thumb size and position of scroll bar BAR. We are currently | |
3245 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
|
3246 |
49323 | 3247 void |
3248 xg_set_toolkit_scroll_bar_thumb (bar, portion, position, whole) | |
3249 struct scroll_bar *bar; | |
3250 int portion, position, whole; | |
3251 { | |
86161
3408ab8b4152
* xterm.h (struct scroll_bar): Only use Lisp_Object for lisp data.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85938
diff
changeset
|
3252 GtkWidget *wscroll = xg_get_widget_from_map (bar->x_window); |
49323 | 3253 |
3254 FRAME_PTR f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window))); | |
3255 | |
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
|
3256 if (wscroll && NILP (bar->dragging)) |
49323 | 3257 { |
3258 GtkAdjustment *adj; | |
3259 gdouble shown; | |
3260 gdouble top; | |
3261 int size, value; | |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3262 int new_step; |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3263 int changed = 0; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3264 |
49323 | 3265 adj = gtk_range_get_adjustment (GTK_RANGE (wscroll)); |
3266 | |
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
|
3267 /* 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
|
3268 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
|
3269 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
|
3270 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
|
3271 /* 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
|
3272 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
|
3273 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
|
3274 |
49323 | 3275 if (whole <= 0) |
3276 top = 0, shown = 1; | |
3277 else | |
3278 { | |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3279 top = (gdouble) position / whole; |
49323 | 3280 shown = (gdouble) portion / whole; |
3281 } | |
3282 | |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3283 size = shown * XG_SB_RANGE; |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3284 size = min (size, XG_SB_RANGE); |
49323 | 3285 size = max (size, 1); |
3286 | |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3287 value = top * XG_SB_RANGE; |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3288 value = min (value, XG_SB_MAX - size); |
49323 | 3289 value = max (value, XG_SB_MIN); |
3290 | |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3291 /* 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
|
3292 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
|
3293 |
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
|
3294 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
|
3295 || (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
|
3296 { |
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
|
3297 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
|
3298 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
|
3299 /* 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
|
3300 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
|
3301 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
|
3302 } |
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
|
3303 |
50270
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3304 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
|
3305 { |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3306 BLOCK_INPUT; |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3307 |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3308 /* 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
|
3309 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
|
3310 xg_ignore_gtk_scrollbar = 1; |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3311 |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3312 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
|
3313 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
|
3314 else if (changed) |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3315 gtk_adjustment_changed (adj); |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3316 |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3317 xg_ignore_gtk_scrollbar = 0; |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3318 |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3319 UNBLOCK_INPUT; |
fa50953c02dc
Finally (?) fix flicker in scroll bar.
Jan Djärv <jan.h.d@swipnet.se>
parents:
50192
diff
changeset
|
3320 } |
49323 | 3321 } |
3322 } | |
3323 | |
105880
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3324 /* 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
|
3325 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
|
3326 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
|
3327 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
|
3328 |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3329 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
|
3330 |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3331 int |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3332 xg_event_is_for_scrollbar (f, event) |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3333 FRAME_PTR f; |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3334 XEvent *event; |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3335 { |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3336 int retval = 0; |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3337 |
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
|
3338 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
|
3339 { |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3340 /* 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
|
3341 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
|
3342 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
|
3343 != 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
|
3344 } |
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
|
3345 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
|
3346 && ((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
|
3347 || event->type == MotionNotify)) |
105880
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3348 { |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3349 /* 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
|
3350 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
|
3351 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
|
3352 } |
106549
3acd32c3e0ac
gtkutil.c: Scroll bar thumb not updated properly (bug #5177).
Jan Djärv <jan.h.d@swipnet.se>
parents:
106512
diff
changeset
|
3353 |
105880
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3354 return retval; |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3355 } |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3356 |
5910e0380daf
Fix bug #4870, issues 3 and 4.
Jan Djärv <jan.h.d@swipnet.se>
parents:
105693
diff
changeset
|
3357 |
49323 | 3358 |
3359 /*********************************************************************** | |
3360 Tool bar functions | |
3361 ***********************************************************************/ | |
3362 /* The key for the data we put in the GtkImage widgets. The data is | |
3363 the image used by Emacs. We use this to see if we need to update | |
3364 the GtkImage with a new image. */ | |
3365 #define XG_TOOL_BAR_IMAGE_DATA "emacs-tool-bar-image" | |
3366 | |
68874
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3367 /* 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
|
3368 get them. */ |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3369 #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
|
3370 |
75009
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3371 /* 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
|
3372 #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
|
3373 |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3374 /* 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
|
3375 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
|
3376 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
|
3377 #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
|
3378 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3379 /* 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
|
3380 stock items. */ |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3381 #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
|
3382 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3383 /* 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
|
3384 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
|
3385 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
|
3386 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
|
3387 |
68874
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3388 static gboolean |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3389 xg_tool_bar_button_cb (widget, event, user_data) |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3390 GtkWidget *widget; |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3391 GdkEventButton *event; |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3392 gpointer user_data; |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3393 { |
73389
7b5c0104efb0
* gtkutil.c (get_utf8_string): Remove warnings with casts.
Jan Djärv <jan.h.d@swipnet.se>
parents:
73066
diff
changeset
|
3394 /* 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
|
3395 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
|
3396 g_object_set_data (G_OBJECT (widget), XG_TOOL_BAR_LAST_MODIFIER, ptr); |
68922 | 3397 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
|
3398 } |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3399 |
8ccdd5aee32d
* gtkutil.c (xg_tool_bar_button_cb): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
3400 |
74990
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
3401 /* 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
|
3402 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
|
3403 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
|
3404 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
|
3405 |
49323 | 3406 static void |
3407 xg_tool_bar_callback (w, client_data) | |
3408 GtkWidget *w; | |
3409 gpointer client_data; | |
3410 { | |
59411
ecb6689e04bf
* gtkutil.c (xg_gtk_scroll_destroy, xg_create_scroll_bar)
Jan Djärv <jan.h.d@swipnet.se>
parents:
59102
diff
changeset
|
3411 /* 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
|
3412 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
|
3413 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
|
3414 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
|
3415 |
49323 | 3416 FRAME_PTR f = (FRAME_PTR) g_object_get_data (G_OBJECT (w), XG_FRAME_DATA); |
3417 Lisp_Object key, frame; | |
3418 struct input_event event; | |
51569
e7bd8581e306
(xg_tool_bar_callback): Don't pass uninitialized
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51432
diff
changeset
|
3419 EVENT_INIT (event); |
49323 | 3420 |
3421 if (! f || ! f->n_tool_bar_items || NILP (f->tool_bar_items)) | |
3422 return; | |
3423 | |
3424 idx *= TOOL_BAR_ITEM_NSLOTS; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3425 |
49323 | 3426 key = AREF (f->tool_bar_items, idx + TOOL_BAR_ITEM_KEY); |
3427 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
|
3428 |
2fcf45c12927
(update_frame_tool_bar): Use -1 as index
Jan Djärv <jan.h.d@swipnet.se>
parents:
78260
diff
changeset
|
3429 /* 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
|
3430 to `(tool_bar)', see keyboard.c. */ |
49323 | 3431 event.kind = TOOL_BAR_EVENT; |
3432 event.frame_or_window = frame; | |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
3433 event.arg = frame; |
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
3434 kbd_buffer_store_event (&event); |
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
3435 |
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
3436 event.kind = TOOL_BAR_EVENT; |
49323 | 3437 event.frame_or_window = frame; |
3438 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
|
3439 /* 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
|
3440 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
|
3441 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
|
3442 event.modifiers = x_x_to_emacs_modifiers (FRAME_X_DISPLAY_INFO (f), mod); |
49323 | 3443 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
|
3444 |
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
|
3445 /* 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
|
3446 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
|
3447 Fx_focus_frame (frame); |
49323 | 3448 } |
3449 | |
75009
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3450 /* 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
|
3451 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
|
3452 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
|
3453 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
|
3454 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
|
3455 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
|
3456 |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3457 static void |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3458 xg_tool_bar_proxy_callback (w, client_data) |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3459 GtkWidget *w; |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3460 gpointer client_data; |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3461 { |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3462 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
|
3463 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
|
3464 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
|
3465 } |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3466 |
103673
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3467 |
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3468 static gboolean |
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3469 xg_tool_bar_help_callback P_ ((GtkWidget *w, |
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3470 GdkEventCrossing *event, |
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3471 gpointer client_data)); |
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3472 |
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3473 /* 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
|
3474 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
|
3475 |
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3476 static gboolean |
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3477 xg_tool_bar_proxy_help_callback (w, event, client_data) |
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3478 GtkWidget *w; |
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3479 GdkEventCrossing *event; |
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3480 gpointer client_data; |
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3481 { |
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3482 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
|
3483 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
|
3484 |
106512
471e6932ea09
(xg_tool_bar_proxy_help_callback): Fix missing return.
Andreas Schwab <schwab@linux-m68k.org>
parents:
106186
diff
changeset
|
3485 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
|
3486 } |
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3487 |
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
|
3488 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
|
3489 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
|
3490 { |
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
|
3491 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
|
3492 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
|
3493 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
|
3494 *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
|
3495 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
|
3496 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
|
3497 } |
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
|
3498 |
103673
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3499 |
75009
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3500 /* 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
|
3501 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
|
3502 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
|
3503 blank. */ |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3504 |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3505 static gboolean |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3506 xg_tool_bar_menu_proxy (toolitem, user_data) |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3507 GtkToolItem *toolitem; |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3508 gpointer user_data; |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3509 { |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3510 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
|
3511 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
|
3512 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
|
3513 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
|
3514 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
|
3515 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
|
3516 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
|
3517 (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
|
3518 GtkWidget *wmenuimage; |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3519 |
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
|
3520 |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
3521 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
|
3522 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
|
3523 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
|
3524 else |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3525 { |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3526 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
|
3527 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
|
3528 |
75009
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3529 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
|
3530 { |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3531 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
|
3532 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
|
3533 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
|
3534 } |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3535 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
|
3536 { |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3537 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
|
3538 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
|
3539 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
|
3540 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
|
3541 } |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3542 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
|
3543 { |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3544 gint width, height; |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
3545 |
75009
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3546 if (settings && |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3547 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
|
3548 &width, &height)) |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3549 { |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3550 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
|
3551 |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3552 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
|
3553 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
|
3554 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
|
3555 |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3556 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
|
3557 } |
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
|
3558 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
|
3559 { |
7c710af0ae5e
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
78809
diff
changeset
|
3560 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
|
3561 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
|
3562 } |
7c710af0ae5e
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
78809
diff
changeset
|
3563 } |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
3564 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
|
3565 { |
7c710af0ae5e
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
78809
diff
changeset
|
3566 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
|
3567 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
|
3568 |
7c710af0ae5e
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
78809
diff
changeset
|
3569 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
|
3570 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
|
3571 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
|
3572 } |
7c710af0ae5e
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
78809
diff
changeset
|
3573 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
|
3574 { |
7c710af0ae5e
(xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
Jan Djärv <jan.h.d@swipnet.se>
parents:
78809
diff
changeset
|
3575 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
|
3576 abort (); |
75009
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 } |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3579 if (wmenuimage) |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3580 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
|
3581 |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3582 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
|
3583 "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
|
3584 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
|
3585 user_data); |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3586 |
103673
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3587 |
75009
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3588 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
|
3589 (gpointer) wbutton); |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3590 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
|
3591 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
|
3592 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
|
3593 |
34f3338fd2bf
* gtkutil.c (xg_tool_bar_proxy_help_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103665
diff
changeset
|
3594 /* 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
|
3595 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
|
3596 "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
|
3597 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
|
3598 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
|
3599 "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
|
3600 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
|
3601 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
|
3602 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
|
3603 "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
|
3604 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
|
3605 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
|
3606 |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3607 return TRUE; |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3608 } |
6ec19c8cca02
(update_frame_tool_bar): Connect create-menu-proxy with
Jan Djärv <jan.h.d@swipnet.se>
parents:
74990
diff
changeset
|
3609 |
49323 | 3610 /* This callback is called when a tool bar is detached. We must set |
3611 the height of the tool bar to zero when this happens so frame sizes | |
3612 are correctly calculated. | |
3613 WBOX is the handle box widget that enables detach/attach of the tool bar. | |
3614 W is the tool bar widget. | |
3615 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
|
3616 |
49323 | 3617 static void |
3618 xg_tool_bar_detach_callback (wbox, w, client_data) | |
3619 GtkHandleBox *wbox; | |
3620 GtkWidget *w; | |
3621 gpointer client_data; | |
3622 { | |
3623 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
|
3624 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
|
3625 |
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
|
3626 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
|
3627 NULL); |
49323 | 3628 |
3629 if (f) | |
3630 { | |
59420
eb72706060ad
* xterm.h (struct x_output): New member, toolbar_detached.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59411
diff
changeset
|
3631 FRAME_X_OUTPUT (f)->toolbar_detached = 1; |
eb72706060ad
* xterm.h (struct x_output): New member, toolbar_detached.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59411
diff
changeset
|
3632 |
49323 | 3633 /* When detaching a tool bar, not everything dissapear. There are |
3634 a few pixels left that are used to drop the tool bar back into | |
3635 place. */ | |
103665
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103198
diff
changeset
|
3636 FRAME_TOOLBAR_HEIGHT (f) = 4; |
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103198
diff
changeset
|
3637 xg_height_changed (f); |
49323 | 3638 } |
3639 } | |
3640 | |
3641 /* This callback is called when a tool bar is reattached. We must set | |
3642 the height of the tool bar when this happens so frame sizes | |
3643 are correctly calculated. | |
3644 WBOX is the handle box widget that enables detach/attach of the tool bar. | |
3645 W is the tool bar widget. | |
3646 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
|
3647 |
49323 | 3648 static void |
3649 xg_tool_bar_attach_callback (wbox, w, client_data) | |
3650 GtkHandleBox *wbox; | |
3651 GtkWidget *w; | |
3652 gpointer client_data; | |
3653 { | |
3654 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
|
3655 g_object_set (G_OBJECT (w), "show-arrow", TRUE, NULL); |
49323 | 3656 |
3657 if (f) | |
3658 { | |
3659 GtkRequisition req; | |
3660 | |
59420
eb72706060ad
* xterm.h (struct x_output): New member, toolbar_detached.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59411
diff
changeset
|
3661 FRAME_X_OUTPUT (f)->toolbar_detached = 0; |
eb72706060ad
* xterm.h (struct x_output): New member, toolbar_detached.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59411
diff
changeset
|
3662 |
49323 | 3663 gtk_widget_size_request (w, &req); |
3664 FRAME_TOOLBAR_HEIGHT (f) = req.height; | |
103665
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103198
diff
changeset
|
3665 xg_height_changed (f); |
49323 | 3666 } |
3667 } | |
3668 | |
3669 /* This callback is called when the mouse enters or leaves a tool bar item. | |
3670 It is used for displaying and hiding the help text. | |
3671 W is the tool bar item, a button. | |
3672 EVENT is either an enter event or leave event. | |
3673 CLIENT_DATA is an integer that is the index of the button in the | |
3674 tool bar. 0 is the first button. | |
3675 | |
3676 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
|
3677 |
49323 | 3678 static gboolean |
3679 xg_tool_bar_help_callback (w, event, client_data) | |
3680 GtkWidget *w; | |
3681 GdkEventCrossing *event; | |
3682 gpointer client_data; | |
3683 { | |
59411
ecb6689e04bf
* gtkutil.c (xg_gtk_scroll_destroy, xg_create_scroll_bar)
Jan Djärv <jan.h.d@swipnet.se>
parents:
59102
diff
changeset
|
3684 /* 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
|
3685 int idx = (int) (EMACS_INT) client_data; |
49323 | 3686 FRAME_PTR f = (FRAME_PTR) g_object_get_data (G_OBJECT (w), XG_FRAME_DATA); |
3687 Lisp_Object help, frame; | |
3688 | |
3689 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
|
3690 return FALSE; |
49323 | 3691 |
3692 if (event->type == GDK_ENTER_NOTIFY) | |
3693 { | |
3694 idx *= TOOL_BAR_ITEM_NSLOTS; | |
3695 help = AREF (f->tool_bar_items, idx + TOOL_BAR_ITEM_HELP); | |
3696 | |
3697 if (NILP (help)) | |
3698 help = AREF (f->tool_bar_items, idx + TOOL_BAR_ITEM_CAPTION); | |
3699 } | |
3700 else | |
3701 help = Qnil; | |
3702 | |
3703 XSETFRAME (frame, f); | |
3704 kbd_buffer_store_help_event (frame, help); | |
3705 | |
3706 return FALSE; | |
3707 } | |
3708 | |
3709 | |
49826
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3710 /* 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
|
3711 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
|
3712 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
|
3713 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
|
3714 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
|
3715 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
|
3716 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
|
3717 |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3718 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
|
3719 |
49826
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3720 static gboolean |
50063 | 3721 xg_tool_bar_item_expose_callback (w, event, client_data) |
49826
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3722 GtkWidget *w; |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3723 GdkEventExpose *event; |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3724 gpointer client_data; |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3725 { |
50333
60da21fd968b
* gtkutil.c (xg_tool_bar_item_expose_callback): Reduce size
Jan Djärv <jan.h.d@swipnet.se>
parents:
50318
diff
changeset
|
3726 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
|
3727 |
60da21fd968b
* gtkutil.c (xg_tool_bar_item_expose_callback): Reduce size
Jan Djärv <jan.h.d@swipnet.se>
parents:
50318
diff
changeset
|
3728 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
|
3729 |
60da21fd968b
* gtkutil.c (xg_tool_bar_item_expose_callback): Reduce size
Jan Djärv <jan.h.d@swipnet.se>
parents:
50318
diff
changeset
|
3730 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
|
3731 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
|
3732 |
53069
1218a42792ea
Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents:
52981
diff
changeset
|
3733 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
|
3734 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
|
3735 |
50333
60da21fd968b
* gtkutil.c (xg_tool_bar_item_expose_callback): Reduce size
Jan Djärv <jan.h.d@swipnet.se>
parents:
50318
diff
changeset
|
3736 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
|
3737 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
|
3738 |
49826
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3739 return FALSE; |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3740 } |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3741 |
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
|
3742 /* Attach a tool bar to frame F. */ |
39b38c867ca4
(xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents:
91632
diff
changeset
|
3743 |
39b38c867ca4
(xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents:
91632
diff
changeset
|
3744 static void |
39b38c867ca4
(xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents:
91632
diff
changeset
|
3745 xg_pack_tool_bar (f) |
39b38c867ca4
(xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents:
91632
diff
changeset
|
3746 FRAME_PTR f; |
39b38c867ca4
(xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents:
91632
diff
changeset
|
3747 { |
39b38c867ca4
(xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents:
91632
diff
changeset
|
3748 struct x_output *x = f->output_data.x; |
39b38c867ca4
(xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents:
91632
diff
changeset
|
3749 int vbox_pos = x->menubar_widget ? 1 : 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
|
3750 |
39b38c867ca4
(xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents:
91632
diff
changeset
|
3751 x->handlebox_widget = gtk_handle_box_new (); |
39b38c867ca4
(xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents:
91632
diff
changeset
|
3752 g_signal_connect (G_OBJECT (x->handlebox_widget), "child-detached", |
39b38c867ca4
(xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents:
91632
diff
changeset
|
3753 G_CALLBACK (xg_tool_bar_detach_callback), f); |
39b38c867ca4
(xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents:
91632
diff
changeset
|
3754 g_signal_connect (G_OBJECT (x->handlebox_widget), "child-attached", |
39b38c867ca4
(xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents:
91632
diff
changeset
|
3755 G_CALLBACK (xg_tool_bar_attach_callback), f); |
39b38c867ca4
(xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents:
91632
diff
changeset
|
3756 |
39b38c867ca4
(xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents:
91632
diff
changeset
|
3757 gtk_container_add (GTK_CONTAINER (x->handlebox_widget), |
39b38c867ca4
(xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents:
91632
diff
changeset
|
3758 x->toolbar_widget); |
39b38c867ca4
(xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents:
91632
diff
changeset
|
3759 |
39b38c867ca4
(xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents:
91632
diff
changeset
|
3760 gtk_box_pack_start (GTK_BOX (x->vbox_widget), x->handlebox_widget, |
39b38c867ca4
(xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents:
91632
diff
changeset
|
3761 FALSE, FALSE, 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
|
3762 |
39b38c867ca4
(xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents:
91632
diff
changeset
|
3763 gtk_box_reorder_child (GTK_BOX (x->vbox_widget), x->handlebox_widget, |
39b38c867ca4
(xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents:
91632
diff
changeset
|
3764 vbox_pos); |
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
|
3765 |
8bb62bdbd80a
Fix bug #6139, text is briefly shown in tool bar on startup.
Jan D <jan.h.d@swipnet.se>
parents:
108082
diff
changeset
|
3766 gtk_widget_show (x->toolbar_widget); |
8bb62bdbd80a
Fix bug #6139, text is briefly shown in tool bar on startup.
Jan D <jan.h.d@swipnet.se>
parents:
108082
diff
changeset
|
3767 gtk_widget_show (x->handlebox_widget); |
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
|
3768 } |
50063 | 3769 |
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 /* Create a tool bar for frame F. */ |
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
|
3771 #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
|
3772 #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
|
3773 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
|
3774 #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
|
3775 #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
|
3776 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
|
3777 #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
|
3778 |
49323 | 3779 static void |
3780 xg_create_tool_bar (f) | |
3781 FRAME_PTR f; | |
3782 { | |
3783 struct x_output *x = f->output_data.x; | |
3784 | |
3785 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
|
3786 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
|
3787 |
49826
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3788 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
|
3789 |
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3790 gtk_toolbar_set_style (GTK_TOOLBAR (x->toolbar_widget), GTK_TOOLBAR_ICONS); |
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
|
3791 toolbar_set_orientation (x->toolbar_widget, |
49826
e99f1a981a3b
* gtkutil.c (xg_tool_bar_expose_callback): New function.
Jan Djärv <jan.h.d@swipnet.se>
parents:
49600
diff
changeset
|
3792 GTK_ORIENTATION_HORIZONTAL); |
49323 | 3793 } |
3794 | |
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
|
3795 |
39b38c867ca4
(xg_resize_outer_widget): Only do one of set_geometry or
Jan Djärv <jan.h.d@swipnet.se>
parents:
91632
diff
changeset
|
3796 #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
|
3797 |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3798 /* 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
|
3799 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
|
3800 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3801 static Lisp_Object |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3802 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
|
3803 FRAME_PTR f; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3804 Lisp_Object image; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3805 Lisp_Object rtl; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3806 { |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3807 int i; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3808 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
|
3809 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
|
3810 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
|
3811 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3812 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
|
3813 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3814 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
|
3815 { |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3816 Lisp_Object rtl_image = PROP (TOOL_BAR_ITEM_IMAGES); |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
3817 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
|
3818 { |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3819 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
|
3820 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
|
3821 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
|
3822 { |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3823 image = rtl_image; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3824 break; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3825 } |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3826 } |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3827 } |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3828 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3829 return image; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3830 } |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3831 |
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
|
3832 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
|
3833 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
|
3834 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
|
3835 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
|
3836 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
|
3837 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
|
3838 { |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3839 GtkToolItem *ti = gtk_tool_item_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
|
3840 GtkWidget *vb = EQ (Vtool_bar_style, Qboth_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
|
3841 ? 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
|
3842 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
|
3843 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
|
3844 |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3845 if (wimage) |
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
|
3846 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
|
3847 |
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
|
3848 gtk_box_pack_start (GTK_BOX (vb), gtk_label_new (label), 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
|
3849 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
|
3850 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
|
3851 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
|
3852 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
|
3853 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
|
3854 |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3855 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
|
3856 { |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3857 /* 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
|
3858 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
|
3859 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
|
3860 (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
|
3861 |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3862 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
|
3863 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
|
3864 (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
|
3865 |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3866 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
|
3867 |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3868 /* 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
|
3869 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
|
3870 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
|
3871 "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
|
3872 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
|
3873 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
|
3874 |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3875 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
|
3876 |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3877 /* 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
|
3878 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
|
3879 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
|
3880 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
|
3881 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
|
3882 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
|
3883 |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3884 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
|
3885 |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3886 /* 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
|
3887 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
|
3888 "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
|
3889 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
|
3890 /* 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
|
3891 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
|
3892 "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
|
3893 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
|
3894 (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
|
3895 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
|
3896 "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
|
3897 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
|
3898 (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
|
3899 } |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3900 |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3901 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
|
3902 |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3903 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
|
3904 } |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3905 |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3906 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
|
3907 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
|
3908 { |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3909 Lisp_Object style = Ftool_bar_get_system_style (); |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3910 |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3911 int show_label = EQ (style, Qboth) |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3912 || EQ (style, Qboth_horiz) || 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
|
3913 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
|
3914 int horiz = EQ (style, Qboth_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
|
3915 |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3916 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
|
3917 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
|
3918 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
|
3919 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
|
3920 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
|
3921 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
|
3922 |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3923 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
|
3924 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
|
3925 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
|
3926 new_box = 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
|
3927 if (new_box) |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3928 { |
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
|
3929 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
|
3930 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
|
3931 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
|
3932 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
|
3933 gtk_widget_destroy (GTK_WIDGET (vb)); |
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
|
3934 gtk_box_pack_start (GTK_BOX (new_box), 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
|
3935 gtk_box_pack_start (GTK_BOX (new_box), wlbl, 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
|
3936 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
|
3937 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
|
3938 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
|
3939 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
|
3940 } |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3941 |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3942 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
|
3943 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
|
3944 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
|
3945 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
|
3946 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
|
3947 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
|
3948 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
|
3949 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
|
3950 } |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3951 |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
3952 |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
3953 /* 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
|
3954 |
103916
9653887b5cd0
* xterm.c (Qx_gtk_map_stock): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
103690
diff
changeset
|
3955 extern Lisp_Object Qx_gtk_map_stock; |
9653887b5cd0
* xterm.c (Qx_gtk_map_stock): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
103690
diff
changeset
|
3956 |
49323 | 3957 void |
3958 update_frame_tool_bar (f) | |
3959 FRAME_PTR f; | |
3960 { | |
3961 int i; | |
3962 GtkRequisition old_req, new_req; | |
3963 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
|
3964 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
|
3965 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
|
3966 GtkToolItem *ti; |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
3967 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
|
3968 int pack_tool_bar = x->handlebox_widget == NULL; |
49323 | 3969 |
3970 if (! FRAME_GTK_WIDGET (f)) | |
3971 return; | |
3972 | |
3973 BLOCK_INPUT; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
3974 |
59084
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3975 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
|
3976 && 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
|
3977 { |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3978 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
|
3979 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
|
3980 } |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3981 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
|
3982 { |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3983 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
|
3984 && 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
|
3985 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
|
3986 |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3987 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
|
3988 && 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
|
3989 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
|
3990 } |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3991 |
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
3992 /* 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
|
3993 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
|
3994 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
|
3995 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
|
3996 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
|
3997 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
|
3998 |
49323 | 3999 if (! x->toolbar_widget) |
4000 xg_create_tool_bar (f); | |
4001 | |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4002 wtoolbar = GTK_TOOLBAR (x->toolbar_widget); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4003 gtk_widget_size_request (GTK_WIDGET (wtoolbar), &old_req); |
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
|
4004 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
|
4005 |
49323 | 4006 for (i = 0; i < f->n_tool_bar_items; ++i) |
4007 { | |
4008 int enabled_p = !NILP (PROP (TOOL_BAR_ITEM_ENABLED_P)); | |
4009 int selected_p = !NILP (PROP (TOOL_BAR_ITEM_SELECTED_P)); | |
4010 int idx; | |
4011 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
|
4012 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
|
4013 struct image *img = NULL; |
49323 | 4014 Lisp_Object image; |
100100
f5d2a2e44839
(update_frame_tool_bar): Initialize variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
98555
diff
changeset
|
4015 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
|
4016 GtkStockItem stock_item; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4017 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
|
4018 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
|
4019 Lisp_Object rtl; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4020 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
|
4021 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
|
4022 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
|
4023 Lisp_Object lbl = 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
|
4024 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
|
4025 |
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 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
|
4027 |
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
4028 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
|
4029 { |
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
4030 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
|
4031 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
|
4032 } |
49323 | 4033 |
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
|
4034 |
49323 | 4035 image = PROP (TOOL_BAR_ITEM_IMAGES); |
4036 | |
4037 /* Ignore invalid image specifications. */ | |
4038 if (!valid_image_p (image)) | |
4039 { | |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4040 if (wbutton) gtk_widget_hide (wbutton); |
49323 | 4041 continue; |
4042 } | |
4043 | |
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
|
4044 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
|
4045 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
|
4046 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
|
4047 |
9653887b5cd0
* xterm.c (Qx_gtk_map_stock): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
103690
diff
changeset
|
4048 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
|
4049 { |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4050 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
|
4051 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
|
4052 { |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4053 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
|
4054 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
|
4055 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4056 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
|
4057 stock_name = NULL; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4058 stock = Qnil; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4059 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4060 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
|
4061 icon_name = NULL; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4062 else |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4063 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
|
4064 } |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4065 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
|
4066 icon_size = gtk_toolbar_get_icon_size (wtoolbar); |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
4067 else |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4068 { |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4069 stock = Qnil; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4070 stock_name = NULL; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4071 } |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4072 } |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4073 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4074 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
|
4075 { |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4076 /* 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
|
4077 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4078 /* 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
|
4079 button state. */ |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4080 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
|
4081 && !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
|
4082 && 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
|
4083 { |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4084 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
|
4085 } |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4086 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4087 if (VECTORP (image)) |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4088 { |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4089 if (enabled_p) |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4090 idx = (selected_p |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4091 ? 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
|
4092 : 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
|
4093 else |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4094 idx = (selected_p |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4095 ? 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
|
4096 : 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
|
4097 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4098 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
|
4099 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
|
4100 } |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4101 else |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4102 idx = -1; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4103 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4104 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
|
4105 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
|
4106 prepare_image_for_display (f, img); |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
4107 |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4108 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
|
4109 { |
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
|
4110 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
|
4111 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
|
4112 else |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4113 { |
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
|
4114 /* 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
|
4115 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
|
4116 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
|
4117 } |
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
|
4118 continue; |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4119 } |
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
|
4120 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
4121 |
74990
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
4122 if (ti == NULL) |
49323 | 4123 { |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4124 GtkWidget *w; |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4125 if (stock_name) |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4126 { |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4127 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
|
4128 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
|
4129 (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
|
4130 (GDestroyNotify) xfree); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4131 } |
102283
43221c2f4272
Fix typo in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
100951
diff
changeset
|
4132 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
|
4133 { |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4134 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
|
4135 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
|
4136 (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
|
4137 (GDestroyNotify) xfree); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4138 } |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4139 else |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4140 { |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4141 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
|
4142 /* 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
|
4143 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
|
4144 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
|
4145 (gpointer)img->pixmap); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4146 } |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4147 |
59084
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
4148 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
|
4149 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
|
4150 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
|
4151 gtk_widget_set_sensitive (wbutton, enabled_p); |
49323 | 4152 } |
4153 else | |
4154 { | |
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
|
4155 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
|
4156 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
|
4157 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
|
4158 |
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
|
4159 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
|
4160 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
|
4161 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
|
4162 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
|
4163 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
|
4164 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
|
4165 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
|
4166 if (stock_name && |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4167 (! 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
|
4168 { |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4169 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
|
4170 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
|
4171 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
|
4172 (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
|
4173 (GDestroyNotify) xfree); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4174 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
|
4175 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
|
4176 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
|
4177 NULL); |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4178 } |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4179 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
|
4180 (! 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
|
4181 { |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4182 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
|
4183 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
|
4184 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
|
4185 (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
|
4186 (GDestroyNotify) xfree); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4187 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
|
4188 NULL); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4189 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
|
4190 NULL); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4191 } |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4192 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
|
4193 { |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4194 (void) xg_get_image_for_pixmap (f, img, x->widget, wimage); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4195 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
|
4196 (gpointer)img->pixmap); |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4197 |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4198 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
|
4199 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
|
4200 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
|
4201 NULL); |
78721
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4202 } |
a888c5a82ba5
(file_for_image, find_rtl_image): New functions.
Jan Djärv <jan.h.d@swipnet.se>
parents:
78690
diff
changeset
|
4203 |
59084
6a0b8f23858b
* gtkutil.c (update_frame_tool_bar): Make the value of
Jan Djärv <jan.h.d@swipnet.se>
parents:
58818
diff
changeset
|
4204 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
|
4205 |
74990
de706755c4d7
(xg_tool_bar_button_cb): Save last modifier on widget.
Jan Djärv <jan.h.d@swipnet.se>
parents:
74376
diff
changeset
|
4206 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
|
4207 } |
4d8277a44bb4
Gtk tool bars can be text, icons with text or just icons.
Jan D. <jan.h.d@swipnet.se>
parents:
107997
diff
changeset
|
4208 xg_show_toolbar_item (ti); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49572
diff
changeset
|
4209 |
49323 | 4210 #undef PROP |
4211 } | |
4212 | |
4213 /* Remove buttons not longer needed. We just hide them so they | |
4214 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
|
4215 do |
49323 | 4216 { |
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
|
4217 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
|
4218 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
|
4219 } while (ti != NULL); |
49323 | 4220 |
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
|
4221 new_req.height = 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
|
4222 if (pack_tool_bar && f->n_tool_bar_items != 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
|
4223 xg_pack_tool_bar (f); |
103665
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103198
diff
changeset
|
4224 |
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103198
diff
changeset
|
4225 |
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
|
4226 gtk_widget_size_request (GTK_WIDGET (wtoolbar), &new_req); |
103665
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103198
diff
changeset
|
4227 if (old_req.height != new_req.height |
59420
eb72706060ad
* xterm.h (struct x_output): New member, toolbar_detached.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59411
diff
changeset
|
4228 && ! FRAME_X_OUTPUT (f)->toolbar_detached) |
49323 | 4229 { |
4230 FRAME_TOOLBAR_HEIGHT (f) = new_req.height; | |
103665
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103198
diff
changeset
|
4231 xg_height_changed (f); |
49323 | 4232 } |
4233 UNBLOCK_INPUT; | |
4234 } | |
4235 | |
57715
cdc48cdd5b0e
* gtkutil.c: Put empty line between comment and function body.
Jan Djärv <jan.h.d@swipnet.se>
parents:
57597
diff
changeset
|
4236 /* 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
|
4237 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
|
4238 |
49323 | 4239 void |
4240 free_frame_tool_bar (f) | |
4241 FRAME_PTR f; | |
4242 { | |
4243 struct x_output *x = f->output_data.x; | |
4244 | |
4245 if (x->toolbar_widget) | |
4246 { | |
93030
d38f7962c052
(free_frame_tool_bar): Only call gtk_container_remove if
Jan Djärv <jan.h.d@swipnet.se>
parents:
92366
diff
changeset
|
4247 int is_packed = x->handlebox_widget != 0; |
49323 | 4248 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
|
4249 /* 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
|
4250 not the x->handlebox_widget which is created in xg_pack_tool_bar. */ |
d38f7962c052
(free_frame_tool_bar): Only call gtk_container_remove if
Jan Djärv <jan.h.d@swipnet.se>
parents:
92366
diff
changeset
|
4251 if (is_packed) |
d38f7962c052
(free_frame_tool_bar): Only call gtk_container_remove if
Jan Djärv <jan.h.d@swipnet.se>
parents:
92366
diff
changeset
|
4252 gtk_container_remove (GTK_CONTAINER (x->vbox_widget), |
d38f7962c052
(free_frame_tool_bar): Only call gtk_container_remove if
Jan Djärv <jan.h.d@swipnet.se>
parents:
92366
diff
changeset
|
4253 x->handlebox_widget); |
d38f7962c052
(free_frame_tool_bar): Only call gtk_container_remove if
Jan Djärv <jan.h.d@swipnet.se>
parents:
92366
diff
changeset
|
4254 else |
d38f7962c052
(free_frame_tool_bar): Only call gtk_container_remove if
Jan Djärv <jan.h.d@swipnet.se>
parents:
92366
diff
changeset
|
4255 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
|
4256 |
49323 | 4257 x->toolbar_widget = 0; |
4258 x->handlebox_widget = 0; | |
4259 FRAME_TOOLBAR_HEIGHT (f) = 0; | |
103665
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103198
diff
changeset
|
4260 xg_height_changed (f); |
340c701162a6
* emacs.c (USAGE3, standard_args): Add -mm and --maximized.
Jan Djärv <jan.h.d@swipnet.se>
parents:
103198
diff
changeset
|
4261 |
49323 | 4262 UNBLOCK_INPUT; |
4263 } | |
4264 } | |
4265 | |
4266 | |
4267 | |
4268 /*********************************************************************** | |
4269 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
|
4270 ***********************************************************************/ |
49323 | 4271 void |
4272 xg_initialize () | |
4273 { | |
59102
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59084
diff
changeset
|
4274 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
|
4275 |
75417
c21d47d727f3
(xg_initialize): Call XftInit if HAVE_XFT.
Jan Djärv <jan.h.d@swipnet.se>
parents:
75348
diff
changeset
|
4276 #if HAVE_XFT |
c21d47d727f3
(xg_initialize): Call XftInit if HAVE_XFT.
Jan Djärv <jan.h.d@swipnet.se>
parents:
75348
diff
changeset
|
4277 /* 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
|
4278 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
|
4279 XftInit (0); |
c21d47d727f3
(xg_initialize): Call XftInit if HAVE_XFT.
Jan Djärv <jan.h.d@swipnet.se>
parents:
75348
diff
changeset
|
4280 #endif |
84621 | 4281 |
4282 gdpy_def = NULL; | |
49323 | 4283 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
|
4284 xg_detached_menus = 0; |
49323 | 4285 xg_menu_cb_list.prev = xg_menu_cb_list.next = |
4286 xg_menu_item_cb_list.prev = xg_menu_item_cb_list.next = 0; | |
4287 | |
49419
6562bb5f04aa
gtkutil.c (xg_initialize): Initialize id_to_widget here instead
Jan Djärv <jan.h.d@swipnet.se>
parents:
49359
diff
changeset
|
4288 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
|
4289 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
|
4290 |
49323 | 4291 /* Remove F10 as a menu accelerator, it does not mix well with Emacs key |
4292 bindings. It doesn't seem to be any way to remove properties, | |
4293 so we set it to VoidSymbol which in X means "no key". */ | |
4294 gtk_settings_set_string_property (gtk_settings_get_default (), | |
4295 "gtk-menu-bar-accel", | |
4296 "VoidSymbol", | |
4297 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
|
4298 |
6562bb5f04aa
gtkutil.c (xg_initialize): Initialize id_to_widget here instead
Jan Djärv <jan.h.d@swipnet.se>
parents:
49359
diff
changeset
|
4299 /* 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
|
4300 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
|
4301 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
|
4302 "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
|
4303 "Emacs", |
6562bb5f04aa
gtkutil.c (xg_initialize): Initialize id_to_widget here instead
Jan Djärv <jan.h.d@swipnet.se>
parents:
49359
diff
changeset
|
4304 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
|
4305 |
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59084
diff
changeset
|
4306 /* 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
|
4307 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
|
4308 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
|
4309 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
|
4310 "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
|
4311 |
0096c58ce34a
* xmenu.c (popup_get_selection): Pop down on C-g.
Jan Djärv <jan.h.d@swipnet.se>
parents:
59084
diff
changeset
|
4312 /* 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
|
4313 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
|
4314 (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
|
4315 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
|
4316 "cancel", 0); |
49323 | 4317 } |
4318 | |
4319 #endif /* USE_GTK */ | |
52401 | 4320 |
4321 /* arch-tag: fe7104da-bc1e-4aba-9bd1-f349c528f7e3 | |
4322 (do not change this comment) */ |