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.355 by ayin, Fri Sep 14 09:46:18 2007 UTC vs.
Revision 1.472 by sf-exg, Sun Jan 23 12:28:47 2011 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 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 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, rs[Rs_backspace_key]);
566 break;
567#endif
568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Delete
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if (kp)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
579 case XK_Delete:
580 strcpy (kbuf, rs[Rs_delete_key]);
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 (kp)
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 (kp)
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 (kp)
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 (kp)
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 (kp)
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 (kp)
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 (kp)
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 (kp)
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
… …
950 commit_iso14755 (); 889 commit_iso14755 ();
951 890
952 return; 891 return;
953 } 892 }
954 893
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
956 if (i[0] == keysym) 895 if (i[0] == keysym)
957 { 896 {
958 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 (); 898 commit_iso14755 ();
960 899
… …
1035void 974void
1036rxvt_term::flush () 975rxvt_term::flush ()
1037{ 976{
1038 flush_ev.stop (); 977 flush_ev.stop ();
1039 978
979#ifdef HAVE_BG_PIXMAP
980 if (bgPixmap.flags & bgPixmap_t::hasChanged)
981 {
982 bgPixmap.flags &= ~bgPixmap_t::hasChanged;
983 scr_touch (false);
984 }
985#endif
986
1040 if (want_refresh) 987 if (want_refresh)
1041 { 988 {
1042 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 989 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1043 { 990 {
1044 int row = view_start; 991 int row = view_start;
… …
1076 } 1023 }
1077 while (row < end_row); 1024 while (row < end_row);
1078 } 1025 }
1079 1026
1080 scr_refresh (); 1027 scr_refresh ();
1081 scrollbar_show (1); 1028 scrollBar.show (1);
1082#ifdef USE_XIM 1029#ifdef USE_XIM
1083 IMSendSpot (); 1030 IMSendSpot ();
1084#endif 1031#endif
1085 } 1032 }
1086 1033
1087 display->flush (); 1034 display->flush ();
1088} 1035}
1089 1036
1037/* checks whether a refresh is requested and starts the refresh timer */
1090void 1038void
1091rxvt_term::check_cb (check_watcher &w) 1039rxvt_term::refresh_check ()
1092{ 1040{
1093 make_current (); 1041 if (want_refresh && !flush_ev.is_active ())
1042 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1094 1043
1095 display->flush (); 1044 display->flush ();
1096
1097 if (want_refresh && !flush_ev.active)
1098 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1099} 1045}
1100 1046
1101void 1047void
1102rxvt_term::flush_cb (time_watcher &w) 1048rxvt_term::flush_cb (ev::timer &w, int revents)
1103{ 1049{
1104 make_current (); 1050 make_current ();
1105 1051
1106 refresh_count = 0; 1052 refresh_count = 0;
1107 flush (); 1053 flush ();
1108} 1054}
1109 1055
1110#ifdef CURSOR_BLINK 1056#ifdef CURSOR_BLINK
1111void 1057void
1112rxvt_term::cursor_blink_cb (time_watcher &w) 1058rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1113{ 1059{
1114 hidden_cursor = !hidden_cursor; 1060 hidden_cursor = !hidden_cursor;
1115 want_refresh = 1; 1061 want_refresh = 1;
1116 1062 refresh_check ();
1117 w.start (w.at + CURSOR_BLINK_INTERVAL);
1118} 1063}
1119#endif 1064#endif
1120 1065
1121#ifdef TEXT_BLINK 1066#ifdef TEXT_BLINK
1122void 1067void
1123rxvt_term::text_blink_cb (time_watcher &w) 1068rxvt_term::text_blink_cb (ev::timer &w, int revents)
1124{ 1069{
1125 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1070 if (scr_refresh_rend (RS_Blink, RS_Blink))
1126 { 1071 {
1127 hidden_text = !hidden_text; 1072 hidden_text = !hidden_text;
1128 want_refresh = 1; 1073 want_refresh = 1;
1129 w.start (w.at + TEXT_BLINK_INTERVAL); 1074 refresh_check ();
1130 } 1075 }
1076 else
1077 w.stop ();
1131} 1078}
1132#endif 1079#endif
1133 1080
1134#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1081#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1135void 1082void
1136rxvt_term::cont_scroll_cb (time_watcher &w) 1083rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1137{ 1084{
1138 if ((scrollbar_isUp() || scrollbar_isDn()) && 1085 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1139 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1086 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1140 { 1087 {
1141 want_refresh = 1; 1088 want_refresh = 1;
1142 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1089 refresh_check ();
1143 } 1090 }
1091 else
1092 w.stop ();
1144} 1093}
1145#endif 1094#endif
1146 1095
1147#ifdef SELECTION_SCROLLING 1096#ifdef SELECTION_SCROLLING
1148void 1097void
1149rxvt_term::sel_scroll_cb (time_watcher &w) 1098rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1150{ 1099{
1151 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1100 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1152 { 1101 {
1153 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1102 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1154 want_refresh = 1; 1103 want_refresh = 1;
1155 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1104 refresh_check ();
1156 } 1105 }
1106 else
1107 w.stop ();
1157} 1108}
1158#endif 1109#endif
1159 1110
1160#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1111#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1161void 1112void
1162rxvt_term::slip_wheel_cb (time_watcher &w) 1113rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1163{ 1114{
1164 if (mouse_slip_wheel_speed == 0 1115 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1165 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1166 : scr_page (UP, mouse_slip_wheel_speed))
1167 { 1116 {
1168 if (view_start == top_row || view_start == 0)
1169 mouse_slip_wheel_speed = 0;
1170
1171 want_refresh = 1; 1117 want_refresh = 1;
1172 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1118 refresh_check ();
1119 }
1120
1121 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1122 {
1123 mouse_slip_wheel_speed = 0;
1124 w.stop ();
1173 } 1125 }
1174} 1126}
1175#endif 1127#endif
1176 1128
1177#if LINUX_YIELD_HACK 1129#if LINUX_YIELD_HACK
1178static struct event_handler 1130static struct event_handler
1179{ 1131{
1180 check_watcher yield_ev; 1132 ev::prepare yield_ev;
1181 1133
1182 void yield_cb (check_watcher &w) 1134 void yield_cb (ev::prepare &w, int revents)
1183 { 1135 {
1184 // this should really be sched_yield(), but the linux guys thought 1136 // this should really be sched_yield(), but the linux guys thought
1185 // that giving a process calling sched_yield () less cpu time than 1137 // that giving a process calling sched_yield () less cpu time than
1186 // ones with high nice levels is a useful thing to do. It surely is is 1138 // ones with high nice levels is a useful thing to do. It surely is is
1187 // allowed by the sus... as is returning ENOSYS. 1139 // allowed by the sus... as is returning ENOSYS.
1140 // since the linux guys additionally thought that breaking the only
1141 // known workaround against their unusable sched_yield hack is cool,
1142 // we just nanosleep a bit and hope for the best.
1188 1143
1189 struct timespec ts = { 0, 0 }; 1144 struct timespec ts = { 0, 1000 };
1190 nanosleep (&ts, 0); 1145 nanosleep (&ts, 0);
1191 1146
1192 w.stop (); 1147 w.stop ();
1193 } 1148 }
1194 1149
… …
1238 1193
1239 return false; 1194 return false;
1240} 1195}
1241 1196
1242void 1197void
1243rxvt_term::pty_cb (io_watcher &w, short revents) 1198rxvt_term::pty_cb (ev::io &w, int revents)
1244{ 1199{
1245 make_current (); 1200 make_current ();
1246 1201
1247 if (revents & EVENT_READ) 1202 if (revents & ev::READ)
1248 // loop, but don't allow a single term to monopolize us 1203 // loop, but don't allow a single term to monopolize us
1249 while (pty_fill ()) 1204 for (int i = CBUFCNT; i-- && pty_fill (); )
1250 if (cmd_parse ()) 1205 cmd_parse ();
1251 break;
1252 1206
1253 if (revents & EVENT_WRITE) 1207 if (revents & ev::WRITE)
1254 pty_write (); 1208 pty_write ();
1209
1210 refresh_check ();
1255} 1211}
1256 1212
1257void 1213void
1258rxvt_term::pointer_unblank () 1214rxvt_term::pointer_unblank ()
1259{ 1215{
… …
1262 1218
1263#ifdef POINTER_BLANK 1219#ifdef POINTER_BLANK
1264 hidden_pointer = 0; 1220 hidden_pointer = 0;
1265 1221
1266 if (option (Opt_pointerBlank)) 1222 if (option (Opt_pointerBlank))
1267 pointer_ev.start (NOW + pointerBlankDelay); 1223 pointer_ev.start (pointerBlankDelay);
1268#endif 1224#endif
1269} 1225}
1270 1226
1271#ifdef POINTER_BLANK 1227#ifdef POINTER_BLANK
1272void 1228void
… …
1280 1236
1281 hidden_pointer = 1; 1237 hidden_pointer = 1;
1282} 1238}
1283 1239
1284void 1240void
1285rxvt_term::pointer_cb (time_watcher &w) 1241rxvt_term::pointer_cb (ev::timer &w, int revents)
1286{ 1242{
1287 make_current (); 1243 make_current ();
1288 1244
1289 pointer_blank (); 1245 pointer_blank ();
1290} 1246}
… …
1293void 1249void
1294rxvt_term::mouse_report (XButtonEvent &ev) 1250rxvt_term::mouse_report (XButtonEvent &ev)
1295{ 1251{
1296 int button_number, key_state = 0; 1252 int button_number, key_state = 0;
1297 int x, y; 1253 int x, y;
1254 int code = 32;
1298 1255
1299 x = ev.x; 1256 x = Pixel2Col (ev.x) + 1;
1300 y = ev.y; 1257 y = Pixel2Row (ev.y) + 1;
1301 pixel_position (&x, &y); 1258
1259 if (ev.type == MotionNotify)
1260 {
1261 if (x == mouse_row && y == mouse_col)
1262 return;
1263
1264 mouse_row = x;
1265 mouse_col = y;
1266 code += 32;
1267 }
1302 1268
1303 if (MEvent.button == AnyButton) 1269 if (MEvent.button == AnyButton)
1304 button_number = 3; 1270 button_number = 3;
1305 else 1271 else
1306 { 1272 {
1307 button_number = MEvent.button - Button1; 1273 button_number = MEvent.button - Button1;
1308 /* add 0x3D for wheel events, like xterm does */ 1274 /* add 0x3D for wheel events, like xterm does */
1309 if (button_number >= 3) 1275 if (button_number >= 3)
1310 button_number += (64 - 3); 1276 button_number += 64 - 3;
1311 } 1277 }
1312 1278
1313 if (priv_modes & PrivMode_MouseX10) 1279 if (priv_modes & PrivMode_MouseX10)
1314 { 1280 {
1315 /* 1281 /*
… …
1347 fputc ('A', stderr); 1313 fputc ('A', stderr);
1348 if (key_state & 32) 1314 if (key_state & 32)
1349 fputc ('2', stderr); 1315 fputc ('2', stderr);
1350 fprintf (stderr, "]: <%d>, %d/%d\n", 1316 fprintf (stderr, "]: <%d>, %d/%d\n",
1351 button_number, 1317 button_number,
1352 x + 1, 1318 x,
1353 y + 1); 1319 y);
1354#endif 1320#endif
1355 1321
1322#if ENABLE_FRILLS
1323 if (priv_modes & PrivMode_ExtMouseRight)
1324 tt_printf ("\033[%d;%d;%dM",
1325 code + button_number + key_state,
1326 x,
1327 y);
1328 else if (priv_modes & PrivMode_ExtModeMouse)
1329 tt_printf ("\033[M%c%lc%lc",
1330 code + button_number + key_state,
1331 wint_t (32 + x),
1332 wint_t (32 + y));
1333 else
1334#endif
1356 tt_printf ("\033[M%c%c%c", 1335 tt_printf ("\033[M%c%c%c",
1357 (32 + button_number + key_state), 1336 code + button_number + key_state,
1358 (32 + x + 1), 1337 32 + x,
1359 (32 + y + 1)); 1338 32 + y);
1360} 1339}
1361 1340
1362/*{{{ process an X event */ 1341/*{{{ process an X event */
1363void 1342void
1364rxvt_term::x_cb (XEvent &ev) 1343rxvt_term::x_cb (XEvent &ev)
… …
1466 && ev.xfocus.mode != NotifyGrab) 1445 && ev.xfocus.mode != NotifyGrab)
1467 focus_out (); 1446 focus_out ();
1468 break; 1447 break;
1469 1448
1470 case ConfigureNotify: 1449 case ConfigureNotify:
1471/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1472 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1473 szHint.width, szHint.height);*/
1474 if (ev.xconfigure.window == parent[0]) 1450 if (ev.xconfigure.window == parent[0])
1475 { 1451 {
1476 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1477 ; 1453 ;
1454
1455#ifdef HAVE_BG_PIXMAP
1456 bool moved = false;
1457 if (bgPixmap.window_position_sensitive ())
1458 {
1459 int x, y;
1460 if (ev.xconfigure.send_event)
1461 {
1462 x = ev.xconfigure.x;
1463 y = ev.xconfigure.y;
1464 }
1465 else
1466 get_window_origin (x, y);
1467
1468 if (bgPixmap.set_position (x, y)
1469 || !(bgPixmap.flags & bgPixmap_t::isValid))
1470 moved = true;
1471 }
1472#endif
1478 1473
1479 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1480 { 1475 {
1481 seen_resize = 1; 1476 seen_resize = 1;
1482 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1477 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1483 } 1478 }
1484 else 1479 else
1485 { 1480 {
1486#ifdef HAVE_BG_PIXMAP 1481#ifdef HAVE_BG_PIXMAP
1487 if (bgPixmap.window_position_sensitive ()) 1482 if (moved)
1483 {
1484 if (mapped)
1488 update_background (); 1485 update_background ();
1486 else
1487 bgPixmap.invalidate ();
1488 }
1489#endif 1489#endif
1490 } 1490 }
1491
1491 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1492 } 1493 }
1493 break; 1494 break;
1494 1495
1495 case PropertyNotify: 1496 case PropertyNotify:
… …
1499 selection_property (ev.xproperty.window, ev.xproperty.atom); 1500 selection_property (ev.xproperty.window, ev.xproperty.atom);
1500 1501
1501 break; 1502 break;
1502 1503
1503 case SelectionClear: 1504 case SelectionClear:
1504 selection_clear (); 1505 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1505 break; 1506 break;
1506 1507
1507 case SelectionNotify: 1508 case SelectionNotify:
1508 if (selection_wait == Sel_normal) 1509 if (selection_wait == Sel_normal)
1509 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1510 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1512 case SelectionRequest: 1513 case SelectionRequest:
1513 selection_send (ev.xselectionrequest); 1514 selection_send (ev.xselectionrequest);
1514 break; 1515 break;
1515 1516
1516 case MapNotify: 1517 case MapNotify:
1518#ifdef HAVE_BG_PIXMAP
1519 /* This is needed specifically to fix the case of no window manager or a
1520 * non-reparenting window manager. In those cases we never get first
1521 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1522 * care of multiplicity of ConfigureNotify events arriving while WM does
1523 * reparenting.
1524 * We should not render background immediately, as there could be several
1525 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1526 * by scheduling background redraw as soon as we can, but giving a short
1527 * bit of time for ConfigureNotifies to arrive.
1528 * We should render background PRIOR to drawing any text, but AFTER all
1529 * of ConfigureNotifys for the best results.
1530 */
1531 if (!(bgPixmap.flags & bgPixmap_t::isValid))
1532 update_background_ev.start (0.025);
1533#endif
1517 mapped = 1; 1534 mapped = 1;
1518#ifdef TEXT_BLINK 1535#ifdef TEXT_BLINK
1519 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1536 text_blink_ev.start ();
1520#endif 1537#endif
1521 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1538 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1522 break; 1539 break;
1523 1540
1524 case UnmapNotify: 1541 case UnmapNotify:
… …
1532 case GraphicsExpose: 1549 case GraphicsExpose:
1533 case Expose: 1550 case Expose:
1534 if (ev.xany.window == vt) 1551 if (ev.xany.window == vt)
1535 { 1552 {
1536 do 1553 do
1554 {
1537 scr_expose (ev.xexpose.x, ev.xexpose.y, 1555 scr_expose (ev.xexpose.x, ev.xexpose.y,
1538 ev.xexpose.width, ev.xexpose.height, False); 1556 ev.xexpose.width, ev.xexpose.height, False);
1557 }
1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1540 1559
1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1560 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1542 1561
1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1563 {
1544 scr_expose (ev.xexpose.x, ev.xexpose.y, 1564 scr_expose (ev.xexpose.x, ev.xexpose.y,
1545 ev.xexpose.width, ev.xexpose.height, False); 1565 ev.xexpose.width, ev.xexpose.height, False);
1566 }
1546 1567
1547 want_refresh = 1; 1568 want_refresh = 1;
1548 } 1569 }
1549 else 1570 else
1550 { 1571 {
… …
1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1574 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1554 ; 1575 ;
1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1556 ; 1577 ;
1557 1578
1558 if (isScrollbarWindow (ev.xany.window)) 1579 if (scrollBar.state && ev.xany.window == scrollBar.win)
1559 { 1580 {
1560 scrollBar.setIdle (); 1581 scrollBar.state = STATE_IDLE;
1561 scrollbar_show (0); 1582 scrollBar.show (0);
1562 } 1583 }
1563 } 1584 }
1564 break; 1585 break;
1565 1586
1566 case MotionNotify: 1587 case MotionNotify:
1567#ifdef POINTER_BLANK 1588#ifdef POINTER_BLANK
1568 if (hidden_pointer) 1589 if (hidden_pointer)
1569 pointer_unblank (); 1590 pointer_unblank ();
1570#endif 1591#endif
1592 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1593 || priv_modes & PrivMode_MouseAnyEvent)
1594 mouse_report (ev.xbutton);
1571 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1595 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1572 break; 1596 break;
1573 1597
1574 if (ev.xany.window == vt) 1598 if (ev.xany.window == vt)
1575 { 1599 {
… …
1609 int dist; 1633 int dist;
1610 1634
1611 /* don't clobber the current delay if we are 1635 /* don't clobber the current delay if we are
1612 * already in the middle of scrolling. 1636 * already in the middle of scrolling.
1613 */ 1637 */
1614 if (!sel_scroll_ev.active) 1638 if (!sel_scroll_ev.is_active ())
1615 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1639 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1616 1640
1617 /* save the event params so we can highlight 1641 /* save the event params so we can highlight
1618 * the selection in the pending-scroll loop 1642 * the selection in the pending-scroll loop
1619 */ 1643 */
1620 selection_save_x = ev.xbutton.x; 1644 selection_save_x = ev.xbutton.x;
… …
1642 else 1666 else
1643 { 1667 {
1644 /* we are within the text window, so we 1668 /* we are within the text window, so we
1645 * shouldn't be scrolling 1669 * shouldn't be scrolling
1646 */ 1670 */
1647 if (sel_scroll_ev.active)
1648 sel_scroll_ev.stop(); 1671 sel_scroll_ev.stop();
1649 } 1672 }
1650#endif 1673#endif
1651#ifdef MOUSE_THRESHOLD 1674#ifdef MOUSE_THRESHOLD
1652 } 1675 }
1653#endif 1676#endif
1654 } 1677 }
1655 } 1678 }
1656 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1679 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1657 { 1680 {
1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1681 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1659 MotionNotify, &ev)) 1682 MotionNotify, &ev))
1660 ; 1683 ;
1661 1684
… …
1663 &unused_root, &unused_child, 1686 &unused_root, &unused_child,
1664 &unused_root_x, &unused_root_y, 1687 &unused_root_x, &unused_root_y,
1665 &ev.xbutton.x, &ev.xbutton.y, 1688 &ev.xbutton.x, &ev.xbutton.y,
1666 &unused_mask); 1689 &unused_mask);
1667 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1690 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1668 scrollbar_size ()); 1691 scrollBar.size ());
1669 want_refresh = 1; 1692 want_refresh = 1;
1670 scrollbar_show (1); 1693 scrollBar.show (1);
1671 } 1694 }
1672 break; 1695 break;
1673 } 1696 }
1674 1697
1675#if defined(CURSOR_BLINK) 1698#if defined(CURSOR_BLINK)
… …
1679 { 1702 {
1680 hidden_cursor = 0; 1703 hidden_cursor = 0;
1681 want_refresh = 1; 1704 want_refresh = 1;
1682 } 1705 }
1683 1706
1684 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1707 cursor_blink_ev.again ();
1685 } 1708 }
1686#endif 1709#endif
1687 1710
1688#if defined(POINTER_BLANK) 1711#if defined(POINTER_BLANK)
1689 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1712 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1696 1719
1697 if (ev.type == KeyPress && hidden_pointer == 0) 1720 if (ev.type == KeyPress && hidden_pointer == 0)
1698 pointer_blank (); 1721 pointer_blank ();
1699 } 1722 }
1700#endif 1723#endif
1724
1725 refresh_check ();
1701} 1726}
1727
1728#if ENABLE_FRILLS
1729void
1730rxvt_term::set_urgency (bool enable)
1731{
1732 if (enable == urgency_hint)
1733 return;
1734
1735 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1736 {
1737 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1738 XSetWMHints (dpy, parent[0], h);
1739 urgency_hint = enable;
1740 }
1741}
1742#endif
1702 1743
1703void 1744void
1704rxvt_term::focus_in () 1745rxvt_term::focus_in ()
1705{ 1746{
1706 if (!focus) 1747 if (!focus)
1707 { 1748 {
1708 focus = 1; 1749 focus = 1;
1709 want_refresh = 1; 1750 want_refresh = 1;
1710 1751
1711 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1712
1713#if USE_XIM 1752#if USE_XIM
1714 if (Input_Context != NULL) 1753 if (Input_Context != NULL)
1715 { 1754 {
1716 IMSetPosition (); 1755 IMSetPosition ();
1717 XSetICFocus (Input_Context); 1756 XSetICFocus (Input_Context);
1718 } 1757 }
1719#endif 1758#endif
1720#if CURSOR_BLINK 1759#if CURSOR_BLINK
1721 if (option (Opt_cursorBlink)) 1760 if (option (Opt_cursorBlink))
1722 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1761 cursor_blink_ev.again ();
1723#endif 1762#endif
1724#if OFF_FOCUS_FADING 1763#if OFF_FOCUS_FADING
1725 if (rs[Rs_fade]) 1764 if (rs[Rs_fade])
1726 { 1765 {
1727 pix_colors = pix_colors_focused; 1766 pix_colors = pix_colors_focused;
1728 scr_recolour (); 1767 scr_recolour ();
1729 } 1768 }
1730#endif 1769#endif
1731#if ENABLE_FRILLS 1770#if ENABLE_FRILLS
1732 if (option (Opt_urgentOnBell)) 1771 if (option (Opt_urgentOnBell))
1733 { 1772 set_urgency (0);
1734 XWMHints *h;
1735
1736 h = XGetWMHints(dpy, parent[0]);
1737 if (h != NULL)
1738 {
1739 h->flags &= ~XUrgencyHint;
1740 XSetWMHints(dpy, parent[0], h);
1741 }
1742 }
1743#endif 1773#endif
1774
1775 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1744 } 1776 }
1745} 1777}
1746 1778
1747void 1779void
1748rxvt_term::focus_out () 1780rxvt_term::focus_out ()
… …
1750 if (focus) 1782 if (focus)
1751 { 1783 {
1752 focus = 0; 1784 focus = 0;
1753 want_refresh = 1; 1785 want_refresh = 1;
1754 1786
1755 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1787#if ENABLE_FRILLS
1756 1788 if (option (Opt_urgentOnBell))
1789 set_urgency (0);
1790#endif
1757#if ENABLE_FRILLS || ISO_14755 1791#if ENABLE_FRILLS || ISO_14755
1758 if (iso14755buf) 1792 if (iso14755buf)
1759 { 1793 {
1760 iso14755buf = 0; 1794 iso14755buf = 0;
1761# if ISO_14755 1795# if ISO_14755
… …
1768 XUnsetICFocus (Input_Context); 1802 XUnsetICFocus (Input_Context);
1769#endif 1803#endif
1770#if CURSOR_BLINK 1804#if CURSOR_BLINK
1771 if (option (Opt_cursorBlink)) 1805 if (option (Opt_cursorBlink))
1772 cursor_blink_ev.stop (); 1806 cursor_blink_ev.stop ();
1807
1773 hidden_cursor = 0; 1808 hidden_cursor = 0;
1774#endif 1809#endif
1775#if OFF_FOCUS_FADING 1810#if OFF_FOCUS_FADING
1776 if (rs[Rs_fade]) 1811 if (rs[Rs_fade])
1777 { 1812 {
1778 pix_colors = pix_colors_unfocused; 1813 pix_colors = pix_colors_unfocused;
1779 scr_recolour (); 1814 scr_recolour ();
1780 } 1815 }
1781#endif 1816#endif
1817
1818 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1782 } 1819 }
1783} 1820}
1784 1821
1785void 1822void
1786rxvt_term::update_fade_color (unsigned int idx) 1823rxvt_term::update_fade_color (unsigned int idx)
… …
1817 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1854 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1818 { 1855 {
1819 bgPixmap.set_root_pixmap (); 1856 bgPixmap.set_root_pixmap ();
1820 update_background (); 1857 update_background ();
1821 } 1858 }
1859
1822 break; 1860 break;
1823 } 1861 }
1824# endif 1862# endif
1863
1864 refresh_check ();
1825} 1865}
1826#endif 1866#endif
1827 1867
1828void 1868void
1829rxvt_term::button_press (XButtonEvent &ev) 1869rxvt_term::button_press (XButtonEvent &ev)
… …
1860 /* save the xbutton state (for ButtonRelease) */ 1900 /* save the xbutton state (for ButtonRelease) */
1861 MEvent.state = ev.state; 1901 MEvent.state = ev.state;
1862#ifdef MOUSE_REPORT_DOUBLECLICK 1902#ifdef MOUSE_REPORT_DOUBLECLICK
1863 if (ev.button == MEvent.button && clickintime) 1903 if (ev.button == MEvent.button && clickintime)
1864 { 1904 {
1865 /* same button, within alloted time */ 1905 /* same button, within allowed time */
1866 MEvent.clicks++; 1906 MEvent.clicks++;
1867 1907
1868 if (MEvent.clicks > 1) 1908 if (MEvent.clicks > 1)
1869 { 1909 {
1870 /* only report double clicks */ 1910 /* only report double clicks */
… …
1884 mouse_report (ev); 1924 mouse_report (ev);
1885 } 1925 }
1886#else 1926#else
1887 MEvent.button = ev.button; 1927 MEvent.button = ev.button;
1888 mouse_report (ev); 1928 mouse_report (ev);
1889#endif /* MOUSE_REPORT_DOUBLECLICK */ 1929#endif /* MOUSE_REPORT_DOUBLECLICK */
1890 1930
1891 } 1931 }
1892 else 1932 else
1893 { 1933 {
1894 if (ev.button != MEvent.button) 1934 if (ev.button != MEvent.button)
… …
1942 } 1982 }
1943 1983
1944 /* 1984 /*
1945 * Scrollbar window processing of button press 1985 * Scrollbar window processing of button press
1946 */ 1986 */
1947 if (isScrollbarWindow (ev.window)) 1987 if (scrollBar.state && ev.window == scrollBar.win)
1948 { 1988 {
1949 scrollBar.setIdle (); 1989 page_dirn direction = NO_DIR;
1990
1991 if (scrollBar.upButton (ev.y))
1992 direction = UP; /* up */
1993 else if (scrollBar.dnButton (ev.y))
1994 direction = DN; /* down */
1995
1996 scrollBar.state = STATE_IDLE;
1950 /* 1997 /*
1951 * Rxvt-style scrollbar: 1998 * Rxvt-style scrollbar:
1952 * move up if mouse is above slider 1999 * move up if mouse is above slider
1953 * move dn if mouse is below slider 2000 * move dn if mouse is below slider
1954 * 2001 *
… …
1963 /* 2010 /*
1964 * Mouse report disabled scrollbar: 2011 * Mouse report disabled scrollbar:
1965 * arrow buttons - send up/down 2012 * arrow buttons - send up/down
1966 * click on scrollbar - send pageup/down 2013 * click on scrollbar - send pageup/down
1967 */ 2014 */
1968 if ((scrollBar.style == R_SB_NEXT 2015 if (direction == UP)
1969 && scrollbarnext_upButton (ev.y))
1970 || (scrollBar.style == R_SB_RXVT
1971 && scrollbarrxvt_upButton (ev.y)))
1972 tt_printf ("\033[A"); 2016 tt_printf ("\033[A");
1973 else if ((scrollBar.style == R_SB_NEXT 2017 else if (direction == DN)
1974 && scrollbarnext_dnButton (ev.y))
1975 || (scrollBar.style == R_SB_RXVT
1976 && scrollbarrxvt_dnButton (ev.y)))
1977 tt_printf ("\033[B"); 2018 tt_printf ("\033[B");
1978 else 2019 else
1979 switch (ev.button) 2020 switch (ev.button)
1980 { 2021 {
1981 case Button2: 2022 case Button2:
… …
1988 tt_printf ("\033[5~"); 2029 tt_printf ("\033[5~");
1989 break; 2030 break;
1990 } 2031 }
1991 } 2032 }
1992 else 2033 else
1993#endif /* NO_SCROLLBAR_REPORT */ 2034#endif /* NO_SCROLLBAR_REPORT */
1994
1995 {
1996 char upordown = 0;
1997
1998 if (scrollBar.style == R_SB_NEXT)
1999 { 2035 {
2000 if (scrollbarnext_upButton (ev.y)) 2036 if (direction != NO_DIR)
2001 upordown = -1; /* up */
2002 else if (scrollbarnext_dnButton (ev.y))
2003 upordown = 1; /* down */
2004 }
2005 else if (scrollBar.style == R_SB_RXVT)
2006 {
2007 if (scrollbarrxvt_upButton (ev.y))
2008 upordown = -1; /* up */
2009 else if (scrollbarrxvt_dnButton (ev.y))
2010 upordown = 1; /* down */
2011 }
2012 if (upordown)
2013 { 2037 {
2014#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2038#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2039 if (!cont_scroll_ev.is_active ())
2015 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2040 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2016#endif 2041#endif
2017 if (scr_page (upordown < 0 ? UP : DN, 1)) 2042 if (scr_page (direction, 1))
2018 { 2043 {
2019 if (upordown < 0) 2044 if (direction == UP)
2020 scrollBar.setUp (); 2045 scrollBar.state = STATE_UP;
2021 else 2046 else
2022 scrollBar.setDn (); 2047 scrollBar.state = STATE_DOWN;
2023 } 2048 }
2024 } 2049 }
2025 else 2050 else
2026 switch (ev.button) 2051 switch (ev.button)
2027 { 2052 {
2028 case Button2: 2053 case Button2:
2029 switch (scrollbar_align) 2054 switch (scrollBar.align)
2030 { 2055 {
2031 case R_SB_ALIGN_TOP: 2056 case R_SB_ALIGN_TOP:
2032 csrO = 0; 2057 csrO = 0;
2033 break; 2058 break;
2034 case R_SB_ALIGN_CENTRE: 2059 case R_SB_ALIGN_CENTRE:
… …
2040 } 2065 }
2041 2066
2042 if (scrollBar.style == R_SB_XTERM 2067 if (scrollBar.style == R_SB_XTERM
2043 || scrollbar_above_slider (ev.y) 2068 || scrollbar_above_slider (ev.y)
2044 || scrollbar_below_slider (ev.y)) 2069 || scrollbar_below_slider (ev.y))
2045 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2070 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2046 2071
2047 scrollBar.setMotion (); 2072 scrollBar.state = STATE_MOTION;
2048 break; 2073 break;
2049 2074
2050 case Button1: 2075 case Button1:
2051 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2076 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2052 csrO = ev.y - scrollBar.top; 2077 csrO = ev.y - scrollBar.top;
2053 /* FALLTHROUGH */ 2078 /* FALLTHROUGH */
2054 2079
2055 case Button3: 2080 case Button3:
2056 if (scrollBar.style != R_SB_XTERM) 2081 if (scrollBar.style != R_SB_XTERM)
… …
2066 scr_page (DN, nrow - 1); 2091 scr_page (DN, nrow - 1);
2067# else 2092# else
2068 scr_page (DN, nrow / 4); 2093 scr_page (DN, nrow / 4);
2069# endif 2094# endif
2070 else 2095 else
2071 scrollBar.setMotion (); 2096 scrollBar.state = STATE_MOTION;
2072 } 2097 }
2073 else 2098 else
2074 { 2099 {
2075 scr_page ((ev.button == Button1 ? DN : UP), 2100 scr_page ((ev.button == Button1 ? DN : UP),
2076 (nrow 2101 (nrow
2077 * scrollbar_position (ev.y) 2102 * scrollbar_position (ev.y)
2078 / scrollbar_size ())); 2103 / scrollBar.size ()));
2079 } 2104 }
2080 2105
2081 break; 2106 break;
2082 } 2107 }
2083 } 2108 }
… …
2093 2118
2094 csrO = 0; /* reset csr Offset */ 2119 csrO = 0; /* reset csr Offset */
2095 if (!bypass_keystate) 2120 if (!bypass_keystate)
2096 reportmode = !! (priv_modes & PrivMode_mouse_report); 2121 reportmode = !! (priv_modes & PrivMode_mouse_report);
2097 2122
2098 if (scrollbar_isUpDn ()) 2123 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2099 { 2124 {
2100 scrollBar.setIdle (); 2125 scrollBar.state = STATE_IDLE;
2101 scrollbar_show (0); 2126 scrollBar.show (0);
2102 } 2127 }
2103 2128
2104#ifdef SELECTION_SCROLLING 2129#ifdef SELECTION_SCROLLING
2105 if (sel_scroll_ev.active)
2106 sel_scroll_ev.stop(); 2130 sel_scroll_ev.stop();
2107#endif 2131#endif
2108 2132
2109 if (ev.window == vt) 2133 if (ev.window == vt)
2110 { 2134 {
2111 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2135 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2135 mouse_report (ev); 2159 mouse_report (ev);
2136 } 2160 }
2137#else /* MOUSE_REPORT_DOUBLECLICK */ 2161#else /* MOUSE_REPORT_DOUBLECLICK */
2138 MEvent.button = AnyButton; 2162 MEvent.button = AnyButton;
2139 mouse_report (ev); 2163 mouse_report (ev);
2140#endif /* MOUSE_REPORT_DOUBLECLICK */ 2164#endif /* MOUSE_REPORT_DOUBLECLICK */
2141 return; 2165 return;
2142 } 2166 }
2143 2167
2144 /* 2168 /*
2145 * dumb hack to compensate for the failure of click-and-drag 2169 * dumb hack to compensate for the failure of click-and-drag
… …
2157 selection_make (ev.time); 2181 selection_make (ev.time);
2158 break; 2182 break;
2159 2183
2160 case Button2: 2184 case Button2:
2161 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2185 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2162 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2186 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2163 break; 2187 break;
2164 2188
2165#ifdef MOUSE_WHEEL 2189#ifdef MOUSE_WHEEL
2166 case Button4: 2190 case Button4:
2167 case Button5: 2191 case Button5:
… …
2183 { 2207 {
2184 mouse_slip_wheel_speed += v ? -1 : 1; 2208 mouse_slip_wheel_speed += v ? -1 : 1;
2185 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2209 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2186 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2210 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2187 2211
2188 if (slip_wheel_ev.at < NOW) 2212 if (!slip_wheel_ev.is_active ())
2189 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2213 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2190
2191 slip_wheel_ev.start ();
2192 } 2214 }
2193 else 2215 else
2216# endif
2194 { 2217 {
2195# endif
2196 scr_page (v, i); 2218 scr_page (v, i);
2197 scrollbar_show (1); 2219 scrollBar.show (1);
2198# ifdef MOUSE_SLIP_WHEELING
2199 } 2220 }
2200# endif
2201 } 2221 }
2202 break; 2222 break;
2203#endif 2223#endif
2204 } 2224 }
2205 } 2225 }
2206} 2226}
2207 2227
2208/*}}} */ 2228/*}}} */
2209 2229
2210bool 2230void
2211rxvt_term::cmd_parse () 2231rxvt_term::cmd_parse ()
2212{ 2232{
2213 bool flag = false;
2214 wchar_t ch = NOCHAR; 2233 wchar_t ch = NOCHAR;
2215 char *seq_begin; // remember start of esc-sequence here 2234 char *seq_begin; // remember start of esc-sequence here
2216 2235
2217 for (;;) 2236 for (;;)
2218 { 2237 {
2219 if (ch == NOCHAR) 2238 if (expect_false (ch == NOCHAR))
2220 { 2239 {
2221 seq_begin = cmdbuf_ptr; 2240 seq_begin = cmdbuf_ptr;
2222 ch = next_char (); 2241 ch = next_char ();
2223 2242
2224 if (ch == NOCHAR) 2243 if (ch == NOCHAR)
2225 break; 2244 break;
2226 } 2245 }
2227 2246
2228 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2247 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2229 { 2248 {
2230 if (!seen_input) 2249 if (expect_false (!seen_input))
2231 { 2250 {
2232 seen_input = 1; 2251 seen_input = 1;
2233 // many badly-written programs (e.g. jed) contain a race condition: 2252 // many badly-written programs (e.g. jed) contain a race condition:
2234 // they first read the screensize and then install a SIGWINCH handler. 2253 // they first read the screensize and then install a SIGWINCH handler.
2235 // some window managers resize the window early, and these programs 2254 // some window managers resize the window early, and these programs
… …
2248 wchar_t *str = buf; 2267 wchar_t *str = buf;
2249 wchar_t *eol = str + min (ncol, UBUFSIZ); 2268 wchar_t *eol = str + min (ncol, UBUFSIZ);
2250 2269
2251 for (;;) 2270 for (;;)
2252 { 2271 {
2253 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2272 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2254 break; 2273 break;
2255 2274
2256 *str++ = ch; 2275 *str++ = ch;
2257 2276
2258 if (ch == C0_LF || str >= eol) 2277 if (expect_false (ch == C0_LF || str >= eol))
2259 { 2278 {
2260 if (ch == C0_LF) 2279 if (ch == C0_LF)
2261 nlines++; 2280 nlines++;
2262 2281
2263 refresh_count++; 2282 refresh_count++;
2264 2283
2265 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2284 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2266 { 2285 {
2267 refresh_count = 0; 2286 refresh_count = 0;
2268 2287
2269 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2288 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2270 { 2289 {
2271 refreshnow = true; 2290 refreshnow = true;
2272 ch = NOCHAR; 2291 ch = NOCHAR;
2273 break; 2292 break;
2274 } 2293 }
… …
2312 * What the heck we'll cheat and only refresh less than every page-full. 2331 * What the heck we'll cheat and only refresh less than every page-full.
2313 * if skipScroll is enabled. 2332 * if skipScroll is enabled.
2314 */ 2333 */
2315 if (refreshnow) 2334 if (refreshnow)
2316 { 2335 {
2317 flag = true;
2318 scr_refresh (); 2336 scr_refresh ();
2319 want_refresh = 1; 2337 want_refresh = 1;
2320 } 2338 }
2321
2322 } 2339 }
2323 else 2340 else
2324 { 2341 {
2325 try 2342 try
2326 { 2343 {
… …
2334 } 2351 }
2335 2352
2336 ch = NOCHAR; 2353 ch = NOCHAR;
2337 } 2354 }
2338 } 2355 }
2339
2340 return flag;
2341} 2356}
2342 2357
2343// read the next character 2358// read the next character
2344wchar_t 2359wchar_t
2345rxvt_term::next_char () NOTHROW 2360rxvt_term::next_char () NOTHROW
2346{ 2361{
2347 while (cmdbuf_ptr < cmdbuf_endp) 2362 while (cmdbuf_ptr < cmdbuf_endp)
2348 { 2363 {
2349 // assume 7-bit to be ascii ALWAYS 2364 // assume 7-bit to be ascii ALWAYS
2350 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2365 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2351 return *cmdbuf_ptr++; 2366 return *cmdbuf_ptr++;
2352 2367
2353 wchar_t wc; 2368 wchar_t wc;
2354 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2369 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2355 2370
… …
2359 cmdbuf_ptr = cmdbuf_endp; 2374 cmdbuf_ptr = cmdbuf_endp;
2360 break; 2375 break;
2361 } 2376 }
2362 2377
2363 if (len == (size_t)-1) 2378 if (len == (size_t)-1)
2379 {
2380 mbstate.reset (); // reset now undefined conversion state
2364 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2381 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2382 }
2365 2383
2366 // assume wchar == unicode 2384 // assume wchar == unicode
2367 cmdbuf_ptr += len; 2385 cmdbuf_ptr += len;
2368 return wc & UNICODE_MASK; 2386 return wc & UNICODE_MASK;
2369 } 2387 }
… …
2413/*----------------------------------------------------------------------*/ 2431/*----------------------------------------------------------------------*/
2414#ifdef PRINTPIPE 2432#ifdef PRINTPIPE
2415FILE * 2433FILE *
2416rxvt_term::popen_printer () 2434rxvt_term::popen_printer ()
2417{ 2435{
2418 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2436 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2419 2437
2420 if (stream == NULL) 2438 if (stream == NULL)
2421 rxvt_warn ("can't open printer pipe, not printing.\n"); 2439 rxvt_warn ("can't open printer pipe, not printing.\n");
2422 2440
2423 return stream; 2441 return stream;
… …
2434 * simulate attached vt100 printer 2452 * simulate attached vt100 printer
2435 */ 2453 */
2436void 2454void
2437rxvt_term::process_print_pipe () 2455rxvt_term::process_print_pipe ()
2438{ 2456{
2439 int done; 2457 FILE *fd = popen_printer ();
2440 FILE *fd;
2441 2458
2442 if ((fd = popen_printer ()) == NULL) 2459 if (!fd)
2443 return; 2460 return;
2444 2461
2445 /* 2462 /*
2446 * Send all input to the printer until either ESC[4i or ESC[?4i 2463 * Send all input to the printer until either ESC[4i or ESC[?4i
2447 * is received. 2464 * is received.
2448 */ 2465 */
2449 for (done = 0; !done;) 2466 for (int done = 0; !done; )
2450 { 2467 {
2451 unsigned char buf[8]; 2468 unsigned char buf[8];
2452 unicode_t ch; 2469 unicode_t ch;
2453 unsigned int i, len; 2470 unsigned int i, len;
2454 2471
… …
2485 } 2502 }
2486 } 2503 }
2487 2504
2488 pclose_printer (fd); 2505 pclose_printer (fd);
2489} 2506}
2490#endif /* PRINTPIPE */ 2507#endif /* PRINTPIPE */
2491/*}}} */ 2508/*}}} */
2492 2509
2493/* *INDENT-OFF* */ 2510/* *INDENT-OFF* */
2494enum { 2511enum {
2495 C1_40 = 0x40, 2512 C1_40 = 0x40,
… …
2599 break; 2616 break;
2600 case 'Z': /* identify the terminal type */ 2617 case 'Z': /* identify the terminal type */
2601 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2618 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2602 break; 2619 break;
2603 case '<': /* turn off VT52 mode */ 2620 case '<': /* turn off VT52 mode */
2604 PrivMode (0, PrivMode_vt52); 2621 set_privmode (PrivMode_vt52, 0);
2605 break; 2622 break;
2606 case 'F': /* use special graphics character set */ 2623 case 'F': /* use special graphics character set */
2607 case 'G': /* use regular character set */ 2624 case 'G': /* use regular character set */
2608 /* unimplemented */ 2625 /* unimplemented */
2609 break; 2626 break;
… …
2663 scr_forwardindex (); 2680 scr_forwardindex ();
2664 break; 2681 break;
2665#endif 2682#endif
2666 case '=': 2683 case '=':
2667 case '>': 2684 case '>':
2668 PrivMode ((ch == '='), PrivMode_aplKP); 2685 set_privmode (PrivMode_aplKP, ch == '=');
2669 break; 2686 break;
2670 2687
2671 case C1_40: 2688 case C1_40:
2672 cmd_getc (); 2689 cmd_getc ();
2673 break; 2690 break;
… …
2677 2694
2678 /* 8.3.87: NEXT LINE */ 2695 /* 8.3.87: NEXT LINE */
2679 case C1_NEL: /* ESC E */ 2696 case C1_NEL: /* ESC E */
2680 { 2697 {
2681 wchar_t nlcr[] = { C0_LF, C0_CR }; 2698 wchar_t nlcr[] = { C0_LF, C0_CR };
2682 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2699 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2683 } 2700 }
2684 break; 2701 break;
2685 2702
2686 /* kidnapped escape sequence: Should be 8.3.48 */ 2703 /* kidnapped escape sequence: Should be 8.3.48 */
2687 case C1_ESA: /* ESC G */ 2704 case C1_ESA: /* ESC G */
… …
2712 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2729 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2713 case C1_SCI: /* ESC Z */ 2730 case C1_SCI: /* ESC Z */
2714 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2731 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2715 break; /* steal obsolete ESC [ c */ 2732 break; /* steal obsolete ESC [ c */
2716 2733
2717 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2734 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2718 case C1_CSI: /* ESC [ */ 2735 case C1_CSI: /* ESC [ */
2719 process_csi_seq (); 2736 process_csi_seq ();
2720 break; 2737 break;
2721 2738
2722 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2739 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2723 case C1_OSC: /* ESC ] */ 2740 case C1_OSC: /* ESC ] */
2724 process_osc_seq (); 2741 process_osc_seq ();
2725 break; 2742 break;
2726 2743
2727 /* 8.3.106: RESET TO INITIAL STATE */ 2744 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2728 case 'c': 2745 case 'c':
2729 mbstate.reset (); 2746 mbstate.reset ();
2730 scr_poweron (); 2747 scr_poweron ();
2731 scrollbar_show (1); 2748 scrollBar.show (1);
2732 break; 2749 break;
2733 2750
2734 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2751 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2735 case 'n': 2752 case 'n':
2736 scr_charset_choose (2); 2753 scr_charset_choose (2);
… …
2756 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2773 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2757 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2774 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2758 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2775 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2759}; 2776};
2760 2777
2761#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2778#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2762 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2779 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2763 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2780 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2764#define get_byte_array_bit(array, bit) \ 2781#define get_byte_array_bit(array, bit) \
2765 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2782 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2766 2783
2767const unsigned char csi_defaults[] = 2784static const unsigned char csi_defaults[] =
2768 { 2785 {
2769 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2786 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2770 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2787 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2771 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2788 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2772 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2789 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
2787 2804
2788 nargs = 0; 2805 nargs = 0;
2789 2806
2790 priv = 0; 2807 priv = 0;
2791 ch = cmd_getc (); 2808 ch = cmd_getc ();
2792 if (ch >= '<' && ch <= '?') 2809 if ((ch >= '<' && ch <= '?') || ch == '!')
2810 {
2793 { /* '<' '=' '>' '?' */ 2811 /* '<' '=' '>' '?' '!' */
2794 priv = ch; 2812 priv = ch;
2795 ch = cmd_getc (); 2813 ch = cmd_getc ();
2796 } 2814 }
2797 2815
2798 /* read any numerical arguments */ 2816 /* read any numerical arguments */
… …
2841 { 2859 {
2842 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2860 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2843 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2861 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2844 // 2862 //
2845 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2863 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2846 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2864 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2847 // that we do not support xterm mouse reporting (should be 95 when we do). 2865 // versions.
2848 // 2866 //
2849 tt_printf ("\033[>%d;94;0c", 'U'); 2867 tt_printf ("\033[>%d;95;0c", 'U');
2850 } 2868 }
2851 break; 2869 break;
2870
2852 case '?': 2871 case '?':
2853 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2872 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2854 process_terminal_mode (ch, priv, nargs, arg); 2873 process_terminal_mode (ch, priv, nargs, arg);
2855 break; 2874 break;
2875
2876 case '!':
2877 if (ch == CSI_70)
2878 {
2879 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2880 scr_soft_reset ();
2881
2882 static const int pm_h[] = { 7, 25 };
2883 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2884
2885 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2886 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2856 } 2887 }
2888 break;
2889 }
2890
2857 return; 2891 return;
2858 } 2892 }
2859 2893
2860 switch (ch) 2894 switch (ch)
2861 { 2895 {
… …
3228 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3262 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3229 */ 3263 */
3230void 3264void
3231rxvt_term::process_dcs_seq () 3265rxvt_term::process_dcs_seq ()
3232{ 3266{
3233 char *s;
3234 unicode_t eh;
3235
3236 /* 3267 /*
3237 * Not handled yet 3268 * Not handled yet
3238 */ 3269 */
3270
3271 unicode_t eh;
3239 s = get_to_st (eh); 3272 char *s = get_to_st (eh);
3240 if (s) 3273 if (s)
3241 free (s); 3274 free (s);
3242 3275
3243 return; 3276 return;
3244} 3277}
… …
3248 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3281 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3249 */ 3282 */
3250void 3283void
3251rxvt_term::process_osc_seq () 3284rxvt_term::process_osc_seq ()
3252{ 3285{
3253 unicode_t ch, eh;
3254 int arg; 3286 int arg;
3255 3287
3256 ch = cmd_getc (); 3288 unicode_t ch = cmd_getc ();
3257 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3289 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3258 arg = arg * 10 + (ch - '0'); 3290 arg = arg * 10 + (ch - '0');
3259 3291
3260 if (ch == ';') 3292 if (ch == ';')
3261 { 3293 {
3294 unicode_t eh;
3262 char *s = get_to_st (eh); 3295 char *s = get_to_st (eh);
3263 3296
3264 if (s) 3297 if (s)
3265 { 3298 {
3266 process_xterm_seq (arg, s, eh); 3299 process_xterm_seq (arg, s, eh);
… …
3290 3323
3291/* 3324/*
3292 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3325 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3293 */ 3326 */
3294void 3327void
3295rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3328rxvt_term::process_xterm_seq (int op, char *str, char resp)
3296{ 3329{
3297 int color; 3330 int color;
3298 char *buf, *name; 3331 char *buf, *name;
3299 bool query = str[0] == '?' && !str[1]; 3332 bool query = str[0] == '?' && !str[1];
3300 int saveop = op; 3333 int saveop = op;
… …
3341 3374
3342 XFree (value); 3375 XFree (value);
3343 } 3376 }
3344 else 3377 else
3345 { 3378 {
3346 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3379 char *eq = strchr (str, '=');
3347 3380
3348 if (eq) 3381 if (eq)
3349 { 3382 {
3350 *eq = 0; 3383 *eq = 0;
3351 set_utf8_property (display->atom (str), eq + 1); 3384 set_utf8_property (display->atom (str), eq + 1);
… …
3372 *buf++ = '\0'; 3405 *buf++ = '\0';
3373 3406
3374 process_color_seq (op, color, name, resp); 3407 process_color_seq (op, color, name, resp);
3375 } 3408 }
3376 break; 3409 break;
3410 case Rxvt_restoreFG:
3377 case XTerm_Color00: 3411 case XTerm_Color00:
3378 process_color_seq (op, Color_fg, str, resp); 3412 process_color_seq (op, Color_fg, str, resp);
3379 break; 3413 break;
3414 case Rxvt_restoreBG:
3380 case XTerm_Color01: 3415 case XTerm_Color01:
3381 process_color_seq (op, Color_bg, str, resp); 3416 process_color_seq (op, Color_bg, str, resp);
3382 break; 3417 break;
3383#ifndef NO_CURSORCOLOR 3418#ifndef NO_CURSORCOLOR
3384 case XTerm_Color_cursor: 3419 case XTerm_Color_cursor:
… …
3389 process_color_seq (op, Color_pointer_fg, str, resp); 3424 process_color_seq (op, Color_pointer_fg, str, resp);
3390 break; 3425 break;
3391 case XTerm_Color_pointer_bg: 3426 case XTerm_Color_pointer_bg:
3392 process_color_seq (op, Color_pointer_bg, str, resp); 3427 process_color_seq (op, Color_pointer_bg, str, resp);
3393 break; 3428 break;
3429#ifdef OPTION_HC
3430 case XTerm_Color_HC:
3431 process_color_seq (op, Color_HC, str, resp);
3432 break;
3433 case XTerm_Color_HTC:
3434 process_color_seq (op, Color_HTC, str, resp);
3435 break;
3436#endif
3394#ifndef NO_BOLD_UNDERLINE_REVERSE 3437#ifndef NO_BOLD_UNDERLINE_REVERSE
3395 case XTerm_Color_RV:
3396 process_color_seq (op, Color_RV, str, resp);
3397 break;
3398 case Rxvt_Color_BD:
3399 case URxvt_Color_BD: 3438 case URxvt_Color_BD:
3400 process_color_seq (op, Color_BD, str, resp); 3439 process_color_seq (op, Color_BD, str, resp);
3401 break; 3440 break;
3402 case Rxvt_Color_UL:
3403 case URxvt_Color_UL: 3441 case URxvt_Color_UL:
3404 process_color_seq (op, Color_UL, str, resp); 3442 process_color_seq (op, Color_UL, str, resp);
3405 break; 3443 break;
3406 case URxvt_Color_IT: 3444 case URxvt_Color_IT:
3407 process_color_seq (op, Color_IT, str, resp); 3445 process_color_seq (op, Color_IT, str, resp);
3408 break; 3446 break;
3409#endif 3447#endif
3448 case URxvt_Color_border:
3449 process_color_seq (op, Color_border, str, resp);
3450 break;
3410#if ENABLE_TRANSPARENCY 3451#if ENABLE_TRANSPARENCY
3411 case URxvt_Color_tint: 3452 case URxvt_Color_tint:
3412 process_color_seq (op, Color_tint, str, resp); 3453 process_color_seq (op, Color_tint, str, resp);
3413 { 3454 {
3414 bool changed = false; 3455 bool changed = false;
3456
3415 if (ISSET_PIXCOLOR (Color_tint)) 3457 if (ISSET_PIXCOLOR (Color_tint))
3416 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3458 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3417 else 3459
3418 changed = bgPixmap.unset_tint ();
3419 if (changed) 3460 if (changed)
3420 update_background (); 3461 update_background ();
3421 } 3462 }
3422 3463
3423 break; 3464 break;
… …
3427 case Rxvt_Pixmap: 3468 case Rxvt_Pixmap:
3428 if (!strcmp (str, "?")) 3469 if (!strcmp (str, "?"))
3429 { 3470 {
3430 char str[256]; 3471 char str[256];
3431 3472
3432 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3473 sprintf (str, "[%dx%d+%d+%d]",
3433 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3474 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3434 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3475 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3435 process_xterm_seq (XTerm_title, str, CHAR_ST); 3476 process_xterm_seq (XTerm_title, str, CHAR_ST);
3436 } 3477 }
3437 else 3478 else
3438 { 3479 {
3439 int changed = 0; 3480 int changed = 0;
3440 3481
3441 if (*str != ';') 3482 if (*str != ';')
3442 { 3483 {
3443 /* reset to default scaling :*/
3444 bgPixmap.unset_geometry ();
3445 if (bgPixmap.set_file (str)) /* change pixmap */ 3484 if (bgPixmap.set_file (str)) /* change pixmap */
3485 {
3446 changed++; 3486 changed++;
3447 str = strchr (str, ';'); 3487 str = strchr (str, ';');
3448 if (str == NULL) 3488 if (str == NULL)
3449 bgPixmap.set_defaultGeometry (); 3489 bgPixmap.set_defaultGeometry ();
3490 else
3491 bgPixmap.set_geometry (str+1);
3492 }
3450 } 3493 }
3451 while (str) 3494 else
3452 { 3495 {
3453 str++; 3496 str++;
3454 if (bgPixmap.set_geometry (str)) 3497 if (bgPixmap.set_geometry (str, true))
3455 changed++; 3498 changed++;
3456 str = strchr (str, ';');
3457 } 3499 }
3500
3458 if (changed) 3501 if (changed)
3502 {
3503 if (bgPixmap.window_position_sensitive ())
3504 {
3505 int x, y;
3506 get_window_origin (x, y);
3507 bgPixmap.set_position (x, y);
3508 }
3459 update_background (); 3509 update_background ();
3510 }
3460 } 3511 }
3461 break; 3512 break;
3462#endif 3513#endif
3463
3464 case Rxvt_restoreFG:
3465 set_window_color (Color_fg, str);
3466 break;
3467 case Rxvt_restoreBG:
3468 set_window_color (Color_bg, str);
3469 break;
3470 3514
3471 case XTerm_logfile: 3515 case XTerm_logfile:
3472 // TODO, when secure mode? 3516 // TODO, when secure mode?
3473 break; 3517 break;
3474 3518
… …
3541 break; 3585 break;
3542#endif 3586#endif
3543 3587
3544#if ENABLE_PERL 3588#if ENABLE_PERL
3545 case URxvt_perl: 3589 case URxvt_perl:
3546 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3590 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3547 ; // no responses yet
3548 break; 3591 break;
3549#endif 3592#endif
3550 } 3593 }
3551} 3594}
3552/*----------------------------------------------------------------------*/ 3595/*----------------------------------------------------------------------*/
… …
3575 { 3618 {
3576 if (mode == 'r') 3619 if (mode == 'r')
3577 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3620 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3578 else 3621 else
3579 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3622 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3580 PrivMode (state, bit); 3623
3624 set_privmode (bit, state);
3581 } 3625 }
3582 3626
3583 return state; 3627 return state;
3584} 3628}
3585 3629
… …
3593 static const struct 3637 static const struct
3594 { 3638 {
3595 const int argval; 3639 const int argval;
3596 const unsigned long bit; 3640 const unsigned long bit;
3597 } argtopriv[] = { 3641 } argtopriv[] = {
3598 { 1, PrivMode_aplCUR }, 3642 { 1, PrivMode_aplCUR }, // DECCKM
3599 { 2, PrivMode_vt52 }, 3643 { 2, PrivMode_vt52 },
3600 { 3, PrivMode_132 }, 3644 { 3, PrivMode_132 }, // DECCOLM
3601 { 4, PrivMode_smoothScroll }, 3645 { 4, PrivMode_smoothScroll }, // DECSCLM
3602 { 5, PrivMode_rVideo }, 3646 { 5, PrivMode_rVideo }, // DECSCNM
3603 { 6, PrivMode_relOrigin }, 3647 { 6, PrivMode_relOrigin }, // DECOM
3604 { 7, PrivMode_Autowrap }, 3648 { 7, PrivMode_Autowrap }, // DECAWM
3605 // 8, bi-directional support mode 3649 // 8, auto-repeat keys // DECARM
3606 { 9, PrivMode_MouseX10 }, 3650 { 9, PrivMode_MouseX10 },
3607 // 18, 19 printing-related 3651 // 18 end FF to printer after print screen
3652 // 19 Print screen prints full screen/scroll region
3608 { 25, PrivMode_VisibleCursor }, 3653 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3609#ifdef scrollBar_esc 3654#ifdef scrollBar_esc
3610 { scrollBar_esc, PrivMode_scrollBar }, 3655 { scrollBar_esc, PrivMode_scrollBar },
3611#endif 3656#endif
3612 { 35, PrivMode_ShiftKeys }, // rxvt extension 3657 { 35, PrivMode_ShiftKeys }, // rxvt extension
3658 // 38, tektronix mode // DECTEK
3613 { 40, PrivMode_132OK }, 3659 { 40, PrivMode_132OK },
3614 // 41 xterm more fixes NYI 3660 // 41 xterm more fixes NYI
3615 // 45 margin bell NYI 3661 // 45 margin bell NYI
3616 // 46 start logging 3662 // 46 start logging
3617 { 47, PrivMode_Screen }, 3663 { 47, PrivMode_Screen },
3618 { 66, PrivMode_aplKP }, 3664 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3619#ifndef NO_BACKSPACE_KEY 3665#ifndef NO_BACKSPACE_KEY
3620 { 67, PrivMode_BackSpace }, 3666 { 67, PrivMode_BackSpace }, // DECBKM
3621#endif 3667#endif
3622 { 1000, PrivMode_MouseX11 }, 3668 { 1000, PrivMode_MouseX11 },
3623 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3669 { 1002, PrivMode_MouseBtnEvent },
3624 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3670 { 1003, PrivMode_MouseAnyEvent },
3625 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3671#if ENABLE_FRILLS
3672 { 1005, PrivMode_ExtModeMouse },
3673#endif
3626 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3674 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3627 { 1011, PrivMode_Keypress }, // rxvt extension 3675 { 1011, PrivMode_Keypress }, // rxvt extension
3676#if ENABLE_FRILLS
3677 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3678#endif
3628 // 1035 enable modifiers for alt, numlock NYI 3679 // 1035 enable modifiers for alt, numlock NYI
3629 // 1036 send ESC for meta keys NYI 3680 // 1036 send ESC for meta keys NYI
3630 // 1037 send DEL for keypad delete NYI 3681 // 1037 send DEL for keypad delete NYI
3631 { 1047, PrivMode_Screen }, 3682 { 1047, PrivMode_Screen },
3632 // 1048 save and restore cursor 3683 // 1048 save and restore cursor, implemented in code
3633 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3684 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3634 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3685 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3686 { 2004, PrivMode_BracketPaste },
3635 }; 3687 };
3636 3688
3637 if (nargs == 0) 3689 if (nargs == 0)
3638 return; 3690 return;
3639 3691
… …
3646 for (i = 0; i < nargs; i++) 3698 for (i = 0; i < nargs; i++)
3647 { 3699 {
3648 state = -1; 3700 state = -1;
3649 3701
3650 /* basic handling */ 3702 /* basic handling */
3651 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3703 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3652 if (argtopriv[j].argval == arg[i]) 3704 if (argtopriv[j].argval == arg[i])
3653 { 3705 {
3654 state = privcases (mode, argtopriv[j].bit); 3706 state = privcases (mode, argtopriv[j].bit);
3655 break; 3707 break;
3656 } 3708 }
… …
3664 3716
3665 scr_touch (true); 3717 scr_touch (true);
3666 break; 3718 break;
3667#endif 3719#endif
3668 case 1048: /* alternative cursor save */ 3720 case 1048: /* alternative cursor save */
3669 case 1049:
3670 if (option (Opt_secondaryScreen)) 3721 if (option (Opt_secondaryScreen))
3671 if (mode == 0) 3722 if (mode == 0)
3672 scr_cursor (RESTORE); 3723 scr_cursor (RESTORE);
3673 else if (mode == 1) 3724 else if (mode == 1)
3674 scr_cursor (SAVE); 3725 scr_cursor (SAVE);
… …
3683 case 2: /* VT52 mode */ 3734 case 2: /* VT52 mode */
3684 /* oddball mode. should be set regardless of set/reset 3735 /* oddball mode. should be set regardless of set/reset
3685 * parameter. Return from VT52 mode with an ESC < from 3736 * parameter. Return from VT52 mode with an ESC < from
3686 * within VT52 mode 3737 * within VT52 mode
3687 */ 3738 */
3688 PrivMode (1, PrivMode_vt52); 3739 set_privmode (PrivMode_vt52, 1);
3689 break; 3740 break;
3690 case 3: /* 80/132 */ 3741 case 3: /* 80/132 */
3691 if (priv_modes & PrivMode_132OK) 3742 if (priv_modes & PrivMode_132OK)
3692 set_widthheight (((state ? 132 : 80) * fwidth), height); 3743 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3693 break; 3744 break;
3694 case 4: /* smooth scrolling */ 3745 case 4: /* smooth scrolling */
3695 set_option (Opt_jumpScroll, !state); 3746 set_option (Opt_jumpScroll, !state);
3696 break; 3747 break;
3697 case 5: /* reverse video */ 3748 case 5: /* reverse video */
… …
3704 scr_autowrap (state); 3755 scr_autowrap (state);
3705 break; 3756 break;
3706 /* case 8: - auto repeat, can't do on a per window basis */ 3757 /* case 8: - auto repeat, can't do on a per window basis */
3707 case 9: /* X10 mouse reporting */ 3758 case 9: /* X10 mouse reporting */
3708 if (state) /* orthogonal */ 3759 if (state) /* orthogonal */
3709 priv_modes &= ~PrivMode_MouseX11; 3760 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3710 break; 3761 break;
3711#ifdef scrollBar_esc 3762#ifdef scrollBar_esc
3712 case scrollBar_esc: 3763 case scrollBar_esc:
3713 if (scrollbar_mapping (state)) 3764 if (scrollBar.map (state))
3714 { 3765 {
3715 resize_all_windows (0, 0, 0); 3766 resize_all_windows (0, 0, 0);
3716 scr_touch (true); 3767 scr_touch (true);
3717 } 3768 }
3718 break; 3769 break;
… …
3727 break; 3778 break;
3728 /* case 66: - application key pad */ 3779 /* case 66: - application key pad */
3729 /* case 67: - backspace key */ 3780 /* case 67: - backspace key */
3730 case 1000: /* X11 mouse reporting */ 3781 case 1000: /* X11 mouse reporting */
3731 if (state) /* orthogonal */ 3782 if (state) /* orthogonal */
3732 priv_modes &= ~PrivMode_MouseX10; 3783 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3733 break; 3784 break;
3734#if 0
3735 case 1001: 3785 case 1002:
3736 break; /* X11 mouse highlighting */ 3786 case 1003:
3737#endif 3787 if (state)
3788 {
3789 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3790 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3791 mouse_row = mouse_col = 0;
3792 vt_emask_mouse = PointerMotionMask;
3793 }
3794 else
3795 vt_emask_mouse = NoEventMask;
3796
3797 vt_select_input ();
3798 break;
3738 case 1010: /* scroll to bottom on TTY output inhibit */ 3799 case 1010: /* scroll to bottom on TTY output inhibit */
3739 set_option (Opt_scrollTtyOutput, !state); 3800 set_option (Opt_scrollTtyOutput, !state);
3740 break; 3801 break;
3741 case 1011: /* scroll to bottom on key press */ 3802 case 1011: /* scroll to bottom on key press */
3742 set_option (Opt_scrollTtyKeypress, state); 3803 set_option (Opt_scrollTtyKeypress, state);
3743 break; 3804 break;
3744 case 1047: /* secondary screen w/ clearing last */ 3805 case 1047: /* secondary screen w/ clearing last */
3745 if (option (Opt_secondaryScreen)) 3806 if (option (Opt_secondaryScreen))
3746 if (current_screen != PRIMARY) 3807 if (!state)
3747 scr_erase_screen (2); 3808 scr_erase_screen (2);
3809
3748 scr_change_screen (state); 3810 scr_change_screen (state);
3749 break; 3811 break;
3750 case 1049: /* secondary screen w/ clearing first */ 3812 case 1049: /* secondary screen w/ clearing first */
3813 if (option (Opt_secondaryScreen))
3814 if (state)
3815 scr_cursor (SAVE);
3816
3751 scr_change_screen (state); 3817 scr_change_screen (state);
3818
3752 if (option (Opt_secondaryScreen)) 3819 if (option (Opt_secondaryScreen))
3753 if (current_screen != PRIMARY) 3820 if (state)
3754 scr_erase_screen (2); 3821 scr_erase_screen (2);
3822 else
3823 scr_cursor (RESTORE);
3755 break; 3824 break;
3756 default: 3825 default:
3757 break; 3826 break;
3758 } 3827 }
3759 } 3828 }
… …
3919rxvt_term::process_graphics () 3988rxvt_term::process_graphics ()
3920{ 3989{
3921 unicode_t ch, cmd = cmd_getc (); 3990 unicode_t ch, cmd = cmd_getc ();
3922 3991
3923 if (cmd == 'Q') 3992 if (cmd == 'Q')
3993 {
3924 { /* query graphics */ 3994 /* query graphics */
3925 tt_printf ("\033G0\012"); /* no graphics */ 3995 tt_printf ("\033G0\012"); /* no graphics */
3926 return; 3996 return;
3927 } 3997 }
3928 /* swallow other graphics sequences until terminating ':' */ 3998 /* swallow other graphics sequences until terminating ':' */
3929 do 3999 do
… …
3952 4022
3953/* ---------------------------------------------------------------------- */ 4023/* ---------------------------------------------------------------------- */
3954/* Write data to the pty as typed by the user, pasted with the mouse, 4024/* Write data to the pty as typed by the user, pasted with the mouse,
3955 * or generated by us in response to a query ESC sequence. 4025 * or generated by us in response to a query ESC sequence.
3956 */ 4026 */
3957const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4027static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3958 4028
3959void 4029void
3960rxvt_term::tt_write (const char *data, unsigned int len) 4030rxvt_term::tt_write (const char *data, unsigned int len)
3961{ 4031{
3962 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4032 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3974 4044
3975 data += written; 4045 data += written;
3976 len -= written; 4046 len -= written;
3977 } 4047 }
3978 4048
3979 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4049 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3980 4050
3981 memcpy (v_buffer + v_buflen, data, len); 4051 memcpy (v_buffer + v_buflen, data, len);
3982 v_buflen += len; 4052 v_buflen += len;
3983 4053
3984 pty_ev.set (EVENT_READ | EVENT_WRITE); 4054 pty_ev.set (ev::READ | ev::WRITE);
3985} 4055}
3986 4056
3987void rxvt_term::pty_write () 4057void rxvt_term::pty_write ()
3988{ 4058{
3989 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4059 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
3995 if (v_buflen == 0) 4065 if (v_buflen == 0)
3996 { 4066 {
3997 free (v_buffer); 4067 free (v_buffer);
3998 v_buffer = 0; 4068 v_buffer = 0;
3999 4069
4000 pty_ev.set (EVENT_READ); 4070 pty_ev.set (ev::READ);
4001 return; 4071 return;
4002 } 4072 }
4003 4073
4004 memmove (v_buffer, v_buffer + written, v_buflen); 4074 memmove (v_buffer, v_buffer + written, v_buflen);
4005 } 4075 }
4006 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4076 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4007 pty_ev.set (EVENT_READ); 4077 pty_ev.set (ev::READ);
4008} 4078}
4009 4079
4010/*----------------------- end-of-file (C source) -----------------------*/ 4080/*----------------------- end-of-file (C source) -----------------------*/
4011 4081

Diff Legend

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