mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-02 20:00:35 -08:00
Code Issues Projects Releases Wiki Activity
143957 commits 247 branches 194 tags 1 GiB
Commit graph

143957 commits

This branch
This branch
All branches
Author SHA1 Message Date
Yuuki Harano
2d5ffa5595 Make pointer visible when motion notify event 
* src/pgtkterm.c (motion_notify_event): set pending_signals to true.
 2020-11-24 12:24:40 +11:00
Yuuki Harano
e7190d8bb2 Fix non-English layout does not work 
* src/pgtkterm.c (key_press_event): Use Vlocale_coding_system.
 2020-11-24 12:24:40 +11:00
Yuuki Harano
6c4349601c Fix font lock is not applied on continued lines 
* src/pgtkterm.c (pgtk_parse_color): Remove alpha bits.
 2020-11-24 12:24:40 +11:00
Jeff Walsh
af1e279c15 Restore support for terminal only emacs in PGTK (add --with-pgtk) 
* configure.ac: add "--with-pgtk" switch for building pgtk terminal
support.
Adjust X11 window system tests to no clobber pgtk preferences
 2020-11-24 12:24:40 +11:00
Jeff Walsh
27a92f7b15 Add font chooser functionality 
* src/pgtkfns.c (Fpgtk_popup_font_panel): repurpose X/gtk font chooser code
(syms_of_pgtkfns): add new symbol
 2020-11-24 12:24:40 +11:00
Jeff Walsh
383ced7aee Fix migrating Child frames 
* src/pgtkterm.c:
(x_calc_absolute_position): Remove Function that has no effect
(x_set_offset): titlebar off should not be stored as an offset, only
used to calculate final move locations
 2020-11-24 12:24:40 +11:00
Yuuki Harano
89cbe3756c * src/keyboard.c (make_lispy_event): Fix coding style 2020-11-24 12:24:40 +11:00
Yuuki Harano
20dbd4e283 Change coding style 
* src/gtkutil.c (xg_display_open):
(xg_get_image_for_pixmap):
(xg_frame_resized):
(xg_create_frame_widgets):
(x_wm_set_size_hint):
(xg_frame_restack):
(xg_finish_scroll_bar_creation):
(xg_update_scrollbar_pos):
(xg_update_horizontal_scrollbar_pos):
(xg_set_toolkit_scroll_bar_thumb):
(xg_event_is_for_scrollbar):
 2020-11-24 12:24:40 +11:00
Yuuki Harano
1fe7caf3a6 Fix coding style 
* src/emacs.c (main): Fix coding style
 2020-11-24 12:24:40 +11:00
Yuuki Harano
25cf59203e Change coding style 
* src/image.c (image_create_pattern_from_pixbuf): Change coding style
(image_create_bitmap_from_data): Change coding style
(image_create_bitmap_from_file): Change coding style
 2020-11-24 12:24:40 +11:00
Yuuki Harano
3b161dd3c8 * src/pgtkselect.h: Change coding style 2020-11-24 12:24:40 +11:00
Yuuki Harano
f761a09c98 * src/pgtkim.c: Change coding style 2020-11-24 12:24:40 +11:00
Yuuki Harano
0056ca2d06 * src/pgtkterm.h: Change coding style 2020-11-24 12:24:40 +11:00
Yuuki Harano
209c611ae9 * src/pgtkterm.h: Remove unused code 2020-11-24 12:24:40 +11:00
Yuuki Harano
964dfcf462 * src/pgtkgui.h: change coding style 2020-11-24 12:24:40 +11:00
Yuuki Harano
af5b72575c * src/pgtkmenu.c: change coding style 2020-11-24 12:24:40 +11:00
Yuuki Harano
72f79d820d * src/pgtkselect.c: change coding style 2020-11-24 12:24:40 +11:00
Yuuki Harano
d109dabbc5 * src/pgtkfns.c: change coding style 2020-11-24 12:24:40 +11:00
Yuuki Harano
e649275a0c * src/pgtkterm.c: change coding style 2020-11-24 12:24:40 +11:00
Yuuki Harano
a167e23560 * src/pgtkmenu.c (set_frame_menubar): Suppress gcc warning 2020-11-24 12:24:40 +11:00
Yuuki Harano
d68633bfa1 * src/pgtkterm.c (pgtk_defined_color): support gtk special colors 
Color functions take the frame

* src/gtkutil.c (xg_check_special_colors): pass frame as argument.
* src/pgtkfns.c (x_set_foreground_color, x_set_background_color,
x_set_cursor_color, pgtk_set_scroll_bar_foreground,
pgtk_set_scroll_bar_background, Fxw_color_defined_p,
Fxw_color_values): pass frame as argument.
* src/pgtkterm.c (pgtk_parse_color): take frame as argument.
(pgtk_lisp_to_color): take frame as argument, and pass it.

Remove pgtk_lisp_to_color

* src/pgtkfns.c (x_set_foreground_color, x_set_background_color,
x_set_cursor_color): use x_decode_color instead of pgtk_lisp_to_color.
(Fxw_color_defined_p, Fxw_color_values):
use pgtk_defined_color instead of pgtk_lisp_to_color.
* src/pgtkterm.c (pgtk_lisp_to_color): remove.

* src/gtkutil.c (xg_check_special_colors): change color format

* src/pgtkterm.h: remove pgtk_lisp_to_color declaration
 2020-11-24 12:24:40 +11:00
Yuuki Harano
fe2297ce7a * pgtkmenu.c (set_frame_menubar): fix empty menu. 2020-11-24 12:24:39 +11:00
Yuuki Harano
8669feb0c5 Make icons and titles work like on X 
* pgtk-win.el (frame-title-format, icon-title-format): remove.
* pgtkfns.c (pgtk_set_name_as_filename):  remove.
* pgtkfns.c (pgtk_set_name_internal): remove gtk_window_set_icon_name call.
* pgtkfns.c (pgtk_set_name): change value of update_mode_lines.
* pgtkfns.c (pgtk_explicitly_set_name):
prefer the symbol to an immediate value.
* pgtkfns.c (pgtk_implicitly_set_name): remove pgtk_set_name_as_filename call.
* pgtkfns.c (x_set_icon_type, x_set_icon_name): re-port from X code.
* pgtkfns.c (xg_set_icon, xg_set_icon_from_xpm_data): port from X code.
* pgtkterm.c (pgtk_bitmap_icon, pgtk_text_icon, pgtk_create_terminal):
port from X code.
* pgtkterm.h: add function declarations.
 2020-11-24 12:24:39 +11:00
Yuuki Harano
5a72a07fa5 * pgtk-win.el: fix compile-time warnings. 2020-11-24 12:24:39 +11:00
Yuuki Harano
014d56fa13 * src/pgtkterm.c: Remove incorrect mark_object call. 2020-11-24 12:24:39 +11:00
Yuuki Harano
4de4d9ee7e follow x_set_internal_border_width change. 
* ../src/pgtkfns.c (x_set_internal_border_width):
 2020-11-24 12:24:39 +11:00
Yuuki Harano
984f9cc7e5 restore frame_rehighlight_hook. 
* src/frame.c (gui_set_border_width):
 2020-11-24 12:24:39 +11:00
Yuuki Harano
de7b0daf2b use pgtk_menu_set_in_use. 
* ../src/pgtkfns.c:
	(Fx_file_dialog, clean_up_dialog):

	* src/pgtkmenu.c (pgtk_menu_wait_for_event):
 2020-11-24 12:24:39 +11:00
Yuuki Harano
04bfe70138 implement popup/context menu 
* ../src/pgtkterm.c (x_draw_glyph_string_background)
	(x_draw_glyph_string_foreground)
	(x_draw_composite_glyph_string_foreground)
	(x_draw_glyphless_glyph_string_foreground, x_draw_relief_rect)
	(x_draw_box_rect, x_draw_glyph_string_box, x_draw_image_relief)
	(x_draw_image_foreground, x_draw_image_glyph_string)
	(button_event):

	* src/pgtkterm.h (struct pgtk_display_info):

	* src/pgtkmenu.c (pgtk_menu_set_in_use)
	(pgtk_menu_wait_for_event, Fx_menu_bar_open_internal)
	(popup_widget_loop, pgtk_activate_menubar)
	(popup_deactivate_callback, show_help_event): new functions
	(menu_highlight_callback): remove
	(update_frame_menubar, popup_selection_callback, pop_down_menu)
	(create_and_show_popup_menu, cleanup_widget_value_tree)
	(pgtk_menu_show, dialog_selection_callback): new
	(create_and_show_dialog, pgtk_dialog_show, pgtk_popup_dialog)
	(popup_activated, Fmenu_or_popup_active_p, syms_of_pgtkmenu):
 2020-11-24 12:24:39 +11:00
Yuuki Harano
49645df52e minimize gtkutil.c differences. 
* src/pgtkterm.h: remove compiletime ifdefs

* src/gtkutil.h: block out unused decl

* src/gtkutil.c:
(xg_get_pixbuf_from_pix_and_mask, xg_height_or_width_changed)
(xg_create_frame_widgets, x_wm_set_size_hint)
(xg_event_is_for_menubar, update_frame_tool_bar):

resolve argument type mismatch.
fix compatibility.
 2020-11-24 12:24:39 +11:00
Yuuki Harano
cbd28cddea improve code readability. 
* src/gtkutil.c (xg_create_frame_widgets):
 2020-11-24 12:24:39 +11:00
Jeff Walsh
ef67659e98 Set screen/display dpi res to make broadway work as expected 
* src/pgtkterm.c (pgtk_initialize_display_info)
(window_state_event, pgtk_term_init):

* src/gtkutil.c (xg_create_frame_widgets):

* src/pgtkterm.c (pgtk_initialize_display_info)
(window_state_event, pgtk_term_init):

* src/ftcrfont.c (ftcrfont_open):
 2020-11-24 12:24:39 +11:00
Jeff Walsh
c9e6b4486b Some work toward posframe on wayland 
* src/pgtkterm.c (flip_cr_context, x_set_offset): update for new functionality
(pgtk_set_window_size): remove dead code
(x_set_parent_frame): cleanup trace code
(pgtk_cr_update_surface_desired_size): add comment

* src/pgtkmenu.c (Fmenu_or_popup_active_p):

* src/pgtkfns.c (pgtk_frame_parm_handlers, Fx_create_frame):

* src/gtkutil.c (xg_create_frame_widgets, x_wm_set_size_hint):

* src/gtkutil.c (xg_create_frame_widgets):

hacky GTK offsets taht will need better calculations

Get parent frame's editor widget allocation for the offset

Fix child-frame offsets for negative values

Add some function comments around the new double context handling
 2020-11-24 12:24:39 +11:00
Jeff Walsh
e021e233b4 End Resize flickering by copying surface rather than just clearing 
* src/pgtkterm.h (FRAME_NATIVE_WINDOW):

* src/pgtkterm.c (pgtk_set_window_size): cleanup traces
(x_draw_bar_cursor, pgtk_handle_draw, syms_of_pgtkterm):
 2020-11-24 12:24:39 +11:00
Jeff Walsh
975289663f Bring pgtk more inline with X11-cairo builds 
* src/pgtkterm.h (struct pgtk_output):

* src/pgtkterm.c (FRAME_CR_ACTIVE_CONTEXT, flip_cr_context)
(x_draw_bar_cursor, pgtk_scroll_run, pgtk_update_end)
(pgtk_cr_draw_image, pgtk_flash, pgtk_handle_draw)
(pgtk_cr_update_surface_desired_size, pgtk_begin_cr_clip)
(pgtk_cr_destroy_frame_context):

* src/image.c (image_create_pattern_from_pixbuf):

- Don't create a context each time, just hold a reference

- Pull in a few cairo image changes from master

- Remove redundant code in pgtk_update_begin()
 2020-11-24 12:24:39 +11:00
Yuuki Harano
992ef48300 update redisplay_interface. 
* src/pgtkfns.c (Fx_create_frame, pgtk_default_font_parameter):

* src/pgtkterm.c (pgtk_redisplay_interface):

* src/pgtkterm.h:
 2020-11-24 12:24:39 +11:00
Yuuki Harano
d2a29e883e emacsclient should use both of DISPLAY and WAYLAND_DISPLAY. 
* lisp/server.el (server-create-window-system-frame): error out when
not on a supported window

* lib-src/emacsclient.c (decode_options): handle WALAND_DISPLAY on PGTK
 2020-11-24 12:24:31 +11:00
Yuuki Harano
806b7640c0 Before sleep, dispatch draw events. 
* src/pgtkterm.c (pgtk_select): remove sigio signal
  (pgtk_term_init): dispatch draw
 2020-11-22 14:46:56 +11:00
Jeff Walsh
385e85c3dd End Resize flickering by copying surface rather than just clearing 
* src/pgtkterm.h (struct pgtk_output): store desired sizes

* src/pgtkterm.c (FRAME_CR_SURFACE_DESIRED_HEIGHT)
(FRAME_CR_SURFACE_DESIRED_WIDTH, size_allocate, configure_event)
(pgtk_cr_update_surface_desired_size): add "desired" size for handling
surface change

* src/gtkutil.c (xg_frame_resized, xg_create_frame_widgets): remove
surface destroy, turn off double buffer call
 2020-11-22 14:46:56 +11:00
Yuuki Harano
b1cc62cac3 Add support for Jpeglib 
configure.ac: enable jpeglib support for pgtk

jpeglib を使えるようにした。

imagemagick がうまく機能してるので気付かなかった…
 2020-11-22 14:46:56 +11:00
Yuuki Harano
526f7277fc Let gtk handle scaling. 
* src/gtkutil.c (xg_get_scale):
 2020-11-22 14:46:56 +11:00
Yuuki Harano
232c129fe4 implement pre-edit input method 
* src/termhooks.h (enum event_kind): new pgtk value

* src/pgtkterm.h (struct pgtk_display_info):

* src/pgtkterm.c (x_free_frame_resources, pgtk_delete_terminal)
(pgtk_enqueue_string, pgtk_enqueue_preedit, key_press_event)
(focus_in_event, focus_out_event, pgtk_term_init): call pgtkim

* src/pgtkim.c: new file
(im_context_commit_cb, im_context_retrieve_surrounding_cb)
(make_color_string, im_context_preedit_changed_cb)
(im_context_preedit_end_cb, im_context_preedit_start_cb)
(pgtk_im_focus_in, pgtk_im_focus_out, pgtk_im_filter_keypress)
(pgtk_im_finish, Fpgtk_use_im_context, syms_of_pgtkim):

* src/pgtkfns.c (check_pgtk_display_info):

* src/keyboard.c (kbd_buffer_get_event, make_lispy_event)
(keys_of_keyboard):

* src/emacs.c (main): add syms_of_pgtkim

* lisp/term/pgtk-win.el (pgtk-preedit-text): new defun

* configure.ac (XWIDGETS_OBJ): add pgtkim.o

input method 対応

preedit を overlay で表示するようにした。

preedit 表示後すぐに反映されなかったのを修正

この機能を ON/OFF できるようにした。

default off.

確定と同時に次の preedit が始まった場合に表示位置がおかしかったのを修正。

sample.

preedit をテキストで渡すようにした
 2020-11-22 14:46:56 +11:00
Yuuki Harano
9e56fa9853 Support focus on click event 
* src/pgtkterm.c (enter_notify_event, leave_notify_event)
(focus_in_event, focus_out_event): support focus on click

focus-on-click な環境に対応。
 2020-11-22 14:46:56 +11:00
Yuuki Harano
9eb35f9996 experimental support of tab-bar. 
* src/window.h: compile conditional

* src/pgtkterm.h: function decls

* src/pgtkterm.c (x_draw_image_relief, pgtk_create_terminal)
(motion_notify_event, button_event): tabbar support

* src/pgtkfns.c (x_set_tab_bar_lines, x_change_tab_bar_height)
(pgtk_frame_parm_handlers, Fx_create_frame, frame_geometry): tabbar support

余計なイベントが生成されていたのを修正。
 2020-11-22 14:46:56 +11:00
Yuuki Harano
bc35a1e1d5 Make multipdisplay work by limiting selection while enabed 
* src/pgtkterm.c (pgtk_mouse_position):

* src/pgtkselect.c (pgtk_selection_usable): new function
(Fpgtk_own_selection_internal, Fpgtk_disown_selection_internal)
(Fpgtk_selection_exists_p, Fpgtk_selection_owner_p)
(Fpgtk_get_selection_internal): check usable selection

multi-display で落ちる理由を一つ潰した。

まだまだありそう。

multi-display 時は selection を使えないようにした。
 2020-11-22 14:46:56 +11:00
Yuuki Harano
24d82638bc Improve drawing efficency by refactoring code 
* ../src/pgtkterm.c (fill_background, fill_background_by_face)
	(x_draw_glyph_string_background, x_draw_glyph_string_bg_rect)
	(x_draw_image_glyph_string, x_draw_stretch_glyph_string)
	(pgtk_clear_under_internal_border): Refator duplcate code

更に効率化。
 2020-11-22 14:46:56 +11:00
Yuuki Harano
fd61a86ea5 improve some efficiency - simplify draws 
* src/pgtkterm.h (struct pgtk_bitmap_record):

* src/pgtkterm.c (create_background_surface_by_face):

* src/image.c (image_create_pattern_from_pixbuf)
(image_create_bitmap_from_data, image_create_bitmap_from_file):

少し効率化。
 2020-11-22 14:46:56 +11:00
Yuuki Harano
ae3bb14091 implement restacking and cleanup frame z order 
src/pgtkfns.c:
	(pgtk_frame_restack,  Fpgtk_frame_restack, syms_of_pgtkfns):

pgtk-frame-restack を実装だけ。

ついでに、pgtk-frame-list-z-order は無意味なので削除した。
 2020-11-22 14:46:56 +11:00
Yuuki Harano
fde74fa8b9 implement pgtk-frame-list-z-order same as frame-list. 
* src/pgtkfns.c (Fpgtk_frame_list_z_order): return frame list as it's
the same
 2020-11-22 14:46:55 +11:00
Yuuki Harano
b3a20d7a21 Implement Scroll-bar-forground and scroll-bar-background 
* src/pgtkterm.h (struct pgtk_output):

* src/pgtkterm.c (x_free_frame_resources):

* src/pgtkfns.c (pgtk_set_scroll_bar_foreground)
(pgtk_set_scroll_bar_background, pgtk_frame_parm_handlers)
(Fx_create_frame):

* src/gtkutil.c (xg_finish_scroll_bar_creation):handle scrollbar css values

* etc/org.gnu.emacs.defaults.gschema.xml: add scroll bar fields

scroll-bar-foreground, scroll-bar-background 実装。
 2020-11-22 14:46:55 +11:00