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.350 by ayin, Sat Sep 8 20:48:31 2007 UTC vs.
Revision 1.463 by sf-exg, Tue Dec 14 07:59:54 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.
… …
161 162
162void 163void
163rxvt_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)
164{ 165{
165 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
166 rxvt_font *f = (*fs)[fs->find_font (ch)];
167 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169
170 fname = rxvt_utf8towcs (f->name);
171 169
172# if ENABLE_COMBINING 170# if ENABLE_COMBINING
173 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
174 { 172 {
175 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
196 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
200 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);
201 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
202 207
203 max_it (width, 8+5); // for char + hey 208 max_it (width, 8+5); // for char + hex
204 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
205 210
206 if (y >= 0) 211 if (y >= 0)
207 { 212 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
209 x = 0; 214 x = 0;
210 } 215 }
211 216
212 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
213 218
214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
215 220
216 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
217 { 222 {
… …
220 ch = *chr++; 225 ch = *chr++;
221 226
222 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
224 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
225# if !UNICODE3 230# if !UNICODE_3
226 if (ch >= 0x10000) 231 if (ch >= 0x10000)
227 ch = 0xfffd; 232 ch = 0xfffd;
228# endif 233# endif
229 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
230 235
… …
236// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
239// } 244// }
240 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
241 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
242
243 free (fname); 249 free (fname[i]);
250 }
244 251
245# if ENABLE_COMBINING 252# if ENABLE_COMBINING
246 if (alloc) 253 if (alloc)
247 delete [] alloc; 254 delete [] alloc;
248# endif 255# endif
… …
278 } 285 }
279 286
280 iso14755buf = 0; 287 iso14755buf = 0;
281} 288}
282 289
283int 290static int
284rxvt_term::hex_keyval (XKeyEvent &ev) 291hex_keyval (XKeyEvent &ev)
285{ 292{
286 // check wether this event corresponds to a hex digit 293 // check whether this event corresponds to a hex digit
287 // if the modifiers had not been pressed. 294 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++) 295 for (int index = 0; index < 8; index++)
289 { 296 {
290 KeySym k = XLookupKeysym (&ev, index); 297 KeySym k = XLookupKeysym (&ev, index);
291 298
… …
297 304
298 return -1; 305 return -1;
299} 306}
300#endif 307#endif
301 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
302void 404void
303rxvt_term::key_press (XKeyEvent &ev) 405rxvt_term::key_press (XKeyEvent &ev)
304{ 406{
305 int ctrl, meta, shft, len; 407 int ctrl, meta, shft, len;
306 unsigned int newlen;
307 KeySym keysym; 408 KeySym keysym;
308 int valid_keysym; 409 int valid_keysym;
309 char kbuf[KBUFSZ]; 410 char kbuf[KBUFSZ];
310 411
311#if ISO_14755 412#if ISO_14755
… …
320 * Always permit `shift' to override the current setting 421 * Always permit `shift' to override the current setting
321 */ 422 */
322 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
323 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
324 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
325
326 if (numlock_state || (ev.state & ModNumLockMask))
327 {
328 numlock_state = (ev.state & ModNumLockMask);
329 PrivMode ((!numlock_state), PrivMode_aplKP);
330 }
331 426
332 kbuf[0] = 0; 427 kbuf[0] = 0;
333 428
334#ifdef USE_XIM 429#ifdef USE_XIM
335 if (Input_Context) 430 if (Input_Context)
… …
410#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
411 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
412#else 507#else
413 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
414#endif 509#endif
510 max_it (lnsppg, 1);
511
415 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
416 { 513 {
417 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
418 return; 515 return;
419 } 516 }
… …
484 } 581 }
485 } 582 }
486 583
487#if ENABLE_FRILLS || ISO_14755 584#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 585 // ISO 14755 support
489 if (shft && ctrl) 586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 587 {
491 int hv; 588 int hv;
492 589
493 if (iso14755buf & ISO_14755_51 590 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 591 && (keysym == XK_space || keysym == XK_KP_Space
… …
524 scr_overlay_off (); 621 scr_overlay_off ();
525# endif 622# endif
526 iso14755buf = 0; 623 iso14755buf = 0;
527 } 624 }
528 } 625 }
626 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 627 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 628 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 629 if (!(iso14755buf & ISO_14755_STARTED))
532 { 630 {
533 iso14755buf |= ISO_14755_STARTED; 631 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 632# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 633 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
546 } 644 }
547#endif 645#endif
548 646
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 648 {
649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
650 unsigned int newlen = 1;
651
652 if (ev.state & ModNumLockMask)
653 kp = false;
654
655 keysym = translate_keypad (keysym, kp);
656
657 switch (keysym)
551 { 658 {
659#ifndef NO_BACKSPACE_KEY
660 case XK_BackSpace:
661 if (priv_modes & PrivMode_HaveBackSpace)
662 {
663 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
664 ^ !!ctrl) ? '\b' : '\177';
665 kbuf[1] = '\0';
666 }
667 else
668 strcpy (kbuf, rs[Rs_backspace_key]);
669 break;
670#endif
671#ifndef NO_DELETE_KEY
672 case XK_Delete:
673 strcpy (kbuf, rs[Rs_delete_key]);
674 break;
675#endif
676 case XK_Tab:
677 if (shft)
678 strcpy (kbuf, "\033[Z");
679 else
680 {
681#ifdef CTRL_TAB_MAKES_META
682 if (ctrl)
683 meta = 1;
684#endif
685#ifdef MOD4_TAB_MAKES_META
686 if (ev.state & Mod4Mask)
687 meta = 1;
688#endif
552 newlen = 1; 689 newlen = 0;
553 switch (keysym) 690 }
691 break;
692
693 case XK_Up: /* "\033[A" */
694 case XK_Down: /* "\033[B" */
695 case XK_Right: /* "\033[C" */
696 case XK_Left: /* "\033[D" */
697 strcpy (kbuf, "\033[Z");
698 kbuf[2] = "DACB"[keysym - XK_Left];
699 /* do Shift first */
700 if (shft)
701 kbuf[2] = "dacb"[keysym - XK_Left];
702 else if (ctrl)
703 {
704 kbuf[1] = 'O';
705 kbuf[2] = "dacb"[keysym - XK_Left];
706 }
707 else if (priv_modes & PrivMode_aplCUR)
708 kbuf[1] = 'O';
709 break;
710
711 case XK_KP_Enter:
712 /* allow shift to override */
713 if (kp)
714 {
715 strcpy (kbuf, "\033OM");
716 break;
717 }
718
719 /* FALLTHROUGH */
720
721 case XK_Return:
722 if (priv_modes & PrivMode_LFNL)
723 {
724 kbuf[0] = '\015';
725 kbuf[1] = '\012';
726 kbuf[2] = '\0';
727 }
728 else
729 {
730 kbuf[0] = '\015';
731 kbuf[1] = '\0';
732 }
733 break;
734
735 case XK_KP_F1: /* "\033OP" */
736 case XK_KP_F2: /* "\033OQ" */
737 case XK_KP_F3: /* "\033OR" */
738 case XK_KP_F4: /* "\033OS" */
739 strcpy (kbuf, "\033OP");
740 kbuf[2] += (keysym - XK_KP_F1);
741 break;
742
743 case XK_KP_Multiply: /* "\033Oj" : "*" */
744 case XK_KP_Add: /* "\033Ok" : "+" */
745 case XK_KP_Separator: /* "\033Ol" : "," */
746 case XK_KP_Subtract: /* "\033Om" : "-" */
747 case XK_KP_Decimal: /* "\033On" : "." */
748 case XK_KP_Divide: /* "\033Oo" : "/" */
749 case XK_KP_0: /* "\033Op" : "0" */
750 case XK_KP_1: /* "\033Oq" : "1" */
751 case XK_KP_2: /* "\033Or" : "2" */
752 case XK_KP_3: /* "\033Os" : "3" */
753 case XK_KP_4: /* "\033Ot" : "4" */
754 case XK_KP_5: /* "\033Ou" : "5" */
755 case XK_KP_6: /* "\033Ov" : "6" */
756 case XK_KP_7: /* "\033Ow" : "7" */
757 case XK_KP_8: /* "\033Ox" : "8" */
758 case XK_KP_9: /* "\033Oy" : "9" */
759 /* allow shift to override */
760 if (kp)
761 {
762 strcpy (kbuf, "\033Oj");
763 kbuf[2] += (keysym - XK_KP_Multiply);
764 }
765 else
766 {
767 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
768 kbuf[1] = '\0';
769 }
770 break;
771
772 default:
554 { 773 {
555#ifndef NO_BACKSPACE_KEY 774 int param = map_function_key (keysym);
556 case XK_BackSpace: 775 if (param > 0)
557 if (priv_modes & PrivMode_HaveBackSpace) 776 sprintf (kbuf,"\033[%d~", param);
558 {
559 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
560 ^ !!ctrl) ? '\b' : '\177';
561 kbuf[1] = '\0';
562 }
563 else 777 else
564 strcpy (kbuf, key_backspace);
565 break;
566#endif
567#ifndef NO_DELETE_KEY
568# ifdef XK_KP_Delete
569 case XK_KP_Delete:
570 /* allow shift to override */
571 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
572 {
573 strcpy (kbuf, "\033On");
574 break;
575 }
576 /* FALLTHROUGH */
577# endif
578 case XK_Delete:
579 strcpy (kbuf, key_delete);
580 break;
581#endif
582 case XK_Tab:
583 if (shft)
584 strcpy (kbuf, "\033[Z");
585 else
586 {
587#ifdef CTRL_TAB_MAKES_META
588 if (ctrl)
589 meta = 1;
590#endif
591#ifdef MOD4_TAB_MAKES_META
592 if (ev.state & Mod4Mask)
593 meta = 1;
594#endif
595 newlen = 0;
596 }
597 break;
598
599#ifdef XK_KP_Left
600 case XK_KP_Up: /* \033Ox or standard */
601 case XK_KP_Down: /* \033Or or standard */
602 case XK_KP_Right: /* \033Ov or standard */
603 case XK_KP_Left: /* \033Ot or standard */
604 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
605 {
606 strcpy (kbuf, "\033OZ");
607 kbuf[2] = "txvr"[keysym - XK_KP_Left];
608 break;
609 }
610 else
611 /* translate to std. cursor key */
612 keysym = XK_Left + (keysym - XK_KP_Left);
613 /* FALLTHROUGH */
614#endif
615 case XK_Up: /* "\033[A" */
616 case XK_Down: /* "\033[B" */
617 case XK_Right: /* "\033[C" */
618 case XK_Left: /* "\033[D" */
619 strcpy (kbuf, "\033[Z");
620 kbuf[2] = "DACB"[keysym - XK_Left];
621 /* do Shift first */
622 if (shft)
623 kbuf[2] = "dacb"[keysym - XK_Left];
624 else if (ctrl)
625 {
626 kbuf[1] = 'O';
627 kbuf[2] = "dacb"[keysym - XK_Left];
628 }
629 else if (priv_modes & PrivMode_aplCUR)
630 kbuf[1] = 'O';
631 break;
632
633#ifndef UNSHIFTED_SCROLLKEYS
634# ifdef XK_KP_Prior
635 case XK_KP_Prior:
636 /* allow shift to override */
637 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
638 {
639 strcpy (kbuf, "\033Oy");
640 break;
641 }
642 /* FALLTHROUGH */
643# endif
644 case XK_Prior:
645 strcpy (kbuf, "\033[5~");
646 break;
647# ifdef XK_KP_Next
648 case XK_KP_Next:
649 /* allow shift to override */
650 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
651 {
652 strcpy (kbuf, "\033Os");
653 break;
654 }
655 /* FALLTHROUGH */
656# endif
657 case XK_Next:
658 strcpy (kbuf, "\033[6~");
659 break;
660#endif
661 case XK_KP_Enter:
662 /* allow shift to override */
663 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
664 {
665 strcpy (kbuf, "\033OM");
666 break;
667 }
668
669 /* FALLTHROUGH */
670
671 case XK_Return:
672 if (priv_modes & PrivMode_LFNL)
673 {
674 kbuf[0] = '\015';
675 kbuf[1] = '\012';
676 kbuf[2] = '\0';
677 }
678 else
679 {
680 kbuf[0] = '\015';
681 kbuf[1] = '\0';
682 }
683 break;
684
685#ifdef XK_KP_Begin
686 case XK_KP_Begin:
687 strcpy (kbuf, "\033Ou");
688 break;
689
690#endif
691 case XK_KP_F1: /* "\033OP" */
692 case XK_KP_F2: /* "\033OQ" */
693 case XK_KP_F3: /* "\033OR" */
694 case XK_KP_F4: /* "\033OS" */
695 strcpy (kbuf, "\033OP");
696 kbuf[2] += (keysym - XK_KP_F1);
697 break;
698
699 case XK_KP_Multiply: /* "\033Oj" : "*" */
700 case XK_KP_Add: /* "\033Ok" : "+" */
701 case XK_KP_Separator: /* "\033Ol" : "," */
702 case XK_KP_Subtract: /* "\033Om" : "-" */
703 case XK_KP_Decimal: /* "\033On" : "." */
704 case XK_KP_Divide: /* "\033Oo" : "/" */
705 case XK_KP_0: /* "\033Op" : "0" */
706 case XK_KP_1: /* "\033Oq" : "1" */
707 case XK_KP_2: /* "\033Or" : "2" */
708 case XK_KP_3: /* "\033Os" : "3" */
709 case XK_KP_4: /* "\033Ot" : "4" */
710 case XK_KP_5: /* "\033Ou" : "5" */
711 case XK_KP_6: /* "\033Ov" : "6" */
712 case XK_KP_7: /* "\033Ow" : "7" */
713 case XK_KP_8: /* "\033Ox" : "8" */
714 case XK_KP_9: /* "\033Oy" : "9" */
715 /* allow shift to override */
716 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
717 {
718 strcpy (kbuf, "\033Oj");
719 kbuf[2] += (keysym - XK_KP_Multiply);
720 }
721 else
722 {
723 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
724 kbuf[1] = '\0';
725 }
726 break;
727
728 case XK_Find:
729 strcpy (kbuf, "\033[1~");
730 break;
731
732#ifdef XK_KP_Insert
733 case XK_KP_Insert:
734 /* allow shift to override */
735 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
736 {
737 strcpy (kbuf, "\033Op");
738 break;
739 }
740 /* FALLTHROUGH */
741#endif
742 case XK_Insert:
743 strcpy (kbuf, "\033[2~");
744 break;
745#ifdef DXK_Remove /* support for DEC remove like key */
746 case DXK_Remove:
747 /* FALLTHROUGH */
748#endif
749 case XK_Execute:
750 strcpy (kbuf, "\033[3~");
751 break;
752 case XK_Select:
753 strcpy (kbuf, "\033[4~");
754 break;
755#ifdef XK_KP_End
756 case XK_KP_End:
757 /* allow shift to override */
758 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
759 {
760 strcpy (kbuf, "\033Oq");
761 break;
762 }
763 /* FALLTHROUGH */
764#endif
765 case XK_End:
766 strcpy (kbuf, KS_END);
767 break;
768#ifdef XK_KP_Home
769 case XK_KP_Home:
770 /* allow shift to override */
771 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
772 {
773 strcpy (kbuf, "\033Ow");
774 break;
775 }
776 /* FALLTHROUGH */
777#endif
778 case XK_Home:
779 strcpy (kbuf, KS_HOME);
780 break;
781
782#define FKEY(n, fkey) \
783 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
784
785 case XK_F1: /* "\033[11~" */
786 case XK_F2: /* "\033[12~" */
787 case XK_F3: /* "\033[13~" */
788 case XK_F4: /* "\033[14~" */
789 case XK_F5: /* "\033[15~" */
790 FKEY (11, XK_F1);
791 break;
792 case XK_F6: /* "\033[17~" */
793 case XK_F7: /* "\033[18~" */
794 case XK_F8: /* "\033[19~" */
795 case XK_F9: /* "\033[20~" */
796 case XK_F10: /* "\033[21~" */
797 FKEY (17, XK_F6);
798 break;
799 case XK_F11: /* "\033[23~" */
800 case XK_F12: /* "\033[24~" */
801 case XK_F13: /* "\033[25~" */
802 case XK_F14: /* "\033[26~" */
803 FKEY (23, XK_F11);
804 break;
805 case XK_F15: /* "\033[28~" */
806 case XK_F16: /* "\033[29~" */
807 FKEY (28, XK_F15);
808 break;
809 case XK_Help: /* "\033[28~" */
810 FKEY (28, XK_Help);
811 break;
812 case XK_Menu: /* "\033[29~" */
813 FKEY (29, XK_Menu);
814 break;
815 case XK_F17: /* "\033[31~" */
816 case XK_F18: /* "\033[32~" */
817 case XK_F19: /* "\033[33~" */
818 case XK_F20: /* "\033[34~" */
819 case XK_F21: /* "\033[35~" */
820 case XK_F22: /* "\033[36~" */
821 case XK_F23: /* "\033[37~" */
822 case XK_F24: /* "\033[38~" */
823 case XK_F25: /* "\033[39~" */
824 case XK_F26: /* "\033[40~" */
825 case XK_F27: /* "\033[41~" */
826 case XK_F28: /* "\033[42~" */
827 case XK_F29: /* "\033[43~" */
828 case XK_F30: /* "\033[44~" */
829 case XK_F31: /* "\033[45~" */
830 case XK_F32: /* "\033[46~" */
831 case XK_F33: /* "\033[47~" */
832 case XK_F34: /* "\033[48~" */
833 case XK_F35: /* "\033[49~" */
834 FKEY (31, XK_F17);
835 break;
836#undef FKEY
837 default:
838 newlen = 0; 778 newlen = 0;
839 break;
840 } 779 }
841 780 break;
842 if (newlen)
843 len = strlen (kbuf);
844 } 781 }
782
783 if (newlen)
784 len = strlen (kbuf);
845 785
846 /* 786 /*
847 * Pass meta for all function keys, if 'meta' option set 787 * Pass meta for all function keys, if 'meta' option set
848 */ 788 */
849#ifdef META8_OPTION 789#ifdef META8_OPTION
… …
949 commit_iso14755 (); 889 commit_iso14755 ();
950 890
951 return; 891 return;
952 } 892 }
953 893
954 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
955 if (i[0] == keysym) 895 if (i[0] == keysym)
956 { 896 {
957 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
958 commit_iso14755 (); 898 commit_iso14755 ();
959 899
… …
1034void 974void
1035rxvt_term::flush () 975rxvt_term::flush ()
1036{ 976{
1037 flush_ev.stop (); 977 flush_ev.stop ();
1038 978
1039#ifdef ENABLE_TRANSPARENCY 979#ifdef HAVE_BG_PIXMAP
1040 if (want_full_refresh) 980 if (bgPixmap.flags & bgPixmap_t::hasChanged)
1041 { 981 {
1042 want_full_refresh = 0; 982 bgPixmap.flags &= ~bgPixmap_t::hasChanged;
1043 scr_clear (); 983// scr_clear (true); This needs to be researched further!
1044 scr_touch (false); 984 scr_touch (false);
1045 } 985 }
1046#endif 986#endif
1047 987
1048 if (want_refresh) 988 if (want_refresh)
… …
1084 } 1024 }
1085 while (row < end_row); 1025 while (row < end_row);
1086 } 1026 }
1087 1027
1088 scr_refresh (); 1028 scr_refresh ();
1089 scrollbar_show (1); 1029 scrollBar.show (1);
1090#ifdef USE_XIM 1030#ifdef USE_XIM
1091 IMSendSpot (); 1031 IMSendSpot ();
1092#endif 1032#endif
1093 } 1033 }
1094 1034
1095 display->flush (); 1035 display->flush ();
1096} 1036}
1097 1037
1038/* checks whether a refresh is requested and starts the refresh timer */
1098void 1039void
1099rxvt_term::check_cb (check_watcher &w) 1040rxvt_term::refresh_check ()
1100{ 1041{
1101 make_current (); 1042 if (want_refresh && !flush_ev.is_active ())
1043 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1102 1044
1103 display->flush (); 1045 display->flush ();
1104
1105 if (want_refresh && !flush_ev.active)
1106 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1107} 1046}
1108 1047
1109void 1048void
1110rxvt_term::flush_cb (time_watcher &w) 1049rxvt_term::flush_cb (ev::timer &w, int revents)
1111{ 1050{
1112 make_current (); 1051 make_current ();
1113 1052
1114 refresh_count = 0; 1053 refresh_count = 0;
1115 flush (); 1054 flush ();
1116} 1055}
1117 1056
1118#ifdef CURSOR_BLINK 1057#ifdef CURSOR_BLINK
1119void 1058void
1120rxvt_term::cursor_blink_cb (time_watcher &w) 1059rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1121{ 1060{
1122 hidden_cursor = !hidden_cursor; 1061 hidden_cursor = !hidden_cursor;
1123 want_refresh = 1; 1062 want_refresh = 1;
1124 1063 refresh_check ();
1125 w.start (w.at + CURSOR_BLINK_INTERVAL);
1126} 1064}
1127#endif 1065#endif
1128 1066
1129#ifdef TEXT_BLINK 1067#ifdef TEXT_BLINK
1130void 1068void
1131rxvt_term::text_blink_cb (time_watcher &w) 1069rxvt_term::text_blink_cb (ev::timer &w, int revents)
1132{ 1070{
1133 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1071 if (scr_refresh_rend (RS_Blink, RS_Blink))
1134 { 1072 {
1135 hidden_text = !hidden_text; 1073 hidden_text = !hidden_text;
1136 want_refresh = 1; 1074 want_refresh = 1;
1137 w.start (w.at + TEXT_BLINK_INTERVAL); 1075 refresh_check ();
1138 } 1076 }
1077 else
1078 w.stop ();
1139} 1079}
1140#endif 1080#endif
1141 1081
1142#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1082#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1143void 1083void
1144rxvt_term::cont_scroll_cb (time_watcher &w) 1084rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1145{ 1085{
1146 if ((scrollbar_isUp() || scrollbar_isDn()) && 1086 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1147 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1087 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1148 { 1088 {
1149 want_refresh = 1; 1089 want_refresh = 1;
1150 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1090 refresh_check ();
1151 } 1091 }
1092 else
1093 w.stop ();
1152} 1094}
1153#endif 1095#endif
1154 1096
1155#ifdef SELECTION_SCROLLING 1097#ifdef SELECTION_SCROLLING
1156void 1098void
1157rxvt_term::sel_scroll_cb (time_watcher &w) 1099rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1158{ 1100{
1159 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1101 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1160 { 1102 {
1161 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1103 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1162 want_refresh = 1; 1104 want_refresh = 1;
1163 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1105 refresh_check ();
1164 } 1106 }
1107 else
1108 w.stop ();
1165} 1109}
1166#endif 1110#endif
1167 1111
1168#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1112#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1169void 1113void
1170rxvt_term::slip_wheel_cb (time_watcher &w) 1114rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1171{ 1115{
1172 if (mouse_slip_wheel_speed == 0 1116 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1173 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1174 : scr_page (UP, mouse_slip_wheel_speed))
1175 { 1117 {
1176 if (view_start == top_row || view_start == 0)
1177 mouse_slip_wheel_speed = 0;
1178
1179 want_refresh = 1; 1118 want_refresh = 1;
1180 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 ();
1181 } 1126 }
1182} 1127}
1183#endif 1128#endif
1184 1129
1185#if LINUX_YIELD_HACK 1130#if LINUX_YIELD_HACK
1186static struct event_handler 1131static struct event_handler
1187{ 1132{
1188 check_watcher yield_ev; 1133 ev::prepare yield_ev;
1189 1134
1190 void yield_cb (check_watcher &w) 1135 void yield_cb (ev::prepare &w, int revents)
1191 { 1136 {
1192 // this should really be sched_yield(), but the linux guys thought 1137 // this should really be sched_yield(), but the linux guys thought
1193 // that giving a process calling sched_yield () less cpu time than 1138 // that giving a process calling sched_yield () less cpu time than
1194 // 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
1195 // 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.
1196 1144
1197 struct timespec ts = { 0, 0 }; 1145 struct timespec ts = { 0, 1000 };
1198 nanosleep (&ts, 0); 1146 nanosleep (&ts, 0);
1199 1147
1200 w.stop (); 1148 w.stop ();
1201 } 1149 }
1202 1150
… …
1246 1194
1247 return false; 1195 return false;
1248} 1196}
1249 1197
1250void 1198void
1251rxvt_term::pty_cb (io_watcher &w, short revents) 1199rxvt_term::pty_cb (ev::io &w, int revents)
1252{ 1200{
1253 make_current (); 1201 make_current ();
1254 1202
1255 if (revents & EVENT_READ) 1203 if (revents & ev::READ)
1256 // loop, but don't allow a single term to monopolize us 1204 // loop, but don't allow a single term to monopolize us
1257 while (pty_fill ()) 1205 for (int i = CBUFCNT; i-- && pty_fill (); )
1258 if (cmd_parse ()) 1206 cmd_parse ();
1259 break;
1260 1207
1261 if (revents & EVENT_WRITE) 1208 if (revents & ev::WRITE)
1262 pty_write (); 1209 pty_write ();
1210
1211 refresh_check ();
1263} 1212}
1264 1213
1265void 1214void
1266rxvt_term::pointer_unblank () 1215rxvt_term::pointer_unblank ()
1267{ 1216{
… …
1270 1219
1271#ifdef POINTER_BLANK 1220#ifdef POINTER_BLANK
1272 hidden_pointer = 0; 1221 hidden_pointer = 0;
1273 1222
1274 if (option (Opt_pointerBlank)) 1223 if (option (Opt_pointerBlank))
1275 pointer_ev.start (NOW + pointerBlankDelay); 1224 pointer_ev.start (pointerBlankDelay);
1276#endif 1225#endif
1277} 1226}
1278 1227
1279#ifdef POINTER_BLANK 1228#ifdef POINTER_BLANK
1280void 1229void
… …
1288 1237
1289 hidden_pointer = 1; 1238 hidden_pointer = 1;
1290} 1239}
1291 1240
1292void 1241void
1293rxvt_term::pointer_cb (time_watcher &w) 1242rxvt_term::pointer_cb (ev::timer &w, int revents)
1294{ 1243{
1295 make_current (); 1244 make_current ();
1296 1245
1297 pointer_blank (); 1246 pointer_blank ();
1298} 1247}
… …
1301void 1250void
1302rxvt_term::mouse_report (XButtonEvent &ev) 1251rxvt_term::mouse_report (XButtonEvent &ev)
1303{ 1252{
1304 int button_number, key_state = 0; 1253 int button_number, key_state = 0;
1305 int x, y; 1254 int x, y;
1255 int code = 32;
1306 1256
1307 x = ev.x; 1257 x = Pixel2Col (ev.x) + 1;
1308 y = ev.y; 1258 y = Pixel2Row (ev.y) + 1;
1309 pixel_position (&x, &y); 1259
1260 if (ev.type == MotionNotify)
1261 {
1262 if (x == mouse_row && y == mouse_col)
1263 return;
1264
1265 mouse_row = x;
1266 mouse_col = y;
1267 code += 32;
1268 }
1310 1269
1311 if (MEvent.button == AnyButton) 1270 if (MEvent.button == AnyButton)
1312 button_number = 3; 1271 button_number = 3;
1313 else 1272 else
1314 { 1273 {
1315 button_number = MEvent.button - Button1; 1274 button_number = MEvent.button - Button1;
1316 /* add 0x3D for wheel events, like xterm does */ 1275 /* add 0x3D for wheel events, like xterm does */
1317 if (button_number >= 3) 1276 if (button_number >= 3)
1318 button_number += (64 - 3); 1277 button_number += 64 - 3;
1319 } 1278 }
1320 1279
1321 if (priv_modes & PrivMode_MouseX10) 1280 if (priv_modes & PrivMode_MouseX10)
1322 { 1281 {
1323 /* 1282 /*
… …
1355 fputc ('A', stderr); 1314 fputc ('A', stderr);
1356 if (key_state & 32) 1315 if (key_state & 32)
1357 fputc ('2', stderr); 1316 fputc ('2', stderr);
1358 fprintf (stderr, "]: <%d>, %d/%d\n", 1317 fprintf (stderr, "]: <%d>, %d/%d\n",
1359 button_number, 1318 button_number,
1360 x + 1, 1319 x,
1361 y + 1); 1320 y);
1362#endif 1321#endif
1363 1322
1323#if ENABLE_FRILLS
1324 if (priv_modes & PrivMode_ExtMouseRight)
1325 tt_printf ("\033[%d;%d;%dM",
1326 code + button_number + key_state,
1327 x,
1328 y);
1329 else if (priv_modes & PrivMode_ExtModeMouse)
1330 tt_printf ("\033[M%c%lc%lc",
1331 code + button_number + key_state,
1332 wint_t (32 + x),
1333 wint_t (32 + y));
1334 else
1335#endif
1364 tt_printf ("\033[M%c%c%c", 1336 tt_printf ("\033[M%c%c%c",
1365 (32 + button_number + key_state), 1337 code + button_number + key_state,
1366 (32 + x + 1), 1338 32 + x,
1367 (32 + y + 1)); 1339 32 + y);
1368} 1340}
1369 1341
1370/*{{{ process an X event */ 1342/*{{{ process an X event */
1371void 1343void
1372rxvt_term::x_cb (XEvent &ev) 1344rxvt_term::x_cb (XEvent &ev)
… …
1474 && ev.xfocus.mode != NotifyGrab) 1446 && ev.xfocus.mode != NotifyGrab)
1475 focus_out (); 1447 focus_out ();
1476 break; 1448 break;
1477 1449
1478 case ConfigureNotify: 1450 case ConfigureNotify:
1479/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1480 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1481 szHint.width, szHint.height);*/
1482 if (ev.xconfigure.window == parent[0]) 1451 if (ev.xconfigure.window == parent[0])
1483 { 1452 {
1484 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1453 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1485 ; 1454 ;
1455
1456#ifdef HAVE_BG_PIXMAP
1457 bool moved = false;
1458 if (bgPixmap.window_position_sensitive ())
1459 {
1460 int x, y;
1461 if (ev.xconfigure.send_event)
1462 {
1463 x = ev.xconfigure.x;
1464 y = ev.xconfigure.y;
1465 }
1466 else
1467 get_window_origin (x, y);
1468
1469 if (bgPixmap.set_position (x, y)
1470 || (bgPixmap.flags & bgPixmap_t::isInvalid))
1471 moved = true;
1472 }
1473#endif
1486 1474
1487 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1475 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1488 { 1476 {
1489 seen_resize = 1; 1477 seen_resize = 1;
1490 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1478 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1491 } 1479 }
1492 else 1480 else
1493 { 1481 {
1494#ifdef ENABLE_TRANSPARENCY 1482#ifdef HAVE_BG_PIXMAP
1495 if (option (Opt_transparent)) 1483 if (moved)
1484 {
1485 if (mapped)
1496 update_background (); 1486 update_background ();
1487 else
1488 bgPixmap.invalidate ();
1489 }
1497#endif 1490#endif
1498 } 1491 }
1492
1499 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1493 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1500 } 1494 }
1501 break; 1495 break;
1502 1496
1503 case PropertyNotify: 1497 case PropertyNotify:
… …
1507 selection_property (ev.xproperty.window, ev.xproperty.atom); 1501 selection_property (ev.xproperty.window, ev.xproperty.atom);
1508 1502
1509 break; 1503 break;
1510 1504
1511 case SelectionClear: 1505 case SelectionClear:
1512 selection_clear (); 1506 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1513 break; 1507 break;
1514 1508
1515 case SelectionNotify: 1509 case SelectionNotify:
1516 if (selection_wait == Sel_normal) 1510 if (selection_wait == Sel_normal)
1517 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1511 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1520 case SelectionRequest: 1514 case SelectionRequest:
1521 selection_send (ev.xselectionrequest); 1515 selection_send (ev.xselectionrequest);
1522 break; 1516 break;
1523 1517
1524 case MapNotify: 1518 case MapNotify:
1519#ifdef HAVE_BG_PIXMAP
1520 /* This is needed specifically to fix the case of no window manager or a
1521 * non-reparenting window manager. In those cases we never get first
1522 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1523 * care of multiplicity of ConfigureNotify events arriving while WM does
1524 * reparenting.
1525 * We should not render background immediately, as there could be several
1526 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1527 * by scheduling background redraw as soon as we can, but giving a short
1528 * bit of time for ConfigureNotifies to arrive.
1529 * We should render background PRIOR to drawing any text, but AFTER all
1530 * of ConfigureNotifys for the best results.
1531 */
1532 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1533 update_background_ev.start (0.025);
1534#endif
1525 mapped = 1; 1535 mapped = 1;
1526#ifdef TEXT_BLINK 1536#ifdef TEXT_BLINK
1527 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1537 text_blink_ev.start ();
1528#endif 1538#endif
1529 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1539 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1530 break; 1540 break;
1531 1541
1532 case UnmapNotify: 1542 case UnmapNotify:
… …
1534#ifdef TEXT_BLINK 1544#ifdef TEXT_BLINK
1535 text_blink_ev.stop (); 1545 text_blink_ev.stop ();
1536#endif 1546#endif
1537 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1547 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1538 break; 1548 break;
1539
1540#ifdef ENABLE_TRANSPARENCY
1541 case ReparentNotify:
1542 rootwin_cb (ev);
1543 break;
1544#endif /* ENABLE_TRANSPARENCY */
1545 1549
1546 case GraphicsExpose: 1550 case GraphicsExpose:
1547 case Expose: 1551 case Expose:
1548 if (ev.xany.window == vt) 1552 if (ev.xany.window == vt)
1549 { 1553 {
1550 do 1554 do
1555 {
1551 scr_expose (ev.xexpose.x, ev.xexpose.y, 1556 scr_expose (ev.xexpose.x, ev.xexpose.y,
1552 ev.xexpose.width, ev.xexpose.height, False); 1557 ev.xexpose.width, ev.xexpose.height, False);
1558 }
1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1554 1560
1555 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1561 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1556 1562
1557 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1563 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1564 {
1558 scr_expose (ev.xexpose.x, ev.xexpose.y, 1565 scr_expose (ev.xexpose.x, ev.xexpose.y,
1559 ev.xexpose.width, ev.xexpose.height, False); 1566 ev.xexpose.width, ev.xexpose.height, False);
1567 }
1560 1568
1561 want_refresh = 1; 1569 want_refresh = 1;
1562 } 1570 }
1563 else 1571 else
1564 { 1572 {
… …
1567 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1575 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1568 ; 1576 ;
1569 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1577 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1570 ; 1578 ;
1571 1579
1572 if (isScrollbarWindow (ev.xany.window)) 1580 if (scrollBar.state && ev.xany.window == scrollBar.win)
1573 { 1581 {
1574 scrollBar.setIdle (); 1582 scrollBar.state = STATE_IDLE;
1575 scrollbar_show (0); 1583 scrollBar.show (0);
1576 } 1584 }
1577 } 1585 }
1578 break; 1586 break;
1579 1587
1580 case MotionNotify: 1588 case MotionNotify:
1581#ifdef POINTER_BLANK 1589#ifdef POINTER_BLANK
1582 if (hidden_pointer) 1590 if (hidden_pointer)
1583 pointer_unblank (); 1591 pointer_unblank ();
1584#endif 1592#endif
1593 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1594 || priv_modes & PrivMode_MouseAnyEvent)
1595 mouse_report (ev.xbutton);
1585 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1596 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1586 break; 1597 break;
1587 1598
1588 if (ev.xany.window == vt) 1599 if (ev.xany.window == vt)
1589 { 1600 {
… …
1623 int dist; 1634 int dist;
1624 1635
1625 /* don't clobber the current delay if we are 1636 /* don't clobber the current delay if we are
1626 * already in the middle of scrolling. 1637 * already in the middle of scrolling.
1627 */ 1638 */
1628 if (!sel_scroll_ev.active) 1639 if (!sel_scroll_ev.is_active ())
1629 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1640 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1630 1641
1631 /* save the event params so we can highlight 1642 /* save the event params so we can highlight
1632 * the selection in the pending-scroll loop 1643 * the selection in the pending-scroll loop
1633 */ 1644 */
1634 selection_save_x = ev.xbutton.x; 1645 selection_save_x = ev.xbutton.x;
… …
1656 else 1667 else
1657 { 1668 {
1658 /* we are within the text window, so we 1669 /* we are within the text window, so we
1659 * shouldn't be scrolling 1670 * shouldn't be scrolling
1660 */ 1671 */
1661 if (sel_scroll_ev.active)
1662 sel_scroll_ev.stop(); 1672 sel_scroll_ev.stop();
1663 } 1673 }
1664#endif 1674#endif
1665#ifdef MOUSE_THRESHOLD 1675#ifdef MOUSE_THRESHOLD
1666 } 1676 }
1667#endif 1677#endif
1668 } 1678 }
1669 } 1679 }
1670 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1680 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1671 { 1681 {
1672 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1682 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1673 MotionNotify, &ev)) 1683 MotionNotify, &ev))
1674 ; 1684 ;
1675 1685
… …
1677 &unused_root, &unused_child, 1687 &unused_root, &unused_child,
1678 &unused_root_x, &unused_root_y, 1688 &unused_root_x, &unused_root_y,
1679 &ev.xbutton.x, &ev.xbutton.y, 1689 &ev.xbutton.x, &ev.xbutton.y,
1680 &unused_mask); 1690 &unused_mask);
1681 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1691 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1682 scrollbar_size ()); 1692 scrollBar.size ());
1683 want_refresh = 1; 1693 want_refresh = 1;
1684 scrollbar_show (1); 1694 scrollBar.show (1);
1685 } 1695 }
1686 break; 1696 break;
1687 } 1697 }
1688 1698
1689#if defined(CURSOR_BLINK) 1699#if defined(CURSOR_BLINK)
… …
1693 { 1703 {
1694 hidden_cursor = 0; 1704 hidden_cursor = 0;
1695 want_refresh = 1; 1705 want_refresh = 1;
1696 } 1706 }
1697 1707
1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1708 cursor_blink_ev.again ();
1699 } 1709 }
1700#endif 1710#endif
1701 1711
1702#if defined(POINTER_BLANK) 1712#if defined(POINTER_BLANK)
1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1713 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1710 1720
1711 if (ev.type == KeyPress && hidden_pointer == 0) 1721 if (ev.type == KeyPress && hidden_pointer == 0)
1712 pointer_blank (); 1722 pointer_blank ();
1713 } 1723 }
1714#endif 1724#endif
1725
1726 refresh_check ();
1715} 1727}
1728
1729#if ENABLE_FRILLS
1730void
1731rxvt_term::set_urgency (bool enable)
1732{
1733 if (enable == urgency_hint)
1734 return;
1735
1736 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1737 {
1738 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1739 XSetWMHints (dpy, parent[0], h);
1740 urgency_hint = enable;
1741 }
1742}
1743#endif
1716 1744
1717void 1745void
1718rxvt_term::focus_in () 1746rxvt_term::focus_in ()
1719{ 1747{
1720 if (!focus) 1748 if (!focus)
1721 { 1749 {
1722 focus = 1; 1750 focus = 1;
1723 want_refresh = 1; 1751 want_refresh = 1;
1724 1752
1725 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1726
1727#if USE_XIM 1753#if USE_XIM
1728 if (Input_Context != NULL) 1754 if (Input_Context != NULL)
1729 { 1755 {
1730 IMSetPosition (); 1756 IMSetPosition ();
1731 XSetICFocus (Input_Context); 1757 XSetICFocus (Input_Context);
1732 } 1758 }
1733#endif 1759#endif
1734#if CURSOR_BLINK 1760#if CURSOR_BLINK
1735 if (option (Opt_cursorBlink)) 1761 if (option (Opt_cursorBlink))
1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1762 cursor_blink_ev.again ();
1737#endif 1763#endif
1738#if OFF_FOCUS_FADING 1764#if OFF_FOCUS_FADING
1739 if (rs[Rs_fade]) 1765 if (rs[Rs_fade])
1740 { 1766 {
1741 pix_colors = pix_colors_focused; 1767 pix_colors = pix_colors_focused;
1742 scr_recolour (); 1768 scr_recolour ();
1743 } 1769 }
1744#endif 1770#endif
1745#if ENABLE_FRILLS 1771#if ENABLE_FRILLS
1746 if (option (Opt_urgentOnBell)) 1772 if (option (Opt_urgentOnBell))
1747 { 1773 set_urgency (0);
1748 XWMHints *h;
1749
1750 h = XGetWMHints(dpy, parent[0]);
1751 if (h != NULL)
1752 {
1753 h->flags &= ~XUrgencyHint;
1754 XSetWMHints(dpy, parent[0], h);
1755 }
1756 }
1757#endif 1774#endif
1775
1776 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1758 } 1777 }
1759} 1778}
1760 1779
1761void 1780void
1762rxvt_term::focus_out () 1781rxvt_term::focus_out ()
… …
1764 if (focus) 1783 if (focus)
1765 { 1784 {
1766 focus = 0; 1785 focus = 0;
1767 want_refresh = 1; 1786 want_refresh = 1;
1768 1787
1769 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1788#if ENABLE_FRILLS
1770 1789 if (option (Opt_urgentOnBell))
1790 set_urgency (0);
1791#endif
1771#if ENABLE_FRILLS || ISO_14755 1792#if ENABLE_FRILLS || ISO_14755
1772 if (iso14755buf) 1793 if (iso14755buf)
1773 { 1794 {
1774 iso14755buf = 0; 1795 iso14755buf = 0;
1775# if ISO_14755 1796# if ISO_14755
… …
1782 XUnsetICFocus (Input_Context); 1803 XUnsetICFocus (Input_Context);
1783#endif 1804#endif
1784#if CURSOR_BLINK 1805#if CURSOR_BLINK
1785 if (option (Opt_cursorBlink)) 1806 if (option (Opt_cursorBlink))
1786 cursor_blink_ev.stop (); 1807 cursor_blink_ev.stop ();
1808
1787 hidden_cursor = 0; 1809 hidden_cursor = 0;
1788#endif 1810#endif
1789#if OFF_FOCUS_FADING 1811#if OFF_FOCUS_FADING
1790 if (rs[Rs_fade]) 1812 if (rs[Rs_fade])
1791 { 1813 {
1792 pix_colors = pix_colors_unfocused; 1814 pix_colors = pix_colors_unfocused;
1793 scr_recolour (); 1815 scr_recolour ();
1794 } 1816 }
1795#endif 1817#endif
1818
1819 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1796 } 1820 }
1797} 1821}
1798 1822
1799void 1823void
1800rxvt_term::update_fade_color (unsigned int idx) 1824rxvt_term::update_fade_color (unsigned int idx)
… …
1831 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1855 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1832 { 1856 {
1833 bgPixmap.set_root_pixmap (); 1857 bgPixmap.set_root_pixmap ();
1834 update_background (); 1858 update_background ();
1835 } 1859 }
1860
1836 break; 1861 break;
1837 } 1862 }
1838# endif 1863# endif
1864
1865 refresh_check ();
1839} 1866}
1840#endif 1867#endif
1841 1868
1842void 1869void
1843rxvt_term::button_press (XButtonEvent &ev) 1870rxvt_term::button_press (XButtonEvent &ev)
… …
1874 /* save the xbutton state (for ButtonRelease) */ 1901 /* save the xbutton state (for ButtonRelease) */
1875 MEvent.state = ev.state; 1902 MEvent.state = ev.state;
1876#ifdef MOUSE_REPORT_DOUBLECLICK 1903#ifdef MOUSE_REPORT_DOUBLECLICK
1877 if (ev.button == MEvent.button && clickintime) 1904 if (ev.button == MEvent.button && clickintime)
1878 { 1905 {
1879 /* same button, within alloted time */ 1906 /* same button, within allowed time */
1880 MEvent.clicks++; 1907 MEvent.clicks++;
1881 1908
1882 if (MEvent.clicks > 1) 1909 if (MEvent.clicks > 1)
1883 { 1910 {
1884 /* only report double clicks */ 1911 /* only report double clicks */
… …
1898 mouse_report (ev); 1925 mouse_report (ev);
1899 } 1926 }
1900#else 1927#else
1901 MEvent.button = ev.button; 1928 MEvent.button = ev.button;
1902 mouse_report (ev); 1929 mouse_report (ev);
1903#endif /* MOUSE_REPORT_DOUBLECLICK */ 1930#endif /* MOUSE_REPORT_DOUBLECLICK */
1904 1931
1905 } 1932 }
1906 else 1933 else
1907 { 1934 {
1908 if (ev.button != MEvent.button) 1935 if (ev.button != MEvent.button)
… …
1956 } 1983 }
1957 1984
1958 /* 1985 /*
1959 * Scrollbar window processing of button press 1986 * Scrollbar window processing of button press
1960 */ 1987 */
1961 if (isScrollbarWindow (ev.window)) 1988 if (scrollBar.state && ev.window == scrollBar.win)
1962 { 1989 {
1963 scrollBar.setIdle (); 1990 page_dirn direction = NO_DIR;
1991
1992 if (scrollBar.upButton (ev.y))
1993 direction = UP; /* up */
1994 else if (scrollBar.dnButton (ev.y))
1995 direction = DN; /* down */
1996
1997 scrollBar.state = STATE_IDLE;
1964 /* 1998 /*
1965 * Rxvt-style scrollbar: 1999 * Rxvt-style scrollbar:
1966 * move up if mouse is above slider 2000 * move up if mouse is above slider
1967 * move dn if mouse is below slider 2001 * move dn if mouse is below slider
1968 * 2002 *
… …
1977 /* 2011 /*
1978 * Mouse report disabled scrollbar: 2012 * Mouse report disabled scrollbar:
1979 * arrow buttons - send up/down 2013 * arrow buttons - send up/down
1980 * click on scrollbar - send pageup/down 2014 * click on scrollbar - send pageup/down
1981 */ 2015 */
1982 if ((scrollBar.style == R_SB_NEXT 2016 if (direction == UP)
1983 && scrollbarnext_upButton (ev.y))
1984 || (scrollBar.style == R_SB_RXVT
1985 && scrollbarrxvt_upButton (ev.y)))
1986 tt_printf ("\033[A"); 2017 tt_printf ("\033[A");
1987 else if ((scrollBar.style == R_SB_NEXT 2018 else if (direction == DN)
1988 && scrollbarnext_dnButton (ev.y))
1989 || (scrollBar.style == R_SB_RXVT
1990 && scrollbarrxvt_dnButton (ev.y)))
1991 tt_printf ("\033[B"); 2019 tt_printf ("\033[B");
1992 else 2020 else
1993 switch (ev.button) 2021 switch (ev.button)
1994 { 2022 {
1995 case Button2: 2023 case Button2:
… …
2002 tt_printf ("\033[5~"); 2030 tt_printf ("\033[5~");
2003 break; 2031 break;
2004 } 2032 }
2005 } 2033 }
2006 else 2034 else
2007#endif /* NO_SCROLLBAR_REPORT */ 2035#endif /* NO_SCROLLBAR_REPORT */
2008
2009 {
2010 char upordown = 0;
2011
2012 if (scrollBar.style == R_SB_NEXT)
2013 { 2036 {
2014 if (scrollbarnext_upButton (ev.y)) 2037 if (direction != NO_DIR)
2015 upordown = -1; /* up */
2016 else if (scrollbarnext_dnButton (ev.y))
2017 upordown = 1; /* down */
2018 }
2019 else if (scrollBar.style == R_SB_RXVT)
2020 {
2021 if (scrollbarrxvt_upButton (ev.y))
2022 upordown = -1; /* up */
2023 else if (scrollbarrxvt_dnButton (ev.y))
2024 upordown = 1; /* down */
2025 }
2026 if (upordown)
2027 { 2038 {
2028#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2039#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2040 if (!cont_scroll_ev.is_active ())
2029 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2041 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2030#endif 2042#endif
2031 if (scr_page (upordown < 0 ? UP : DN, 1)) 2043 if (scr_page (direction, 1))
2032 { 2044 {
2033 if (upordown < 0) 2045 if (direction == UP)
2034 scrollBar.setUp (); 2046 scrollBar.state = STATE_UP;
2035 else 2047 else
2036 scrollBar.setDn (); 2048 scrollBar.state = STATE_DOWN;
2037 } 2049 }
2038 } 2050 }
2039 else 2051 else
2040 switch (ev.button) 2052 switch (ev.button)
2041 { 2053 {
2042 case Button2: 2054 case Button2:
2043 switch (scrollbar_align) 2055 switch (scrollBar.align)
2044 { 2056 {
2045 case R_SB_ALIGN_TOP: 2057 case R_SB_ALIGN_TOP:
2046 csrO = 0; 2058 csrO = 0;
2047 break; 2059 break;
2048 case R_SB_ALIGN_CENTRE: 2060 case R_SB_ALIGN_CENTRE:
… …
2054 } 2066 }
2055 2067
2056 if (scrollBar.style == R_SB_XTERM 2068 if (scrollBar.style == R_SB_XTERM
2057 || scrollbar_above_slider (ev.y) 2069 || scrollbar_above_slider (ev.y)
2058 || scrollbar_below_slider (ev.y)) 2070 || scrollbar_below_slider (ev.y))
2059 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2071 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2060 2072
2061 scrollBar.setMotion (); 2073 scrollBar.state = STATE_MOTION;
2062 break; 2074 break;
2063 2075
2064 case Button1: 2076 case Button1:
2065 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2077 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2066 csrO = ev.y - scrollBar.top; 2078 csrO = ev.y - scrollBar.top;
2067 /* FALLTHROUGH */ 2079 /* FALLTHROUGH */
2068 2080
2069 case Button3: 2081 case Button3:
2070 if (scrollBar.style != R_SB_XTERM) 2082 if (scrollBar.style != R_SB_XTERM)
… …
2080 scr_page (DN, nrow - 1); 2092 scr_page (DN, nrow - 1);
2081# else 2093# else
2082 scr_page (DN, nrow / 4); 2094 scr_page (DN, nrow / 4);
2083# endif 2095# endif
2084 else 2096 else
2085 scrollBar.setMotion (); 2097 scrollBar.state = STATE_MOTION;
2086 } 2098 }
2087 else 2099 else
2088 { 2100 {
2089 scr_page ((ev.button == Button1 ? DN : UP), 2101 scr_page ((ev.button == Button1 ? DN : UP),
2090 (nrow 2102 (nrow
2091 * scrollbar_position (ev.y) 2103 * scrollbar_position (ev.y)
2092 / scrollbar_size ())); 2104 / scrollBar.size ()));
2093 } 2105 }
2094 2106
2095 break; 2107 break;
2096 } 2108 }
2097 } 2109 }
… …
2107 2119
2108 csrO = 0; /* reset csr Offset */ 2120 csrO = 0; /* reset csr Offset */
2109 if (!bypass_keystate) 2121 if (!bypass_keystate)
2110 reportmode = !! (priv_modes & PrivMode_mouse_report); 2122 reportmode = !! (priv_modes & PrivMode_mouse_report);
2111 2123
2112 if (scrollbar_isUpDn ()) 2124 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2113 { 2125 {
2114 scrollBar.setIdle (); 2126 scrollBar.state = STATE_IDLE;
2115 scrollbar_show (0); 2127 scrollBar.show (0);
2116 } 2128 }
2117 2129
2118#ifdef SELECTION_SCROLLING 2130#ifdef SELECTION_SCROLLING
2119 if (sel_scroll_ev.active)
2120 sel_scroll_ev.stop(); 2131 sel_scroll_ev.stop();
2121#endif 2132#endif
2122 2133
2123 if (ev.window == vt) 2134 if (ev.window == vt)
2124 { 2135 {
2125 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2136 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2149 mouse_report (ev); 2160 mouse_report (ev);
2150 } 2161 }
2151#else /* MOUSE_REPORT_DOUBLECLICK */ 2162#else /* MOUSE_REPORT_DOUBLECLICK */
2152 MEvent.button = AnyButton; 2163 MEvent.button = AnyButton;
2153 mouse_report (ev); 2164 mouse_report (ev);
2154#endif /* MOUSE_REPORT_DOUBLECLICK */ 2165#endif /* MOUSE_REPORT_DOUBLECLICK */
2155 return; 2166 return;
2156 } 2167 }
2157 2168
2158 /* 2169 /*
2159 * dumb hack to compensate for the failure of click-and-drag 2170 * dumb hack to compensate for the failure of click-and-drag
… …
2171 selection_make (ev.time); 2182 selection_make (ev.time);
2172 break; 2183 break;
2173 2184
2174 case Button2: 2185 case Button2:
2175 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2186 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2176 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2187 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2177 break; 2188 break;
2178 2189
2179#ifdef MOUSE_WHEEL 2190#ifdef MOUSE_WHEEL
2180 case Button4: 2191 case Button4:
2181 case Button5: 2192 case Button5:
… …
2197 { 2208 {
2198 mouse_slip_wheel_speed += v ? -1 : 1; 2209 mouse_slip_wheel_speed += v ? -1 : 1;
2199 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2210 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2200 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2211 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2201 2212
2202 if (slip_wheel_ev.at < NOW) 2213 if (!slip_wheel_ev.is_active ())
2203 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2214 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2204
2205 slip_wheel_ev.start ();
2206 } 2215 }
2207 else 2216 else
2217# endif
2208 { 2218 {
2209# endif
2210 scr_page (v, i); 2219 scr_page (v, i);
2211 scrollbar_show (1); 2220 scrollBar.show (1);
2212# ifdef MOUSE_SLIP_WHEELING
2213 } 2221 }
2214# endif
2215 } 2222 }
2216 break; 2223 break;
2217#endif 2224#endif
2218 } 2225 }
2219 } 2226 }
2220} 2227}
2221 2228
2222/*}}} */ 2229/*}}} */
2223 2230
2224bool 2231void
2225rxvt_term::cmd_parse () 2232rxvt_term::cmd_parse ()
2226{ 2233{
2227 bool flag = false;
2228 wchar_t ch = NOCHAR; 2234 wchar_t ch = NOCHAR;
2229 char *seq_begin; // remember start of esc-sequence here 2235 char *seq_begin; // remember start of esc-sequence here
2230 2236
2231 for (;;) 2237 for (;;)
2232 { 2238 {
2233 if (ch == NOCHAR) 2239 if (expect_false (ch == NOCHAR))
2234 { 2240 {
2235 seq_begin = cmdbuf_ptr; 2241 seq_begin = cmdbuf_ptr;
2236 ch = next_char (); 2242 ch = next_char ();
2237 2243
2238 if (ch == NOCHAR) 2244 if (ch == NOCHAR)
2239 break; 2245 break;
2240 } 2246 }
2241 2247
2242 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2248 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2243 { 2249 {
2244 if (!seen_input) 2250 if (expect_false (!seen_input))
2245 { 2251 {
2246 seen_input = 1; 2252 seen_input = 1;
2247 // many badly-written programs (e.g. jed) contain a race condition: 2253 // many badly-written programs (e.g. jed) contain a race condition:
2248 // they first read the screensize and then install a SIGWINCH handler. 2254 // they first read the screensize and then install a SIGWINCH handler.
2249 // some window managers resize the window early, and these programs 2255 // some window managers resize the window early, and these programs
… …
2262 wchar_t *str = buf; 2268 wchar_t *str = buf;
2263 wchar_t *eol = str + min (ncol, UBUFSIZ); 2269 wchar_t *eol = str + min (ncol, UBUFSIZ);
2264 2270
2265 for (;;) 2271 for (;;)
2266 { 2272 {
2267 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2273 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2268 break; 2274 break;
2269 2275
2270 *str++ = ch; 2276 *str++ = ch;
2271 2277
2272 if (ch == C0_LF || str >= eol) 2278 if (expect_false (ch == C0_LF || str >= eol))
2273 { 2279 {
2274 if (ch == C0_LF) 2280 if (ch == C0_LF)
2275 nlines++; 2281 nlines++;
2276 2282
2277 refresh_count++; 2283 refresh_count++;
2278 2284
2279 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2285 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2280 { 2286 {
2281 refresh_count = 0; 2287 refresh_count = 0;
2282 2288
2283 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2289 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2284 { 2290 {
2285 refreshnow = true; 2291 refreshnow = true;
2286 ch = NOCHAR; 2292 ch = NOCHAR;
2287 break; 2293 break;
2288 } 2294 }
… …
2326 * What the heck we'll cheat and only refresh less than every page-full. 2332 * What the heck we'll cheat and only refresh less than every page-full.
2327 * if skipScroll is enabled. 2333 * if skipScroll is enabled.
2328 */ 2334 */
2329 if (refreshnow) 2335 if (refreshnow)
2330 { 2336 {
2331 flag = true;
2332 scr_refresh (); 2337 scr_refresh ();
2333 want_refresh = 1; 2338 want_refresh = 1;
2334 } 2339 }
2335
2336 } 2340 }
2337 else 2341 else
2338 { 2342 {
2339 try 2343 try
2340 { 2344 {
… …
2348 } 2352 }
2349 2353
2350 ch = NOCHAR; 2354 ch = NOCHAR;
2351 } 2355 }
2352 } 2356 }
2353
2354 return flag;
2355} 2357}
2356 2358
2357// read the next character 2359// read the next character
2358wchar_t 2360wchar_t
2359rxvt_term::next_char () NOTHROW 2361rxvt_term::next_char () NOTHROW
2360{ 2362{
2361 while (cmdbuf_ptr < cmdbuf_endp) 2363 while (cmdbuf_ptr < cmdbuf_endp)
2362 { 2364 {
2363 // assume 7-bit to be ascii ALWAYS 2365 // assume 7-bit to be ascii ALWAYS
2364 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2366 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2365 return *cmdbuf_ptr++; 2367 return *cmdbuf_ptr++;
2366 2368
2367 wchar_t wc; 2369 wchar_t wc;
2368 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2370 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2369 2371
… …
2373 cmdbuf_ptr = cmdbuf_endp; 2375 cmdbuf_ptr = cmdbuf_endp;
2374 break; 2376 break;
2375 } 2377 }
2376 2378
2377 if (len == (size_t)-1) 2379 if (len == (size_t)-1)
2380 {
2381 mbstate.reset (); // reset now undefined conversion state
2378 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2382 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2383 }
2379 2384
2380 // assume wchar == unicode 2385 // assume wchar == unicode
2381 cmdbuf_ptr += len; 2386 cmdbuf_ptr += len;
2382 return wc & UNICODE_MASK; 2387 return wc & UNICODE_MASK;
2383 } 2388 }
… …
2427/*----------------------------------------------------------------------*/ 2432/*----------------------------------------------------------------------*/
2428#ifdef PRINTPIPE 2433#ifdef PRINTPIPE
2429FILE * 2434FILE *
2430rxvt_term::popen_printer () 2435rxvt_term::popen_printer ()
2431{ 2436{
2432 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2437 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2433 2438
2434 if (stream == NULL) 2439 if (stream == NULL)
2435 rxvt_warn ("can't open printer pipe, not printing.\n"); 2440 rxvt_warn ("can't open printer pipe, not printing.\n");
2436 2441
2437 return stream; 2442 return stream;
… …
2448 * simulate attached vt100 printer 2453 * simulate attached vt100 printer
2449 */ 2454 */
2450void 2455void
2451rxvt_term::process_print_pipe () 2456rxvt_term::process_print_pipe ()
2452{ 2457{
2453 int done; 2458 FILE *fd = popen_printer ();
2454 FILE *fd;
2455 2459
2456 if ((fd = popen_printer ()) == NULL) 2460 if (!fd)
2457 return; 2461 return;
2458 2462
2459 /* 2463 /*
2460 * Send all input to the printer until either ESC[4i or ESC[?4i 2464 * Send all input to the printer until either ESC[4i or ESC[?4i
2461 * is received. 2465 * is received.
2462 */ 2466 */
2463 for (done = 0; !done;) 2467 for (int done = 0; !done; )
2464 { 2468 {
2465 unsigned char buf[8]; 2469 unsigned char buf[8];
2466 unicode_t ch; 2470 unicode_t ch;
2467 unsigned int i, len; 2471 unsigned int i, len;
2468 2472
… …
2499 } 2503 }
2500 } 2504 }
2501 2505
2502 pclose_printer (fd); 2506 pclose_printer (fd);
2503} 2507}
2504#endif /* PRINTPIPE */ 2508#endif /* PRINTPIPE */
2505/*}}} */ 2509/*}}} */
2506 2510
2507/* *INDENT-OFF* */ 2511/* *INDENT-OFF* */
2508enum { 2512enum {
2509 C1_40 = 0x40, 2513 C1_40 = 0x40,
… …
2613 break; 2617 break;
2614 case 'Z': /* identify the terminal type */ 2618 case 'Z': /* identify the terminal type */
2615 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2619 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2616 break; 2620 break;
2617 case '<': /* turn off VT52 mode */ 2621 case '<': /* turn off VT52 mode */
2618 PrivMode (0, PrivMode_vt52); 2622 set_privmode (PrivMode_vt52, 0);
2619 break; 2623 break;
2620 case 'F': /* use special graphics character set */ 2624 case 'F': /* use special graphics character set */
2621 case 'G': /* use regular character set */ 2625 case 'G': /* use regular character set */
2622 /* unimplemented */ 2626 /* unimplemented */
2623 break; 2627 break;
… …
2677 scr_forwardindex (); 2681 scr_forwardindex ();
2678 break; 2682 break;
2679#endif 2683#endif
2680 case '=': 2684 case '=':
2681 case '>': 2685 case '>':
2682 PrivMode ((ch == '='), PrivMode_aplKP); 2686 set_privmode (PrivMode_aplKP, ch == '=');
2683 break; 2687 break;
2684 2688
2685 case C1_40: 2689 case C1_40:
2686 cmd_getc (); 2690 cmd_getc ();
2687 break; 2691 break;
… …
2726 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2730 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2727 case C1_SCI: /* ESC Z */ 2731 case C1_SCI: /* ESC Z */
2728 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2732 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2729 break; /* steal obsolete ESC [ c */ 2733 break; /* steal obsolete ESC [ c */
2730 2734
2731 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2735 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2732 case C1_CSI: /* ESC [ */ 2736 case C1_CSI: /* ESC [ */
2733 process_csi_seq (); 2737 process_csi_seq ();
2734 break; 2738 break;
2735 2739
2736 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2740 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2737 case C1_OSC: /* ESC ] */ 2741 case C1_OSC: /* ESC ] */
2738 process_osc_seq (); 2742 process_osc_seq ();
2739 break; 2743 break;
2740 2744
2741 /* 8.3.106: RESET TO INITIAL STATE */ 2745 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2742 case 'c': 2746 case 'c':
2743 mbstate.reset (); 2747 mbstate.reset ();
2744 scr_poweron (); 2748 scr_poweron ();
2745 scrollbar_show (1); 2749 scrollBar.show (1);
2746 break; 2750 break;
2747 2751
2748 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2752 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2749 case 'n': 2753 case 'n':
2750 scr_charset_choose (2); 2754 scr_charset_choose (2);
… …
2801 2805
2802 nargs = 0; 2806 nargs = 0;
2803 2807
2804 priv = 0; 2808 priv = 0;
2805 ch = cmd_getc (); 2809 ch = cmd_getc ();
2806 if (ch >= '<' && ch <= '?') 2810 if ((ch >= '<' && ch <= '?') || ch == '!')
2811 {
2807 { /* '<' '=' '>' '?' */ 2812 /* '<' '=' '>' '?' '!' */
2808 priv = ch; 2813 priv = ch;
2809 ch = cmd_getc (); 2814 ch = cmd_getc ();
2810 } 2815 }
2811 2816
2812 /* read any numerical arguments */ 2817 /* read any numerical arguments */
… …
2855 { 2860 {
2856 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2861 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2857 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2862 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2858 // 2863 //
2859 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2864 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2860 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2865 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2861 // that we do not support xterm mouse reporting (should be 95 when we do). 2866 // versions.
2862 // 2867 //
2863 tt_printf ("\033[>%d;94;0c", 'U'); 2868 tt_printf ("\033[>%d;95;0c", 'U');
2864 } 2869 }
2865 break; 2870 break;
2871
2866 case '?': 2872 case '?':
2867 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2873 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2868 process_terminal_mode (ch, priv, nargs, arg); 2874 process_terminal_mode (ch, priv, nargs, arg);
2869 break; 2875 break;
2876
2877 case '!':
2878 if (ch == CSI_70)
2879 {
2880 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2881 scr_soft_reset ();
2882
2883 static const int pm_h[] = { 7, 25 };
2884 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2885
2886 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2887 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2870 } 2888 }
2889 break;
2890 }
2891
2871 return; 2892 return;
2872 } 2893 }
2873 2894
2874 switch (ch) 2895 switch (ch)
2875 { 2896 {
… …
3242 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3263 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3243 */ 3264 */
3244void 3265void
3245rxvt_term::process_dcs_seq () 3266rxvt_term::process_dcs_seq ()
3246{ 3267{
3247 char *s;
3248 unicode_t eh;
3249
3250 /* 3268 /*
3251 * Not handled yet 3269 * Not handled yet
3252 */ 3270 */
3271
3272 unicode_t eh;
3253 s = get_to_st (eh); 3273 char *s = get_to_st (eh);
3254 if (s) 3274 if (s)
3255 free (s); 3275 free (s);
3256 3276
3257 return; 3277 return;
3258} 3278}
… …
3262 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3282 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3263 */ 3283 */
3264void 3284void
3265rxvt_term::process_osc_seq () 3285rxvt_term::process_osc_seq ()
3266{ 3286{
3267 unicode_t ch, eh;
3268 int arg; 3287 int arg;
3269 3288
3270 ch = cmd_getc (); 3289 unicode_t ch = cmd_getc ();
3271 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3290 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3272 arg = arg * 10 + (ch - '0'); 3291 arg = arg * 10 + (ch - '0');
3273 3292
3274 if (ch == ';') 3293 if (ch == ';')
3275 { 3294 {
3295 unicode_t eh;
3276 char *s = get_to_st (eh); 3296 char *s = get_to_st (eh);
3277 3297
3278 if (s) 3298 if (s)
3279 { 3299 {
3280 process_xterm_seq (arg, s, eh); 3300 process_xterm_seq (arg, s, eh);
… …
3304 3324
3305/* 3325/*
3306 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3326 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3307 */ 3327 */
3308void 3328void
3309rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3329rxvt_term::process_xterm_seq (int op, char *str, char resp)
3310{ 3330{
3311 int color; 3331 int color;
3312 char *buf, *name; 3332 char *buf, *name;
3313 bool query = str[0] == '?' && !str[1]; 3333 bool query = str[0] == '?' && !str[1];
3314 int saveop = op; 3334 int saveop = op;
… …
3355 3375
3356 XFree (value); 3376 XFree (value);
3357 } 3377 }
3358 else 3378 else
3359 { 3379 {
3360 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3380 char *eq = strchr (str, '=');
3361 3381
3362 if (eq) 3382 if (eq)
3363 { 3383 {
3364 *eq = 0; 3384 *eq = 0;
3365 set_utf8_property (display->atom (str), eq + 1); 3385 set_utf8_property (display->atom (str), eq + 1);
… …
3386 *buf++ = '\0'; 3406 *buf++ = '\0';
3387 3407
3388 process_color_seq (op, color, name, resp); 3408 process_color_seq (op, color, name, resp);
3389 } 3409 }
3390 break; 3410 break;
3411 case Rxvt_restoreFG:
3391 case XTerm_Color00: 3412 case XTerm_Color00:
3392 process_color_seq (op, Color_fg, str, resp); 3413 process_color_seq (op, Color_fg, str, resp);
3393 break; 3414 break;
3415 case Rxvt_restoreBG:
3394 case XTerm_Color01: 3416 case XTerm_Color01:
3395 process_color_seq (op, Color_bg, str, resp); 3417 process_color_seq (op, Color_bg, str, resp);
3396 break; 3418 break;
3397#ifndef NO_CURSORCOLOR 3419#ifndef NO_CURSORCOLOR
3398 case XTerm_Color_cursor: 3420 case XTerm_Color_cursor:
… …
3403 process_color_seq (op, Color_pointer_fg, str, resp); 3425 process_color_seq (op, Color_pointer_fg, str, resp);
3404 break; 3426 break;
3405 case XTerm_Color_pointer_bg: 3427 case XTerm_Color_pointer_bg:
3406 process_color_seq (op, Color_pointer_bg, str, resp); 3428 process_color_seq (op, Color_pointer_bg, str, resp);
3407 break; 3429 break;
3430#ifdef OPTION_HC
3431 case XTerm_Color_HC:
3432 process_color_seq (op, Color_HC, str, resp);
3433 break;
3434 case XTerm_Color_HTC:
3435 process_color_seq (op, Color_HTC, str, resp);
3436 break;
3437#endif
3408#ifndef NO_BOLD_UNDERLINE_REVERSE 3438#ifndef NO_BOLD_UNDERLINE_REVERSE
3409 case XTerm_Color_RV:
3410 process_color_seq (op, Color_RV, str, resp);
3411 break;
3412 case Rxvt_Color_BD:
3413 case URxvt_Color_BD: 3439 case URxvt_Color_BD:
3414 process_color_seq (op, Color_BD, str, resp); 3440 process_color_seq (op, Color_BD, str, resp);
3415 break; 3441 break;
3416 case Rxvt_Color_UL:
3417 case URxvt_Color_UL: 3442 case URxvt_Color_UL:
3418 process_color_seq (op, Color_UL, str, resp); 3443 process_color_seq (op, Color_UL, str, resp);
3419 break; 3444 break;
3420 case URxvt_Color_IT: 3445 case URxvt_Color_IT:
3421 process_color_seq (op, Color_IT, str, resp); 3446 process_color_seq (op, Color_IT, str, resp);
3422 break; 3447 break;
3423#endif 3448#endif
3449 case URxvt_Color_border:
3450 process_color_seq (op, Color_border, str, resp);
3451 break;
3424#if ENABLE_TRANSPARENCY 3452#if ENABLE_TRANSPARENCY
3425 case URxvt_Color_tint: 3453 case URxvt_Color_tint:
3426 process_color_seq (op, Color_tint, str, resp); 3454 process_color_seq (op, Color_tint, str, resp);
3427 { 3455 {
3428 bool changed = false; 3456 bool changed = false;
3457
3429 if (ISSET_PIXCOLOR (Color_tint)) 3458 if (ISSET_PIXCOLOR (Color_tint))
3430 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3459 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3431 else 3460 else
3432 changed = bgPixmap.unset_tint (); 3461 changed = bgPixmap.unset_tint ();
3462
3433 if (changed) 3463 if (changed)
3434 update_background (); 3464 update_background ();
3435 } 3465 }
3436 3466
3437 break; 3467 break;
3438#endif 3468#endif
3439 3469
3440#if XPM_BACKGROUND 3470#if BG_IMAGE_FROM_FILE
3441 case Rxvt_Pixmap: 3471 case Rxvt_Pixmap:
3442 if (!strcmp (str, "?")) 3472 if (!strcmp (str, "?"))
3443 { 3473 {
3444 char str[256]; 3474 char str[256];
3445 3475
3446 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3476 sprintf (str, "[%dx%d+%d+%d]",
3447 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3477 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3448 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3478 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3449 process_xterm_seq (XTerm_title, str, CHAR_ST); 3479 process_xterm_seq (XTerm_title, str, CHAR_ST);
3450 } 3480 }
3451 else 3481 else
3452 { 3482 {
3453 int changed = 0; 3483 int changed = 0;
3454 3484
3455 if (*str != ';') 3485 if (*str != ';')
3456 { 3486 {
3457 /* reset to default scaling :*/
3458 bgPixmap.unset_geometry ();
3459 if (bgPixmap.set_file (str)) /* change pixmap */ 3487 if (bgPixmap.set_file (str)) /* change pixmap */
3488 {
3460 changed++; 3489 changed++;
3461 str = strchr (str, ';'); 3490 str = strchr (str, ';');
3462 if (str == NULL) 3491 if (str == NULL)
3463 bgPixmap.set_defaultGeometry (); 3492 bgPixmap.set_defaultGeometry ();
3493 else
3494 bgPixmap.set_geometry (str+1);
3495 }
3464 } 3496 }
3465 while (str) 3497 else
3466 { 3498 {
3467 str++; 3499 str++;
3468 if (bgPixmap.set_geometry (str)) 3500 if (bgPixmap.set_geometry (str, true))
3469 changed++; 3501 changed++;
3470 str = strchr (str, ';');
3471 } 3502 }
3503
3472 if (changed) 3504 if (changed)
3505 {
3506 if (bgPixmap.window_position_sensitive ())
3507 {
3508 int x, y;
3509 get_window_origin (x, y);
3510 bgPixmap.set_position (x, y);
3511 }
3473 update_background (); 3512 update_background ();
3513 }
3474 } 3514 }
3475 break; 3515 break;
3476#endif 3516#endif
3477
3478 case Rxvt_restoreFG:
3479 set_window_color (Color_fg, str);
3480 break;
3481 case Rxvt_restoreBG:
3482 set_window_color (Color_bg, str);
3483 break;
3484 3517
3485 case XTerm_logfile: 3518 case XTerm_logfile:
3486 // TODO, when secure mode? 3519 // TODO, when secure mode?
3487 break; 3520 break;
3488 3521
… …
3555 break; 3588 break;
3556#endif 3589#endif
3557 3590
3558#if ENABLE_PERL 3591#if ENABLE_PERL
3559 case URxvt_perl: 3592 case URxvt_perl:
3560 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3593 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3561 ; // no responses yet
3562 break; 3594 break;
3563#endif 3595#endif
3564 } 3596 }
3565} 3597}
3566/*----------------------------------------------------------------------*/ 3598/*----------------------------------------------------------------------*/
… …
3589 { 3621 {
3590 if (mode == 'r') 3622 if (mode == 'r')
3591 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3623 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3592 else 3624 else
3593 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3625 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3594 PrivMode (state, bit); 3626
3627 set_privmode (bit, state);
3595 } 3628 }
3596 3629
3597 return state; 3630 return state;
3598} 3631}
3599 3632
… …
3607 static const struct 3640 static const struct
3608 { 3641 {
3609 const int argval; 3642 const int argval;
3610 const unsigned long bit; 3643 const unsigned long bit;
3611 } argtopriv[] = { 3644 } argtopriv[] = {
3612 { 1, PrivMode_aplCUR }, 3645 { 1, PrivMode_aplCUR }, // DECCKM
3613 { 2, PrivMode_vt52 }, 3646 { 2, PrivMode_vt52 },
3614 { 3, PrivMode_132 }, 3647 { 3, PrivMode_132 }, // DECCOLM
3615 { 4, PrivMode_smoothScroll }, 3648 { 4, PrivMode_smoothScroll }, // DECSCLM
3616 { 5, PrivMode_rVideo }, 3649 { 5, PrivMode_rVideo }, // DECSCNM
3617 { 6, PrivMode_relOrigin }, 3650 { 6, PrivMode_relOrigin }, // DECOM
3618 { 7, PrivMode_Autowrap }, 3651 { 7, PrivMode_Autowrap }, // DECAWM
3619 // 8, bi-directional support mode 3652 // 8, auto-repeat keys // DECARM
3620 { 9, PrivMode_MouseX10 }, 3653 { 9, PrivMode_MouseX10 },
3621 // 18, 19 printing-related 3654 // 18 end FF to printer after print screen
3655 // 19 Print screen prints full screen/scroll region
3622 { 25, PrivMode_VisibleCursor }, 3656 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3623#ifdef scrollBar_esc 3657#ifdef scrollBar_esc
3624 { scrollBar_esc, PrivMode_scrollBar }, 3658 { scrollBar_esc, PrivMode_scrollBar },
3625#endif 3659#endif
3626 { 35, PrivMode_ShiftKeys }, // rxvt extension 3660 { 35, PrivMode_ShiftKeys }, // rxvt extension
3661 // 38, tektronix mode // DECTEK
3627 { 40, PrivMode_132OK }, 3662 { 40, PrivMode_132OK },
3628 // 41 xterm more fixes NYI 3663 // 41 xterm more fixes NYI
3629 // 45 margin bell NYI 3664 // 45 margin bell NYI
3630 // 46 start logging 3665 // 46 start logging
3631 { 47, PrivMode_Screen }, 3666 { 47, PrivMode_Screen },
3632 { 66, PrivMode_aplKP }, 3667 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3633#ifndef NO_BACKSPACE_KEY 3668#ifndef NO_BACKSPACE_KEY
3634 { 67, PrivMode_BackSpace }, 3669 { 67, PrivMode_BackSpace }, // DECBKM
3635#endif 3670#endif
3636 { 1000, PrivMode_MouseX11 }, 3671 { 1000, PrivMode_MouseX11 },
3637 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3672 { 1002, PrivMode_MouseBtnEvent },
3638 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3673 { 1003, PrivMode_MouseAnyEvent },
3639 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3674#if ENABLE_FRILLS
3675 { 1005, PrivMode_ExtModeMouse },
3676#endif
3640 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3677 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3641 { 1011, PrivMode_Keypress }, // rxvt extension 3678 { 1011, PrivMode_Keypress }, // rxvt extension
3679#if ENABLE_FRILLS
3680 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3681#endif
3642 // 1035 enable modifiers for alt, numlock NYI 3682 // 1035 enable modifiers for alt, numlock NYI
3643 // 1036 send ESC for meta keys NYI 3683 // 1036 send ESC for meta keys NYI
3644 // 1037 send DEL for keypad delete NYI 3684 // 1037 send DEL for keypad delete NYI
3645 { 1047, PrivMode_Screen }, 3685 { 1047, PrivMode_Screen },
3646 // 1048 save and restore cursor 3686 // 1048 save and restore cursor, implemented in code
3647 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3687 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3648 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3688 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3689 { 2004, PrivMode_BracketPaste },
3649 }; 3690 };
3650 3691
3651 if (nargs == 0) 3692 if (nargs == 0)
3652 return; 3693 return;
3653 3694
… …
3678 3719
3679 scr_touch (true); 3720 scr_touch (true);
3680 break; 3721 break;
3681#endif 3722#endif
3682 case 1048: /* alternative cursor save */ 3723 case 1048: /* alternative cursor save */
3683 case 1049:
3684 if (option (Opt_secondaryScreen)) 3724 if (option (Opt_secondaryScreen))
3685 if (mode == 0) 3725 if (mode == 0)
3686 scr_cursor (RESTORE); 3726 scr_cursor (RESTORE);
3687 else if (mode == 1) 3727 else if (mode == 1)
3688 scr_cursor (SAVE); 3728 scr_cursor (SAVE);
… …
3697 case 2: /* VT52 mode */ 3737 case 2: /* VT52 mode */
3698 /* oddball mode. should be set regardless of set/reset 3738 /* oddball mode. should be set regardless of set/reset
3699 * parameter. Return from VT52 mode with an ESC < from 3739 * parameter. Return from VT52 mode with an ESC < from
3700 * within VT52 mode 3740 * within VT52 mode
3701 */ 3741 */
3702 PrivMode (1, PrivMode_vt52); 3742 set_privmode (PrivMode_vt52, 1);
3703 break; 3743 break;
3704 case 3: /* 80/132 */ 3744 case 3: /* 80/132 */
3705 if (priv_modes & PrivMode_132OK) 3745 if (priv_modes & PrivMode_132OK)
3706 set_widthheight (((state ? 132 : 80) * fwidth), height); 3746 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3707 break; 3747 break;
3708 case 4: /* smooth scrolling */ 3748 case 4: /* smooth scrolling */
3709 set_option (Opt_jumpScroll, !state); 3749 set_option (Opt_jumpScroll, !state);
3710 break; 3750 break;
3711 case 5: /* reverse video */ 3751 case 5: /* reverse video */
… …
3718 scr_autowrap (state); 3758 scr_autowrap (state);
3719 break; 3759 break;
3720 /* case 8: - auto repeat, can't do on a per window basis */ 3760 /* case 8: - auto repeat, can't do on a per window basis */
3721 case 9: /* X10 mouse reporting */ 3761 case 9: /* X10 mouse reporting */
3722 if (state) /* orthogonal */ 3762 if (state) /* orthogonal */
3723 priv_modes &= ~PrivMode_MouseX11; 3763 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3724 break; 3764 break;
3725#ifdef scrollBar_esc 3765#ifdef scrollBar_esc
3726 case scrollBar_esc: 3766 case scrollBar_esc:
3727 if (scrollbar_mapping (state)) 3767 if (scrollBar.map (state))
3728 { 3768 {
3729 resize_all_windows (0, 0, 0); 3769 resize_all_windows (0, 0, 0);
3730 scr_touch (true); 3770 scr_touch (true);
3731 } 3771 }
3732 break; 3772 break;
… …
3741 break; 3781 break;
3742 /* case 66: - application key pad */ 3782 /* case 66: - application key pad */
3743 /* case 67: - backspace key */ 3783 /* case 67: - backspace key */
3744 case 1000: /* X11 mouse reporting */ 3784 case 1000: /* X11 mouse reporting */
3745 if (state) /* orthogonal */ 3785 if (state) /* orthogonal */
3746 priv_modes &= ~PrivMode_MouseX10; 3786 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3747 break; 3787 break;
3748#if 0
3749 case 1001: 3788 case 1002:
3750 break; /* X11 mouse highlighting */ 3789 case 1003:
3751#endif 3790 if (state)
3791 {
3792 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3793 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3794 mouse_row = mouse_col = 0;
3795 vt_emask_mouse = PointerMotionMask;
3796 }
3797 else
3798 vt_emask_mouse = NoEventMask;
3799
3800 vt_select_input ();
3801 break;
3752 case 1010: /* scroll to bottom on TTY output inhibit */ 3802 case 1010: /* scroll to bottom on TTY output inhibit */
3753 set_option (Opt_scrollTtyOutput, !state); 3803 set_option (Opt_scrollTtyOutput, !state);
3754 break; 3804 break;
3755 case 1011: /* scroll to bottom on key press */ 3805 case 1011: /* scroll to bottom on key press */
3756 set_option (Opt_scrollTtyKeypress, state); 3806 set_option (Opt_scrollTtyKeypress, state);
3757 break; 3807 break;
3758 case 1047: /* secondary screen w/ clearing last */ 3808 case 1047: /* secondary screen w/ clearing last */
3759 if (option (Opt_secondaryScreen)) 3809 if (option (Opt_secondaryScreen))
3760 if (current_screen != PRIMARY) 3810 if (!state)
3761 scr_erase_screen (2); 3811 scr_erase_screen (2);
3812
3762 scr_change_screen (state); 3813 scr_change_screen (state);
3763 break; 3814 break;
3764 case 1049: /* secondary screen w/ clearing first */ 3815 case 1049: /* secondary screen w/ clearing first */
3816 if (option (Opt_secondaryScreen))
3817 if (state)
3818 scr_cursor (SAVE);
3819
3765 scr_change_screen (state); 3820 scr_change_screen (state);
3821
3766 if (option (Opt_secondaryScreen)) 3822 if (option (Opt_secondaryScreen))
3767 if (current_screen != PRIMARY) 3823 if (state)
3768 scr_erase_screen (2); 3824 scr_erase_screen (2);
3825 else
3826 scr_cursor (RESTORE);
3769 break; 3827 break;
3770 default: 3828 default:
3771 break; 3829 break;
3772 } 3830 }
3773 } 3831 }
… …
3933rxvt_term::process_graphics () 3991rxvt_term::process_graphics ()
3934{ 3992{
3935 unicode_t ch, cmd = cmd_getc (); 3993 unicode_t ch, cmd = cmd_getc ();
3936 3994
3937 if (cmd == 'Q') 3995 if (cmd == 'Q')
3996 {
3938 { /* query graphics */ 3997 /* query graphics */
3939 tt_printf ("\033G0\012"); /* no graphics */ 3998 tt_printf ("\033G0\012"); /* no graphics */
3940 return; 3999 return;
3941 } 4000 }
3942 /* swallow other graphics sequences until terminating ':' */ 4001 /* swallow other graphics sequences until terminating ':' */
3943 do 4002 do
… …
3993 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4052 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3994 4053
3995 memcpy (v_buffer + v_buflen, data, len); 4054 memcpy (v_buffer + v_buflen, data, len);
3996 v_buflen += len; 4055 v_buflen += len;
3997 4056
3998 pty_ev.set (EVENT_READ | EVENT_WRITE); 4057 pty_ev.set (ev::READ | ev::WRITE);
3999} 4058}
4000 4059
4001void rxvt_term::pty_write () 4060void rxvt_term::pty_write ()
4002{ 4061{
4003 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4062 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4008 4067
4009 if (v_buflen == 0) 4068 if (v_buflen == 0)
4010 { 4069 {
4011 free (v_buffer); 4070 free (v_buffer);
4012 v_buffer = 0; 4071 v_buffer = 0;
4013 v_buflen = 0;
4014 4072
4015 pty_ev.set (EVENT_READ); 4073 pty_ev.set (ev::READ);
4016 return; 4074 return;
4017 } 4075 }
4018 4076
4019 memmove (v_buffer, v_buffer + written, v_buflen); 4077 memmove (v_buffer, v_buffer + written, v_buflen);
4020 } 4078 }
4021 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4079 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4022 pty_ev.set (EVENT_READ); 4080 pty_ev.set (ev::READ);
4023} 4081}
4024 4082
4025/*----------------------- end-of-file (C source) -----------------------*/ 4083/*----------------------- end-of-file (C source) -----------------------*/
4026 4084

Diff Legend

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