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.339 by ayin, Fri Aug 3 14:03:28 2007 UTC vs.
Revision 1.461 by root, Tue Nov 23 22:58:08 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
… …
321 * Always permit `shift' to override the current setting 421 * Always permit `shift' to override the current setting
322 */ 422 */
323 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
324 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
325 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
326
327 if (numlock_state || (ev.state & ModNumLockMask))
328 {
329 numlock_state = (ev.state & ModNumLockMask);
330 PrivMode ((!numlock_state), PrivMode_aplKP);
331 }
332 426
333 kbuf[0] = 0; 427 kbuf[0] = 0;
334 428
335#ifdef USE_XIM 429#ifdef USE_XIM
336 if (Input_Context) 430 if (Input_Context)
… …
411#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
412 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
413#else 507#else
414 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
415#endif 509#endif
510 max_it (lnsppg, 1);
511
416 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
417 { 513 {
418 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
419 return; 515 return;
420 } 516 }
… …
485 } 581 }
486 } 582 }
487 583
488#if ENABLE_FRILLS || ISO_14755 584#if ENABLE_FRILLS || ISO_14755
489 // ISO 14755 support 585 // ISO 14755 support
490 if (shft && ctrl) 586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
491 { 587 {
492 int hv; 588 int hv;
493 589
494 if (iso14755buf & ISO_14755_51 590 if (iso14755buf & ISO_14755_51
495 && (keysym == XK_space || keysym == XK_KP_Space 591 && (keysym == XK_space || keysym == XK_KP_Space
… …
525 scr_overlay_off (); 621 scr_overlay_off ();
526# endif 622# endif
527 iso14755buf = 0; 623 iso14755buf = 0;
528 } 624 }
529 } 625 }
626 else if (option (Opt_iso14755) &&
530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 627 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 628 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
532 if (!(iso14755buf & ISO_14755_STARTED)) 629 if (!(iso14755buf & ISO_14755_STARTED))
533 { 630 {
534 iso14755buf |= ISO_14755_STARTED; 631 iso14755buf |= ISO_14755_STARTED;
535# if ISO_14755 632# if ISO_14755
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 633 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
547 } 644 }
548#endif 645#endif
549 646
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 { 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)
552 { 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
553 newlen = 1; 689 newlen = 0;
554 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:
555 { 773 {
556#ifndef NO_BACKSPACE_KEY 774 int param = map_function_key (keysym);
557 case XK_BackSpace: 775 if (param > 0)
558 if (priv_modes & PrivMode_HaveBackSpace) 776 sprintf (kbuf,"\033[%d~", param);
559 {
560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561 ^ !!ctrl) ? '\b' : '\177';
562 kbuf[1] = '\0';
563 }
564 else 777 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_Insert
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; 778 newlen = 0;
840 break;
841 } 779 }
842 780 break;
843 if (newlen)
844 len = strlen (kbuf);
845 } 781 }
782
783 if (newlen)
784 len = strlen (kbuf);
846 785
847 /* 786 /*
848 * Pass meta for all function keys, if 'meta' option set 787 * Pass meta for all function keys, if 'meta' option set
849 */ 788 */
850#ifdef META8_OPTION 789#ifdef META8_OPTION
… …
1035void 974void
1036rxvt_term::flush () 975rxvt_term::flush ()
1037{ 976{
1038 flush_ev.stop (); 977 flush_ev.stop ();
1039 978
1040#ifdef ENABLE_TRANSPARENCY 979#ifdef HAVE_BG_PIXMAP
1041 if (want_full_refresh) 980 if (bgPixmap.flags & bgPixmap_t::hasChanged)
1042 { 981 {
1043 want_full_refresh = 0; 982 bgPixmap.flags &= ~bgPixmap_t::hasChanged;
1044 scr_clear (); 983// scr_clear (true); This needs to be researched further!
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) + 1;
1309 y = ev.y; 1258 y = Pixel2Row (ev.y) + 1;
1310 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 }
1311 1269
1312 if (MEvent.button == AnyButton) 1270 if (MEvent.button == AnyButton)
1313 button_number = 3; 1271 button_number = 3;
1314 else 1272 else
1315 { 1273 {
1316 button_number = MEvent.button - Button1; 1274 button_number = MEvent.button - Button1;
1317 /* add 0x3D for wheel events, like xterm does */ 1275 /* add 0x3D for wheel events, like xterm does */
1318 if (button_number >= 3) 1276 if (button_number >= 3)
1319 button_number += (64 - 3); 1277 button_number += 64 - 3;
1320 } 1278 }
1321 1279
1322 if (priv_modes & PrivMode_MouseX10) 1280 if (priv_modes & PrivMode_MouseX10)
1323 { 1281 {
1324 /* 1282 /*
… …
1356 fputc ('A', stderr); 1314 fputc ('A', stderr);
1357 if (key_state & 32) 1315 if (key_state & 32)
1358 fputc ('2', stderr); 1316 fputc ('2', stderr);
1359 fprintf (stderr, "]: <%d>, %d/%d\n", 1317 fprintf (stderr, "]: <%d>, %d/%d\n",
1360 button_number, 1318 button_number,
1361 x + 1, 1319 x,
1362 y + 1); 1320 y);
1363#endif 1321#endif
1364 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
1365 tt_printf ("\033[M%c%c%c", 1336 tt_printf ("\033[M%c%c%c",
1366 (32 + button_number + key_state), 1337 code + button_number + key_state,
1367 (32 + x + 1), 1338 32 + x,
1368 (32 + y + 1)); 1339 32 + y);
1369} 1340}
1370 1341
1371/*{{{ process an X event */ 1342/*{{{ process an X event */
1372void 1343void
1373rxvt_term::x_cb (XEvent &ev) 1344rxvt_term::x_cb (XEvent &ev)
… …
1480 if (ev.xconfigure.window == parent[0]) 1451 if (ev.xconfigure.window == parent[0])
1481 { 1452 {
1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1453 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1483 ; 1454 ;
1484 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
1474
1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1475 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1486 { 1476 {
1487 seen_resize = 1; 1477 seen_resize = 1;
1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1478 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1489#ifdef XPM_BACKGROUND 1479 }
1490 if (!option (Opt_transparent) && bgPixmap.auto_resize) 1480 else
1481 {
1482#ifdef HAVE_BG_PIXMAP
1483 if (moved)
1491 { 1484 {
1485 if (mapped)
1486 update_background ();
1492 resize_pixmap (); 1487 else
1493 scr_touch (true); 1488 bgPixmap.invalidate ();
1494 } 1489 }
1495#endif 1490#endif
1496 } 1491 }
1497 1492
1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1493 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1499
1500#ifdef ENABLE_TRANSPARENCY
1501 if (option (Opt_transparent))
1502 check_our_parents ();
1503#endif
1504 } 1494 }
1505 break; 1495 break;
1506 1496
1507 case PropertyNotify: 1497 case PropertyNotify:
1508 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1498 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1511 selection_property (ev.xproperty.window, ev.xproperty.atom); 1501 selection_property (ev.xproperty.window, ev.xproperty.atom);
1512 1502
1513 break; 1503 break;
1514 1504
1515 case SelectionClear: 1505 case SelectionClear:
1516 selection_clear (); 1506 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1517 break; 1507 break;
1518 1508
1519 case SelectionNotify: 1509 case SelectionNotify:
1520 if (selection_wait == Sel_normal) 1510 if (selection_wait == Sel_normal)
1521 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1511 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1524 case SelectionRequest: 1514 case SelectionRequest:
1525 selection_send (ev.xselectionrequest); 1515 selection_send (ev.xselectionrequest);
1526 break; 1516 break;
1527 1517
1528 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
1529 mapped = 1; 1535 mapped = 1;
1530#ifdef TEXT_BLINK 1536#ifdef TEXT_BLINK
1531 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1537 text_blink_ev.start ();
1532#endif 1538#endif
1533 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1539 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1534 break; 1540 break;
1535 1541
1536 case UnmapNotify: 1542 case UnmapNotify:
… …
1538#ifdef TEXT_BLINK 1544#ifdef TEXT_BLINK
1539 text_blink_ev.stop (); 1545 text_blink_ev.stop ();
1540#endif 1546#endif
1541 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1547 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1542 break; 1548 break;
1543
1544#ifdef ENABLE_TRANSPARENCY
1545 case ReparentNotify:
1546 rootwin_cb (ev);
1547 break;
1548#endif /* ENABLE_TRANSPARENCY */
1549 1549
1550 case GraphicsExpose: 1550 case GraphicsExpose:
1551 case Expose: 1551 case Expose:
1552 if (ev.xany.window == vt) 1552 if (ev.xany.window == vt)
1553 { 1553 {
1554 do 1554 do
1555 {
1555 scr_expose (ev.xexpose.x, ev.xexpose.y, 1556 scr_expose (ev.xexpose.x, ev.xexpose.y,
1556 ev.xexpose.width, ev.xexpose.height, False); 1557 ev.xexpose.width, ev.xexpose.height, False);
1558 }
1557 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1558 1560
1559 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1561 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1560 1562
1561 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1563 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1564 {
1562 scr_expose (ev.xexpose.x, ev.xexpose.y, 1565 scr_expose (ev.xexpose.x, ev.xexpose.y,
1563 ev.xexpose.width, ev.xexpose.height, False); 1566 ev.xexpose.width, ev.xexpose.height, False);
1567 }
1564 1568
1565 want_refresh = 1; 1569 want_refresh = 1;
1566 } 1570 }
1567 else 1571 else
1568 { 1572 {
… …
1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1575 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1572 ; 1576 ;
1573 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1577 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1574 ; 1578 ;
1575 1579
1576 if (isScrollbarWindow (ev.xany.window)) 1580 if (scrollBar.state && ev.xany.window == scrollBar.win)
1577 { 1581 {
1578 scrollBar.setIdle (); 1582 scrollBar.state = STATE_IDLE;
1579 scrollbar_show (0); 1583 scrollBar.show (0);
1580 } 1584 }
1581
1582#ifdef ENABLE_TRANSPARENCY
1583 if (am_transparent && ev.xany.window == parent[0])
1584 XClearWindow (dpy, ev.xany.window);
1585#endif
1586 } 1585 }
1587 break; 1586 break;
1588 1587
1589 case MotionNotify: 1588 case MotionNotify:
1590#ifdef POINTER_BLANK 1589#ifdef POINTER_BLANK
1591 if (hidden_pointer) 1590 if (hidden_pointer)
1592 pointer_unblank (); 1591 pointer_unblank ();
1593#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);
1594 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1596 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1595 break; 1597 break;
1596 1598
1597 if (ev.xany.window == vt) 1599 if (ev.xany.window == vt)
1598 { 1600 {
… …
1632 int dist; 1634 int dist;
1633 1635
1634 /* don't clobber the current delay if we are 1636 /* don't clobber the current delay if we are
1635 * already in the middle of scrolling. 1637 * already in the middle of scrolling.
1636 */ 1638 */
1637 if (!sel_scroll_ev.active) 1639 if (!sel_scroll_ev.is_active ())
1638 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1640 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1639 1641
1640 /* save the event params so we can highlight 1642 /* save the event params so we can highlight
1641 * the selection in the pending-scroll loop 1643 * the selection in the pending-scroll loop
1642 */ 1644 */
1643 selection_save_x = ev.xbutton.x; 1645 selection_save_x = ev.xbutton.x;
… …
1665 else 1667 else
1666 { 1668 {
1667 /* we are within the text window, so we 1669 /* we are within the text window, so we
1668 * shouldn't be scrolling 1670 * shouldn't be scrolling
1669 */ 1671 */
1670 if (sel_scroll_ev.active)
1671 sel_scroll_ev.stop(); 1672 sel_scroll_ev.stop();
1672 } 1673 }
1673#endif 1674#endif
1674#ifdef MOUSE_THRESHOLD 1675#ifdef MOUSE_THRESHOLD
1675 } 1676 }
1676#endif 1677#endif
1677 } 1678 }
1678 } 1679 }
1679 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1680 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1680 { 1681 {
1681 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1682 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1682 MotionNotify, &ev)) 1683 MotionNotify, &ev))
1683 ; 1684 ;
1684 1685
… …
1686 &unused_root, &unused_child, 1687 &unused_root, &unused_child,
1687 &unused_root_x, &unused_root_y, 1688 &unused_root_x, &unused_root_y,
1688 &ev.xbutton.x, &ev.xbutton.y, 1689 &ev.xbutton.x, &ev.xbutton.y,
1689 &unused_mask); 1690 &unused_mask);
1690 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1691 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1691 scrollbar_size ()); 1692 scrollBar.size ());
1692 want_refresh = 1; 1693 want_refresh = 1;
1693 scrollbar_show (1); 1694 scrollBar.show (1);
1694 } 1695 }
1695 break; 1696 break;
1696 } 1697 }
1697 1698
1698#if defined(CURSOR_BLINK) 1699#if defined(CURSOR_BLINK)
… …
1702 { 1703 {
1703 hidden_cursor = 0; 1704 hidden_cursor = 0;
1704 want_refresh = 1; 1705 want_refresh = 1;
1705 } 1706 }
1706 1707
1707 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1708 cursor_blink_ev.again ();
1708 } 1709 }
1709#endif 1710#endif
1710 1711
1711#if defined(POINTER_BLANK) 1712#if defined(POINTER_BLANK)
1712 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1713 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1719 1720
1720 if (ev.type == KeyPress && hidden_pointer == 0) 1721 if (ev.type == KeyPress && hidden_pointer == 0)
1721 pointer_blank (); 1722 pointer_blank ();
1722 } 1723 }
1723#endif 1724#endif
1725
1726 refresh_check ();
1724} 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
1725 1744
1726void 1745void
1727rxvt_term::focus_in () 1746rxvt_term::focus_in ()
1728{ 1747{
1729 if (!focus) 1748 if (!focus)
1730 { 1749 {
1731 focus = 1; 1750 focus = 1;
1732 want_refresh = 1; 1751 want_refresh = 1;
1733 1752
1734 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1735
1736#if USE_XIM 1753#if USE_XIM
1737 if (Input_Context != NULL) 1754 if (Input_Context != NULL)
1738 { 1755 {
1739 IMSetPosition (); 1756 IMSetPosition ();
1740 XSetICFocus (Input_Context); 1757 XSetICFocus (Input_Context);
1741 } 1758 }
1742#endif 1759#endif
1743#if CURSOR_BLINK 1760#if CURSOR_BLINK
1744 if (option (Opt_cursorBlink)) 1761 if (option (Opt_cursorBlink))
1745 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1762 cursor_blink_ev.again ();
1746#endif 1763#endif
1747#if OFF_FOCUS_FADING 1764#if OFF_FOCUS_FADING
1748 if (rs[Rs_fade]) 1765 if (rs[Rs_fade])
1749 { 1766 {
1750 pix_colors = pix_colors_focused; 1767 pix_colors = pix_colors_focused;
1751 scr_recolour (); 1768 scr_recolour ();
1752 } 1769 }
1753#endif 1770#endif
1754#if ENABLE_FRILLS 1771#if ENABLE_FRILLS
1755 if (option (Opt_urgentOnBell)) 1772 if (option (Opt_urgentOnBell))
1756 { 1773 set_urgency (0);
1757 XWMHints *h;
1758
1759 h = XGetWMHints(dpy, parent[0]);
1760 if (h != NULL)
1761 {
1762 h->flags &= ~XUrgencyHint;
1763 XSetWMHints(dpy, parent[0], h);
1764 }
1765 }
1766#endif 1774#endif
1775
1776 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1767 } 1777 }
1768} 1778}
1769 1779
1770void 1780void
1771rxvt_term::focus_out () 1781rxvt_term::focus_out ()
… …
1773 if (focus) 1783 if (focus)
1774 { 1784 {
1775 focus = 0; 1785 focus = 0;
1776 want_refresh = 1; 1786 want_refresh = 1;
1777 1787
1778 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1788#if ENABLE_FRILLS
1779 1789 if (option (Opt_urgentOnBell))
1790 set_urgency (0);
1791#endif
1780#if ENABLE_FRILLS || ISO_14755 1792#if ENABLE_FRILLS || ISO_14755
1781 if (iso14755buf) 1793 if (iso14755buf)
1782 { 1794 {
1783 iso14755buf = 0; 1795 iso14755buf = 0;
1784# if ISO_14755 1796# if ISO_14755
… …
1791 XUnsetICFocus (Input_Context); 1803 XUnsetICFocus (Input_Context);
1792#endif 1804#endif
1793#if CURSOR_BLINK 1805#if CURSOR_BLINK
1794 if (option (Opt_cursorBlink)) 1806 if (option (Opt_cursorBlink))
1795 cursor_blink_ev.stop (); 1807 cursor_blink_ev.stop ();
1808
1796 hidden_cursor = 0; 1809 hidden_cursor = 0;
1797#endif 1810#endif
1798#if OFF_FOCUS_FADING 1811#if OFF_FOCUS_FADING
1799 if (rs[Rs_fade]) 1812 if (rs[Rs_fade])
1800 { 1813 {
1801 pix_colors = pix_colors_unfocused; 1814 pix_colors = pix_colors_unfocused;
1802 scr_recolour (); 1815 scr_recolour ();
1803 } 1816 }
1804#endif 1817#endif
1818
1819 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1805 } 1820 }
1806} 1821}
1807 1822
1808void 1823void
1809rxvt_term::update_fade_color (unsigned int idx) 1824rxvt_term::update_fade_color (unsigned int idx)
… …
1834 case PropertyNotify: 1849 case PropertyNotify:
1835 /* 1850 /*
1836 * if user used some Esetroot compatible prog to set the root bg, 1851 * if user used some Esetroot compatible prog to set the root bg,
1837 * use the property to determine the pixmap. We use it later on. 1852 * use the property to determine the pixmap. We use it later on.
1838 */ 1853 */
1839 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1854 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1840 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1855 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1841 return; 1856 {
1857 bgPixmap.set_root_pixmap ();
1858 update_background ();
1859 }
1842 1860
1843 /* FALLTHROUGH */
1844 case ReparentNotify:
1845 if (option (Opt_transparent))
1846 check_our_parents ();
1847 break; 1861 break;
1848 } 1862 }
1849# endif 1863# endif
1864
1865 refresh_check ();
1850} 1866}
1851#endif 1867#endif
1852 1868
1853void 1869void
1854rxvt_term::button_press (XButtonEvent &ev) 1870rxvt_term::button_press (XButtonEvent &ev)
… …
1885 /* save the xbutton state (for ButtonRelease) */ 1901 /* save the xbutton state (for ButtonRelease) */
1886 MEvent.state = ev.state; 1902 MEvent.state = ev.state;
1887#ifdef MOUSE_REPORT_DOUBLECLICK 1903#ifdef MOUSE_REPORT_DOUBLECLICK
1888 if (ev.button == MEvent.button && clickintime) 1904 if (ev.button == MEvent.button && clickintime)
1889 { 1905 {
1890 /* same button, within alloted time */ 1906 /* same button, within allowed time */
1891 MEvent.clicks++; 1907 MEvent.clicks++;
1892 1908
1893 if (MEvent.clicks > 1) 1909 if (MEvent.clicks > 1)
1894 { 1910 {
1895 /* only report double clicks */ 1911 /* only report double clicks */
… …
1909 mouse_report (ev); 1925 mouse_report (ev);
1910 } 1926 }
1911#else 1927#else
1912 MEvent.button = ev.button; 1928 MEvent.button = ev.button;
1913 mouse_report (ev); 1929 mouse_report (ev);
1914#endif /* MOUSE_REPORT_DOUBLECLICK */ 1930#endif /* MOUSE_REPORT_DOUBLECLICK */
1915 1931
1916 } 1932 }
1917 else 1933 else
1918 { 1934 {
1919 if (ev.button != MEvent.button) 1935 if (ev.button != MEvent.button)
… …
1967 } 1983 }
1968 1984
1969 /* 1985 /*
1970 * Scrollbar window processing of button press 1986 * Scrollbar window processing of button press
1971 */ 1987 */
1972 if (isScrollbarWindow (ev.window)) 1988 if (scrollBar.state && ev.window == scrollBar.win)
1973 { 1989 {
1974 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;
1975 /* 1998 /*
1976 * Rxvt-style scrollbar: 1999 * Rxvt-style scrollbar:
1977 * move up if mouse is above slider 2000 * move up if mouse is above slider
1978 * move dn if mouse is below slider 2001 * move dn if mouse is below slider
1979 * 2002 *
… …
1988 /* 2011 /*
1989 * Mouse report disabled scrollbar: 2012 * Mouse report disabled scrollbar:
1990 * arrow buttons - send up/down 2013 * arrow buttons - send up/down
1991 * click on scrollbar - send pageup/down 2014 * click on scrollbar - send pageup/down
1992 */ 2015 */
1993 if ((scrollBar.style == R_SB_NEXT 2016 if (direction == UP)
1994 && scrollbarnext_upButton (ev.y))
1995 || (scrollBar.style == R_SB_RXVT
1996 && scrollbarrxvt_upButton (ev.y)))
1997 tt_printf ("\033[A"); 2017 tt_printf ("\033[A");
1998 else if ((scrollBar.style == R_SB_NEXT 2018 else if (direction == DN)
1999 && scrollbarnext_dnButton (ev.y))
2000 || (scrollBar.style == R_SB_RXVT
2001 && scrollbarrxvt_dnButton (ev.y)))
2002 tt_printf ("\033[B"); 2019 tt_printf ("\033[B");
2003 else 2020 else
2004 switch (ev.button) 2021 switch (ev.button)
2005 { 2022 {
2006 case Button2: 2023 case Button2:
… …
2013 tt_printf ("\033[5~"); 2030 tt_printf ("\033[5~");
2014 break; 2031 break;
2015 } 2032 }
2016 } 2033 }
2017 else 2034 else
2018#endif /* NO_SCROLLBAR_REPORT */ 2035#endif /* NO_SCROLLBAR_REPORT */
2019
2020 {
2021 char upordown = 0;
2022
2023 if (scrollBar.style == R_SB_NEXT)
2024 { 2036 {
2025 if (scrollbarnext_upButton (ev.y)) 2037 if (direction != NO_DIR)
2026 upordown = -1; /* up */
2027 else if (scrollbarnext_dnButton (ev.y))
2028 upordown = 1; /* down */
2029 }
2030 else if (scrollBar.style == R_SB_RXVT)
2031 {
2032 if (scrollbarrxvt_upButton (ev.y))
2033 upordown = -1; /* up */
2034 else if (scrollbarrxvt_dnButton (ev.y))
2035 upordown = 1; /* down */
2036 }
2037 if (upordown)
2038 { 2038 {
2039#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2039#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2040 if (!cont_scroll_ev.is_active ())
2040 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2041 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2041#endif 2042#endif
2042 if (scr_page (upordown < 0 ? UP : DN, 1)) 2043 if (scr_page (direction, 1))
2043 { 2044 {
2044 if (upordown < 0) 2045 if (direction == UP)
2045 scrollBar.setUp (); 2046 scrollBar.state = STATE_UP;
2046 else 2047 else
2047 scrollBar.setDn (); 2048 scrollBar.state = STATE_DOWN;
2048 } 2049 }
2049 } 2050 }
2050 else 2051 else
2051 switch (ev.button) 2052 switch (ev.button)
2052 { 2053 {
2053 case Button2: 2054 case Button2:
2054 switch (scrollbar_align) 2055 switch (scrollBar.align)
2055 { 2056 {
2056 case R_SB_ALIGN_TOP: 2057 case R_SB_ALIGN_TOP:
2057 csrO = 0; 2058 csrO = 0;
2058 break; 2059 break;
2059 case R_SB_ALIGN_CENTRE: 2060 case R_SB_ALIGN_CENTRE:
… …
2065 } 2066 }
2066 2067
2067 if (scrollBar.style == R_SB_XTERM 2068 if (scrollBar.style == R_SB_XTERM
2068 || scrollbar_above_slider (ev.y) 2069 || scrollbar_above_slider (ev.y)
2069 || scrollbar_below_slider (ev.y)) 2070 || scrollbar_below_slider (ev.y))
2070 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2071 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2071 2072
2072 scrollBar.setMotion (); 2073 scrollBar.state = STATE_MOTION;
2073 break; 2074 break;
2074 2075
2075 case Button1: 2076 case Button1:
2076 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2077 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2077 csrO = ev.y - scrollBar.top; 2078 csrO = ev.y - scrollBar.top;
2078 /* FALLTHROUGH */ 2079 /* FALLTHROUGH */
2079 2080
2080 case Button3: 2081 case Button3:
2081 if (scrollBar.style != R_SB_XTERM) 2082 if (scrollBar.style != R_SB_XTERM)
… …
2091 scr_page (DN, nrow - 1); 2092 scr_page (DN, nrow - 1);
2092# else 2093# else
2093 scr_page (DN, nrow / 4); 2094 scr_page (DN, nrow / 4);
2094# endif 2095# endif
2095 else 2096 else
2096 scrollBar.setMotion (); 2097 scrollBar.state = STATE_MOTION;
2097 } 2098 }
2098 else 2099 else
2099 { 2100 {
2100 scr_page ((ev.button == Button1 ? DN : UP), 2101 scr_page ((ev.button == Button1 ? DN : UP),
2101 (nrow 2102 (nrow
2102 * scrollbar_position (ev.y) 2103 * scrollbar_position (ev.y)
2103 / scrollbar_size ())); 2104 / scrollBar.size ()));
2104 } 2105 }
2105 2106
2106 break; 2107 break;
2107 } 2108 }
2108 } 2109 }
… …
2118 2119
2119 csrO = 0; /* reset csr Offset */ 2120 csrO = 0; /* reset csr Offset */
2120 if (!bypass_keystate) 2121 if (!bypass_keystate)
2121 reportmode = !! (priv_modes & PrivMode_mouse_report); 2122 reportmode = !! (priv_modes & PrivMode_mouse_report);
2122 2123
2123 if (scrollbar_isUpDn ()) 2124 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2124 { 2125 {
2125 scrollBar.setIdle (); 2126 scrollBar.state = STATE_IDLE;
2126 scrollbar_show (0); 2127 scrollBar.show (0);
2127 } 2128 }
2128 2129
2129#ifdef SELECTION_SCROLLING 2130#ifdef SELECTION_SCROLLING
2130 if (sel_scroll_ev.active)
2131 sel_scroll_ev.stop(); 2131 sel_scroll_ev.stop();
2132#endif 2132#endif
2133 2133
2134 if (ev.window == vt) 2134 if (ev.window == vt)
2135 { 2135 {
2136 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)))
… …
2160 mouse_report (ev); 2160 mouse_report (ev);
2161 } 2161 }
2162#else /* MOUSE_REPORT_DOUBLECLICK */ 2162#else /* MOUSE_REPORT_DOUBLECLICK */
2163 MEvent.button = AnyButton; 2163 MEvent.button = AnyButton;
2164 mouse_report (ev); 2164 mouse_report (ev);
2165#endif /* MOUSE_REPORT_DOUBLECLICK */ 2165#endif /* MOUSE_REPORT_DOUBLECLICK */
2166 return; 2166 return;
2167 } 2167 }
2168 2168
2169 /* 2169 /*
2170 * dumb hack to compensate for the failure of click-and-drag 2170 * dumb hack to compensate for the failure of click-and-drag
… …
2182 selection_make (ev.time); 2182 selection_make (ev.time);
2183 break; 2183 break;
2184 2184
2185 case Button2: 2185 case Button2:
2186 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?
2187 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2187 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2188 break; 2188 break;
2189 2189
2190#ifdef MOUSE_WHEEL 2190#ifdef MOUSE_WHEEL
2191 case Button4: 2191 case Button4:
2192 case Button5: 2192 case Button5:
… …
2208 { 2208 {
2209 mouse_slip_wheel_speed += v ? -1 : 1; 2209 mouse_slip_wheel_speed += v ? -1 : 1;
2210 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2210 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2211 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2211 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2212 2212
2213 if (slip_wheel_ev.at < NOW) 2213 if (!slip_wheel_ev.is_active ())
2214 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2214 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2215
2216 slip_wheel_ev.start ();
2217 } 2215 }
2218 else 2216 else
2217# endif
2219 { 2218 {
2220# endif
2221 scr_page (v, i); 2219 scr_page (v, i);
2222 scrollbar_show (1); 2220 scrollBar.show (1);
2223# ifdef MOUSE_SLIP_WHEELING
2224 } 2221 }
2225# endif
2226 } 2222 }
2227 break; 2223 break;
2228#endif 2224#endif
2229 } 2225 }
2230 } 2226 }
2231} 2227}
2232 2228
2233/*}}} */ 2229/*}}} */
2234 2230
2235bool 2231void
2236rxvt_term::cmd_parse () 2232rxvt_term::cmd_parse ()
2237{ 2233{
2238 bool flag = false;
2239 wchar_t ch = NOCHAR; 2234 wchar_t ch = NOCHAR;
2240 char *seq_begin; // remember start of esc-sequence here 2235 char *seq_begin; // remember start of esc-sequence here
2241 2236
2242 for (;;) 2237 for (;;)
2243 { 2238 {
2244 if (ch == NOCHAR) 2239 if (expect_false (ch == NOCHAR))
2245 { 2240 {
2246 seq_begin = cmdbuf_ptr; 2241 seq_begin = cmdbuf_ptr;
2247 ch = next_char (); 2242 ch = next_char ();
2248 2243
2249 if (ch == NOCHAR) 2244 if (ch == NOCHAR)
2250 break; 2245 break;
2251 } 2246 }
2252 2247
2253 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))
2254 { 2249 {
2255 if (!seen_input) 2250 if (expect_false (!seen_input))
2256 { 2251 {
2257 seen_input = 1; 2252 seen_input = 1;
2258 // many badly-written programs (e.g. jed) contain a race condition: 2253 // many badly-written programs (e.g. jed) contain a race condition:
2259 // they first read the screensize and then install a SIGWINCH handler. 2254 // they first read the screensize and then install a SIGWINCH handler.
2260 // some window managers resize the window early, and these programs 2255 // some window managers resize the window early, and these programs
… …
2273 wchar_t *str = buf; 2268 wchar_t *str = buf;
2274 wchar_t *eol = str + min (ncol, UBUFSIZ); 2269 wchar_t *eol = str + min (ncol, UBUFSIZ);
2275 2270
2276 for (;;) 2271 for (;;)
2277 { 2272 {
2278 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)))
2279 break; 2274 break;
2280 2275
2281 *str++ = ch; 2276 *str++ = ch;
2282 2277
2283 if (ch == C0_LF || str >= eol) 2278 if (expect_false (ch == C0_LF || str >= eol))
2284 { 2279 {
2285 if (ch == C0_LF) 2280 if (ch == C0_LF)
2286 nlines++; 2281 nlines++;
2287 2282
2288 refresh_count++; 2283 refresh_count++;
2289 2284
2290 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2285 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2291 { 2286 {
2292 refresh_count = 0; 2287 refresh_count = 0;
2293 2288
2294 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2289 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2295 { 2290 {
2296 refreshnow = true; 2291 refreshnow = true;
2297 ch = NOCHAR; 2292 ch = NOCHAR;
2298 break; 2293 break;
2299 } 2294 }
… …
2337 * 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.
2338 * if skipScroll is enabled. 2333 * if skipScroll is enabled.
2339 */ 2334 */
2340 if (refreshnow) 2335 if (refreshnow)
2341 { 2336 {
2342 flag = true;
2343 scr_refresh (); 2337 scr_refresh ();
2344 want_refresh = 1; 2338 want_refresh = 1;
2345 } 2339 }
2346
2347 } 2340 }
2348 else 2341 else
2349 { 2342 {
2350 try 2343 try
2351 { 2344 {
… …
2359 } 2352 }
2360 2353
2361 ch = NOCHAR; 2354 ch = NOCHAR;
2362 } 2355 }
2363 } 2356 }
2364
2365 return flag;
2366} 2357}
2367 2358
2368// read the next character 2359// read the next character
2369wchar_t 2360wchar_t
2370rxvt_term::next_char () NOTHROW 2361rxvt_term::next_char () NOTHROW
2371{ 2362{
2372 while (cmdbuf_ptr < cmdbuf_endp) 2363 while (cmdbuf_ptr < cmdbuf_endp)
2373 { 2364 {
2374 // assume 7-bit to be ascii ALWAYS 2365 // assume 7-bit to be ascii ALWAYS
2375 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2366 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2376 return *cmdbuf_ptr++; 2367 return *cmdbuf_ptr++;
2377 2368
2378 wchar_t wc; 2369 wchar_t wc;
2379 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);
2380 2371
… …
2384 cmdbuf_ptr = cmdbuf_endp; 2375 cmdbuf_ptr = cmdbuf_endp;
2385 break; 2376 break;
2386 } 2377 }
2387 2378
2388 if (len == (size_t)-1) 2379 if (len == (size_t)-1)
2380 {
2381 mbstate.reset (); // reset now undefined conversion state
2389 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 }
2390 2384
2391 // assume wchar == unicode 2385 // assume wchar == unicode
2392 cmdbuf_ptr += len; 2386 cmdbuf_ptr += len;
2393 return wc & UNICODE_MASK; 2387 return wc & UNICODE_MASK;
2394 } 2388 }
… …
2438/*----------------------------------------------------------------------*/ 2432/*----------------------------------------------------------------------*/
2439#ifdef PRINTPIPE 2433#ifdef PRINTPIPE
2440FILE * 2434FILE *
2441rxvt_term::popen_printer () 2435rxvt_term::popen_printer ()
2442{ 2436{
2443 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2437 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2444 2438
2445 if (stream == NULL) 2439 if (stream == NULL)
2446 rxvt_warn ("can't open printer pipe, not printing.\n"); 2440 rxvt_warn ("can't open printer pipe, not printing.\n");
2447 2441
2448 return stream; 2442 return stream;
… …
2459 * simulate attached vt100 printer 2453 * simulate attached vt100 printer
2460 */ 2454 */
2461void 2455void
2462rxvt_term::process_print_pipe () 2456rxvt_term::process_print_pipe ()
2463{ 2457{
2464 int done; 2458 FILE *fd = popen_printer ();
2465 FILE *fd;
2466 2459
2467 if ((fd = popen_printer ()) == NULL) 2460 if (!fd)
2468 return; 2461 return;
2469 2462
2470 /* 2463 /*
2471 * 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
2472 * is received. 2465 * is received.
2473 */ 2466 */
2474 for (done = 0; !done;) 2467 for (int done = 0; !done; )
2475 { 2468 {
2476 unsigned char buf[8]; 2469 unsigned char buf[8];
2477 unicode_t ch; 2470 unicode_t ch;
2478 unsigned int i, len; 2471 unsigned int i, len;
2479 2472
… …
2510 } 2503 }
2511 } 2504 }
2512 2505
2513 pclose_printer (fd); 2506 pclose_printer (fd);
2514} 2507}
2515#endif /* PRINTPIPE */ 2508#endif /* PRINTPIPE */
2516/*}}} */ 2509/*}}} */
2517 2510
2518/* *INDENT-OFF* */ 2511/* *INDENT-OFF* */
2519enum { 2512enum {
2520 C1_40 = 0x40, 2513 C1_40 = 0x40,
… …
2624 break; 2617 break;
2625 case 'Z': /* identify the terminal type */ 2618 case 'Z': /* identify the terminal type */
2626 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2619 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2627 break; 2620 break;
2628 case '<': /* turn off VT52 mode */ 2621 case '<': /* turn off VT52 mode */
2629 PrivMode (0, PrivMode_vt52); 2622 set_privmode (PrivMode_vt52, 0);
2630 break; 2623 break;
2631 case 'F': /* use special graphics character set */ 2624 case 'F': /* use special graphics character set */
2632 case 'G': /* use regular character set */ 2625 case 'G': /* use regular character set */
2633 /* unimplemented */ 2626 /* unimplemented */
2634 break; 2627 break;
… …
2688 scr_forwardindex (); 2681 scr_forwardindex ();
2689 break; 2682 break;
2690#endif 2683#endif
2691 case '=': 2684 case '=':
2692 case '>': 2685 case '>':
2693 PrivMode ((ch == '='), PrivMode_aplKP); 2686 set_privmode (PrivMode_aplKP, ch == '=');
2694 break; 2687 break;
2695 2688
2696 case C1_40: 2689 case C1_40:
2697 cmd_getc (); 2690 cmd_getc ();
2698 break; 2691 break;
… …
2737 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2730 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2738 case C1_SCI: /* ESC Z */ 2731 case C1_SCI: /* ESC Z */
2739 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2732 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2740 break; /* steal obsolete ESC [ c */ 2733 break; /* steal obsolete ESC [ c */
2741 2734
2742 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2735 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2743 case C1_CSI: /* ESC [ */ 2736 case C1_CSI: /* ESC [ */
2744 process_csi_seq (); 2737 process_csi_seq ();
2745 break; 2738 break;
2746 2739
2747 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2740 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2748 case C1_OSC: /* ESC ] */ 2741 case C1_OSC: /* ESC ] */
2749 process_osc_seq (); 2742 process_osc_seq ();
2750 break; 2743 break;
2751 2744
2752 /* 8.3.106: RESET TO INITIAL STATE */ 2745 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2753 case 'c': 2746 case 'c':
2754 mbstate.reset (); 2747 mbstate.reset ();
2755 scr_poweron (); 2748 scr_poweron ();
2756 scrollbar_show (1); 2749 scrollBar.show (1);
2757 break; 2750 break;
2758 2751
2759 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2752 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2760 case 'n': 2753 case 'n':
2761 scr_charset_choose (2); 2754 scr_charset_choose (2);
… …
2806rxvt_term::process_csi_seq () 2799rxvt_term::process_csi_seq ()
2807{ 2800{
2808 unicode_t ch, priv, i; 2801 unicode_t ch, priv, i;
2809 unsigned int nargs, p; 2802 unsigned int nargs, p;
2810 int n, ndef; 2803 int n, ndef;
2811 int arg[ESC_ARGS]; 2804 int arg[ESC_ARGS] = { };
2812 2805
2813 memset (arg, 0, sizeof (arg));
2814 nargs = 0; 2806 nargs = 0;
2815 2807
2816 priv = 0; 2808 priv = 0;
2817 ch = cmd_getc (); 2809 ch = cmd_getc ();
2818 if (ch >= '<' && ch <= '?') 2810 if ((ch >= '<' && ch <= '?') || ch == '!')
2811 {
2819 { /* '<' '=' '>' '?' */ 2812 /* '<' '=' '>' '?' '!' */
2820 priv = ch; 2813 priv = ch;
2821 ch = cmd_getc (); 2814 ch = cmd_getc ();
2822 } 2815 }
2823 2816
2824 /* read any numerical arguments */ 2817 /* read any numerical arguments */
… …
2867 { 2860 {
2868 // 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,
2869 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2862 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2870 // 2863 //
2871 // 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
2872 // 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
2873 // that we do not support xterm mouse reporting (should be 95 when we do). 2866 // versions.
2874 // 2867 //
2875 tt_printf ("\033[>%d;94;0c", 'U'); 2868 tt_printf ("\033[>%d;95;0c", 'U');
2876 } 2869 }
2877 break; 2870 break;
2871
2878 case '?': 2872 case '?':
2879 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2873 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2880 process_terminal_mode (ch, priv, nargs, arg); 2874 process_terminal_mode (ch, priv, nargs, arg);
2881 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, 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);
2882 } 2888 }
2889 break;
2890 }
2891
2883 return; 2892 return;
2884 } 2893 }
2885 2894
2886 switch (ch) 2895 switch (ch)
2887 { 2896 {
… …
3254 * 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)'
3255 */ 3264 */
3256void 3265void
3257rxvt_term::process_dcs_seq () 3266rxvt_term::process_dcs_seq ()
3258{ 3267{
3259 char *s;
3260 unicode_t eh;
3261
3262 /* 3268 /*
3263 * Not handled yet 3269 * Not handled yet
3264 */ 3270 */
3271
3272 unicode_t eh;
3265 s = get_to_st (eh); 3273 char *s = get_to_st (eh);
3266 if (s) 3274 if (s)
3267 free (s); 3275 free (s);
3268 3276
3269 return; 3277 return;
3270} 3278}
… …
3274 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3282 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3275 */ 3283 */
3276void 3284void
3277rxvt_term::process_osc_seq () 3285rxvt_term::process_osc_seq ()
3278{ 3286{
3279 unicode_t ch, eh;
3280 int arg; 3287 int arg;
3281 3288
3282 ch = cmd_getc (); 3289 unicode_t ch = cmd_getc ();
3283 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3290 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3284 arg = arg * 10 + (ch - '0'); 3291 arg = arg * 10 + (ch - '0');
3285 3292
3286 if (ch == ';') 3293 if (ch == ';')
3287 { 3294 {
3295 unicode_t eh;
3288 char *s = get_to_st (eh); 3296 char *s = get_to_st (eh);
3289 3297
3290 if (s) 3298 if (s)
3291 { 3299 {
3292 process_xterm_seq (arg, s, eh); 3300 process_xterm_seq (arg, s, eh);
… …
3316 3324
3317/* 3325/*
3318 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3326 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3319 */ 3327 */
3320void 3328void
3321rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3329rxvt_term::process_xterm_seq (int op, char *str, char resp)
3322{ 3330{
3323 int color; 3331 int color;
3324 char *buf, *name; 3332 char *buf, *name;
3325 bool query = str[0] == '?' && !str[1]; 3333 bool query = str[0] == '?' && !str[1];
3326 int saveop = op; 3334 int saveop = op;
… …
3367 3375
3368 XFree (value); 3376 XFree (value);
3369 } 3377 }
3370 else 3378 else
3371 { 3379 {
3372 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3380 char *eq = strchr (str, '=');
3373 3381
3374 if (eq) 3382 if (eq)
3375 { 3383 {
3376 *eq = 0; 3384 *eq = 0;
3377 set_utf8_property (display->atom (str), eq + 1); 3385 set_utf8_property (display->atom (str), eq + 1);
… …
3398 *buf++ = '\0'; 3406 *buf++ = '\0';
3399 3407
3400 process_color_seq (op, color, name, resp); 3408 process_color_seq (op, color, name, resp);
3401 } 3409 }
3402 break; 3410 break;
3411 case Rxvt_restoreFG:
3403 case XTerm_Color00: 3412 case XTerm_Color00:
3404 process_color_seq (op, Color_fg, str, resp); 3413 process_color_seq (op, Color_fg, str, resp);
3405 break; 3414 break;
3415 case Rxvt_restoreBG:
3406 case XTerm_Color01: 3416 case XTerm_Color01:
3407 process_color_seq (op, Color_bg, str, resp); 3417 process_color_seq (op, Color_bg, str, resp);
3408 break; 3418 break;
3409#ifndef NO_CURSORCOLOR 3419#ifndef NO_CURSORCOLOR
3410 case XTerm_Color_cursor: 3420 case XTerm_Color_cursor:
… …
3415 process_color_seq (op, Color_pointer_fg, str, resp); 3425 process_color_seq (op, Color_pointer_fg, str, resp);
3416 break; 3426 break;
3417 case XTerm_Color_pointer_bg: 3427 case XTerm_Color_pointer_bg:
3418 process_color_seq (op, Color_pointer_bg, str, resp); 3428 process_color_seq (op, Color_pointer_bg, str, resp);
3419 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
3420#ifndef NO_BOLD_UNDERLINE_REVERSE 3438#ifndef NO_BOLD_UNDERLINE_REVERSE
3421 case XTerm_Color_RV:
3422 process_color_seq (op, Color_RV, str, resp);
3423 break;
3424 case Rxvt_Color_BD:
3425 case URxvt_Color_BD: 3439 case URxvt_Color_BD:
3426 process_color_seq (op, Color_BD, str, resp); 3440 process_color_seq (op, Color_BD, str, resp);
3427 break; 3441 break;
3428 case Rxvt_Color_UL:
3429 case URxvt_Color_UL: 3442 case URxvt_Color_UL:
3430 process_color_seq (op, Color_UL, str, resp); 3443 process_color_seq (op, Color_UL, str, resp);
3431 break; 3444 break;
3432 case URxvt_Color_IT: 3445 case URxvt_Color_IT:
3433 process_color_seq (op, Color_IT, str, resp); 3446 process_color_seq (op, Color_IT, str, resp);
3434 break; 3447 break;
3435#endif 3448#endif
3449 case URxvt_Color_border:
3450 process_color_seq (op, Color_border, str, resp);
3451 break;
3436#if ENABLE_TRANSPARENCY && TINTING 3452#if ENABLE_TRANSPARENCY
3437 case URxvt_Color_tint: 3453 case URxvt_Color_tint:
3438 process_color_seq (op, Color_tint, str, resp); 3454 process_color_seq (op, Color_tint, str, resp);
3455 {
3456 bool changed = false;
3439 3457
3440 check_our_parents (); 3458 if (ISSET_PIXCOLOR (Color_tint))
3459 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3460 else
3461 changed = bgPixmap.unset_tint ();
3441 3462
3442 if (am_transparent) 3463 if (changed)
3443 want_full_refresh = want_refresh = 1; 3464 update_background ();
3465 }
3444 3466
3445 break; 3467 break;
3446#endif 3468#endif
3447 3469
3448#if XPM_BACKGROUND 3470#if BG_IMAGE_FROM_FILE
3449 case Rxvt_Pixmap: 3471 case Rxvt_Pixmap:
3450 { 3472 if (!strcmp (str, "?"))
3451 if (*str != ';')
3452 { 3473 {
3453 scale_pixmap (""); /* reset to default scaling */ 3474 char str[256];
3454 set_bgPixmap (str); /* change pixmap */ 3475
3455 scr_touch (true); 3476 sprintf (str, "[%dx%d+%d+%d]",
3477 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3478 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3479 process_xterm_seq (XTerm_title, str, CHAR_ST);
3456 } 3480 }
3457 3481 else
3482 {
3458 int changed = 0; 3483 int changed = 0;
3459 3484
3460 while ((str = strchr (str, ';')) != NULL) 3485 if (*str != ';')
3461 { 3486 {
3487 if (bgPixmap.set_file (str)) /* change pixmap */
3488 {
3489 changed++;
3490 str = strchr (str, ';');
3491 if (str == NULL)
3492 bgPixmap.set_defaultGeometry ();
3493 else
3494 bgPixmap.set_geometry (str+1);
3495 }
3496 }
3497 else
3498 {
3462 str++; 3499 str++;
3463 changed += scale_pixmap (str); 3500 if (bgPixmap.set_geometry (str, true))
3501 changed++;
3464 } 3502 }
3465 3503
3466 if (changed) 3504 if (changed)
3467 { 3505 {
3468 resize_pixmap (); 3506 if (bgPixmap.window_position_sensitive ())
3469 scr_touch (true); 3507 {
3508 int x, y;
3509 get_window_origin (x, y);
3510 bgPixmap.set_position (x, y);
3511 }
3512 update_background ();
3470 } 3513 }
3471#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3472 if (option (Opt_transparent))
3473 check_our_parents ();
3474#endif
3475 } 3514 }
3476 break; 3515 break;
3477#endif 3516#endif
3478
3479 case Rxvt_restoreFG:
3480 set_window_color (Color_fg, str);
3481 break;
3482 case Rxvt_restoreBG:
3483 set_window_color (Color_bg, str);
3484 break;
3485 3517
3486 case XTerm_logfile: 3518 case XTerm_logfile:
3487 // TODO, when secure mode? 3519 // TODO, when secure mode?
3488 break; 3520 break;
3489 3521
… …
3556 break; 3588 break;
3557#endif 3589#endif
3558 3590
3559#if ENABLE_PERL 3591#if ENABLE_PERL
3560 case URxvt_perl: 3592 case URxvt_perl:
3561 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));
3562 ; // no responses yet
3563 break; 3594 break;
3564#endif 3595#endif
3565 } 3596 }
3566} 3597}
3567/*----------------------------------------------------------------------*/ 3598/*----------------------------------------------------------------------*/
… …
3590 { 3621 {
3591 if (mode == 'r') 3622 if (mode == 'r')
3592 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3623 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3593 else 3624 else
3594 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3625 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3595 PrivMode (state, bit); 3626
3627 set_privmode (bit, state);
3596 } 3628 }
3597 3629
3598 return state; 3630 return state;
3599} 3631}
3600 3632
… …
3604{ 3636{
3605 unsigned int i, j; 3637 unsigned int i, j;
3606 int state; 3638 int state;
3607 3639
3608 static const struct 3640 static const struct
3609 { 3641 {
3610 const int argval; 3642 const int argval;
3611 const unsigned long bit; 3643 const unsigned long bit;
3612 }
3613
3614 argtopriv[] = { 3644 } argtopriv[] = {
3615 { 1, PrivMode_aplCUR }, 3645 { 1, PrivMode_aplCUR }, // DECCKM
3616 { 2, PrivMode_vt52 }, 3646 { 2, PrivMode_vt52 },
3617 { 3, PrivMode_132 }, 3647 { 3, PrivMode_132 }, // DECCOLM
3618 { 4, PrivMode_smoothScroll }, 3648 { 4, PrivMode_smoothScroll }, // DECSCLM
3619 { 5, PrivMode_rVideo }, 3649 { 5, PrivMode_rVideo }, // DECSCNM
3620 { 6, PrivMode_relOrigin }, 3650 { 6, PrivMode_relOrigin }, // DECOM
3621 { 7, PrivMode_Autowrap }, 3651 { 7, PrivMode_Autowrap }, // DECAWM
3622 // 8, bi-directional support mode 3652 // 8, auto-repeat keys // DECARM
3623 { 9, PrivMode_MouseX10 }, 3653 { 9, PrivMode_MouseX10 },
3624 // 18, 19 printing-related 3654 // 18 end FF to printer after print screen
3655 // 19 Print screen prints full screen/scroll region
3625 { 25, PrivMode_VisibleCursor }, 3656 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3626#ifdef scrollBar_esc 3657#ifdef scrollBar_esc
3627 { scrollBar_esc, PrivMode_scrollBar }, 3658 { scrollBar_esc, PrivMode_scrollBar },
3628#endif 3659#endif
3629 { 35, PrivMode_ShiftKeys }, // rxvt extension 3660 { 35, PrivMode_ShiftKeys }, // rxvt extension
3661 // 38, tektronix mode // DECTEK
3630 { 40, PrivMode_132OK }, 3662 { 40, PrivMode_132OK },
3631 // 41 xterm more fixes NYI 3663 // 41 xterm more fixes NYI
3632 // 45 margin bell NYI 3664 // 45 margin bell NYI
3633 // 46 start logging 3665 // 46 start logging
3634 { 47, PrivMode_Screen }, 3666 { 47, PrivMode_Screen },
3635 { 66, PrivMode_aplKP }, 3667 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3636#ifndef NO_BACKSPACE_KEY 3668#ifndef NO_BACKSPACE_KEY
3637 { 67, PrivMode_BackSpace }, 3669 { 67, PrivMode_BackSpace }, // DECBKM
3638#endif 3670#endif
3639 { 1000, PrivMode_MouseX11 }, 3671 { 1000, PrivMode_MouseX11 },
3640 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3672 { 1002, PrivMode_MouseBtnEvent },
3641 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3673 { 1003, PrivMode_MouseAnyEvent },
3642 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3674#if ENABLE_FRILLS
3675 { 1005, PrivMode_ExtModeMouse },
3676#endif
3643 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3677 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3644 { 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
3645 // 1035 enable modifiers for alt, numlock NYI 3682 // 1035 enable modifiers for alt, numlock NYI
3646 // 1036 send ESC for meta keys NYI 3683 // 1036 send ESC for meta keys NYI
3647 // 1037 send DEL for keypad delete NYI 3684 // 1037 send DEL for keypad delete NYI
3648 { 1047, PrivMode_Screen }, 3685 { 1047, PrivMode_Screen },
3649 // 1048 save and restore cursor 3686 // 1048 save and restore cursor, implemented in code
3650 { 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 */
3651 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3688 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3689 { 2004, PrivMode_BracketPaste },
3652 }; 3690 };
3653 3691
3654 if (nargs == 0) 3692 if (nargs == 0)
3655 return; 3693 return;
3656 3694
… …
3681 3719
3682 scr_touch (true); 3720 scr_touch (true);
3683 break; 3721 break;
3684#endif 3722#endif
3685 case 1048: /* alternative cursor save */ 3723 case 1048: /* alternative cursor save */
3686 case 1049:
3687 if (option (Opt_secondaryScreen)) 3724 if (option (Opt_secondaryScreen))
3688 if (mode == 0) 3725 if (mode == 0)
3689 scr_cursor (RESTORE); 3726 scr_cursor (RESTORE);
3690 else if (mode == 1) 3727 else if (mode == 1)
3691 scr_cursor (SAVE); 3728 scr_cursor (SAVE);
… …
3700 case 2: /* VT52 mode */ 3737 case 2: /* VT52 mode */
3701 /* oddball mode. should be set regardless of set/reset 3738 /* oddball mode. should be set regardless of set/reset
3702 * parameter. Return from VT52 mode with an ESC < from 3739 * parameter. Return from VT52 mode with an ESC < from
3703 * within VT52 mode 3740 * within VT52 mode
3704 */ 3741 */
3705 PrivMode (1, PrivMode_vt52); 3742 set_privmode (PrivMode_vt52, 1);
3706 break; 3743 break;
3707 case 3: /* 80/132 */ 3744 case 3: /* 80/132 */
3708 if (priv_modes & PrivMode_132OK) 3745 if (priv_modes & PrivMode_132OK)
3709 set_widthheight (((state ? 132 : 80) * fwidth), height); 3746 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3710 break; 3747 break;
3711 case 4: /* smooth scrolling */ 3748 case 4: /* smooth scrolling */
3712 set_option (Opt_jumpScroll, !state); 3749 set_option (Opt_jumpScroll, !state);
3713 break; 3750 break;
3714 case 5: /* reverse video */ 3751 case 5: /* reverse video */
… …
3721 scr_autowrap (state); 3758 scr_autowrap (state);
3722 break; 3759 break;
3723 /* 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 */
3724 case 9: /* X10 mouse reporting */ 3761 case 9: /* X10 mouse reporting */
3725 if (state) /* orthogonal */ 3762 if (state) /* orthogonal */
3726 priv_modes &= ~PrivMode_MouseX11; 3763 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3727 break; 3764 break;
3728#ifdef scrollBar_esc 3765#ifdef scrollBar_esc
3729 case scrollBar_esc: 3766 case scrollBar_esc:
3730 if (scrollbar_mapping (state)) 3767 if (scrollBar.map (state))
3731 { 3768 {
3732 resize_all_windows (0, 0, 0); 3769 resize_all_windows (0, 0, 0);
3733 scr_touch (true); 3770 scr_touch (true);
3734 } 3771 }
3735 break; 3772 break;
… …
3744 break; 3781 break;
3745 /* case 66: - application key pad */ 3782 /* case 66: - application key pad */
3746 /* case 67: - backspace key */ 3783 /* case 67: - backspace key */
3747 case 1000: /* X11 mouse reporting */ 3784 case 1000: /* X11 mouse reporting */
3748 if (state) /* orthogonal */ 3785 if (state) /* orthogonal */
3749 priv_modes &= ~PrivMode_MouseX10; 3786 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3750 break; 3787 break;
3751#if 0
3752 case 1001: 3788 case 1002:
3753 break; /* X11 mouse highlighting */ 3789 case 1003:
3754#endif 3790 if (state)
3791 {
3792 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3793 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3794 vt_emask_mouse = PointerMotionMask;
3795 }
3796 else
3797 vt_emask_mouse = NoEventMask;
3798
3799 vt_select_input ();
3800 break;
3755 case 1010: /* scroll to bottom on TTY output inhibit */ 3801 case 1010: /* scroll to bottom on TTY output inhibit */
3756 set_option (Opt_scrollTtyOutput, !state); 3802 set_option (Opt_scrollTtyOutput, !state);
3757 break; 3803 break;
3758 case 1011: /* scroll to bottom on key press */ 3804 case 1011: /* scroll to bottom on key press */
3759 set_option (Opt_scrollTtyKeypress, state); 3805 set_option (Opt_scrollTtyKeypress, state);
3760 break; 3806 break;
3761 case 1047: /* secondary screen w/ clearing last */ 3807 case 1047: /* secondary screen w/ clearing last */
3762 if (option (Opt_secondaryScreen)) 3808 if (option (Opt_secondaryScreen))
3763 if (current_screen != PRIMARY) 3809 if (!state)
3764 scr_erase_screen (2); 3810 scr_erase_screen (2);
3811
3765 scr_change_screen (state); 3812 scr_change_screen (state);
3766 break; 3813 break;
3767 case 1049: /* secondary screen w/ clearing first */ 3814 case 1049: /* secondary screen w/ clearing first */
3815 if (option (Opt_secondaryScreen))
3816 if (state)
3817 scr_cursor (SAVE);
3818
3768 scr_change_screen (state); 3819 scr_change_screen (state);
3820
3769 if (option (Opt_secondaryScreen)) 3821 if (option (Opt_secondaryScreen))
3770 if (current_screen != PRIMARY) 3822 if (state)
3771 scr_erase_screen (2); 3823 scr_erase_screen (2);
3824 else
3825 scr_cursor (RESTORE);
3772 break; 3826 break;
3773 default: 3827 default:
3774 break; 3828 break;
3775 } 3829 }
3776 } 3830 }
… …
3936rxvt_term::process_graphics () 3990rxvt_term::process_graphics ()
3937{ 3991{
3938 unicode_t ch, cmd = cmd_getc (); 3992 unicode_t ch, cmd = cmd_getc ();
3939 3993
3940 if (cmd == 'Q') 3994 if (cmd == 'Q')
3995 {
3941 { /* query graphics */ 3996 /* query graphics */
3942 tt_printf ("\033G0\012"); /* no graphics */ 3997 tt_printf ("\033G0\012"); /* no graphics */
3943 return; 3998 return;
3944 } 3999 }
3945 /* swallow other graphics sequences until terminating ':' */ 4000 /* swallow other graphics sequences until terminating ':' */
3946 do 4001 do
… …
3996 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4051 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3997 4052
3998 memcpy (v_buffer + v_buflen, data, len); 4053 memcpy (v_buffer + v_buflen, data, len);
3999 v_buflen += len; 4054 v_buflen += len;
4000 4055
4001 pty_ev.set (EVENT_READ | EVENT_WRITE); 4056 pty_ev.set (ev::READ | ev::WRITE);
4002} 4057}
4003 4058
4004void rxvt_term::pty_write () 4059void rxvt_term::pty_write ()
4005{ 4060{
4006 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4061 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4011 4066
4012 if (v_buflen == 0) 4067 if (v_buflen == 0)
4013 { 4068 {
4014 free (v_buffer); 4069 free (v_buffer);
4015 v_buffer = 0; 4070 v_buffer = 0;
4016 v_buflen = 0;
4017 4071
4018 pty_ev.set (EVENT_READ); 4072 pty_ev.set (ev::READ);
4019 return; 4073 return;
4020 } 4074 }
4021 4075
4022 memmove (v_buffer, v_buffer + written, v_buflen); 4076 memmove (v_buffer, v_buffer + written, v_buflen);
4023 } 4077 }
4024 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4078 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4025 pty_ev.set (EVENT_READ); 4079 pty_ev.set (ev::READ);
4026} 4080}
4027 4081
4028/*----------------------- end-of-file (C source) -----------------------*/ 4082/*----------------------- end-of-file (C source) -----------------------*/
4029 4083

Diff Legend

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