Mercurial > emacs
annotate src/bitmaps/README @ 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 | c3512b2085a0 |
| children |
| rev | line source |
|---|---|
| 25830 | 1 This directory contains bitmap files that Emacs uses from |
| 97142 | 2 /usr/include/X11/bitmaps. |
| 25830 | 3 |
|
75659
318e25d470ae
Add copyright and license information.
Glenn Morris <rgm@gnu.org>
parents:
25830
diff
changeset
|
4 |
|
318e25d470ae
Add copyright and license information.
Glenn Morris <rgm@gnu.org>
parents:
25830
diff
changeset
|
5 COPYRIGHT AND LICENSE INFORMATION |
|
318e25d470ae
Add copyright and license information.
Glenn Morris <rgm@gnu.org>
parents:
25830
diff
changeset
|
6 |
|
318e25d470ae
Add copyright and license information.
Glenn Morris <rgm@gnu.org>
parents:
25830
diff
changeset
|
7 These bitmaps are the same as those contained in X Version 11 Release |
|
318e25d470ae
Add copyright and license information.
Glenn Morris <rgm@gnu.org>
parents:
25830
diff
changeset
|
8 4 (released 1989). The correspondence between the Emacs filenames and |
|
318e25d470ae
Add copyright and license information.
Glenn Morris <rgm@gnu.org>
parents:
25830
diff
changeset
|
9 the original include/X11/bitmaps/ filenames is as follows: |
|
318e25d470ae
Add copyright and license information.
Glenn Morris <rgm@gnu.org>
parents:
25830
diff
changeset
|
10 |
|
318e25d470ae
Add copyright and license information.
Glenn Morris <rgm@gnu.org>
parents:
25830
diff
changeset
|
11 Emacs: X11R4: |
|
318e25d470ae
Add copyright and license information.
Glenn Morris <rgm@gnu.org>
parents:
25830
diff
changeset
|
12 cntrpmsk.xbm cntr_ptrmsk |
|
318e25d470ae
Add copyright and license information.
Glenn Morris <rgm@gnu.org>
parents:
25830
diff
changeset
|
13 cntrptr.xbm cntr_ptr |
|
318e25d470ae
Add copyright and license information.
Glenn Morris <rgm@gnu.org>
parents:
25830
diff
changeset
|
14 crosswv.xbm cross_weave |
|
318e25d470ae
Add copyright and license information.
Glenn Morris <rgm@gnu.org>
parents:
25830
diff
changeset
|
15 dimple1.xbm dimple1 |
|
318e25d470ae
Add copyright and license information.
Glenn Morris <rgm@gnu.org>
parents:
25830
diff
changeset
|
16 dimple3.xbm dimple3 |
|
318e25d470ae
Add copyright and license information.
Glenn Morris <rgm@gnu.org>
parents:
25830
diff
changeset
|
17 gray.xbm gray |
|
318e25d470ae
Add copyright and license information.
Glenn Morris <rgm@gnu.org>
parents:
25830
diff
changeset
|
18 gray1.xbm gray1 |
|
318e25d470ae
Add copyright and license information.
Glenn Morris <rgm@gnu.org>
parents:
25830
diff
changeset
|
19 gray3.xbm gray3 |
|
318e25d470ae
Add copyright and license information.
Glenn Morris <rgm@gnu.org>
parents:
25830
diff
changeset
|
20 leftpmsk.xbm left_ptrmsk |
|
318e25d470ae
Add copyright and license information.
Glenn Morris <rgm@gnu.org>
parents:
25830
diff
changeset
|
21 leftptr.xbm left_ptr |
|
318e25d470ae
Add copyright and license information.
Glenn Morris <rgm@gnu.org>
parents:
25830
diff
changeset
|
22 rtpmsk.xbm right_ptrmsk |
|
318e25d470ae
Add copyright and license information.
Glenn Morris <rgm@gnu.org>
parents:
25830
diff
changeset
|
23 rtptr.xbm right_ptr |
|
318e25d470ae
Add copyright and license information.
Glenn Morris <rgm@gnu.org>
parents:
25830
diff
changeset
|
24 stipple.xbm stipple |
|
318e25d470ae
Add copyright and license information.
Glenn Morris <rgm@gnu.org>
parents:
25830
diff
changeset
|
25 |
|
318e25d470ae
Add copyright and license information.
Glenn Morris <rgm@gnu.org>
parents:
25830
diff
changeset
|
26 |
|
318e25d470ae
Add copyright and license information.
Glenn Morris <rgm@gnu.org>
parents:
25830
diff
changeset
|
27 The following copyright and license notice appeared in the parent |
|
318e25d470ae
Add copyright and license information.
Glenn Morris <rgm@gnu.org>
parents:
25830
diff
changeset
|
28 directory of the X11R4 bitmaps/ directory (in include/X11/copyright.h): |
|
318e25d470ae
Add copyright and license information.
Glenn Morris <rgm@gnu.org>
parents:
25830
diff
changeset
|
29 |
|
318e25d470ae
Add copyright and license information.
Glenn Morris <rgm@gnu.org>
parents:
25830
diff
changeset
|
30 Copyright 1985, 1986, 1987, 1988, 1989 by the |
|
318e25d470ae
Add copyright and license information.
Glenn Morris <rgm@gnu.org>
parents:
25830
diff
changeset
|
31 Massachusetts Institute of Technology |
|
318e25d470ae
Add copyright and license information.
Glenn Morris <rgm@gnu.org>
parents:
25830
diff
changeset
|
32 |
|
318e25d470ae
Add copyright and license information.
Glenn Morris <rgm@gnu.org>
parents:
25830
diff
changeset
|
33 Permission to use, copy, modify, distribute, and sell this software and its |
|
318e25d470ae
Add copyright and license information.
Glenn Morris <rgm@gnu.org>
parents:
25830
diff
changeset
|
34 documentation for any purpose is hereby granted without fee, provided that |
|
318e25d470ae
Add copyright and license information.
Glenn Morris <rgm@gnu.org>
parents:
25830
diff
changeset
|
35 the above copyright notice appear in all copies and that both that |
|
318e25d470ae
Add copyright and license information.
Glenn Morris <rgm@gnu.org>
parents:
25830
diff
changeset
|
36 copyright notice and this permission notice appear in supporting |
|
318e25d470ae
Add copyright and license information.
Glenn Morris <rgm@gnu.org>
parents:
25830
diff
changeset
|
37 documentation, and that the name of M.I.T. not be used in advertising or |
|
318e25d470ae
Add copyright and license information.
Glenn Morris <rgm@gnu.org>
parents:
25830
diff
changeset
|
38 publicity pertaining to distribution of the software without specific, |
|
318e25d470ae
Add copyright and license information.
Glenn Morris <rgm@gnu.org>
parents:
25830
diff
changeset
|
39 written prior permission. M.I.T. makes no representations about the |
|
318e25d470ae
Add copyright and license information.
Glenn Morris <rgm@gnu.org>
parents:
25830
diff
changeset
|
40 suitability of this software for any purpose. It is provided "as is" |
|
318e25d470ae
Add copyright and license information.
Glenn Morris <rgm@gnu.org>
parents:
25830
diff
changeset
|
41 without express or implied warranty. |
