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

Diff Legend

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