Mercurial > emacs
view src/gtkutil.h @ 82990:2ecd1f669db9
Fixed X support, preliminary support for X-tty combo sessions.
lib-src/emacsclient.c (copy_from_to, pty_conversation): Re-added SIGIO
hack. (Sigh.)
lisp/frame.el (make-frame-on-tty): Use make-terminal-frame, not
make-frame.
src/dispnew.c (line_hash_code, line_draw_cost): Updated to use
the new display_method parameters.
(Fredraw_frame): fflush the tty only if f is a termcap frame.
(direct_output_for_insert): Updated to use the new display_method
parameters. fflush the tty only if f is a termcap frame.
(direct_output_forward_char, update_frame_1, scrolling): Ditto.
(update_frame_line, Fding, bitch_at_user): Ditto.
(Fsend_string_to_terminal): Fail if current frame is not on a tty.
(init_display): Frame size change is safe here.
src/frame.c (Vterminal_frame): Restored previously deleted variable.
(syms_of_frame): Initialize it.
(make_terminal_frame): Copy the frame's display_method from tty_display_info.
(Fmake_terminal_frame): Enable simultaneous X and tty frames (buggy).
(Fredirect_frame_focus): Don't call frame_rehighlight_hook if frame
is on a termcap device.
src/frame.h (struct frame): Renamed display to display_method.
(Vterminal_frame): Re-added declaration.
src/keyboard.c (flow_control): Moved to struct tty_display_info.
(read_avail_input): Check ttys even if there is a read_socket_hook.
(Fset_input_mode): Call reset_sys_modes/init_sys_modes and set
flow_control or meta_key only when the frame is a termcap frame.
(Fcurrent_input_mode): Handle flow_control and meta_key right on
non-termcap frames.
src/scroll.c (calculate_scrolling, calculate_direct_scrolling): Update
to use the new display_method parameters.
(scrolling_1, scroll_cost): Ditto.
src/sysdep.c (init_sys_modes, reset_sys_modes): Always set the
terminal parameters if tty_out->input is not stdin. Updated to the
new location of flow_control.
(hft_init): Moved HFT init code to term_init, as it needs the frame.
src/term.c (tty_display_method_template): New variable.
(update_begin): Added rif hack.
(set_terminal_window, ins_del_lines, term_init): Updated to use the
new display_method parameters.
(insert_glyphs, ins_del_lines): Only call insert_glyphs_hook if the
current frame is not on a tty.
(calculate_costs): Don't calculate costs if not on a tty.
(term_dummy_init): Fixed tty->output initialization. Preallocate Wcm
and display_method.
(term_init): Allocate & initialize display_method. Blindly fixed
WINDOWSNT-specific parts. Added HFT-specific initialization
exception from hft_init.
(delete_tty): Only delete termcap frames. Free() the display_method.
src/termchar.h (struct tty_display_info): Moved high-level terminal
characteristics to struct display_method. Added flow_control and
display_method members.
src/termhooks.h (struct display_method): New struct (renamed from
struct device). Added accessor macros.
src/window.c (init_window_once): Initialize Vterminal_frame.
src/xdisp.c (init_iterator, expose_frame): Added rif hack.
(try_window_id): Updated to use the new display_method parameters.
src/xfaces.c (realize_basic_faces): Don't call
x_update_menu_appearance if the frame is a tty frame.
src/xfns.c (Fx_create_frame): Added rif hack. Initialize
display_method.
(x_create_tip_frame): Initialize display_method.
src/xterm.c (x_display_method): New variable.
(x_flush, x_frame_of_widget, XTmouse_position): Ignore non-X frames.
(x_window_to_scroll_bar, x_window_to_menu_bar): Ditto.
(xim_destroy_callback, xim_instantiate_callback): Ditto.
(frame_highlight, frame_unhighlight): Added rif hack.
(x_initialize): Don't initialize rif. Do initialize x_display_method.
src/xterm.h (x_display_method): New declaration.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-30
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Fri, 02 Jan 2004 01:15:26 +0000 |
parents | 1218a42792ea |
children | 5817080daeba |
line wrap: on
line source
/* Definitions and headers for GTK widgets. Copyright (C) 2003 Free Software Foundation, Inc. This file is part of GNU Emacs. GNU Emacs 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. GNU Emacs 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 GNU Emacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifndef GTKUTIL_H #define GTKUTIL_H #ifdef USE_GTK #include <gtk/gtk.h> #include "frame.h" /* Minimum and maximum values used for GTK scroll bars */ #define XG_SB_MIN 1 #define XG_SB_MAX 10000000 #define XG_SB_RANGE (XG_SB_MAX-XG_SB_MIN) /* Key for data that is valid for menus in a frame */ #define XG_FRAME_DATA "emacs_frame" /* Key for data that is the last scrollbar value */ #define XG_LAST_SB_DATA "emacs_last_sb_value" /* Key for data that menu items hold. */ #define XG_ITEM_DATA "emacs_menuitem" /* Button types in menus. */ enum button_type { BUTTON_TYPE_NONE, BUTTON_TYPE_TOGGLE, BUTTON_TYPE_RADIO }; /* This is a list node in a generic list implementation. */ typedef struct xg_list_node_ { struct xg_list_node_ *prev; struct xg_list_node_ *next; } xg_list_node; /* This structure is the callback data that is shared for menu items. We need to keep it separate from the frame structure due to detachable menus. The data in the frame structure is only valid while the menu is popped up. This structure is kept around as long as the menu is. */ typedef struct xg_menu_cb_data_ { xg_list_node ptrs; FRAME_PTR f; Lisp_Object menu_bar_vector; int menu_bar_items_used; GCallback highlight_cb; int ref_count; } xg_menu_cb_data; /* This structure holds callback information for each individual menu item. */ typedef struct xg_menu_item_cb_data_ { xg_list_node ptrs; gulong highlight_id; gulong unhighlight_id; gulong select_id; Lisp_Object help; gpointer call_data; xg_menu_cb_data *cl_data; } xg_menu_item_cb_data; /* Used to specify menus and dialogs. This is an adaption from lwlib for Gtk so we can use more of the same code as lwlib in xmenu.c. */ typedef struct _widget_value { /* name of widget */ char *name; /* value (meaning depend on widget type) */ char *value; /* keyboard equivalent. no implications for XtTranslations */ char *key; /* Help string or nil if none. GC finds this string through the frame's menu_bar_vector or through menu_items. */ Lisp_Object help; /* true if enabled */ gint enabled; /* true if selected */ gint selected; /* The type of a button. */ enum button_type button_type; /* Contents of the sub-widgets, also selected slot for checkbox */ struct _widget_value *contents; /* data passed to callback */ gpointer call_data; /* next one in the list */ struct _widget_value *next; /* we resource the widget_value structures; this points to the next one on the free list if this one has been deallocated. */ struct _widget_value *free_list; } widget_value; extern widget_value *malloc_widget_value P_ ((void)); extern void free_widget_value P_ ((widget_value *)); extern char *xg_get_file_name P_ ((FRAME_PTR f, char *prompt, char *default_filename, int mustmatch_p)); extern GtkWidget *xg_create_widget P_ ((char *type, char *name, FRAME_PTR f, widget_value *val, GCallback select_cb, GCallback deactivate_cb, GCallback hightlight_cb)); extern void xg_modify_menubar_widgets P_ ((GtkWidget *menubar, FRAME_PTR f, widget_value *val, int deep_p, GCallback select_cb, GCallback deactivate_cb, GCallback hightlight_cb)); extern int xg_update_frame_menubar P_ ((FRAME_PTR f)); extern int xg_have_tear_offs P_ ((void)); extern int xg_get_scroll_id_for_window P_ ((Display *dpy, Window wid)); extern void xg_create_scroll_bar P_ ((FRAME_PTR f, struct scroll_bar *bar, GCallback scroll_callback, char *scroll_bar_name)); extern void xg_show_scroll_bar P_ ((int scrollbar_id)); extern void xg_remove_scroll_bar P_ ((FRAME_PTR f, int scrollbar_id)); extern void xg_update_scrollbar_pos P_ ((FRAME_PTR f, int scrollbar_id, int top, int left, int width, int height, int real_left, int canon_width)); extern void xg_set_toolkit_scroll_bar_thumb P_ ((struct scroll_bar *bar, int portion, int position, int whole)); extern void update_frame_tool_bar P_ ((FRAME_PTR f)); extern void free_frame_tool_bar P_ ((FRAME_PTR f)); extern void xg_resize_widgets P_ ((FRAME_PTR f, int pixelwidth, int pixelheight)); extern void xg_frame_cleared P_ ((FRAME_PTR f)); extern void xg_frame_set_char_size P_ ((FRAME_PTR f, int cols, int rows)); extern GtkWidget * xg_win_to_widget P_ ((Display *dpy, Window wdesc)); extern int xg_display_open P_ ((char *display_name, Display **dpy)); extern void xg_display_close P_ ((Display *dpy)); extern GdkCursor * xg_create_default_cursor P_ ((Display *dpy)); extern int xg_create_frame_widgets P_ ((FRAME_PTR f)); extern void x_wm_set_size_hint P_ ((FRAME_PTR f, long flags, int user_position)); extern void xg_set_background_color P_ ((FRAME_PTR f, unsigned long bg)); /* Mark all callback data that are Lisp_object:s during GC. */ extern void xg_mark_data P_ ((void)); /* Initialize GTK specific parts. */ extern void xg_initialize P_ ((void)); /* Setting scrollbar values invokes the callback. Use this variable to indicate that the callback should do nothing. */ extern int xg_ignore_gtk_scrollbar; #endif /* USE_GTK */ #endif /* GTKUTIL_H */ /* arch-tag: 0757f3dc-00c7-4cee-9e4c-282cf1d34c72 (do not change this comment) */