procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove PGTK_DEBUG stuff

Browse source 
* src/gtkutil.c:
(xg_create_frame_widgets):
(xg_create_frame_outer_widgets):
(x_wm_set_size_hint):
(xg_set_toolkit_scroll_bar_thumb):
* src/pgtkfns.c (x_set_background_color):
(pgtk_set_name):
(x_explicitly_set_name):
(pgtk_implicitly_set_name):
(x_set_title):
(Fx_create_frame):
(Fpgtk_set_mouse_absolute_pixel_position):
(pgtk_log):
(pgtk_backtrace):
* src/pgtkselect.c (get_func):
(clear_func):
(pgtk_selection_lost):
(Fpgtk_own_selection_internal):
(Fpgtk_disown_selection_internal):
(Fpgtk_selection_exists_p):
(Fpgtk_selection_owner_p):
(nxatoms_of_pgtkselect):
(syms_of_pgtkselect):
* src/pgtkterm.c (flip_cr_context):
(get_keysym_name):
(frame_set_mouse_pixel_position):
(x_free_frame_resources):
(x_destroy_window):
(x_set_offset):
(pgtk_set_window_size):
(pgtk_iconify_frame):
(pgtk_make_frame_visible):
(pgtk_make_frame_invisible):
(pgtk_new_font):
(x_display_pixel_height):
(x_display_pixel_width):
(x_set_no_focus_on_map):
(x_set_no_accept_focus):
(x_set_z_group):
(x_set_cursor_gc):
(x_set_glyph_string_gc):
(x_set_glyph_string_clipping):
(x_draw_glyph_string_background):
(pgtk_draw_glyph_string):
(pgtk_after_update_window_line):
(pgtk_clear_frame_area):
(pgtk_draw_window_cursor):
(pgtk_copy_bits):
(pgtk_cr_draw_image):
(pgtk_draw_fringe_bitmap):
(pgtk_redraw_scroll_bars):
(pgtk_clear_frame):
(pgtk_read_socket):
(pgtk_select):
(xg_scroll_callback):
(xg_end_scroll_callback):
(pgtk_set_vertical_scroll_bar):
(set_fullscreen_state):
(pgtk_fullscreen_hook):
(pgtk_handle_event):
(pgtk_fill_rectangle):
(pgtk_clear_under_internal_border):
(print_widget_tree_recursive):
(print_widget_tree):
(pgtk_handle_draw):
(size_allocate):
(key_press_event):
(key_release_event):
(map_event):
(delete_event):
(enter_notify_event):
(leave_notify_event):
(focus_in_event):
(focus_out_event):
(motion_notify_event):
(button_event):
(scroll_event):
(drag_data_received):
(pgtk_xlfd_to_fontname):
(pgtk_defined_color):
(pgtk_parse_color):
(pgtk_query_colors):
(pgtk_query_color):
(pgtk_clear_area):
(pgtk_cr_update_surface_desired_size):
(pgtk_begin_cr_clip):
(pgtk_end_cr_clip):
(pgtk_set_cr_source_with_gc_foreground):
(pgtk_set_cr_source_with_gc_background):
(pgtk_set_cr_source_with_color):
(pgtk_cr_draw_frame):
(pgtk_cr_destroy_frame_context):
* src/pgtkterm.h:
This commit is contained in:
Yuuki Harano 2021-11-24 00:32:57 +09:00
parent 209662c0bd
commit 901938109f
5 changed files with 0 additions and 561 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/gtkutil.c
View file

@ -51,9 +51,6 @@ typedef struct pgtk_output xp_output;
#include "termhooks.h"
#include "keyboard.h"
#include "coding.h"
#ifndef PGTK_TRACE
#define PGTK_TRACE(fmt, ...) ((void) 0)
#endif
#include <gdk/gdkkeysyms.h>
@ -1408,7 +1405,6 @@ xg_create_frame_widgets (struct frame *f)
GtkWindowType type = GTK_WINDOW_TOPLEVEL;
char *title = 0;
PGTK_TRACE ("xg_create_frame_widgets.");
block_input ();
#ifndef HAVE_PGTK // gtk_plug not found.
@ -1622,7 +1618,6 @@ xg_create_frame_outer_widgets (struct frame *f)
GtkWindowType type = GTK_WINDOW_TOPLEVEL;
char *title = 0;
PGTK_TRACE ("xg_create_frame_outer_widgets.");
block_input ();
wtop = gtk_window_new (type);
@ -1814,7 +1809,6 @@ x_wm_set_size_hint (struct frame *f, long int flags, bool user_position)
base_width = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, 1) + FRAME_TOOLBAR_WIDTH (f);
base_height = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, 1)
+ FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f);
PGTK_TRACE ("base: %dx%d\n", base_width, base_height);
size_hints.base_width = base_width;
size_hints.base_height = base_height;
@ -4569,8 +4563,6 @@ xg_set_toolkit_scroll_bar_thumb (struct scroll_bar *bar,
struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window)));
PGTK_TRACE ("xg_set_toolkit_scroll_bar_thumb: ----------------------------------");
PGTK_TRACE ("xg_set_toolkit_scroll_bar_thumb: %p, %d, %d, %d.", bar, portion, position, whole);
if (wscroll && bar->dragging == -1)
{
GtkAdjustment *adj;
@ -4602,26 +4594,17 @@ xg_set_toolkit_scroll_bar_thumb (struct scroll_bar *bar,
top = (gdouble) position / whole;
shown = (gdouble) portion / whole;
}
PGTK_TRACE ("xg_set_toolkit_scroll_bar_thumb: position=%d, portion=%d, whole=%d", position, portion, whole);
PGTK_TRACE ("xg_set_toolkit_scroll_bar_thumb: top=%f, shown=%f", top, shown);
PGTK_TRACE ("xg_set_toolkit_scroll_bar_thumb: shown*range=%f", shown * XG_SB_RANGE);
size = clip_to_bounds (1, shown * XG_SB_RANGE, XG_SB_RANGE);
PGTK_TRACE ("xg_set_toolkit_scroll_bar_thumb: size=%d.", size);
PGTK_TRACE ("xg_set_toolkit_scroll_bar_thumb: top*range=%f.", top * XG_SB_RANGE);
PGTK_TRACE ("xg_set_toolkit_scroll_bar_thumb: max-size=%d.", XG_SB_MAX - size);
value = clip_to_bounds (XG_SB_MIN, top * XG_SB_RANGE, XG_SB_MAX - size);
PGTK_TRACE ("xg_set_toolkit_scroll_bar_thumb: value=%d.", value);
/* Assume all lines are of equal size. */
new_step = size / max (1, FRAME_LINES (f));
old_size = gtk_adjustment_get_page_size (adj);
PGTK_TRACE("xg_set_toolkit_scroll_bar_thumb: old_size=%d, size=%d", old_size, size);
if (old_size != size)
{
int old_step = gtk_adjustment_get_step_increment (adj);
PGTK_TRACE ("xg_set_toolkit_scroll_bar_thumb: old_step=%d, new_step=%d", old_step, new_step);
if (old_step != new_step)
{
gtk_adjustment_set_page_size (adj, size);
@ -4632,8 +4615,6 @@ xg_set_toolkit_scroll_bar_thumb (struct scroll_bar *bar,
}
}
PGTK_TRACE ("xg_set_toolkit_scroll_bar_thumb: changed=%d, old=%d, value=%d.",
changed, int_gtk_range_get_value (GTK_RANGE (wscroll)), value);
if (changed || int_gtk_range_get_value (GTK_RANGE (wscroll)) != value)
{
block_input ();

71
src/pgtkfns.c
View file

@ -222,13 +222,11 @@ x_set_background_color (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
if (FRAME_VISIBLE_P (f))
pgtk_clear_frame (f);
PGTK_TRACE ("x_set_background_color: col.pixel=%08lx.", bg);
FRAME_X_OUTPUT (f)->background_color = bg;
xg_set_background_color (f, bg);
update_face_from_frame_parameter (f, Qbackground_color, arg);
PGTK_TRACE ("visible_p=%d.", FRAME_VISIBLE_P (f));
if (FRAME_VISIBLE_P (f))
SET_FRAME_GARBAGED (f);
}
@ -311,8 +309,6 @@ pgtk_set_name_internal (struct frame *f, Lisp_Object name)
static void
pgtk_set_name (struct frame *f, Lisp_Object name, int explicit)
{
PGTK_TRACE ("pgtk_set_name");
/* Make sure that requests from lisp code override requests from
Emacs redisplay code. */
if (explicit)
@ -352,7 +348,6 @@ pgtk_set_name (struct frame *f, Lisp_Object name, int explicit)
static void
x_explicitly_set_name (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
{
PGTK_TRACE ("x_explicitly_set_name");
pgtk_set_name (f, arg, true);
}
@ -364,7 +359,6 @@ void
pgtk_implicitly_set_name (struct frame *f, Lisp_Object arg,
Lisp_Object oldval)
{
PGTK_TRACE ("x_implicitly_set_name");
pgtk_set_name (f, arg, false);
}
@ -375,7 +369,6 @@ pgtk_implicitly_set_name (struct frame *f, Lisp_Object arg,
static void
x_set_title (struct frame *f, Lisp_Object name, Lisp_Object old_name)
{
PGTK_TRACE ("x_set_title");
/* Don't change the title if it's already NAME. */
if (EQ (name, f->title))
return;
@ -1670,7 +1663,6 @@ This function is an internal primitive--use `make-frame' instead. */ )
block_input ();
PGTK_TRACE ("x_set_parent_frame x: %d, y: %d", f->left_pos, f->top_pos);
GtkWidget *fixed = FRAME_GTK_WIDGET (f);
GtkWidget *fixed_of_p = FRAME_GTK_WIDGET (p);
GtkWidget *whbox_of_f = gtk_widget_get_parent (fixed);
@ -3726,7 +3718,6 @@ The coordinates X and Y are interpreted in pixels relative to a position
GdkSeat *seat = gdk_display_get_default_seat (gdpy);
GdkDevice *device = gdk_seat_get_pointer (seat);
PGTK_TRACE ("pgtk-set-mouse-absolute-pixel-position:");
gdk_device_warp (device, gscr, XFIXNUM (x), XFIXNUM (y)); /* No effect on wayland. */
return Qnil;
@ -4128,66 +4119,4 @@ eliminated in future versions of Emacs. */);
DEFSYM (Qreverse_landscape, "reverse-landscape");
}
#ifdef PGTK_DEBUG
#include <stdarg.h>
#include <time.h>
void
pgtk_log (const char *file, int lineno, const char *fmt, ...)
{
struct timespec ts;
struct tm tm;
char timestr[32];
va_list ap;
clock_gettime (CLOCK_REALTIME, &ts);
localtime_r (&ts.tv_sec, &tm);
strftime (timestr, sizeof timestr, "%H:%M:%S", &tm);
fprintf (stderr, "%s.%06ld %.10s:%04d ", timestr, ts.tv_nsec / 1000, file,
lineno);
va_start (ap, fmt);
vfprintf (stderr, fmt, ap);
va_end (ap);
fputc ('\n', stderr);
}
void
pgtk_backtrace (const char *file, int lineno)
{
Lisp_Object bt = make_uninit_vector (10);
for (int i = 0; i < 10; i++)
ASET (bt, i, Qnil);
struct timespec ts;
struct tm tm;
char timestr[32];
clock_gettime (CLOCK_REALTIME, &ts);
localtime_r (&ts.tv_sec, &tm);
strftime (timestr, sizeof timestr, "%H:%M:%S", &tm);
fprintf (stderr, "%s.%06ld %.10s:%04d ********\n", timestr,
ts.tv_nsec / 1000, file, lineno);
get_backtrace (bt);
for (int i = 0; i < 10; i++)
{
Lisp_Object stk = AREF (bt, i);
if (!NILP (stk))
{
Lisp_Object args[2] = { build_string ("%S"), stk };
Lisp_Object str = Fformat (2, args);
fprintf (stderr, "%s %.10s:%04d %s\n", timestr, file, lineno,
SSDATA (str));
}
}
fprintf (stderr, "%s %.10s:%04d ********\n", timestr, file, lineno);
}
#endif
#endif

18
src/pgtkselect.c
View file

@ -165,7 +165,6 @@ static void
get_func (GtkClipboard * cb, GtkSelectionData * data, guint info,
gpointer user_data_or_owner)
{
PGTK_TRACE ("get_func:");
GObject *obj = G_OBJECT (user_data_or_owner);
const char *str;
int size;
@ -176,14 +175,12 @@ get_func (GtkClipboard * cb, GtkSelectionData * data, guint info,
str = g_object_get_qdata (obj, quark_data);
size = GPOINTER_TO_SIZE (g_object_get_qdata (obj, quark_size));
PGTK_TRACE ("get_func: str: %s", str);
gtk_selection_data_set_text (data, str, size);
}
static void
clear_func (GtkClipboard * cb, gpointer user_data_or_owner)
{
PGTK_TRACE ("clear_func:");
GObject *obj = G_OBJECT (user_data_or_owner);
GQuark quark_data, quark_size;
@ -224,7 +221,6 @@ pgtk_selection_lost (GtkWidget * widget, GdkEventSelection * event,
gpointer user_data)
{
GQuark quark_data, quark_size;
PGTK_TRACE ("pgtk_selection_lost:");
selection_type_to_quarks (event->selection, &quark_data, &quark_size);
@ -340,7 +336,6 @@ FRAME should be a frame that should own the selection. If omitted or
nil, it defaults to the selected frame. */)
(Lisp_Object selection, Lisp_Object value, Lisp_Object frame)
{
PGTK_TRACE ("pgtk-own-selection-internal.");
Lisp_Object successful_p = Qnil;
Lisp_Object target_symbol, rest;
GtkClipboard *cb;
@ -392,19 +387,13 @@ nil, it defaults to the selected frame. */)
g_object_set_qdata_full (G_OBJECT (widget), quark_size,
GSIZE_TO_POINTER (size), NULL);
PGTK_TRACE ("set_with_owner: owner=%p", FRAME_GTK_WIDGET (f));
if (gtk_clipboard_set_with_owner (cb,
targets, n_targets,
get_func, clear_func,
G_OBJECT (FRAME_GTK_WIDGET (f))))
{
PGTK_TRACE ("set_with_owner succeeded..");
successful_p = Qt;
}
else
{
PGTK_TRACE ("set_with_owner failed.");
}
gtk_clipboard_set_can_store (cb, NULL, 0);
gtk_target_table_free (targets, n_targets);
@ -439,8 +428,6 @@ On MS-DOS, all this does is return non-nil if we own the selection.
On PGTK, the TIME-OBJECT is unused. */)
(Lisp_Object selection, Lisp_Object time_object, Lisp_Object terminal)
{
PGTK_TRACE ("pgtk-disown-selection-internal.");
struct frame *f = frame_for_pgtk_selection (terminal);
GtkClipboard *cb;
@ -472,7 +459,6 @@ frame's display, or the first available X display.
On Nextstep, TERMINAL is unused. */)
(Lisp_Object selection, Lisp_Object terminal)
{
PGTK_TRACE ("pgtk-selection-exists-p.");
struct frame *f = frame_for_pgtk_selection (terminal);
GtkClipboard *cb;
@ -503,7 +489,6 @@ frame's display, or the first available X display.
On Nextstep, TERMINAL is unused. */)
(Lisp_Object selection, Lisp_Object terminal)
{
PGTK_TRACE ("pgtk-selection-owner-p.");
struct frame *f = frame_for_pgtk_selection (terminal);
GtkClipboard *cb;
GObject *obj;
@ -598,14 +583,11 @@ On PGTK, TIME-STAMP is unused. */)
void
nxatoms_of_pgtkselect (void)
{
PGTK_TRACE ("nxatoms_of_pgtkselect");
}
void
syms_of_pgtkselect (void)
{
PGTK_TRACE ("syms_of_pgtkselect");
DEFSYM (QCLIPBOARD, "CLIPBOARD");
DEFSYM (QSECONDARY, "SECONDARY");
DEFSYM (QTEXT, "TEXT");

439
src/pgtkterm.c
View file

File diff suppressed because it is too large Load diff

14
src/pgtkterm.h
View file

@ -38,20 +38,6 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
#include <cairo-svg.h>
#endif
// #define PGTK_DEBUG 1
#ifdef PGTK_DEBUG
extern void
pgtk_log (const char *file, int lineno, const char *fmt, ...)
ATTRIBUTE_FORMAT_PRINTF (3, 4);
#define PGTK_TRACE(fmt, ...) pgtk_log (__FILE__, __LINE__, fmt, ## __VA_ARGS__)
extern void pgtk_backtrace (const char *file, int lineno);
#define PGTK_BACKTRACE() pgtk_backtrace (__FILE__, __LINE__)
#else
#define PGTK_TRACE(fmt, ...) ((void) 0)
#define PGTK_BACKTRACE() ((void) 0)
#endif
/* could use list to store these, but rest of emacs has a big infrastructure
for managing a table of bitmap "records" */
struct pgtk_bitmap_record