Skip to content

Commit 5b930c3

Browse files
Jeff Walshfejfighter
authored andcommitted
Set screen/display dpi res to make broadway work as expected
1 parent b832b04 commit 5b930c3

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
lines changed

src/ftcrfont.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,9 @@ ftcrfont_open (struct frame *f, Lisp_Object entity, int pixel_size)
131131
filename = XCAR (val);
132132
size = XFIXNUM (AREF (entity, FONT_SIZE_INDEX));
133133
if (size == 0)
134+
{
134135
size = pixel_size;
136+
}
135137

136138
block_input ();
137139

src/gtkutil.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1350,7 +1350,6 @@ xg_create_frame_widgets (struct frame *f)
13501350
wtop = gtk_window_new (type);
13511351
#ifdef HAVE_PGTK
13521352
gtk_widget_add_events(wtop, GDK_ALL_EVENTS_MASK);
1353-
gtk_window_set_hide_titlebar_when_maximized(GTK_WINDOW(wtop), TRUE);
13541353
#endif
13551354

13561355
/* gtk_window_set_has_resize_grip is a Gtk+ 3.0 function but Ubuntu

src/pgtkfns.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3165,7 +3165,7 @@ When using Gtk+ tooltips, the tooltip face is not used. */);
31653165
}
31663166

31673167

3168-
3168+
#ifdef PGTK_DEBUG
31693169
#include <stdarg.h>
31703170
#include <time.h>
31713171
void pgtk_log(const char *file, int lineno, const char *fmt, ...)
@@ -3186,7 +3186,7 @@ void pgtk_log(const char *file, int lineno, const char *fmt, ...)
31863186
va_end(ap);
31873187
fputc('\n', stderr);
31883188
}
3189-
#ifdef PGTK_DEBUG
3189+
31903190
void pgtk_backtrace(const char *file, int lineno)
31913191
{
31923192
Lisp_Object bt = make_uninit_vector(10);

src/pgtkterm.c

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -818,8 +818,8 @@ pgtk_initialize_display_info (struct pgtk_display_info *dpyinfo)
818818
Initialize global info and storage for display.
819819
-------------------------------------------------------------------------- */
820820
{
821-
dpyinfo->resx = 72.27; /* used 75.0, but this makes pt == pixel, expected */
822-
dpyinfo->resy = 72.27;
821+
dpyinfo->resx = 96;
822+
dpyinfo->resy = 96;
823823
dpyinfo->color_p = 1;
824824
dpyinfo->n_planes = 32;
825825
dpyinfo->root_window = 42; /* a placeholder.. */
@@ -5393,7 +5393,7 @@ static gboolean window_state_event(GtkWidget *widget, GdkEvent *event, gpointer
53935393

53945394
if (inev.ie.kind != NO_EVENT)
53955395
evq_enqueue(&inev);
5396-
return TRUE;
5396+
return FALSE;
53975397
}
53985398

53995399
static gboolean delete_event(GtkWidget *widget, GdkEvent *event, gpointer *user_data)
@@ -6288,7 +6288,13 @@ pgtk_term_init (Lisp_Object display_name, char *resource_name)
62886288

62896289
{
62906290
GdkScreen *gscr = gdk_display_get_default_screen(dpyinfo->gdpy);
6291-
gdouble dpi = gdk_screen_get_resolution(gscr);
6291+
6292+
GSettings *set = g_settings_new("org.gnome.desktop.interface");
6293+
gdouble x = g_settings_get_double(set,"text-scaling-factor");
6294+
gdouble dpi = 0;
6295+
6296+
dpi = 96.0 * x;
6297+
gdk_screen_set_resolution(gscr, dpi);
62926298
dpyinfo->resx = dpi;
62936299
dpyinfo->resy = dpi;
62946300
}

0 commit comments

Comments
 (0)