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.361 by ayin, Wed Oct 31 09:55:23 2007 UTC vs.
Revision 1.476 by sf-exg, Fri Feb 11 01:24:46 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
… …
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
… …
1246 1193
1247 return false; 1194 return false;
1248} 1195}
1249 1196
1250void 1197void
1251rxvt_term::pty_cb (io_watcher &w, short revents) 1198rxvt_term::pty_cb (ev::io &w, int revents)
1252{ 1199{
1253 make_current (); 1200 make_current ();
1254 1201
1255 if (revents & EVENT_READ) 1202 if (revents & ev::READ)
1256 // loop, but don't allow a single term to monopolize us 1203 // loop, but don't allow a single term to monopolize us
1257 while (pty_fill ()) 1204 for (int i = CBUFCNT; i-- && pty_fill (); )
1258 if (cmd_parse ()) 1205 cmd_parse ();
1259 break;
1260 1206
1261 if (revents & EVENT_WRITE) 1207 if (revents & ev::WRITE)
1262 pty_write (); 1208 pty_write ();
1209
1210 refresh_check ();
1263} 1211}
1264 1212
1265void 1213void
1266rxvt_term::pointer_unblank () 1214rxvt_term::pointer_unblank ()
1267{ 1215{
… …
1270 1218
1271#ifdef POINTER_BLANK 1219#ifdef POINTER_BLANK
1272 hidden_pointer = 0; 1220 hidden_pointer = 0;
1273 1221
1274 if (option (Opt_pointerBlank)) 1222 if (option (Opt_pointerBlank))
1275 pointer_ev.start (NOW + pointerBlankDelay); 1223 pointer_ev.start (pointerBlankDelay);
1276#endif 1224#endif
1277} 1225}
1278 1226
1279#ifdef POINTER_BLANK 1227#ifdef POINTER_BLANK
1280void 1228void
… …
1288 1236
1289 hidden_pointer = 1; 1237 hidden_pointer = 1;
1290} 1238}
1291 1239
1292void 1240void
1293rxvt_term::pointer_cb (time_watcher &w) 1241rxvt_term::pointer_cb (ev::timer &w, int revents)
1294{ 1242{
1295 make_current (); 1243 make_current ();
1296 1244
1297 pointer_blank (); 1245 pointer_blank ();
1298} 1246}
… …
1303{ 1251{
1304 int button_number, key_state = 0; 1252 int button_number, key_state = 0;
1305 int x, y; 1253 int x, y;
1306 int code = 32; 1254 int code = 32;
1307 1255
1308 x = Pixel2Col (ev.x); 1256 x = Pixel2Col (ev.x) + 1;
1309 y = Pixel2Row (ev.y); 1257 y = Pixel2Row (ev.y) + 1;
1258
1310 if (ev.type == MotionNotify) { 1259 if (ev.type == MotionNotify)
1260 {
1311 if (x == mouse_row && y == mouse_col) 1261 if (x == mouse_row && y == mouse_col)
1312 return; 1262 return;
1263
1313 mouse_row = x; 1264 mouse_row = x;
1314 mouse_col = y; 1265 mouse_col = y;
1315 code += 32; 1266 code += 32;
1316 } 1267 }
1317 1268
1318 if (MEvent.button == AnyButton) 1269 if (MEvent.button == AnyButton)
1319 button_number = 3; 1270 button_number = 3;
1320 else 1271 else
1321 { 1272 {
1322 button_number = MEvent.button - Button1; 1273 button_number = MEvent.button - Button1;
1323 /* add 0x3D for wheel events, like xterm does */ 1274 /* add 0x3D for wheel events, like xterm does */
1324 if (button_number >= 3) 1275 if (button_number >= 3)
1325 button_number += (64 - 3); 1276 button_number += 64 - 3;
1326 } 1277 }
1327 1278
1328 if (priv_modes & PrivMode_MouseX10) 1279 if (priv_modes & PrivMode_MouseX10)
1329 { 1280 {
1330 /* 1281 /*
… …
1362 fputc ('A', stderr); 1313 fputc ('A', stderr);
1363 if (key_state & 32) 1314 if (key_state & 32)
1364 fputc ('2', stderr); 1315 fputc ('2', stderr);
1365 fprintf (stderr, "]: <%d>, %d/%d\n", 1316 fprintf (stderr, "]: <%d>, %d/%d\n",
1366 button_number, 1317 button_number,
1367 x + 1, 1318 x,
1368 y + 1); 1319 y);
1369#endif 1320#endif
1370 1321
1322#if ENABLE_FRILLS
1323 if (priv_modes & PrivMode_ExtMouseRight)
1324 tt_printf ("\033[%d;%d;%dM",
1325 code + button_number + key_state,
1326 x,
1327 y);
1328 else if (priv_modes & PrivMode_ExtModeMouse)
1329 tt_printf ("\033[M%c%lc%lc",
1330 code + button_number + key_state,
1331 wint_t (32 + x),
1332 wint_t (32 + y));
1333 else
1334#endif
1371 tt_printf ("\033[M%c%c%c", 1335 tt_printf ("\033[M%c%c%c",
1372 (code + button_number + key_state), 1336 code + button_number + key_state,
1373 (32 + x + 1), 1337 32 + x,
1374 (32 + y + 1)); 1338 32 + y);
1375} 1339}
1376 1340
1377/*{{{ process an X event */ 1341/*{{{ process an X event */
1378void 1342void
1379rxvt_term::x_cb (XEvent &ev) 1343rxvt_term::x_cb (XEvent &ev)
… …
1481 && ev.xfocus.mode != NotifyGrab) 1445 && ev.xfocus.mode != NotifyGrab)
1482 focus_out (); 1446 focus_out ();
1483 break; 1447 break;
1484 1448
1485 case ConfigureNotify: 1449 case ConfigureNotify:
1486 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1487 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1488 szHint.width, szHint.height); */
1489 if (ev.xconfigure.window == parent[0]) 1450 if (ev.xconfigure.window == parent[0])
1490 { 1451 {
1491 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1492 ; 1453 ;
1454
1455#ifdef HAVE_BG_PIXMAP
1456 bool moved = false;
1457 if (bg_window_position_sensitive ())
1458 {
1459 int x, y;
1460 if (ev.xconfigure.send_event)
1461 {
1462 x = ev.xconfigure.x;
1463 y = ev.xconfigure.y;
1464 }
1465 else
1466 get_window_origin (x, y);
1467
1468 if (bg_set_position (x, y)
1469 || !(bg_flags & BG_IS_VALID))
1470 moved = true;
1471 }
1472#endif
1493 1473
1494 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1495 { 1475 {
1496 seen_resize = 1; 1476 seen_resize = 1;
1497 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1477 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1498 } 1478 }
1499 else 1479 else
1500 { 1480 {
1501#ifdef HAVE_BG_PIXMAP 1481#ifdef HAVE_BG_PIXMAP
1502 if (bgPixmap.window_position_sensitive ()) 1482 if (moved)
1483 {
1484 if (mapped)
1503 update_background (); 1485 update_background ();
1486 else
1487 bg_invalidate ();
1488 }
1504#endif 1489#endif
1505 } 1490 }
1491
1506 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1507 } 1493 }
1508 break; 1494 break;
1509 1495
1510 case PropertyNotify: 1496 case PropertyNotify:
1511 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1497 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1512 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1513 && ev.xproperty.state == PropertyNewValue)
1514 selection_property (ev.xproperty.window, ev.xproperty.atom);
1515
1516 break; 1498 break;
1517 1499
1518 case SelectionClear: 1500 case SelectionClear:
1519 selection_clear (); 1501 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1520 break;
1521
1522 case SelectionNotify:
1523 if (selection_wait == Sel_normal)
1524 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1525 break; 1502 break;
1526 1503
1527 case SelectionRequest: 1504 case SelectionRequest:
1528 selection_send (ev.xselectionrequest); 1505 selection_send (ev.xselectionrequest);
1529 break; 1506 break;
1530 1507
1531 case MapNotify: 1508 case MapNotify:
1509#ifdef HAVE_BG_PIXMAP
1510 /* This is needed specifically to fix the case of no window manager or a
1511 * non-reparenting window manager. In those cases we never get first
1512 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1513 * care of multiplicity of ConfigureNotify events arriving while WM does
1514 * reparenting.
1515 * We should not render background immediately, as there could be several
1516 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1517 * by scheduling background redraw as soon as we can, but giving a short
1518 * bit of time for ConfigureNotifies to arrive.
1519 * We should render background PRIOR to drawing any text, but AFTER all
1520 * of ConfigureNotifys for the best results.
1521 */
1522 if (!(bg_flags & BG_IS_VALID))
1523 update_background_ev.start (0.025);
1524#endif
1532 mapped = 1; 1525 mapped = 1;
1533#ifdef TEXT_BLINK 1526#ifdef TEXT_BLINK
1534 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1527 text_blink_ev.start ();
1535#endif 1528#endif
1536 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1529 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1537 break; 1530 break;
1538 1531
1539 case UnmapNotify: 1532 case UnmapNotify:
… …
1549 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1550 { 1543 {
1551 do 1544 do
1552 { 1545 {
1553 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1554 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, false);
1555 } 1548 }
1556 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1549 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1557 1550
1558 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1551 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1559 1552
1560 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1561 { 1554 {
1562 scr_expose (ev.xexpose.x, ev.xexpose.y, 1555 scr_expose (ev.xexpose.x, ev.xexpose.y,
1563 ev.xexpose.width, ev.xexpose.height, False); 1556 ev.xexpose.width, ev.xexpose.height, false);
1564 } 1557 }
1558
1565 want_refresh = 1; 1559 want_refresh = 1;
1566 } 1560 }
1567 else 1561 else
1568 { 1562 {
1569 XEvent unused_event; 1563 XEvent unused_event;
… …
1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1565 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1572 ; 1566 ;
1573 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1567 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1574 ; 1568 ;
1575 1569
1576 if (isScrollbarWindow (ev.xany.window)) 1570 if (scrollBar.state && ev.xany.window == scrollBar.win)
1577 { 1571 {
1578 scrollBar.setIdle (); 1572 scrollBar.state = STATE_IDLE;
1579 scrollbar_show (0); 1573 scrollBar.show (0);
1580 } 1574 }
1581 } 1575 }
1582 break; 1576 break;
1583 1577
1584 case MotionNotify: 1578 case MotionNotify:
… …
1630 int dist; 1624 int dist;
1631 1625
1632 /* don't clobber the current delay if we are 1626 /* don't clobber the current delay if we are
1633 * already in the middle of scrolling. 1627 * already in the middle of scrolling.
1634 */ 1628 */
1635 if (!sel_scroll_ev.active) 1629 if (!sel_scroll_ev.is_active ())
1636 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1630 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1637 1631
1638 /* save the event params so we can highlight 1632 /* save the event params so we can highlight
1639 * the selection in the pending-scroll loop 1633 * the selection in the pending-scroll loop
1640 */ 1634 */
1641 selection_save_x = ev.xbutton.x; 1635 selection_save_x = ev.xbutton.x;
… …
1663 else 1657 else
1664 { 1658 {
1665 /* we are within the text window, so we 1659 /* we are within the text window, so we
1666 * shouldn't be scrolling 1660 * shouldn't be scrolling
1667 */ 1661 */
1668 if (sel_scroll_ev.active)
1669 sel_scroll_ev.stop(); 1662 sel_scroll_ev.stop();
1670 } 1663 }
1671#endif 1664#endif
1672#ifdef MOUSE_THRESHOLD 1665#ifdef MOUSE_THRESHOLD
1673 } 1666 }
1674#endif 1667#endif
1675 } 1668 }
1676 } 1669 }
1677 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1670 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1678 { 1671 {
1679 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1672 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1680 MotionNotify, &ev)) 1673 MotionNotify, &ev))
1681 ; 1674 ;
1682 1675
… …
1684 &unused_root, &unused_child, 1677 &unused_root, &unused_child,
1685 &unused_root_x, &unused_root_y, 1678 &unused_root_x, &unused_root_y,
1686 &ev.xbutton.x, &ev.xbutton.y, 1679 &ev.xbutton.x, &ev.xbutton.y,
1687 &unused_mask); 1680 &unused_mask);
1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1681 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1689 scrollbar_size ()); 1682 scrollBar.size ());
1690 want_refresh = 1; 1683 want_refresh = 1;
1691 scrollbar_show (1); 1684 scrollBar.show (1);
1692 } 1685 }
1693 break; 1686 break;
1694 } 1687 }
1695 1688
1696#if defined(CURSOR_BLINK) 1689#if defined(CURSOR_BLINK)
… …
1700 { 1693 {
1701 hidden_cursor = 0; 1694 hidden_cursor = 0;
1702 want_refresh = 1; 1695 want_refresh = 1;
1703 } 1696 }
1704 1697
1705 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1698 cursor_blink_ev.again ();
1706 } 1699 }
1707#endif 1700#endif
1708 1701
1709#if defined(POINTER_BLANK) 1702#if defined(POINTER_BLANK)
1710 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1717 1710
1718 if (ev.type == KeyPress && hidden_pointer == 0) 1711 if (ev.type == KeyPress && hidden_pointer == 0)
1719 pointer_blank (); 1712 pointer_blank ();
1720 } 1713 }
1721#endif 1714#endif
1715
1716 refresh_check ();
1722} 1717}
1718
1719#if ENABLE_FRILLS
1720void
1721rxvt_term::set_urgency (bool enable)
1722{
1723 if (enable == urgency_hint)
1724 return;
1725
1726 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1727 {
1728 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1729 XSetWMHints (dpy, parent[0], h);
1730 urgency_hint = enable;
1731 }
1732}
1733#endif
1723 1734
1724void 1735void
1725rxvt_term::focus_in () 1736rxvt_term::focus_in ()
1726{ 1737{
1727 if (!focus) 1738 if (!focus)
1728 { 1739 {
1729 focus = 1; 1740 focus = 1;
1730 want_refresh = 1; 1741 want_refresh = 1;
1731 1742
1732 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1733
1734#if USE_XIM 1743#if USE_XIM
1735 if (Input_Context != NULL) 1744 if (Input_Context != NULL)
1736 { 1745 {
1737 IMSetPosition (); 1746 IMSetPosition ();
1738 XSetICFocus (Input_Context); 1747 XSetICFocus (Input_Context);
1739 } 1748 }
1740#endif 1749#endif
1741#if CURSOR_BLINK 1750#if CURSOR_BLINK
1742 if (option (Opt_cursorBlink)) 1751 if (option (Opt_cursorBlink))
1743 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1752 cursor_blink_ev.again ();
1744#endif 1753#endif
1745#if OFF_FOCUS_FADING 1754#if OFF_FOCUS_FADING
1746 if (rs[Rs_fade]) 1755 if (rs[Rs_fade])
1747 { 1756 {
1748 pix_colors = pix_colors_focused; 1757 pix_colors = pix_colors_focused;
1749 scr_recolour (); 1758 scr_recolour ();
1750 } 1759 }
1751#endif 1760#endif
1752#if ENABLE_FRILLS 1761#if ENABLE_FRILLS
1753 if (option (Opt_urgentOnBell)) 1762 if (option (Opt_urgentOnBell))
1754 { 1763 set_urgency (0);
1755 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1756 {
1757 h->flags &= ~XUrgencyHint;
1758 XSetWMHints (dpy, parent[0], h);
1759 }
1760 }
1761#endif 1764#endif
1765
1766 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1762 } 1767 }
1763} 1768}
1764 1769
1765void 1770void
1766rxvt_term::focus_out () 1771rxvt_term::focus_out ()
… …
1768 if (focus) 1773 if (focus)
1769 { 1774 {
1770 focus = 0; 1775 focus = 0;
1771 want_refresh = 1; 1776 want_refresh = 1;
1772 1777
1773 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1778#if ENABLE_FRILLS
1774 1779 if (option (Opt_urgentOnBell))
1780 set_urgency (0);
1781#endif
1775#if ENABLE_FRILLS || ISO_14755 1782#if ENABLE_FRILLS || ISO_14755
1776 if (iso14755buf) 1783 if (iso14755buf)
1777 { 1784 {
1778 iso14755buf = 0; 1785 iso14755buf = 0;
1779# if ISO_14755 1786# if ISO_14755
… …
1786 XUnsetICFocus (Input_Context); 1793 XUnsetICFocus (Input_Context);
1787#endif 1794#endif
1788#if CURSOR_BLINK 1795#if CURSOR_BLINK
1789 if (option (Opt_cursorBlink)) 1796 if (option (Opt_cursorBlink))
1790 cursor_blink_ev.stop (); 1797 cursor_blink_ev.stop ();
1798
1791 hidden_cursor = 0; 1799 hidden_cursor = 0;
1792#endif 1800#endif
1793#if OFF_FOCUS_FADING 1801#if OFF_FOCUS_FADING
1794 if (rs[Rs_fade]) 1802 if (rs[Rs_fade])
1795 { 1803 {
1796 pix_colors = pix_colors_unfocused; 1804 pix_colors = pix_colors_unfocused;
1797 scr_recolour (); 1805 scr_recolour ();
1798 } 1806 }
1799#endif 1807#endif
1808
1809 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1800 } 1810 }
1801} 1811}
1802 1812
1803void 1813void
1804rxvt_term::update_fade_color (unsigned int idx) 1814rxvt_term::update_fade_color (unsigned int idx)
… …
1832 * use the property to determine the pixmap. We use it later on. 1842 * use the property to determine the pixmap. We use it later on.
1833 */ 1843 */
1834 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1844 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1835 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1845 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1836 { 1846 {
1837 bgPixmap.set_root_pixmap (); 1847 bg_set_root_pixmap ();
1838 update_background (); 1848 update_background ();
1839 } 1849 }
1850
1840 break; 1851 break;
1841 } 1852 }
1842# endif 1853# endif
1854
1855 refresh_check ();
1843} 1856}
1844#endif 1857#endif
1845 1858
1846void 1859void
1847rxvt_term::button_press (XButtonEvent &ev) 1860rxvt_term::button_press (XButtonEvent &ev)
… …
1878 /* save the xbutton state (for ButtonRelease) */ 1891 /* save the xbutton state (for ButtonRelease) */
1879 MEvent.state = ev.state; 1892 MEvent.state = ev.state;
1880#ifdef MOUSE_REPORT_DOUBLECLICK 1893#ifdef MOUSE_REPORT_DOUBLECLICK
1881 if (ev.button == MEvent.button && clickintime) 1894 if (ev.button == MEvent.button && clickintime)
1882 { 1895 {
1883 /* same button, within alloted time */ 1896 /* same button, within allowed time */
1884 MEvent.clicks++; 1897 MEvent.clicks++;
1885 1898
1886 if (MEvent.clicks > 1) 1899 if (MEvent.clicks > 1)
1887 { 1900 {
1888 /* only report double clicks */ 1901 /* only report double clicks */
… …
1902 mouse_report (ev); 1915 mouse_report (ev);
1903 } 1916 }
1904#else 1917#else
1905 MEvent.button = ev.button; 1918 MEvent.button = ev.button;
1906 mouse_report (ev); 1919 mouse_report (ev);
1907#endif /* MOUSE_REPORT_DOUBLECLICK */ 1920#endif /* MOUSE_REPORT_DOUBLECLICK */
1908 1921
1909 } 1922 }
1910 else 1923 else
1911 { 1924 {
1912 if (ev.button != MEvent.button) 1925 if (ev.button != MEvent.button)
… …
1960 } 1973 }
1961 1974
1962 /* 1975 /*
1963 * Scrollbar window processing of button press 1976 * Scrollbar window processing of button press
1964 */ 1977 */
1965 if (isScrollbarWindow (ev.window)) 1978 if (scrollBar.state && ev.window == scrollBar.win)
1966 { 1979 {
1967 scrollBar.setIdle (); 1980 page_dirn direction = NO_DIR;
1981
1982 if (scrollBar.upButton (ev.y))
1983 direction = UP; /* up */
1984 else if (scrollBar.dnButton (ev.y))
1985 direction = DN; /* down */
1986
1987 scrollBar.state = STATE_IDLE;
1968 /* 1988 /*
1969 * Rxvt-style scrollbar: 1989 * Rxvt-style scrollbar:
1970 * move up if mouse is above slider 1990 * move up if mouse is above slider
1971 * move dn if mouse is below slider 1991 * move dn if mouse is below slider
1972 * 1992 *
… …
1981 /* 2001 /*
1982 * Mouse report disabled scrollbar: 2002 * Mouse report disabled scrollbar:
1983 * arrow buttons - send up/down 2003 * arrow buttons - send up/down
1984 * click on scrollbar - send pageup/down 2004 * click on scrollbar - send pageup/down
1985 */ 2005 */
1986 if ((scrollBar.style == R_SB_NEXT 2006 if (direction == UP)
1987 && scrollbarnext_upButton (ev.y))
1988 || (scrollBar.style == R_SB_RXVT
1989 && scrollbarrxvt_upButton (ev.y)))
1990 tt_printf ("\033[A"); 2007 tt_printf ("\033[A");
1991 else if ((scrollBar.style == R_SB_NEXT 2008 else if (direction == DN)
1992 && scrollbarnext_dnButton (ev.y))
1993 || (scrollBar.style == R_SB_RXVT
1994 && scrollbarrxvt_dnButton (ev.y)))
1995 tt_printf ("\033[B"); 2009 tt_printf ("\033[B");
1996 else 2010 else
1997 switch (ev.button) 2011 switch (ev.button)
1998 { 2012 {
1999 case Button2: 2013 case Button2:
… …
2006 tt_printf ("\033[5~"); 2020 tt_printf ("\033[5~");
2007 break; 2021 break;
2008 } 2022 }
2009 } 2023 }
2010 else 2024 else
2011#endif /* NO_SCROLLBAR_REPORT */ 2025#endif /* NO_SCROLLBAR_REPORT */
2012
2013 {
2014 char upordown = 0;
2015
2016 if (scrollBar.style == R_SB_NEXT)
2017 { 2026 {
2018 if (scrollbarnext_upButton (ev.y)) 2027 if (direction != NO_DIR)
2019 upordown = -1; /* up */
2020 else if (scrollbarnext_dnButton (ev.y))
2021 upordown = 1; /* down */
2022 }
2023 else if (scrollBar.style == R_SB_RXVT)
2024 {
2025 if (scrollbarrxvt_upButton (ev.y))
2026 upordown = -1; /* up */
2027 else if (scrollbarrxvt_dnButton (ev.y))
2028 upordown = 1; /* down */
2029 }
2030 if (upordown)
2031 { 2028 {
2032#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2029#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2030 if (!cont_scroll_ev.is_active ())
2033 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2031 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2034#endif 2032#endif
2035 if (scr_page (upordown < 0 ? UP : DN, 1)) 2033 if (scr_page (direction, 1))
2036 { 2034 {
2037 if (upordown < 0) 2035 if (direction == UP)
2038 scrollBar.setUp (); 2036 scrollBar.state = STATE_UP;
2039 else 2037 else
2040 scrollBar.setDn (); 2038 scrollBar.state = STATE_DOWN;
2041 } 2039 }
2042 } 2040 }
2043 else 2041 else
2044 switch (ev.button) 2042 switch (ev.button)
2045 { 2043 {
2046 case Button2: 2044 case Button2:
2047 switch (scrollbar_align) 2045 switch (scrollBar.align)
2048 { 2046 {
2049 case R_SB_ALIGN_TOP: 2047 case R_SB_ALIGN_TOP:
2050 csrO = 0; 2048 csrO = 0;
2051 break; 2049 break;
2052 case R_SB_ALIGN_CENTRE: 2050 case R_SB_ALIGN_CENTRE:
… …
2058 } 2056 }
2059 2057
2060 if (scrollBar.style == R_SB_XTERM 2058 if (scrollBar.style == R_SB_XTERM
2061 || scrollbar_above_slider (ev.y) 2059 || scrollbar_above_slider (ev.y)
2062 || scrollbar_below_slider (ev.y)) 2060 || scrollbar_below_slider (ev.y))
2063 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2061 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2064 2062
2065 scrollBar.setMotion (); 2063 scrollBar.state = STATE_MOTION;
2066 break; 2064 break;
2067 2065
2068 case Button1: 2066 case Button1:
2069 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2067 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2070 csrO = ev.y - scrollBar.top; 2068 csrO = ev.y - scrollBar.top;
2071 /* FALLTHROUGH */ 2069 /* FALLTHROUGH */
2072 2070
2073 case Button3: 2071 case Button3:
2074 if (scrollBar.style != R_SB_XTERM) 2072 if (scrollBar.style != R_SB_XTERM)
… …
2084 scr_page (DN, nrow - 1); 2082 scr_page (DN, nrow - 1);
2085# else 2083# else
2086 scr_page (DN, nrow / 4); 2084 scr_page (DN, nrow / 4);
2087# endif 2085# endif
2088 else 2086 else
2089 scrollBar.setMotion (); 2087 scrollBar.state = STATE_MOTION;
2090 } 2088 }
2091 else 2089 else
2092 { 2090 {
2093 scr_page ((ev.button == Button1 ? DN : UP), 2091 scr_page ((ev.button == Button1 ? DN : UP),
2094 (nrow 2092 (nrow
2095 * scrollbar_position (ev.y) 2093 * scrollbar_position (ev.y)
2096 / scrollbar_size ())); 2094 / scrollBar.size ()));
2097 } 2095 }
2098 2096
2099 break; 2097 break;
2100 } 2098 }
2101 } 2099 }
… …
2111 2109
2112 csrO = 0; /* reset csr Offset */ 2110 csrO = 0; /* reset csr Offset */
2113 if (!bypass_keystate) 2111 if (!bypass_keystate)
2114 reportmode = !! (priv_modes & PrivMode_mouse_report); 2112 reportmode = !! (priv_modes & PrivMode_mouse_report);
2115 2113
2116 if (scrollbar_isUpDn ()) 2114 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2117 { 2115 {
2118 scrollBar.setIdle (); 2116 scrollBar.state = STATE_IDLE;
2119 scrollbar_show (0); 2117 scrollBar.show (0);
2120 } 2118 }
2121 2119
2122#ifdef SELECTION_SCROLLING 2120#ifdef SELECTION_SCROLLING
2123 if (sel_scroll_ev.active)
2124 sel_scroll_ev.stop(); 2121 sel_scroll_ev.stop();
2125#endif 2122#endif
2126 2123
2127 if (ev.window == vt) 2124 if (ev.window == vt)
2128 { 2125 {
2129 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2126 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2153 mouse_report (ev); 2150 mouse_report (ev);
2154 } 2151 }
2155#else /* MOUSE_REPORT_DOUBLECLICK */ 2152#else /* MOUSE_REPORT_DOUBLECLICK */
2156 MEvent.button = AnyButton; 2153 MEvent.button = AnyButton;
2157 mouse_report (ev); 2154 mouse_report (ev);
2158#endif /* MOUSE_REPORT_DOUBLECLICK */ 2155#endif /* MOUSE_REPORT_DOUBLECLICK */
2159 return; 2156 return;
2160 } 2157 }
2161 2158
2162 /* 2159 /*
2163 * dumb hack to compensate for the failure of click-and-drag 2160 * dumb hack to compensate for the failure of click-and-drag
… …
2175 selection_make (ev.time); 2172 selection_make (ev.time);
2176 break; 2173 break;
2177 2174
2178 case Button2: 2175 case Button2:
2179 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2176 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2180 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2177 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2181 break; 2178 break;
2182 2179
2183#ifdef MOUSE_WHEEL 2180#ifdef MOUSE_WHEEL
2184 case Button4: 2181 case Button4:
2185 case Button5: 2182 case Button5:
… …
2201 { 2198 {
2202 mouse_slip_wheel_speed += v ? -1 : 1; 2199 mouse_slip_wheel_speed += v ? -1 : 1;
2203 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2200 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2204 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2201 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2205 2202
2206 if (slip_wheel_ev.at < NOW) 2203 if (!slip_wheel_ev.is_active ())
2207 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2204 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2208
2209 slip_wheel_ev.start ();
2210 } 2205 }
2211 else 2206 else
2207# endif
2212 { 2208 {
2213# endif
2214 scr_page (v, i); 2209 scr_page (v, i);
2215 scrollbar_show (1); 2210 scrollBar.show (1);
2216# ifdef MOUSE_SLIP_WHEELING
2217 } 2211 }
2218# endif
2219 } 2212 }
2220 break; 2213 break;
2221#endif 2214#endif
2222 } 2215 }
2223 } 2216 }
2224} 2217}
2225 2218
2226/*}}} */ 2219/*}}} */
2227 2220
2228bool 2221void
2229rxvt_term::cmd_parse () 2222rxvt_term::cmd_parse ()
2230{ 2223{
2231 bool flag = false;
2232 wchar_t ch = NOCHAR; 2224 wchar_t ch = NOCHAR;
2233 char *seq_begin; // remember start of esc-sequence here 2225 char *seq_begin; // remember start of esc-sequence here
2234 2226
2235 for (;;) 2227 for (;;)
2236 { 2228 {
2237 if (ch == NOCHAR) 2229 if (expect_false (ch == NOCHAR))
2238 { 2230 {
2239 seq_begin = cmdbuf_ptr; 2231 seq_begin = cmdbuf_ptr;
2240 ch = next_char (); 2232 ch = next_char ();
2241 2233
2242 if (ch == NOCHAR) 2234 if (ch == NOCHAR)
2243 break; 2235 break;
2244 } 2236 }
2245 2237
2246 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2238 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2247 { 2239 {
2248 if (!seen_input) 2240 if (expect_false (!seen_input))
2249 { 2241 {
2250 seen_input = 1; 2242 seen_input = 1;
2251 // many badly-written programs (e.g. jed) contain a race condition: 2243 // many badly-written programs (e.g. jed) contain a race condition:
2252 // they first read the screensize and then install a SIGWINCH handler. 2244 // they first read the screensize and then install a SIGWINCH handler.
2253 // some window managers resize the window early, and these programs 2245 // some window managers resize the window early, and these programs
… …
2266 wchar_t *str = buf; 2258 wchar_t *str = buf;
2267 wchar_t *eol = str + min (ncol, UBUFSIZ); 2259 wchar_t *eol = str + min (ncol, UBUFSIZ);
2268 2260
2269 for (;;) 2261 for (;;)
2270 { 2262 {
2271 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2263 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2272 break; 2264 break;
2273 2265
2274 *str++ = ch; 2266 *str++ = ch;
2275 2267
2276 if (ch == C0_LF || str >= eol) 2268 if (expect_false (ch == C0_LF || str >= eol))
2277 { 2269 {
2278 if (ch == C0_LF) 2270 if (ch == C0_LF)
2279 nlines++; 2271 nlines++;
2280 2272
2281 refresh_count++; 2273 refresh_count++;
2282 2274
2283 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2275 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2284 { 2276 {
2285 refresh_count = 0; 2277 refresh_count = 0;
2286 2278
2287 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2279 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2288 { 2280 {
2289 refreshnow = true; 2281 refreshnow = true;
2290 ch = NOCHAR; 2282 ch = NOCHAR;
2291 break; 2283 break;
2292 } 2284 }
… …
2330 * What the heck we'll cheat and only refresh less than every page-full. 2322 * What the heck we'll cheat and only refresh less than every page-full.
2331 * if skipScroll is enabled. 2323 * if skipScroll is enabled.
2332 */ 2324 */
2333 if (refreshnow) 2325 if (refreshnow)
2334 { 2326 {
2335 flag = true;
2336 scr_refresh (); 2327 scr_refresh ();
2337 want_refresh = 1; 2328 want_refresh = 1;
2338 } 2329 }
2339
2340 } 2330 }
2341 else 2331 else
2342 { 2332 {
2343 try 2333 try
2344 { 2334 {
… …
2352 } 2342 }
2353 2343
2354 ch = NOCHAR; 2344 ch = NOCHAR;
2355 } 2345 }
2356 } 2346 }
2357
2358 return flag;
2359} 2347}
2360 2348
2361// read the next character 2349// read the next character
2362wchar_t 2350wchar_t
2363rxvt_term::next_char () NOTHROW 2351rxvt_term::next_char () NOTHROW
2364{ 2352{
2365 while (cmdbuf_ptr < cmdbuf_endp) 2353 while (cmdbuf_ptr < cmdbuf_endp)
2366 { 2354 {
2367 // assume 7-bit to be ascii ALWAYS 2355 // assume 7-bit to be ascii ALWAYS
2368 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2356 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2369 return *cmdbuf_ptr++; 2357 return *cmdbuf_ptr++;
2370 2358
2371 wchar_t wc; 2359 wchar_t wc;
2372 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2360 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2373 2361
… …
2377 cmdbuf_ptr = cmdbuf_endp; 2365 cmdbuf_ptr = cmdbuf_endp;
2378 break; 2366 break;
2379 } 2367 }
2380 2368
2381 if (len == (size_t)-1) 2369 if (len == (size_t)-1)
2370 {
2371 mbstate.reset (); // reset now undefined conversion state
2382 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2372 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2373 }
2383 2374
2384 // assume wchar == unicode 2375 // assume wchar == unicode
2385 cmdbuf_ptr += len; 2376 cmdbuf_ptr += len;
2386 return wc & UNICODE_MASK; 2377 return wc & UNICODE_MASK;
2387 } 2378 }
… …
2431/*----------------------------------------------------------------------*/ 2422/*----------------------------------------------------------------------*/
2432#ifdef PRINTPIPE 2423#ifdef PRINTPIPE
2433FILE * 2424FILE *
2434rxvt_term::popen_printer () 2425rxvt_term::popen_printer ()
2435{ 2426{
2436 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2427 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2437 2428
2438 if (stream == NULL) 2429 if (stream == NULL)
2439 rxvt_warn ("can't open printer pipe, not printing.\n"); 2430 rxvt_warn ("can't open printer pipe, not printing.\n");
2440 2431
2441 return stream; 2432 return stream;
… …
2452 * simulate attached vt100 printer 2443 * simulate attached vt100 printer
2453 */ 2444 */
2454void 2445void
2455rxvt_term::process_print_pipe () 2446rxvt_term::process_print_pipe ()
2456{ 2447{
2457 int done; 2448 FILE *fd = popen_printer ();
2458 FILE *fd;
2459 2449
2460 if ((fd = popen_printer ()) == NULL) 2450 if (!fd)
2461 return; 2451 return;
2462 2452
2463 /* 2453 /*
2464 * Send all input to the printer until either ESC[4i or ESC[?4i 2454 * Send all input to the printer until either ESC[4i or ESC[?4i
2465 * is received. 2455 * is received.
2466 */ 2456 */
2467 for (done = 0; !done;) 2457 for (int done = 0; !done; )
2468 { 2458 {
2469 unsigned char buf[8]; 2459 unsigned char buf[8];
2470 unicode_t ch; 2460 unicode_t ch;
2471 unsigned int i, len; 2461 unsigned int i, len;
2472 2462
… …
2503 } 2493 }
2504 } 2494 }
2505 2495
2506 pclose_printer (fd); 2496 pclose_printer (fd);
2507} 2497}
2508#endif /* PRINTPIPE */ 2498#endif /* PRINTPIPE */
2509/*}}} */ 2499/*}}} */
2510 2500
2511/* *INDENT-OFF* */ 2501/* *INDENT-OFF* */
2512enum { 2502enum {
2513 C1_40 = 0x40, 2503 C1_40 = 0x40,
… …
2617 break; 2607 break;
2618 case 'Z': /* identify the terminal type */ 2608 case 'Z': /* identify the terminal type */
2619 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2609 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2620 break; 2610 break;
2621 case '<': /* turn off VT52 mode */ 2611 case '<': /* turn off VT52 mode */
2622 PrivMode (0, PrivMode_vt52); 2612 set_privmode (PrivMode_vt52, 0);
2623 break; 2613 break;
2624 case 'F': /* use special graphics character set */ 2614 case 'F': /* use special graphics character set */
2625 case 'G': /* use regular character set */ 2615 case 'G': /* use regular character set */
2626 /* unimplemented */ 2616 /* unimplemented */
2627 break; 2617 break;
… …
2681 scr_forwardindex (); 2671 scr_forwardindex ();
2682 break; 2672 break;
2683#endif 2673#endif
2684 case '=': 2674 case '=':
2685 case '>': 2675 case '>':
2686 PrivMode ((ch == '='), PrivMode_aplKP); 2676 set_privmode (PrivMode_aplKP, ch == '=');
2687 break; 2677 break;
2688 2678
2689 case C1_40: 2679 case C1_40:
2690 cmd_getc (); 2680 cmd_getc ();
2691 break; 2681 break;
… …
2695 2685
2696 /* 8.3.87: NEXT LINE */ 2686 /* 8.3.87: NEXT LINE */
2697 case C1_NEL: /* ESC E */ 2687 case C1_NEL: /* ESC E */
2698 { 2688 {
2699 wchar_t nlcr[] = { C0_LF, C0_CR }; 2689 wchar_t nlcr[] = { C0_LF, C0_CR };
2700 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2690 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2701 } 2691 }
2702 break; 2692 break;
2703 2693
2704 /* kidnapped escape sequence: Should be 8.3.48 */ 2694 /* kidnapped escape sequence: Should be 8.3.48 */
2705 case C1_ESA: /* ESC G */ 2695 case C1_ESA: /* ESC G */
… …
2730 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2720 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2731 case C1_SCI: /* ESC Z */ 2721 case C1_SCI: /* ESC Z */
2732 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2722 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2733 break; /* steal obsolete ESC [ c */ 2723 break; /* steal obsolete ESC [ c */
2734 2724
2735 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2725 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2736 case C1_CSI: /* ESC [ */ 2726 case C1_CSI: /* ESC [ */
2737 process_csi_seq (); 2727 process_csi_seq ();
2738 break; 2728 break;
2739 2729
2740 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2730 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2741 case C1_OSC: /* ESC ] */ 2731 case C1_OSC: /* ESC ] */
2742 process_osc_seq (); 2732 process_osc_seq ();
2743 break; 2733 break;
2744 2734
2745 /* 8.3.106: RESET TO INITIAL STATE */ 2735 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2746 case 'c': 2736 case 'c':
2747 mbstate.reset (); 2737 mbstate.reset ();
2748 scr_poweron (); 2738 scr_poweron ();
2749 scrollbar_show (1); 2739 scrollBar.show (1);
2750 break; 2740 break;
2751 2741
2752 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2742 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2753 case 'n': 2743 case 'n':
2754 scr_charset_choose (2); 2744 scr_charset_choose (2);
… …
2774 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2764 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2775 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2765 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2776 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2766 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2777}; 2767};
2778 2768
2779#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2769#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2780 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2770 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2781 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2771 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2782#define get_byte_array_bit(array, bit) \ 2772#define get_byte_array_bit(array, bit) \
2783 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2773 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2784 2774
2785const unsigned char csi_defaults[] = 2775static const unsigned char csi_defaults[] =
2786 { 2776 {
2787 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2777 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2788 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2778 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2789 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2779 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2790 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2780 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
2805 2795
2806 nargs = 0; 2796 nargs = 0;
2807 2797
2808 priv = 0; 2798 priv = 0;
2809 ch = cmd_getc (); 2799 ch = cmd_getc ();
2810 if (ch >= '<' && ch <= '?') 2800 if ((ch >= '<' && ch <= '?') || ch == '!')
2801 {
2811 { /* '<' '=' '>' '?' */ 2802 /* '<' '=' '>' '?' '!' */
2812 priv = ch; 2803 priv = ch;
2813 ch = cmd_getc (); 2804 ch = cmd_getc ();
2814 } 2805 }
2815 2806
2816 /* read any numerical arguments */ 2807 /* read any numerical arguments */
… …
2865 // versions. 2856 // versions.
2866 // 2857 //
2867 tt_printf ("\033[>%d;95;0c", 'U'); 2858 tt_printf ("\033[>%d;95;0c", 'U');
2868 } 2859 }
2869 break; 2860 break;
2861
2870 case '?': 2862 case '?':
2871 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2863 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2872 process_terminal_mode (ch, priv, nargs, arg); 2864 process_terminal_mode (ch, priv, nargs, arg);
2873 break; 2865 break;
2866
2867 case '!':
2868 if (ch == CSI_70)
2869 {
2870 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2871 scr_soft_reset ();
2872
2873 static const int pm_h[] = { 7, 25 };
2874 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2875
2876 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2877 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2874 } 2878 }
2879 break;
2880 }
2881
2875 return; 2882 return;
2876 } 2883 }
2877 2884
2878 switch (ch) 2885 switch (ch)
2879 { 2886 {
… …
3246 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3253 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3247 */ 3254 */
3248void 3255void
3249rxvt_term::process_dcs_seq () 3256rxvt_term::process_dcs_seq ()
3250{ 3257{
3251 char *s;
3252 unicode_t eh;
3253
3254 /* 3258 /*
3255 * Not handled yet 3259 * Not handled yet
3256 */ 3260 */
3261
3262 unicode_t eh;
3257 s = get_to_st (eh); 3263 char *s = get_to_st (eh);
3258 if (s) 3264 if (s)
3259 free (s); 3265 free (s);
3260 3266
3261 return; 3267 return;
3262} 3268}
… …
3266 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3272 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3267 */ 3273 */
3268void 3274void
3269rxvt_term::process_osc_seq () 3275rxvt_term::process_osc_seq ()
3270{ 3276{
3271 unicode_t ch, eh;
3272 int arg; 3277 int arg;
3273 3278
3274 ch = cmd_getc (); 3279 unicode_t ch = cmd_getc ();
3275 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3280 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3276 arg = arg * 10 + (ch - '0'); 3281 arg = arg * 10 + (ch - '0');
3277 3282
3278 if (ch == ';') 3283 if (ch == ';')
3279 { 3284 {
3285 unicode_t eh;
3280 char *s = get_to_st (eh); 3286 char *s = get_to_st (eh);
3281 3287
3282 if (s) 3288 if (s)
3283 { 3289 {
3284 process_xterm_seq (arg, s, eh); 3290 process_xterm_seq (arg, s, eh);
… …
3308 3314
3309/* 3315/*
3310 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3316 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3311 */ 3317 */
3312void 3318void
3313rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3319rxvt_term::process_xterm_seq (int op, char *str, char resp)
3314{ 3320{
3315 int color; 3321 int color;
3316 char *buf, *name; 3322 char *buf, *name;
3317 bool query = str[0] == '?' && !str[1]; 3323 bool query = str[0] == '?' && !str[1];
3318 int saveop = op; 3324 int saveop = op;
… …
3359 3365
3360 XFree (value); 3366 XFree (value);
3361 } 3367 }
3362 else 3368 else
3363 { 3369 {
3364 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3370 char *eq = strchr (str, '=');
3365 3371
3366 if (eq) 3372 if (eq)
3367 { 3373 {
3368 *eq = 0; 3374 *eq = 0;
3369 set_utf8_property (display->atom (str), eq + 1); 3375 set_utf8_property (display->atom (str), eq + 1);
… …
3390 *buf++ = '\0'; 3396 *buf++ = '\0';
3391 3397
3392 process_color_seq (op, color, name, resp); 3398 process_color_seq (op, color, name, resp);
3393 } 3399 }
3394 break; 3400 break;
3401 case Rxvt_restoreFG:
3395 case XTerm_Color00: 3402 case XTerm_Color00:
3396 process_color_seq (op, Color_fg, str, resp); 3403 process_color_seq (op, Color_fg, str, resp);
3397 break; 3404 break;
3405 case Rxvt_restoreBG:
3398 case XTerm_Color01: 3406 case XTerm_Color01:
3399 process_color_seq (op, Color_bg, str, resp); 3407 process_color_seq (op, Color_bg, str, resp);
3400 break; 3408 break;
3401#ifndef NO_CURSORCOLOR 3409#ifndef NO_CURSORCOLOR
3402 case XTerm_Color_cursor: 3410 case XTerm_Color_cursor:
… …
3407 process_color_seq (op, Color_pointer_fg, str, resp); 3415 process_color_seq (op, Color_pointer_fg, str, resp);
3408 break; 3416 break;
3409 case XTerm_Color_pointer_bg: 3417 case XTerm_Color_pointer_bg:
3410 process_color_seq (op, Color_pointer_bg, str, resp); 3418 process_color_seq (op, Color_pointer_bg, str, resp);
3411 break; 3419 break;
3420#ifdef OPTION_HC
3421 case XTerm_Color_HC:
3422 process_color_seq (op, Color_HC, str, resp);
3423 break;
3424 case XTerm_Color_HTC:
3425 process_color_seq (op, Color_HTC, str, resp);
3426 break;
3427#endif
3412#ifndef NO_BOLD_UNDERLINE_REVERSE 3428#ifndef NO_BOLD_UNDERLINE_REVERSE
3413 case XTerm_Color_RV:
3414 process_color_seq (op, Color_RV, str, resp);
3415 break;
3416 case Rxvt_Color_BD:
3417 case URxvt_Color_BD: 3429 case URxvt_Color_BD:
3418 process_color_seq (op, Color_BD, str, resp); 3430 process_color_seq (op, Color_BD, str, resp);
3419 break; 3431 break;
3420 case Rxvt_Color_UL:
3421 case URxvt_Color_UL: 3432 case URxvt_Color_UL:
3422 process_color_seq (op, Color_UL, str, resp); 3433 process_color_seq (op, Color_UL, str, resp);
3423 break; 3434 break;
3424 case URxvt_Color_IT: 3435 case URxvt_Color_IT:
3425 process_color_seq (op, Color_IT, str, resp); 3436 process_color_seq (op, Color_IT, str, resp);
3426 break; 3437 break;
3427#endif 3438#endif
3439 case URxvt_Color_border:
3440 process_color_seq (op, Color_border, str, resp);
3441 break;
3428#if ENABLE_TRANSPARENCY 3442#if ENABLE_TRANSPARENCY
3429 case URxvt_Color_tint: 3443 case URxvt_Color_tint:
3430 process_color_seq (op, Color_tint, str, resp); 3444 process_color_seq (op, Color_tint, str, resp);
3431 { 3445 {
3432 bool changed = false; 3446 bool changed = false;
3447
3433 if (ISSET_PIXCOLOR (Color_tint)) 3448 if (ISSET_PIXCOLOR (Color_tint))
3434 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3449 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3435 else 3450
3436 changed = bgPixmap.unset_tint ();
3437 if (changed) 3451 if (changed)
3438 update_background (); 3452 update_background ();
3439 } 3453 }
3440 3454
3441 break; 3455 break;
… …
3445 case Rxvt_Pixmap: 3459 case Rxvt_Pixmap:
3446 if (!strcmp (str, "?")) 3460 if (!strcmp (str, "?"))
3447 { 3461 {
3448 char str[256]; 3462 char str[256];
3449 3463
3450 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3464 sprintf (str, "[%dx%d+%d+%d]",
3451 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3465 min (h_scale, 32767), min (v_scale, 32767),
3452 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3466 min (h_align, 32767), min (v_align, 32767));
3453 process_xterm_seq (XTerm_title, str, CHAR_ST); 3467 process_xterm_seq (XTerm_title, str, CHAR_ST);
3454 } 3468 }
3455 else 3469 else
3456 { 3470 {
3457 int changed = 0; 3471 int changed = 0;
3458 3472
3459 if (*str != ';') 3473 if (*str != ';')
3460 { 3474 {
3461 /* reset to default scaling :*/
3462 bgPixmap.unset_geometry ();
3463 if (bgPixmap.set_file (str)) /* change pixmap */ 3475 if (bg_set_file (str)) /* change pixmap */
3476 {
3464 changed++; 3477 changed++;
3465 str = strchr (str, ';'); 3478 str = strchr (str, ';');
3466 if (str == NULL) 3479 if (str == NULL)
3467 bgPixmap.set_defaultGeometry (); 3480 bg_set_default_geometry ();
3481 else
3482 bg_set_geometry (str+1);
3483 }
3468 } 3484 }
3469 while (str) 3485 else
3470 { 3486 {
3471 str++; 3487 str++;
3472 if (bgPixmap.set_geometry (str)) 3488 if (bg_set_geometry (str, true))
3473 changed++; 3489 changed++;
3474 str = strchr (str, ';');
3475 } 3490 }
3491
3476 if (changed) 3492 if (changed)
3493 {
3494 if (bg_window_position_sensitive ())
3495 {
3496 int x, y;
3497 get_window_origin (x, y);
3498 bg_set_position (x, y);
3499 }
3477 update_background (); 3500 update_background ();
3501 }
3478 } 3502 }
3479 break; 3503 break;
3480#endif 3504#endif
3481
3482 case Rxvt_restoreFG:
3483 set_window_color (Color_fg, str);
3484 break;
3485 case Rxvt_restoreBG:
3486 set_window_color (Color_bg, str);
3487 break;
3488 3505
3489 case XTerm_logfile: 3506 case XTerm_logfile:
3490 // TODO, when secure mode? 3507 // TODO, when secure mode?
3491 break; 3508 break;
3492 3509
… …
3559 break; 3576 break;
3560#endif 3577#endif
3561 3578
3562#if ENABLE_PERL 3579#if ENABLE_PERL
3563 case URxvt_perl: 3580 case URxvt_perl:
3564 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3581 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3565 ; // no responses yet
3566 break; 3582 break;
3567#endif 3583#endif
3568 } 3584 }
3569} 3585}
3570/*----------------------------------------------------------------------*/ 3586/*----------------------------------------------------------------------*/
… …
3593 { 3609 {
3594 if (mode == 'r') 3610 if (mode == 'r')
3595 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3611 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3596 else 3612 else
3597 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3613 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3598 PrivMode (state, bit); 3614
3615 set_privmode (bit, state);
3599 } 3616 }
3600 3617
3601 return state; 3618 return state;
3602} 3619}
3603 3620
… …
3611 static const struct 3628 static const struct
3612 { 3629 {
3613 const int argval; 3630 const int argval;
3614 const unsigned long bit; 3631 const unsigned long bit;
3615 } argtopriv[] = { 3632 } argtopriv[] = {
3616 { 1, PrivMode_aplCUR }, 3633 { 1, PrivMode_aplCUR }, // DECCKM
3617 { 2, PrivMode_vt52 }, 3634 { 2, PrivMode_vt52 },
3618 { 3, PrivMode_132 }, 3635 { 3, PrivMode_132 }, // DECCOLM
3619 { 4, PrivMode_smoothScroll }, 3636 { 4, PrivMode_smoothScroll }, // DECSCLM
3620 { 5, PrivMode_rVideo }, 3637 { 5, PrivMode_rVideo }, // DECSCNM
3621 { 6, PrivMode_relOrigin }, 3638 { 6, PrivMode_relOrigin }, // DECOM
3622 { 7, PrivMode_Autowrap }, 3639 { 7, PrivMode_Autowrap }, // DECAWM
3623 // 8, bi-directional support mode 3640 // 8, auto-repeat keys // DECARM
3624 { 9, PrivMode_MouseX10 }, 3641 { 9, PrivMode_MouseX10 },
3625 // 18, 19 printing-related 3642 // 18 end FF to printer after print screen
3643 // 19 Print screen prints full screen/scroll region
3626 { 25, PrivMode_VisibleCursor }, 3644 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3627#ifdef scrollBar_esc 3645#ifdef scrollBar_esc
3628 { scrollBar_esc, PrivMode_scrollBar }, 3646 { scrollBar_esc, PrivMode_scrollBar },
3629#endif 3647#endif
3630 { 35, PrivMode_ShiftKeys }, // rxvt extension 3648 { 35, PrivMode_ShiftKeys }, // rxvt extension
3649 // 38, tektronix mode // DECTEK
3631 { 40, PrivMode_132OK }, 3650 { 40, PrivMode_132OK },
3632 // 41 xterm more fixes NYI 3651 // 41 xterm more fixes NYI
3633 // 45 margin bell NYI 3652 // 45 margin bell NYI
3634 // 46 start logging 3653 // 46 start logging
3635 { 47, PrivMode_Screen }, 3654 { 47, PrivMode_Screen },
3636 { 66, PrivMode_aplKP }, 3655 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3637#ifndef NO_BACKSPACE_KEY 3656#ifndef NO_BACKSPACE_KEY
3638 { 67, PrivMode_BackSpace }, 3657 { 67, PrivMode_BackSpace }, // DECBKM
3639#endif 3658#endif
3640 { 1000, PrivMode_MouseX11 }, 3659 { 1000, PrivMode_MouseX11 },
3641 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3642 { 1002, PrivMode_MouseBtnEvent }, 3660 { 1002, PrivMode_MouseBtnEvent },
3643 { 1003, PrivMode_MouseAnyEvent }, 3661 { 1003, PrivMode_MouseAnyEvent },
3662#if ENABLE_FRILLS
3663 { 1005, PrivMode_ExtModeMouse },
3664#endif
3644 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3665 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3645 { 1011, PrivMode_Keypress }, // rxvt extension 3666 { 1011, PrivMode_Keypress }, // rxvt extension
3667#if ENABLE_FRILLS
3668 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3669#endif
3646 // 1035 enable modifiers for alt, numlock NYI 3670 // 1035 enable modifiers for alt, numlock NYI
3647 // 1036 send ESC for meta keys NYI 3671 // 1036 send ESC for meta keys NYI
3648 // 1037 send DEL for keypad delete NYI 3672 // 1037 send DEL for keypad delete NYI
3649 { 1047, PrivMode_Screen }, 3673 { 1047, PrivMode_Screen },
3650 // 1048 save and restore cursor 3674 // 1048 save and restore cursor, implemented in code
3651 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3675 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3652 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3676 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3677 { 2004, PrivMode_BracketPaste },
3653 }; 3678 };
3654 3679
3655 if (nargs == 0) 3680 if (nargs == 0)
3656 return; 3681 return;
3657 3682
… …
3664 for (i = 0; i < nargs; i++) 3689 for (i = 0; i < nargs; i++)
3665 { 3690 {
3666 state = -1; 3691 state = -1;
3667 3692
3668 /* basic handling */ 3693 /* basic handling */
3669 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3694 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3670 if (argtopriv[j].argval == arg[i]) 3695 if (argtopriv[j].argval == arg[i])
3671 { 3696 {
3672 state = privcases (mode, argtopriv[j].bit); 3697 state = privcases (mode, argtopriv[j].bit);
3673 break; 3698 break;
3674 } 3699 }
… …
3682 3707
3683 scr_touch (true); 3708 scr_touch (true);
3684 break; 3709 break;
3685#endif 3710#endif
3686 case 1048: /* alternative cursor save */ 3711 case 1048: /* alternative cursor save */
3687 case 1049:
3688 if (option (Opt_secondaryScreen)) 3712 if (option (Opt_secondaryScreen))
3689 if (mode == 0) 3713 if (mode == 0)
3690 scr_cursor (RESTORE); 3714 scr_cursor (RESTORE);
3691 else if (mode == 1) 3715 else if (mode == 1)
3692 scr_cursor (SAVE); 3716 scr_cursor (SAVE);
… …
3701 case 2: /* VT52 mode */ 3725 case 2: /* VT52 mode */
3702 /* oddball mode. should be set regardless of set/reset 3726 /* oddball mode. should be set regardless of set/reset
3703 * parameter. Return from VT52 mode with an ESC < from 3727 * parameter. Return from VT52 mode with an ESC < from
3704 * within VT52 mode 3728 * within VT52 mode
3705 */ 3729 */
3706 PrivMode (1, PrivMode_vt52); 3730 set_privmode (PrivMode_vt52, 1);
3707 break; 3731 break;
3708 case 3: /* 80/132 */ 3732 case 3: /* 80/132 */
3709 if (priv_modes & PrivMode_132OK) 3733 if (priv_modes & PrivMode_132OK)
3710 set_widthheight (((state ? 132 : 80) * fwidth), height); 3734 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3711 break; 3735 break;
3712 case 4: /* smooth scrolling */ 3736 case 4: /* smooth scrolling */
3713 set_option (Opt_jumpScroll, !state); 3737 set_option (Opt_jumpScroll, !state);
3714 break; 3738 break;
3715 case 5: /* reverse video */ 3739 case 5: /* reverse video */
… …
3726 if (state) /* orthogonal */ 3750 if (state) /* orthogonal */
3727 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3751 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3728 break; 3752 break;
3729#ifdef scrollBar_esc 3753#ifdef scrollBar_esc
3730 case scrollBar_esc: 3754 case scrollBar_esc:
3731 if (scrollbar_mapping (state)) 3755 if (scrollBar.map (state))
3732 { 3756 {
3733 resize_all_windows (0, 0, 0); 3757 resize_all_windows (0, 0, 0);
3734 scr_touch (true); 3758 scr_touch (true);
3735 } 3759 }
3736 break; 3760 break;
… …
3747 /* case 67: - backspace key */ 3771 /* case 67: - backspace key */
3748 case 1000: /* X11 mouse reporting */ 3772 case 1000: /* X11 mouse reporting */
3749 if (state) /* orthogonal */ 3773 if (state) /* orthogonal */
3750 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3774 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3751 break; 3775 break;
3752#if 0
3753 case 1001:
3754 break; /* X11 mouse highlighting */
3755#endif
3756 case 1002: 3776 case 1002:
3757 case 1003: 3777 case 1003:
3758 if (state) { 3778 if (state)
3779 {
3759 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3780 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3760 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3781 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3782 mouse_row = mouse_col = 0;
3761 vt_emask_mouse = PointerMotionMask; 3783 vt_emask_mouse = PointerMotionMask;
3784 }
3762 } else 3785 else
3763 vt_emask_mouse = NoEventMask; 3786 vt_emask_mouse = NoEventMask;
3787
3764 vt_select_input (); 3788 vt_select_input ();
3765 break; 3789 break;
3766 case 1010: /* scroll to bottom on TTY output inhibit */ 3790 case 1010: /* scroll to bottom on TTY output inhibit */
3767 set_option (Opt_scrollTtyOutput, !state); 3791 set_option (Opt_scrollTtyOutput, !state);
3768 break; 3792 break;
3769 case 1011: /* scroll to bottom on key press */ 3793 case 1011: /* scroll to bottom on key press */
3770 set_option (Opt_scrollTtyKeypress, state); 3794 set_option (Opt_scrollTtyKeypress, state);
3771 break; 3795 break;
3772 case 1047: /* secondary screen w/ clearing last */ 3796 case 1047: /* secondary screen w/ clearing last */
3773 if (option (Opt_secondaryScreen)) 3797 if (option (Opt_secondaryScreen))
3774 if (current_screen != PRIMARY) 3798 if (!state)
3775 scr_erase_screen (2); 3799 scr_erase_screen (2);
3800
3776 scr_change_screen (state); 3801 scr_change_screen (state);
3777 break; 3802 break;
3778 case 1049: /* secondary screen w/ clearing first */ 3803 case 1049: /* secondary screen w/ clearing first */
3804 if (option (Opt_secondaryScreen))
3805 if (state)
3806 scr_cursor (SAVE);
3807
3779 scr_change_screen (state); 3808 scr_change_screen (state);
3809
3780 if (option (Opt_secondaryScreen)) 3810 if (option (Opt_secondaryScreen))
3781 if (current_screen != PRIMARY) 3811 if (state)
3782 scr_erase_screen (2); 3812 scr_erase_screen (2);
3813 else
3814 scr_cursor (RESTORE);
3783 break; 3815 break;
3784 default: 3816 default:
3785 break; 3817 break;
3786 } 3818 }
3787 } 3819 }
… …
3947rxvt_term::process_graphics () 3979rxvt_term::process_graphics ()
3948{ 3980{
3949 unicode_t ch, cmd = cmd_getc (); 3981 unicode_t ch, cmd = cmd_getc ();
3950 3982
3951 if (cmd == 'Q') 3983 if (cmd == 'Q')
3984 {
3952 { /* query graphics */ 3985 /* query graphics */
3953 tt_printf ("\033G0\012"); /* no graphics */ 3986 tt_printf ("\033G0\012"); /* no graphics */
3954 return; 3987 return;
3955 } 3988 }
3956 /* swallow other graphics sequences until terminating ':' */ 3989 /* swallow other graphics sequences until terminating ':' */
3957 do 3990 do
… …
3980 4013
3981/* ---------------------------------------------------------------------- */ 4014/* ---------------------------------------------------------------------- */
3982/* Write data to the pty as typed by the user, pasted with the mouse, 4015/* Write data to the pty as typed by the user, pasted with the mouse,
3983 * or generated by us in response to a query ESC sequence. 4016 * or generated by us in response to a query ESC sequence.
3984 */ 4017 */
3985const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4018static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3986 4019
3987void 4020void
3988rxvt_term::tt_write (const char *data, unsigned int len) 4021rxvt_term::tt_write (const char *data, unsigned int len)
3989{ 4022{
3990 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4023 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
4002 4035
4003 data += written; 4036 data += written;
4004 len -= written; 4037 len -= written;
4005 } 4038 }
4006 4039
4007 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4040 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4008 4041
4009 memcpy (v_buffer + v_buflen, data, len); 4042 memcpy (v_buffer + v_buflen, data, len);
4010 v_buflen += len; 4043 v_buflen += len;
4011 4044
4012 pty_ev.set (EVENT_READ | EVENT_WRITE); 4045 pty_ev.set (ev::READ | ev::WRITE);
4013} 4046}
4014 4047
4015void rxvt_term::pty_write () 4048void rxvt_term::pty_write ()
4016{ 4049{
4017 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4050 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4023 if (v_buflen == 0) 4056 if (v_buflen == 0)
4024 { 4057 {
4025 free (v_buffer); 4058 free (v_buffer);
4026 v_buffer = 0; 4059 v_buffer = 0;
4027 4060
4028 pty_ev.set (EVENT_READ); 4061 pty_ev.set (ev::READ);
4029 return; 4062 return;
4030 } 4063 }
4031 4064
4032 memmove (v_buffer, v_buffer + written, v_buflen); 4065 memmove (v_buffer, v_buffer + written, v_buflen);
4033 } 4066 }
4034 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4067 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4035 pty_ev.set (EVENT_READ); 4068 pty_ev.set (ev::READ);
4036} 4069}
4037 4070
4038/*----------------------- end-of-file (C source) -----------------------*/ 4071/*----------------------- end-of-file (C source) -----------------------*/
4039 4072

Diff Legend

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