projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 25f687b8 AM |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.1.141 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=ISO-8859-1 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.1.141 | |
| 11 | Problem: GTK: -geom argument doesn't support a negative offset. | |
| 12 | Solution: Compute position from the right/lower corner. | |
| 13 | Files: src/gui_gtk_x11.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.1.140/src/gui_gtk_x11.c Sat Sep 15 14:06:41 2007 | |
| 17 | --- src/gui_gtk_x11.c Mon Oct 8 21:26:50 2007 | |
| 18 | *************** | |
| 19 | *** 4044,4049 **** | |
| 20 | --- 4044,4051 ---- | |
| 21 | unsigned int w, h; | |
| 22 | int x = 0; | |
| 23 | int y = 0; | |
| 24 | + guint pixel_width; | |
| 25 | + guint pixel_height; | |
| 26 | ||
| 27 | mask = XParseGeometry((char *)gui.geom, &x, &y, &w, &h); | |
| 28 | ||
| 29 | *************** | |
| 30 | *** 4055,4066 **** | |
| 31 | --- 4057,4087 ---- | |
| 32 | p_window = h - 1; | |
| 33 | Rows = h; | |
| 34 | } | |
| 35 | + | |
| 36 | + pixel_width = (guint)(gui_get_base_width() + Columns * gui.char_width); | |
| 37 | + pixel_height = (guint)(gui_get_base_height() + Rows * gui.char_height); | |
| 38 | + | |
| 39 | + #ifdef HAVE_GTK2 | |
| 40 | + pixel_width += get_menu_tool_width(); | |
| 41 | + pixel_height += get_menu_tool_height(); | |
| 42 | + #endif | |
| 43 | + | |
| 44 | if (mask & (XValue | YValue)) | |
| 45 | + { | |
| 46 | + int w, h; | |
| 47 | + gui_mch_get_screen_dimensions(&w, &h); | |
| 48 | + h += p_ghr + get_menu_tool_height(); | |
| 49 | + w += get_menu_tool_width(); | |
| 50 | + if (mask & XNegative) | |
| 51 | + x += w - pixel_width; | |
| 52 | + if (mask & YNegative) | |
| 53 | + y += h - pixel_height; | |
| 54 | #ifdef HAVE_GTK2 | |
| 55 | gtk_window_move(GTK_WINDOW(gui.mainwin), x, y); | |
| 56 | #else | |
| 57 | gtk_widget_set_uposition(gui.mainwin, x, y); | |
| 58 | #endif | |
| 59 | + } | |
| 60 | vim_free(gui.geom); | |
| 61 | gui.geom = NULL; | |
| 62 | ||
| 63 | *************** | |
| 64 | *** 4071,4084 **** | |
| 65 | */ | |
| 66 | if (gtk_socket_id != 0 && (mask & WidthValue || mask & HeightValue)) | |
| 67 | { | |
| 68 | - guint pixel_width = (guint)(gui_get_base_width() + Columns * gui.char_width); | |
| 69 | - guint pixel_height = (guint)(gui_get_base_height() + Rows * gui.char_height); | |
| 70 | - | |
| 71 | - #ifdef HAVE_GTK2 | |
| 72 | - pixel_width += get_menu_tool_width(); | |
| 73 | - pixel_height += get_menu_tool_height(); | |
| 74 | - #endif | |
| 75 | - | |
| 76 | update_window_manager_hints(pixel_width, pixel_height); | |
| 77 | init_window_hints_state = 1; | |
| 78 | g_timeout_add(1000, check_startup_plug_hints, NULL); | |
| 79 | --- 4092,4097 ---- | |
| 80 | *** ../vim-7.1.140/src/version.c Sun Oct 14 17:15:45 2007 | |
| 81 | --- src/version.c Fri Oct 19 14:28:52 2007 | |
| 82 | *************** | |
| 83 | *** 668,669 **** | |
| 84 | --- 668,671 ---- | |
| 85 | { /* Add new patch number below this line */ | |
| 86 | + /**/ | |
| 87 | + 141, | |
| 88 | /**/ | |
| 89 | ||
| 90 | -- | |
| 91 | hundred-and-one symptoms of being an internet addict: | |
| 92 | 35. Your husband tells you he's had the beard for 2 months. | |
| 93 | ||
| 94 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 95 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 96 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 97 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |