diff options
| author | Joakim Verona | 2016-01-19 20:27:12 +0100 |
|---|---|---|
| committer | Joakim Verona | 2016-01-19 20:58:22 +0100 |
| commit | 7c1f66a94bf236a427606ef537b4629a48a1665b (patch) | |
| tree | 8661f512f7bcf35bfb1e7d915e5b6ef8df6229d8 /src/buffer.c | |
| parent | 663d379bbc2fde5e9bded157365e9d48ea01c027 (diff) | |
| download | emacs-7c1f66a94bf236a427606ef537b4629a48a1665b.tar.gz emacs-7c1f66a94bf236a427606ef537b4629a48a1665b.zip | |
Support for the new Xwidget feature.
* configure.ac:
(HAVE_XWIDGETS, WIDGET_OBJ, EMACS_CONFIG_FEATURES):
* xterm.c (x_draw_glyph_string, x_draw_bar_cursor):
* xdisp.c:
(handle_display_spec, handle_single_display_spec, push_it)
(pop_it, set_iterator_to_next, dump_glyph)
(calc_pixel_width_or_height, fill_xwidget_glyph_string)
(BUILD_XWIDGET_GLYPH_STRING, BUILD_GLYPH_STRINGS)
(produce_xwidget_glyph, x_produce_glyphs)
(get_window_cursor_type):
* window.c (Fdelete_window_internal):
* termhooks.h (e):
* print.c (print_object):
* lisp.h (ptrdiff_t):
* keyboard.c (kbd_buffer_get_event, make_lispy_event)
(syms_of_keyboard):
* emacs.c (main):
* dispnew.c (update_window, scrolling_window):
* dispextern.h (g, i):
* Makefile.in (XWIDGETS_OBJ, WEBKIT_CFLAGS, WEBKIT_LIBS)
(GIR_LIBS, ALL_CFLAGS, base_obj, LIBES):
* keyboard.c (kbd_buffer_get_event):
* emacsgtkfixed.c (emacs_fixed_gtk_widget_size_allocate)
(emacs_fixed_class_init): Add case for an xwidget view.
* xwidget.c, xwidget.h, xwidget.el: New files for xwidgets
Co-authored-by: Grégoire Jadi <daimrod@gmail.com>
Various improvements to the Xwidget feature.
* xwidgets.c:
* emacsgtkfixed.c:
* xwidget.el:
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/buffer.c b/src/buffer.c index b02135cef87..a2981c90f66 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -43,6 +43,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 43 | #include "keymap.h" | 43 | #include "keymap.h" |
| 44 | #include "frame.h" | 44 | #include "frame.h" |
| 45 | 45 | ||
| 46 | #ifdef HAVE_XWIDGETS | ||
| 47 | # include "xwidget.h" | ||
| 48 | #endif | ||
| 46 | #ifdef WINDOWSNT | 49 | #ifdef WINDOWSNT |
| 47 | #include "w32heap.h" /* for mmap_* */ | 50 | #include "w32heap.h" /* for mmap_* */ |
| 48 | #endif | 51 | #endif |
| @@ -1747,6 +1750,9 @@ cleaning up all windows currently displaying the buffer to be killed. */) | |||
| 1747 | 1750 | ||
| 1748 | kill_buffer_processes (buffer); | 1751 | kill_buffer_processes (buffer); |
| 1749 | 1752 | ||
| 1753 | #ifdef HAVE_XWIDGETS | ||
| 1754 | kill_buffer_xwidgets (buffer); | ||
| 1755 | #endif | ||
| 1750 | /* Killing buffer processes may run sentinels which may have killed | 1756 | /* Killing buffer processes may run sentinels which may have killed |
| 1751 | our buffer. */ | 1757 | our buffer. */ |
| 1752 | if (!BUFFER_LIVE_P (b)) | 1758 | if (!BUFFER_LIVE_P (b)) |