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.382 by root, Fri Dec 14 06:04:56 2007 UTC vs.
Revision 1.394 by ayin, Sat Jan 19 15:00:49 2008 UTC

… …
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-2007 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
198 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
200 201
201 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
202 203
203 max_it (width, 8+5); // for char + hey 204 max_it (width, 8+5); // for char + hex
204 max_it (width, strlen (attr)); 205 max_it (width, strlen (attr));
205 206
206 if (y >= 0) 207 if (y >= 0)
207 { 208 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
… …
220 ch = *chr++; 221 ch = *chr++;
221 222
222 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
224 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
225# if !UNICODE3 226# if !UNICODE_3
226 if (ch >= 0x10000) 227 if (ch >= 0x10000)
227 ch = 0xfffd; 228 ch = 0xfffd;
228# endif 229# endif
229 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
230 231
… …
1078{ 1079{
1079 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1080 if (scr_refresh_rend (RS_Blink, RS_Blink))
1080 { 1081 {
1081 hidden_text = !hidden_text; 1082 hidden_text = !hidden_text;
1082 want_refresh = 1; 1083 want_refresh = 1;
1083 refresh_check (); 1084 refresh_check ();
1084 } 1085 }
1085 else 1086 else
1086 w.stop (); 1087 w.stop ();
1087} 1088}
1088#endif 1089#endif
… …
1211 if (cmd_parse ()) 1212 if (cmd_parse ())
1212 break; 1213 break;
1213 1214
1214 if (revents & ev::WRITE) 1215 if (revents & ev::WRITE)
1215 pty_write (); 1216 pty_write ();
1217
1218 refresh_check ();
1216} 1219}
1217 1220
1218void 1221void
1219rxvt_term::pointer_unblank () 1222rxvt_term::pointer_unblank ()
1220{ 1223{
… …
1435 && ev.xfocus.mode != NotifyGrab) 1438 && ev.xfocus.mode != NotifyGrab)
1436 focus_out (); 1439 focus_out ();
1437 break; 1440 break;
1438 1441
1439 case ConfigureNotify: 1442 case ConfigureNotify:
1440 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n", 1443 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1441 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y, 1444 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1442 szHint.width, szHint.height); */ 1445 szHint.width, szHint.height); */
1443 if (ev.xconfigure.window == parent[0]) 1446 if (ev.xconfigure.window == parent[0])
1444 { 1447 {
1445 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
… …
1452 } 1455 }
1453 else 1456 else
1454 { 1457 {
1455#ifdef HAVE_BG_PIXMAP 1458#ifdef HAVE_BG_PIXMAP
1456 if (bgPixmap.window_position_sensitive ()) 1459 if (bgPixmap.window_position_sensitive ())
1460 {
1461 if (mapped)
1457 update_background (); 1462 update_background ();
1463 else
1464 bgPixmap.invalidate ();
1465 }
1458#endif 1466#endif
1459 } 1467 }
1468
1460 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1469 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1461 } 1470 }
1462 break; 1471 break;
1463 1472
1464 case PropertyNotify: 1473 case PropertyNotify:
… …
1481 case SelectionRequest: 1490 case SelectionRequest:
1482 selection_send (ev.xselectionrequest); 1491 selection_send (ev.xselectionrequest);
1483 break; 1492 break;
1484 1493
1485 case MapNotify: 1494 case MapNotify:
1495#ifdef HAVE_BG_PIXMAP
1496 /* This is needed spcifically to fix the case of no window manager or a
1497 * non-reparenting window manager. In those cases we never get first
1498 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1499 * care of multiplicity of ConfigureNotify events arriwing while WM does
1500 * reparenting.
1501 * We should not render background immidiately, as there could be several
1502 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1503 * by scheduling background redraw as soon as we can, but giving a short
1504 * bit of time for ConfigureNotifies to arrive.
1505 * We should render background PRIOR to drawing any text, but AFTER all
1506 * of ConfigureNotifys for the best results.
1507 */
1508 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1509 update_background_ev.start (0.025);
1510#endif
1486 mapped = 1; 1511 mapped = 1;
1487#ifdef TEXT_BLINK 1512#ifdef TEXT_BLINK
1488 text_blink_ev.start (); 1513 text_blink_ev.start ();
1489#endif 1514#endif
1490 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1515 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1526 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1551 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1527 ; 1552 ;
1528 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1529 ; 1554 ;
1530 1555
1531 if (isScrollbarWindow (ev.xany.window)) 1556 if (scrollBar.state && ev.xany.window == scrollBar.win)
1532 { 1557 {
1533 scrollBar.setIdle (); 1558 scrollBar.setIdle ();
1534 scrollbar_show (0); 1559 scrollbar_show (0);
1535 } 1560 }
1536 } 1561 }
… …
1626#ifdef MOUSE_THRESHOLD 1651#ifdef MOUSE_THRESHOLD
1627 } 1652 }
1628#endif 1653#endif
1629 } 1654 }
1630 } 1655 }
1631 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1656 else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win)
1632 { 1657 {
1633 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1634 MotionNotify, &ev)) 1659 MotionNotify, &ev))
1635 ; 1660 ;
1636 1661
… …
1792 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1817 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1793 { 1818 {
1794 bgPixmap.set_root_pixmap (); 1819 bgPixmap.set_root_pixmap ();
1795 update_background (); 1820 update_background ();
1796 } 1821 }
1822
1797 break; 1823 break;
1798 } 1824 }
1799# endif 1825# endif
1800 1826
1801 refresh_check (); 1827 refresh_check ();
… …
1919 } 1945 }
1920 1946
1921 /* 1947 /*
1922 * Scrollbar window processing of button press 1948 * Scrollbar window processing of button press
1923 */ 1949 */
1924 if (isScrollbarWindow (ev.window)) 1950 if (scrollBar.state && ev.window == scrollBar.win)
1925 { 1951 {
1926 scrollBar.setIdle (); 1952 scrollBar.setIdle ();
1927 /* 1953 /*
1928 * Rxvt-style scrollbar: 1954 * Rxvt-style scrollbar:
1929 * move up if mouse is above slider 1955 * move up if mouse is above slider
… …
2003 } 2029 }
2004 else 2030 else
2005 switch (ev.button) 2031 switch (ev.button)
2006 { 2032 {
2007 case Button2: 2033 case Button2:
2008 switch (scrollbar_align) 2034 switch (scrollBar.align)
2009 { 2035 {
2010 case R_SB_ALIGN_TOP: 2036 case R_SB_ALIGN_TOP:
2011 csrO = 0; 2037 csrO = 0;
2012 break; 2038 break;
2013 case R_SB_ALIGN_CENTRE: 2039 case R_SB_ALIGN_CENTRE:
… …
2025 2051
2026 scrollBar.setMotion (); 2052 scrollBar.setMotion ();
2027 break; 2053 break;
2028 2054
2029 case Button1: 2055 case Button1:
2030 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2056 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2031 csrO = ev.y - scrollBar.top; 2057 csrO = ev.y - scrollBar.top;
2032 /* FALLTHROUGH */ 2058 /* FALLTHROUGH */
2033 2059
2034 case Button3: 2060 case Button3:
2035 if (scrollBar.style != R_SB_XTERM) 2061 if (scrollBar.style != R_SB_XTERM)
… …
2165 2191
2166 if (!slip_wheel_ev.is_active ()) 2192 if (!slip_wheel_ev.is_active ())
2167 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2193 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2168 } 2194 }
2169 else 2195 else
2196# endif
2170 { 2197 {
2171# endif
2172 scr_page (v, i); 2198 scr_page (v, i);
2173 scrollbar_show (1); 2199 scrollbar_show (1);
2174# ifdef MOUSE_SLIP_WHEELING
2175 } 2200 }
2176# endif
2177 } 2201 }
2178 break; 2202 break;
2179#endif 2203#endif
2180 } 2204 }
2181 } 2205 }
… …
2310 } 2334 }
2311 2335
2312 ch = NOCHAR; 2336 ch = NOCHAR;
2313 } 2337 }
2314 } 2338 }
2315
2316 refresh_check ();
2317 2339
2318 return flag; 2340 return flag;
2319} 2341}
2320 2342
2321// read the next character 2343// read the next character
… …
3351 *buf++ = '\0'; 3373 *buf++ = '\0';
3352 3374
3353 process_color_seq (op, color, name, resp); 3375 process_color_seq (op, color, name, resp);
3354 } 3376 }
3355 break; 3377 break;
3378 case Rxvt_restoreFG:
3356 case XTerm_Color00: 3379 case XTerm_Color00:
3357 process_color_seq (op, Color_fg, str, resp); 3380 process_color_seq (op, Color_fg, str, resp);
3358 break; 3381 break;
3382 case Rxvt_restoreBG:
3359 case XTerm_Color01: 3383 case XTerm_Color01:
3360 process_color_seq (op, Color_bg, str, resp); 3384 process_color_seq (op, Color_bg, str, resp);
3361 break; 3385 break;
3362#ifndef NO_CURSORCOLOR 3386#ifndef NO_CURSORCOLOR
3363 case XTerm_Color_cursor: 3387 case XTerm_Color_cursor:
… …
3389#if ENABLE_TRANSPARENCY 3413#if ENABLE_TRANSPARENCY
3390 case URxvt_Color_tint: 3414 case URxvt_Color_tint:
3391 process_color_seq (op, Color_tint, str, resp); 3415 process_color_seq (op, Color_tint, str, resp);
3392 { 3416 {
3393 bool changed = false; 3417 bool changed = false;
3418
3394 if (ISSET_PIXCOLOR (Color_tint)) 3419 if (ISSET_PIXCOLOR (Color_tint))
3395 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3420 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3396 else 3421 else
3397 changed = bgPixmap.unset_tint (); 3422 changed = bgPixmap.unset_tint ();
3423
3398 if (changed) 3424 if (changed)
3399 update_background (); 3425 update_background ();
3400 } 3426 }
3401 3427
3402 break; 3428 break;
… …
3425 changed++; 3451 changed++;
3426 str = strchr (str, ';'); 3452 str = strchr (str, ';');
3427 if (str == NULL) 3453 if (str == NULL)
3428 bgPixmap.set_defaultGeometry (); 3454 bgPixmap.set_defaultGeometry ();
3429 } 3455 }
3456
3430 while (str) 3457 while (str)
3431 { 3458 {
3432 str++; 3459 str++;
3433 if (bgPixmap.set_geometry (str)) 3460 if (bgPixmap.set_geometry (str))
3434 changed++; 3461 changed++;
3435 str = strchr (str, ';'); 3462 str = strchr (str, ';');
3436 } 3463 }
3464
3437 if (changed) 3465 if (changed)
3438 update_background (); 3466 update_background ();
3439 } 3467 }
3440 break; 3468 break;
3441#endif 3469#endif
3442
3443 case Rxvt_restoreFG:
3444 set_window_color (Color_fg, str);
3445 break;
3446 case Rxvt_restoreBG:
3447 set_window_color (Color_bg, str);
3448 break;
3449 3470
3450 case XTerm_logfile: 3471 case XTerm_logfile:
3451 // TODO, when secure mode? 3472 // TODO, when secure mode?
3452 break; 3473 break;
3453 3474
… …
3665 */ 3686 */
3666 PrivMode (1, PrivMode_vt52); 3687 PrivMode (1, PrivMode_vt52);
3667 break; 3688 break;
3668 case 3: /* 80/132 */ 3689 case 3: /* 80/132 */
3669 if (priv_modes & PrivMode_132OK) 3690 if (priv_modes & PrivMode_132OK)
3691 {
3692 scr_poweron ();
3670 set_widthheight (((state ? 132 : 80) * fwidth), height); 3693 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3694 }
3671 break; 3695 break;
3672 case 4: /* smooth scrolling */ 3696 case 4: /* smooth scrolling */
3673 set_option (Opt_jumpScroll, !state); 3697 set_option (Opt_jumpScroll, !state);
3674 break; 3698 break;
3675 case 5: /* reverse video */ 3699 case 5: /* reverse video */

Diff Legend

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