Mercurial > hg > xemacs-beta
view src/sysdep.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 | 5bb998bf84bd |
children | 308d34e9f07d |
line wrap: on
line source
/* System-dependent prototypes Copyright (C) 1985, 1993, 1994 Free Software Foundation, Inc. Copyright (C) 2001, 2002 Ben Wing. This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: FSF 19.30. Split out of sysdep.c/emacs.c. */ #ifndef INCLUDED_sysdep_h_ #define INCLUDED_sysdep_h_ #include <setjmp.h> #ifdef PDUMP int pdump_read_file (char **pdump_start_pos, size_t *pdump_length); #endif int eight_bit_tty (struct device *d); void stuff_char (struct console *con, int c); void init_baud_rate (struct device *d); void set_exclusive_use (int fd); void set_descriptor_non_blocking (int fd); int get_pty_max_bytes (int fd); Ibyte get_eof_char (int fd); /* Wait for subprocess with process id `pid' to terminate and make sure it will get eliminated (not remain forever as a zombie) */ void wait_for_termination (int pid); /* flush any pending output * (may flush input as well; it does not matter the way we use it) */ void flush_pending_output (int channel); void child_setup_tty (int out); /* Suspend the Emacs process; give terminal to its superior. */ void sys_suspend (void); /* Suspend a process if possible; give terminal to its superior. */ void sys_suspend_process (int process); void request_sigio (void); void unrequest_sigio (void); BEGIN_C_DECLS #ifndef WIN32_NATIVE extern char **environ; #endif void stop_interrupts (void); void start_interrupts (void); MODULE_API void slow_down_interrupts (void); MODULE_API void speed_up_interrupts (void); void init_poll_for_quit (void); END_C_DECLS /* Used so that signals can break out of system calls that aren't naturally interruptible. */ extern JMP_BUF break_system_call_jump; extern volatile int can_break_system_calls; /* Call these functions if you want to change some terminal parameter -- reset the console, change the parameter, and init it again. */ void init_one_console (struct console *c); void reset_one_console (struct console *c); void init_one_device (struct device *d); void reset_one_device (struct device *d); /* Prepare all terminals for exiting Emacs; move the cursor to the bottom of the frame, turn off special modes, etc. Called at exit. This calls reset_one_console() on all consoles and does some other stuff (e.g. fix the foreground pgroup). */ void reset_all_consoles (void); /* Call these functions if you are going to temporarily exit back to the shell (e.g. when suspending). This calls reset_one_console() on the initial console and does some other stuff (e.g. fix the foreground pgroup). */ void reset_initial_console (void); void reinit_initial_console (void); /* We muck around with our process group. This function needs to be called at startup. The rest of the mucking is done as part of the functions reset_all_consoles(), reset_initial_console(), and reinit_initial_console(). */ void init_process_group (void); void munge_tty_process_group (void); void unmunge_tty_process_group (void); void disconnect_controlling_terminal (void); /* Return nonzero if safe to use tabs in output. At the time this is called, init_sys_modes has not been done yet. */ int tabs_safe_p (struct device *d); /* Get terminal size from system. If zero or a negative number is stored, the value is not valid. */ void get_tty_device_size (struct device *d, int *widthp, int *heightp); /* Set the logical window size associated with descriptor FD */ int set_window_size (int fd, int height, int width); /* Set up the proper status flags for use of a pty. */ void setup_pty (int fd); /* Return the address of the start of the text segment prior to unexec. */ char *start_of_text (void); /* Return the address of the start of the data segment prior to unexec. */ void *start_of_data (void); /* Get_system_name returns as its value a string for system-name to return. */ void init_system_name (void); #ifdef WIN32_NATIVE void *sbrk (unsigned long increment); #endif Bytecount total_data_usage (void); #endif /* INCLUDED_sysdep_h_ */