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.359 by ayin, Mon Oct 15 14:56:06 2007 UTC vs.
Revision 1.480 by sf-exg, Mon Mar 7 11:48:55 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-2011 Marc Lehmann <schmorp@schmorp.de>
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
… …
1034 973
1035void 974void
1036rxvt_term::flush () 975rxvt_term::flush ()
1037{ 976{
1038 flush_ev.stop (); 977 flush_ev.stop ();
1039 978
1040#ifdef HAVE_BG_PIXMAP 979#ifdef HAVE_BG_PIXMAP
1041 if (bgPixmap.check_clearChanged ()) 980 if (bg_flags & BG_NEEDS_REFRESH)
1042 { 981 {
1043// scr_clear (true); This needs to be researched further! 982 bg_flags &= ~BG_NEEDS_REFRESH;
1044 scr_touch (false); 983 scr_touch (false);
1045 } 984 }
1046#endif 985#endif
1047 986
1048 if (want_refresh) 987 if (want_refresh)
… …
1084 } 1023 }
1085 while (row < end_row); 1024 while (row < end_row);
1086 } 1025 }
1087 1026
1088 scr_refresh (); 1027 scr_refresh ();
1089 scrollbar_show (1); 1028 scrollBar.show (1);
1090#ifdef USE_XIM 1029#ifdef USE_XIM
1091 IMSendSpot (); 1030 IMSendSpot ();
1092#endif 1031#endif
1093 } 1032 }
1094 1033
1095 display->flush (); 1034 display->flush ();
1096} 1035}
1097 1036
1037/* checks whether a refresh is requested and starts the refresh timer */
1098void 1038void
1099rxvt_term::check_cb (check_watcher &w) 1039rxvt_term::refresh_check ()
1100{ 1040{
1101 make_current (); 1041 if (want_refresh && !flush_ev.is_active ())
1042 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1102 1043
1103 display->flush (); 1044 display->flush ();
1104
1105 if (want_refresh && !flush_ev.active)
1106 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1107} 1045}
1108 1046
1109void 1047void
1110rxvt_term::flush_cb (time_watcher &w) 1048rxvt_term::flush_cb (ev::timer &w, int revents)
1111{ 1049{
1112 make_current (); 1050 make_current ();
1113 1051
1114 refresh_count = 0; 1052 refresh_count = 0;
1115 flush (); 1053 flush ();
1116} 1054}
1117 1055
1118#ifdef CURSOR_BLINK 1056#ifdef CURSOR_BLINK
1119void 1057void
1120rxvt_term::cursor_blink_cb (time_watcher &w) 1058rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1121{ 1059{
1122 hidden_cursor = !hidden_cursor; 1060 hidden_cursor = !hidden_cursor;
1123 want_refresh = 1; 1061 want_refresh = 1;
1124 1062 refresh_check ();
1125 w.start (w.at + CURSOR_BLINK_INTERVAL);
1126} 1063}
1127#endif 1064#endif
1128 1065
1129#ifdef TEXT_BLINK 1066#ifdef TEXT_BLINK
1130void 1067void
1131rxvt_term::text_blink_cb (time_watcher &w) 1068rxvt_term::text_blink_cb (ev::timer &w, int revents)
1132{ 1069{
1133 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1070 if (scr_refresh_rend (RS_Blink, RS_Blink))
1134 { 1071 {
1135 hidden_text = !hidden_text; 1072 hidden_text = !hidden_text;
1136 want_refresh = 1; 1073 want_refresh = 1;
1137 w.start (w.at + TEXT_BLINK_INTERVAL); 1074 refresh_check ();
1138 } 1075 }
1076 else
1077 w.stop ();
1139} 1078}
1140#endif 1079#endif
1141 1080
1142#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1081#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1143void 1082void
1144rxvt_term::cont_scroll_cb (time_watcher &w) 1083rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1145{ 1084{
1146 if ((scrollbar_isUp() || scrollbar_isDn()) && 1085 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1147 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1086 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1148 { 1087 {
1149 want_refresh = 1; 1088 want_refresh = 1;
1150 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1089 refresh_check ();
1151 } 1090 }
1091 else
1092 w.stop ();
1152} 1093}
1153#endif 1094#endif
1154 1095
1155#ifdef SELECTION_SCROLLING 1096#ifdef SELECTION_SCROLLING
1156void 1097void
1157rxvt_term::sel_scroll_cb (time_watcher &w) 1098rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1158{ 1099{
1159 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1100 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1160 { 1101 {
1161 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1102 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1162 want_refresh = 1; 1103 want_refresh = 1;
1163 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1104 refresh_check ();
1164 } 1105 }
1106 else
1107 w.stop ();
1165} 1108}
1166#endif 1109#endif
1167 1110
1168#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1111#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1169void 1112void
1170rxvt_term::slip_wheel_cb (time_watcher &w) 1113rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1171{ 1114{
1172 if (mouse_slip_wheel_speed == 0 1115 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1173 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1174 : scr_page (UP, mouse_slip_wheel_speed))
1175 { 1116 {
1176 if (view_start == top_row || view_start == 0)
1177 mouse_slip_wheel_speed = 0;
1178
1179 want_refresh = 1; 1117 want_refresh = 1;
1180 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 ();
1181 } 1125 }
1182} 1126}
1183#endif 1127#endif
1184 1128
1185#if LINUX_YIELD_HACK 1129#if LINUX_YIELD_HACK
1186static struct event_handler 1130static struct event_handler
1187{ 1131{
1188 check_watcher yield_ev; 1132 ev::prepare yield_ev;
1189 1133
1190 void yield_cb (check_watcher &w) 1134 void yield_cb (ev::prepare &w, int revents)
1191 { 1135 {
1192 // this should really be sched_yield(), but the linux guys thought 1136 // this should really be sched_yield(), but the linux guys thought
1193 // that giving a process calling sched_yield () less cpu time than 1137 // that giving a process calling sched_yield () less cpu time than
1194 // ones with high nice levels is a useful thing to do. It surely is is 1138 // ones with high nice levels is a useful thing to do. It surely is is
1195 // 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.
1196 1143
1197 struct timespec ts = { 0, 0 }; 1144 struct timespec ts = { 0, 1000 };
1198 nanosleep (&ts, 0); 1145 nanosleep (&ts, 0);
1199 1146
1200 w.stop (); 1147 w.stop ();
1201 } 1148 }
1202 1149
… …
1211rxvt_term::pty_fill () 1158rxvt_term::pty_fill ()
1212{ 1159{
1213 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1160 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1214 1161
1215 if (CBUFSIZ == n) 1162 if (CBUFSIZ == n)
1216 { 1163 n = 0; // normally this indicates a "too long" command sequence - just drop the data we have
1217 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1218 n = 0;
1219 }
1220 1164
1221 memmove (cmdbuf_base, cmdbuf_ptr, n); 1165 memmove (cmdbuf_base, cmdbuf_ptr, n);
1222 cmdbuf_ptr = cmdbuf_base; 1166 cmdbuf_ptr = cmdbuf_base;
1223 cmdbuf_endp = cmdbuf_ptr + n; 1167 cmdbuf_endp = cmdbuf_ptr + n;
1224 1168
… …
1246 1190
1247 return false; 1191 return false;
1248} 1192}
1249 1193
1250void 1194void
1251rxvt_term::pty_cb (io_watcher &w, short revents) 1195rxvt_term::pty_cb (ev::io &w, int revents)
1252{ 1196{
1253 make_current (); 1197 make_current ();
1254 1198
1255 if (revents & EVENT_READ) 1199 if (revents & ev::READ)
1256 // loop, but don't allow a single term to monopolize us 1200 // loop, but don't allow a single term to monopolize us
1257 while (pty_fill ()) 1201 for (int i = CBUFCNT; i-- && pty_fill (); )
1258 if (cmd_parse ()) 1202 cmd_parse ();
1259 break;
1260 1203
1261 if (revents & EVENT_WRITE) 1204 if (revents & ev::WRITE)
1262 pty_write (); 1205 pty_write ();
1206
1207 refresh_check ();
1263} 1208}
1264 1209
1265void 1210void
1266rxvt_term::pointer_unblank () 1211rxvt_term::pointer_unblank ()
1267{ 1212{
… …
1270 1215
1271#ifdef POINTER_BLANK 1216#ifdef POINTER_BLANK
1272 hidden_pointer = 0; 1217 hidden_pointer = 0;
1273 1218
1274 if (option (Opt_pointerBlank)) 1219 if (option (Opt_pointerBlank))
1275 pointer_ev.start (NOW + pointerBlankDelay); 1220 pointer_ev.start (pointerBlankDelay);
1276#endif 1221#endif
1277} 1222}
1278 1223
1279#ifdef POINTER_BLANK 1224#ifdef POINTER_BLANK
1280void 1225void
… …
1288 1233
1289 hidden_pointer = 1; 1234 hidden_pointer = 1;
1290} 1235}
1291 1236
1292void 1237void
1293rxvt_term::pointer_cb (time_watcher &w) 1238rxvt_term::pointer_cb (ev::timer &w, int revents)
1294{ 1239{
1295 make_current (); 1240 make_current ();
1296 1241
1297 pointer_blank (); 1242 pointer_blank ();
1298} 1243}
… …
1301void 1246void
1302rxvt_term::mouse_report (XButtonEvent &ev) 1247rxvt_term::mouse_report (XButtonEvent &ev)
1303{ 1248{
1304 int button_number, key_state = 0; 1249 int button_number, key_state = 0;
1305 int x, y; 1250 int x, y;
1251 int code = 32;
1306 1252
1307 x = Pixel2Col (ev.x); 1253 x = Pixel2Col (ev.x) + 1;
1308 y = Pixel2Row (ev.y); 1254 y = Pixel2Row (ev.y) + 1;
1255
1256 if (ev.type == MotionNotify)
1257 {
1258 if (x == mouse_row && y == mouse_col)
1259 return;
1260
1261 mouse_row = x;
1262 mouse_col = y;
1263 code += 32;
1264 }
1309 1265
1310 if (MEvent.button == AnyButton) 1266 if (MEvent.button == AnyButton)
1311 button_number = 3; 1267 button_number = 3;
1312 else 1268 else
1313 { 1269 {
1314 button_number = MEvent.button - Button1; 1270 button_number = MEvent.button - Button1;
1315 /* add 0x3D for wheel events, like xterm does */ 1271 /* add 0x3D for wheel events, like xterm does */
1316 if (button_number >= 3) 1272 if (button_number >= 3)
1317 button_number += (64 - 3); 1273 button_number += 64 - 3;
1318 } 1274 }
1319 1275
1320 if (priv_modes & PrivMode_MouseX10) 1276 if (priv_modes & PrivMode_MouseX10)
1321 { 1277 {
1322 /* 1278 /*
… …
1354 fputc ('A', stderr); 1310 fputc ('A', stderr);
1355 if (key_state & 32) 1311 if (key_state & 32)
1356 fputc ('2', stderr); 1312 fputc ('2', stderr);
1357 fprintf (stderr, "]: <%d>, %d/%d\n", 1313 fprintf (stderr, "]: <%d>, %d/%d\n",
1358 button_number, 1314 button_number,
1359 x + 1, 1315 x,
1360 y + 1); 1316 y);
1361#endif 1317#endif
1362 1318
1319#if ENABLE_FRILLS
1320 if (priv_modes & PrivMode_ExtMouseRight)
1321 tt_printf ("\033[%d;%d;%dM",
1322 code + button_number + key_state,
1323 x,
1324 y);
1325 else if (priv_modes & PrivMode_ExtModeMouse)
1326 tt_printf ("\033[M%c%lc%lc",
1327 code + button_number + key_state,
1328 wint_t (32 + x),
1329 wint_t (32 + y));
1330 else
1331#endif
1363 tt_printf ("\033[M%c%c%c", 1332 tt_printf ("\033[M%c%c%c",
1364 (32 + button_number + key_state), 1333 code + button_number + key_state,
1365 (32 + x + 1), 1334 32 + x,
1366 (32 + y + 1)); 1335 32 + y);
1367} 1336}
1368 1337
1369/*{{{ process an X event */ 1338/*{{{ process an X event */
1370void 1339void
1371rxvt_term::x_cb (XEvent &ev) 1340rxvt_term::x_cb (XEvent &ev)
… …
1473 && ev.xfocus.mode != NotifyGrab) 1442 && ev.xfocus.mode != NotifyGrab)
1474 focus_out (); 1443 focus_out ();
1475 break; 1444 break;
1476 1445
1477 case ConfigureNotify: 1446 case ConfigureNotify:
1478 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1479 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1480 szHint.width, szHint.height); */
1481 if (ev.xconfigure.window == parent[0]) 1447 if (ev.xconfigure.window == parent[0])
1482 { 1448 {
1483 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1449 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1484 ; 1450 ;
1451
1452#ifdef HAVE_BG_PIXMAP
1453 bool moved = false;
1454 if (bg_window_position_sensitive ())
1455 {
1456 int x, y;
1457 if (ev.xconfigure.send_event)
1458 {
1459 x = ev.xconfigure.x;
1460 y = ev.xconfigure.y;
1461 }
1462 else
1463 get_window_origin (x, y);
1464
1465 if (bg_set_position (x, y)
1466 || !(bg_flags & BG_IS_VALID))
1467 moved = true;
1468 }
1469#endif
1485 1470
1486 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1471 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1487 { 1472 {
1488 seen_resize = 1; 1473 seen_resize = 1;
1489 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1474 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1490 } 1475 }
1491 else 1476 else
1492 { 1477 {
1493#ifdef HAVE_BG_PIXMAP 1478#ifdef HAVE_BG_PIXMAP
1494 if (bgPixmap.window_position_sensitive ()) 1479 if (moved)
1480 {
1481 if (mapped)
1495 update_background (); 1482 update_background ();
1483 else
1484 bg_invalidate ();
1485 }
1496#endif 1486#endif
1497 } 1487 }
1488
1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1489 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1499 } 1490 }
1500 break; 1491 break;
1501 1492
1502 case PropertyNotify: 1493 case PropertyNotify:
1503 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1494 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1504 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1505 && ev.xproperty.state == PropertyNewValue)
1506 selection_property (ev.xproperty.window, ev.xproperty.atom);
1507
1508 break; 1495 break;
1509 1496
1510 case SelectionClear: 1497 case SelectionClear:
1511 selection_clear (); 1498 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1512 break;
1513
1514 case SelectionNotify:
1515 if (selection_wait == Sel_normal)
1516 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1517 break; 1499 break;
1518 1500
1519 case SelectionRequest: 1501 case SelectionRequest:
1520 selection_send (ev.xselectionrequest); 1502 selection_send (ev.xselectionrequest);
1521 break; 1503 break;
1522 1504
1523 case MapNotify: 1505 case MapNotify:
1506#ifdef HAVE_BG_PIXMAP
1507 /* This is needed specifically to fix the case of no window manager or a
1508 * non-reparenting window manager. In those cases we never get first
1509 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1510 * care of multiplicity of ConfigureNotify events arriving while WM does
1511 * reparenting.
1512 * We should not render background immediately, as there could be several
1513 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1514 * by scheduling background redraw as soon as we can, but giving a short
1515 * bit of time for ConfigureNotifies to arrive.
1516 * We should render background PRIOR to drawing any text, but AFTER all
1517 * of ConfigureNotifys for the best results.
1518 */
1519 if (!(bg_flags & BG_IS_VALID))
1520 update_background_ev.start (0.025);
1521#endif
1524 mapped = 1; 1522 mapped = 1;
1525#ifdef TEXT_BLINK 1523#ifdef TEXT_BLINK
1526 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1524 text_blink_ev.start ();
1527#endif 1525#endif
1528 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1526 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1529 break; 1527 break;
1530 1528
1531 case UnmapNotify: 1529 case UnmapNotify:
… …
1541 if (ev.xany.window == vt) 1539 if (ev.xany.window == vt)
1542 { 1540 {
1543 do 1541 do
1544 { 1542 {
1545 scr_expose (ev.xexpose.x, ev.xexpose.y, 1543 scr_expose (ev.xexpose.x, ev.xexpose.y,
1546 ev.xexpose.width, ev.xexpose.height, False); 1544 ev.xexpose.width, ev.xexpose.height, false);
1547 } 1545 }
1548 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1546 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1549 1547
1550 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1551 1549
1552 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1550 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1553 { 1551 {
1554 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1555 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, false);
1556 } 1554 }
1555
1557 want_refresh = 1; 1556 want_refresh = 1;
1558 } 1557 }
1559 else 1558 else
1560 { 1559 {
1561 XEvent unused_event; 1560 XEvent unused_event;
… …
1563 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1562 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1564 ; 1563 ;
1565 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1564 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1566 ; 1565 ;
1567 1566
1568 if (isScrollbarWindow (ev.xany.window)) 1567 if (scrollBar.state && ev.xany.window == scrollBar.win)
1569 { 1568 {
1570 scrollBar.setIdle (); 1569 scrollBar.state = STATE_IDLE;
1571 scrollbar_show (0); 1570 scrollBar.show (0);
1572 } 1571 }
1573 } 1572 }
1574 break; 1573 break;
1575 1574
1576 case MotionNotify: 1575 case MotionNotify:
1577#ifdef POINTER_BLANK 1576#ifdef POINTER_BLANK
1578 if (hidden_pointer) 1577 if (hidden_pointer)
1579 pointer_unblank (); 1578 pointer_unblank ();
1580#endif 1579#endif
1580 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1581 || priv_modes & PrivMode_MouseAnyEvent)
1582 mouse_report (ev.xbutton);
1581 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1583 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1582 break; 1584 break;
1583 1585
1584 if (ev.xany.window == vt) 1586 if (ev.xany.window == vt)
1585 { 1587 {
… …
1619 int dist; 1621 int dist;
1620 1622
1621 /* don't clobber the current delay if we are 1623 /* don't clobber the current delay if we are
1622 * already in the middle of scrolling. 1624 * already in the middle of scrolling.
1623 */ 1625 */
1624 if (!sel_scroll_ev.active) 1626 if (!sel_scroll_ev.is_active ())
1625 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1627 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1626 1628
1627 /* save the event params so we can highlight 1629 /* save the event params so we can highlight
1628 * the selection in the pending-scroll loop 1630 * the selection in the pending-scroll loop
1629 */ 1631 */
1630 selection_save_x = ev.xbutton.x; 1632 selection_save_x = ev.xbutton.x;
… …
1652 else 1654 else
1653 { 1655 {
1654 /* we are within the text window, so we 1656 /* we are within the text window, so we
1655 * shouldn't be scrolling 1657 * shouldn't be scrolling
1656 */ 1658 */
1657 if (sel_scroll_ev.active)
1658 sel_scroll_ev.stop(); 1659 sel_scroll_ev.stop();
1659 } 1660 }
1660#endif 1661#endif
1661#ifdef MOUSE_THRESHOLD 1662#ifdef MOUSE_THRESHOLD
1662 } 1663 }
1663#endif 1664#endif
1664 } 1665 }
1665 } 1666 }
1666 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1667 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1667 { 1668 {
1668 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1669 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1669 MotionNotify, &ev)) 1670 MotionNotify, &ev))
1670 ; 1671 ;
1671 1672
… …
1673 &unused_root, &unused_child, 1674 &unused_root, &unused_child,
1674 &unused_root_x, &unused_root_y, 1675 &unused_root_x, &unused_root_y,
1675 &ev.xbutton.x, &ev.xbutton.y, 1676 &ev.xbutton.x, &ev.xbutton.y,
1676 &unused_mask); 1677 &unused_mask);
1677 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1678 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1678 scrollbar_size ()); 1679 scrollBar.size ());
1679 want_refresh = 1; 1680 want_refresh = 1;
1680 scrollbar_show (1); 1681 scrollBar.show (1);
1681 } 1682 }
1682 break; 1683 break;
1683 } 1684 }
1684 1685
1685#if defined(CURSOR_BLINK) 1686#if defined(CURSOR_BLINK)
… …
1689 { 1690 {
1690 hidden_cursor = 0; 1691 hidden_cursor = 0;
1691 want_refresh = 1; 1692 want_refresh = 1;
1692 } 1693 }
1693 1694
1694 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1695 cursor_blink_ev.again ();
1695 } 1696 }
1696#endif 1697#endif
1697 1698
1698#if defined(POINTER_BLANK) 1699#if defined(POINTER_BLANK)
1699 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1700 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1706 1707
1707 if (ev.type == KeyPress && hidden_pointer == 0) 1708 if (ev.type == KeyPress && hidden_pointer == 0)
1708 pointer_blank (); 1709 pointer_blank ();
1709 } 1710 }
1710#endif 1711#endif
1712
1713 refresh_check ();
1711} 1714}
1715
1716#if ENABLE_FRILLS
1717void
1718rxvt_term::set_urgency (bool enable)
1719{
1720 if (enable == urgency_hint)
1721 return;
1722
1723 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1724 {
1725 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1726 XSetWMHints (dpy, parent[0], h);
1727 urgency_hint = enable;
1728 }
1729}
1730#endif
1712 1731
1713void 1732void
1714rxvt_term::focus_in () 1733rxvt_term::focus_in ()
1715{ 1734{
1716 if (!focus) 1735 if (!focus)
1717 { 1736 {
1718 focus = 1; 1737 focus = 1;
1719 want_refresh = 1; 1738 want_refresh = 1;
1720 1739
1721 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1722
1723#if USE_XIM 1740#if USE_XIM
1724 if (Input_Context != NULL) 1741 if (Input_Context != NULL)
1725 { 1742 {
1726 IMSetPosition (); 1743 IMSetPosition ();
1727 XSetICFocus (Input_Context); 1744 XSetICFocus (Input_Context);
1728 } 1745 }
1729#endif 1746#endif
1730#if CURSOR_BLINK 1747#if CURSOR_BLINK
1731 if (option (Opt_cursorBlink)) 1748 if (option (Opt_cursorBlink))
1732 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1749 cursor_blink_ev.again ();
1733#endif 1750#endif
1734#if OFF_FOCUS_FADING 1751#if OFF_FOCUS_FADING
1735 if (rs[Rs_fade]) 1752 if (rs[Rs_fade])
1736 { 1753 {
1737 pix_colors = pix_colors_focused; 1754 pix_colors = pix_colors_focused;
1738 scr_recolour (); 1755 scr_recolour ();
1739 } 1756 }
1740#endif 1757#endif
1741#if ENABLE_FRILLS 1758#if ENABLE_FRILLS
1742 if (option (Opt_urgentOnBell)) 1759 if (option (Opt_urgentOnBell))
1743 { 1760 set_urgency (0);
1744 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1745 {
1746 h->flags &= ~XUrgencyHint;
1747 XSetWMHints (dpy, parent[0], h);
1748 }
1749 }
1750#endif 1761#endif
1762
1763 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1751 } 1764 }
1752} 1765}
1753 1766
1754void 1767void
1755rxvt_term::focus_out () 1768rxvt_term::focus_out ()
… …
1757 if (focus) 1770 if (focus)
1758 { 1771 {
1759 focus = 0; 1772 focus = 0;
1760 want_refresh = 1; 1773 want_refresh = 1;
1761 1774
1762 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1775#if ENABLE_FRILLS
1763 1776 if (option (Opt_urgentOnBell))
1777 set_urgency (0);
1778#endif
1764#if ENABLE_FRILLS || ISO_14755 1779#if ENABLE_FRILLS || ISO_14755
1765 if (iso14755buf) 1780 if (iso14755buf)
1766 { 1781 {
1767 iso14755buf = 0; 1782 iso14755buf = 0;
1768# if ISO_14755 1783# if ISO_14755
… …
1775 XUnsetICFocus (Input_Context); 1790 XUnsetICFocus (Input_Context);
1776#endif 1791#endif
1777#if CURSOR_BLINK 1792#if CURSOR_BLINK
1778 if (option (Opt_cursorBlink)) 1793 if (option (Opt_cursorBlink))
1779 cursor_blink_ev.stop (); 1794 cursor_blink_ev.stop ();
1795
1780 hidden_cursor = 0; 1796 hidden_cursor = 0;
1781#endif 1797#endif
1782#if OFF_FOCUS_FADING 1798#if OFF_FOCUS_FADING
1783 if (rs[Rs_fade]) 1799 if (rs[Rs_fade])
1784 { 1800 {
1785 pix_colors = pix_colors_unfocused; 1801 pix_colors = pix_colors_unfocused;
1786 scr_recolour (); 1802 scr_recolour ();
1787 } 1803 }
1788#endif 1804#endif
1805
1806 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1789 } 1807 }
1790} 1808}
1791 1809
1792void 1810void
1793rxvt_term::update_fade_color (unsigned int idx) 1811rxvt_term::update_fade_color (unsigned int idx)
… …
1821 * use the property to determine the pixmap. We use it later on. 1839 * use the property to determine the pixmap. We use it later on.
1822 */ 1840 */
1823 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1841 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1824 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1842 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1825 { 1843 {
1826 bgPixmap.set_root_pixmap (); 1844 bg_set_root_pixmap ();
1827 update_background (); 1845 update_background ();
1828 } 1846 }
1847
1829 break; 1848 break;
1830 } 1849 }
1831# endif 1850# endif
1851
1852 refresh_check ();
1832} 1853}
1833#endif 1854#endif
1834 1855
1835void 1856void
1836rxvt_term::button_press (XButtonEvent &ev) 1857rxvt_term::button_press (XButtonEvent &ev)
… …
1867 /* save the xbutton state (for ButtonRelease) */ 1888 /* save the xbutton state (for ButtonRelease) */
1868 MEvent.state = ev.state; 1889 MEvent.state = ev.state;
1869#ifdef MOUSE_REPORT_DOUBLECLICK 1890#ifdef MOUSE_REPORT_DOUBLECLICK
1870 if (ev.button == MEvent.button && clickintime) 1891 if (ev.button == MEvent.button && clickintime)
1871 { 1892 {
1872 /* same button, within alloted time */ 1893 /* same button, within allowed time */
1873 MEvent.clicks++; 1894 MEvent.clicks++;
1874 1895
1875 if (MEvent.clicks > 1) 1896 if (MEvent.clicks > 1)
1876 { 1897 {
1877 /* only report double clicks */ 1898 /* only report double clicks */
… …
1891 mouse_report (ev); 1912 mouse_report (ev);
1892 } 1913 }
1893#else 1914#else
1894 MEvent.button = ev.button; 1915 MEvent.button = ev.button;
1895 mouse_report (ev); 1916 mouse_report (ev);
1896#endif /* MOUSE_REPORT_DOUBLECLICK */ 1917#endif /* MOUSE_REPORT_DOUBLECLICK */
1897 1918
1898 } 1919 }
1899 else 1920 else
1900 { 1921 {
1901 if (ev.button != MEvent.button) 1922 if (ev.button != MEvent.button)
… …
1949 } 1970 }
1950 1971
1951 /* 1972 /*
1952 * Scrollbar window processing of button press 1973 * Scrollbar window processing of button press
1953 */ 1974 */
1954 if (isScrollbarWindow (ev.window)) 1975 if (scrollBar.state && ev.window == scrollBar.win)
1955 { 1976 {
1956 scrollBar.setIdle (); 1977 page_dirn direction = NO_DIR;
1978
1979 if (scrollBar.upButton (ev.y))
1980 direction = UP; /* up */
1981 else if (scrollBar.dnButton (ev.y))
1982 direction = DN; /* down */
1983
1984 scrollBar.state = STATE_IDLE;
1957 /* 1985 /*
1958 * Rxvt-style scrollbar: 1986 * Rxvt-style scrollbar:
1959 * move up if mouse is above slider 1987 * move up if mouse is above slider
1960 * move dn if mouse is below slider 1988 * move dn if mouse is below slider
1961 * 1989 *
… …
1970 /* 1998 /*
1971 * Mouse report disabled scrollbar: 1999 * Mouse report disabled scrollbar:
1972 * arrow buttons - send up/down 2000 * arrow buttons - send up/down
1973 * click on scrollbar - send pageup/down 2001 * click on scrollbar - send pageup/down
1974 */ 2002 */
1975 if ((scrollBar.style == R_SB_NEXT 2003 if (direction == UP)
1976 && scrollbarnext_upButton (ev.y))
1977 || (scrollBar.style == R_SB_RXVT
1978 && scrollbarrxvt_upButton (ev.y)))
1979 tt_printf ("\033[A"); 2004 tt_printf ("\033[A");
1980 else if ((scrollBar.style == R_SB_NEXT 2005 else if (direction == DN)
1981 && scrollbarnext_dnButton (ev.y))
1982 || (scrollBar.style == R_SB_RXVT
1983 && scrollbarrxvt_dnButton (ev.y)))
1984 tt_printf ("\033[B"); 2006 tt_printf ("\033[B");
1985 else 2007 else
1986 switch (ev.button) 2008 switch (ev.button)
1987 { 2009 {
1988 case Button2: 2010 case Button2:
… …
1995 tt_printf ("\033[5~"); 2017 tt_printf ("\033[5~");
1996 break; 2018 break;
1997 } 2019 }
1998 } 2020 }
1999 else 2021 else
2000#endif /* NO_SCROLLBAR_REPORT */ 2022#endif /* NO_SCROLLBAR_REPORT */
2001
2002 {
2003 char upordown = 0;
2004
2005 if (scrollBar.style == R_SB_NEXT)
2006 { 2023 {
2007 if (scrollbarnext_upButton (ev.y)) 2024 if (direction != NO_DIR)
2008 upordown = -1; /* up */
2009 else if (scrollbarnext_dnButton (ev.y))
2010 upordown = 1; /* down */
2011 }
2012 else if (scrollBar.style == R_SB_RXVT)
2013 {
2014 if (scrollbarrxvt_upButton (ev.y))
2015 upordown = -1; /* up */
2016 else if (scrollbarrxvt_dnButton (ev.y))
2017 upordown = 1; /* down */
2018 }
2019 if (upordown)
2020 { 2025 {
2021#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2026#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2027 if (!cont_scroll_ev.is_active ())
2022 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2028 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2023#endif 2029#endif
2024 if (scr_page (upordown < 0 ? UP : DN, 1)) 2030 if (scr_page (direction, 1))
2025 { 2031 {
2026 if (upordown < 0) 2032 if (direction == UP)
2027 scrollBar.setUp (); 2033 scrollBar.state = STATE_UP;
2028 else 2034 else
2029 scrollBar.setDn (); 2035 scrollBar.state = STATE_DOWN;
2030 } 2036 }
2031 } 2037 }
2032 else 2038 else
2033 switch (ev.button) 2039 switch (ev.button)
2034 { 2040 {
2035 case Button2: 2041 case Button2:
2036 switch (scrollbar_align) 2042 switch (scrollBar.align)
2037 { 2043 {
2038 case R_SB_ALIGN_TOP: 2044 case R_SB_ALIGN_TOP:
2039 csrO = 0; 2045 csrO = 0;
2040 break; 2046 break;
2041 case R_SB_ALIGN_CENTRE: 2047 case R_SB_ALIGN_CENTRE:
… …
2047 } 2053 }
2048 2054
2049 if (scrollBar.style == R_SB_XTERM 2055 if (scrollBar.style == R_SB_XTERM
2050 || scrollbar_above_slider (ev.y) 2056 || scrollbar_above_slider (ev.y)
2051 || scrollbar_below_slider (ev.y)) 2057 || scrollbar_below_slider (ev.y))
2052 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2058 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2053 2059
2054 scrollBar.setMotion (); 2060 scrollBar.state = STATE_MOTION;
2055 break; 2061 break;
2056 2062
2057 case Button1: 2063 case Button1:
2058 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2064 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2059 csrO = ev.y - scrollBar.top; 2065 csrO = ev.y - scrollBar.top;
2060 /* FALLTHROUGH */ 2066 /* FALLTHROUGH */
2061 2067
2062 case Button3: 2068 case Button3:
2063 if (scrollBar.style != R_SB_XTERM) 2069 if (scrollBar.style != R_SB_XTERM)
… …
2073 scr_page (DN, nrow - 1); 2079 scr_page (DN, nrow - 1);
2074# else 2080# else
2075 scr_page (DN, nrow / 4); 2081 scr_page (DN, nrow / 4);
2076# endif 2082# endif
2077 else 2083 else
2078 scrollBar.setMotion (); 2084 scrollBar.state = STATE_MOTION;
2079 } 2085 }
2080 else 2086 else
2081 { 2087 {
2082 scr_page ((ev.button == Button1 ? DN : UP), 2088 scr_page ((ev.button == Button1 ? DN : UP),
2083 (nrow 2089 (nrow
2084 * scrollbar_position (ev.y) 2090 * scrollbar_position (ev.y)
2085 / scrollbar_size ())); 2091 / scrollBar.size ()));
2086 } 2092 }
2087 2093
2088 break; 2094 break;
2089 } 2095 }
2090 } 2096 }
… …
2100 2106
2101 csrO = 0; /* reset csr Offset */ 2107 csrO = 0; /* reset csr Offset */
2102 if (!bypass_keystate) 2108 if (!bypass_keystate)
2103 reportmode = !! (priv_modes & PrivMode_mouse_report); 2109 reportmode = !! (priv_modes & PrivMode_mouse_report);
2104 2110
2105 if (scrollbar_isUpDn ()) 2111 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2106 { 2112 {
2107 scrollBar.setIdle (); 2113 scrollBar.state = STATE_IDLE;
2108 scrollbar_show (0); 2114 scrollBar.show (0);
2109 } 2115 }
2110 2116
2111#ifdef SELECTION_SCROLLING 2117#ifdef SELECTION_SCROLLING
2112 if (sel_scroll_ev.active)
2113 sel_scroll_ev.stop(); 2118 sel_scroll_ev.stop();
2114#endif 2119#endif
2115 2120
2116 if (ev.window == vt) 2121 if (ev.window == vt)
2117 { 2122 {
2118 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2123 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2142 mouse_report (ev); 2147 mouse_report (ev);
2143 } 2148 }
2144#else /* MOUSE_REPORT_DOUBLECLICK */ 2149#else /* MOUSE_REPORT_DOUBLECLICK */
2145 MEvent.button = AnyButton; 2150 MEvent.button = AnyButton;
2146 mouse_report (ev); 2151 mouse_report (ev);
2147#endif /* MOUSE_REPORT_DOUBLECLICK */ 2152#endif /* MOUSE_REPORT_DOUBLECLICK */
2148 return; 2153 return;
2149 } 2154 }
2150 2155
2151 /* 2156 /*
2152 * dumb hack to compensate for the failure of click-and-drag 2157 * dumb hack to compensate for the failure of click-and-drag
… …
2164 selection_make (ev.time); 2169 selection_make (ev.time);
2165 break; 2170 break;
2166 2171
2167 case Button2: 2172 case Button2:
2168 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2173 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2169 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2174 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2170 break; 2175 break;
2171 2176
2172#ifdef MOUSE_WHEEL 2177#ifdef MOUSE_WHEEL
2173 case Button4: 2178 case Button4:
2174 case Button5: 2179 case Button5:
… …
2190 { 2195 {
2191 mouse_slip_wheel_speed += v ? -1 : 1; 2196 mouse_slip_wheel_speed += v ? -1 : 1;
2192 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2197 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2193 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2198 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2194 2199
2195 if (slip_wheel_ev.at < NOW) 2200 if (!slip_wheel_ev.is_active ())
2196 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2201 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2197
2198 slip_wheel_ev.start ();
2199 } 2202 }
2200 else 2203 else
2204# endif
2201 { 2205 {
2202# endif
2203 scr_page (v, i); 2206 scr_page (v, i);
2204 scrollbar_show (1); 2207 scrollBar.show (1);
2205# ifdef MOUSE_SLIP_WHEELING
2206 } 2208 }
2207# endif
2208 } 2209 }
2209 break; 2210 break;
2210#endif 2211#endif
2211 } 2212 }
2212 } 2213 }
2213} 2214}
2214 2215
2215/*}}} */ 2216/*}}} */
2216 2217
2217bool 2218void
2218rxvt_term::cmd_parse () 2219rxvt_term::cmd_parse ()
2219{ 2220{
2220 bool flag = false;
2221 wchar_t ch = NOCHAR; 2221 wchar_t ch = NOCHAR;
2222 char *seq_begin; // remember start of esc-sequence here 2222 char *seq_begin; // remember start of esc-sequence here
2223 2223
2224 for (;;) 2224 for (;;)
2225 { 2225 {
2226 if (ch == NOCHAR) 2226 if (expect_false (ch == NOCHAR))
2227 { 2227 {
2228 seq_begin = cmdbuf_ptr; 2228 seq_begin = cmdbuf_ptr;
2229 ch = next_char (); 2229 ch = next_char ();
2230 2230
2231 if (ch == NOCHAR) 2231 if (ch == NOCHAR)
2232 break; 2232 break;
2233 } 2233 }
2234 2234
2235 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2235 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2236 { 2236 {
2237 if (!seen_input) 2237 if (expect_false (!seen_input))
2238 { 2238 {
2239 seen_input = 1; 2239 seen_input = 1;
2240 // many badly-written programs (e.g. jed) contain a race condition: 2240 // many badly-written programs (e.g. jed) contain a race condition:
2241 // they first read the screensize and then install a SIGWINCH handler. 2241 // they first read the screensize and then install a SIGWINCH handler.
2242 // some window managers resize the window early, and these programs 2242 // some window managers resize the window early, and these programs
… …
2255 wchar_t *str = buf; 2255 wchar_t *str = buf;
2256 wchar_t *eol = str + min (ncol, UBUFSIZ); 2256 wchar_t *eol = str + min (ncol, UBUFSIZ);
2257 2257
2258 for (;;) 2258 for (;;)
2259 { 2259 {
2260 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2260 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2261 break; 2261 break;
2262 2262
2263 *str++ = ch; 2263 *str++ = ch;
2264 2264
2265 if (ch == C0_LF || str >= eol) 2265 if (expect_false (ch == C0_LF || str >= eol))
2266 { 2266 {
2267 if (ch == C0_LF) 2267 if (ch == C0_LF)
2268 nlines++; 2268 nlines++;
2269 2269
2270 refresh_count++; 2270 refresh_count++;
2271 2271
2272 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2272 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2273 { 2273 {
2274 refresh_count = 0; 2274 refresh_count = 0;
2275 2275
2276 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2276 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2277 { 2277 {
2278 refreshnow = true; 2278 refreshnow = true;
2279 ch = NOCHAR; 2279 ch = NOCHAR;
2280 break; 2280 break;
2281 } 2281 }
… …
2319 * What the heck we'll cheat and only refresh less than every page-full. 2319 * What the heck we'll cheat and only refresh less than every page-full.
2320 * if skipScroll is enabled. 2320 * if skipScroll is enabled.
2321 */ 2321 */
2322 if (refreshnow) 2322 if (refreshnow)
2323 { 2323 {
2324 flag = true;
2325 scr_refresh (); 2324 scr_refresh ();
2326 want_refresh = 1; 2325 want_refresh = 1;
2327 } 2326 }
2328
2329 } 2327 }
2330 else 2328 else
2331 { 2329 {
2332 try 2330 try
2333 { 2331 {
… …
2341 } 2339 }
2342 2340
2343 ch = NOCHAR; 2341 ch = NOCHAR;
2344 } 2342 }
2345 } 2343 }
2346
2347 return flag;
2348} 2344}
2349 2345
2350// read the next character 2346// read the next character
2351wchar_t 2347wchar_t
2352rxvt_term::next_char () NOTHROW 2348rxvt_term::next_char () NOTHROW
2353{ 2349{
2354 while (cmdbuf_ptr < cmdbuf_endp) 2350 while (cmdbuf_ptr < cmdbuf_endp)
2355 { 2351 {
2356 // assume 7-bit to be ascii ALWAYS 2352 // assume 7-bit to be ascii ALWAYS
2357 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2353 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2358 return *cmdbuf_ptr++; 2354 return *cmdbuf_ptr++;
2359 2355
2360 wchar_t wc; 2356 wchar_t wc;
2361 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2357 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2362 2358
… …
2366 cmdbuf_ptr = cmdbuf_endp; 2362 cmdbuf_ptr = cmdbuf_endp;
2367 break; 2363 break;
2368 } 2364 }
2369 2365
2370 if (len == (size_t)-1) 2366 if (len == (size_t)-1)
2367 {
2368 mbstate.reset (); // reset now undefined conversion state
2371 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2369 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2370 }
2372 2371
2373 // assume wchar == unicode 2372 // assume wchar == unicode
2374 cmdbuf_ptr += len; 2373 cmdbuf_ptr += len;
2375 return wc & UNICODE_MASK; 2374 return wc & UNICODE_MASK;
2376 } 2375 }
… …
2420/*----------------------------------------------------------------------*/ 2419/*----------------------------------------------------------------------*/
2421#ifdef PRINTPIPE 2420#ifdef PRINTPIPE
2422FILE * 2421FILE *
2423rxvt_term::popen_printer () 2422rxvt_term::popen_printer ()
2424{ 2423{
2425 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2424 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2426 2425
2427 if (stream == NULL) 2426 if (stream == NULL)
2428 rxvt_warn ("can't open printer pipe, not printing.\n"); 2427 rxvt_warn ("can't open printer pipe, not printing.\n");
2429 2428
2430 return stream; 2429 return stream;
… …
2441 * simulate attached vt100 printer 2440 * simulate attached vt100 printer
2442 */ 2441 */
2443void 2442void
2444rxvt_term::process_print_pipe () 2443rxvt_term::process_print_pipe ()
2445{ 2444{
2446 int done; 2445 FILE *fd = popen_printer ();
2447 FILE *fd;
2448 2446
2449 if ((fd = popen_printer ()) == NULL) 2447 if (!fd)
2450 return; 2448 return;
2451 2449
2452 /* 2450 /*
2453 * Send all input to the printer until either ESC[4i or ESC[?4i 2451 * Send all input to the printer until either ESC[4i or ESC[?4i
2454 * is received. 2452 * is received.
2455 */ 2453 */
2456 for (done = 0; !done;) 2454 for (int done = 0; !done; )
2457 { 2455 {
2458 unsigned char buf[8]; 2456 unsigned char buf[8];
2459 unicode_t ch; 2457 unicode_t ch;
2460 unsigned int i, len; 2458 unsigned int i, len;
2461 2459
… …
2492 } 2490 }
2493 } 2491 }
2494 2492
2495 pclose_printer (fd); 2493 pclose_printer (fd);
2496} 2494}
2497#endif /* PRINTPIPE */ 2495#endif /* PRINTPIPE */
2498/*}}} */ 2496/*}}} */
2499 2497
2500/* *INDENT-OFF* */ 2498/* *INDENT-OFF* */
2501enum { 2499enum {
2502 C1_40 = 0x40, 2500 C1_40 = 0x40,
… …
2606 break; 2604 break;
2607 case 'Z': /* identify the terminal type */ 2605 case 'Z': /* identify the terminal type */
2608 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2606 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2609 break; 2607 break;
2610 case '<': /* turn off VT52 mode */ 2608 case '<': /* turn off VT52 mode */
2611 PrivMode (0, PrivMode_vt52); 2609 set_privmode (PrivMode_vt52, 0);
2612 break; 2610 break;
2613 case 'F': /* use special graphics character set */ 2611 case 'F': /* use special graphics character set */
2614 case 'G': /* use regular character set */ 2612 case 'G': /* use regular character set */
2615 /* unimplemented */ 2613 /* unimplemented */
2616 break; 2614 break;
… …
2670 scr_forwardindex (); 2668 scr_forwardindex ();
2671 break; 2669 break;
2672#endif 2670#endif
2673 case '=': 2671 case '=':
2674 case '>': 2672 case '>':
2675 PrivMode ((ch == '='), PrivMode_aplKP); 2673 set_privmode (PrivMode_aplKP, ch == '=');
2676 break; 2674 break;
2677 2675
2678 case C1_40: 2676 case C1_40:
2679 cmd_getc (); 2677 cmd_getc ();
2680 break; 2678 break;
… …
2684 2682
2685 /* 8.3.87: NEXT LINE */ 2683 /* 8.3.87: NEXT LINE */
2686 case C1_NEL: /* ESC E */ 2684 case C1_NEL: /* ESC E */
2687 { 2685 {
2688 wchar_t nlcr[] = { C0_LF, C0_CR }; 2686 wchar_t nlcr[] = { C0_LF, C0_CR };
2689 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2687 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2690 } 2688 }
2691 break; 2689 break;
2692 2690
2693 /* kidnapped escape sequence: Should be 8.3.48 */ 2691 /* kidnapped escape sequence: Should be 8.3.48 */
2694 case C1_ESA: /* ESC G */ 2692 case C1_ESA: /* ESC G */
2695 process_graphics (); 2693 // used by original rxvt for rob nations own graphics mode
2694 if (cmd_getc () == 'Q')
2695 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2696 break; 2696 break;
2697 2697
2698 /* 8.3.63: CHARACTER TABULATION SET */ 2698 /* 8.3.63: CHARACTER TABULATION SET */
2699 case C1_HTS: /* ESC H */ 2699 case C1_HTS: /* ESC H */
2700 scr_set_tab (1); 2700 scr_set_tab (1);
… …
2719 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2719 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2720 case C1_SCI: /* ESC Z */ 2720 case C1_SCI: /* ESC Z */
2721 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2721 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2722 break; /* steal obsolete ESC [ c */ 2722 break; /* steal obsolete ESC [ c */
2723 2723
2724 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2724 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2725 case C1_CSI: /* ESC [ */ 2725 case C1_CSI: /* ESC [ */
2726 process_csi_seq (); 2726 process_csi_seq ();
2727 break; 2727 break;
2728 2728
2729 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2729 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2730 case C1_OSC: /* ESC ] */ 2730 case C1_OSC: /* ESC ] */
2731 process_osc_seq (); 2731 process_osc_seq ();
2732 break; 2732 break;
2733 2733
2734 /* 8.3.106: RESET TO INITIAL STATE */ 2734 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2735 case 'c': 2735 case 'c':
2736 mbstate.reset (); 2736 mbstate.reset ();
2737 scr_poweron (); 2737 scr_poweron ();
2738 scrollbar_show (1); 2738 scrollBar.show (1);
2739 break; 2739 break;
2740 2740
2741 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2741 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2742 case 'n': 2742 case 'n':
2743 scr_charset_choose (2); 2743 scr_charset_choose (2);
… …
2763 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2763 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2764 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2764 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2765 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2765 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2766}; 2766};
2767 2767
2768#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2768#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2769 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2769 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2770 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2770 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2771#define get_byte_array_bit(array, bit) \ 2771#define get_byte_array_bit(array, bit) \
2772 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2772 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2773 2773
2774const unsigned char csi_defaults[] = 2774static const unsigned char csi_defaults[] =
2775 { 2775 {
2776 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2776 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2777 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2777 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2778 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2778 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2779 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2779 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
2794 2794
2795 nargs = 0; 2795 nargs = 0;
2796 2796
2797 priv = 0; 2797 priv = 0;
2798 ch = cmd_getc (); 2798 ch = cmd_getc ();
2799 if (ch >= '<' && ch <= '?') 2799 if ((ch >= '<' && ch <= '?') || ch == '!')
2800 {
2800 { /* '<' '=' '>' '?' */ 2801 /* '<' '=' '>' '?' '!' */
2801 priv = ch; 2802 priv = ch;
2802 ch = cmd_getc (); 2803 ch = cmd_getc ();
2803 } 2804 }
2804 2805
2805 /* read any numerical arguments */ 2806 /* read any numerical arguments */
… …
2848 { 2849 {
2849 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2850 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2850 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2851 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2851 // 2852 //
2852 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2853 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2853 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2854 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2854 // that we do not support xterm mouse reporting (should be 95 when we do). 2855 // versions.
2855 // 2856 //
2856 tt_printf ("\033[>%d;94;0c", 'U'); 2857 tt_printf ("\033[>%d;95;0c", 'U');
2857 } 2858 }
2858 break; 2859 break;
2860
2859 case '?': 2861 case '?':
2860 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2862 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2861 process_terminal_mode (ch, priv, nargs, arg); 2863 process_terminal_mode (ch, priv, nargs, arg);
2862 break; 2864 break;
2865
2866 case '!':
2867 if (ch == CSI_70)
2868 {
2869 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2870 scr_soft_reset ();
2871
2872 static const int pm_h[] = { 7, 25 };
2873 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2874
2875 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2876 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2863 } 2877 }
2878 break;
2879 }
2880
2864 return; 2881 return;
2865 } 2882 }
2866 2883
2867 switch (ch) 2884 switch (ch)
2868 { 2885 {
… …
3235 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3252 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3236 */ 3253 */
3237void 3254void
3238rxvt_term::process_dcs_seq () 3255rxvt_term::process_dcs_seq ()
3239{ 3256{
3240 char *s;
3241 unicode_t eh;
3242
3243 /* 3257 /*
3244 * Not handled yet 3258 * Not handled yet
3245 */ 3259 */
3260
3261 unicode_t eh;
3246 s = get_to_st (eh); 3262 char *s = get_to_st (eh);
3247 if (s) 3263 if (s)
3248 free (s); 3264 free (s);
3249 3265
3250 return; 3266 return;
3251} 3267}
… …
3255 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3271 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3256 */ 3272 */
3257void 3273void
3258rxvt_term::process_osc_seq () 3274rxvt_term::process_osc_seq ()
3259{ 3275{
3260 unicode_t ch, eh;
3261 int arg; 3276 int arg;
3262 3277
3263 ch = cmd_getc (); 3278 unicode_t ch = cmd_getc ();
3264 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3279 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3265 arg = arg * 10 + (ch - '0'); 3280 arg = arg * 10 + (ch - '0');
3266 3281
3267 if (ch == ';') 3282 if (ch == ';')
3268 { 3283 {
3284 unicode_t eh;
3269 char *s = get_to_st (eh); 3285 char *s = get_to_st (eh);
3270 3286
3271 if (s) 3287 if (s)
3272 { 3288 {
3273 process_xterm_seq (arg, s, eh); 3289 process_xterm_seq (arg, s, eh);
… …
3297 3313
3298/* 3314/*
3299 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3315 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3300 */ 3316 */
3301void 3317void
3302rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3318rxvt_term::process_xterm_seq (int op, char *str, char resp)
3303{ 3319{
3304 int color; 3320 int color;
3305 char *buf, *name; 3321 char *buf, *name;
3306 bool query = str[0] == '?' && !str[1]; 3322 bool query = str[0] == '?' && !str[1];
3307 int saveop = op; 3323 int saveop = op;
… …
3348 3364
3349 XFree (value); 3365 XFree (value);
3350 } 3366 }
3351 else 3367 else
3352 { 3368 {
3353 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3369 char *eq = strchr (str, '=');
3354 3370
3355 if (eq) 3371 if (eq)
3356 { 3372 {
3357 *eq = 0; 3373 *eq = 0;
3358 set_utf8_property (display->atom (str), eq + 1); 3374 set_utf8_property (display->atom (str), eq + 1);
… …
3379 *buf++ = '\0'; 3395 *buf++ = '\0';
3380 3396
3381 process_color_seq (op, color, name, resp); 3397 process_color_seq (op, color, name, resp);
3382 } 3398 }
3383 break; 3399 break;
3400 case Rxvt_restoreFG:
3384 case XTerm_Color00: 3401 case XTerm_Color00:
3385 process_color_seq (op, Color_fg, str, resp); 3402 process_color_seq (op, Color_fg, str, resp);
3386 break; 3403 break;
3404 case Rxvt_restoreBG:
3387 case XTerm_Color01: 3405 case XTerm_Color01:
3388 process_color_seq (op, Color_bg, str, resp); 3406 process_color_seq (op, Color_bg, str, resp);
3389 break; 3407 break;
3390#ifndef NO_CURSORCOLOR 3408#ifndef NO_CURSORCOLOR
3391 case XTerm_Color_cursor: 3409 case XTerm_Color_cursor:
… …
3396 process_color_seq (op, Color_pointer_fg, str, resp); 3414 process_color_seq (op, Color_pointer_fg, str, resp);
3397 break; 3415 break;
3398 case XTerm_Color_pointer_bg: 3416 case XTerm_Color_pointer_bg:
3399 process_color_seq (op, Color_pointer_bg, str, resp); 3417 process_color_seq (op, Color_pointer_bg, str, resp);
3400 break; 3418 break;
3419#ifdef OPTION_HC
3420 case XTerm_Color_HC:
3421 process_color_seq (op, Color_HC, str, resp);
3422 break;
3423 case XTerm_Color_HTC:
3424 process_color_seq (op, Color_HTC, str, resp);
3425 break;
3426#endif
3401#ifndef NO_BOLD_UNDERLINE_REVERSE 3427#ifndef NO_BOLD_UNDERLINE_REVERSE
3402 case XTerm_Color_RV:
3403 process_color_seq (op, Color_RV, str, resp);
3404 break;
3405 case Rxvt_Color_BD:
3406 case URxvt_Color_BD: 3428 case URxvt_Color_BD:
3407 process_color_seq (op, Color_BD, str, resp); 3429 process_color_seq (op, Color_BD, str, resp);
3408 break; 3430 break;
3409 case Rxvt_Color_UL:
3410 case URxvt_Color_UL: 3431 case URxvt_Color_UL:
3411 process_color_seq (op, Color_UL, str, resp); 3432 process_color_seq (op, Color_UL, str, resp);
3412 break; 3433 break;
3413 case URxvt_Color_IT: 3434 case URxvt_Color_IT:
3414 process_color_seq (op, Color_IT, str, resp); 3435 process_color_seq (op, Color_IT, str, resp);
3415 break; 3436 break;
3416#endif 3437#endif
3438 case URxvt_Color_border:
3439 process_color_seq (op, Color_border, str, resp);
3440 break;
3417#if ENABLE_TRANSPARENCY 3441#if ENABLE_TRANSPARENCY
3418 case URxvt_Color_tint: 3442 case URxvt_Color_tint:
3419 process_color_seq (op, Color_tint, str, resp); 3443 process_color_seq (op, Color_tint, str, resp);
3420 { 3444 {
3421 bool changed = false; 3445 bool changed = false;
3446
3422 if (ISSET_PIXCOLOR (Color_tint)) 3447 if (ISSET_PIXCOLOR (Color_tint))
3423 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3448 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3424 else 3449
3425 changed = bgPixmap.unset_tint ();
3426 if (changed) 3450 if (changed)
3427 update_background (); 3451 update_background ();
3428 } 3452 }
3429 3453
3430 break; 3454 break;
… …
3434 case Rxvt_Pixmap: 3458 case Rxvt_Pixmap:
3435 if (!strcmp (str, "?")) 3459 if (!strcmp (str, "?"))
3436 { 3460 {
3437 char str[256]; 3461 char str[256];
3438 3462
3439 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3463 sprintf (str, "[%dx%d+%d+%d]",
3440 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3464 min (h_scale, 32767), min (v_scale, 32767),
3441 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3465 min (h_align, 32767), min (v_align, 32767));
3442 process_xterm_seq (XTerm_title, str, CHAR_ST); 3466 process_xterm_seq (XTerm_title, str, CHAR_ST);
3443 } 3467 }
3444 else 3468 else
3445 { 3469 {
3446 int changed = 0; 3470 int changed = 0;
3447 3471
3448 if (*str != ';') 3472 if (*str != ';')
3449 { 3473 {
3450 /* reset to default scaling :*/
3451 bgPixmap.unset_geometry ();
3452 if (bgPixmap.set_file (str)) /* change pixmap */ 3474 if (bg_set_file (str)) /* change pixmap */
3475 {
3453 changed++; 3476 changed++;
3454 str = strchr (str, ';'); 3477 str = strchr (str, ';');
3455 if (str == NULL) 3478 if (str == NULL)
3456 bgPixmap.set_defaultGeometry (); 3479 bg_set_default_geometry ();
3480 else
3481 bg_set_geometry (str+1);
3482 }
3457 } 3483 }
3458 while (str) 3484 else
3459 { 3485 {
3460 str++; 3486 str++;
3461 if (bgPixmap.set_geometry (str)) 3487 if (bg_set_geometry (str, true))
3462 changed++; 3488 changed++;
3463 str = strchr (str, ';');
3464 } 3489 }
3490
3465 if (changed) 3491 if (changed)
3492 {
3493 if (bg_window_position_sensitive ())
3494 {
3495 int x, y;
3496 get_window_origin (x, y);
3497 bg_set_position (x, y);
3498 }
3466 update_background (); 3499 update_background ();
3500 }
3467 } 3501 }
3468 break; 3502 break;
3469#endif 3503#endif
3470
3471 case Rxvt_restoreFG:
3472 set_window_color (Color_fg, str);
3473 break;
3474 case Rxvt_restoreBG:
3475 set_window_color (Color_bg, str);
3476 break;
3477 3504
3478 case XTerm_logfile: 3505 case XTerm_logfile:
3479 // TODO, when secure mode? 3506 // TODO, when secure mode?
3480 break; 3507 break;
3481 3508
… …
3548 break; 3575 break;
3549#endif 3576#endif
3550 3577
3551#if ENABLE_PERL 3578#if ENABLE_PERL
3552 case URxvt_perl: 3579 case URxvt_perl:
3553 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3580 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3554 ; // no responses yet
3555 break; 3581 break;
3556#endif 3582#endif
3557 } 3583 }
3558} 3584}
3559/*----------------------------------------------------------------------*/ 3585/*----------------------------------------------------------------------*/
… …
3582 { 3608 {
3583 if (mode == 'r') 3609 if (mode == 'r')
3584 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3610 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3585 else 3611 else
3586 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3612 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3587 PrivMode (state, bit); 3613
3614 set_privmode (bit, state);
3588 } 3615 }
3589 3616
3590 return state; 3617 return state;
3591} 3618}
3592 3619
… …
3600 static const struct 3627 static const struct
3601 { 3628 {
3602 const int argval; 3629 const int argval;
3603 const unsigned long bit; 3630 const unsigned long bit;
3604 } argtopriv[] = { 3631 } argtopriv[] = {
3605 { 1, PrivMode_aplCUR }, 3632 { 1, PrivMode_aplCUR }, // DECCKM
3606 { 2, PrivMode_vt52 }, 3633 { 2, PrivMode_vt52 },
3607 { 3, PrivMode_132 }, 3634 { 3, PrivMode_132 }, // DECCOLM
3608 { 4, PrivMode_smoothScroll }, 3635 { 4, PrivMode_smoothScroll }, // DECSCLM
3609 { 5, PrivMode_rVideo }, 3636 { 5, PrivMode_rVideo }, // DECSCNM
3610 { 6, PrivMode_relOrigin }, 3637 { 6, PrivMode_relOrigin }, // DECOM
3611 { 7, PrivMode_Autowrap }, 3638 { 7, PrivMode_Autowrap }, // DECAWM
3612 // 8, bi-directional support mode 3639 // 8, auto-repeat keys // DECARM
3613 { 9, PrivMode_MouseX10 }, 3640 { 9, PrivMode_MouseX10 },
3614 // 18, 19 printing-related 3641 // 18 end FF to printer after print screen
3642 // 19 Print screen prints full screen/scroll region
3615 { 25, PrivMode_VisibleCursor }, 3643 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3616#ifdef scrollBar_esc 3644#ifdef scrollBar_esc
3617 { scrollBar_esc, PrivMode_scrollBar }, 3645 { scrollBar_esc, PrivMode_scrollBar },
3618#endif 3646#endif
3619 { 35, PrivMode_ShiftKeys }, // rxvt extension 3647 { 35, PrivMode_ShiftKeys }, // rxvt extension
3648 // 38, tektronix mode // DECTEK
3620 { 40, PrivMode_132OK }, 3649 { 40, PrivMode_132OK },
3621 // 41 xterm more fixes NYI 3650 // 41 xterm more fixes NYI
3622 // 45 margin bell NYI 3651 // 45 margin bell NYI
3623 // 46 start logging 3652 // 46 start logging
3624 { 47, PrivMode_Screen }, 3653 { 47, PrivMode_Screen },
3625 { 66, PrivMode_aplKP }, 3654 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3626#ifndef NO_BACKSPACE_KEY 3655#ifndef NO_BACKSPACE_KEY
3627 { 67, PrivMode_BackSpace }, 3656 { 67, PrivMode_BackSpace }, // DECBKM
3628#endif 3657#endif
3629 { 1000, PrivMode_MouseX11 }, 3658 { 1000, PrivMode_MouseX11 },
3630 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3659 { 1002, PrivMode_MouseBtnEvent },
3631 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3660 { 1003, PrivMode_MouseAnyEvent },
3632 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3661#if ENABLE_FRILLS
3662 { 1005, PrivMode_ExtModeMouse },
3663#endif
3633 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3664 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3634 { 1011, PrivMode_Keypress }, // rxvt extension 3665 { 1011, PrivMode_Keypress }, // rxvt extension
3666#if ENABLE_FRILLS
3667 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3668#endif
3635 // 1035 enable modifiers for alt, numlock NYI 3669 // 1035 enable modifiers for alt, numlock NYI
3636 // 1036 send ESC for meta keys NYI 3670 // 1036 send ESC for meta keys NYI
3637 // 1037 send DEL for keypad delete NYI 3671 // 1037 send DEL for keypad delete NYI
3638 { 1047, PrivMode_Screen }, 3672 { 1047, PrivMode_Screen },
3639 // 1048 save and restore cursor 3673 // 1048 save and restore cursor, implemented in code
3640 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3674 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3641 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3675 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3676 { 2004, PrivMode_BracketPaste },
3642 }; 3677 };
3643 3678
3644 if (nargs == 0) 3679 if (nargs == 0)
3645 return; 3680 return;
3646 3681
… …
3653 for (i = 0; i < nargs; i++) 3688 for (i = 0; i < nargs; i++)
3654 { 3689 {
3655 state = -1; 3690 state = -1;
3656 3691
3657 /* basic handling */ 3692 /* basic handling */
3658 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3693 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3659 if (argtopriv[j].argval == arg[i]) 3694 if (argtopriv[j].argval == arg[i])
3660 { 3695 {
3661 state = privcases (mode, argtopriv[j].bit); 3696 state = privcases (mode, argtopriv[j].bit);
3662 break; 3697 break;
3663 } 3698 }
… …
3671 3706
3672 scr_touch (true); 3707 scr_touch (true);
3673 break; 3708 break;
3674#endif 3709#endif
3675 case 1048: /* alternative cursor save */ 3710 case 1048: /* alternative cursor save */
3676 case 1049:
3677 if (option (Opt_secondaryScreen)) 3711 if (option (Opt_secondaryScreen))
3678 if (mode == 0) 3712 if (mode == 0)
3679 scr_cursor (RESTORE); 3713 scr_cursor (RESTORE);
3680 else if (mode == 1) 3714 else if (mode == 1)
3681 scr_cursor (SAVE); 3715 scr_cursor (SAVE);
… …
3690 case 2: /* VT52 mode */ 3724 case 2: /* VT52 mode */
3691 /* oddball mode. should be set regardless of set/reset 3725 /* oddball mode. should be set regardless of set/reset
3692 * parameter. Return from VT52 mode with an ESC < from 3726 * parameter. Return from VT52 mode with an ESC < from
3693 * within VT52 mode 3727 * within VT52 mode
3694 */ 3728 */
3695 PrivMode (1, PrivMode_vt52); 3729 set_privmode (PrivMode_vt52, 1);
3696 break; 3730 break;
3697 case 3: /* 80/132 */ 3731 case 3: /* 80/132 */
3698 if (priv_modes & PrivMode_132OK) 3732 if (priv_modes & PrivMode_132OK)
3699 set_widthheight (((state ? 132 : 80) * fwidth), height); 3733 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3700 break; 3734 break;
3701 case 4: /* smooth scrolling */ 3735 case 4: /* smooth scrolling */
3702 set_option (Opt_jumpScroll, !state); 3736 set_option (Opt_jumpScroll, !state);
3703 break; 3737 break;
3704 case 5: /* reverse video */ 3738 case 5: /* reverse video */
… …
3711 scr_autowrap (state); 3745 scr_autowrap (state);
3712 break; 3746 break;
3713 /* case 8: - auto repeat, can't do on a per window basis */ 3747 /* case 8: - auto repeat, can't do on a per window basis */
3714 case 9: /* X10 mouse reporting */ 3748 case 9: /* X10 mouse reporting */
3715 if (state) /* orthogonal */ 3749 if (state) /* orthogonal */
3716 priv_modes &= ~PrivMode_MouseX11; 3750 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3717 break; 3751 break;
3718#ifdef scrollBar_esc 3752#ifdef scrollBar_esc
3719 case scrollBar_esc: 3753 case scrollBar_esc:
3720 if (scrollbar_mapping (state)) 3754 if (scrollBar.map (state))
3721 { 3755 {
3722 resize_all_windows (0, 0, 0); 3756 resize_all_windows (0, 0, 0);
3723 scr_touch (true); 3757 scr_touch (true);
3724 } 3758 }
3725 break; 3759 break;
… …
3734 break; 3768 break;
3735 /* case 66: - application key pad */ 3769 /* case 66: - application key pad */
3736 /* case 67: - backspace key */ 3770 /* case 67: - backspace key */
3737 case 1000: /* X11 mouse reporting */ 3771 case 1000: /* X11 mouse reporting */
3738 if (state) /* orthogonal */ 3772 if (state) /* orthogonal */
3739 priv_modes &= ~PrivMode_MouseX10; 3773 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3740 break; 3774 break;
3741#if 0
3742 case 1001: 3775 case 1002:
3743 break; /* X11 mouse highlighting */ 3776 case 1003:
3744#endif 3777 if (state)
3778 {
3779 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3780 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3781 mouse_row = mouse_col = 0;
3782 vt_emask_mouse = PointerMotionMask;
3783 }
3784 else
3785 vt_emask_mouse = NoEventMask;
3786
3787 vt_select_input ();
3788 break;
3745 case 1010: /* scroll to bottom on TTY output inhibit */ 3789 case 1010: /* scroll to bottom on TTY output inhibit */
3746 set_option (Opt_scrollTtyOutput, !state); 3790 set_option (Opt_scrollTtyOutput, !state);
3747 break; 3791 break;
3748 case 1011: /* scroll to bottom on key press */ 3792 case 1011: /* scroll to bottom on key press */
3749 set_option (Opt_scrollTtyKeypress, state); 3793 set_option (Opt_scrollTtyKeypress, state);
3750 break; 3794 break;
3751 case 1047: /* secondary screen w/ clearing last */ 3795 case 1047: /* secondary screen w/ clearing last */
3752 if (option (Opt_secondaryScreen)) 3796 if (option (Opt_secondaryScreen))
3753 if (current_screen != PRIMARY) 3797 if (!state)
3754 scr_erase_screen (2); 3798 scr_erase_screen (2);
3799
3755 scr_change_screen (state); 3800 scr_change_screen (state);
3756 break; 3801 break;
3757 case 1049: /* secondary screen w/ clearing first */ 3802 case 1049: /* secondary screen w/ clearing first */
3803 if (option (Opt_secondaryScreen))
3804 if (state)
3805 scr_cursor (SAVE);
3806
3758 scr_change_screen (state); 3807 scr_change_screen (state);
3808
3759 if (option (Opt_secondaryScreen)) 3809 if (option (Opt_secondaryScreen))
3760 if (current_screen != PRIMARY) 3810 if (state)
3761 scr_erase_screen (2); 3811 scr_erase_screen (2);
3812 else
3813 scr_cursor (RESTORE);
3762 break; 3814 break;
3763 default: 3815 default:
3764 break; 3816 break;
3765 } 3817 }
3766 } 3818 }
… …
3919 } 3971 }
3920 } 3972 }
3921} 3973}
3922/*}}} */ 3974/*}}} */
3923 3975
3924/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3925void
3926rxvt_term::process_graphics ()
3927{
3928 unicode_t ch, cmd = cmd_getc ();
3929
3930 if (cmd == 'Q')
3931 { /* query graphics */
3932 tt_printf ("\033G0\012"); /* no graphics */
3933 return;
3934 }
3935 /* swallow other graphics sequences until terminating ':' */
3936 do
3937 ch = cmd_getc ();
3938 while (ch != ':');
3939}
3940/*}}} */
3941
3942/* ------------------------------------------------------------------------- */ 3976/* ------------------------------------------------------------------------- */
3943 3977
3944/* 3978/*
3945 * Send printf () formatted output to the command. 3979 * Send printf () formatted output to the command.
3946 * Only use for small amounts of data. 3980 * Only use for small amounts of data.
… …
3959 3993
3960/* ---------------------------------------------------------------------- */ 3994/* ---------------------------------------------------------------------- */
3961/* Write data to the pty as typed by the user, pasted with the mouse, 3995/* Write data to the pty as typed by the user, pasted with the mouse,
3962 * or generated by us in response to a query ESC sequence. 3996 * or generated by us in response to a query ESC sequence.
3963 */ 3997 */
3964const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3998static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3965 3999
3966void 4000void
3967rxvt_term::tt_write (const char *data, unsigned int len) 4001rxvt_term::tt_write (const char *data, unsigned int len)
3968{ 4002{
3969 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4003 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3974 4008
3975 if (v_buflen == 0) 4009 if (v_buflen == 0)
3976 { 4010 {
3977 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4011 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3978 4012
4013 max_it (written, 0);
4014
3979 if ((unsigned int)written == len) 4015 if (written == len)
3980 return; 4016 return;
3981 4017
3982 data += written; 4018 data += written;
3983 len -= written; 4019 len -= written;
3984 } 4020 }
3985 4021
3986 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4022 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3987 4023
3988 memcpy (v_buffer + v_buflen, data, len); 4024 memcpy (v_buffer + v_buflen, data, len);
3989 v_buflen += len; 4025 v_buflen += len;
3990 4026
3991 pty_ev.set (EVENT_READ | EVENT_WRITE); 4027 pty_ev.set (ev::READ | ev::WRITE);
3992} 4028}
3993 4029
3994void rxvt_term::pty_write () 4030void rxvt_term::pty_write ()
3995{ 4031{
3996 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4032 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4002 if (v_buflen == 0) 4038 if (v_buflen == 0)
4003 { 4039 {
4004 free (v_buffer); 4040 free (v_buffer);
4005 v_buffer = 0; 4041 v_buffer = 0;
4006 4042
4007 pty_ev.set (EVENT_READ); 4043 pty_ev.set (ev::READ);
4008 return; 4044 return;
4009 } 4045 }
4010 4046
4011 memmove (v_buffer, v_buffer + written, v_buflen); 4047 memmove (v_buffer, v_buffer + written, v_buflen);
4012 } 4048 }
4013 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4049 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4014 pty_ev.set (EVENT_READ); 4050 pty_ev.set (ev::READ);
4015} 4051}
4016 4052
4017/*----------------------- end-of-file (C source) -----------------------*/ 4053/*----------------------- end-of-file (C source) -----------------------*/
4018 4054

Diff Legend

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