mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-04 06:31:13 -08:00
Code Issues Projects Releases Wiki Activity

Set screen/display dpi res to make broadway work as expected

Browse source 
* 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):
This commit is contained in:
Jeff Walsh 2020-02-18 17:13:26 +11:00 • committed by Jeff Walsh
parent c9e6b4486b
commit ef67659e98
4 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/ftcrfont.c
View file

@ -136,7 +136,9 @@ ftcrfont_open (struct frame *f, Lisp_Object entity, int pixel_size)
filename = XCAR (val);
size = XFIXNUM (AREF (entity, FONT_SIZE_INDEX));
if (size == 0)
{
size = pixel_size;
}
block_input ();

1
src/gtkutil.c
View file

@ -1377,7 +1377,6 @@ xg_create_frame_widgets (struct frame *f)
wtop = gtk_window_new (type);
#ifdef HAVE_PGTK
gtk_widget_add_events(wtop, GDK_ALL_EVENTS_MASK);
gtk_window_set_hide_titlebar_when_maximized(GTK_WINDOW(wtop), TRUE);
#endif
/* gtk_window_set_has_resize_grip is a Gtk+ 3.0 function but Ubuntu

4
src/pgtkfns.c
View file

@ -3160,7 +3160,7 @@ When using Gtk+ tooltips, the tooltip face is not used. */);
}
#ifdef PGTK_DEBUG
#include <stdarg.h>
#include <time.h>
void pgtk_log(const char *file, int lineno, const char *fmt, ...)
@ -3181,7 +3181,7 @@ void pgtk_log(const char *file, int lineno, const char *fmt, ...)
va_end(ap);
fputc('\n', stderr);
}
#ifdef PGTK_DEBUG
void pgtk_backtrace(const char *file, int lineno)
{
Lisp_Object bt = make_uninit_vector(10);

14
src/pgtkterm.c
View file

@ -828,8 +828,8 @@ pgtk_initialize_display_info (struct pgtk_display_info *dpyinfo)
Initialize global info and storage for display.
-------------------------------------------------------------------------- */
{
dpyinfo->resx = 72.27; /* used 75.0, but this makes pt == pixel, expected */
dpyinfo->resy = 72.27;
dpyinfo->resx = 96;
dpyinfo->resy = 96;
dpyinfo->color_p = 1;
dpyinfo->n_planes = 32;
dpyinfo->root_window = 42; /* a placeholder.. */
@ -5401,7 +5401,7 @@ static gboolean window_state_event(GtkWidget *widget, GdkEvent *event, gpointer
if (inev.ie.kind != NO_EVENT)
evq_enqueue(&inev);
return TRUE;
return FALSE;
}
static gboolean delete_event(GtkWidget *widget, GdkEvent *event, gpointer *user_data)
@ -6297,7 +6297,13 @@ pgtk_term_init (Lisp_Object display_name, char *resource_name)
{
GdkScreen *gscr = gdk_display_get_default_screen(dpyinfo->gdpy);
gdouble dpi = gdk_screen_get_resolution(gscr);
GSettings *set = g_settings_new("org.gnome.desktop.interface");
gdouble x = g_settings_get_double(set,"text-scaling-factor");
gdouble dpi = 0;
dpi = 96.0 * x;
gdk_screen_set_resolution(gscr, dpi);
dpyinfo->resx = dpi;
dpyinfo->resy = dpi;
}