Mercurial > hg > xemacs-beta
annotate src/syspwd.h @ 4908:b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* compiler.h:
Create a USED() macro to force unused-var warnings to go away,
in certain cases where it's inconvenient to do otherwise (e.g.
when THIS_IS_GTK in redisplay-xlike-inc.c).
* console-x.h:
Remove unneeded decls, make some static.
* redisplay-xlike-inc.c:
* console-xlike-inc.h: New file. Include defns from
redisplay-xlike-inc.c that may be useful in other XLIKE files.
Correct the handling of colors and font-style setting functions
in the xlike defns. Lots of fixes in the GTK-specific defns.
* depend: Regenerate.
* event-xlike-inc.c:
* event-xlike-inc.c (USE_UNICODE_MAP):
* event-xlike-inc.c (endif):
* gccache-gtk.c:
* gtk-glue.c (xemacs_list_to_gtklist):
* gtk-glue.c (xemacs_gtklist_to_list):
* gtk-glue.c (FROB):
* gtk-glue.c (face_to_gc):
* gtk-glue.c (face_to_style):
* gtk-glue.c (gdk_event_to_emacs_event):
* gtk-xemacs.h (struct _GtkXEmacs):
* gtk-xemacs.h (struct _GtkXEmacsClass):
* objects-xlike-inc.c:
Cosmetic, comment fixes.
* glyphs.c (pixmap_to_lisp_data):
Unused var fixes.
* gtk-glue.c:
* gccache-gtk.c:
* gtk-xemacs.c:
* gtk-xemacs.h:
* objects-xlike-inc.c:
* ui-gtk.c:
* ui-gtk.h:
* xgccache.c:
* xgccache.c (GC_CACHE_SIZE):
* xgccache.h:
Misc include-file fixes.
* objects-xlike-inc.c (XFUN):
* objects-xlike-inc.c (xlistfonts_checking_charset):
Combine some ifdeffed stuff using defs in console-xlike-inc.h.
* redisplay-gtk.c:
* redisplay-gtk.c (THIS_IS_GTK):
* redisplay-gtk.c (XLIKE_bevel_area):
* redisplay-gtk.c (XLIKE_ring_bell):
* redisplay-gtk.c (gdk_draw_text_image):
Fix numerous compile problems. Delete gtk_output_shadows(),
which mostly duplicates generic bevel_modeline(). Fix up
gtk_bevel_modeline() into XLIKE_bevel_area() and make use of
the style var properly to set the appropriate GTK constant.
* redisplay-x.c:
* redisplay-x.c (XLIKE_window_output_begin):
* redisplay-x.c (XLIKE_window_output_end):
* redisplay-x.c (XLIKE_bevel_area):
* redisplay-x.c (x_output_shadows):
* redisplay-x.c (XLIKE_ring_bell):
Make x_output_shadows be static. Change the defn of various
functions to look like XLIKE_foo() so it matches the calling
convention elsewhere.
* redisplay-xlike-inc.c:
* redisplay-xlike-inc.c (NEED_GCCACHE_H):
* redisplay-xlike-inc.c (XLIKE_text_width):
* redisplay-xlike-inc.c (XLIKE_get_gc):
* redisplay-xlike-inc.c (XLIKE_text_width_single_run):
* redisplay-xlike-inc.c (XFT_FROB_LISP_COLOR):
* redisplay-xlike-inc.c (XLIKE_output_xlike_pixmap):
* redisplay-xlike-inc.c (XLIKE_output_pixmap):
* redisplay-xlike-inc.c (XLIKE_output_vertical_divider):
* redisplay-xlike-inc.c (XLIKE_flash):
Lots of header fixes. Lots of stuff moved to console-xlike-inc.h.
Use XFUN() to generate function names instead of directly
calling XLIKE_PASTE(). Remove unnecessary prototypes.
Unify calls to text_width funs. Make XLIKE_get_gc non-static
since it's called from gtk. Change the color-function calls
and fill-style-setting calls to match the changes in
console-xlike-inc.h. Use USED() to avoid some warnings.
* symsinit.h:
Sort the prototypes, and add a fun `sort-symsinit' in a comment
that does the sorting (using sort-regexp-fields).
* symsinit.h (init_number):
* sysgtk.h: New file, wraps the various GTK headers.
* sysgdkx.h: New file, wraps <gtk/gdkx.h>. Keep this separate to
* event-gtk.h: Delete. Combine stuff into console-gtk.h.
help isolate X-specific code from GTK.
* device-gtk.c:
* event-gtk.c:
* console-gtk.h:
* frame-gtk.c:
* gccache-gtk.c:
* gccache-gtk.h:
* glyphs-gtk.c (gtk_colorize_image_instance):
* glyphs-gtk.h:
* gtk-xemacs.h:
* objects-gtk.c:
* objects-gtk.c (MAX_FONT_COUNT):
* ui-gtk.h:
Use sysgtk.h or sysgdkx.h instead of directly including GTK
headers. Don't include event-gtk.h.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Mon, 01 Feb 2010 02:15:28 -0600 |
| parents | 804517e16990 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 /* |
| 2 | |
| 3 This file is part of XEmacs. | |
| 4 | |
| 5 XEmacs is free software; you can redistribute it and/or modify it | |
| 6 under the terms of the GNU General Public License as published by the | |
| 7 Free Software Foundation; either version 2, or (at your option) any | |
| 8 later version. | |
| 9 | |
| 10 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 11 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 12 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 13 for more details. | |
| 14 | |
| 15 You should have received a copy of the GNU General Public License | |
| 16 along with XEmacs; see the file COPYING. If not, write to | |
| 17 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 18 Boston, MA 02111-1307, USA. */ | |
| 19 | |
| 20 /* Synched up with: Not really in FSF. */ | |
| 21 | |
| 442 | 22 #ifndef WIN32_NATIVE |
| 23 | |
| 24 # include <pwd.h> | |
| 25 | |
| 26 #else /* WIN32_NATIVE */ | |
| 428 | 27 |
| 771 | 28 struct passwd |
| 29 { | |
| 30 char *pw_name; | |
| 31 char *pw_passwd; | |
| 32 int pw_uid; | |
| 33 int pw_gid; | |
| 34 int pw_quota; | |
| 35 char *pw_gecos; | |
| 36 char *pw_dir; | |
| 37 char *pw_shell; | |
| 442 | 38 }; |
| 39 | |
| 771 | 40 #ifdef emacs |
| 41 | |
| 42 struct passwd *getpwuid (uid_t uid); | |
| 867 | 43 struct passwd *getpwnam (const Ibyte *name); |
| 771 | 44 uid_t getuid (void); |
| 45 uid_t geteuid (void); | |
| 46 gid_t getgid (void); | |
| 47 gid_t getegid (void); | |
| 48 | |
| 49 #endif /* emacs */ | |
| 50 | |
| 442 | 51 #endif /* WIN32_NATIVE */ |
| 771 | 52 |
| 53 #ifdef emacs | |
| 54 | |
| 867 | 55 struct passwd *qxe_getpwnam (const Ibyte *name); |
| 771 | 56 struct passwd *qxe_getpwuid (uid_t uid); |
| 57 struct passwd *qxe_getpwent (void); | |
| 58 | |
| 59 #endif /* emacs */ | |
| 60 |