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.

diff --git a/src/ChangeLog b/src/ChangeLog
index 5aec2645907263af72beaec0034ccdb81902f0d1..9c536990bdacdb2829ac275cbef4b29e1e52911b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2013-12-05  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * nsfns.m (ns_frame_parm_handlers): Add right/bottom_divider_width.
+
+       * nsterm.m (x_set_window_size): Handle pixelwise.
+
 2013-12-05  Martin Rudalics  <rudalics@gmx.at>
 
        * w32term.c (x_new_font):

diff --git a/src/nsfns.m b/src/nsfns.m
index 550e625c4240def07665365c1e5f439f10cfeba2..13103582891bf27f9287646733b95d17937c714a 100644 (file)
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -946,6 +946,8 @@ frame_parm_handler ns_frame_parm_handlers[] =
   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,

diff --git a/src/nsterm.m b/src/nsterm.m
index e58ac9b927780f5f8be9c4c7260e469fe8bd2af3..3e6ceae6580808c6f5cc12cb627efcf8c76183f1 100644 (file)
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -1258,7 +1258,7 @@ x_set_window_size (struct frame *f, int change_grav, int cols, int rows, bool pi
   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 @@ x_set_window_size (struct frame *f, int change_grav, int cols, int rows, bool pi
   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])