Mercurial > hg > xemacs-beta
annotate src/make-src-depend @ 5077:d372b17f63ce
clean up toolbar/gutter edge geometry
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-25 Ben Wing <ben@xemacs.org>
* EmacsFrame.c (EmacsFrameSetValues):
* frame-impl.h:
* frame-impl.h (struct frame):
* frame-impl.h (FRAME_THEORETICAL_TOP_TOOLBAR_HEIGHT):
* frame-impl.h (FRAME_THEORETICAL_TOP_TOOLBAR_BORDER_WIDTH):
* frame-impl.h (FRAME_REAL_TOP_TOOLBAR_HEIGHT):
* frame-impl.h (FRAME_REAL_TOP_TOOLBAR_BORDER_WIDTH):
* frame-impl.h (FRAME_REAL_TOP_TOOLBAR_VISIBLE):
* frame-impl.h (FRAME_REAL_TOP_TOOLBAR_BOUNDS):
* frame.h:
* frame.h (enum edge_pos):
* gutter.c:
* gutter.c (get_gutter_coords):
* gutter.c (display_boxes_in_gutter_p):
* gutter.c (construct_window_gutter_spec):
* gutter.c (calculate_gutter_size_from_display_lines):
* gutter.c (calculate_gutter_size):
* gutter.c (output_gutter):
* gutter.c (clear_gutter):
* gutter.c (mark_gutters):
* gutter.c (gutter_extent_signal_changed_region_maybe):
* gutter.c (update_gutter_geometry):
* gutter.c (update_frame_gutter_geometry):
* gutter.c (update_frame_gutters):
* gutter.c (reset_gutter_display_lines):
* gutter.c (redraw_exposed_gutter):
* gutter.c (redraw_exposed_gutters):
* gutter.c (free_frame_gutters):
* gutter.c (decode_gutter_position):
* gutter.c (Fset_default_gutter_position):
* gutter.c (Fgutter_pixel_width):
* gutter.c (Fgutter_pixel_height):
* gutter.c (recompute_overlaying_specifier):
* gutter.c (gutter_specs_changed_1):
* gutter.c (gutter_specs_changed):
* gutter.c (top_gutter_specs_changed):
* gutter.c (bottom_gutter_specs_changed):
* gutter.c (left_gutter_specs_changed):
* gutter.c (right_gutter_specs_changed):
* gutter.c (gutter_geometry_changed_in_window):
* gutter.c (init_frame_gutters):
* gutter.c (specifier_vars_of_gutter):
* gutter.h:
* gutter.h (WINDOW_REAL_TOP_GUTTER_BOUNDS):
* gutter.h (FRAME_TOP_GUTTER_BOUNDS):
* lisp.h (enum edge_style):
* native-gtk-toolbar.c:
* native-gtk-toolbar.c (gtk_output_toolbar):
* native-gtk-toolbar.c (gtk_clear_toolbar):
* native-gtk-toolbar.c (gtk_output_frame_toolbars):
* native-gtk-toolbar.c (gtk_initialize_frame_toolbars):
* toolbar-msw.c:
* toolbar-msw.c (TOOLBAR_HANDLE):
* toolbar-msw.c (allocate_toolbar_item_id):
* toolbar-msw.c (mswindows_clear_toolbar):
* toolbar-msw.c (mswindows_output_toolbar):
* toolbar-msw.c (mswindows_move_toolbar):
* toolbar-msw.c (mswindows_redraw_exposed_toolbars):
* toolbar-msw.c (mswindows_initialize_frame_toolbars):
* toolbar-msw.c (mswindows_output_frame_toolbars):
* toolbar-msw.c (mswindows_clear_frame_toolbars):
* toolbar-msw.c (DELETE_TOOLBAR):
* toolbar-msw.c (mswindows_free_frame_toolbars):
* toolbar-msw.c (mswindows_get_toolbar_button_text):
* toolbar-xlike.c:
* toolbar-xlike.c (__prepare_button_area):
* toolbar-xlike.c (XLIKE_OUTPUT_BUTTONS_LOOP):
* toolbar-xlike.c (xlike_output_toolbar):
* toolbar-xlike.c (xlike_clear_toolbar):
* toolbar-xlike.c (xlike_output_frame_toolbars):
* toolbar-xlike.c (xlike_clear_frame_toolbars):
* toolbar-xlike.c (xlike_redraw_exposed_toolbar):
* toolbar-xlike.c (xlike_redraw_exposed_toolbars):
* toolbar-xlike.c (xlike_redraw_frame_toolbars):
* toolbar.c:
* toolbar.c (decode_toolbar_position):
* toolbar.c (Fset_default_toolbar_position):
* toolbar.c (mark_frame_toolbar_buttons_dirty):
* toolbar.c (compute_frame_toolbar_buttons):
* toolbar.c (set_frame_toolbar):
* toolbar.c (compute_frame_toolbars_data):
* toolbar.c (update_frame_toolbars_geometry):
* toolbar.c (init_frame_toolbars):
* toolbar.c (get_toolbar_coords):
* toolbar.c (CHECK_TOOLBAR):
* toolbar.c (toolbar_buttons_at_pixpos):
* toolbar.c (CTB_ERROR):
* toolbar.c (recompute_overlaying_specifier):
* toolbar.c (specifier_vars_of_toolbar):
* toolbar.h:
* toolbar.h (SET_TOOLBAR_WAS_VISIBLE_FLAG):
Create new enum edge_pos with TOP_EDGE, BOTTOM_EDGE, LEFT_EDGE,
RIGHT_EDGE; subsume TOP_BORDER, TOP_GUTTER, enum toolbar_pos,
enum gutter_pos, etc.
Create EDGE_POS_LOOP, subsuming GUTTER_POS_LOOP.
Create NUM_EDGES, use in many places instead of hardcoded '4'.
Instead of top_toolbar_was_visible, bottom_toolbar_was_visible,
etc. make an array toolbar_was_visible[NUM_EDGES]. This increases
the frame size by 15 bytes or so (could be 3 if we use Boolbytes)
but hardly seems w to matter -- frames are heavy weight objects
anyway. Same with top_gutter_was_visible, etc.
Remove duplicated SET_TOOLBAR_WAS_VISIBLE_FLAG and put defn in
one place (toolbar.h).
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Thu, 25 Feb 2010 04:45:13 -0600 |
| parents | 6f2158fa75ed |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 : #-*- Perl -*- |
| 1303 | 2 |
| 3 ### make-src-depend --- update the Makefile dependency information for XEmacs | |
| 4 | |
| 428 | 5 # Copyright (C) 1998 Free Software Foundation, Inc. |
|
5050
6f2158fa75ed
Fix quick-build, use asserts() in place of ABORT()
Ben Wing <ben@xemacs.org>
parents:
4984
diff
changeset
|
6 # Copyright (C) 2010 Ben Wing. |
| 428 | 7 |
| 1303 | 8 ## Author: Martin Buchholz <martin@xemacs.org> |
| 9 ## Maintainer: XEmacs Development Team | |
| 10 | |
| 11 ## This file is part of XEmacs. | |
| 12 | |
| 13 ## XEmacs is free software; you can redistribute it and/or modify it | |
| 14 ## under the terms of the GNU General Public License as published by | |
| 15 ## the Free Software Foundation; either version 2, or (at your option) | |
| 16 ## any later version. | |
| 428 | 17 |
| 1303 | 18 ## XEmacs is distributed in the hope that it will be useful, but |
| 19 ## WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 20 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 21 ## General Public License for more details. | |
| 22 | |
| 23 ## You should have received a copy of the GNU General Public License | |
| 24 ## along with XEmacs; see the file COPYING. If not, write to the Free | |
| 25 ## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | |
| 26 ## 02111-1307, USA. | |
| 27 | |
| 428 | 28 eval 'exec perl -w -S $0 ${1+"$@"}' |
| 29 if 0; | |
| 30 | |
| 31 use strict; | |
| 32 my ($myName, $srcdir, %exists, %uses, %generated_header); | |
| 33 | |
| 34 ($myName = $0) =~ s@.*/@@; my $usage =" | |
| 35 Usage: $myName | |
| 36 | |
| 37 Generates Makefile dependencies for the XEmacs src directory. | |
| 1303 | 38 The dependencies are written to stdout. |
| 39 "; | |
| 428 | 40 |
| 41 die $usage if @ARGV; | |
| 42 | |
| 43 ($srcdir = $0) =~ s@[^/]+$@@; | |
| 44 $srcdir = "." if $srcdir eq ""; | |
| 45 chdir $srcdir or die "$srcdir: $!"; | |
| 46 | |
| 47 opendir SRCDIR, "." or die "$srcdir: $!"; | |
| 48 for (grep (/\.[ch]$/, readdir (SRCDIR))) { $exists{$_} = 1; } | |
| 49 closedir SRCDIR; | |
| 50 | |
| 51 for (qw (config.h sheap-adjust.h paths.h Emacs.ad.h)) { | |
| 52 $generated_header{$_} = 1; | |
| 53 } | |
| 54 | |
| 442 | 55 # Although this is not technically true, it ought to be true, |
| 56 # and makes the generated Makefile smaller. | |
| 57 $uses{'lisp.h'}{'config.h'} = 1; | |
| 58 | |
| 428 | 59 for my $file (keys %exists) { |
| 60 open (FILE, $file) or die "$file: $!"; | |
| 61 undef $/; $_ = <FILE>; | |
| 62 RemoveComments ($_); | |
| 63 s/[ \t]+//g; | |
| 64 # Find include dependencies | |
| 65 for (/^\#include([^\n]+)/gm) { | |
| 462 | 66 if (m@^\"([A-Za-z0-9._-]+\.[ch])\"@) { |
| 428 | 67 $uses{$file}{$1} = 1 if exists $exists{$1}; |
| 442 | 68 } elsif (m@<([A-Za-z0-9._-]+\.h)>@) { |
| 428 | 69 $uses{$file}{$1} = 1 if exists $generated_header{$1}; |
| 442 | 70 } elsif (m@\"../lwlib/([A-Za-z0-9._-]+\.h)\"@) { |
| 428 | 71 $uses{$file}{"\$(LWLIB_SRCDIR)/lwlib.h"} = 1; |
| 72 } | |
| 73 } | |
| 74 } | |
| 75 | |
| 76 # Make transitive closure of %uses | |
| 77 while (1) { | |
| 78 my $changedP = 0; | |
| 79 for my $x (keys %uses) { | |
| 80 for my $y (keys %{$uses{$x}}) { | |
| 81 for my $z (keys %{$uses{$y}}) { | |
| 82 if (! exists $uses{$x}{$z}) { | |
| 83 $uses{$x}{$z} = 1; | |
| 84 $changedP = 1; | |
| 85 } | |
| 86 } | |
| 87 } | |
| 88 } | |
| 89 last if !$changedP; | |
| 90 } | |
| 91 | |
| 92 # Print file header | |
| 93 print | |
| 442 | 94 "## This file is automatically generated by \`$myName'. Do not modify. |
| 428 | 95 |
| 442 | 96 #if defined(USE_UNION_TYPE) |
| 428 | 97 LISP_UNION_H=lisp-union.h |
| 98 #else | |
| 99 LISP_UNION_H=lisp-disunion.h | |
| 100 #endif | |
| 101 "; | |
| 102 | |
| 452 | 103 my @LISP_H = ('lisp.h', sort keys %{$uses{'lisp.h'}}); |
| 1303 | 104 print " |
| 105 #if defined(QUICK_BUILD) | |
| 106 CONFIG_H= | |
| 107 LISP_H= | |
| 108 #else | |
| 109 CONFIG_H=config.h | |
| 110 LISP_H=@{[grep (!/lisp-(dis)?union\.h/, @LISP_H)]} \$(LISP_UNION_H) | |
| 111 #endif | |
| 112 | |
| 113 "; | |
| 428 | 114 |
| 115 sub PrintDeps { | |
| 116 my $file = shift; | |
| 117 my $ofile = $file; $ofile =~ s/c$/o/; print "$ofile: "; | |
| 1303 | 118 if (exists $uses{$file}{'config.h'}) { |
| 119 delete $uses{$file}{'config.h'}; | |
| 120 $uses{$file}{'$(CONFIG_H)'} = 1; | |
| 121 } | |
|
5050
6f2158fa75ed
Fix quick-build, use asserts() in place of ABORT()
Ben Wing <ben@xemacs.org>
parents:
4984
diff
changeset
|
122 if (exists $uses{$file}{'lisp.h'}) { |
|
6f2158fa75ed
Fix quick-build, use asserts() in place of ABORT()
Ben Wing <ben@xemacs.org>
parents:
4984
diff
changeset
|
123 for my $x (@LISP_H) { |
|
6f2158fa75ed
Fix quick-build, use asserts() in place of ABORT()
Ben Wing <ben@xemacs.org>
parents:
4984
diff
changeset
|
124 delete $uses{$file}{$x}; |
|
6f2158fa75ed
Fix quick-build, use asserts() in place of ABORT()
Ben Wing <ben@xemacs.org>
parents:
4984
diff
changeset
|
125 } |
|
6f2158fa75ed
Fix quick-build, use asserts() in place of ABORT()
Ben Wing <ben@xemacs.org>
parents:
4984
diff
changeset
|
126 $uses{$file}{'$(LISP_H)'} = 1; |
|
6f2158fa75ed
Fix quick-build, use asserts() in place of ABORT()
Ben Wing <ben@xemacs.org>
parents:
4984
diff
changeset
|
127 } |
| 1333 | 128 # Huge hack. With QUICK_BUILD, general.c has no dependence on |
| 129 # general-slots.h but really should. | |
| 130 $uses{$file}{'general-slots.h'} = 1 if $file eq "general.c"; | |
| 428 | 131 print "@{[sort keys %{$uses{$file}}]}\n"; |
| 132 } | |
| 133 | |
| 134 sub PrintPatternDeps { | |
| 135 my ($pattern, $CPP_SYMBOL) = @_; | |
| 442 | 136 print "#if defined($CPP_SYMBOL)\n"; |
| 428 | 137 for my $file (sort grep (/$pattern/ && /\.c$/, keys %uses)) { |
| 138 PrintDeps($file); | |
| 139 delete $uses{$file}; | |
| 140 } | |
| 141 print "#endif\n"; | |
| 142 } | |
| 143 | |
| 442 | 144 PrintPatternDeps ('-msw\\.', "HAVE_MS_WINDOWS"); |
| 1303 | 145 PrintPatternDeps ('-xlike', "HAVE_XLIKE"); |
| 4984 | 146 # X-specific files: *-x.c *-x-impl.h balloon_help.c x*.h Emacs*.[ch] |
| 147 PrintPatternDeps ('-x\\.|balloon_help|^Emacs', "HAVE_X_WINDOWS"); | |
| 442 | 148 PrintPatternDeps ('-tty\\.', "HAVE_TTY"); |
| 1303 | 149 # GTK-specific files: *-gtk.[ch] *-gtk-*.[ch] gtk-*.[ch] emacs-marshals.c emacs-widget-accessors.c glade.c ui-byhand.c |
| 150 PrintPatternDeps ('gtk|emacs-marshals|emacs-widget-accessors|glade|ui-byhand', "HAVE_GTK"); | |
| 442 | 151 PrintPatternDeps ('^database', "HAVE_DATABASE"); |
| 152 PrintPatternDeps ('^mule', "MULE"); | |
| 428 | 153 PrintPatternDeps ('^(?:External|extw-)', "EXTERNAL_WIDGET"); |
| 154 | |
| 155 for my $file (sort grep (/\.c$/, keys %uses)) { PrintDeps($file); } | |
| 156 | |
| 442 | 157 # Surprisingly robust regexp to remove comments from arbitrary C code |
| 428 | 158 sub RemoveComments { |
| 159 $_[0] =~ | |
| 160 s{ ( | |
| 161 [^\"\'/]+ | | |
| 162 (?:\"[^\"\\]*(?:\\.[^\"\\]*)*\" [^\"\'/]*)+ | | |
| 163 (?:\'[^\'\\]*(?:\\.[^\'\\]*)*\' [^\"\'/]*)+ | |
| 164 ) | |
| 165 | / (?: | |
| 166 \*[^*]*\*+(?:[^/*][^*]*\*+)*/ | |
| 167 | | |
| 168 /[^\n]* | |
| 169 ) | |
| 170 }{defined $1 ? $1 : ""}gsxeo; | |
| 171 } |