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.245 by root, Fri Jan 6 18:33:30 2006 UTC vs.
Revision 1.248 by root, Sun Jan 8 00:07:18 2006 UTC

… …
1312 dDisp; 1312 dDisp;
1313 1313
1314 SET_R (this); 1314 SET_R (this);
1315 SET_LOCALE (locale); 1315 SET_LOCALE (locale);
1316 1316
1317#if defined(CURSOR_BLINK)
1318 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1319 {
1320 if (hidden_cursor)
1321 {
1322 hidden_cursor = 0;
1323 want_refresh = 1;
1324 }
1325
1326 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1327 }
1328#endif
1329
1330#if defined(POINTER_BLANK)
1331 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1332 {
1333 if (ev.type == MotionNotify
1334 || ev.type == ButtonPress
1335 || ev.type == ButtonRelease)
1336 if (hidden_pointer)
1337 pointer_unblank ();
1338
1339 if (ev.type == KeyPress && hidden_pointer == 0)
1340 pointer_blank ();
1341 }
1342#endif
1343
1344 Window unused_root, unused_child; 1317 Window unused_root, unused_child;
1345 int unused_root_x, unused_root_y; 1318 int unused_root_x, unused_root_y;
1346 unsigned int unused_mask; 1319 unsigned int unused_mask;
1347 1320
1348 switch (ev.type) 1321 switch (ev.type)
… …
1378 && ((ks >= 0x40 && ks <= 0x5f) 1351 && ((ks >= 0x40 && ks <= 0x5f)
1379 || (ks >= 0x61 && ks <= 0x7f))) 1352 || (ks >= 0x61 && ks <= 0x7f)))
1380 { 1353 {
1381 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1354 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1382 commit_iso14755 (); 1355 commit_iso14755 ();
1383 return; // case-break; 1356 goto skip_switch;
1384 } 1357 }
1385 1358
1386 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1359 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1387 if (i[0] == ks) 1360 if (i[0] == ks)
1388 { 1361 {
1389 iso14755buf = ISO_14755_51 | i[1]; 1362 iso14755buf = ISO_14755_51 | i[1];
1390 commit_iso14755 (); 1363 commit_iso14755 ();
1391 return; // case-break; 1364 goto skip_switch;
1392 } 1365 }
1393 1366
1394 scr_bell (); 1367 scr_bell ();
1395# endif 1368# endif
1396 iso14755buf = 0; 1369 iso14755buf = 0;
… …
1562 1535
1563 case SelectionRequest: 1536 case SelectionRequest:
1564 selection_send (ev.xselectionrequest); 1537 selection_send (ev.xselectionrequest);
1565 break; 1538 break;
1566 1539
1540 case MapNotify:
1541 mapped = 1;
1542#ifdef TEXT_BLINK
1543 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1544#endif
1545 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1546 break;
1547
1567 case UnmapNotify: 1548 case UnmapNotify:
1568 mapped = 0; 1549 mapped = 0;
1569#ifdef TEXT_BLINK 1550#ifdef TEXT_BLINK
1570 text_blink_ev.stop (); 1551 text_blink_ev.stop ();
1571#endif 1552#endif
1572 break; 1553 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1573
1574 case MapNotify:
1575 mapped = 1;
1576#ifdef TEXT_BLINK
1577 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1578#endif
1579 break; 1554 break;
1580 1555
1581#ifdef TRANSPARENT 1556#ifdef TRANSPARENT
1582 case ReparentNotify: 1557 case ReparentNotify:
1583 rootwin_cb (ev); 1558 rootwin_cb (ev);
… …
1740 refresh_limit = 0; 1715 refresh_limit = 0;
1741 scrollbar_show (1); 1716 scrollbar_show (1);
1742 } 1717 }
1743 break; 1718 break;
1744 } 1719 }
1720
1721skip_switch: ;
1722
1723#if defined(CURSOR_BLINK)
1724 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1725 {
1726 if (hidden_cursor)
1727 {
1728 hidden_cursor = 0;
1729 want_refresh = 1;
1730 }
1731
1732 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1733 }
1734#endif
1735
1736#if defined(POINTER_BLANK)
1737 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1738 {
1739 if (ev.type == MotionNotify
1740 || ev.type == ButtonPress
1741 || ev.type == ButtonRelease)
1742 if (hidden_pointer)
1743 pointer_unblank ();
1744
1745 if (ev.type == KeyPress && hidden_pointer == 0)
1746 pointer_blank ();
1747 }
1748#endif
1745} 1749}
1746 1750
1747void 1751void
1748rxvt_term::focus_in () 1752rxvt_term::focus_in ()
1749{ 1753{
… …
2890// read the next octet 2894// read the next octet
2891uint32_t 2895uint32_t
2892rxvt_term::next_octet () 2896rxvt_term::next_octet ()
2893{ 2897{
2894 return cmdbuf_ptr < cmdbuf_endp 2898 return cmdbuf_ptr < cmdbuf_endp
2895 ? *cmdbuf_ptr++ 2899 ? (unsigned char)*cmdbuf_ptr++
2896 : NOCHAR; 2900 : NOCHAR;
2897} 2901}
2898 2902
2899/* rxvt_cmd_getc () - Return next input character */ 2903/* rxvt_cmd_getc () - Return next input character */
2900/* 2904/*

Diff Legend

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