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.

This directory contains C header files containing
operating-system-specific definitions.  Each file describes a
particular operating system.  The emacs configuration script edits
../config.h to include the appropriate one of these files, and then
each emacs source file includes config.h.

template.h is a generic template for system descriptions; it describes
the parameters a system file can specify.

General XEmacs Changes
---------------------------
The following is a list of those changes made globally across all
files.  They are not marked individually in each header file.  All
other changes should be preceded by a comment /* XEmacs change */.


1. Removed all #defines of [read|write|open|close].  This is now
   handled automatically by checking the INTERRUPTIBLE_IO etc. flags.

2. Removed all instances of #undef SIGIO and replaced them with
   #define BROKEN_SIGIO.  Jamie says:

   /* use BROKEN_SIGIO instead of this kludge -- jwz */

3. All instances of HAVE_GETWD, HAVE_DUP2, HAVE_UNISTD_H, NEED_UNISTD_H,
   HAVE_GETTIMEOFDAY and NEED_REALPATH removed.  We detect these
   automatically with configure.

4. All instances of HAVE_X11 replaced with HAVE_X_WINDOWS.  We don't
   support X10 or earlier so the HAVE_X11 define was purged.

5. Most of the signal crap (e.g. redefining sigsetmask, defining
   POSIX_SIGNALS) has been removed.  There are four possible
   signal paradigms that all systems fall into, and we auto-detect
   them in configure and handle them in syssignal.h.

6. Removed references to INTERRUPT_INPUT.  XEmacs does not use
   this bizarre way of reading input.

7. Removed references to BROKEN_FIONREAD.  FIONREAD is used only
   in INTERRUPT_INPUT and in the select() emulator, neither of
   which are supported in XEmacs.

8. Removed references to NOMULTIPLEJOBS.  This is unused in XEmacs
   and in FSF Emacs.

9. Removed references to HAVE_WAIT_HEADER and WAIT_USE_INT.
   They are unnecessary with the cleaned up syswait.h in XEmacs.
   (We autodetect sys/wait.h).  Instead, #define or #undef
   HAVE_UNION_WAIT.

10. Removed BSTRING.  Not used anywhere. (If the header file
    says there are bugs in bcopy() or the like, however, a
    #define BROKEN_BCOPY is added for reference.)

11. Removed #defines of bcopy, bzero, bcmp, index, rindex.
    XEmacs makes consistent use of the ANSI-equivalent
    functions memcpy, memset, memcmp, strchr, strrchr.

12. '#define subprocesses' removed.  Use '#define NO_SUBPROCESSES'
    if they don't exist.

13. References to HAVE_VFORK removed.  configure detects this.

14. Removed references to SYSV_SYSTEM_DIR, NONSYSTEM_DIR_LIBRARY,
    HAVE_SOCKETS, HAVE_SYSVIPC.  configure detects these.

15. Removed defines of HAVE_TERMIOS, HAVE_TERMIO, and
    HAVE_TCATTR (when HAVE_TERMIOS was also defined).
    configure detects these and systty.h automatically defines
    HAVE_TCATTR when HAVE_TERMIOS is defined.

16. Removed SETPGRP_RELEASES_CTTY.  Not necessary any more, with
    fixed definitions of EMACS_SEPARATE_PROCESS_GROUP et al.

17. Removed defines of NLIST_STRUCT.  configure detects this.

18. Removed defines of _setjmp and _longjmp.  configure detects this.

19. Removed all '#define static' business.  Defines NO_REMAP instead.

20. Removed defines of HAVE_MACH_MACH_H.  configure detects this.