xemacs-beta: src/gtk-xemacs.h annotate

annotate src/gtk-xemacs.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	db7068430402
children	ba07c880114a

rev	line source
462 0784d089fdc9 Import from CVS: tag r21-2-46 cvs parents: diff changeset	1 /* gtk-xemacs.h
0784d089fdc9 Import from CVS: tag r21-2-46 cvs parents: diff changeset	2 **
0784d089fdc9 Import from CVS: tag r21-2-46 cvs parents: diff changeset	3 ** Description: A widget to encapsulate a XEmacs 'text widget'
0784d089fdc9 Import from CVS: tag r21-2-46 cvs parents: diff changeset	4 **
0784d089fdc9 Import from CVS: tag r21-2-46 cvs parents: diff changeset	5 ** Created by: William M. Perry
0784d089fdc9 Import from CVS: tag r21-2-46 cvs parents: diff changeset	6 ** Copyright (c) 2000 William M. Perry <wmperry@gnu.org>
0784d089fdc9 Import from CVS: tag r21-2-46 cvs parents: diff changeset	7 **
4709 db7068430402 Add explicit GPL v2 or later notices to Bill Perry's code, where such notices Jerry James <james@xemacs.org> parents: 1743 diff changeset	8 ** This file is part of XEmacs.
db7068430402 Add explicit GPL v2 or later notices to Bill Perry's code, where such notices Jerry James <james@xemacs.org> parents: 1743 diff changeset	9 **
db7068430402 Add explicit GPL v2 or later notices to Bill Perry's code, where such notices Jerry James <james@xemacs.org> parents: 1743 diff changeset	10 ** XEmacs is free software; you can redistribute it and/or modify it
db7068430402 Add explicit GPL v2 or later notices to Bill Perry's code, where such notices Jerry James <james@xemacs.org> parents: 1743 diff changeset	11 ** under the terms of the GNU General Public License as published by the
db7068430402 Add explicit GPL v2 or later notices to Bill Perry's code, where such notices Jerry James <james@xemacs.org> parents: 1743 diff changeset	12 ** Free Software Foundation; either version 2, or (at your option) any
db7068430402 Add explicit GPL v2 or later notices to Bill Perry's code, where such notices Jerry James <james@xemacs.org> parents: 1743 diff changeset	13 ** later version.
db7068430402 Add explicit GPL v2 or later notices to Bill Perry's code, where such notices Jerry James <james@xemacs.org> parents: 1743 diff changeset	14 **
db7068430402 Add explicit GPL v2 or later notices to Bill Perry's code, where such notices Jerry James <james@xemacs.org> parents: 1743 diff changeset	15 ** XEmacs is distributed in the hope that it will be useful, but WITHOUT
db7068430402 Add explicit GPL v2 or later notices to Bill Perry's code, where such notices Jerry James <james@xemacs.org> parents: 1743 diff changeset	16 ** ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
db7068430402 Add explicit GPL v2 or later notices to Bill Perry's code, where such notices Jerry James <james@xemacs.org> parents: 1743 diff changeset	17 ** FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
db7068430402 Add explicit GPL v2 or later notices to Bill Perry's code, where such notices Jerry James <james@xemacs.org> parents: 1743 diff changeset	18 ** for more details.
db7068430402 Add explicit GPL v2 or later notices to Bill Perry's code, where such notices Jerry James <james@xemacs.org> parents: 1743 diff changeset	19 **
db7068430402 Add explicit GPL v2 or later notices to Bill Perry's code, where such notices Jerry James <james@xemacs.org> parents: 1743 diff changeset	20 ** You should have received a copy of the GNU General Public License
db7068430402 Add explicit GPL v2 or later notices to Bill Perry's code, where such notices Jerry James <james@xemacs.org> parents: 1743 diff changeset	21 ** along with XEmacs; see the file COPYING. If not, write to
db7068430402 Add explicit GPL v2 or later notices to Bill Perry's code, where such notices Jerry James <james@xemacs.org> parents: 1743 diff changeset	22 ** the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
db7068430402 Add explicit GPL v2 or later notices to Bill Perry's code, where such notices Jerry James <james@xemacs.org> parents: 1743 diff changeset	23 ** Boston, MA 02111-1301, USA. */
462 0784d089fdc9 Import from CVS: tag r21-2-46 cvs parents: diff changeset	24
0784d089fdc9 Import from CVS: tag r21-2-46 cvs parents: diff changeset	25 #ifndef __GTK_XEMACS_H__
0784d089fdc9 Import from CVS: tag r21-2-46 cvs parents: diff changeset	26 #define __GTK_XEMACS_H__
0784d089fdc9 Import from CVS: tag r21-2-46 cvs parents: diff changeset	27
1743 543769b89fed [xemacs-hg @ 2003-10-14 05:02:57 by james] james parents: 462 diff changeset	28 BEGIN_C_DECLS
462 0784d089fdc9 Import from CVS: tag r21-2-46 cvs parents: diff changeset	29
0784d089fdc9 Import from CVS: tag r21-2-46 cvs parents: diff changeset	30 #define GTK_XEMACS(obj) GTK_CHECK_CAST (obj, gtk_xemacs_get_type (), GtkXEmacs)
0784d089fdc9 Import from CVS: tag r21-2-46 cvs parents: diff changeset	31 #define GTK_XEMACS_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_xemacs_get_type (), GtkXEmacsClass)
0784d089fdc9 Import from CVS: tag r21-2-46 cvs parents: diff changeset	32 #define GTK_IS_XEMACS(obj) GTK_CHECK_TYPE (obj, gtk_xemacs_get_type ())
0784d089fdc9 Import from CVS: tag r21-2-46 cvs parents: diff changeset	33 #define GTK_XEMACS_FRAME(obj) GTK_XEMACS (obj)->f
0784d089fdc9 Import from CVS: tag r21-2-46 cvs parents: diff changeset	34
4908 b3ce27ca7647 various fixes related to gtk, redisplay-xlike-inc.c Ben Wing <ben@xemacs.org> parents: 4709 diff changeset	35 typedef struct _GtkXEmacs GtkXEmacs;
b3ce27ca7647 various fixes related to gtk, redisplay-xlike-inc.c Ben Wing <ben@xemacs.org> parents: 4709 diff changeset	36 typedef struct _GtkXEmacsClass GtkXEmacsClass;
462 0784d089fdc9 Import from CVS: tag r21-2-46 cvs parents: diff changeset	37
4908 b3ce27ca7647 various fixes related to gtk, redisplay-xlike-inc.c Ben Wing <ben@xemacs.org> parents: 4709 diff changeset	38 struct _GtkXEmacs
b3ce27ca7647 various fixes related to gtk, redisplay-xlike-inc.c Ben Wing <ben@xemacs.org> parents: 4709 diff changeset	39 {
b3ce27ca7647 various fixes related to gtk, redisplay-xlike-inc.c Ben Wing <ben@xemacs.org> parents: 4709 diff changeset	40 GtkFixed fixed;
b3ce27ca7647 various fixes related to gtk, redisplay-xlike-inc.c Ben Wing <ben@xemacs.org> parents: 4709 diff changeset	41 struct frame *f;
b3ce27ca7647 various fixes related to gtk, redisplay-xlike-inc.c Ben Wing <ben@xemacs.org> parents: 4709 diff changeset	42 };
462 0784d089fdc9 Import from CVS: tag r21-2-46 cvs parents: diff changeset	43
4908 b3ce27ca7647 various fixes related to gtk, redisplay-xlike-inc.c Ben Wing <ben@xemacs.org> parents: 4709 diff changeset	44 struct _GtkXEmacsClass
b3ce27ca7647 various fixes related to gtk, redisplay-xlike-inc.c Ben Wing <ben@xemacs.org> parents: 4709 diff changeset	45 {
b3ce27ca7647 various fixes related to gtk, redisplay-xlike-inc.c Ben Wing <ben@xemacs.org> parents: 4709 diff changeset	46 GtkFixedClass parent_class;
b3ce27ca7647 various fixes related to gtk, redisplay-xlike-inc.c Ben Wing <ben@xemacs.org> parents: 4709 diff changeset	47 };
462 0784d089fdc9 Import from CVS: tag r21-2-46 cvs parents: diff changeset	48
4908 b3ce27ca7647 various fixes related to gtk, redisplay-xlike-inc.c Ben Wing <ben@xemacs.org> parents: 4709 diff changeset	49 guint gtk_xemacs_get_type (void);
b3ce27ca7647 various fixes related to gtk, redisplay-xlike-inc.c Ben Wing <ben@xemacs.org> parents: 4709 diff changeset	50 GtkWidget gtk_xemacs_new (struct frame f);
462 0784d089fdc9 Import from CVS: tag r21-2-46 cvs parents: diff changeset	51
1743 543769b89fed [xemacs-hg @ 2003-10-14 05:02:57 by james] james parents: 462 diff changeset	52 END_C_DECLS
462 0784d089fdc9 Import from CVS: tag r21-2-46 cvs parents: diff changeset	53
0784d089fdc9 Import from CVS: tag r21-2-46 cvs parents: diff changeset	54 #endif /* __GTK_XEMACS_H__ */

Mercurial > hg > xemacs-beta

annotate src/gtk-xemacs.h @ 4908:b3ce27ca7647