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.330 by root, Mon Jun 18 12:53:25 2007 UTC vs.
Revision 1.444 by sf-exg, Thu Apr 1 08:40:33 2010 UTC

… …
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-2006 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.
… …
95 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
97 98
98 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
162 162
163void 163void
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)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
197 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
201 198
199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++)
202 {
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
203 207
204 max_it (width, 8+5); // for char + hey 208 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
206 210
207 if (y >= 0) 211 if (y >= 0)
208 { 212 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 214 x = 0;
211 } 215 }
212 216
213 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
214 218
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 220
217 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
218 { 222 {
… …
221 ch = *chr++; 225 ch = *chr++;
222 226
223 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
225 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
226# if !UNICODE3 230# if !UNICODE_3
227 if (ch >= 0x10000) 231 if (ch >= 0x10000)
228 ch = 0xfffd; 232 ch = 0xfffd;
229# endif 233# endif
230 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
231 235
… …
237// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
240// } 244// }
241 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
242 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
243
244 free (fname); 249 free (fname[i]);
250 }
245 251
246# if ENABLE_COMBINING 252# if ENABLE_COMBINING
247 if (alloc) 253 if (alloc)
248 delete [] alloc; 254 delete [] alloc;
249# endif 255# endif
… …
279 } 285 }
280 286
281 iso14755buf = 0; 287 iso14755buf = 0;
282} 288}
283 289
284int 290static int
285rxvt_term::hex_keyval (XKeyEvent &ev) 291hex_keyval (XKeyEvent &ev)
286{ 292{
287 // check wether this event corresponds to a hex digit 293 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 294 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 295 for (int index = 0; index < 8; index++)
290 { 296 {
291 KeySym k = XLookupKeysym (&ev, index); 297 KeySym k = XLookupKeysym (&ev, index);
292 298
… …
298 304
299 return -1; 305 return -1;
300} 306}
301#endif 307#endif
302 308
309static inline KeySym
310translate_keypad (KeySym keysym, bool kp)
311{
312#ifdef XK_KP_Home
313 static const KeySym keypadtrans[] = {
314 XK_KP_7, // XK_KP_Home
315 XK_KP_4, // XK_KP_Left
316 XK_KP_8, // XK_KP_Up
317 XK_KP_6, // XK_KP_Right
318 XK_KP_2, // XK_KP_Down
319# ifndef UNSHIFTED_SCROLLKEYS
320 XK_KP_9, // XK_KP_Prior
321 XK_KP_3, // XK_KP_Next
322# else
323 XK_Prior,
324 XK_Next,
325# endif
326 XK_KP_1, // XK_KP_End
327 XK_KP_5, // XK_KP_Begin
328 };
329
330 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
331 {
332 unsigned int index = keysym - XK_KP_Home;
333 keysym = kp ? keypadtrans[index] : XK_Home + index;
334 }
335 else if (keysym == XK_KP_Insert)
336 keysym = kp ? XK_KP_0 : XK_Insert;
337# ifndef NO_DELETE_KEY
338 else if (keysym == XK_KP_Delete)
339 keysym = kp ? XK_KP_Decimal : XK_Delete;
340# endif
341#endif
342 return keysym;
343}
344
345static inline int
346map_function_key (KeySym keysym)
347{
348 int param = 0;
349
350 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
351 {
352 param = 11 + keysym - XK_F1;
353 if (keysym >= XK_F17)
354 param += 4;
355 else if (keysym >= XK_F15)
356 param += 3;
357 else if (keysym >= XK_F11)
358 param += 2;
359 else if (keysym >= XK_F6)
360 param += 1;
361 }
362 else
363 switch (keysym)
364 {
365 case XK_Find:
366 param = 1;
367 break;
368 case XK_Insert:
369 param = 2;
370 break;
371#ifdef DXK_Remove
372 case DXK_Remove:
373#endif
374 case XK_Execute:
375 param = 3;
376 break;
377 case XK_Select:
378 param = 4;
379 break;
380#ifndef UNSHIFTED_SCROLLKEYS
381 case XK_Prior:
382 param = 5;
383 break;
384 case XK_Next:
385 param = 6;
386 break;
387 case XK_Home:
388 param = 7;
389 break;
390 case XK_End:
391 param = 8;
392 break;
393#endif
394 case XK_Help:
395 param = 28;
396 break;
397 case XK_Menu:
398 param = 29;
399 break;
400 }
401 return param;
402}
403
303void 404void
304rxvt_term::key_press (XKeyEvent &ev) 405rxvt_term::key_press (XKeyEvent &ev)
305{ 406{
306 int ctrl, meta, shft, len; 407 int ctrl, meta, shft, len;
307 unsigned int newlen;
308 KeySym keysym; 408 KeySym keysym;
309 int valid_keysym; 409 int valid_keysym;
310 char kbuf[KBUFSZ]; 410 char kbuf[KBUFSZ];
311 411
312#if ISO_14755 412#if ISO_14755
… …
325 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
326 426
327 if (numlock_state || (ev.state & ModNumLockMask)) 427 if (numlock_state || (ev.state & ModNumLockMask))
328 { 428 {
329 numlock_state = (ev.state & ModNumLockMask); 429 numlock_state = (ev.state & ModNumLockMask);
330 PrivMode ((!numlock_state), PrivMode_aplKP); 430 set_privmode (PrivMode_aplKP, !numlock_state);
331 } 431 }
332 432
333 kbuf[0] = 0; 433 kbuf[0] = 0;
334 434
335#ifdef USE_XIM 435#ifdef USE_XIM
… …
411#ifdef PAGING_CONTEXT_LINES 511#ifdef PAGING_CONTEXT_LINES
412 lnsppg = nrow - PAGING_CONTEXT_LINES; 512 lnsppg = nrow - PAGING_CONTEXT_LINES;
413#else 513#else
414 lnsppg = nrow * 4 / 5; 514 lnsppg = nrow * 4 / 5;
415#endif 515#endif
516 max_it (lnsppg, 1);
517
416 if (keysym == XK_Prior) 518 if (keysym == XK_Prior)
417 { 519 {
418 scr_page (UP, lnsppg); 520 scr_page (UP, lnsppg);
419 return; 521 return;
420 } 522 }
… …
485 } 587 }
486 } 588 }
487 589
488#if ENABLE_FRILLS || ISO_14755 590#if ENABLE_FRILLS || ISO_14755
489 // ISO 14755 support 591 // ISO 14755 support
490 if (shft && ctrl) 592 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
491 { 593 {
492 int hv; 594 int hv;
493 595
494 if (iso14755buf & ISO_14755_51 596 if (iso14755buf & ISO_14755_51
495 && (keysym == XK_space || keysym == XK_KP_Space 597 && (keysym == XK_space || keysym == XK_KP_Space
… …
519# endif 621# endif
520 return; 622 return;
521 } 623 }
522 else 624 else
523 { 625 {
524# if ENABLE_OVERLAY 626# if ISO_14755
525 scr_overlay_off (); 627 scr_overlay_off ();
526# endif 628# endif
527 iso14755buf = 0; 629 iso14755buf = 0;
528 } 630 }
529 } 631 }
632 else if (option (Opt_iso14755) &&
530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 633 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 634 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
532 if (!(iso14755buf & ISO_14755_STARTED)) 635 if (!(iso14755buf & ISO_14755_STARTED))
533 { 636 {
534 iso14755buf |= ISO_14755_STARTED; 637 iso14755buf |= ISO_14755_STARTED;
535# if ENABLE_OVERLAY 638# if ISO_14755
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 639 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
537 scr_overlay_set (0, 0, "ISO 14755 mode"); 640 scr_overlay_set (0, 0, "ISO 14755 mode");
538# endif 641# endif
539 } 642 }
540#endif 643#endif
… …
547 } 650 }
548#endif 651#endif
549 652
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 653 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 { 654 {
655 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
656 unsigned int newlen = 1;
657
658 switch (translate_keypad (keysym, kp))
552 { 659 {
660#ifndef NO_BACKSPACE_KEY
661 case XK_BackSpace:
662 if (priv_modes & PrivMode_HaveBackSpace)
663 {
664 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
665 ^ !!ctrl) ? '\b' : '\177';
666 kbuf[1] = '\0';
667 }
668 else
669 strcpy (kbuf, rs[Rs_backspace_key]);
670 break;
671#endif
672#ifndef NO_DELETE_KEY
673 case XK_Delete:
674 strcpy (kbuf, rs[Rs_delete_key]);
675 break;
676#endif
677 case XK_Tab:
678 if (shft)
679 strcpy (kbuf, "\033[Z");
680 else
681 {
682#ifdef CTRL_TAB_MAKES_META
683 if (ctrl)
684 meta = 1;
685#endif
686#ifdef MOD4_TAB_MAKES_META
687 if (ev.state & Mod4Mask)
688 meta = 1;
689#endif
553 newlen = 1; 690 newlen = 0;
554 switch (keysym) 691 }
692 break;
693
694 case XK_Up: /* "\033[A" */
695 case XK_Down: /* "\033[B" */
696 case XK_Right: /* "\033[C" */
697 case XK_Left: /* "\033[D" */
698 strcpy (kbuf, "\033[Z");
699 kbuf[2] = "DACB"[keysym - XK_Left];
700 /* do Shift first */
701 if (shft)
702 kbuf[2] = "dacb"[keysym - XK_Left];
703 else if (ctrl)
704 {
705 kbuf[1] = 'O';
706 kbuf[2] = "dacb"[keysym - XK_Left];
707 }
708 else if (priv_modes & PrivMode_aplCUR)
709 kbuf[1] = 'O';
710 break;
711
712 case XK_KP_Enter:
713 /* allow shift to override */
714 if (kp)
715 {
716 strcpy (kbuf, "\033OM");
717 break;
718 }
719
720 /* FALLTHROUGH */
721
722 case XK_Return:
723 if (priv_modes & PrivMode_LFNL)
724 {
725 kbuf[0] = '\015';
726 kbuf[1] = '\012';
727 kbuf[2] = '\0';
728 }
729 else
730 {
731 kbuf[0] = '\015';
732 kbuf[1] = '\0';
733 }
734 break;
735
736 case XK_KP_F1: /* "\033OP" */
737 case XK_KP_F2: /* "\033OQ" */
738 case XK_KP_F3: /* "\033OR" */
739 case XK_KP_F4: /* "\033OS" */
740 strcpy (kbuf, "\033OP");
741 kbuf[2] += (keysym - XK_KP_F1);
742 break;
743
744 case XK_KP_Multiply: /* "\033Oj" : "*" */
745 case XK_KP_Add: /* "\033Ok" : "+" */
746 case XK_KP_Separator: /* "\033Ol" : "," */
747 case XK_KP_Subtract: /* "\033Om" : "-" */
748 case XK_KP_Decimal: /* "\033On" : "." */
749 case XK_KP_Divide: /* "\033Oo" : "/" */
750 case XK_KP_0: /* "\033Op" : "0" */
751 case XK_KP_1: /* "\033Oq" : "1" */
752 case XK_KP_2: /* "\033Or" : "2" */
753 case XK_KP_3: /* "\033Os" : "3" */
754 case XK_KP_4: /* "\033Ot" : "4" */
755 case XK_KP_5: /* "\033Ou" : "5" */
756 case XK_KP_6: /* "\033Ov" : "6" */
757 case XK_KP_7: /* "\033Ow" : "7" */
758 case XK_KP_8: /* "\033Ox" : "8" */
759 case XK_KP_9: /* "\033Oy" : "9" */
760 /* allow shift to override */
761 if (kp)
762 {
763 strcpy (kbuf, "\033Oj");
764 kbuf[2] += (keysym - XK_KP_Multiply);
765 }
766 else
767 {
768 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
769 kbuf[1] = '\0';
770 }
771 break;
772
773 default:
555 { 774 {
556#ifndef NO_BACKSPACE_KEY 775 int param = map_function_key (keysym);
557 case XK_BackSpace: 776 if (param > 0)
558 if (priv_modes & PrivMode_HaveBackSpace) 777 sprintf (kbuf,"\033[%d~", param);
559 {
560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561 ^ !!ctrl) ? '\b' : '\177';
562 kbuf[1] = '\0';
563 }
564 else 778 else
565 strcpy (kbuf, key_backspace);
566 break;
567#endif
568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Prior
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
579 case XK_Delete:
580 strcpy (kbuf, key_delete);
581 break;
582#endif
583 case XK_Tab:
584 if (shft)
585 strcpy (kbuf, "\033[Z");
586 else
587 {
588#ifdef CTRL_TAB_MAKES_META
589 if (ctrl)
590 meta = 1;
591#endif
592#ifdef MOD4_TAB_MAKES_META
593 if (ev.state & Mod4Mask)
594 meta = 1;
595#endif
596 newlen = 0;
597 }
598 break;
599
600#ifdef XK_KP_Left
601 case XK_KP_Up: /* \033Ox or standard */
602 case XK_KP_Down: /* \033Or or standard */
603 case XK_KP_Right: /* \033Ov or standard */
604 case XK_KP_Left: /* \033Ot or standard */
605 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
606 {
607 strcpy (kbuf, "\033OZ");
608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
609 break;
610 }
611 else
612 /* translate to std. cursor key */
613 keysym = XK_Left + (keysym - XK_KP_Left);
614 /* FALLTHROUGH */
615#endif
616 case XK_Up: /* "\033[A" */
617 case XK_Down: /* "\033[B" */
618 case XK_Right: /* "\033[C" */
619 case XK_Left: /* "\033[D" */
620 strcpy (kbuf, "\033[Z");
621 kbuf[2] = "DACB"[keysym - XK_Left];
622 /* do Shift first */
623 if (shft)
624 kbuf[2] = "dacb"[keysym - XK_Left];
625 else if (ctrl)
626 {
627 kbuf[1] = 'O';
628 kbuf[2] = "dacb"[keysym - XK_Left];
629 }
630 else if (priv_modes & PrivMode_aplCUR)
631 kbuf[1] = 'O';
632 break;
633
634#ifndef UNSHIFTED_SCROLLKEYS
635# ifdef XK_KP_Prior
636 case XK_KP_Prior:
637 /* allow shift to override */
638 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
639 {
640 strcpy (kbuf, "\033Oy");
641 break;
642 }
643 /* FALLTHROUGH */
644# endif
645 case XK_Prior:
646 strcpy (kbuf, "\033[5~");
647 break;
648# ifdef XK_KP_Next
649 case XK_KP_Next:
650 /* allow shift to override */
651 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
652 {
653 strcpy (kbuf, "\033Os");
654 break;
655 }
656 /* FALLTHROUGH */
657# endif
658 case XK_Next:
659 strcpy (kbuf, "\033[6~");
660 break;
661#endif
662 case XK_KP_Enter:
663 /* allow shift to override */
664 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
665 {
666 strcpy (kbuf, "\033OM");
667 break;
668 }
669
670 /* FALLTHROUGH */
671
672 case XK_Return:
673 if (priv_modes & PrivMode_LFNL)
674 {
675 kbuf[0] = '\015';
676 kbuf[1] = '\012';
677 kbuf[2] = '\0';
678 }
679 else
680 {
681 kbuf[0] = '\015';
682 kbuf[1] = '\0';
683 }
684 break;
685
686#ifdef XK_KP_Begin
687 case XK_KP_Begin:
688 strcpy (kbuf, "\033Ou");
689 break;
690
691#endif
692 case XK_KP_F1: /* "\033OP" */
693 case XK_KP_F2: /* "\033OQ" */
694 case XK_KP_F3: /* "\033OR" */
695 case XK_KP_F4: /* "\033OS" */
696 strcpy (kbuf, "\033OP");
697 kbuf[2] += (keysym - XK_KP_F1);
698 break;
699
700 case XK_KP_Multiply: /* "\033Oj" : "*" */
701 case XK_KP_Add: /* "\033Ok" : "+" */
702 case XK_KP_Separator: /* "\033Ol" : "," */
703 case XK_KP_Subtract: /* "\033Om" : "-" */
704 case XK_KP_Decimal: /* "\033On" : "." */
705 case XK_KP_Divide: /* "\033Oo" : "/" */
706 case XK_KP_0: /* "\033Op" : "0" */
707 case XK_KP_1: /* "\033Oq" : "1" */
708 case XK_KP_2: /* "\033Or" : "2" */
709 case XK_KP_3: /* "\033Os" : "3" */
710 case XK_KP_4: /* "\033Ot" : "4" */
711 case XK_KP_5: /* "\033Ou" : "5" */
712 case XK_KP_6: /* "\033Ov" : "6" */
713 case XK_KP_7: /* "\033Ow" : "7" */
714 case XK_KP_8: /* "\033Ox" : "8" */
715 case XK_KP_9: /* "\033Oy" : "9" */
716 /* allow shift to override */
717 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
718 {
719 strcpy (kbuf, "\033Oj");
720 kbuf[2] += (keysym - XK_KP_Multiply);
721 }
722 else
723 {
724 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
725 kbuf[1] = '\0';
726 }
727 break;
728
729 case XK_Find:
730 strcpy (kbuf, "\033[1~");
731 break;
732
733#ifdef XK_KP_End
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
743 case XK_Insert:
744 strcpy (kbuf, "\033[2~");
745 break;
746#ifdef DXK_Remove /* support for DEC remove like key */
747 case DXK_Remove:
748 /* FALLTHROUGH */
749#endif
750 case XK_Execute:
751 strcpy (kbuf, "\033[3~");
752 break;
753 case XK_Select:
754 strcpy (kbuf, "\033[4~");
755 break;
756#ifdef XK_KP_End
757 case XK_KP_End:
758 /* allow shift to override */
759 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
760 {
761 strcpy (kbuf, "\033Oq");
762 break;
763 }
764 /* FALLTHROUGH */
765#endif
766 case XK_End:
767 strcpy (kbuf, KS_END);
768 break;
769#ifdef XK_KP_Home
770 case XK_KP_Home:
771 /* allow shift to override */
772 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
773 {
774 strcpy (kbuf, "\033Ow");
775 break;
776 }
777 /* FALLTHROUGH */
778#endif
779 case XK_Home:
780 strcpy (kbuf, KS_HOME);
781 break;
782
783#define FKEY(n, fkey) \
784 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
785
786 case XK_F1: /* "\033[11~" */
787 case XK_F2: /* "\033[12~" */
788 case XK_F3: /* "\033[13~" */
789 case XK_F4: /* "\033[14~" */
790 case XK_F5: /* "\033[15~" */
791 FKEY (11, XK_F1);
792 break;
793 case XK_F6: /* "\033[17~" */
794 case XK_F7: /* "\033[18~" */
795 case XK_F8: /* "\033[19~" */
796 case XK_F9: /* "\033[20~" */
797 case XK_F10: /* "\033[21~" */
798 FKEY (17, XK_F6);
799 break;
800 case XK_F11: /* "\033[23~" */
801 case XK_F12: /* "\033[24~" */
802 case XK_F13: /* "\033[25~" */
803 case XK_F14: /* "\033[26~" */
804 FKEY (23, XK_F11);
805 break;
806 case XK_F15: /* "\033[28~" */
807 case XK_F16: /* "\033[29~" */
808 FKEY (28, XK_F15);
809 break;
810 case XK_Help: /* "\033[28~" */
811 FKEY (28, XK_Help);
812 break;
813 case XK_Menu: /* "\033[29~" */
814 FKEY (29, XK_Menu);
815 break;
816 case XK_F17: /* "\033[31~" */
817 case XK_F18: /* "\033[32~" */
818 case XK_F19: /* "\033[33~" */
819 case XK_F20: /* "\033[34~" */
820 case XK_F21: /* "\033[35~" */
821 case XK_F22: /* "\033[36~" */
822 case XK_F23: /* "\033[37~" */
823 case XK_F24: /* "\033[38~" */
824 case XK_F25: /* "\033[39~" */
825 case XK_F26: /* "\033[40~" */
826 case XK_F27: /* "\033[41~" */
827 case XK_F28: /* "\033[42~" */
828 case XK_F29: /* "\033[43~" */
829 case XK_F30: /* "\033[44~" */
830 case XK_F31: /* "\033[45~" */
831 case XK_F32: /* "\033[46~" */
832 case XK_F33: /* "\033[47~" */
833 case XK_F34: /* "\033[48~" */
834 case XK_F35: /* "\033[49~" */
835 FKEY (31, XK_F17);
836 break;
837#undef FKEY
838 default:
839 newlen = 0; 779 newlen = 0;
840 break;
841 } 780 }
842 781 break;
843 if (newlen)
844 len = strlen (kbuf);
845 } 782 }
783
784 if (newlen)
785 len = strlen (kbuf);
846 786
847 /* 787 /*
848 * Pass meta for all function keys, if 'meta' option set 788 * Pass meta for all function keys, if 'meta' option set
849 */ 789 */
850#ifdef META8_OPTION 790#ifdef META8_OPTION
… …
934#if ENABLE_FRILLS || ISO_14755 874#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support 875 // ISO 14755 support
936 if (iso14755buf) 876 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52) 877 if (iso14755buf & ISO_14755_52)
938 { 878 {
939# if ENABLE_OVERLAY 879# if ISO_14755
940 scr_overlay_off (); 880 scr_overlay_off ();
941# endif 881# endif
942# if ISO_14755 882# if ISO_14755
943 // iso14755 part 5.2 handling: release time 883 // iso14755 part 5.2 handling: release time
944 // first: controls 884 // first: controls
… …
967 907
968 return; 908 return;
969 } 909 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 910 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 { 911 {
972# if ENABLE_OVERLAY 912# if ISO_14755
973 scr_overlay_off (); 913 scr_overlay_off ();
974# endif 914# endif
975 if (iso14755buf & ISO_14755_51) 915 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 (); 916 commit_iso14755 ();
977#if ISO_14755 917#if ISO_14755
… …
1035void 975void
1036rxvt_term::flush () 976rxvt_term::flush ()
1037{ 977{
1038 flush_ev.stop (); 978 flush_ev.stop ();
1039 979
1040#ifdef TRANSPARENT 980#ifdef HAVE_BG_PIXMAP
1041 if (want_full_refresh) 981 if (bgPixmap.check_clearChanged ())
1042 { 982 {
1043 want_full_refresh = 0; 983// scr_clear (true); This needs to be researched further!
1044 scr_clear ();
1045 scr_touch (false); 984 scr_touch (false);
1046 } 985 }
1047#endif 986#endif
1048 987
1049 if (want_refresh) 988 if (want_refresh)
… …
1085 } 1024 }
1086 while (row < end_row); 1025 while (row < end_row);
1087 } 1026 }
1088 1027
1089 scr_refresh (); 1028 scr_refresh ();
1090 scrollbar_show (1); 1029 scrollBar.show (1);
1091#ifdef USE_XIM 1030#ifdef USE_XIM
1092 IMSendSpot (); 1031 IMSendSpot ();
1093#endif 1032#endif
1094 } 1033 }
1095 1034
1096 display->flush (); 1035 display->flush ();
1097} 1036}
1098 1037
1038/* checks whether a refresh is requested and starts the refresh timer */
1099void 1039void
1100rxvt_term::check_cb (check_watcher &w) 1040rxvt_term::refresh_check ()
1101{ 1041{
1102 make_current (); 1042 if (want_refresh && !flush_ev.is_active ())
1043 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1103 1044
1104 display->flush (); 1045 display->flush ();
1105
1106 if (want_refresh && !flush_ev.active)
1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1108} 1046}
1109 1047
1110void 1048void
1111rxvt_term::flush_cb (time_watcher &w) 1049rxvt_term::flush_cb (ev::timer &w, int revents)
1112{ 1050{
1113 make_current (); 1051 make_current ();
1114 1052
1115 refresh_count = 0; 1053 refresh_count = 0;
1116 flush (); 1054 flush ();
1117} 1055}
1118 1056
1119#ifdef CURSOR_BLINK 1057#ifdef CURSOR_BLINK
1120void 1058void
1121rxvt_term::cursor_blink_cb (time_watcher &w) 1059rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1122{ 1060{
1123 hidden_cursor = !hidden_cursor; 1061 hidden_cursor = !hidden_cursor;
1124 want_refresh = 1; 1062 want_refresh = 1;
1125 1063 refresh_check ();
1126 w.start (w.at + CURSOR_BLINK_INTERVAL);
1127} 1064}
1128#endif 1065#endif
1129 1066
1130#ifdef TEXT_BLINK 1067#ifdef TEXT_BLINK
1131void 1068void
1132rxvt_term::text_blink_cb (time_watcher &w) 1069rxvt_term::text_blink_cb (ev::timer &w, int revents)
1133{ 1070{
1134 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1071 if (scr_refresh_rend (RS_Blink, RS_Blink))
1135 { 1072 {
1136 hidden_text = !hidden_text; 1073 hidden_text = !hidden_text;
1137 want_refresh = 1; 1074 want_refresh = 1;
1138 w.start (w.at + TEXT_BLINK_INTERVAL); 1075 refresh_check ();
1139 } 1076 }
1077 else
1078 w.stop ();
1140} 1079}
1141#endif 1080#endif
1142 1081
1143#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1082#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1144void 1083void
1145rxvt_term::cont_scroll_cb (time_watcher &w) 1084rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1146{ 1085{
1147 if ((scrollbar_isUp() || scrollbar_isDn()) && 1086 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1148 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1087 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1149 { 1088 {
1150 want_refresh = 1; 1089 want_refresh = 1;
1151 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1090 refresh_check ();
1152 } 1091 }
1092 else
1093 w.stop ();
1153} 1094}
1154#endif 1095#endif
1155 1096
1156#ifdef SELECTION_SCROLLING 1097#ifdef SELECTION_SCROLLING
1157void 1098void
1158rxvt_term::sel_scroll_cb (time_watcher &w) 1099rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1159{ 1100{
1160 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1101 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1161 { 1102 {
1162 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1103 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1163 want_refresh = 1; 1104 want_refresh = 1;
1164 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1105 refresh_check ();
1165 } 1106 }
1107 else
1108 w.stop ();
1166} 1109}
1167#endif 1110#endif
1168 1111
1169#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1112#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1170void 1113void
1171rxvt_term::slip_wheel_cb (time_watcher &w) 1114rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1172{ 1115{
1173 if (mouse_slip_wheel_speed == 0 1116 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1174 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1175 : scr_page (UP, mouse_slip_wheel_speed))
1176 { 1117 {
1177 if (view_start == top_row || view_start == 0)
1178 mouse_slip_wheel_speed = 0;
1179
1180 want_refresh = 1; 1118 want_refresh = 1;
1181 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1119 refresh_check ();
1120 }
1121
1122 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1123 {
1124 mouse_slip_wheel_speed = 0;
1125 w.stop ();
1182 } 1126 }
1183} 1127}
1184#endif 1128#endif
1185 1129
1186#if LINUX_YIELD_HACK 1130#if LINUX_YIELD_HACK
1187static struct event_handler 1131static struct event_handler
1188{ 1132{
1189 check_watcher yield_ev; 1133 ev::prepare yield_ev;
1190 1134
1191 void yield_cb (check_watcher &w) 1135 void yield_cb (ev::prepare &w, int revents)
1192 { 1136 {
1193 // this should really be sched_yield(), but the linux guys thought 1137 // this should really be sched_yield(), but the linux guys thought
1194 // that giving a process calling sched_yield () less cpu time than 1138 // that giving a process calling sched_yield () less cpu time than
1195 // ones with high nice levels is a useful thing to do. It surely is is 1139 // ones with high nice levels is a useful thing to do. It surely is is
1196 // allowed by the sus... as is returning ENOSYS. 1140 // allowed by the sus... as is returning ENOSYS.
1141 // since the linux guys additionally thought that breaking the only
1142 // known workaround against their unusable sched_yield hack is cool,
1143 // we just nanosleep a bit and hope for the best.
1197 1144
1198 struct timespec ts = { 0, 0 }; 1145 struct timespec ts = { 0, 1000 };
1199 nanosleep (&ts, 0); 1146 nanosleep (&ts, 0);
1200 1147
1201 w.stop (); 1148 w.stop ();
1202 } 1149 }
1203 1150
… …
1247 1194
1248 return false; 1195 return false;
1249} 1196}
1250 1197
1251void 1198void
1252rxvt_term::pty_cb (io_watcher &w, short revents) 1199rxvt_term::pty_cb (ev::io &w, int revents)
1253{ 1200{
1254 make_current (); 1201 make_current ();
1255 1202
1256 if (revents & EVENT_READ) 1203 if (revents & ev::READ)
1257 // loop, but don't allow a single term to monopolize us 1204 // loop, but don't allow a single term to monopolize us
1258 while (pty_fill ()) 1205 for (int i = CBUFCNT; i-- && pty_fill (); )
1259 if (cmd_parse ()) 1206 cmd_parse ();
1260 break;
1261 1207
1262 if (revents & EVENT_WRITE) 1208 if (revents & ev::WRITE)
1263 pty_write (); 1209 pty_write ();
1210
1211 refresh_check ();
1264} 1212}
1265 1213
1266void 1214void
1267rxvt_term::pointer_unblank () 1215rxvt_term::pointer_unblank ()
1268{ 1216{
… …
1271 1219
1272#ifdef POINTER_BLANK 1220#ifdef POINTER_BLANK
1273 hidden_pointer = 0; 1221 hidden_pointer = 0;
1274 1222
1275 if (option (Opt_pointerBlank)) 1223 if (option (Opt_pointerBlank))
1276 pointer_ev.start (NOW + pointerBlankDelay); 1224 pointer_ev.start (pointerBlankDelay);
1277#endif 1225#endif
1278} 1226}
1279 1227
1280#ifdef POINTER_BLANK 1228#ifdef POINTER_BLANK
1281void 1229void
… …
1289 1237
1290 hidden_pointer = 1; 1238 hidden_pointer = 1;
1291} 1239}
1292 1240
1293void 1241void
1294rxvt_term::pointer_cb (time_watcher &w) 1242rxvt_term::pointer_cb (ev::timer &w, int revents)
1295{ 1243{
1296 make_current (); 1244 make_current ();
1297 1245
1298 pointer_blank (); 1246 pointer_blank ();
1299} 1247}
… …
1302void 1250void
1303rxvt_term::mouse_report (XButtonEvent &ev) 1251rxvt_term::mouse_report (XButtonEvent &ev)
1304{ 1252{
1305 int button_number, key_state = 0; 1253 int button_number, key_state = 0;
1306 int x, y; 1254 int x, y;
1255 int code = 32;
1307 1256
1308 x = ev.x; 1257 x = Pixel2Col (ev.x);
1309 y = ev.y; 1258 y = Pixel2Row (ev.y);
1310 pixel_position (&x, &y); 1259 if (ev.type == MotionNotify)
1260 {
1261 if (x == mouse_row && y == mouse_col)
1262 return;
1263 mouse_row = x;
1264 mouse_col = y;
1265 code += 32;
1266 }
1311 1267
1312 if (MEvent.button == AnyButton) 1268 if (MEvent.button == AnyButton)
1313 button_number = 3; 1269 button_number = 3;
1314 else 1270 else
1315 { 1271 {
… …
1361 x + 1, 1317 x + 1,
1362 y + 1); 1318 y + 1);
1363#endif 1319#endif
1364 1320
1365 tt_printf ("\033[M%c%c%c", 1321 tt_printf ("\033[M%c%c%c",
1366 (32 + button_number + key_state), 1322 (code + button_number + key_state),
1367 (32 + x + 1), 1323 (32 + x + 1),
1368 (32 + y + 1)); 1324 (32 + y + 1));
1369} 1325}
1370 1326
1371/*{{{ process an X event */ 1327/*{{{ process an X event */
… …
1433 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1389 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1434 focus_out (); 1390 focus_out ();
1435 } 1391 }
1436#endif 1392#endif
1437 } 1393 }
1438 break;
1439
1440 case MappingNotify:
1441 XRefreshKeyboardMapping (&ev.xmapping);
1442 break; 1394 break;
1443 1395
1444 /* 1396 /*
1445 * XXX: this is not the _current_ arrangement 1397 * XXX: this is not the _current_ arrangement
1446 * Here's my conclusion: 1398 * Here's my conclusion:
… …
1479 && ev.xfocus.mode != NotifyGrab) 1431 && ev.xfocus.mode != NotifyGrab)
1480 focus_out (); 1432 focus_out ();
1481 break; 1433 break;
1482 1434
1483 case ConfigureNotify: 1435 case ConfigureNotify:
1436 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1437 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1438 szHint.width, szHint.height);*/
1484 if (ev.xconfigure.window == parent[0]) 1439 if (ev.xconfigure.window == parent[0])
1485 { 1440 {
1486 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1441 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1487 ; 1442 ;
1488 1443
1489 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1444 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1490 { 1445 {
1491 seen_resize = 1; 1446 seen_resize = 1;
1492 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1447 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1493#ifdef XPM_BACKGROUND 1448 }
1494 if (!option (Opt_transparent) && bgPixmap.auto_resize) 1449 else
1450 {
1451#ifdef HAVE_BG_PIXMAP
1452 if (bgPixmap.window_position_sensitive ())
1495 { 1453 {
1454 if (mapped)
1455 update_background ();
1496 resize_pixmap (); 1456 else
1497 scr_touch (true); 1457 bgPixmap.invalidate ();
1498 } 1458 }
1499#endif 1459#endif
1500 } 1460 }
1501 1461
1502 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1462 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1503
1504#ifdef TRANSPARENT
1505 if (option (Opt_transparent))
1506 check_our_parents ();
1507#endif
1508 } 1463 }
1509 break; 1464 break;
1510 1465
1511 case PropertyNotify: 1466 case PropertyNotify:
1512 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1467 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1515 selection_property (ev.xproperty.window, ev.xproperty.atom); 1470 selection_property (ev.xproperty.window, ev.xproperty.atom);
1516 1471
1517 break; 1472 break;
1518 1473
1519 case SelectionClear: 1474 case SelectionClear:
1520 selection_clear (); 1475 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1521 break; 1476 break;
1522 1477
1523 case SelectionNotify: 1478 case SelectionNotify:
1524 if (selection_wait == Sel_normal) 1479 if (selection_wait == Sel_normal)
1525 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1480 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1528 case SelectionRequest: 1483 case SelectionRequest:
1529 selection_send (ev.xselectionrequest); 1484 selection_send (ev.xselectionrequest);
1530 break; 1485 break;
1531 1486
1532 case MapNotify: 1487 case MapNotify:
1488#ifdef HAVE_BG_PIXMAP
1489 /* This is needed spcifically to fix the case of no window manager or a
1490 * non-reparenting window manager. In those cases we never get first
1491 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1492 * care of multiplicity of ConfigureNotify events arriwing while WM does
1493 * reparenting.
1494 * We should not render background immidiately, as there could be several
1495 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1496 * by scheduling background redraw as soon as we can, but giving a short
1497 * bit of time for ConfigureNotifies to arrive.
1498 * We should render background PRIOR to drawing any text, but AFTER all
1499 * of ConfigureNotifys for the best results.
1500 */
1501 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1502 update_background_ev.start (0.025);
1503#endif
1533 mapped = 1; 1504 mapped = 1;
1534#ifdef TEXT_BLINK 1505#ifdef TEXT_BLINK
1535 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1506 text_blink_ev.start ();
1536#endif 1507#endif
1537 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1508 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1538 break; 1509 break;
1539 1510
1540 case UnmapNotify: 1511 case UnmapNotify:
… …
1542#ifdef TEXT_BLINK 1513#ifdef TEXT_BLINK
1543 text_blink_ev.stop (); 1514 text_blink_ev.stop ();
1544#endif 1515#endif
1545 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1516 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1546 break; 1517 break;
1547
1548#ifdef TRANSPARENT
1549 case ReparentNotify:
1550 rootwin_cb (ev);
1551 break;
1552#endif /* TRANSPARENT */
1553 1518
1554 case GraphicsExpose: 1519 case GraphicsExpose:
1555 case Expose: 1520 case Expose:
1556 if (ev.xany.window == vt) 1521 if (ev.xany.window == vt)
1557 { 1522 {
1558 do 1523 do
1524 {
1559 scr_expose (ev.xexpose.x, ev.xexpose.y, 1525 scr_expose (ev.xexpose.x, ev.xexpose.y,
1560 ev.xexpose.width, ev.xexpose.height, False); 1526 ev.xexpose.width, ev.xexpose.height, False);
1527 }
1561 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1528 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1562 1529
1563 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1530 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1564 1531
1565 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1532 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1533 {
1566 scr_expose (ev.xexpose.x, ev.xexpose.y, 1534 scr_expose (ev.xexpose.x, ev.xexpose.y,
1567 ev.xexpose.width, ev.xexpose.height, False); 1535 ev.xexpose.width, ev.xexpose.height, False);
1536 }
1568 1537
1569 want_refresh = 1; 1538 want_refresh = 1;
1570 } 1539 }
1571 else 1540 else
1572 { 1541 {
… …
1575 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1544 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1576 ; 1545 ;
1577 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1546 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1578 ; 1547 ;
1579 1548
1580 if (isScrollbarWindow (ev.xany.window)) 1549 if (scrollBar.state && ev.xany.window == scrollBar.win)
1581 { 1550 {
1582 scrollBar.setIdle (); 1551 scrollBar.state = STATE_IDLE;
1583 scrollbar_show (0); 1552 scrollBar.show (0);
1584 } 1553 }
1585
1586#ifdef TRANSPARENT
1587 if (am_transparent && ev.xany.window == parent[0])
1588 XClearWindow (dpy, ev.xany.window);
1589#endif
1590 } 1554 }
1591 break; 1555 break;
1592 1556
1593 case MotionNotify: 1557 case MotionNotify:
1594#ifdef POINTER_BLANK 1558#ifdef POINTER_BLANK
1595 if (hidden_pointer) 1559 if (hidden_pointer)
1596 pointer_unblank (); 1560 pointer_unblank ();
1597#endif 1561#endif
1562 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1563 || priv_modes & PrivMode_MouseAnyEvent)
1564 mouse_report (ev.xbutton);
1598 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1565 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1599 break; 1566 break;
1600 1567
1601 if (ev.xany.window == vt) 1568 if (ev.xany.window == vt)
1602 { 1569 {
… …
1636 int dist; 1603 int dist;
1637 1604
1638 /* don't clobber the current delay if we are 1605 /* don't clobber the current delay if we are
1639 * already in the middle of scrolling. 1606 * already in the middle of scrolling.
1640 */ 1607 */
1641 if (!sel_scroll_ev.active) 1608 if (!sel_scroll_ev.is_active ())
1642 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1609 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1643 1610
1644 /* save the event params so we can highlight 1611 /* save the event params so we can highlight
1645 * the selection in the pending-scroll loop 1612 * the selection in the pending-scroll loop
1646 */ 1613 */
1647 selection_save_x = ev.xbutton.x; 1614 selection_save_x = ev.xbutton.x;
… …
1669 else 1636 else
1670 { 1637 {
1671 /* we are within the text window, so we 1638 /* we are within the text window, so we
1672 * shouldn't be scrolling 1639 * shouldn't be scrolling
1673 */ 1640 */
1674 if (sel_scroll_ev.active)
1675 sel_scroll_ev.stop(); 1641 sel_scroll_ev.stop();
1676 } 1642 }
1677#endif 1643#endif
1678#ifdef MOUSE_THRESHOLD 1644#ifdef MOUSE_THRESHOLD
1679 } 1645 }
1680#endif 1646#endif
1681 } 1647 }
1682 } 1648 }
1683 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1649 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1684 { 1650 {
1685 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1651 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1686 MotionNotify, &ev)) 1652 MotionNotify, &ev))
1687 ; 1653 ;
1688 1654
… …
1690 &unused_root, &unused_child, 1656 &unused_root, &unused_child,
1691 &unused_root_x, &unused_root_y, 1657 &unused_root_x, &unused_root_y,
1692 &ev.xbutton.x, &ev.xbutton.y, 1658 &ev.xbutton.x, &ev.xbutton.y,
1693 &unused_mask); 1659 &unused_mask);
1694 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1660 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1695 scrollbar_size ()); 1661 scrollBar.size ());
1696 want_refresh = 1; 1662 want_refresh = 1;
1697 scrollbar_show (1); 1663 scrollBar.show (1);
1698 } 1664 }
1699 break; 1665 break;
1700 } 1666 }
1701 1667
1702#if defined(CURSOR_BLINK) 1668#if defined(CURSOR_BLINK)
… …
1706 { 1672 {
1707 hidden_cursor = 0; 1673 hidden_cursor = 0;
1708 want_refresh = 1; 1674 want_refresh = 1;
1709 } 1675 }
1710 1676
1711 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1677 cursor_blink_ev.again ();
1712 } 1678 }
1713#endif 1679#endif
1714 1680
1715#if defined(POINTER_BLANK) 1681#if defined(POINTER_BLANK)
1716 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1682 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1723 1689
1724 if (ev.type == KeyPress && hidden_pointer == 0) 1690 if (ev.type == KeyPress && hidden_pointer == 0)
1725 pointer_blank (); 1691 pointer_blank ();
1726 } 1692 }
1727#endif 1693#endif
1694
1695 refresh_check ();
1728} 1696}
1697
1698#if ENABLE_FRILLS
1699void
1700rxvt_term::set_urgency (bool enable)
1701{
1702 if (enable == urgency_hint)
1703 return;
1704
1705 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1706 {
1707 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1708 XSetWMHints (dpy, parent[0], h);
1709 urgency_hint = enable;
1710 }
1711}
1712#endif
1729 1713
1730void 1714void
1731rxvt_term::focus_in () 1715rxvt_term::focus_in ()
1732{ 1716{
1733 if (!focus) 1717 if (!focus)
1734 { 1718 {
1735 focus = 1; 1719 focus = 1;
1736 want_refresh = 1; 1720 want_refresh = 1;
1737 1721
1738 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1739
1740#if USE_XIM 1722#if USE_XIM
1741 if (Input_Context != NULL) 1723 if (Input_Context != NULL)
1742 { 1724 {
1743 IMSetPosition (); 1725 IMSetPosition ();
1744 XSetICFocus (Input_Context); 1726 XSetICFocus (Input_Context);
1745 } 1727 }
1746#endif 1728#endif
1747#if CURSOR_BLINK 1729#if CURSOR_BLINK
1748 if (option (Opt_cursorBlink)) 1730 if (option (Opt_cursorBlink))
1749 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1731 cursor_blink_ev.again ();
1750#endif 1732#endif
1751#if OFF_FOCUS_FADING 1733#if OFF_FOCUS_FADING
1752 if (rs[Rs_fade]) 1734 if (rs[Rs_fade])
1753 { 1735 {
1754 pix_colors = pix_colors_focused; 1736 pix_colors = pix_colors_focused;
1755 scr_recolour (); 1737 scr_recolour ();
1756 } 1738 }
1757#endif 1739#endif
1758#if ENABLE_FRILLS 1740#if ENABLE_FRILLS
1759 if (option (Opt_urgentOnBell)) 1741 if (option (Opt_urgentOnBell))
1760 { 1742 set_urgency (0);
1761 XWMHints *h;
1762
1763 h = XGetWMHints(dpy, parent[0]);
1764 if (h != NULL)
1765 {
1766 h->flags &= ~XUrgencyHint;
1767 XSetWMHints(dpy, parent[0], h);
1768 }
1769 }
1770#endif 1743#endif
1744
1745 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1771 } 1746 }
1772} 1747}
1773 1748
1774void 1749void
1775rxvt_term::focus_out () 1750rxvt_term::focus_out ()
… …
1777 if (focus) 1752 if (focus)
1778 { 1753 {
1779 focus = 0; 1754 focus = 0;
1780 want_refresh = 1; 1755 want_refresh = 1;
1781 1756
1782 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1757#if ENABLE_FRILLS
1783 1758 if (option (Opt_urgentOnBell))
1759 set_urgency (0);
1760#endif
1784#if ENABLE_FRILLS || ISO_14755 1761#if ENABLE_FRILLS || ISO_14755
1785 if (iso14755buf) 1762 if (iso14755buf)
1786 { 1763 {
1787 iso14755buf = 0; 1764 iso14755buf = 0;
1788# if ENABLE_OVERLAY 1765# if ISO_14755
1789 scr_overlay_off (); 1766 scr_overlay_off ();
1790# endif 1767# endif
1791 } 1768 }
1792#endif 1769#endif
1793#if USE_XIM 1770#if USE_XIM
… …
1795 XUnsetICFocus (Input_Context); 1772 XUnsetICFocus (Input_Context);
1796#endif 1773#endif
1797#if CURSOR_BLINK 1774#if CURSOR_BLINK
1798 if (option (Opt_cursorBlink)) 1775 if (option (Opt_cursorBlink))
1799 cursor_blink_ev.stop (); 1776 cursor_blink_ev.stop ();
1777
1800 hidden_cursor = 0; 1778 hidden_cursor = 0;
1801#endif 1779#endif
1802#if OFF_FOCUS_FADING 1780#if OFF_FOCUS_FADING
1803 if (rs[Rs_fade]) 1781 if (rs[Rs_fade])
1804 { 1782 {
1805 pix_colors = pix_colors_unfocused; 1783 pix_colors = pix_colors_unfocused;
1806 scr_recolour (); 1784 scr_recolour ();
1807 } 1785 }
1808#endif 1786#endif
1787
1788 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1809 } 1789 }
1810} 1790}
1811 1791
1812void 1792void
1813rxvt_term::update_fade_color (unsigned int idx) 1793rxvt_term::update_fade_color (unsigned int idx)
… …
1820 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1800 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1821 } 1801 }
1822#endif 1802#endif
1823} 1803}
1824 1804
1825#if TRANSPARENT || ENABLE_PERL 1805#if ENABLE_TRANSPARENCY || ENABLE_PERL
1826void 1806void
1827rxvt_term::rootwin_cb (XEvent &ev) 1807rxvt_term::rootwin_cb (XEvent &ev)
1828{ 1808{
1829 make_current (); 1809 make_current ();
1830 1810
1831 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1811 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1832 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1812 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1833 return; 1813 return;
1834 1814
1835# if TRANSPARENT 1815# if ENABLE_TRANSPARENCY
1836 switch (ev.type) 1816 switch (ev.type)
1837 { 1817 {
1838 case PropertyNotify: 1818 case PropertyNotify:
1839 /* 1819 /*
1840 * if user used some Esetroot compatible prog to set the root bg, 1820 * 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. 1821 * use the property to determine the pixmap. We use it later on.
1842 */ 1822 */
1843 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1823 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1844 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1824 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1845 return; 1825 {
1826 bgPixmap.set_root_pixmap ();
1827 update_background ();
1828 }
1846 1829
1847 /* FALLTHROUGH */
1848 case ReparentNotify:
1849 if (option (Opt_transparent))
1850 check_our_parents ();
1851 break; 1830 break;
1852 } 1831 }
1853# endif 1832# endif
1833
1834 refresh_check ();
1854} 1835}
1855#endif 1836#endif
1856 1837
1857void 1838void
1858rxvt_term::button_press (XButtonEvent &ev) 1839rxvt_term::button_press (XButtonEvent &ev)
… …
1913 mouse_report (ev); 1894 mouse_report (ev);
1914 } 1895 }
1915#else 1896#else
1916 MEvent.button = ev.button; 1897 MEvent.button = ev.button;
1917 mouse_report (ev); 1898 mouse_report (ev);
1918#endif /* MOUSE_REPORT_DOUBLECLICK */ 1899#endif /* MOUSE_REPORT_DOUBLECLICK */
1919 1900
1920 } 1901 }
1921 else 1902 else
1922 { 1903 {
1923 if (ev.button != MEvent.button) 1904 if (ev.button != MEvent.button)
… …
1971 } 1952 }
1972 1953
1973 /* 1954 /*
1974 * Scrollbar window processing of button press 1955 * Scrollbar window processing of button press
1975 */ 1956 */
1976 if (isScrollbarWindow (ev.window)) 1957 if (scrollBar.state && ev.window == scrollBar.win)
1977 { 1958 {
1978 scrollBar.setIdle (); 1959 page_dirn direction = NO_DIR;
1960
1961 if (scrollBar.upButton (ev.y))
1962 direction = UP; /* up */
1963 else if (scrollBar.dnButton (ev.y))
1964 direction = DN; /* down */
1965
1966 scrollBar.state = STATE_IDLE;
1979 /* 1967 /*
1980 * Rxvt-style scrollbar: 1968 * Rxvt-style scrollbar:
1981 * move up if mouse is above slider 1969 * move up if mouse is above slider
1982 * move dn if mouse is below slider 1970 * move dn if mouse is below slider
1983 * 1971 *
… …
1992 /* 1980 /*
1993 * Mouse report disabled scrollbar: 1981 * Mouse report disabled scrollbar:
1994 * arrow buttons - send up/down 1982 * arrow buttons - send up/down
1995 * click on scrollbar - send pageup/down 1983 * click on scrollbar - send pageup/down
1996 */ 1984 */
1997 if ((scrollBar.style == R_SB_NEXT 1985 if (direction == UP)
1998 && scrollbarnext_upButton (ev.y))
1999 || (scrollBar.style == R_SB_RXVT
2000 && scrollbarrxvt_upButton (ev.y)))
2001 tt_printf ("\033[A"); 1986 tt_printf ("\033[A");
2002 else if ((scrollBar.style == R_SB_NEXT 1987 else if (direction == DN)
2003 && scrollbarnext_dnButton (ev.y))
2004 || (scrollBar.style == R_SB_RXVT
2005 && scrollbarrxvt_dnButton (ev.y)))
2006 tt_printf ("\033[B"); 1988 tt_printf ("\033[B");
2007 else 1989 else
2008 switch (ev.button) 1990 switch (ev.button)
2009 { 1991 {
2010 case Button2: 1992 case Button2:
… …
2017 tt_printf ("\033[5~"); 1999 tt_printf ("\033[5~");
2018 break; 2000 break;
2019 } 2001 }
2020 } 2002 }
2021 else 2003 else
2022#endif /* NO_SCROLLBAR_REPORT */ 2004#endif /* NO_SCROLLBAR_REPORT */
2023
2024 {
2025 char upordown = 0;
2026
2027 if (scrollBar.style == R_SB_NEXT)
2028 { 2005 {
2029 if (scrollbarnext_upButton (ev.y)) 2006 if (direction != NO_DIR)
2030 upordown = -1; /* up */
2031 else if (scrollbarnext_dnButton (ev.y))
2032 upordown = 1; /* down */
2033 }
2034 else if (scrollBar.style == R_SB_RXVT)
2035 {
2036 if (scrollbarrxvt_upButton (ev.y))
2037 upordown = -1; /* up */
2038 else if (scrollbarrxvt_dnButton (ev.y))
2039 upordown = 1; /* down */
2040 }
2041 if (upordown)
2042 { 2007 {
2043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2008#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2009 if (!cont_scroll_ev.is_active ())
2044 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2010 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2045#endif 2011#endif
2046 if (scr_page (upordown < 0 ? UP : DN, 1)) 2012 if (scr_page (direction, 1))
2047 { 2013 {
2048 if (upordown < 0) 2014 if (direction == UP)
2049 scrollBar.setUp (); 2015 scrollBar.state = STATE_UP;
2050 else 2016 else
2051 scrollBar.setDn (); 2017 scrollBar.state = STATE_DOWN;
2052 } 2018 }
2053 } 2019 }
2054 else 2020 else
2055 switch (ev.button) 2021 switch (ev.button)
2056 { 2022 {
2057 case Button2: 2023 case Button2:
2058 switch (scrollbar_align) 2024 switch (scrollBar.align)
2059 { 2025 {
2060 case R_SB_ALIGN_TOP: 2026 case R_SB_ALIGN_TOP:
2061 csrO = 0; 2027 csrO = 0;
2062 break; 2028 break;
2063 case R_SB_ALIGN_CENTRE: 2029 case R_SB_ALIGN_CENTRE:
… …
2069 } 2035 }
2070 2036
2071 if (scrollBar.style == R_SB_XTERM 2037 if (scrollBar.style == R_SB_XTERM
2072 || scrollbar_above_slider (ev.y) 2038 || scrollbar_above_slider (ev.y)
2073 || scrollbar_below_slider (ev.y)) 2039 || scrollbar_below_slider (ev.y))
2074 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2040 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2075 2041
2076 scrollBar.setMotion (); 2042 scrollBar.state = STATE_MOTION;
2077 break; 2043 break;
2078 2044
2079 case Button1: 2045 case Button1:
2080 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2046 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2081 csrO = ev.y - scrollBar.top; 2047 csrO = ev.y - scrollBar.top;
2082 /* FALLTHROUGH */ 2048 /* FALLTHROUGH */
2083 2049
2084 case Button3: 2050 case Button3:
2085 if (scrollBar.style != R_SB_XTERM) 2051 if (scrollBar.style != R_SB_XTERM)
… …
2095 scr_page (DN, nrow - 1); 2061 scr_page (DN, nrow - 1);
2096# else 2062# else
2097 scr_page (DN, nrow / 4); 2063 scr_page (DN, nrow / 4);
2098# endif 2064# endif
2099 else 2065 else
2100 scrollBar.setMotion (); 2066 scrollBar.state = STATE_MOTION;
2101 } 2067 }
2102 else 2068 else
2103 { 2069 {
2104 scr_page ((ev.button == Button1 ? DN : UP), 2070 scr_page ((ev.button == Button1 ? DN : UP),
2105 (nrow 2071 (nrow
2106 * scrollbar_position (ev.y) 2072 * scrollbar_position (ev.y)
2107 / scrollbar_size ())); 2073 / scrollBar.size ()));
2108 } 2074 }
2109 2075
2110 break; 2076 break;
2111 } 2077 }
2112 } 2078 }
… …
2122 2088
2123 csrO = 0; /* reset csr Offset */ 2089 csrO = 0; /* reset csr Offset */
2124 if (!bypass_keystate) 2090 if (!bypass_keystate)
2125 reportmode = !! (priv_modes & PrivMode_mouse_report); 2091 reportmode = !! (priv_modes & PrivMode_mouse_report);
2126 2092
2127 if (scrollbar_isUpDn ()) 2093 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2128 { 2094 {
2129 scrollBar.setIdle (); 2095 scrollBar.state = STATE_IDLE;
2130 scrollbar_show (0); 2096 scrollBar.show (0);
2131 } 2097 }
2132 2098
2133#ifdef SELECTION_SCROLLING 2099#ifdef SELECTION_SCROLLING
2134 if (sel_scroll_ev.active)
2135 sel_scroll_ev.stop(); 2100 sel_scroll_ev.stop();
2136#endif 2101#endif
2137 2102
2138 if (ev.window == vt) 2103 if (ev.window == vt)
2139 { 2104 {
2140 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2105 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2164 mouse_report (ev); 2129 mouse_report (ev);
2165 } 2130 }
2166#else /* MOUSE_REPORT_DOUBLECLICK */ 2131#else /* MOUSE_REPORT_DOUBLECLICK */
2167 MEvent.button = AnyButton; 2132 MEvent.button = AnyButton;
2168 mouse_report (ev); 2133 mouse_report (ev);
2169#endif /* MOUSE_REPORT_DOUBLECLICK */ 2134#endif /* MOUSE_REPORT_DOUBLECLICK */
2170 return; 2135 return;
2171 } 2136 }
2172 2137
2173 /* 2138 /*
2174 * dumb hack to compensate for the failure of click-and-drag 2139 * dumb hack to compensate for the failure of click-and-drag
… …
2212 { 2177 {
2213 mouse_slip_wheel_speed += v ? -1 : 1; 2178 mouse_slip_wheel_speed += v ? -1 : 1;
2214 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2179 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2215 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2180 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2216 2181
2217 if (slip_wheel_ev.at < NOW) 2182 if (!slip_wheel_ev.is_active ())
2218 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2183 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2219
2220 slip_wheel_ev.start ();
2221 } 2184 }
2222 else 2185 else
2186# endif
2223 { 2187 {
2224# endif
2225 scr_page (v, i); 2188 scr_page (v, i);
2226 scrollbar_show (1); 2189 scrollBar.show (1);
2227# ifdef MOUSE_SLIP_WHEELING
2228 } 2190 }
2229# endif
2230 } 2191 }
2231 break; 2192 break;
2232#endif 2193#endif
2233 } 2194 }
2234 } 2195 }
2235} 2196}
2236 2197
2237/*}}} */ 2198/*}}} */
2238 2199
2239bool 2200void
2240rxvt_term::cmd_parse () 2201rxvt_term::cmd_parse ()
2241{ 2202{
2242 bool flag = false;
2243 wchar_t ch = NOCHAR; 2203 wchar_t ch = NOCHAR;
2244 char *seq_begin; // remember start of esc-sequence here 2204 char *seq_begin; // remember start of esc-sequence here
2245 2205
2246 for (;;) 2206 for (;;)
2247 { 2207 {
2248 if (ch == NOCHAR) 2208 if (expect_false (ch == NOCHAR))
2249 { 2209 {
2250 seq_begin = cmdbuf_ptr; 2210 seq_begin = cmdbuf_ptr;
2251 ch = next_char (); 2211 ch = next_char ();
2252 2212
2253 if (ch == NOCHAR) 2213 if (ch == NOCHAR)
2254 break; 2214 break;
2255 } 2215 }
2256 2216
2257 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2217 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2258 { 2218 {
2259 if (!seen_input) 2219 if (expect_false (!seen_input))
2260 { 2220 {
2261 seen_input = 1; 2221 seen_input = 1;
2262 // many badly-written programs (e.g. jed) contain a race condition: 2222 // many badly-written programs (e.g. jed) contain a race condition:
2263 // they first read the screensize and then install a SIGWINCH handler. 2223 // they first read the screensize and then install a SIGWINCH handler.
2264 // some window managers resize the window early, and these programs 2224 // some window managers resize the window early, and these programs
… …
2277 wchar_t *str = buf; 2237 wchar_t *str = buf;
2278 wchar_t *eol = str + min (ncol, UBUFSIZ); 2238 wchar_t *eol = str + min (ncol, UBUFSIZ);
2279 2239
2280 for (;;) 2240 for (;;)
2281 { 2241 {
2282 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2242 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2283 break; 2243 break;
2284 2244
2285 *str++ = ch; 2245 *str++ = ch;
2286 2246
2287 if (ch == C0_LF || str >= eol) 2247 if (expect_false (ch == C0_LF || str >= eol))
2288 { 2248 {
2289 if (ch == C0_LF) 2249 if (ch == C0_LF)
2290 nlines++; 2250 nlines++;
2291 2251
2292 refresh_count++; 2252 refresh_count++;
2293 2253
2294 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2254 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2295 { 2255 {
2296 refresh_count = 0; 2256 refresh_count = 0;
2297 2257
2298 if (!option (Opt_skipScroll) || io_manager::now () > NOW + .1) 2258 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2299 { 2259 {
2300 refreshnow = true; 2260 refreshnow = true;
2301 ch = NOCHAR; 2261 ch = NOCHAR;
2302 break; 2262 break;
2303 } 2263 }
… …
2341 * What the heck we'll cheat and only refresh less than every page-full. 2301 * What the heck we'll cheat and only refresh less than every page-full.
2342 * if skipScroll is enabled. 2302 * if skipScroll is enabled.
2343 */ 2303 */
2344 if (refreshnow) 2304 if (refreshnow)
2345 { 2305 {
2346 flag = true;
2347 scr_refresh (); 2306 scr_refresh ();
2348 want_refresh = 1; 2307 want_refresh = 1;
2349 } 2308 }
2350
2351 } 2309 }
2352 else 2310 else
2353 { 2311 {
2354 try 2312 try
2355 { 2313 {
… …
2363 } 2321 }
2364 2322
2365 ch = NOCHAR; 2323 ch = NOCHAR;
2366 } 2324 }
2367 } 2325 }
2368
2369 return flag;
2370} 2326}
2371 2327
2372// read the next character 2328// read the next character
2373wchar_t 2329wchar_t
2374rxvt_term::next_char () NOTHROW 2330rxvt_term::next_char () NOTHROW
2375{ 2331{
2376 while (cmdbuf_ptr < cmdbuf_endp) 2332 while (cmdbuf_ptr < cmdbuf_endp)
2377 { 2333 {
2378 // assume 7-bit to be ascii ALWAYS 2334 // assume 7-bit to be ascii ALWAYS
2379 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2335 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2380 return *cmdbuf_ptr++; 2336 return *cmdbuf_ptr++;
2381 2337
2382 wchar_t wc; 2338 wchar_t wc;
2383 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2339 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2384 2340
… …
2388 cmdbuf_ptr = cmdbuf_endp; 2344 cmdbuf_ptr = cmdbuf_endp;
2389 break; 2345 break;
2390 } 2346 }
2391 2347
2392 if (len == (size_t)-1) 2348 if (len == (size_t)-1)
2349 {
2350 mbstate.reset (); // reset now undefined conversion state
2393 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2351 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2352 }
2394 2353
2395 // assume wchar == unicode 2354 // assume wchar == unicode
2396 cmdbuf_ptr += len; 2355 cmdbuf_ptr += len;
2397 return wc & UNICODE_MASK; 2356 return wc & UNICODE_MASK;
2398 } 2357 }
… …
2442/*----------------------------------------------------------------------*/ 2401/*----------------------------------------------------------------------*/
2443#ifdef PRINTPIPE 2402#ifdef PRINTPIPE
2444FILE * 2403FILE *
2445rxvt_term::popen_printer () 2404rxvt_term::popen_printer ()
2446{ 2405{
2447 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2406 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2448 2407
2449 if (stream == NULL) 2408 if (stream == NULL)
2450 rxvt_warn ("can't open printer pipe, not printing.\n"); 2409 rxvt_warn ("can't open printer pipe, not printing.\n");
2451 2410
2452 return stream; 2411 return stream;
… …
2463 * simulate attached vt100 printer 2422 * simulate attached vt100 printer
2464 */ 2423 */
2465void 2424void
2466rxvt_term::process_print_pipe () 2425rxvt_term::process_print_pipe ()
2467{ 2426{
2468 int done; 2427 FILE *fd = popen_printer ();
2469 FILE *fd;
2470 2428
2471 if ((fd = popen_printer ()) == NULL) 2429 if (!fd)
2472 return; 2430 return;
2473 2431
2474 /* 2432 /*
2475 * Send all input to the printer until either ESC[4i or ESC[?4i 2433 * Send all input to the printer until either ESC[4i or ESC[?4i
2476 * is received. 2434 * is received.
2477 */ 2435 */
2478 for (done = 0; !done;) 2436 for (int done = 0; !done; )
2479 { 2437 {
2480 unsigned char buf[8]; 2438 unsigned char buf[8];
2481 unicode_t ch; 2439 unicode_t ch;
2482 unsigned int i, len; 2440 unsigned int i, len;
2483 2441
… …
2514 } 2472 }
2515 } 2473 }
2516 2474
2517 pclose_printer (fd); 2475 pclose_printer (fd);
2518} 2476}
2519#endif /* PRINTPIPE */ 2477#endif /* PRINTPIPE */
2520/*}}} */ 2478/*}}} */
2521 2479
2522/* *INDENT-OFF* */ 2480/* *INDENT-OFF* */
2523enum { 2481enum {
2524 C1_40 = 0x40, 2482 C1_40 = 0x40,
… …
2574 process_dcs_seq (); 2532 process_dcs_seq ();
2575 break; 2533 break;
2576 case 0x9b: /* CSI */ 2534 case 0x9b: /* CSI */
2577 process_csi_seq (); 2535 process_csi_seq ();
2578 break; 2536 break;
2579 case 0x9d: /* CSI */ 2537 case 0x9d: /* OSC */
2580 process_osc_seq (); 2538 process_osc_seq ();
2581 break; 2539 break;
2582#endif 2540#endif
2583 } 2541 }
2584} 2542}
… …
2628 break; 2586 break;
2629 case 'Z': /* identify the terminal type */ 2587 case 'Z': /* identify the terminal type */
2630 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2588 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2631 break; 2589 break;
2632 case '<': /* turn off VT52 mode */ 2590 case '<': /* turn off VT52 mode */
2633 PrivMode (0, PrivMode_vt52); 2591 set_privmode (PrivMode_vt52, 0);
2634 break; 2592 break;
2635 case 'F': /* use special graphics character set */ 2593 case 'F': /* use special graphics character set */
2636 case 'G': /* use regular character set */ 2594 case 'G': /* use regular character set */
2637 /* unimplemented */ 2595 /* unimplemented */
2638 break; 2596 break;
… …
2692 scr_forwardindex (); 2650 scr_forwardindex ();
2693 break; 2651 break;
2694#endif 2652#endif
2695 case '=': 2653 case '=':
2696 case '>': 2654 case '>':
2697 PrivMode ((ch == '='), PrivMode_aplKP); 2655 set_privmode (PrivMode_aplKP, ch == '=');
2698 break; 2656 break;
2699 2657
2700 case C1_40: 2658 case C1_40:
2701 cmd_getc (); 2659 cmd_getc ();
2702 break; 2660 break;
… …
2741 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2699 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2742 case C1_SCI: /* ESC Z */ 2700 case C1_SCI: /* ESC Z */
2743 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2701 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2744 break; /* steal obsolete ESC [ c */ 2702 break; /* steal obsolete ESC [ c */
2745 2703
2746 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2704 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2747 case C1_CSI: /* ESC [ */ 2705 case C1_CSI: /* ESC [ */
2748 process_csi_seq (); 2706 process_csi_seq ();
2749 break; 2707 break;
2750 2708
2751 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2709 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2752 case C1_OSC: /* ESC ] */ 2710 case C1_OSC: /* ESC ] */
2753 process_osc_seq (); 2711 process_osc_seq ();
2754 break; 2712 break;
2755 2713
2756 /* 8.3.106: RESET TO INITIAL STATE */ 2714 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2757 case 'c': 2715 case 'c':
2758 mbstate.reset (); 2716 mbstate.reset ();
2759 scr_poweron (); 2717 scr_poweron ();
2760 scrollbar_show (1); 2718 scrollBar.show (1);
2761 break; 2719 break;
2762 2720
2763 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2721 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2764 case 'n': 2722 case 'n':
2765 scr_charset_choose (2); 2723 scr_charset_choose (2);
… …
2810rxvt_term::process_csi_seq () 2768rxvt_term::process_csi_seq ()
2811{ 2769{
2812 unicode_t ch, priv, i; 2770 unicode_t ch, priv, i;
2813 unsigned int nargs, p; 2771 unsigned int nargs, p;
2814 int n, ndef; 2772 int n, ndef;
2815 int arg[ESC_ARGS]; 2773 int arg[ESC_ARGS] = { };
2816 2774
2817 for (nargs = ESC_ARGS; nargs > 0;) 2775 nargs = 0;
2818 arg[--nargs] = 0;
2819 2776
2820 priv = 0; 2777 priv = 0;
2821 ch = cmd_getc (); 2778 ch = cmd_getc ();
2822 if (ch >= '<' && ch <= '?') 2779 if ((ch >= '<' && ch <= '?') || ch == '!')
2780 {
2823 { /* '<' '=' '>' '?' */ 2781 /* '<' '=' '>' '?' '!' */
2824 priv = ch; 2782 priv = ch;
2825 ch = cmd_getc (); 2783 ch = cmd_getc ();
2826 } 2784 }
2827 2785
2828 /* read any numerical arguments */ 2786 /* read any numerical arguments */
… …
2867 switch (priv) 2825 switch (priv)
2868 { 2826 {
2869 case '>': 2827 case '>':
2870 if (ch == CSI_DA) /* secondary device attributes */ 2828 if (ch == CSI_DA) /* secondary device attributes */
2871 { 2829 {
2872 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2830 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2873 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2831 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2874 // 2832 //
2875 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2833 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2876 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2834 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2877 // that we do not support xterm mouse reporting (should be 95 when we do). 2835 // versions.
2878 // 2836 //
2879 tt_printf ("\033[>%d;94;0c", 'U'); 2837 tt_printf ("\033[>%d;95;0c", 'U');
2880 } 2838 }
2881 break; 2839 break;
2840
2882 case '?': 2841 case '?':
2883 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2842 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2884 process_terminal_mode (ch, priv, nargs, arg); 2843 process_terminal_mode (ch, priv, nargs, arg);
2885 break; 2844 break;
2845
2846 case '!':
2847 if (ch == CSI_70)
2848 {
2849 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2850 scr_soft_reset ();
2851
2852 static const int pm_h[] = { 7, 25 };
2853 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2854
2855 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2856 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2886 } 2857 }
2858 break;
2859 }
2860
2887 return; 2861 return;
2888 } 2862 }
2889 2863
2890 switch (ch) 2864 switch (ch)
2891 { 2865 {
… …
3320 3294
3321/* 3295/*
3322 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3296 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3323 */ 3297 */
3324void 3298void
3325rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3299rxvt_term::process_xterm_seq (int op, char *str, char resp)
3326{ 3300{
3327 int color; 3301 int color;
3328 char *buf, *name; 3302 char *buf, *name;
3329 bool query = str[0] == '?' && !str[1]; 3303 bool query = str[0] == '?' && !str[1];
3330 int saveop = op; 3304 int saveop = op;
… …
3371 3345
3372 XFree (value); 3346 XFree (value);
3373 } 3347 }
3374 else 3348 else
3375 { 3349 {
3376 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3350 char *eq = strchr (str, '=');
3377 3351
3378 if (eq) 3352 if (eq)
3379 { 3353 {
3380 *eq = 0; 3354 *eq = 0;
3381 set_utf8_property (display->atom (str), eq + 1); 3355 set_utf8_property (display->atom (str), eq + 1);
… …
3402 *buf++ = '\0'; 3376 *buf++ = '\0';
3403 3377
3404 process_color_seq (op, color, name, resp); 3378 process_color_seq (op, color, name, resp);
3405 } 3379 }
3406 break; 3380 break;
3381 case Rxvt_restoreFG:
3407 case XTerm_Color00: 3382 case XTerm_Color00:
3408 process_color_seq (op, Color_fg, str, resp); 3383 process_color_seq (op, Color_fg, str, resp);
3409 break; 3384 break;
3385 case Rxvt_restoreBG:
3410 case XTerm_Color01: 3386 case XTerm_Color01:
3411 process_color_seq (op, Color_bg, str, resp); 3387 process_color_seq (op, Color_bg, str, resp);
3412 break; 3388 break;
3413#ifndef NO_CURSORCOLOR 3389#ifndef NO_CURSORCOLOR
3414 case XTerm_Color_cursor: 3390 case XTerm_Color_cursor:
… …
3435 break; 3411 break;
3436 case URxvt_Color_IT: 3412 case URxvt_Color_IT:
3437 process_color_seq (op, Color_IT, str, resp); 3413 process_color_seq (op, Color_IT, str, resp);
3438 break; 3414 break;
3439#endif 3415#endif
3440#if TRANSPARENT && TINTING 3416 case URxvt_Color_border:
3417 process_color_seq (op, Color_border, str, resp);
3418 break;
3419#if ENABLE_TRANSPARENCY
3441 case URxvt_Color_tint: 3420 case URxvt_Color_tint:
3442 process_color_seq (op, Color_tint, str, resp); 3421 process_color_seq (op, Color_tint, str, resp);
3422 {
3423 bool changed = false;
3443 3424
3444 check_our_parents (); 3425 if (ISSET_PIXCOLOR (Color_tint))
3426 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3427 else
3428 changed = bgPixmap.unset_tint ();
3445 3429
3446 if (am_transparent) 3430 if (changed)
3447 want_full_refresh = want_refresh = 1; 3431 update_background ();
3432 }
3448 3433
3449 break; 3434 break;
3450#endif 3435#endif
3451 3436
3437#if BG_IMAGE_FROM_FILE
3452 case Rxvt_Pixmap: 3438 case Rxvt_Pixmap:
3453 { 3439 if (!strcmp (str, "?"))
3454 if (*str != ';')
3455 { 3440 {
3456#if XPM_BACKGROUND 3441 char str[256];
3457 scale_pixmap (""); /* reset to default scaling */ 3442
3458 set_bgPixmap (str); /* change pixmap */ 3443 sprintf (str, "[%dx%d+%d+%d]",
3459 scr_touch (true); 3444 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3460#endif 3445 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3446 process_xterm_seq (XTerm_title, str, CHAR_ST);
3461 } 3447 }
3462 3448 else
3449 {
3463 int changed = 0; 3450 int changed = 0;
3464 3451
3465 while ((str = strchr (str, ';')) != NULL) 3452 if (*str != ';')
3466 { 3453 {
3454 /* reset to default scaling :*/
3455 bgPixmap.unset_geometry ();
3456 if (bgPixmap.set_file (str)) /* change pixmap */
3457 changed++;
3458 str = strchr (str, ';');
3459 if (str == NULL)
3460 bgPixmap.set_defaultGeometry ();
3461 }
3462
3463 while (str)
3464 {
3467 str++; 3465 str++;
3468#if XPM_BACKGROUND 3466 if (bgPixmap.set_geometry (str))
3469 changed += scale_pixmap (str); 3467 changed++;
3470#endif 3468 str = strchr (str, ';');
3471 } 3469 }
3472 3470
3473 if (changed) 3471 if (changed)
3474 { 3472 update_background ();
3475#ifdef XPM_BACKGROUND
3476 resize_pixmap ();
3477 scr_touch (true);
3478#endif
3479 } 3473 }
3480#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
3481 if (option (Opt_transparent))
3482 check_our_parents ();
3483#endif
3484 }
3485 break; 3474 break;
3486 3475#endif
3487 case Rxvt_restoreFG:
3488 set_window_color (Color_fg, str);
3489 break;
3490 case Rxvt_restoreBG:
3491 set_window_color (Color_bg, str);
3492 break;
3493 3476
3494 case XTerm_logfile: 3477 case XTerm_logfile:
3495 // TODO, when secure mode? 3478 // TODO, when secure mode?
3496 break; 3479 break;
3497 3480
… …
3564 break; 3547 break;
3565#endif 3548#endif
3566 3549
3567#if ENABLE_PERL 3550#if ENABLE_PERL
3568 case URxvt_perl: 3551 case URxvt_perl:
3569 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3552 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3570 ; // no responses yet
3571 break; 3553 break;
3572#endif 3554#endif
3573 } 3555 }
3574} 3556}
3575/*----------------------------------------------------------------------*/ 3557/*----------------------------------------------------------------------*/
… …
3598 { 3580 {
3599 if (mode == 'r') 3581 if (mode == 'r')
3600 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3582 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3601 else 3583 else
3602 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3584 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3603 PrivMode (state, bit); 3585 set_privmode (bit, state);
3604 } 3586 }
3605 3587
3606 return state; 3588 return state;
3607} 3589}
3608 3590
… …
3612{ 3594{
3613 unsigned int i, j; 3595 unsigned int i, j;
3614 int state; 3596 int state;
3615 3597
3616 static const struct 3598 static const struct
3617 { 3599 {
3618 const int argval; 3600 const int argval;
3619 const unsigned long bit; 3601 const unsigned long bit;
3620 }
3621
3622 argtopriv[] = { 3602 } argtopriv[] = {
3623 { 1, PrivMode_aplCUR }, 3603 { 1, PrivMode_aplCUR }, // DECCKM
3624 { 2, PrivMode_vt52 }, 3604 { 2, PrivMode_vt52 },
3625 { 3, PrivMode_132 }, 3605 { 3, PrivMode_132 }, // DECCOLM
3626 { 4, PrivMode_smoothScroll }, 3606 { 4, PrivMode_smoothScroll }, // DECSCLM
3627 { 5, PrivMode_rVideo }, 3607 { 5, PrivMode_rVideo }, // DECSCNM
3628 { 6, PrivMode_relOrigin }, 3608 { 6, PrivMode_relOrigin }, // DECOM
3629 { 7, PrivMode_Autowrap }, 3609 { 7, PrivMode_Autowrap }, // DECAWM
3630 // 8, bi-directional support mode 3610 // 8, auto-repeat keys // DECARM
3631 { 9, PrivMode_MouseX10 }, 3611 { 9, PrivMode_MouseX10 },
3632 // 18, 19 printing-related 3612 // 18 end FF to printer after print screen
3613 // 19 Print screen prints full screen/scorll region
3633 { 25, PrivMode_VisibleCursor }, 3614 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3634#ifdef scrollBar_esc 3615#ifdef scrollBar_esc
3635 { scrollBar_esc, PrivMode_scrollBar }, 3616 { scrollBar_esc, PrivMode_scrollBar },
3636#endif 3617#endif
3637 { 35, PrivMode_ShiftKeys }, // rxvt extension 3618 { 35, PrivMode_ShiftKeys }, // rxvt extension
3619 // 38, tektronix mode // DECTEK
3638 { 40, PrivMode_132OK }, 3620 { 40, PrivMode_132OK },
3639 // 41 xterm more fixes NYI 3621 // 41 xterm more fixes NYI
3640 // 45 margin bell NYI 3622 // 45 margin bell NYI
3641 // 46 start logging 3623 // 46 start logging
3642 { 47, PrivMode_Screen }, 3624 { 47, PrivMode_Screen },
3643 { 66, PrivMode_aplKP }, 3625 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3644#ifndef NO_BACKSPACE_KEY 3626#ifndef NO_BACKSPACE_KEY
3645 { 67, PrivMode_BackSpace }, 3627 { 67, PrivMode_BackSpace }, // DECBKM
3646#endif 3628#endif
3647 { 1000, PrivMode_MouseX11 }, 3629 { 1000, PrivMode_MouseX11 },
3648 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3630 { 1002, PrivMode_MouseBtnEvent },
3649 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3631 { 1003, PrivMode_MouseAnyEvent },
3650 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3651 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3632 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3652 { 1011, PrivMode_Keypress }, // rxvt extension 3633 { 1011, PrivMode_Keypress }, // rxvt extension
3653 // 1035 enable modifiers for alt, numlock NYI 3634 // 1035 enable modifiers for alt, numlock NYI
3654 // 1036 send ESC for meta keys NYI 3635 // 1036 send ESC for meta keys NYI
3655 // 1037 send DEL for keypad delete NYI 3636 // 1037 send DEL for keypad delete NYI
3656 { 1047, PrivMode_Screen }, 3637 { 1047, PrivMode_Screen },
3657 // 1048 save and restore cursor 3638 // 1048 save and restore cursor
3658 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3639 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3659 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3640 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3641 { 2004, PrivMode_BracketPaste },
3660 }; 3642 };
3661 3643
3662 if (nargs == 0) 3644 if (nargs == 0)
3663 return; 3645 return;
3664 3646
… …
3689 3671
3690 scr_touch (true); 3672 scr_touch (true);
3691 break; 3673 break;
3692#endif 3674#endif
3693 case 1048: /* alternative cursor save */ 3675 case 1048: /* alternative cursor save */
3694 case 1049:
3695 if (option (Opt_secondaryScreen)) 3676 if (option (Opt_secondaryScreen))
3696 if (mode == 0) 3677 if (mode == 0)
3697 scr_cursor (RESTORE); 3678 scr_cursor (RESTORE);
3698 else if (mode == 1) 3679 else if (mode == 1)
3699 scr_cursor (SAVE); 3680 scr_cursor (SAVE);
… …
3708 case 2: /* VT52 mode */ 3689 case 2: /* VT52 mode */
3709 /* oddball mode. should be set regardless of set/reset 3690 /* oddball mode. should be set regardless of set/reset
3710 * parameter. Return from VT52 mode with an ESC < from 3691 * parameter. Return from VT52 mode with an ESC < from
3711 * within VT52 mode 3692 * within VT52 mode
3712 */ 3693 */
3713 PrivMode (1, PrivMode_vt52); 3694 set_privmode (PrivMode_vt52, 1);
3714 break; 3695 break;
3715 case 3: /* 80/132 */ 3696 case 3: /* 80/132 */
3716 if (priv_modes & PrivMode_132OK) 3697 if (priv_modes & PrivMode_132OK)
3717 set_widthheight (((state ? 132 : 80) * fwidth), height); 3698 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3718 break; 3699 break;
3719 case 4: /* smooth scrolling */ 3700 case 4: /* smooth scrolling */
3720 set_option (Opt_jumpScroll, !state); 3701 set_option (Opt_jumpScroll, !state);
3721 break; 3702 break;
3722 case 5: /* reverse video */ 3703 case 5: /* reverse video */
… …
3729 scr_autowrap (state); 3710 scr_autowrap (state);
3730 break; 3711 break;
3731 /* case 8: - auto repeat, can't do on a per window basis */ 3712 /* case 8: - auto repeat, can't do on a per window basis */
3732 case 9: /* X10 mouse reporting */ 3713 case 9: /* X10 mouse reporting */
3733 if (state) /* orthogonal */ 3714 if (state) /* orthogonal */
3734 priv_modes &= ~PrivMode_MouseX11; 3715 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3735 break; 3716 break;
3736#ifdef scrollBar_esc 3717#ifdef scrollBar_esc
3737 case scrollBar_esc: 3718 case scrollBar_esc:
3738 if (scrollbar_mapping (state)) 3719 if (scrollBar.map (state))
3739 { 3720 {
3740 resize_all_windows (0, 0, 0); 3721 resize_all_windows (0, 0, 0);
3741 scr_touch (true); 3722 scr_touch (true);
3742 } 3723 }
3743 break; 3724 break;
… …
3752 break; 3733 break;
3753 /* case 66: - application key pad */ 3734 /* case 66: - application key pad */
3754 /* case 67: - backspace key */ 3735 /* case 67: - backspace key */
3755 case 1000: /* X11 mouse reporting */ 3736 case 1000: /* X11 mouse reporting */
3756 if (state) /* orthogonal */ 3737 if (state) /* orthogonal */
3757 priv_modes &= ~PrivMode_MouseX10; 3738 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3758 break; 3739 break;
3759#if 0
3760 case 1001: 3740 case 1002:
3761 break; /* X11 mouse highlighting */ 3741 case 1003:
3762#endif 3742 if (state)
3743 {
3744 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3745 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3746 vt_emask_mouse = PointerMotionMask;
3747 }
3748 else
3749 vt_emask_mouse = NoEventMask;
3750
3751 vt_select_input ();
3752 break;
3763 case 1010: /* scroll to bottom on TTY output inhibit */ 3753 case 1010: /* scroll to bottom on TTY output inhibit */
3764 set_option (Opt_scrollTtyOutput, !state); 3754 set_option (Opt_scrollTtyOutput, !state);
3765 break; 3755 break;
3766 case 1011: /* scroll to bottom on key press */ 3756 case 1011: /* scroll to bottom on key press */
3767 set_option (Opt_scrollTtyKeypress, state); 3757 set_option (Opt_scrollTtyKeypress, state);
3768 break; 3758 break;
3769 case 1047: /* secondary screen w/ clearing last */ 3759 case 1047: /* secondary screen w/ clearing last */
3770 if (option (Opt_secondaryScreen)) 3760 if (option (Opt_secondaryScreen))
3771 if (current_screen != PRIMARY) 3761 if (!state)
3772 scr_erase_screen (2); 3762 scr_erase_screen (2);
3763
3773 scr_change_screen (state); 3764 scr_change_screen (state);
3774 break; 3765 break;
3775 case 1049: /* secondary screen w/ clearing first */ 3766 case 1049: /* secondary screen w/ clearing first */
3767 if (option (Opt_secondaryScreen))
3768 if (state)
3769 scr_cursor (SAVE);
3770
3776 scr_change_screen (state); 3771 scr_change_screen (state);
3772
3777 if (option (Opt_secondaryScreen)) 3773 if (option (Opt_secondaryScreen))
3778 if (current_screen != PRIMARY) 3774 if (state)
3779 scr_erase_screen (2); 3775 scr_erase_screen (2);
3776 else
3777 scr_cursor (RESTORE);
3780 break; 3778 break;
3781 default: 3779 default:
3782 break; 3780 break;
3783 } 3781 }
3784 } 3782 }
… …
3944rxvt_term::process_graphics () 3942rxvt_term::process_graphics ()
3945{ 3943{
3946 unicode_t ch, cmd = cmd_getc (); 3944 unicode_t ch, cmd = cmd_getc ();
3947 3945
3948 if (cmd == 'Q') 3946 if (cmd == 'Q')
3947 {
3949 { /* query graphics */ 3948 /* query graphics */
3950 tt_printf ("\033G0\012"); /* no graphics */ 3949 tt_printf ("\033G0\012"); /* no graphics */
3951 return; 3950 return;
3952 } 3951 }
3953 /* swallow other graphics sequences until terminating ':' */ 3952 /* swallow other graphics sequences until terminating ':' */
3954 do 3953 do
… …
4004 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4003 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4005 4004
4006 memcpy (v_buffer + v_buflen, data, len); 4005 memcpy (v_buffer + v_buflen, data, len);
4007 v_buflen += len; 4006 v_buflen += len;
4008 4007
4009 pty_ev.set (EVENT_READ | EVENT_WRITE); 4008 pty_ev.set (ev::READ | ev::WRITE);
4010} 4009}
4011 4010
4012void rxvt_term::pty_write () 4011void rxvt_term::pty_write ()
4013{ 4012{
4014 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4013 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4019 4018
4020 if (v_buflen == 0) 4019 if (v_buflen == 0)
4021 { 4020 {
4022 free (v_buffer); 4021 free (v_buffer);
4023 v_buffer = 0; 4022 v_buffer = 0;
4024 v_buflen = 0;
4025 4023
4026 pty_ev.set (EVENT_READ); 4024 pty_ev.set (ev::READ);
4027 return; 4025 return;
4028 } 4026 }
4029 4027
4030 memmove (v_buffer, v_buffer + written, v_buflen); 4028 memmove (v_buffer, v_buffer + written, v_buflen);
4031 } 4029 }
4032 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4030 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4033 pty_ev.set (EVENT_READ); 4031 pty_ev.set (ev::READ);
4034} 4032}
4035 4033
4036/*----------------------- end-of-file (C source) -----------------------*/ 4034/*----------------------- end-of-file (C source) -----------------------*/
4037 4035

Diff Legend

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