Mercurial > hg > xemacs-beta
view src/toolbar-x.c @ 665:fdefd0186b75
[xemacs-hg @ 2001-09-20 06:28:42 by ben]
The great integral types renaming.
The purpose of this is to rationalize the names used for various
integral types, so that they match their intended uses and follow
consist conventions, and eliminate types that were not semantically
different from each other.
The conventions are:
-- All integral types that measure quantities of anything are
signed. Some people disagree vociferously with this, but their
arguments are mostly theoretical, and are vastly outweighed by
the practical headaches of mixing signed and unsigned values,
and more importantly by the far increased likelihood of
inadvertent bugs: Because of the broken "viral" nature of
unsigned quantities in C (operations involving mixed
signed/unsigned are done unsigned, when exactly the opposite is
nearly always wanted), even a single error in declaring a
quantity unsigned that should be signed, or even the even more
subtle error of comparing signed and unsigned values and
forgetting the necessary cast, can be catastrophic, as
comparisons will yield wrong results. -Wsign-compare is turned
on specifically to catch this, but this tends to result in a
great number of warnings when mixing signed and unsigned, and
the casts are annoying. More has been written on this
elsewhere.
-- All such quantity types just mentioned boil down to EMACS_INT,
which is 32 bits on 32-bit machines and 64 bits on 64-bit
machines. This is guaranteed to be the same size as Lisp
objects of type `int', and (as far as I can tell) of size_t
(unsigned!) and ssize_t. The only type below that is not an
EMACS_INT is Hashcode, which is an unsigned value of the same
size as EMACS_INT.
-- Type names should be relatively short (no more than 10
characters or so), with the first letter capitalized and no
underscores if they can at all be avoided.
-- "count" == a zero-based measurement of some quantity. Includes
sizes, offsets, and indexes.
-- "bpos" == a one-based measurement of a position in a buffer.
"Charbpos" and "Bytebpos" count text in the buffer, rather than
bytes in memory; thus Bytebpos does not directly correspond to
the memory representation. Use "Membpos" for this.
-- "Char" refers to internal-format characters, not to the C type
"char", which is really a byte.
-- For the actual name changes, see the script below.
I ran the following script to do the conversion. (NOTE: This script
is idempotent. You can safely run it multiple times and it will
not screw up previous results -- in fact, it will do nothing if
nothing has changed. Thus, it can be run repeatedly as necessary
to handle patches coming in from old workspaces, or old branches.)
There are two tags, just before and just after the change:
`pre-integral-type-rename' and `post-integral-type-rename'. When
merging code from the main trunk into a branch, the best thing to
do is first merge up to `pre-integral-type-rename', then apply the
script and associated changes, then merge from
`post-integral-type-change' to the present. (Alternatively, just do
the merging in one operation; but you may then have a lot of
conflicts needing to be resolved by hand.)
Script `fixtypes.sh' follows:
----------------------------------- cut ------------------------------------
files="*.[ch] s/*.h m/*.h config.h.in ../configure.in Makefile.in.in ../lib-src/*.[ch] ../lwlib/*.[ch]"
gr Memory_Count Bytecount $files
gr Lstream_Data_Count Bytecount $files
gr Element_Count Elemcount $files
gr Hash_Code Hashcode $files
gr extcount bytecount $files
gr bufpos charbpos $files
gr bytind bytebpos $files
gr memind membpos $files
gr bufbyte intbyte $files
gr Extcount Bytecount $files
gr Bufpos Charbpos $files
gr Bytind Bytebpos $files
gr Memind Membpos $files
gr Bufbyte Intbyte $files
gr EXTCOUNT BYTECOUNT $files
gr BUFPOS CHARBPOS $files
gr BYTIND BYTEBPOS $files
gr MEMIND MEMBPOS $files
gr BUFBYTE INTBYTE $files
gr MEMORY_COUNT BYTECOUNT $files
gr LSTREAM_DATA_COUNT BYTECOUNT $files
gr ELEMENT_COUNT ELEMCOUNT $files
gr HASH_CODE HASHCODE $files
----------------------------------- cut ------------------------------------
`fixtypes.sh' is a Bourne-shell script; it uses 'gr':
----------------------------------- cut ------------------------------------
#!/bin/sh
# Usage is like this:
# gr FROM TO FILES ...
# globally replace FROM with TO in FILES. FROM and TO are regular expressions.
# backup files are stored in the `backup' directory.
from="$1"
to="$2"
shift 2
echo ${1+"$@"} | xargs global-replace "s/$from/$to/g"
----------------------------------- cut ------------------------------------
`gr' in turn uses a Perl script to do its real work,
`global-replace', which follows:
----------------------------------- cut ------------------------------------
: #-*- Perl -*-
### global-modify --- modify the contents of a file by a Perl expression
## Copyright (C) 1999 Martin Buchholz.
## Copyright (C) 2001 Ben Wing.
## Authors: Martin Buchholz <martin@xemacs.org>, Ben Wing <ben@xemacs.org>
## Maintainer: Ben Wing <ben@xemacs.org>
## Current Version: 1.0, May 5, 2001
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with XEmacs; see the file COPYING. If not, write to the Free
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
eval 'exec perl -w -S $0 ${1+"$@"}'
if 0;
use strict;
use FileHandle;
use Carp;
use Getopt::Long;
use File::Basename;
(my $myName = $0) =~ s@.*/@@; my $usage="
Usage: $myName [--help] [--backup-dir=DIR] [--line-mode] [--hunk-mode]
PERLEXPR FILE ...
Globally modify a file, either line by line or in one big hunk.
Typical usage is like this:
[with GNU print, GNU xargs: guaranteed to handle spaces, quotes, etc.
in file names]
find . -name '*.[ch]' -print0 | xargs -0 $0 's/\bCONST\b/const/g'\n
[with non-GNU print, xargs]
find . -name '*.[ch]' -print | xargs $0 's/\bCONST\b/const/g'\n
The file is read in, either line by line (with --line-mode specified)
or in one big hunk (with --hunk-mode specified; it's the default), and
the Perl expression is then evalled with \$_ set to the line or hunk of
text, including the terminating newline if there is one. It should
destructively modify the value there, storing the changed result in \$_.
Files in which any modifications are made are backed up to the directory
specified using --backup-dir, or to `backup' by default. To disable this,
use --backup-dir= with no argument.
Hunk mode is the default because it is MUCH MUCH faster than line-by-line.
Use line-by-line only when it matters, e.g. you want to do a replacement
only once per line (the default without the `g' argument). Conversely,
when using hunk mode, *ALWAYS* use `g'; otherwise, you will only make one
replacement in the entire file!
";
my %options = ();
$Getopt::Long::ignorecase = 0;
&GetOptions (
\%options,
'help', 'backup-dir=s', 'line-mode', 'hunk-mode',
);
die $usage if $options{"help"} or @ARGV <= 1;
my $code = shift;
die $usage if grep (-d || ! -w, @ARGV);
sub SafeOpen {
open ((my $fh = new FileHandle), $_[0]);
confess "Can't open $_[0]: $!" if ! defined $fh;
return $fh;
}
sub SafeClose {
close $_[0] or confess "Can't close $_[0]: $!";
}
sub FileContents {
my $fh = SafeOpen ("< $_[0]");
my $olddollarslash = $/;
local $/ = undef;
my $contents = <$fh>;
$/ = $olddollarslash;
return $contents;
}
sub WriteStringToFile {
my $fh = SafeOpen ("> $_[0]");
binmode $fh;
print $fh $_[1] or confess "$_[0]: $!\n";
SafeClose $fh;
}
foreach my $file (@ARGV) {
my $changed_p = 0;
my $new_contents = "";
if ($options{"line-mode"}) {
my $fh = SafeOpen $file;
while (<$fh>) {
my $save_line = $_;
eval $code;
$changed_p = 1 if $save_line ne $_;
$new_contents .= $_;
}
} else {
my $orig_contents = $_ = FileContents $file;
eval $code;
if ($_ ne $orig_contents) {
$changed_p = 1;
$new_contents = $_;
}
}
if ($changed_p) {
my $backdir = $options{"backup-dir"};
$backdir = "backup" if !defined ($backdir);
if ($backdir) {
my ($name, $path, $suffix) = fileparse ($file, "");
my $backfulldir = $path . $backdir;
my $backfile = "$backfulldir/$name";
mkdir $backfulldir, 0755 unless -d $backfulldir;
print "modifying $file (original saved in $backfile)\n";
rename $file, $backfile;
}
WriteStringToFile ($file, $new_contents);
}
}
----------------------------------- cut ------------------------------------
In addition to those programs, I needed to fix up a few other
things, particularly relating to the duplicate definitions of
types, now that some types merged with others. Specifically:
1. in lisp.h, removed duplicate declarations of Bytecount. The
changed code should now look like this: (In each code snippet
below, the first and last lines are the same as the original, as
are all lines outside of those lines. That allows you to locate
the section to be replaced, and replace the stuff in that
section, verifying that there isn't anything new added that
would need to be kept.)
--------------------------------- snip -------------------------------------
/* Counts of bytes or chars */
typedef EMACS_INT Bytecount;
typedef EMACS_INT Charcount;
/* Counts of elements */
typedef EMACS_INT Elemcount;
/* Hash codes */
typedef unsigned long Hashcode;
/* ------------------------ dynamic arrays ------------------- */
--------------------------------- snip -------------------------------------
2. in lstream.h, removed duplicate declaration of Bytecount.
Rewrote the comment about this type. The changed code should
now look like this:
--------------------------------- snip -------------------------------------
#endif
/* The have been some arguments over the what the type should be that
specifies a count of bytes in a data block to be written out or read in,
using Lstream_read(), Lstream_write(), and related functions.
Originally it was long, which worked fine; Martin "corrected" these to
size_t and ssize_t on the grounds that this is theoretically cleaner and
is in keeping with the C standards. Unfortunately, this practice is
horribly error-prone due to design flaws in the way that mixed
signed/unsigned arithmetic happens. In fact, by doing this change,
Martin introduced a subtle but fatal error that caused the operation of
sending large mail messages to the SMTP server under Windows to fail.
By putting all values back to be signed, avoiding any signed/unsigned
mixing, the bug immediately went away. The type then in use was
Lstream_Data_Count, so that it be reverted cleanly if a vote came to
that. Now it is Bytecount.
Some earlier comments about why the type must be signed: This MUST BE
SIGNED, since it also is used in functions that return the number of
bytes actually read to or written from in an operation, and these
functions can return -1 to signal error.
Note that the standard Unix read() and write() functions define the
count going in as a size_t, which is UNSIGNED, and the count going
out as an ssize_t, which is SIGNED. This is a horrible design
flaw. Not only is it highly likely to lead to logic errors when a
-1 gets interpreted as a large positive number, but operations are
bound to fail in all sorts of horrible ways when a number in the
upper-half of the size_t range is passed in -- this number is
unrepresentable as an ssize_t, so code that checks to see how many
bytes are actually written (which is mandatory if you are dealing
with certain types of devices) will get completely screwed up.
--ben
*/
typedef enum lstream_buffering
--------------------------------- snip -------------------------------------
3. in dumper.c, there are four places, all inside of switch()
statements, where XD_BYTECOUNT appears twice as a case tag. In
each case, the two case blocks contain identical code, and you
should *REMOVE THE SECOND* and leave the first.
| author | ben |
|---|---|
| date | Thu, 20 Sep 2001 06:31:11 +0000 |
| parents | abe6d1db359e |
| children | 8ae895c67ce7 |
line wrap: on
line source
/* toolbar implementation -- X interface. Copyright (C) 1995 Board of Trustees, University of Illinois. Copyright (C) 1995 Sun Microsystems, Inc. Copyright (C) 1995, 1996 Ben Wing. Copyright (C) 1996 Chuck Thompson. This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ /* This file Mule-ized (more like Mule-verified) by Ben Wing, 7-8-00. */ #include <config.h> #include "lisp.h" #include "console-x.h" #include "glyphs-x.h" #include "objects-x.h" #include "EmacsFrame.h" #include "EmacsFrameP.h" #include "faces.h" #include "frame.h" #include "toolbar.h" #include "window.h" static void x_draw_blank_toolbar_button (struct frame *f, int x, int y, int width, int height, int threed, int border_width, int vertical) { struct device *d = XDEVICE (f->device); EmacsFrame ef = (EmacsFrame) FRAME_X_TEXT_WIDGET (f); int shadow_thickness = ef->emacs_frame.toolbar_shadow_thickness; int sx = x, sy = y, swidth = width, sheight = height; Display *dpy = DEVICE_X_DISPLAY (d); Window x_win = XtWindow (FRAME_X_TEXT_WIDGET (f)); GC top_shadow_gc, bottom_shadow_gc, background_gc; background_gc = FRAME_X_TOOLBAR_BLANK_BACKGROUND_GC (f); if (threed) { top_shadow_gc = FRAME_X_TOOLBAR_TOP_SHADOW_GC (f); bottom_shadow_gc = FRAME_X_TOOLBAR_BOTTOM_SHADOW_GC (f); } else { top_shadow_gc = background_gc; bottom_shadow_gc = background_gc; } if (vertical) { sx += border_width; swidth -= 2 * border_width; } else { sy += border_width; sheight -= 2 * border_width; } /* Draw the outline. */ x_output_shadows (f, sx, sy, swidth, sheight, top_shadow_gc, bottom_shadow_gc, background_gc, shadow_thickness, EDGE_ALL); /* Blank the middle. */ XFillRectangle (dpy, x_win, background_gc, sx + shadow_thickness, sy + shadow_thickness, swidth - shadow_thickness * 2, sheight - shadow_thickness * 2); /* Do the border */ XFillRectangle (dpy, x_win, background_gc, x, y, (vertical ? border_width : width), (vertical ? height : border_width)); XFillRectangle (dpy, x_win, background_gc, (vertical ? sx + swidth : x), (vertical ? y : sy + sheight), (vertical ? border_width : width), (vertical ? height : border_width)); } static void x_output_toolbar_button (struct frame *f, Lisp_Object button) { struct device *d = XDEVICE (f->device); EmacsFrame ef = (EmacsFrame) FRAME_X_TEXT_WIDGET (f); int shadow_thickness = ef->emacs_frame.toolbar_shadow_thickness; int x_adj, y_adj, width_adj, height_adj; Display *dpy = DEVICE_X_DISPLAY (d); Window x_win = XtWindow (FRAME_X_TEXT_WIDGET (f)); GC top_shadow_gc, bottom_shadow_gc, background_gc; Lisp_Object instance, frame, window, glyph; struct toolbar_button *tb = XTOOLBAR_BUTTON (button); Lisp_Image_Instance *p; struct window *w; int vertical = tb->vertical; int border_width = tb->border_width; if (vertical) { x_adj = border_width; width_adj = - 2 * border_width; y_adj = 0; height_adj = 0; } else { x_adj = 0; width_adj = 0; y_adj = border_width; height_adj = - 2 * border_width; } XSETFRAME (frame, f); window = FRAME_LAST_NONMINIBUF_WINDOW (f); w = XWINDOW (window); glyph = get_toolbar_button_glyph (w, tb); if (tb->enabled) { if (tb->down) { top_shadow_gc = FRAME_X_TOOLBAR_BOTTOM_SHADOW_GC (f); bottom_shadow_gc = FRAME_X_TOOLBAR_TOP_SHADOW_GC (f); } else { top_shadow_gc = FRAME_X_TOOLBAR_TOP_SHADOW_GC (f); bottom_shadow_gc = FRAME_X_TOOLBAR_BOTTOM_SHADOW_GC (f); } } else { top_shadow_gc = FRAME_X_TOOLBAR_BLANK_BACKGROUND_GC (f); bottom_shadow_gc = FRAME_X_TOOLBAR_BLANK_BACKGROUND_GC (f); } background_gc = FRAME_X_TOOLBAR_BLANK_BACKGROUND_GC (f); /* Draw the outline. */ x_output_shadows (f, tb->x + x_adj, tb->y + y_adj, tb->width + width_adj, tb->height + height_adj, top_shadow_gc, bottom_shadow_gc, background_gc, shadow_thickness, EDGE_ALL); /* Clear the pixmap area. */ XFillRectangle (dpy, x_win, background_gc, tb->x + x_adj + shadow_thickness, tb->y + y_adj + shadow_thickness, tb->width + width_adj - shadow_thickness * 2, tb->height + height_adj - shadow_thickness * 2); /* Do the border. */ XFillRectangle (dpy, x_win, background_gc, tb->x, tb->y, (vertical ? border_width : tb->width), (vertical ? tb->height : border_width)); XFillRectangle (dpy, x_win, background_gc, (vertical ? tb->x + tb->width - border_width : tb->x), (vertical ? tb->y : tb->y + tb->height - border_width), (vertical ? border_width : tb->width), (vertical ? tb->height : border_width)); background_gc = FRAME_X_TOOLBAR_PIXMAP_BACKGROUND_GC (f); /* #### It is currently possible for users to trash us by directly changing the toolbar glyphs. Avoid crashing in that case. */ if (GLYPHP (glyph)) instance = glyph_image_instance (glyph, window, ERROR_ME_NOT, 1); else instance = Qnil; if (IMAGE_INSTANCEP (instance)) { int width = tb->width + width_adj - shadow_thickness * 2; int height = tb->height + height_adj - shadow_thickness * 2; int x_offset = x_adj + shadow_thickness; int y_offset = y_adj + shadow_thickness; p = XIMAGE_INSTANCE (instance); if (IMAGE_INSTANCE_PIXMAP_TYPE_P (p)) { if (width > (int) IMAGE_INSTANCE_PIXMAP_WIDTH (p)) { x_offset += ((int) (width - IMAGE_INSTANCE_PIXMAP_WIDTH (p)) / 2); width = IMAGE_INSTANCE_PIXMAP_WIDTH (p); } if (height > (int) IMAGE_INSTANCE_PIXMAP_HEIGHT (p)) { y_offset += ((int) (height - IMAGE_INSTANCE_PIXMAP_HEIGHT (p)) / 2); height = IMAGE_INSTANCE_PIXMAP_HEIGHT (p); } x_output_x_pixmap (f, XIMAGE_INSTANCE (instance), tb->x + x_offset, tb->y + y_offset, 0, 0, width, height, 0, 0, background_gc); } else if (IMAGE_INSTANCE_TYPE (p) == IMAGE_TEXT) { /* #### We need to make the face used configurable. */ struct face_cachel *cachel = WINDOW_FACE_CACHEL (w, DEFAULT_INDEX); struct display_line dl; Lisp_Object string = IMAGE_INSTANCE_TEXT_STRING (p); unsigned char charsets[NUM_LEADING_BYTES]; Emchar_dynarr *buf; struct font_metric_info fm; /* This could be true if we were called via the Expose event handler. Mark the button as dirty and return immediately. */ if (f->window_face_cache_reset) { tb->dirty = 1; MARK_TOOLBAR_CHANGED; return; } buf = Dynarr_new (Emchar); convert_intbyte_string_into_emchar_dynarr (XSTRING_DATA (string), XSTRING_LENGTH (string), buf); find_charsets_in_emchar_string (charsets, Dynarr_atp (buf, 0), Dynarr_length (buf)); ensure_face_cachel_complete (cachel, window, charsets); face_cachel_charset_font_metric_info (cachel, charsets, &fm); dl.ascent = fm.ascent; dl.descent = fm.descent; dl.ypos = tb->y + y_offset + fm.ascent; if (fm.ascent + fm.descent <= height) { dl.ypos += (height - fm.ascent - fm.descent) / 2; dl.clip = 0; } else { dl.clip = fm.ascent + fm.descent - height; } x_output_string (w, &dl, buf, tb->x + x_offset, 0, 0, width, DEFAULT_INDEX, 0, 0, 0, 0); Dynarr_free (buf); } /* We silently ignore the image if it isn't a pixmap or text. */ } tb->dirty = 0; } static int x_get_button_size (struct frame *f, Lisp_Object window, struct toolbar_button *tb, int vert, int pos) { EmacsFrame ef = (EmacsFrame) FRAME_X_TEXT_WIDGET (f); int shadow_thickness = ef->emacs_frame.toolbar_shadow_thickness; int size; if (tb->blank) { if (!NILP (tb->down_glyph)) size = XINT (tb->down_glyph); else size = DEFAULT_TOOLBAR_BLANK_SIZE; } else { struct window *w = XWINDOW (window); Lisp_Object glyph = get_toolbar_button_glyph (w, tb); /* Unless, of course, the user has done something stupid like change the glyph out from under us. Use a blank placeholder in that case. */ if (NILP (glyph)) return XINT (f->toolbar_size[pos]); if (vert) size = glyph_height (glyph, window); else size = glyph_width (glyph, window); } if (!size) { /* If the glyph doesn't have a size we'll insert a blank placeholder instead. */ return XINT (f->toolbar_size[pos]); } size += shadow_thickness * 2; return (size); } #define X_OUTPUT_BUTTONS_LOOP(left) \ do { \ while (!NILP (button)) \ { \ struct toolbar_button *tb = XTOOLBAR_BUTTON (button); \ int size, height, width; \ \ if (left && tb->pushright) \ break; \ \ size = x_get_button_size (f, window, tb, vert, pos); \ \ if (vert) \ { \ width = bar_width; \ if (y + size > max_pixpos) \ height = max_pixpos - y; \ else \ height = size; \ } \ else \ { \ if (x + size > max_pixpos) \ width = max_pixpos - x; \ else \ width = size; \ height = bar_height; \ } \ \ if (tb->x != x \ || tb->y != y \ || tb->width != width \ || tb->height != height \ || tb->dirty) \ { \ if (width && height) \ { \ tb->x = x; \ tb->y = y; \ tb->width = width; \ tb->height = height; \ tb->border_width = border_width; \ tb->vertical = vert; \ \ if (tb->blank || NILP (tb->up_glyph)) \ { \ int threed = (EQ (Qt, tb->up_glyph) ? 1 : 0); \ x_draw_blank_toolbar_button (f, x, y, width, \ height, threed, \ border_width, vert); \ } \ else \ x_output_toolbar_button (f, button); \ } \ } \ \ if (vert) \ y += height; \ else \ x += width; \ \ if ((vert && y == max_pixpos) || (!vert && x == max_pixpos)) \ button = Qnil; \ else \ button = tb->next; \ } \ } while (0) #define SET_TOOLBAR_WAS_VISIBLE_FLAG(frame, pos, flag) \ do { \ switch (pos) \ { \ case TOP_TOOLBAR: \ (frame)->top_toolbar_was_visible = flag; \ break; \ case BOTTOM_TOOLBAR: \ (frame)->bottom_toolbar_was_visible = flag; \ break; \ case LEFT_TOOLBAR: \ (frame)->left_toolbar_was_visible = flag; \ break; \ case RIGHT_TOOLBAR: \ (frame)->right_toolbar_was_visible = flag; \ break; \ default: \ abort (); \ } \ } while (0) static void x_output_toolbar (struct frame *f, enum toolbar_pos pos) { struct device *d = XDEVICE (f->device); int x, y, bar_width, bar_height, vert; int max_pixpos, right_size, right_start, blank_size; int border_width = FRAME_REAL_TOOLBAR_BORDER_WIDTH (f, pos); Lisp_Object button, window; Display *dpy = DEVICE_X_DISPLAY (d); Window x_win = XtWindow (FRAME_X_TEXT_WIDGET (f)); GC background_gc = FRAME_X_TOOLBAR_BLANK_BACKGROUND_GC (f); get_toolbar_coords (f, pos, &x, &y, &bar_width, &bar_height, &vert, 1); window = FRAME_LAST_NONMINIBUF_WINDOW (f); /* Do the border */ XFillRectangle (dpy, x_win, background_gc, x, y, (vert ? bar_width : border_width), (vert ? border_width : bar_height)); XFillRectangle (dpy, x_win, background_gc, (vert ? x : x + bar_width - border_width), (vert ? y + bar_height - border_width : y), (vert ? bar_width : border_width), (vert ? border_width : bar_height)); if (vert) { max_pixpos = y + bar_height - border_width; y += border_width; } else { max_pixpos = x + bar_width - border_width; x += border_width; } button = FRAME_TOOLBAR_BUTTONS (f, pos); right_size = 0; /* First loop over all of the buttons to determine how much room we need for left hand and right hand buttons. This loop will also make sure that all instances are instantiated so when we actually output them they will come up immediately. */ while (!NILP (button)) { struct toolbar_button *tb = XTOOLBAR_BUTTON (button); int size = x_get_button_size (f, window, tb, vert, pos); if (tb->pushright) right_size += size; button = tb->next; } button = FRAME_TOOLBAR_BUTTONS (f, pos); /* Loop over the left buttons, updating and outputting them. */ X_OUTPUT_BUTTONS_LOOP (1); /* Now determine where the right buttons start. */ right_start = max_pixpos - right_size; if (right_start < (vert ? y : x)) right_start = (vert ? y : x); /* Output the blank which goes from the end of the left buttons to the start of the right. */ blank_size = right_start - (vert ? y : x); if (blank_size) { int height, width; if (vert) { width = bar_width; height = blank_size; } else { width = blank_size; height = bar_height; } /* * Use a 3D pushright separator only if there isn't a toolbar * border. A flat separator meshes with the border and looks * better. */ x_draw_blank_toolbar_button (f, x, y, width, height, !border_width, border_width, vert); if (vert) y += height; else x += width; } /* Loop over the right buttons, updating and outputting them. */ X_OUTPUT_BUTTONS_LOOP (0); if (!vert) { Lisp_Object frame; XSETFRAME (frame, f); redisplay_clear_region (frame, DEFAULT_INDEX, FRAME_PIXWIDTH (f) - 1, y, 1, bar_height); } SET_TOOLBAR_WAS_VISIBLE_FLAG (f, pos, 1); XFlush (DEVICE_X_DISPLAY (d)); } static void x_clear_toolbar (struct frame *f, enum toolbar_pos pos, int thickness_change) { Lisp_Object frame; struct device *d = XDEVICE (f->device); int x, y, width, height, vert; get_toolbar_coords (f, pos, &x, &y, &width, &height, &vert, 1); XSETFRAME (frame, f); /* The thickness_change parameter is used by the toolbar resize routines to clear any excess toolbar if the size shrinks. */ if (thickness_change < 0) { if (pos == LEFT_TOOLBAR || pos == RIGHT_TOOLBAR) { x = x + width + thickness_change; width = -thickness_change; } else { y = y + height + thickness_change; height = -thickness_change; } } SET_TOOLBAR_WAS_VISIBLE_FLAG (f, pos, 0); redisplay_clear_region (frame, DEFAULT_INDEX, x, y, width, height); XFlush (DEVICE_X_DISPLAY (d)); } static void x_output_frame_toolbars (struct frame *f) { assert (FRAME_X_P (f)); if (FRAME_REAL_TOP_TOOLBAR_VISIBLE (f)) x_output_toolbar (f, TOP_TOOLBAR); else if (f->top_toolbar_was_visible) x_clear_toolbar (f, TOP_TOOLBAR, 0); if (FRAME_REAL_BOTTOM_TOOLBAR_VISIBLE (f)) x_output_toolbar (f, BOTTOM_TOOLBAR); else if (f->bottom_toolbar_was_visible) x_clear_toolbar (f, BOTTOM_TOOLBAR, 0); if (FRAME_REAL_LEFT_TOOLBAR_VISIBLE (f)) x_output_toolbar (f, LEFT_TOOLBAR); else if (f->left_toolbar_was_visible) x_clear_toolbar (f, LEFT_TOOLBAR, 0); if (FRAME_REAL_RIGHT_TOOLBAR_VISIBLE (f)) x_output_toolbar (f, RIGHT_TOOLBAR); else if (f->right_toolbar_was_visible) x_clear_toolbar (f, RIGHT_TOOLBAR, 0); } static void x_redraw_exposed_toolbar (struct frame *f, enum toolbar_pos pos, int x, int y, int width, int height) { int bar_x, bar_y, bar_width, bar_height, vert; Lisp_Object button = FRAME_TOOLBAR_BUTTONS (f, pos); get_toolbar_coords (f, pos, &bar_x, &bar_y, &bar_width, &bar_height, &vert, 1); if (((y + height) < bar_y) || (y > (bar_y + bar_height))) return; if (((x + width) < bar_x) || (x > (bar_x + bar_width))) return; while (!NILP (button)) { struct toolbar_button *tb = XTOOLBAR_BUTTON (button); if (vert) { if (((tb->y + tb->height) > y) && (tb->y < (y + height))) tb->dirty = 1; /* If this is true we have gone past the exposed region. */ if (tb->y > (y + height)) break; } else { if (((tb->x + tb->width) > x) && (tb->x < (x + width))) tb->dirty = 1; /* If this is true we have gone past the exposed region. */ if (tb->x > (x + width)) break; } button = tb->next; } /* Even if none of the buttons is in the area, the blank region at the very least must be because the first thing we did is verify that some portion of the toolbar is in the exposed region. */ x_output_toolbar (f, pos); } static void x_redraw_exposed_toolbars (struct frame *f, int x, int y, int width, int height) { assert (FRAME_X_P (f)); if (FRAME_REAL_TOP_TOOLBAR_VISIBLE (f)) x_redraw_exposed_toolbar (f, TOP_TOOLBAR, x, y, width, height); if (FRAME_REAL_BOTTOM_TOOLBAR_VISIBLE (f)) x_redraw_exposed_toolbar (f, BOTTOM_TOOLBAR, x, y, width, height); if (FRAME_REAL_LEFT_TOOLBAR_VISIBLE (f)) x_redraw_exposed_toolbar (f, LEFT_TOOLBAR, x, y, width, height); if (FRAME_REAL_RIGHT_TOOLBAR_VISIBLE (f)) x_redraw_exposed_toolbar (f, RIGHT_TOOLBAR, x, y, width, height); } static void x_redraw_frame_toolbars (struct frame *f) { /* There are certain startup paths that lead to update_EmacsFrame in faces.c being called before a new frame is fully initialized. In particular before we have actually mapped it. That routine can call this one. So, we need to make sure that the frame is actually ready before we try and draw all over it. */ if (XtIsRealized (FRAME_X_SHELL_WIDGET (f))) x_redraw_exposed_toolbars (f, 0, 0, FRAME_PIXWIDTH (f), FRAME_PIXHEIGHT (f)); } static void x_initialize_frame_toolbar_gcs (struct frame *f) { EmacsFrame ef = (EmacsFrame) FRAME_X_TEXT_WIDGET (f); EmacsFramePart *efp = &(ef->emacs_frame); XGCValues gcv; unsigned long flags = (GCForeground | GCBackground | GCGraphicsExposures); /* * If backgroundToolBarColor is specified, use it. * Otherwise use the background resource. */ if (efp->background_toolbar_pixel == (Pixel) (-1)) efp->background_toolbar_pixel = efp->background_pixel; /* * #### * If foregroundToolBarColor is specified, use it. * Otherwise use the foreground resource. * * The foreground pixel is currently unused, but will likely be * used when toolbar captions are generated by the toolbar code * instead being incorporated into the icon image. */ if (efp->foreground_toolbar_pixel == (Pixel) (-1)) efp->foreground_toolbar_pixel = efp->foreground_pixel; gcv.foreground = efp->background_toolbar_pixel; gcv.background = ef->core.background_pixel; gcv.graphics_exposures = False; FRAME_X_TOOLBAR_BLANK_BACKGROUND_GC (f) = XtGetGC ((Widget) ef, flags, &gcv); if (efp->top_toolbar_shadow_pixel == efp->bottom_toolbar_shadow_pixel) { efp->top_toolbar_shadow_pixel = efp->background_toolbar_pixel; efp->bottom_toolbar_shadow_pixel = efp->background_toolbar_pixel; } x_generate_shadow_pixels (f, &efp->top_toolbar_shadow_pixel, &efp->bottom_toolbar_shadow_pixel, efp->background_toolbar_pixel, ef->core.background_pixel); gcv.foreground = efp->top_toolbar_shadow_pixel; gcv.background = ef->core.background_pixel; gcv.graphics_exposures = False; flags = GCForeground | GCBackground | GCGraphicsExposures; if (efp->top_toolbar_shadow_pixmap) { gcv.fill_style = FillOpaqueStippled; gcv.stipple = efp->top_toolbar_shadow_pixmap; flags |= GCStipple | GCFillStyle; } FRAME_X_TOOLBAR_TOP_SHADOW_GC (f) = XtGetGC ((Widget) ef, flags, &gcv); gcv.foreground = efp->bottom_toolbar_shadow_pixel; gcv.background = ef->core.background_pixel; gcv.graphics_exposures = False; flags = GCForeground | GCBackground | GCGraphicsExposures; if (efp->bottom_toolbar_shadow_pixmap) { gcv.fill_style = FillOpaqueStippled; gcv.stipple = efp->bottom_toolbar_shadow_pixmap; flags |= GCStipple | GCFillStyle; } FRAME_X_TOOLBAR_BOTTOM_SHADOW_GC (f) = XtGetGC ((Widget) ef, flags, &gcv); #ifdef HAVE_XPM FRAME_X_TOOLBAR_PIXMAP_BACKGROUND_GC (f) = FRAME_X_TOOLBAR_BLANK_BACKGROUND_GC (f); #else { struct device *d = XDEVICE (f->device); Display *dpy = DEVICE_X_DISPLAY (d); gcv.background = WhitePixelOfScreen (DefaultScreenOfDisplay (dpy)); gcv.foreground = BlackPixelOfScreen (DefaultScreenOfDisplay (dpy)); gcv.graphics_exposures = False; flags = GCForeground | GCBackground | GCGraphicsExposures; FRAME_X_TOOLBAR_PIXMAP_BACKGROUND_GC (f) = XtGetGC ((Widget) ef, flags, &gcv); } #endif } static void x_release_frame_toolbar_gcs (struct frame *f) { Widget ew = (Widget) FRAME_X_TEXT_WIDGET (f); XtReleaseGC (ew, FRAME_X_TOOLBAR_BLANK_BACKGROUND_GC (f)); /* If compiled with XPM support, this is a pointer to the same GC as FRAME_X_BLANK_BACKGROUND_GC so we need to make sure we don't release it twice. */ #ifndef HAVE_XPM XtReleaseGC (ew, FRAME_X_TOOLBAR_PIXMAP_BACKGROUND_GC (f)); #endif XtReleaseGC (ew, FRAME_X_TOOLBAR_TOP_SHADOW_GC (f)); XtReleaseGC (ew, FRAME_X_TOOLBAR_BOTTOM_SHADOW_GC (f)); /* Seg fault if we try and use these again. */ FRAME_X_TOOLBAR_BLANK_BACKGROUND_GC (f) = (GC) - 1; FRAME_X_TOOLBAR_PIXMAP_BACKGROUND_GC (f) = (GC) - 1; FRAME_X_TOOLBAR_TOP_SHADOW_GC (f) = (GC) - 1; FRAME_X_TOOLBAR_BOTTOM_SHADOW_GC (f) = (GC) - 1; } static void x_initialize_frame_toolbars (struct frame *f) { EmacsFrame ef = (EmacsFrame) FRAME_X_TEXT_WIDGET (f); if (ef->emacs_frame.toolbar_shadow_thickness < MINIMUM_SHADOW_THICKNESS) Xt_SET_VALUE (FRAME_X_TEXT_WIDGET (f), XtNtoolBarShadowThickness, MINIMUM_SHADOW_THICKNESS); x_initialize_frame_toolbar_gcs (f); } /* This only calls one function but we go ahead and create this in case we ever do decide that we need to do more work. */ static void x_free_frame_toolbars (struct frame *f) { x_release_frame_toolbar_gcs (f); } /************************************************************************/ /* initialization */ /************************************************************************/ void console_type_create_toolbar_x (void) { CONSOLE_HAS_METHOD (x, output_frame_toolbars); CONSOLE_HAS_METHOD (x, initialize_frame_toolbars); CONSOLE_HAS_METHOD (x, free_frame_toolbars); CONSOLE_HAS_METHOD (x, output_toolbar_button); CONSOLE_HAS_METHOD (x, redraw_exposed_toolbars); CONSOLE_HAS_METHOD (x, redraw_frame_toolbars); }