Mercurial > hg > xemacs-beta
annotate netinstall/ini.h @ 5090:0ca81354c4c7
Further frame-geometry cleanups
-------------------- ChangeLog entries follow: --------------------
man/ChangeLog addition:
2010-03-03 Ben Wing <ben@xemacs.org>
* internals/internals.texi (Intro to Window and Frame Geometry):
* internals/internals.texi (The Paned Area):
* internals/internals.texi (The Displayable Area):
Update to make note of e.g. the fact that the bottom gutter is
actually above the minibuffer.
src/ChangeLog addition:
2010-03-03 Ben Wing <ben@xemacs.org>
* emacs.c:
* emacs.c (assert_equal_failed):
* lisp.h:
* lisp.h (assert_equal):
New fun assert_equal, asserting that two values == each other, and
printing out both values upon failure.
* frame-gtk.c (gtk_initialize_frame_size):
* frame-impl.h:
* frame-impl.h (FRAME_TOP_INTERNAL_BORDER_START):
* frame-impl.h (FRAME_BOTTOM_INTERNAL_BORDER_START):
* frame-impl.h (FRAME_LEFT_INTERNAL_BORDER_START):
* frame-impl.h (FRAME_PANED_TOP_EDGE):
* frame-impl.h (FRAME_NONPANED_SIZE):
* frame-x.c (x_initialize_frame_size):
* frame.c:
* gutter.c (get_gutter_coords):
* gutter.c (calculate_gutter_size):
* gutter.h:
* gutter.h (WINDOW_REAL_TOP_GUTTER_BOUNDS):
* gutter.h (FRAME_TOP_GUTTER_BOUNDS):
* input-method-xlib.c:
* input-method-xlib.c (XIM_SetGeometry):
* redisplay-output.c (clear_left_border):
* redisplay-output.c (clear_right_border):
* redisplay-output.c (redisplay_output_pixmap):
* redisplay-output.c (redisplay_clear_region):
* redisplay-output.c (redisplay_clear_top_of_window):
* redisplay-output.c (redisplay_clear_to_window_end):
* redisplay-xlike-inc.c (XLIKE_clear_frame):
* redisplay.c:
* redisplay.c (UPDATE_CACHE_RETURN):
* redisplay.c (pixel_to_glyph_translation):
* toolbar.c (update_frame_toolbars_geometry):
* window.c (Fwindow_pixel_edges):
Get rid of some redundant macros. Consistently use the
FRAME_TOP_*_START, FRAME_RIGHT_*_END, etc. format. Rename
FRAME_*_BORDER_* to FRAME_*_INTERNAL_BORDER_*. Comment out
FRAME_BOTTOM_* for gutters and the paned area due to the
uncertainty over where the paned area actually begins. (Eventually
we should probably move the gutters outside the minibuffer so that
the paned area is contiguous.) Use FRAME_PANED_* more often in the
code to make things clearer.
Update the diagram to show that the bottom gutter is inside the
minibuffer (!) and that there are "junk boxes" when you have left
and/or right gutters (dead boxes that are mistakenly left uncleared,
unlike the corresponding scrollbar dead boxes). Update the text
appropriately to cover the bottom gutter position, etc.
Rewrite gutter-geometry code to use the FRAME_*_GUTTER_* in place of
equivalent expressions referencing other frame elements, to make the
code more portable in case we move around the gutter location.
Cleanup FRAME_*_GUTTER_BOUNDS() in gutter.h.
Add some #### GEOM! comments where I think code is incorrect --
typically, it wasn't fixed up properly when the gutter was added.
Some cosmetic changes.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Wed, 03 Mar 2010 05:07:47 -0600 |
| parents | ce0b3f2eff35 |
| children |
| rev | line source |
|---|---|
| 448 | 1 /* |
| 2 * Copyright (c) 2000, Red Hat, Inc. | |
| 3 * | |
| 4 * This program is free software; you can redistribute it and/or modify | |
| 5 * it under the terms of the GNU General Public License as published by | |
| 6 * the Free Software Foundation; either version 2 of the License, or | |
| 7 * (at your option) any later version. | |
| 8 * | |
| 9 * A copy of the GNU General Public License can be found at | |
| 10 * http://www.gnu.org/ | |
| 11 * | |
| 12 * Written by DJ Delorie <dj@cygnus.com> | |
| 13 * | |
| 14 */ | |
| 15 | |
| 16 /* When setup.ini is parsed, the information is stored according to | |
| 17 the declarations here. ini.cc (via inilex and iniparse) | |
| 18 initializes these structures. choose.cc sets the action and trust | |
| 19 fields. download.cc downloads any needed files for selected | |
| 20 packages (the chosen "install" field). install.cc installs | |
| 21 selected packages. */ | |
| 22 | |
| 23 #define YYSTYPE char * | |
| 24 | |
| 25 /* lowest number must be most trusted, highest least trusted */ | |
| 26 #define TRUST_PREV 0 | |
| 27 #define TRUST_CURR 1 | |
| 28 #define TRUST_TEST 2 | |
| 29 #define NTRUST 3 | |
| 30 #define TRUST_UNKNOWN 3 /* intentionally not in NTRUST */ | |
| 31 | |
| 32 #define TY_GENERIC 0 | |
| 33 #define TY_CYGWIN 1 | |
| 34 #define TY_NATIVE 2 | |
| 35 | |
| 36 #define ACTION_UNKNOWN 0 | |
| 37 #define ACTION_SAME 1 | |
| 38 #define ACTION_NEW 2 | |
| 39 #define ACTION_UPGRADE 3 | |
| 40 #define ACTION_UNINSTALL 4 | |
| 41 #define ACTION_ERROR 5 | |
| 42 | |
| 43 #define SRCACTION_NO 0 | |
| 44 #define SRCACTION_YES 1 | |
| 45 | |
| 46 typedef struct { | |
| 47 char *name; /* package name, like "cygwin" */ | |
| 48 char *sdesc; /* short description (replaces "name" if provided) */ | |
| 49 char *ldesc; /* long description (multi-line) */ | |
| 50 int action; /* ACTION_* - only NEW and UPGRADE get installed */ | |
| 51 int srcaction;/* SRCACTION_ */ | |
| 52 int trust; /* TRUST_* (selects among info[] below) */ | |
| 53 int type; /* TY_GENERIC, TY_CYGWIN or TY_NATIVE. */ | |
| 54 | |
| 55 struct { | |
| 56 char *version; /* version part of filename */ | |
| 57 char *install; /* file name to install */ | |
| 58 int install_size; /* in bytes */ | |
| 59 char *source; /* sources for installed binaries */ | |
| 60 int source_size; /* in bytes */ | |
| 61 } info[NTRUST+1]; /* +1 for TRUST_UNKNOWN */ | |
| 62 } Package; | |
| 63 | |
| 454 | 64 #ifdef __cplusplus |
| 65 extern "C" { | |
| 66 #endif | |
| 67 | |
| 448 | 68 extern Package *package; |
| 69 extern Package *xemacs_package; | |
| 70 | |
| 71 extern int npackages; | |
| 72 | |
| 73 Package *new_package (char *name); | |
| 74 void ini_init (char *string); | |
| 75 | |
| 657 | 76 #define pinfo(p) ((p).info[(p).trust]) |
| 77 #define pi pinfo(package[i]) | |
| 448 | 78 |
| 79 #define LOOP_PACKAGES \ | |
| 80 for (i=0; i<npackages; i++) \ | |
| 81 if ((package[i].action == ACTION_NEW \ | |
| 82 || package[i].action == ACTION_UPGRADE) \ | |
| 83 && pi.install) | |
| 84 | |
| 85 #ifdef __cplusplus | |
| 86 } | |
| 87 #endif |