Mercurial > hg > xemacs-beta

comparison src/frame-gtk.c @ 5047:07dcc7000bbf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
put width before height consistently, fix a real bug found in the process -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2010-02-20 Ben Wing <ben@xemacs.org> * EmacsFrame.c (EmacsFrameRecomputeCellSize): * faces.c (default_face_font_info): * faces.c (default_face_width_and_height): * faces.c (Fface_list): * faces.h: * frame-gtk.c (gtk_set_initial_frame_size): * frame-gtk.c (gtk_set_frame_size): * frame-gtk.c (gtk_recompute_cell_sizes): * frame.c: * frame.c (frame_conversion_internal_1): * frame.c (change_frame_size_1): * frame.c (change_frame_size): * glyphs-msw.c (mswindows_combo_box_instantiate): * glyphs-widget.c (widget_instantiate): * glyphs-widget.c (tree_view_query_geometry): * glyphs-widget.c (Fwidget_logical_to_character_width): * glyphs-widget.c (Fwidget_logical_to_character_height): * indent.c (vmotion_pixels): * redisplay-output.c (get_cursor_size_and_location): * redisplay-xlike-inc.c (XLIKE_output_eol_cursor): * redisplay-xlike-inc.c (XLIKE_flash): * redisplay.c (calculate_baseline): * redisplay.c (start_with_point_on_display_line): * redisplay.c (glyph_to_pixel_translation): * redisplay.c (pixel_to_glyph_translation): * window.c (margin_width_internal): * window.c (frame_size_valid_p): * window.c (frame_pixsize_valid_p): * window.c (check_frame_size): * window.c (set_window_pixsize): * window.c (window_pixel_height_to_char_height): * window.c (window_char_height_to_pixel_height): * window.c (window_displayed_height): * window.c (window_pixel_width_to_char_width): * window.c (window_char_width_to_pixel_width): * window.c (change_window_height): * window.c (window_scroll): * window.h: IMPORTANT: Aidan and Carbon Repo, please pay attention and fix appropriately! Rename: default_face_height_and_width -> default_face_width_and_height and reverse width/height arguments. Reverse width/height arguments to the following functions: -- default_face_font_info -- default_face_height_and_width (see above) -- check_frame_size -- frame_size_valid_p (made into a static function) Fix a redisplay bug where args to default_face_height_and_width were in the wrong order.
author Ben Wing <ben@xemacs.org>
date Sat, 20 Feb 2010 18:56:01 -0600
parents d0c14ea98592
children 0ca81354c4c7 2a462149bd6a 8b2f75cecb89
comparison
equal deleted inserted replaced
5046:d4f666cda5e6 5047:07dcc7000bbf
371 371
372 if (GTK_IS_WINDOW (shell)) 372 if (GTK_IS_WINDOW (shell))
373 { 373 {
374 GdkWindowHints geometry_mask = GDK_HINT_RESIZE_INC; 374 GdkWindowHints geometry_mask = GDK_HINT_RESIZE_INC;
375 /* Deal with the cell size */ 375 /* Deal with the cell size */
376 default_face_height_and_width (wrap_frame (f), &geometry.height_inc, &geometry.width_inc); 376 default_face_width_and_height (wrap_frame (f), &geometry.width_inc, &geometry.height_inc);
377 377
378 gtk_window_set_geometry_hints (GTK_WINDOW (shell), 378 gtk_window_set_geometry_hints (GTK_WINDOW (shell),
379 FRAME_GTK_TEXT_WIDGET (f), &geometry, geometry_mask); 379 FRAME_GTK_TEXT_WIDGET (f), &geometry, geometry_mask);
380 gdk_window_set_hints (GET_GTK_WIDGET_WINDOW (shell), x, y, 0, 0, 0, 0, GDK_HINT_POS); 380 gdk_window_set_hints (GET_GTK_WIDGET_WINDOW (shell), x, y, 0, 0, 0, 0, GDK_HINT_POS);
381 gtk_window_set_policy (GTK_WINDOW (shell), TRUE, TRUE, FALSE); 381 gtk_window_set_policy (GTK_WINDOW (shell), TRUE, TRUE, FALSE);
1189 if (GTK_IS_WINDOW (shell)) 1189 if (GTK_IS_WINDOW (shell))
1190 { 1190 {
1191 GdkWindowHints geometry_mask = GDK_HINT_RESIZE_INC; 1191 GdkWindowHints geometry_mask = GDK_HINT_RESIZE_INC;
1192 1192
1193 /* Update the cell size */ 1193 /* Update the cell size */
1194 default_face_height_and_width (wrap_frame (f), &geometry.height_inc, &geometry.width_inc); 1194 default_face_width_and_height (wrap_frame (f), &geometry.width_inc,
1195 &geometry.height_inc);
1195 1196
1196 gtk_window_set_geometry_hints (GTK_WINDOW (shell), 1197 gtk_window_set_geometry_hints (GTK_WINDOW (shell),
1197 FRAME_GTK_TEXT_WIDGET (f), &geometry, geometry_mask); 1198 FRAME_GTK_TEXT_WIDGET (f), &geometry, geometry_mask);
1198 } 1199 }
1199 1200
1370 GdkGeometry geometry; 1371 GdkGeometry geometry;
1371 GdkWindowHints geometry_mask; 1372 GdkWindowHints geometry_mask;
1372 gint width_inc = 10; 1373 gint width_inc = 10;
1373 gint height_inc = 10; 1374 gint height_inc = 10;
1374 1375
1375 default_face_height_and_width (wrap_frame (frm), &height_inc, &width_inc); 1376 default_face_width_and_height (wrap_frame (frm), &width_inc, &height_inc);
1376 geometry_mask = GDK_HINT_RESIZE_INC; 1377 geometry_mask = GDK_HINT_RESIZE_INC;
1377 geometry.width_inc = width_inc; 1378 geometry.width_inc = width_inc;
1378 geometry.height_inc = height_inc; 1379 geometry.height_inc = height_inc;
1379 1380
1380 gtk_window_set_geometry_hints (w, FRAME_GTK_TEXT_WIDGET (frm), &geometry, geometry_mask); 1381 gtk_window_set_geometry_hints (w, FRAME_GTK_TEXT_WIDGET (frm), &geometry, geometry_mask);