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.356 by root, Mon Sep 17 08:31:54 2007 UTC vs.
Revision 1.457 by sf-exg, Fri Oct 22 18:03:10 2010 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
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
… …
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);
1300 y = ev.y; 1258 y = Pixel2Row (ev.y);
1301 pixel_position (&x, &y); 1259 if (ev.type == MotionNotify)
1260 {
1261 if (x == mouse_row && y == mouse_col)
1262 return;
1263 mouse_row = x;
1264 mouse_col = y;
1265 code += 32;
1266 }
1302 1267
1303 if (MEvent.button == AnyButton) 1268 if (MEvent.button == AnyButton)
1304 button_number = 3; 1269 button_number = 3;
1305 else 1270 else
1306 { 1271 {
… …
1352 x + 1, 1317 x + 1,
1353 y + 1); 1318 y + 1);
1354#endif 1319#endif
1355 1320
1356 tt_printf ("\033[M%c%c%c", 1321 tt_printf ("\033[M%c%c%c",
1357 (32 + button_number + key_state), 1322 (code + button_number + key_state),
1358 (32 + x + 1), 1323 (32 + x + 1),
1359 (32 + y + 1)); 1324 (32 + y + 1));
1360} 1325}
1361 1326
1362/*{{{ process an X event */ 1327/*{{{ process an X event */
… …
1466 && ev.xfocus.mode != NotifyGrab) 1431 && ev.xfocus.mode != NotifyGrab)
1467 focus_out (); 1432 focus_out ();
1468 break; 1433 break;
1469 1434
1470 case ConfigureNotify: 1435 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]) 1436 if (ev.xconfigure.window == parent[0])
1475 { 1437 {
1476 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1477 ; 1439 ;
1478 1440
… …
1483 } 1445 }
1484 else 1446 else
1485 { 1447 {
1486#ifdef HAVE_BG_PIXMAP 1448#ifdef HAVE_BG_PIXMAP
1487 if (bgPixmap.window_position_sensitive ()) 1449 if (bgPixmap.window_position_sensitive ())
1450 {
1451 if (mapped)
1488 update_background (); 1452 update_background ();
1453 else
1454 bgPixmap.invalidate ();
1455 }
1489#endif 1456#endif
1490 } 1457 }
1458
1491 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1459 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1492 } 1460 }
1493 break; 1461 break;
1494 1462
1495 case PropertyNotify: 1463 case PropertyNotify:
… …
1499 selection_property (ev.xproperty.window, ev.xproperty.atom); 1467 selection_property (ev.xproperty.window, ev.xproperty.atom);
1500 1468
1501 break; 1469 break;
1502 1470
1503 case SelectionClear: 1471 case SelectionClear:
1504 selection_clear (); 1472 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1505 break; 1473 break;
1506 1474
1507 case SelectionNotify: 1475 case SelectionNotify:
1508 if (selection_wait == Sel_normal) 1476 if (selection_wait == Sel_normal)
1509 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1477 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1512 case SelectionRequest: 1480 case SelectionRequest:
1513 selection_send (ev.xselectionrequest); 1481 selection_send (ev.xselectionrequest);
1514 break; 1482 break;
1515 1483
1516 case MapNotify: 1484 case MapNotify:
1485#ifdef HAVE_BG_PIXMAP
1486 /* This is needed specifically to fix the case of no window manager or a
1487 * non-reparenting window manager. In those cases we never get first
1488 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1489 * care of multiplicity of ConfigureNotify events arriving while WM does
1490 * reparenting.
1491 * We should not render background immediately, as there could be several
1492 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1493 * by scheduling background redraw as soon as we can, but giving a short
1494 * bit of time for ConfigureNotifies to arrive.
1495 * We should render background PRIOR to drawing any text, but AFTER all
1496 * of ConfigureNotifys for the best results.
1497 */
1498 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1499 update_background_ev.start (0.025);
1500#endif
1517 mapped = 1; 1501 mapped = 1;
1518#ifdef TEXT_BLINK 1502#ifdef TEXT_BLINK
1519 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1503 text_blink_ev.start ();
1520#endif 1504#endif
1521 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1505 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1522 break; 1506 break;
1523 1507
1524 case UnmapNotify: 1508 case UnmapNotify:
… …
1532 case GraphicsExpose: 1516 case GraphicsExpose:
1533 case Expose: 1517 case Expose:
1534 if (ev.xany.window == vt) 1518 if (ev.xany.window == vt)
1535 { 1519 {
1536 do 1520 do
1521 {
1537 scr_expose (ev.xexpose.x, ev.xexpose.y, 1522 scr_expose (ev.xexpose.x, ev.xexpose.y,
1538 ev.xexpose.width, ev.xexpose.height, False); 1523 ev.xexpose.width, ev.xexpose.height, False);
1524 }
1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1525 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1540 1526
1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1542 1528
1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1529 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1530 {
1544 scr_expose (ev.xexpose.x, ev.xexpose.y, 1531 scr_expose (ev.xexpose.x, ev.xexpose.y,
1545 ev.xexpose.width, ev.xexpose.height, False); 1532 ev.xexpose.width, ev.xexpose.height, False);
1533 }
1546 1534
1547 want_refresh = 1; 1535 want_refresh = 1;
1548 } 1536 }
1549 else 1537 else
1550 { 1538 {
… …
1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1541 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1554 ; 1542 ;
1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1543 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1556 ; 1544 ;
1557 1545
1558 if (isScrollbarWindow (ev.xany.window)) 1546 if (scrollBar.state && ev.xany.window == scrollBar.win)
1559 { 1547 {
1560 scrollBar.setIdle (); 1548 scrollBar.state = STATE_IDLE;
1561 scrollbar_show (0); 1549 scrollBar.show (0);
1562 } 1550 }
1563 } 1551 }
1564 break; 1552 break;
1565 1553
1566 case MotionNotify: 1554 case MotionNotify:
1567#ifdef POINTER_BLANK 1555#ifdef POINTER_BLANK
1568 if (hidden_pointer) 1556 if (hidden_pointer)
1569 pointer_unblank (); 1557 pointer_unblank ();
1570#endif 1558#endif
1559 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1560 || priv_modes & PrivMode_MouseAnyEvent)
1561 mouse_report (ev.xbutton);
1571 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1562 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1572 break; 1563 break;
1573 1564
1574 if (ev.xany.window == vt) 1565 if (ev.xany.window == vt)
1575 { 1566 {
… …
1609 int dist; 1600 int dist;
1610 1601
1611 /* don't clobber the current delay if we are 1602 /* don't clobber the current delay if we are
1612 * already in the middle of scrolling. 1603 * already in the middle of scrolling.
1613 */ 1604 */
1614 if (!sel_scroll_ev.active) 1605 if (!sel_scroll_ev.is_active ())
1615 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1606 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1616 1607
1617 /* save the event params so we can highlight 1608 /* save the event params so we can highlight
1618 * the selection in the pending-scroll loop 1609 * the selection in the pending-scroll loop
1619 */ 1610 */
1620 selection_save_x = ev.xbutton.x; 1611 selection_save_x = ev.xbutton.x;
… …
1642 else 1633 else
1643 { 1634 {
1644 /* we are within the text window, so we 1635 /* we are within the text window, so we
1645 * shouldn't be scrolling 1636 * shouldn't be scrolling
1646 */ 1637 */
1647 if (sel_scroll_ev.active)
1648 sel_scroll_ev.stop(); 1638 sel_scroll_ev.stop();
1649 } 1639 }
1650#endif 1640#endif
1651#ifdef MOUSE_THRESHOLD 1641#ifdef MOUSE_THRESHOLD
1652 } 1642 }
1653#endif 1643#endif
1654 } 1644 }
1655 } 1645 }
1656 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1646 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1657 { 1647 {
1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1648 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1659 MotionNotify, &ev)) 1649 MotionNotify, &ev))
1660 ; 1650 ;
1661 1651
… …
1663 &unused_root, &unused_child, 1653 &unused_root, &unused_child,
1664 &unused_root_x, &unused_root_y, 1654 &unused_root_x, &unused_root_y,
1665 &ev.xbutton.x, &ev.xbutton.y, 1655 &ev.xbutton.x, &ev.xbutton.y,
1666 &unused_mask); 1656 &unused_mask);
1667 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1657 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1668 scrollbar_size ()); 1658 scrollBar.size ());
1669 want_refresh = 1; 1659 want_refresh = 1;
1670 scrollbar_show (1); 1660 scrollBar.show (1);
1671 } 1661 }
1672 break; 1662 break;
1673 } 1663 }
1674 1664
1675#if defined(CURSOR_BLINK) 1665#if defined(CURSOR_BLINK)
… …
1679 { 1669 {
1680 hidden_cursor = 0; 1670 hidden_cursor = 0;
1681 want_refresh = 1; 1671 want_refresh = 1;
1682 } 1672 }
1683 1673
1684 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1674 cursor_blink_ev.again ();
1685 } 1675 }
1686#endif 1676#endif
1687 1677
1688#if defined(POINTER_BLANK) 1678#if defined(POINTER_BLANK)
1689 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1679 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1696 1686
1697 if (ev.type == KeyPress && hidden_pointer == 0) 1687 if (ev.type == KeyPress && hidden_pointer == 0)
1698 pointer_blank (); 1688 pointer_blank ();
1699 } 1689 }
1700#endif 1690#endif
1691
1692 refresh_check ();
1701} 1693}
1694
1695#if ENABLE_FRILLS
1696void
1697rxvt_term::set_urgency (bool enable)
1698{
1699 if (enable == urgency_hint)
1700 return;
1701
1702 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1703 {
1704 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1705 XSetWMHints (dpy, parent[0], h);
1706 urgency_hint = enable;
1707 }
1708}
1709#endif
1702 1710
1703void 1711void
1704rxvt_term::focus_in () 1712rxvt_term::focus_in ()
1705{ 1713{
1706 if (!focus) 1714 if (!focus)
1707 { 1715 {
1708 focus = 1; 1716 focus = 1;
1709 want_refresh = 1; 1717 want_refresh = 1;
1710 1718
1711 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1712
1713#if USE_XIM 1719#if USE_XIM
1714 if (Input_Context != NULL) 1720 if (Input_Context != NULL)
1715 { 1721 {
1716 IMSetPosition (); 1722 IMSetPosition ();
1717 XSetICFocus (Input_Context); 1723 XSetICFocus (Input_Context);
1718 } 1724 }
1719#endif 1725#endif
1720#if CURSOR_BLINK 1726#if CURSOR_BLINK
1721 if (option (Opt_cursorBlink)) 1727 if (option (Opt_cursorBlink))
1722 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1728 cursor_blink_ev.again ();
1723#endif 1729#endif
1724#if OFF_FOCUS_FADING 1730#if OFF_FOCUS_FADING
1725 if (rs[Rs_fade]) 1731 if (rs[Rs_fade])
1726 { 1732 {
1727 pix_colors = pix_colors_focused; 1733 pix_colors = pix_colors_focused;
1728 scr_recolour (); 1734 scr_recolour ();
1729 } 1735 }
1730#endif 1736#endif
1731#if ENABLE_FRILLS 1737#if ENABLE_FRILLS
1732 if (option (Opt_urgentOnBell)) 1738 if (option (Opt_urgentOnBell))
1733 { 1739 set_urgency (0);
1734 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1735 {
1736 h->flags &= ~XUrgencyHint;
1737 XSetWMHints (dpy, parent[0], h);
1738 }
1739 }
1740#endif 1740#endif
1741
1742 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1741 } 1743 }
1742} 1744}
1743 1745
1744void 1746void
1745rxvt_term::focus_out () 1747rxvt_term::focus_out ()
… …
1747 if (focus) 1749 if (focus)
1748 { 1750 {
1749 focus = 0; 1751 focus = 0;
1750 want_refresh = 1; 1752 want_refresh = 1;
1751 1753
1752 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1754#if ENABLE_FRILLS
1753 1755 if (option (Opt_urgentOnBell))
1756 set_urgency (0);
1757#endif
1754#if ENABLE_FRILLS || ISO_14755 1758#if ENABLE_FRILLS || ISO_14755
1755 if (iso14755buf) 1759 if (iso14755buf)
1756 { 1760 {
1757 iso14755buf = 0; 1761 iso14755buf = 0;
1758# if ISO_14755 1762# if ISO_14755
… …
1765 XUnsetICFocus (Input_Context); 1769 XUnsetICFocus (Input_Context);
1766#endif 1770#endif
1767#if CURSOR_BLINK 1771#if CURSOR_BLINK
1768 if (option (Opt_cursorBlink)) 1772 if (option (Opt_cursorBlink))
1769 cursor_blink_ev.stop (); 1773 cursor_blink_ev.stop ();
1774
1770 hidden_cursor = 0; 1775 hidden_cursor = 0;
1771#endif 1776#endif
1772#if OFF_FOCUS_FADING 1777#if OFF_FOCUS_FADING
1773 if (rs[Rs_fade]) 1778 if (rs[Rs_fade])
1774 { 1779 {
1775 pix_colors = pix_colors_unfocused; 1780 pix_colors = pix_colors_unfocused;
1776 scr_recolour (); 1781 scr_recolour ();
1777 } 1782 }
1778#endif 1783#endif
1784
1785 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1779 } 1786 }
1780} 1787}
1781 1788
1782void 1789void
1783rxvt_term::update_fade_color (unsigned int idx) 1790rxvt_term::update_fade_color (unsigned int idx)
… …
1814 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1821 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1815 { 1822 {
1816 bgPixmap.set_root_pixmap (); 1823 bgPixmap.set_root_pixmap ();
1817 update_background (); 1824 update_background ();
1818 } 1825 }
1826
1819 break; 1827 break;
1820 } 1828 }
1821# endif 1829# endif
1830
1831 refresh_check ();
1822} 1832}
1823#endif 1833#endif
1824 1834
1825void 1835void
1826rxvt_term::button_press (XButtonEvent &ev) 1836rxvt_term::button_press (XButtonEvent &ev)
… …
1857 /* save the xbutton state (for ButtonRelease) */ 1867 /* save the xbutton state (for ButtonRelease) */
1858 MEvent.state = ev.state; 1868 MEvent.state = ev.state;
1859#ifdef MOUSE_REPORT_DOUBLECLICK 1869#ifdef MOUSE_REPORT_DOUBLECLICK
1860 if (ev.button == MEvent.button && clickintime) 1870 if (ev.button == MEvent.button && clickintime)
1861 { 1871 {
1862 /* same button, within alloted time */ 1872 /* same button, within allowed time */
1863 MEvent.clicks++; 1873 MEvent.clicks++;
1864 1874
1865 if (MEvent.clicks > 1) 1875 if (MEvent.clicks > 1)
1866 { 1876 {
1867 /* only report double clicks */ 1877 /* only report double clicks */
… …
1881 mouse_report (ev); 1891 mouse_report (ev);
1882 } 1892 }
1883#else 1893#else
1884 MEvent.button = ev.button; 1894 MEvent.button = ev.button;
1885 mouse_report (ev); 1895 mouse_report (ev);
1886#endif /* MOUSE_REPORT_DOUBLECLICK */ 1896#endif /* MOUSE_REPORT_DOUBLECLICK */
1887 1897
1888 } 1898 }
1889 else 1899 else
1890 { 1900 {
1891 if (ev.button != MEvent.button) 1901 if (ev.button != MEvent.button)
… …
1939 } 1949 }
1940 1950
1941 /* 1951 /*
1942 * Scrollbar window processing of button press 1952 * Scrollbar window processing of button press
1943 */ 1953 */
1944 if (isScrollbarWindow (ev.window)) 1954 if (scrollBar.state && ev.window == scrollBar.win)
1945 { 1955 {
1946 scrollBar.setIdle (); 1956 page_dirn direction = NO_DIR;
1957
1958 if (scrollBar.upButton (ev.y))
1959 direction = UP; /* up */
1960 else if (scrollBar.dnButton (ev.y))
1961 direction = DN; /* down */
1962
1963 scrollBar.state = STATE_IDLE;
1947 /* 1964 /*
1948 * Rxvt-style scrollbar: 1965 * Rxvt-style scrollbar:
1949 * move up if mouse is above slider 1966 * move up if mouse is above slider
1950 * move dn if mouse is below slider 1967 * move dn if mouse is below slider
1951 * 1968 *
… …
1960 /* 1977 /*
1961 * Mouse report disabled scrollbar: 1978 * Mouse report disabled scrollbar:
1962 * arrow buttons - send up/down 1979 * arrow buttons - send up/down
1963 * click on scrollbar - send pageup/down 1980 * click on scrollbar - send pageup/down
1964 */ 1981 */
1965 if ((scrollBar.style == R_SB_NEXT 1982 if (direction == UP)
1966 && scrollbarnext_upButton (ev.y))
1967 || (scrollBar.style == R_SB_RXVT
1968 && scrollbarrxvt_upButton (ev.y)))
1969 tt_printf ("\033[A"); 1983 tt_printf ("\033[A");
1970 else if ((scrollBar.style == R_SB_NEXT 1984 else if (direction == DN)
1971 && scrollbarnext_dnButton (ev.y))
1972 || (scrollBar.style == R_SB_RXVT
1973 && scrollbarrxvt_dnButton (ev.y)))
1974 tt_printf ("\033[B"); 1985 tt_printf ("\033[B");
1975 else 1986 else
1976 switch (ev.button) 1987 switch (ev.button)
1977 { 1988 {
1978 case Button2: 1989 case Button2:
… …
1985 tt_printf ("\033[5~"); 1996 tt_printf ("\033[5~");
1986 break; 1997 break;
1987 } 1998 }
1988 } 1999 }
1989 else 2000 else
1990#endif /* NO_SCROLLBAR_REPORT */ 2001#endif /* NO_SCROLLBAR_REPORT */
1991
1992 {
1993 char upordown = 0;
1994
1995 if (scrollBar.style == R_SB_NEXT)
1996 { 2002 {
1997 if (scrollbarnext_upButton (ev.y)) 2003 if (direction != NO_DIR)
1998 upordown = -1; /* up */
1999 else if (scrollbarnext_dnButton (ev.y))
2000 upordown = 1; /* down */
2001 }
2002 else if (scrollBar.style == R_SB_RXVT)
2003 {
2004 if (scrollbarrxvt_upButton (ev.y))
2005 upordown = -1; /* up */
2006 else if (scrollbarrxvt_dnButton (ev.y))
2007 upordown = 1; /* down */
2008 }
2009 if (upordown)
2010 { 2004 {
2011#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2005#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2006 if (!cont_scroll_ev.is_active ())
2012 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2007 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2013#endif 2008#endif
2014 if (scr_page (upordown < 0 ? UP : DN, 1)) 2009 if (scr_page (direction, 1))
2015 { 2010 {
2016 if (upordown < 0) 2011 if (direction == UP)
2017 scrollBar.setUp (); 2012 scrollBar.state = STATE_UP;
2018 else 2013 else
2019 scrollBar.setDn (); 2014 scrollBar.state = STATE_DOWN;
2020 } 2015 }
2021 } 2016 }
2022 else 2017 else
2023 switch (ev.button) 2018 switch (ev.button)
2024 { 2019 {
2025 case Button2: 2020 case Button2:
2026 switch (scrollbar_align) 2021 switch (scrollBar.align)
2027 { 2022 {
2028 case R_SB_ALIGN_TOP: 2023 case R_SB_ALIGN_TOP:
2029 csrO = 0; 2024 csrO = 0;
2030 break; 2025 break;
2031 case R_SB_ALIGN_CENTRE: 2026 case R_SB_ALIGN_CENTRE:
… …
2037 } 2032 }
2038 2033
2039 if (scrollBar.style == R_SB_XTERM 2034 if (scrollBar.style == R_SB_XTERM
2040 || scrollbar_above_slider (ev.y) 2035 || scrollbar_above_slider (ev.y)
2041 || scrollbar_below_slider (ev.y)) 2036 || scrollbar_below_slider (ev.y))
2042 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2037 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2043 2038
2044 scrollBar.setMotion (); 2039 scrollBar.state = STATE_MOTION;
2045 break; 2040 break;
2046 2041
2047 case Button1: 2042 case Button1:
2048 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2043 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2049 csrO = ev.y - scrollBar.top; 2044 csrO = ev.y - scrollBar.top;
2050 /* FALLTHROUGH */ 2045 /* FALLTHROUGH */
2051 2046
2052 case Button3: 2047 case Button3:
2053 if (scrollBar.style != R_SB_XTERM) 2048 if (scrollBar.style != R_SB_XTERM)
… …
2063 scr_page (DN, nrow - 1); 2058 scr_page (DN, nrow - 1);
2064# else 2059# else
2065 scr_page (DN, nrow / 4); 2060 scr_page (DN, nrow / 4);
2066# endif 2061# endif
2067 else 2062 else
2068 scrollBar.setMotion (); 2063 scrollBar.state = STATE_MOTION;
2069 } 2064 }
2070 else 2065 else
2071 { 2066 {
2072 scr_page ((ev.button == Button1 ? DN : UP), 2067 scr_page ((ev.button == Button1 ? DN : UP),
2073 (nrow 2068 (nrow
2074 * scrollbar_position (ev.y) 2069 * scrollbar_position (ev.y)
2075 / scrollbar_size ())); 2070 / scrollBar.size ()));
2076 } 2071 }
2077 2072
2078 break; 2073 break;
2079 } 2074 }
2080 } 2075 }
… …
2090 2085
2091 csrO = 0; /* reset csr Offset */ 2086 csrO = 0; /* reset csr Offset */
2092 if (!bypass_keystate) 2087 if (!bypass_keystate)
2093 reportmode = !! (priv_modes & PrivMode_mouse_report); 2088 reportmode = !! (priv_modes & PrivMode_mouse_report);
2094 2089
2095 if (scrollbar_isUpDn ()) 2090 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2096 { 2091 {
2097 scrollBar.setIdle (); 2092 scrollBar.state = STATE_IDLE;
2098 scrollbar_show (0); 2093 scrollBar.show (0);
2099 } 2094 }
2100 2095
2101#ifdef SELECTION_SCROLLING 2096#ifdef SELECTION_SCROLLING
2102 if (sel_scroll_ev.active)
2103 sel_scroll_ev.stop(); 2097 sel_scroll_ev.stop();
2104#endif 2098#endif
2105 2099
2106 if (ev.window == vt) 2100 if (ev.window == vt)
2107 { 2101 {
2108 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2102 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2132 mouse_report (ev); 2126 mouse_report (ev);
2133 } 2127 }
2134#else /* MOUSE_REPORT_DOUBLECLICK */ 2128#else /* MOUSE_REPORT_DOUBLECLICK */
2135 MEvent.button = AnyButton; 2129 MEvent.button = AnyButton;
2136 mouse_report (ev); 2130 mouse_report (ev);
2137#endif /* MOUSE_REPORT_DOUBLECLICK */ 2131#endif /* MOUSE_REPORT_DOUBLECLICK */
2138 return; 2132 return;
2139 } 2133 }
2140 2134
2141 /* 2135 /*
2142 * dumb hack to compensate for the failure of click-and-drag 2136 * dumb hack to compensate for the failure of click-and-drag
… …
2154 selection_make (ev.time); 2148 selection_make (ev.time);
2155 break; 2149 break;
2156 2150
2157 case Button2: 2151 case Button2:
2158 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2152 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2159 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2153 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2160 break; 2154 break;
2161 2155
2162#ifdef MOUSE_WHEEL 2156#ifdef MOUSE_WHEEL
2163 case Button4: 2157 case Button4:
2164 case Button5: 2158 case Button5:
… …
2180 { 2174 {
2181 mouse_slip_wheel_speed += v ? -1 : 1; 2175 mouse_slip_wheel_speed += v ? -1 : 1;
2182 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2176 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2183 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2177 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2184 2178
2185 if (slip_wheel_ev.at < NOW) 2179 if (!slip_wheel_ev.is_active ())
2186 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2180 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2187
2188 slip_wheel_ev.start ();
2189 } 2181 }
2190 else 2182 else
2183# endif
2191 { 2184 {
2192# endif
2193 scr_page (v, i); 2185 scr_page (v, i);
2194 scrollbar_show (1); 2186 scrollBar.show (1);
2195# ifdef MOUSE_SLIP_WHEELING
2196 } 2187 }
2197# endif
2198 } 2188 }
2199 break; 2189 break;
2200#endif 2190#endif
2201 } 2191 }
2202 } 2192 }
2203} 2193}
2204 2194
2205/*}}} */ 2195/*}}} */
2206 2196
2207bool 2197void
2208rxvt_term::cmd_parse () 2198rxvt_term::cmd_parse ()
2209{ 2199{
2210 bool flag = false;
2211 wchar_t ch = NOCHAR; 2200 wchar_t ch = NOCHAR;
2212 char *seq_begin; // remember start of esc-sequence here 2201 char *seq_begin; // remember start of esc-sequence here
2213 2202
2214 for (;;) 2203 for (;;)
2215 { 2204 {
2216 if (ch == NOCHAR) 2205 if (expect_false (ch == NOCHAR))
2217 { 2206 {
2218 seq_begin = cmdbuf_ptr; 2207 seq_begin = cmdbuf_ptr;
2219 ch = next_char (); 2208 ch = next_char ();
2220 2209
2221 if (ch == NOCHAR) 2210 if (ch == NOCHAR)
2222 break; 2211 break;
2223 } 2212 }
2224 2213
2225 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2214 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2226 { 2215 {
2227 if (!seen_input) 2216 if (expect_false (!seen_input))
2228 { 2217 {
2229 seen_input = 1; 2218 seen_input = 1;
2230 // many badly-written programs (e.g. jed) contain a race condition: 2219 // many badly-written programs (e.g. jed) contain a race condition:
2231 // they first read the screensize and then install a SIGWINCH handler. 2220 // they first read the screensize and then install a SIGWINCH handler.
2232 // some window managers resize the window early, and these programs 2221 // some window managers resize the window early, and these programs
… …
2245 wchar_t *str = buf; 2234 wchar_t *str = buf;
2246 wchar_t *eol = str + min (ncol, UBUFSIZ); 2235 wchar_t *eol = str + min (ncol, UBUFSIZ);
2247 2236
2248 for (;;) 2237 for (;;)
2249 { 2238 {
2250 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2239 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2251 break; 2240 break;
2252 2241
2253 *str++ = ch; 2242 *str++ = ch;
2254 2243
2255 if (ch == C0_LF || str >= eol) 2244 if (expect_false (ch == C0_LF || str >= eol))
2256 { 2245 {
2257 if (ch == C0_LF) 2246 if (ch == C0_LF)
2258 nlines++; 2247 nlines++;
2259 2248
2260 refresh_count++; 2249 refresh_count++;
2261 2250
2262 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2251 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2263 { 2252 {
2264 refresh_count = 0; 2253 refresh_count = 0;
2265 2254
2266 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2255 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2267 { 2256 {
2268 refreshnow = true; 2257 refreshnow = true;
2269 ch = NOCHAR; 2258 ch = NOCHAR;
2270 break; 2259 break;
2271 } 2260 }
… …
2309 * What the heck we'll cheat and only refresh less than every page-full. 2298 * What the heck we'll cheat and only refresh less than every page-full.
2310 * if skipScroll is enabled. 2299 * if skipScroll is enabled.
2311 */ 2300 */
2312 if (refreshnow) 2301 if (refreshnow)
2313 { 2302 {
2314 flag = true;
2315 scr_refresh (); 2303 scr_refresh ();
2316 want_refresh = 1; 2304 want_refresh = 1;
2317 } 2305 }
2318
2319 } 2306 }
2320 else 2307 else
2321 { 2308 {
2322 try 2309 try
2323 { 2310 {
… …
2331 } 2318 }
2332 2319
2333 ch = NOCHAR; 2320 ch = NOCHAR;
2334 } 2321 }
2335 } 2322 }
2336
2337 return flag;
2338} 2323}
2339 2324
2340// read the next character 2325// read the next character
2341wchar_t 2326wchar_t
2342rxvt_term::next_char () NOTHROW 2327rxvt_term::next_char () NOTHROW
2343{ 2328{
2344 while (cmdbuf_ptr < cmdbuf_endp) 2329 while (cmdbuf_ptr < cmdbuf_endp)
2345 { 2330 {
2346 // assume 7-bit to be ascii ALWAYS 2331 // assume 7-bit to be ascii ALWAYS
2347 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2332 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2348 return *cmdbuf_ptr++; 2333 return *cmdbuf_ptr++;
2349 2334
2350 wchar_t wc; 2335 wchar_t wc;
2351 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2336 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2352 2337
… …
2356 cmdbuf_ptr = cmdbuf_endp; 2341 cmdbuf_ptr = cmdbuf_endp;
2357 break; 2342 break;
2358 } 2343 }
2359 2344
2360 if (len == (size_t)-1) 2345 if (len == (size_t)-1)
2346 {
2347 mbstate.reset (); // reset now undefined conversion state
2361 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2348 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2349 }
2362 2350
2363 // assume wchar == unicode 2351 // assume wchar == unicode
2364 cmdbuf_ptr += len; 2352 cmdbuf_ptr += len;
2365 return wc & UNICODE_MASK; 2353 return wc & UNICODE_MASK;
2366 } 2354 }
… …
2410/*----------------------------------------------------------------------*/ 2398/*----------------------------------------------------------------------*/
2411#ifdef PRINTPIPE 2399#ifdef PRINTPIPE
2412FILE * 2400FILE *
2413rxvt_term::popen_printer () 2401rxvt_term::popen_printer ()
2414{ 2402{
2415 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2403 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2416 2404
2417 if (stream == NULL) 2405 if (stream == NULL)
2418 rxvt_warn ("can't open printer pipe, not printing.\n"); 2406 rxvt_warn ("can't open printer pipe, not printing.\n");
2419 2407
2420 return stream; 2408 return stream;
… …
2431 * simulate attached vt100 printer 2419 * simulate attached vt100 printer
2432 */ 2420 */
2433void 2421void
2434rxvt_term::process_print_pipe () 2422rxvt_term::process_print_pipe ()
2435{ 2423{
2436 int done; 2424 FILE *fd = popen_printer ();
2437 FILE *fd;
2438 2425
2439 if ((fd = popen_printer ()) == NULL) 2426 if (!fd)
2440 return; 2427 return;
2441 2428
2442 /* 2429 /*
2443 * Send all input to the printer until either ESC[4i or ESC[?4i 2430 * Send all input to the printer until either ESC[4i or ESC[?4i
2444 * is received. 2431 * is received.
2445 */ 2432 */
2446 for (done = 0; !done;) 2433 for (int done = 0; !done; )
2447 { 2434 {
2448 unsigned char buf[8]; 2435 unsigned char buf[8];
2449 unicode_t ch; 2436 unicode_t ch;
2450 unsigned int i, len; 2437 unsigned int i, len;
2451 2438
… …
2482 } 2469 }
2483 } 2470 }
2484 2471
2485 pclose_printer (fd); 2472 pclose_printer (fd);
2486} 2473}
2487#endif /* PRINTPIPE */ 2474#endif /* PRINTPIPE */
2488/*}}} */ 2475/*}}} */
2489 2476
2490/* *INDENT-OFF* */ 2477/* *INDENT-OFF* */
2491enum { 2478enum {
2492 C1_40 = 0x40, 2479 C1_40 = 0x40,
… …
2596 break; 2583 break;
2597 case 'Z': /* identify the terminal type */ 2584 case 'Z': /* identify the terminal type */
2598 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2585 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2599 break; 2586 break;
2600 case '<': /* turn off VT52 mode */ 2587 case '<': /* turn off VT52 mode */
2601 PrivMode (0, PrivMode_vt52); 2588 set_privmode (PrivMode_vt52, 0);
2602 break; 2589 break;
2603 case 'F': /* use special graphics character set */ 2590 case 'F': /* use special graphics character set */
2604 case 'G': /* use regular character set */ 2591 case 'G': /* use regular character set */
2605 /* unimplemented */ 2592 /* unimplemented */
2606 break; 2593 break;
… …
2660 scr_forwardindex (); 2647 scr_forwardindex ();
2661 break; 2648 break;
2662#endif 2649#endif
2663 case '=': 2650 case '=':
2664 case '>': 2651 case '>':
2665 PrivMode ((ch == '='), PrivMode_aplKP); 2652 set_privmode (PrivMode_aplKP, ch == '=');
2666 break; 2653 break;
2667 2654
2668 case C1_40: 2655 case C1_40:
2669 cmd_getc (); 2656 cmd_getc ();
2670 break; 2657 break;
… …
2709 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2696 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2710 case C1_SCI: /* ESC Z */ 2697 case C1_SCI: /* ESC Z */
2711 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2698 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2712 break; /* steal obsolete ESC [ c */ 2699 break; /* steal obsolete ESC [ c */
2713 2700
2714 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2701 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2715 case C1_CSI: /* ESC [ */ 2702 case C1_CSI: /* ESC [ */
2716 process_csi_seq (); 2703 process_csi_seq ();
2717 break; 2704 break;
2718 2705
2719 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2706 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2720 case C1_OSC: /* ESC ] */ 2707 case C1_OSC: /* ESC ] */
2721 process_osc_seq (); 2708 process_osc_seq ();
2722 break; 2709 break;
2723 2710
2724 /* 8.3.106: RESET TO INITIAL STATE */ 2711 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2725 case 'c': 2712 case 'c':
2726 mbstate.reset (); 2713 mbstate.reset ();
2727 scr_poweron (); 2714 scr_poweron ();
2728 scrollbar_show (1); 2715 scrollBar.show (1);
2729 break; 2716 break;
2730 2717
2731 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2718 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2732 case 'n': 2719 case 'n':
2733 scr_charset_choose (2); 2720 scr_charset_choose (2);
… …
2784 2771
2785 nargs = 0; 2772 nargs = 0;
2786 2773
2787 priv = 0; 2774 priv = 0;
2788 ch = cmd_getc (); 2775 ch = cmd_getc ();
2789 if (ch >= '<' && ch <= '?') 2776 if ((ch >= '<' && ch <= '?') || ch == '!')
2777 {
2790 { /* '<' '=' '>' '?' */ 2778 /* '<' '=' '>' '?' '!' */
2791 priv = ch; 2779 priv = ch;
2792 ch = cmd_getc (); 2780 ch = cmd_getc ();
2793 } 2781 }
2794 2782
2795 /* read any numerical arguments */ 2783 /* read any numerical arguments */
… …
2838 { 2826 {
2839 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2827 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2840 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2828 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2841 // 2829 //
2842 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2830 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2843 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2831 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2844 // that we do not support xterm mouse reporting (should be 95 when we do). 2832 // versions.
2845 // 2833 //
2846 tt_printf ("\033[>%d;94;0c", 'U'); 2834 tt_printf ("\033[>%d;95;0c", 'U');
2847 } 2835 }
2848 break; 2836 break;
2837
2849 case '?': 2838 case '?':
2850 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2839 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2851 process_terminal_mode (ch, priv, nargs, arg); 2840 process_terminal_mode (ch, priv, nargs, arg);
2852 break; 2841 break;
2842
2843 case '!':
2844 if (ch == CSI_70)
2845 {
2846 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2847 scr_soft_reset ();
2848
2849 static const int pm_h[] = { 7, 25 };
2850 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2851
2852 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2853 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2853 } 2854 }
2855 break;
2856 }
2857
2854 return; 2858 return;
2855 } 2859 }
2856 2860
2857 switch (ch) 2861 switch (ch)
2858 { 2862 {
… …
3225 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3229 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3226 */ 3230 */
3227void 3231void
3228rxvt_term::process_dcs_seq () 3232rxvt_term::process_dcs_seq ()
3229{ 3233{
3230 char *s;
3231 unicode_t eh;
3232
3233 /* 3234 /*
3234 * Not handled yet 3235 * Not handled yet
3235 */ 3236 */
3237
3238 unicode_t eh;
3236 s = get_to_st (eh); 3239 char *s = get_to_st (eh);
3237 if (s) 3240 if (s)
3238 free (s); 3241 free (s);
3239 3242
3240 return; 3243 return;
3241} 3244}
… …
3245 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3248 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3246 */ 3249 */
3247void 3250void
3248rxvt_term::process_osc_seq () 3251rxvt_term::process_osc_seq ()
3249{ 3252{
3250 unicode_t ch, eh;
3251 int arg; 3253 int arg;
3252 3254
3253 ch = cmd_getc (); 3255 unicode_t ch = cmd_getc ();
3254 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3256 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3255 arg = arg * 10 + (ch - '0'); 3257 arg = arg * 10 + (ch - '0');
3256 3258
3257 if (ch == ';') 3259 if (ch == ';')
3258 { 3260 {
3261 unicode_t eh;
3259 char *s = get_to_st (eh); 3262 char *s = get_to_st (eh);
3260 3263
3261 if (s) 3264 if (s)
3262 { 3265 {
3263 process_xterm_seq (arg, s, eh); 3266 process_xterm_seq (arg, s, eh);
… …
3287 3290
3288/* 3291/*
3289 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3292 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3290 */ 3293 */
3291void 3294void
3292rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3295rxvt_term::process_xterm_seq (int op, char *str, char resp)
3293{ 3296{
3294 int color; 3297 int color;
3295 char *buf, *name; 3298 char *buf, *name;
3296 bool query = str[0] == '?' && !str[1]; 3299 bool query = str[0] == '?' && !str[1];
3297 int saveop = op; 3300 int saveop = op;
… …
3338 3341
3339 XFree (value); 3342 XFree (value);
3340 } 3343 }
3341 else 3344 else
3342 { 3345 {
3343 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3346 char *eq = strchr (str, '=');
3344 3347
3345 if (eq) 3348 if (eq)
3346 { 3349 {
3347 *eq = 0; 3350 *eq = 0;
3348 set_utf8_property (display->atom (str), eq + 1); 3351 set_utf8_property (display->atom (str), eq + 1);
… …
3369 *buf++ = '\0'; 3372 *buf++ = '\0';
3370 3373
3371 process_color_seq (op, color, name, resp); 3374 process_color_seq (op, color, name, resp);
3372 } 3375 }
3373 break; 3376 break;
3377 case Rxvt_restoreFG:
3374 case XTerm_Color00: 3378 case XTerm_Color00:
3375 process_color_seq (op, Color_fg, str, resp); 3379 process_color_seq (op, Color_fg, str, resp);
3376 break; 3380 break;
3381 case Rxvt_restoreBG:
3377 case XTerm_Color01: 3382 case XTerm_Color01:
3378 process_color_seq (op, Color_bg, str, resp); 3383 process_color_seq (op, Color_bg, str, resp);
3379 break; 3384 break;
3380#ifndef NO_CURSORCOLOR 3385#ifndef NO_CURSORCOLOR
3381 case XTerm_Color_cursor: 3386 case XTerm_Color_cursor:
… …
3386 process_color_seq (op, Color_pointer_fg, str, resp); 3391 process_color_seq (op, Color_pointer_fg, str, resp);
3387 break; 3392 break;
3388 case XTerm_Color_pointer_bg: 3393 case XTerm_Color_pointer_bg:
3389 process_color_seq (op, Color_pointer_bg, str, resp); 3394 process_color_seq (op, Color_pointer_bg, str, resp);
3390 break; 3395 break;
3396#ifdef OPTION_HC
3397 case XTerm_Color_HC:
3398 process_color_seq (op, Color_HC, str, resp);
3399 break;
3400 case XTerm_Color_HTC:
3401 process_color_seq (op, Color_HTC, str, resp);
3402 break;
3403#endif
3391#ifndef NO_BOLD_UNDERLINE_REVERSE 3404#ifndef NO_BOLD_UNDERLINE_REVERSE
3392 case XTerm_Color_RV:
3393 process_color_seq (op, Color_RV, str, resp);
3394 break;
3395 case Rxvt_Color_BD:
3396 case URxvt_Color_BD: 3405 case URxvt_Color_BD:
3397 process_color_seq (op, Color_BD, str, resp); 3406 process_color_seq (op, Color_BD, str, resp);
3398 break; 3407 break;
3399 case Rxvt_Color_UL:
3400 case URxvt_Color_UL: 3408 case URxvt_Color_UL:
3401 process_color_seq (op, Color_UL, str, resp); 3409 process_color_seq (op, Color_UL, str, resp);
3402 break; 3410 break;
3403 case URxvt_Color_IT: 3411 case URxvt_Color_IT:
3404 process_color_seq (op, Color_IT, str, resp); 3412 process_color_seq (op, Color_IT, str, resp);
3405 break; 3413 break;
3406#endif 3414#endif
3415 case URxvt_Color_border:
3416 process_color_seq (op, Color_border, str, resp);
3417 break;
3407#if ENABLE_TRANSPARENCY 3418#if ENABLE_TRANSPARENCY
3408 case URxvt_Color_tint: 3419 case URxvt_Color_tint:
3409 process_color_seq (op, Color_tint, str, resp); 3420 process_color_seq (op, Color_tint, str, resp);
3410 { 3421 {
3411 bool changed = false; 3422 bool changed = false;
3423
3412 if (ISSET_PIXCOLOR (Color_tint)) 3424 if (ISSET_PIXCOLOR (Color_tint))
3413 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3425 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3414 else 3426 else
3415 changed = bgPixmap.unset_tint (); 3427 changed = bgPixmap.unset_tint ();
3428
3416 if (changed) 3429 if (changed)
3417 update_background (); 3430 update_background ();
3418 } 3431 }
3419 3432
3420 break; 3433 break;
… …
3424 case Rxvt_Pixmap: 3437 case Rxvt_Pixmap:
3425 if (!strcmp (str, "?")) 3438 if (!strcmp (str, "?"))
3426 { 3439 {
3427 char str[256]; 3440 char str[256];
3428 3441
3429 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3442 sprintf (str, "[%dx%d+%d+%d]",
3430 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3443 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3431 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3444 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3432 process_xterm_seq (XTerm_title, str, CHAR_ST); 3445 process_xterm_seq (XTerm_title, str, CHAR_ST);
3433 } 3446 }
3434 else 3447 else
… …
3443 changed++; 3456 changed++;
3444 str = strchr (str, ';'); 3457 str = strchr (str, ';');
3445 if (str == NULL) 3458 if (str == NULL)
3446 bgPixmap.set_defaultGeometry (); 3459 bgPixmap.set_defaultGeometry ();
3447 } 3460 }
3461
3448 while (str) 3462 while (str)
3449 { 3463 {
3450 str++; 3464 str++;
3451 if (bgPixmap.set_geometry (str)) 3465 if (bgPixmap.set_geometry (str))
3452 changed++; 3466 changed++;
3453 str = strchr (str, ';'); 3467 str = strchr (str, ';');
3454 } 3468 }
3469
3455 if (changed) 3470 if (changed)
3456 update_background (); 3471 update_background ();
3457 } 3472 }
3458 break; 3473 break;
3459#endif 3474#endif
3460
3461 case Rxvt_restoreFG:
3462 set_window_color (Color_fg, str);
3463 break;
3464 case Rxvt_restoreBG:
3465 set_window_color (Color_bg, str);
3466 break;
3467 3475
3468 case XTerm_logfile: 3476 case XTerm_logfile:
3469 // TODO, when secure mode? 3477 // TODO, when secure mode?
3470 break; 3478 break;
3471 3479
… …
3538 break; 3546 break;
3539#endif 3547#endif
3540 3548
3541#if ENABLE_PERL 3549#if ENABLE_PERL
3542 case URxvt_perl: 3550 case URxvt_perl:
3543 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3551 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3544 ; // no responses yet
3545 break; 3552 break;
3546#endif 3553#endif
3547 } 3554 }
3548} 3555}
3549/*----------------------------------------------------------------------*/ 3556/*----------------------------------------------------------------------*/
… …
3572 { 3579 {
3573 if (mode == 'r') 3580 if (mode == 'r')
3574 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3581 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3575 else 3582 else
3576 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3583 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3577 PrivMode (state, bit); 3584
3585 set_privmode (bit, state);
3578 } 3586 }
3579 3587
3580 return state; 3588 return state;
3581} 3589}
3582 3590
… …
3590 static const struct 3598 static const struct
3591 { 3599 {
3592 const int argval; 3600 const int argval;
3593 const unsigned long bit; 3601 const unsigned long bit;
3594 } argtopriv[] = { 3602 } argtopriv[] = {
3595 { 1, PrivMode_aplCUR }, 3603 { 1, PrivMode_aplCUR }, // DECCKM
3596 { 2, PrivMode_vt52 }, 3604 { 2, PrivMode_vt52 },
3597 { 3, PrivMode_132 }, 3605 { 3, PrivMode_132 }, // DECCOLM
3598 { 4, PrivMode_smoothScroll }, 3606 { 4, PrivMode_smoothScroll }, // DECSCLM
3599 { 5, PrivMode_rVideo }, 3607 { 5, PrivMode_rVideo }, // DECSCNM
3600 { 6, PrivMode_relOrigin }, 3608 { 6, PrivMode_relOrigin }, // DECOM
3601 { 7, PrivMode_Autowrap }, 3609 { 7, PrivMode_Autowrap }, // DECAWM
3602 // 8, bi-directional support mode 3610 // 8, auto-repeat keys // DECARM
3603 { 9, PrivMode_MouseX10 }, 3611 { 9, PrivMode_MouseX10 },
3604 // 18, 19 printing-related 3612 // 18 end FF to printer after print screen
3613 // 19 Print screen prints full screen/scroll region
3605 { 25, PrivMode_VisibleCursor }, 3614 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3606#ifdef scrollBar_esc 3615#ifdef scrollBar_esc
3607 { scrollBar_esc, PrivMode_scrollBar }, 3616 { scrollBar_esc, PrivMode_scrollBar },
3608#endif 3617#endif
3609 { 35, PrivMode_ShiftKeys }, // rxvt extension 3618 { 35, PrivMode_ShiftKeys }, // rxvt extension
3619 // 38, tektronix mode // DECTEK
3610 { 40, PrivMode_132OK }, 3620 { 40, PrivMode_132OK },
3611 // 41 xterm more fixes NYI 3621 // 41 xterm more fixes NYI
3612 // 45 margin bell NYI 3622 // 45 margin bell NYI
3613 // 46 start logging 3623 // 46 start logging
3614 { 47, PrivMode_Screen }, 3624 { 47, PrivMode_Screen },
3615 { 66, PrivMode_aplKP }, 3625 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3616#ifndef NO_BACKSPACE_KEY 3626#ifndef NO_BACKSPACE_KEY
3617 { 67, PrivMode_BackSpace }, 3627 { 67, PrivMode_BackSpace }, // DECBKM
3618#endif 3628#endif
3619 { 1000, PrivMode_MouseX11 }, 3629 { 1000, PrivMode_MouseX11 },
3620 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3630 { 1002, PrivMode_MouseBtnEvent },
3621 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3631 { 1003, PrivMode_MouseAnyEvent },
3622 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3623 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3632 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3624 { 1011, PrivMode_Keypress }, // rxvt extension 3633 { 1011, PrivMode_Keypress }, // rxvt extension
3625 // 1035 enable modifiers for alt, numlock NYI 3634 // 1035 enable modifiers for alt, numlock NYI
3626 // 1036 send ESC for meta keys NYI 3635 // 1036 send ESC for meta keys NYI
3627 // 1037 send DEL for keypad delete NYI 3636 // 1037 send DEL for keypad delete NYI
3628 { 1047, PrivMode_Screen }, 3637 { 1047, PrivMode_Screen },
3629 // 1048 save and restore cursor 3638 // 1048 save and restore cursor
3630 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3639 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3631 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3640 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3641 { 2004, PrivMode_BracketPaste },
3632 }; 3642 };
3633 3643
3634 if (nargs == 0) 3644 if (nargs == 0)
3635 return; 3645 return;
3636 3646
… …
3661 3671
3662 scr_touch (true); 3672 scr_touch (true);
3663 break; 3673 break;
3664#endif 3674#endif
3665 case 1048: /* alternative cursor save */ 3675 case 1048: /* alternative cursor save */
3666 case 1049:
3667 if (option (Opt_secondaryScreen)) 3676 if (option (Opt_secondaryScreen))
3668 if (mode == 0) 3677 if (mode == 0)
3669 scr_cursor (RESTORE); 3678 scr_cursor (RESTORE);
3670 else if (mode == 1) 3679 else if (mode == 1)
3671 scr_cursor (SAVE); 3680 scr_cursor (SAVE);
… …
3680 case 2: /* VT52 mode */ 3689 case 2: /* VT52 mode */
3681 /* oddball mode. should be set regardless of set/reset 3690 /* oddball mode. should be set regardless of set/reset
3682 * parameter. Return from VT52 mode with an ESC < from 3691 * parameter. Return from VT52 mode with an ESC < from
3683 * within VT52 mode 3692 * within VT52 mode
3684 */ 3693 */
3685 PrivMode (1, PrivMode_vt52); 3694 set_privmode (PrivMode_vt52, 1);
3686 break; 3695 break;
3687 case 3: /* 80/132 */ 3696 case 3: /* 80/132 */
3688 if (priv_modes & PrivMode_132OK) 3697 if (priv_modes & PrivMode_132OK)
3689 set_widthheight (((state ? 132 : 80) * fwidth), height); 3698 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3690 break; 3699 break;
3691 case 4: /* smooth scrolling */ 3700 case 4: /* smooth scrolling */
3692 set_option (Opt_jumpScroll, !state); 3701 set_option (Opt_jumpScroll, !state);
3693 break; 3702 break;
3694 case 5: /* reverse video */ 3703 case 5: /* reverse video */
… …
3701 scr_autowrap (state); 3710 scr_autowrap (state);
3702 break; 3711 break;
3703 /* case 8: - auto repeat, can't do on a per window basis */ 3712 /* case 8: - auto repeat, can't do on a per window basis */
3704 case 9: /* X10 mouse reporting */ 3713 case 9: /* X10 mouse reporting */
3705 if (state) /* orthogonal */ 3714 if (state) /* orthogonal */
3706 priv_modes &= ~PrivMode_MouseX11; 3715 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3707 break; 3716 break;
3708#ifdef scrollBar_esc 3717#ifdef scrollBar_esc
3709 case scrollBar_esc: 3718 case scrollBar_esc:
3710 if (scrollbar_mapping (state)) 3719 if (scrollBar.map (state))
3711 { 3720 {
3712 resize_all_windows (0, 0, 0); 3721 resize_all_windows (0, 0, 0);
3713 scr_touch (true); 3722 scr_touch (true);
3714 } 3723 }
3715 break; 3724 break;
… …
3724 break; 3733 break;
3725 /* case 66: - application key pad */ 3734 /* case 66: - application key pad */
3726 /* case 67: - backspace key */ 3735 /* case 67: - backspace key */
3727 case 1000: /* X11 mouse reporting */ 3736 case 1000: /* X11 mouse reporting */
3728 if (state) /* orthogonal */ 3737 if (state) /* orthogonal */
3729 priv_modes &= ~PrivMode_MouseX10; 3738 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3730 break; 3739 break;
3731#if 0
3732 case 1001: 3740 case 1002:
3733 break; /* X11 mouse highlighting */ 3741 case 1003:
3734#endif 3742 if (state)
3743 {
3744 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3745 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3746 vt_emask_mouse = PointerMotionMask;
3747 }
3748 else
3749 vt_emask_mouse = NoEventMask;
3750
3751 vt_select_input ();
3752 break;
3735 case 1010: /* scroll to bottom on TTY output inhibit */ 3753 case 1010: /* scroll to bottom on TTY output inhibit */
3736 set_option (Opt_scrollTtyOutput, !state); 3754 set_option (Opt_scrollTtyOutput, !state);
3737 break; 3755 break;
3738 case 1011: /* scroll to bottom on key press */ 3756 case 1011: /* scroll to bottom on key press */
3739 set_option (Opt_scrollTtyKeypress, state); 3757 set_option (Opt_scrollTtyKeypress, state);
3740 break; 3758 break;
3741 case 1047: /* secondary screen w/ clearing last */ 3759 case 1047: /* secondary screen w/ clearing last */
3742 if (option (Opt_secondaryScreen)) 3760 if (option (Opt_secondaryScreen))
3743 if (current_screen != PRIMARY) 3761 if (!state)
3744 scr_erase_screen (2); 3762 scr_erase_screen (2);
3763
3745 scr_change_screen (state); 3764 scr_change_screen (state);
3746 break; 3765 break;
3747 case 1049: /* secondary screen w/ clearing first */ 3766 case 1049: /* secondary screen w/ clearing first */
3767 if (option (Opt_secondaryScreen))
3768 if (state)
3769 scr_cursor (SAVE);
3770
3748 scr_change_screen (state); 3771 scr_change_screen (state);
3772
3749 if (option (Opt_secondaryScreen)) 3773 if (option (Opt_secondaryScreen))
3750 if (current_screen != PRIMARY) 3774 if (state)
3751 scr_erase_screen (2); 3775 scr_erase_screen (2);
3776 else
3777 scr_cursor (RESTORE);
3752 break; 3778 break;
3753 default: 3779 default:
3754 break; 3780 break;
3755 } 3781 }
3756 } 3782 }
… …
3916rxvt_term::process_graphics () 3942rxvt_term::process_graphics ()
3917{ 3943{
3918 unicode_t ch, cmd = cmd_getc (); 3944 unicode_t ch, cmd = cmd_getc ();
3919 3945
3920 if (cmd == 'Q') 3946 if (cmd == 'Q')
3947 {
3921 { /* query graphics */ 3948 /* query graphics */
3922 tt_printf ("\033G0\012"); /* no graphics */ 3949 tt_printf ("\033G0\012"); /* no graphics */
3923 return; 3950 return;
3924 } 3951 }
3925 /* swallow other graphics sequences until terminating ':' */ 3952 /* swallow other graphics sequences until terminating ':' */
3926 do 3953 do
… …
3976 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4003 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3977 4004
3978 memcpy (v_buffer + v_buflen, data, len); 4005 memcpy (v_buffer + v_buflen, data, len);
3979 v_buflen += len; 4006 v_buflen += len;
3980 4007
3981 pty_ev.set (EVENT_READ | EVENT_WRITE); 4008 pty_ev.set (ev::READ | ev::WRITE);
3982} 4009}
3983 4010
3984void rxvt_term::pty_write () 4011void rxvt_term::pty_write ()
3985{ 4012{
3986 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4013 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
3992 if (v_buflen == 0) 4019 if (v_buflen == 0)
3993 { 4020 {
3994 free (v_buffer); 4021 free (v_buffer);
3995 v_buffer = 0; 4022 v_buffer = 0;
3996 4023
3997 pty_ev.set (EVENT_READ); 4024 pty_ev.set (ev::READ);
3998 return; 4025 return;
3999 } 4026 }
4000 4027
4001 memmove (v_buffer, v_buffer + written, v_buflen); 4028 memmove (v_buffer, v_buffer + written, v_buflen);
4002 } 4029 }
4003 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4030 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4004 pty_ev.set (EVENT_READ); 4031 pty_ev.set (ev::READ);
4005} 4032}
4006 4033
4007/*----------------------- end-of-file (C source) -----------------------*/ 4034/*----------------------- end-of-file (C source) -----------------------*/
4008 4035

Diff Legend

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