[Emacs-diffs] trunk r115388: Fix some pixelwise breakage, more remain.

[Jan D.]

------------------------------------------------------------
revno: 115388
revision-id: address@hidden
parent: address@hidden
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Thu 2013-12-05 17:20:11 +0100
message:
  Fix some pixelwise breakage, more remain.
  
  * nsfns.m (ns_frame_parm_handlers): Add right/bottom_divider_width.
  
  * nsterm.m (x_set_window_size): Handle pixelwise.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/nsfns.m                    nsfns.m-20091113204419-o5vbwnq5f7feedwu-8741
  src/nsterm.m                   nsterm.m-20091113204419-o5vbwnq5f7feedwu-8747

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-12-05 13:46:30 +0000
+++ b/src/ChangeLog     2013-12-05 16:20:11 +0000
@@ -1,3 +1,9 @@
+2013-12-05  Jan Djärv  <address@hidden>
+
+       * nsfns.m (ns_frame_parm_handlers): Add right/bottom_divider_width.
+
+       * nsterm.m (x_set_window_size): Handle pixelwise.
+
 2013-12-05  Martin Rudalics  <address@hidden>
 
        * w32term.c (x_new_font):

=== modified file 'src/nsfns.m'
--- a/src/nsfns.m       2013-11-30 09:25:31 +0000
+++ b/src/nsfns.m       2013-12-05 16:20:11 +0000
@@ -946,6 +946,8 @@
   x_set_icon_name,
   x_set_icon_type,
   x_set_internal_border_width, /* generic OK */
+  0, /* x_set_right_divider_width */
+  0, /* x_set_bottom_divider_width */
   x_set_menu_bar_lines,
   x_set_mouse_color,
   x_explicitly_set_name,

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2013-12-01 22:33:13 +0000
+++ b/src/nsterm.m      2013-12-05 16:20:11 +0000
@@ -1258,7 +1258,7 @@
   if (view == nil)
     return;
 
-/*fprintf (stderr, "\tsetWindowSize: %d x %d, font size %d x %d\n", cols, 
rows, FRAME_COLUMN_WIDTH (f), FRAME_LINE_HEIGHT (f)); */
+/*fprintf (stderr, "\tsetWindowSize: %d x %d, pixelwise %d, font size %d x 
%d\n", cols, rows, pixelwise, FRAME_COLUMN_WIDTH (f), FRAME_LINE_HEIGHT (f));*/
 
   block_input ();
 
@@ -1267,8 +1267,18 @@
   f->scroll_bar_actual_width = NS_SCROLL_BAR_WIDTH (f);
   compute_fringe_widths (f, 0);
 
-  pixelwidth =  FRAME_TEXT_COLS_TO_PIXEL_WIDTH   (f, cols);
-  pixelheight = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, rows);
+  if (pixelwise)
+    {
+      pixelwidth = FRAME_TEXT_TO_PIXEL_WIDTH (f, cols);
+      pixelheight = FRAME_TEXT_TO_PIXEL_HEIGHT (f, rows);
+      cols = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, pixelwidth);
+      rows = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, pixelheight);
+    }
+  else
+    {
+      pixelwidth =  FRAME_TEXT_COLS_TO_PIXEL_WIDTH   (f, cols);
+      pixelheight = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, rows);
+    }
 
   /* If we have a toolbar, take its height into account. */
   if (tb && ! [view isFullscreen])