ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.514 by root, Mon Jun 4 15:18:52 2012 UTC vs.
Revision 1.531 by sf-exg, Sun Dec 30 20:28:31 2012 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
… …
149 149
150 text_t t = l.t[x]; 150 text_t t = l.t[x];
151 151
152 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
153 { 153 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
156 break; 156 break;
157 } 157 }
158 158
159 x--; 159 x--;
160 } 160 }
161} 161}
162 162
163void ecb_cold 163void ecb_cold
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 wchar_t *chr, *alloc, ch2, **fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169 169
… …
181 181
182 alloc = 0; 182 alloc = 0;
183 chr = &ch2; 183 chr = &ch2;
184 len = 1; 184 len = 1;
185 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
186 189
187 char attr[80]; // plenty 190 char attr[80]; // plenty
188 191
189 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
190 (int)r, 193 (int)r,
… …
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])]; 206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name); 207 fname[i] = rxvt_utf8towcs (f->name);
205 max_it (width, wcswidth (fname[i], wcslen (fname[i]))); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 } 209 }
207 210
208 max_it (width, 8+5); // for char + hex
209 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
210 212
211 if (y >= 0) 213 if (y >= 0)
212 { 214 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214 x = 0; 216 x = 0;
215 } 217 }
216 218
217 scr_overlay_new (x, y, width, len * 2 + 1); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
218 222
219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
220 224
221 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
222 { 226 {
223 char buf[9]; 227 char buf[9];
224 228
225 ch = *chr++; 229 ch = *chr++;
226 230
227 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
228 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
229 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
230# if !UNICODE_3 234# if !UNICODE_3
231 if (ch >= 0x10000) 235 if (ch >= 0x10000)
232 ch = 0xfffd; 236 ch = 0xfffd;
233# endif 237# endif
234 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
235 239
236 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
237 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
238 } 242 }
239 243
240// { 244// {
241// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
243// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
244// } 248// }
245 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
246 for (int i = 0; i < len; i++) 250 for (int i = 0; i < len; i++)
247 { 251 {
248 scr_overlay_set (0, len + 1 + i, fname[i]); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
249 free (fname[i]); 253 free (fname[i]);
250 } 254 }
251 255
252# if ENABLE_COMBINING 256# if ENABLE_COMBINING
253 if (alloc) 257 if (alloc)
… …
937void 941void
938rxvt_term::flush () 942rxvt_term::flush ()
939{ 943{
940 flush_ev.stop (); 944 flush_ev.stop ();
941 945
942#ifdef HAVE_BG_PIXMAP 946#ifdef HAVE_IMG
943 if (bg_flags & BG_NEEDS_REFRESH) 947 if (bg_flags & BG_NEEDS_REFRESH)
944 { 948 {
945 bg_flags &= ~BG_NEEDS_REFRESH; 949 bg_flags &= ~BG_NEEDS_REFRESH;
946 scr_touch (false); 950 scr_touch (false);
947 } 951 }
… …
1461 if (ev.xconfigure.window == parent) 1465 if (ev.xconfigure.window == parent)
1462 { 1466 {
1463 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1467 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1464 ; 1468 ;
1465 1469
1470 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1471
1472 bool moved = false;
1466#ifdef HAVE_BG_PIXMAP 1473#ifdef HAVE_BG_PIXMAP
1467 bool moved = false;
1468 if (bg_window_position_sensitive ()) 1474 if (bg_window_position_sensitive ())
1469 { 1475 {
1476 want_position_change = true;
1477 if (bg_img == 0)
1478 moved = true;
1479 }
1480#endif
1481
1482 if (want_position_change)
1483 {
1470 int x, y; 1484 int x, y;
1485
1471 if (ev.xconfigure.send_event) 1486 if (ev.xconfigure.send_event)
1472 { 1487 {
1473 x = ev.xconfigure.x; 1488 x = ev.xconfigure.x;
1474 y = ev.xconfigure.y; 1489 y = ev.xconfigure.y;
1475 } 1490 }
1476 else 1491 else
1477 get_window_origin (x, y); 1492 get_window_origin (x, y);
1478 1493
1479 if (bg_set_position (x, y) 1494 if (x != parent_x || y != parent_y)
1480 || !(bg_flags & BG_IS_VALID)) 1495 {
1496 parent_x = x;
1497 parent_y = y;
1498 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1481 moved = true; 1499 moved = true;
1500 }
1482 } 1501 }
1483#endif
1484 1502
1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1503 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1486 { 1504 {
1487 seen_resize = 1; 1505 seen_resize = 1;
1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1506 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
… …
1511 selection_send (ev.xselectionrequest); 1529 selection_send (ev.xselectionrequest);
1512 break; 1530 break;
1513 1531
1514 case MapNotify: 1532 case MapNotify:
1515#ifdef HAVE_BG_PIXMAP 1533#ifdef HAVE_BG_PIXMAP
1516 /* This is needed specifically to fix the case of no window manager or a 1534 // This is needed at startup for the case of no window manager
1517 * non-reparenting window manager. In those cases we never get first 1535 // or a non-reparenting window manager and also because we
1518 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1536 // defer bg image updates if the window is not mapped. The
1519 * care of multiplicity of ConfigureNotify events arriving while WM does 1537 // short delay is to optimize for multiple ConfigureNotify
1520 * reparenting. 1538 // events at startup when the window manager reparents the
1521 * We should not render background immediately, as there could be several 1539 // window, so as to perform the computation after we have
1522 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1540 // received all of them.
1523 * by scheduling background redraw as soon as we can, but giving a short 1541 if (bg_img == 0)
1524 * bit of time for ConfigureNotifies to arrive.
1525 * We should render background PRIOR to drawing any text, but AFTER all
1526 * of ConfigureNotifys for the best results.
1527 */
1528 if (!(bg_flags & BG_IS_VALID))
1529 update_background_ev.start (0.025); 1542 update_background_ev.start (0.025);
1530#endif 1543#endif
1531 mapped = 1; 1544 mapped = 1;
1532#ifdef TEXT_BLINK 1545#ifdef TEXT_BLINK
1533 text_blink_ev.start (); 1546 text_blink_ev.start ();
… …
1820 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1833 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1821 } 1834 }
1822#endif 1835#endif
1823} 1836}
1824 1837
1825#if ENABLE_TRANSPARENCY || ENABLE_PERL 1838#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1826void ecb_hot 1839void ecb_hot
1827rxvt_term::rootwin_cb (XEvent &ev) 1840rxvt_term::rootwin_cb (XEvent &ev)
1828{ 1841{
1829 make_current (); 1842 make_current ();
1830 1843
1831 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1844 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1832 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1845 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1833 return; 1846 return;
1834 1847
1835# if ENABLE_TRANSPARENCY
1836 switch (ev.type) 1848 switch (ev.type)
1837 { 1849 {
1838 case PropertyNotify: 1850 case PropertyNotify:
1839 /* 1851 /*
1840 * if user used some Esetroot compatible prog to set the root bg, 1852 * if user used some Esetroot compatible prog to set the root bg,
1841 * use the property to determine the pixmap. We use it later on. 1853 * use the property to determine the pixmap. We use it later on.
1842 */ 1854 */
1843 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1855 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1844 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1856 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1845 { 1857 {
1858#if BG_IMAGE_FROM_ROOT
1859 if (option (Opt_transparent))
1860 {
1846 bg_set_root_pixmap (); 1861 bg_set_root_pixmap ();
1847 update_background (); 1862 update_background ();
1863 }
1864#endif
1865#if ENABLE_PERL
1866 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1867#endif
1848 } 1868 }
1849 1869
1850 break; 1870 break;
1851 } 1871 }
1852# endif
1853 1872
1854 refresh_check (); 1873 refresh_check ();
1855} 1874}
1856#endif 1875#endif
1857 1876
… …
2366 } 2385 }
2367 2386
2368 if (len == (size_t)-1) 2387 if (len == (size_t)-1)
2369 { 2388 {
2370 mbstate.reset (); // reset now undefined conversion state 2389 mbstate.reset (); // reset now undefined conversion state
2390 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2391 // in which case we "erroneously" return the next byte which might be valid.
2371 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2392 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2372 } 2393 }
2373 2394
2374 // assume wchar == unicode 2395 // assume wchar == unicode
2375 cmdbuf_ptr += len; 2396 cmdbuf_ptr += len;
… …
3430 break; 3451 break;
3431#endif 3452#endif
3432 case URxvt_Color_border: 3453 case URxvt_Color_border:
3433 process_color_seq (op, Color_border, str, resp); 3454 process_color_seq (op, Color_border, str, resp);
3434 break; 3455 break;
3435#if ENABLE_TRANSPARENCY 3456
3457#if BG_IMAGE_FROM_ROOT
3436 case URxvt_Color_tint: 3458 case URxvt_Color_tint:
3437 process_color_seq (op, Color_tint, str, resp); 3459 process_color_seq (op, Color_tint, str, resp);
3438 { 3460 {
3439 bool changed = false; 3461 bool changed = false;
3440 3462
… …
3451#if BG_IMAGE_FROM_FILE 3473#if BG_IMAGE_FROM_FILE
3452 case Rxvt_Pixmap: 3474 case Rxvt_Pixmap:
3453 if (!strcmp (str, "?")) 3475 if (!strcmp (str, "?"))
3454 { 3476 {
3455 char str[256]; 3477 char str[256];
3456 int h_scale = 0, v_scale = 0;
3457 int h_align = 0, v_align = 0;
3458 if (image_vec.size () > 0)
3459 {
3460 h_scale = image_vec[0].h_scale; 3478 int h_scale = fimage.h_scale;
3461 v_scale = image_vec[0].v_scale; 3479 int v_scale = fimage.v_scale;
3462 h_align = image_vec[0].h_align; 3480 int h_align = fimage.h_align;
3463 v_align = image_vec[0].v_align; 3481 int v_align = fimage.v_align;
3464 }
3465 3482
3466 sprintf (str, "[%dx%d+%d+%d]", 3483 sprintf (str, "[%dx%d+%d+%d]",
3467 h_scale, v_scale, 3484 h_scale, v_scale,
3468 h_align, v_align); 3485 h_align, v_align);
3469 process_xterm_seq (XTerm_title, str, CHAR_ST); 3486 process_xterm_seq (XTerm_title, str, CHAR_ST);
… …
3472 { 3489 {
3473 bool changed = false; 3490 bool changed = false;
3474 3491
3475 if (*str != ';') 3492 if (*str != ';')
3476 { 3493 {
3477 if (image_vec.size () > 0)
3478 changed = image_vec[0].set_file_geometry (str);
3479 else 3494 try
3480 { 3495 {
3481 rxvt_image *image = new_image ();
3482 if (!image->set_file_geometry (str)) 3496 fimage.set_file_geometry (this, str);
3483 image_vec.pop_back ();
3484 else
3485 changed = true; 3497 changed = true;
3498 }
3499 catch (const class rxvt_failure_exception &e)
3500 {
3486 } 3501 }
3487 } 3502 }
3488 else 3503 else
3489 { 3504 {
3490 str++; 3505 str++;
3491 if (image_vec.size () > 0)
3492 changed = image_vec[0].set_geometry (str, true); 3506 if (fimage.set_geometry (str, true))
3507 changed = true;
3493 } 3508 }
3494 3509
3495 if (changed) 3510 if (changed)
3496 { 3511 {
3497 if (bg_window_position_sensitive ()) 3512 if (bg_window_position_sensitive ())
3498 { 3513 {
3499 int x, y; 3514 int x, y;
3500 get_window_origin (x, y); 3515 get_window_origin (x, y);
3501 bg_set_position (x, y); 3516 parent_x = x;
3517 parent_y = y;
3502 } 3518 }
3503 update_background (); 3519 update_background ();
3504 } 3520 }
3505 } 3521 }
3506 break; 3522 break;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines