Mercurial > emacs
annotate src/atimer.h @ 109581:06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
* lisp/menu-bar.el (menu-bar-showhide-tool-bar-menu-customize-enable-left)
(menu-bar-showhide-tool-bar-menu-customize-disable)
(menu-bar-showhide-tool-bar-menu-customize-enable-right)
(menu-bar-showhide-tool-bar-menu-customize-enable-top)
(menu-bar-showhide-tool-bar-menu-customize-enable-bottom): New functions
(menu-bar-showhide-tool-bar-menu): If tool bar is moveable,
make a menu for Options => toolbar that can move it.
* src/frame.c (Qtool_bar_position): New variable.
(make_frame): Set tool_bar_position to Qtop.
(frame_parms): Add tool-bar-position.
(x_report_frame_params): Store tool_bar_position.
(x_set_fringe_width): Reset wm size hint after fringe changes.
* src/frame.h (struct frame): Add tool_bar_position.
(Qbottom): Declare.
* src/gtkutil.c (FRAME_TOTAL_PIXEL_WIDTH): New macro.
(xg_frame_set_char_size): Add FRAME_TOOLBAR_WIDTH to pixelwidth.
(xg_height_or_width_changed): Use FRAME_TOTAL_PIXEL_WIDTH.
(xg_create_frame_widgets): Create a hobox for placing widgets
vertically. Use gtk_box_pack_start.
(xg_height_or_width_changed): Renamed from xg_height_changed.
(x_wm_set_size_hint): Add FRAME_TOOLBAR_WIDTH to base_width.
(xg_update_frame_menubar, free_frame_menubar): Change to
xg_height_or_width_changed.
(xg_tool_bar_detach_callback): Update left/right/top/bottom tool bar
size correctly. Remove hardcoded 4, instead use handlebox size -
toolbar size.
(xg_tool_bar_attach_callback): Update left/right/top/bottom tool bar
size correctly. Use handlebox size + toolbar size as additional
size.
(xg_pack_tool_bar): POS is a new parameter.
Set orientation of tool bar based on pos.
Only make handlebox_widget if NULL.
Check if tool bar goes to vbox or hbox depending on pos.
(xg_update_tool_bar_sizes): New function.
(update_frame_tool_bar): Remove old_req, new_req. Do not get tool bar
height, call xg_update_tool_bar_sizes instead.
(free_frame_tool_bar): Remove from hbox or vbox depending on
toolbar_in_hbox, Set all FRAME_TOOLBAR_*_(WIDTH|HEIGHT) to zero.
(xg_change_toolbar_position): New function.
* src/gtkutil.h (xg_change_toolbar_position): Declare.
* src/window.c (calc_absolute_offset): Check for FRAME_TOOLBAR_TOP_HEIGHT
and FRAME_TOOLBAR_LEFT_WIDTH.
* src/xfns.c (x_set_tool_bar_position): New function.
(xic_set_statusarea): Use FRAME_TOOLBAR_TOP_HEIGHT.
(x_frame_parm_handlers): Add x_set_tool_bar_position.
(syms_of_xfns): if USE_GTK, provide move-toolbar.
* src/xterm.c (x_set_window_size_1): Add FRAME_TOOLBAR_WIDTH to pixelwidth.
* src/xterm.h (struct x_output): Add toolbar_top_height,
toolbar_bottom_height, toolbar_left_width, toolbar_right_width. Remove
toolbar_height.
if USE_GTK: Add hbox_widget and toolbar_in_hbox.
(FRAME_TOOLBAR_TOP_HEIGHT, FRAME_TOOLBAR_BOTTOM_HEIGHT)
(FRAME_TOOLBAR_LEFT_WIDTH, FRAME_TOOLBAR_RIGHT_WIDTH): New macros.
(FRAME_TOOLBAR_HEIGHT): Is now TOP_HEIGHT + BOTTOM_HEIGHT.
| author | Jan D. <jan.h.d@swipnet.se> |
|---|---|
| date | Thu, 29 Jul 2010 18:49:59 +0200 |
| parents | 2bc9a0c04c87 |
| children | 417b1e4d63cd |
| rev | line source |
|---|---|
| 27433 | 1 /* Asynchronous timers. |
|
75227
e90d04cd455a
Update copyright for years from Emacs 21 to present (mainly adding
Glenn Morris <rgm@gnu.org>
parents:
68651
diff
changeset
|
2 Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, |
| 106815 | 3 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
| 27433 | 4 |
| 5 This file is part of GNU Emacs. | |
| 6 | |
|
94994
29adfc9354e7
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79759
diff
changeset
|
7 GNU Emacs is free software: you can redistribute it and/or modify |
| 27433 | 8 it under the terms of the GNU General Public License as published by |
|
94994
29adfc9354e7
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79759
diff
changeset
|
9 the Free Software Foundation, either version 3 of the License, or |
|
29adfc9354e7
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79759
diff
changeset
|
10 (at your option) any later version. |
| 27433 | 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 | |
|
94994
29adfc9354e7
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79759
diff
changeset
|
18 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 27433 | 19 |
|
29927
cc1255965fcc
Protect against multiple inclusion. Include
Dave Love <fx@gnu.org>
parents:
27671
diff
changeset
|
20 #ifndef EMACS_ATIMER_H |
|
cc1255965fcc
Protect against multiple inclusion. Include
Dave Love <fx@gnu.org>
parents:
27671
diff
changeset
|
21 #define EMACS_ATIMER_H |
|
cc1255965fcc
Protect against multiple inclusion. Include
Dave Love <fx@gnu.org>
parents:
27671
diff
changeset
|
22 |
|
cc1255965fcc
Protect against multiple inclusion. Include
Dave Love <fx@gnu.org>
parents:
27671
diff
changeset
|
23 #include "systime.h" /* for EMACS_TIME */ |
|
cc1255965fcc
Protect against multiple inclusion. Include
Dave Love <fx@gnu.org>
parents:
27671
diff
changeset
|
24 |
| 27433 | 25 /* Forward declaration. */ |
| 26 | |
| 27 struct atimer; | |
| 28 | |
| 29 /* Types of timers. */ | |
| 30 | |
| 31 enum atimer_type | |
| 32 { | |
| 33 /* Timer is ripe at some absolute time. */ | |
| 34 ATIMER_ABSOLUTE, | |
| 35 | |
| 36 /* Timer is ripe at now plus an offset. */ | |
| 37 ATIMER_RELATIVE, | |
| 38 | |
|
106875
81da60e75606
Fix typos in comments.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
39 /* Timer runs continuously. */ |
| 27433 | 40 ATIMER_CONTINUOUS |
| 41 }; | |
| 42 | |
| 43 /* Type of timer callback functions. */ | |
| 44 | |
| 109099 | 45 typedef void (* atimer_callback) (struct atimer *timer); |
| 27433 | 46 |
| 47 /* Structure describing an asynchronous timer. */ | |
| 48 | |
| 49 struct atimer | |
| 50 { | |
| 51 /* The type of this timer. */ | |
| 52 enum atimer_type type; | |
|
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
39667
diff
changeset
|
53 |
| 27433 | 54 /* Time when this timer is ripe. */ |
| 55 EMACS_TIME expiration; | |
| 56 | |
| 57 /* Interval of this timer. */ | |
| 58 EMACS_TIME interval; | |
| 59 | |
| 39667 | 60 /* Function to call when timer is ripe. Interrupt input is |
| 61 guaranteed to not be blocked when this function is called. */ | |
| 27433 | 62 atimer_callback fn; |
| 63 | |
| 64 /* Additional user-specified data to pass to FN. */ | |
| 65 void *client_data; | |
| 66 | |
| 67 /* Next in list of active or free atimers. */ | |
| 68 struct atimer *next; | |
| 69 }; | |
| 70 | |
| 71 /* Function prototypes. */ | |
| 72 | |
| 109099 | 73 struct atimer *start_atimer (enum atimer_type, EMACS_TIME, |
| 74 atimer_callback, void *); | |
| 75 void cancel_atimer (struct atimer *); | |
| 76 void do_pending_atimers (void); | |
| 77 void init_atimer (void); | |
| 78 void turn_on_atimers (int); | |
| 79 void stop_other_atimers (struct atimer *); | |
| 80 void run_all_atimers (void); | |
| 81 Lisp_Object unwind_stop_other_atimers (Lisp_Object); | |
| 27433 | 82 |
|
29927
cc1255965fcc
Protect against multiple inclusion. Include
Dave Love <fx@gnu.org>
parents:
27671
diff
changeset
|
83 #endif /* EMACS_ATIMER_H */ |
| 52401 | 84 |
| 85 /* arch-tag: 02c7c1c8-45bd-4222-b874-4ca44662f60b | |
| 86 (do not change this comment) */ |
