diff options
| -rw-r--r-- | src/nsterm.m | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/src/nsterm.m b/src/nsterm.m index 8336a163f53..651b400d8bf 100644 --- a/src/nsterm.m +++ b/src/nsterm.m | |||
| @@ -3503,6 +3503,23 @@ x_wm_set_icon_position (struct frame *f, int icon_x, int icon_y) | |||
| 3503 | 3503 | ||
| 3504 | ========================================================================== */ | 3504 | ========================================================================== */ |
| 3505 | 3505 | ||
| 3506 | int | ||
| 3507 | x_display_pixel_height (dpyinfo) | ||
| 3508 | struct ns_display_info *dpyinfo; | ||
| 3509 | { | ||
| 3510 | NSScreen *screen = [NSScreen mainScreen]; | ||
| 3511 | return [screen frame].size.height; | ||
| 3512 | } | ||
| 3513 | |||
| 3514 | int | ||
| 3515 | x_display_pixel_width (dpyinfo) | ||
| 3516 | struct ns_display_info *dpyinfo; | ||
| 3517 | { | ||
| 3518 | NSScreen *screen = [NSScreen mainScreen]; | ||
| 3519 | return [screen frame].size.width; | ||
| 3520 | } | ||
| 3521 | |||
| 3522 | |||
| 3506 | static Lisp_Object ns_string_to_lispmod (const char *s) | 3523 | static Lisp_Object ns_string_to_lispmod (const char *s) |
| 3507 | /* -------------------------------------------------------------------------- | 3524 | /* -------------------------------------------------------------------------- |
| 3508 | Convert modifier name to lisp symbol | 3525 | Convert modifier name to lisp symbol |
| @@ -3602,8 +3619,6 @@ ns_initialize_display_info (struct ns_display_info *dpyinfo) | |||
| 3602 | NSScreen *screen = [NSScreen mainScreen]; | 3619 | NSScreen *screen = [NSScreen mainScreen]; |
| 3603 | NSWindowDepth depth = [screen depth]; | 3620 | NSWindowDepth depth = [screen depth]; |
| 3604 | 3621 | ||
| 3605 | dpyinfo->width = [screen frame].size.width; | ||
| 3606 | dpyinfo->height = [screen frame].size.height; | ||
| 3607 | dpyinfo->resx = 72.27; /* used 75.0, but this makes pt == pixel, expected */ | 3622 | dpyinfo->resx = 72.27; /* used 75.0, but this makes pt == pixel, expected */ |
| 3608 | dpyinfo->resy = 72.27; | 3623 | dpyinfo->resy = 72.27; |
| 3609 | dpyinfo->color_p = ![NSDeviceWhiteColorSpace isEqualToString: | 3624 | dpyinfo->color_p = ![NSDeviceWhiteColorSpace isEqualToString: |