diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2015-02-01 11:39:36 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-02-01 11:45:15 -0800 |
commit | 241260cc2819e5df254ad85953588b06388ade61 (patch) | |
tree | 3b0099a54471738d76567ff650466a14cd3de954 /src/xwidget.h | |
parent | 1d1162479caf1fdf48564f1486fa84e3cdacaa9b (diff) | |
download | emacs-241260cc2819e5df254ad85953588b06388ade61.tar.gz |
Revert changes installed by xwidgets merge
Diffstat (limited to 'src/xwidget.h')
-rw-r--r-- | src/xwidget.h | 115 |
1 files changed, 0 insertions, 115 deletions
diff --git a/src/xwidget.h b/src/xwidget.h deleted file mode 100644 index cbaddf6cec7..00000000000 --- a/src/xwidget.h +++ /dev/null @@ -1,115 +0,0 @@ -#ifndef XWIDGET_H_INCLUDED -#define XWIDGET_H_INCLUDED - -void x_draw_xwidget_glyph_string (struct glyph_string *s); -void syms_of_xwidget (); - -//extern Lisp_Object Qxwidget; - - -int valid_xwidget_spec_p (Lisp_Object object) ; - -#include <gtk/gtk.h> - - -/* -each xwidget instance/model is described by this struct. - -lisp pseudovector. - - - */ -struct xwidget{ - struct vectorlike_header header; - Lisp_Object plist;//auxilliary data - Lisp_Object type;//the widget type - Lisp_Object buffer; //buffer where xwidget lives - Lisp_Object title;//a title that is used for button labels for instance - - //here ends the lisp part. - //"height" is the marker field - int height; - int width; - - //for offscreen widgets, unused if not osr - GtkWidget* widget_osr; - GtkWidget* widgetwindow_osr; - //this is used if the widget (webkit) is to be wrapped in a scrolled window, - GtkWidget* widgetscrolledwindow_osr; - /* Non-nil means kill silently if Emacs is exited. */ - unsigned int kill_without_query : 1; - -}; - - -//struct for each xwidget view -struct xwidget_view { - struct vectorlike_header header; - Lisp_Object model; - Lisp_Object w; - - //here ends the lisp part. - //"redisplayed" is the marker field - int redisplayed; //if touched by redisplay - - int hidden;//if the "live" instance isnt drawn - - GtkWidget* widget; - GtkWidget* widgetwindow; - GtkWidget* emacswindow; - int x; int y; - int clip_right; int clip_bottom; int clip_top; int clip_left; - - - long handler_id; -}; - -/* Test for xwidget pseudovector*/ -#define XWIDGETP(x) PSEUDOVECTORP (x, PVEC_XWIDGET) -#define XXWIDGET(a) (eassert (XWIDGETP(a)), \ - (struct xwidget *) XUNTAG(a, Lisp_Vectorlike)) - -#define CHECK_XWIDGET(x) \ - CHECK_TYPE (XWIDGETP (x), Qxwidgetp, x) - -/* Test for xwidget_view pseudovector */ -#define XWIDGET_VIEW_P(x) PSEUDOVECTORP (x, PVEC_XWIDGET_VIEW) -#define XXWIDGET_VIEW(a) (eassert (XWIDGET_VIEW_P(a)), \ - (struct xwidget_view *) XUNTAG(a, Lisp_Vectorlike)) - -#define CHECK_XWIDGET_VIEW(x) \ - CHECK_TYPE (XWIDGET_VIEW_P (x), Qxwidget_view_p, x) - -struct xwidget_type -{ - /* A symbol uniquely identifying the xwidget type, */ - Lisp_Object *type; - - /* Check that SPEC is a valid image specification for the given - image type. Value is non-zero if SPEC is valid. */ - int (* valid_p) (Lisp_Object spec); - - /* Next in list of all supported image types. */ - struct xwidget_type *next; -}; - -static struct xwidget_type *lookup_xwidget_type (Lisp_Object symbol); - -struct xwidget* xwidget_from_id(int id); - -//extern int xwidget_owns_kbd; - -void xwidget_start_redisplay(); -void xwidget_end_redisplay (struct window *w, struct glyph_matrix *matrix); - -void xwidget_touch (struct xwidget_view *xw); - -//void assert_valid_xwidget_id(int id,char *str); - -struct xwidget* lookup_xwidget (Lisp_Object spec); -#define XG_XWIDGET "emacs_xwidget" -#define XG_XWIDGET_VIEW "emacs_xwidget_view" -void xwidget_view_delete_all_in_window( struct window *w ); - -void kill_buffer_xwidgets (Lisp_Object buffer); -#endif /* XWIDGET_H_INCLUDED */ |