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.347 by sasha, Wed Aug 15 22:41:52 2007 UTC vs.
Revision 1.452 by sf-exg, Mon Jul 26 09:57:53 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 {
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
552 newlen = 1; 689 newlen = 0;
553 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:
554 { 773 {
555#ifndef NO_BACKSPACE_KEY 774 int param = map_function_key (keysym);
556 case XK_BackSpace: 775 if (param > 0)
557 if (priv_modes & PrivMode_HaveBackSpace) 776 sprintf (kbuf,"\033[%d~", param);
558 {
559 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
560 ^ !!ctrl) ? '\b' : '\177';
561 kbuf[1] = '\0';
562 }
563 else 777 else
564 strcpy (kbuf, key_backspace);
565 break;
566#endif
567#ifndef NO_DELETE_KEY
568# ifdef XK_KP_Prior
569 case XK_KP_Delete:
570 /* allow shift to override */
571 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
572 {
573 strcpy (kbuf, "\033On");
574 break;
575 }
576 /* FALLTHROUGH */
577# endif
578 case XK_Delete:
579 strcpy (kbuf, key_delete);
580 break;
581#endif
582 case XK_Tab:
583 if (shft)
584 strcpy (kbuf, "\033[Z");
585 else
586 {
587#ifdef CTRL_TAB_MAKES_META
588 if (ctrl)
589 meta = 1;
590#endif
591#ifdef MOD4_TAB_MAKES_META
592 if (ev.state & Mod4Mask)
593 meta = 1;
594#endif
595 newlen = 0;
596 }
597 break;
598
599#ifdef XK_KP_Left
600 case XK_KP_Up: /* \033Ox or standard */
601 case XK_KP_Down: /* \033Or or standard */
602 case XK_KP_Right: /* \033Ov or standard */
603 case XK_KP_Left: /* \033Ot or standard */
604 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
605 {
606 strcpy (kbuf, "\033OZ");
607 kbuf[2] = "txvr"[keysym - XK_KP_Left];
608 break;
609 }
610 else
611 /* translate to std. cursor key */
612 keysym = XK_Left + (keysym - XK_KP_Left);
613 /* FALLTHROUGH */
614#endif
615 case XK_Up: /* "\033[A" */
616 case XK_Down: /* "\033[B" */
617 case XK_Right: /* "\033[C" */
618 case XK_Left: /* "\033[D" */
619 strcpy (kbuf, "\033[Z");
620 kbuf[2] = "DACB"[keysym - XK_Left];
621 /* do Shift first */
622 if (shft)
623 kbuf[2] = "dacb"[keysym - XK_Left];
624 else if (ctrl)
625 {
626 kbuf[1] = 'O';
627 kbuf[2] = "dacb"[keysym - XK_Left];
628 }
629 else if (priv_modes & PrivMode_aplCUR)
630 kbuf[1] = 'O';
631 break;
632
633#ifndef UNSHIFTED_SCROLLKEYS
634# ifdef XK_KP_Prior
635 case XK_KP_Prior:
636 /* allow shift to override */
637 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
638 {
639 strcpy (kbuf, "\033Oy");
640 break;
641 }
642 /* FALLTHROUGH */
643# endif
644 case XK_Prior:
645 strcpy (kbuf, "\033[5~");
646 break;
647# ifdef XK_KP_Next
648 case XK_KP_Next:
649 /* allow shift to override */
650 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
651 {
652 strcpy (kbuf, "\033Os");
653 break;
654 }
655 /* FALLTHROUGH */
656# endif
657 case XK_Next:
658 strcpy (kbuf, "\033[6~");
659 break;
660#endif
661 case XK_KP_Enter:
662 /* allow shift to override */
663 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
664 {
665 strcpy (kbuf, "\033OM");
666 break;
667 }
668
669 /* FALLTHROUGH */
670
671 case XK_Return:
672 if (priv_modes & PrivMode_LFNL)
673 {
674 kbuf[0] = '\015';
675 kbuf[1] = '\012';
676 kbuf[2] = '\0';
677 }
678 else
679 {
680 kbuf[0] = '\015';
681 kbuf[1] = '\0';
682 }
683 break;
684
685#ifdef XK_KP_Begin
686 case XK_KP_Begin:
687 strcpy (kbuf, "\033Ou");
688 break;
689
690#endif
691 case XK_KP_F1: /* "\033OP" */
692 case XK_KP_F2: /* "\033OQ" */
693 case XK_KP_F3: /* "\033OR" */
694 case XK_KP_F4: /* "\033OS" */
695 strcpy (kbuf, "\033OP");
696 kbuf[2] += (keysym - XK_KP_F1);
697 break;
698
699 case XK_KP_Multiply: /* "\033Oj" : "*" */
700 case XK_KP_Add: /* "\033Ok" : "+" */
701 case XK_KP_Separator: /* "\033Ol" : "," */
702 case XK_KP_Subtract: /* "\033Om" : "-" */
703 case XK_KP_Decimal: /* "\033On" : "." */
704 case XK_KP_Divide: /* "\033Oo" : "/" */
705 case XK_KP_0: /* "\033Op" : "0" */
706 case XK_KP_1: /* "\033Oq" : "1" */
707 case XK_KP_2: /* "\033Or" : "2" */
708 case XK_KP_3: /* "\033Os" : "3" */
709 case XK_KP_4: /* "\033Ot" : "4" */
710 case XK_KP_5: /* "\033Ou" : "5" */
711 case XK_KP_6: /* "\033Ov" : "6" */
712 case XK_KP_7: /* "\033Ow" : "7" */
713 case XK_KP_8: /* "\033Ox" : "8" */
714 case XK_KP_9: /* "\033Oy" : "9" */
715 /* allow shift to override */
716 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
717 {
718 strcpy (kbuf, "\033Oj");
719 kbuf[2] += (keysym - XK_KP_Multiply);
720 }
721 else
722 {
723 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
724 kbuf[1] = '\0';
725 }
726 break;
727
728 case XK_Find:
729 strcpy (kbuf, "\033[1~");
730 break;
731
732#ifdef XK_KP_Insert
733 case XK_KP_Insert:
734 /* allow shift to override */
735 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
736 {
737 strcpy (kbuf, "\033Op");
738 break;
739 }
740 /* FALLTHROUGH */
741#endif
742 case XK_Insert:
743 strcpy (kbuf, "\033[2~");
744 break;
745#ifdef DXK_Remove /* support for DEC remove like key */
746 case DXK_Remove:
747 /* FALLTHROUGH */
748#endif
749 case XK_Execute:
750 strcpy (kbuf, "\033[3~");
751 break;
752 case XK_Select:
753 strcpy (kbuf, "\033[4~");
754 break;
755#ifdef XK_KP_End
756 case XK_KP_End:
757 /* allow shift to override */
758 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
759 {
760 strcpy (kbuf, "\033Oq");
761 break;
762 }
763 /* FALLTHROUGH */
764#endif
765 case XK_End:
766 strcpy (kbuf, KS_END);
767 break;
768#ifdef XK_KP_Home
769 case XK_KP_Home:
770 /* allow shift to override */
771 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
772 {
773 strcpy (kbuf, "\033Ow");
774 break;
775 }
776 /* FALLTHROUGH */
777#endif
778 case XK_Home:
779 strcpy (kbuf, KS_HOME);
780 break;
781
782#define FKEY(n, fkey) \
783 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
784
785 case XK_F1: /* "\033[11~" */
786 case XK_F2: /* "\033[12~" */
787 case XK_F3: /* "\033[13~" */
788 case XK_F4: /* "\033[14~" */
789 case XK_F5: /* "\033[15~" */
790 FKEY (11, XK_F1);
791 break;
792 case XK_F6: /* "\033[17~" */
793 case XK_F7: /* "\033[18~" */
794 case XK_F8: /* "\033[19~" */
795 case XK_F9: /* "\033[20~" */
796 case XK_F10: /* "\033[21~" */
797 FKEY (17, XK_F6);
798 break;
799 case XK_F11: /* "\033[23~" */
800 case XK_F12: /* "\033[24~" */
801 case XK_F13: /* "\033[25~" */
802 case XK_F14: /* "\033[26~" */
803 FKEY (23, XK_F11);
804 break;
805 case XK_F15: /* "\033[28~" */
806 case XK_F16: /* "\033[29~" */
807 FKEY (28, XK_F15);
808 break;
809 case XK_Help: /* "\033[28~" */
810 FKEY (28, XK_Help);
811 break;
812 case XK_Menu: /* "\033[29~" */
813 FKEY (29, XK_Menu);
814 break;
815 case XK_F17: /* "\033[31~" */
816 case XK_F18: /* "\033[32~" */
817 case XK_F19: /* "\033[33~" */
818 case XK_F20: /* "\033[34~" */
819 case XK_F21: /* "\033[35~" */
820 case XK_F22: /* "\033[36~" */
821 case XK_F23: /* "\033[37~" */
822 case XK_F24: /* "\033[38~" */
823 case XK_F25: /* "\033[39~" */
824 case XK_F26: /* "\033[40~" */
825 case XK_F27: /* "\033[41~" */
826 case XK_F28: /* "\033[42~" */
827 case XK_F29: /* "\033[43~" */
828 case XK_F30: /* "\033[44~" */
829 case XK_F31: /* "\033[45~" */
830 case XK_F32: /* "\033[46~" */
831 case XK_F33: /* "\033[47~" */
832 case XK_F34: /* "\033[48~" */
833 case XK_F35: /* "\033[49~" */
834 FKEY (31, XK_F17);
835 break;
836#undef FKEY
837 default:
838 newlen = 0; 778 newlen = 0;
839 break;
840 } 779 }
841 780 break;
842 if (newlen)
843 len = strlen (kbuf);
844 } 781 }
782
783 if (newlen)
784 len = strlen (kbuf);
845 785
846 /* 786 /*
847 * Pass meta for all function keys, if 'meta' option set 787 * Pass meta for all function keys, if 'meta' option set
848 */ 788 */
849#ifdef META8_OPTION 789#ifdef META8_OPTION
… …
1034void 974void
1035rxvt_term::flush () 975rxvt_term::flush ()
1036{ 976{
1037 flush_ev.stop (); 977 flush_ev.stop ();
1038 978
1039#ifdef ENABLE_TRANSPARENCY 979#ifdef HAVE_BG_PIXMAP
1040 if (want_full_refresh) 980 if (bgPixmap.check_clearChanged ())
1041 { 981 {
1042 want_full_refresh = 0; 982// scr_clear (true); This needs to be researched further!
1043 scr_clear ();
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}
… …
1301void 1249void
1302rxvt_term::mouse_report (XButtonEvent &ev) 1250rxvt_term::mouse_report (XButtonEvent &ev)
1303{ 1251{
1304 int button_number, key_state = 0; 1252 int button_number, key_state = 0;
1305 int x, y; 1253 int x, y;
1254 int code = 32;
1306 1255
1307 x = ev.x; 1256 x = Pixel2Col (ev.x);
1308 y = ev.y; 1257 y = Pixel2Row (ev.y);
1309 pixel_position (&x, &y); 1258 if (ev.type == MotionNotify)
1259 {
1260 if (x == mouse_row && y == mouse_col)
1261 return;
1262 mouse_row = x;
1263 mouse_col = y;
1264 code += 32;
1265 }
1310 1266
1311 if (MEvent.button == AnyButton) 1267 if (MEvent.button == AnyButton)
1312 button_number = 3; 1268 button_number = 3;
1313 else 1269 else
1314 { 1270 {
… …
1360 x + 1, 1316 x + 1,
1361 y + 1); 1317 y + 1);
1362#endif 1318#endif
1363 1319
1364 tt_printf ("\033[M%c%c%c", 1320 tt_printf ("\033[M%c%c%c",
1365 (32 + button_number + key_state), 1321 (code + button_number + key_state),
1366 (32 + x + 1), 1322 (32 + x + 1),
1367 (32 + y + 1)); 1323 (32 + y + 1));
1368} 1324}
1369 1325
1370/*{{{ process an X event */ 1326/*{{{ process an X event */
… …
1474 && ev.xfocus.mode != NotifyGrab) 1430 && ev.xfocus.mode != NotifyGrab)
1475 focus_out (); 1431 focus_out ();
1476 break; 1432 break;
1477 1433
1478 case ConfigureNotify: 1434 case ConfigureNotify:
1435 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1436 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1437 szHint.width, szHint.height);*/
1479 if (ev.xconfigure.window == parent[0]) 1438 if (ev.xconfigure.window == parent[0])
1480 { 1439 {
1481 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1440 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1482 ; 1441 ;
1483 1442
… …
1486 seen_resize = 1; 1445 seen_resize = 1;
1487 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1446 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1488 } 1447 }
1489 else 1448 else
1490 { 1449 {
1491#ifdef ENABLE_TRANSPARENCY 1450#ifdef HAVE_BG_PIXMAP
1492 if (option (Opt_transparent)) 1451 if (bgPixmap.window_position_sensitive ())
1452 {
1493 if (bgPixmap.render ()) 1453 if (mapped)
1494 scr_touch (false); 1454 update_background ();
1455 else
1456 bgPixmap.invalidate ();
1457 }
1495#endif 1458#endif
1496 } 1459 }
1460
1497 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1461 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1498 } 1462 }
1499 break; 1463 break;
1500 1464
1501 case PropertyNotify: 1465 case PropertyNotify:
… …
1505 selection_property (ev.xproperty.window, ev.xproperty.atom); 1469 selection_property (ev.xproperty.window, ev.xproperty.atom);
1506 1470
1507 break; 1471 break;
1508 1472
1509 case SelectionClear: 1473 case SelectionClear:
1510 selection_clear (); 1474 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1511 break; 1475 break;
1512 1476
1513 case SelectionNotify: 1477 case SelectionNotify:
1514 if (selection_wait == Sel_normal) 1478 if (selection_wait == Sel_normal)
1515 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1479 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1518 case SelectionRequest: 1482 case SelectionRequest:
1519 selection_send (ev.xselectionrequest); 1483 selection_send (ev.xselectionrequest);
1520 break; 1484 break;
1521 1485
1522 case MapNotify: 1486 case MapNotify:
1487#ifdef HAVE_BG_PIXMAP
1488 /* This is needed specifically to fix the case of no window manager or a
1489 * non-reparenting window manager. In those cases we never get first
1490 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1491 * care of multiplicity of ConfigureNotify events arriving while WM does
1492 * reparenting.
1493 * We should not render background immediately, as there could be several
1494 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1495 * by scheduling background redraw as soon as we can, but giving a short
1496 * bit of time for ConfigureNotifies to arrive.
1497 * We should render background PRIOR to drawing any text, but AFTER all
1498 * of ConfigureNotifys for the best results.
1499 */
1500 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1501 update_background_ev.start (0.025);
1502#endif
1523 mapped = 1; 1503 mapped = 1;
1524#ifdef TEXT_BLINK 1504#ifdef TEXT_BLINK
1525 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1505 text_blink_ev.start ();
1526#endif 1506#endif
1527 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1507 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1528 break; 1508 break;
1529 1509
1530 case UnmapNotify: 1510 case UnmapNotify:
… …
1532#ifdef TEXT_BLINK 1512#ifdef TEXT_BLINK
1533 text_blink_ev.stop (); 1513 text_blink_ev.stop ();
1534#endif 1514#endif
1535 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1515 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1536 break; 1516 break;
1537
1538#ifdef ENABLE_TRANSPARENCY
1539 case ReparentNotify:
1540 rootwin_cb (ev);
1541 break;
1542#endif /* ENABLE_TRANSPARENCY */
1543 1517
1544 case GraphicsExpose: 1518 case GraphicsExpose:
1545 case Expose: 1519 case Expose:
1546 if (ev.xany.window == vt) 1520 if (ev.xany.window == vt)
1547 { 1521 {
1548 do 1522 do
1523 {
1549 scr_expose (ev.xexpose.x, ev.xexpose.y, 1524 scr_expose (ev.xexpose.x, ev.xexpose.y,
1550 ev.xexpose.width, ev.xexpose.height, False); 1525 ev.xexpose.width, ev.xexpose.height, False);
1526 }
1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1527 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1552 1528
1553 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1529 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1554 1530
1555 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1531 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1532 {
1556 scr_expose (ev.xexpose.x, ev.xexpose.y, 1533 scr_expose (ev.xexpose.x, ev.xexpose.y,
1557 ev.xexpose.width, ev.xexpose.height, False); 1534 ev.xexpose.width, ev.xexpose.height, False);
1535 }
1558 1536
1559 want_refresh = 1; 1537 want_refresh = 1;
1560 } 1538 }
1561 else 1539 else
1562 { 1540 {
… …
1565 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1543 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1566 ; 1544 ;
1567 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1545 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1568 ; 1546 ;
1569 1547
1570 if (isScrollbarWindow (ev.xany.window)) 1548 if (scrollBar.state && ev.xany.window == scrollBar.win)
1571 { 1549 {
1572 scrollBar.setIdle (); 1550 scrollBar.state = STATE_IDLE;
1573 scrollbar_show (0); 1551 scrollBar.show (0);
1574 } 1552 }
1575 } 1553 }
1576 break; 1554 break;
1577 1555
1578 case MotionNotify: 1556 case MotionNotify:
1579#ifdef POINTER_BLANK 1557#ifdef POINTER_BLANK
1580 if (hidden_pointer) 1558 if (hidden_pointer)
1581 pointer_unblank (); 1559 pointer_unblank ();
1582#endif 1560#endif
1561 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1562 || priv_modes & PrivMode_MouseAnyEvent)
1563 mouse_report (ev.xbutton);
1583 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1564 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1584 break; 1565 break;
1585 1566
1586 if (ev.xany.window == vt) 1567 if (ev.xany.window == vt)
1587 { 1568 {
… …
1621 int dist; 1602 int dist;
1622 1603
1623 /* don't clobber the current delay if we are 1604 /* don't clobber the current delay if we are
1624 * already in the middle of scrolling. 1605 * already in the middle of scrolling.
1625 */ 1606 */
1626 if (!sel_scroll_ev.active) 1607 if (!sel_scroll_ev.is_active ())
1627 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1608 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1628 1609
1629 /* save the event params so we can highlight 1610 /* save the event params so we can highlight
1630 * the selection in the pending-scroll loop 1611 * the selection in the pending-scroll loop
1631 */ 1612 */
1632 selection_save_x = ev.xbutton.x; 1613 selection_save_x = ev.xbutton.x;
… …
1654 else 1635 else
1655 { 1636 {
1656 /* we are within the text window, so we 1637 /* we are within the text window, so we
1657 * shouldn't be scrolling 1638 * shouldn't be scrolling
1658 */ 1639 */
1659 if (sel_scroll_ev.active)
1660 sel_scroll_ev.stop(); 1640 sel_scroll_ev.stop();
1661 } 1641 }
1662#endif 1642#endif
1663#ifdef MOUSE_THRESHOLD 1643#ifdef MOUSE_THRESHOLD
1664 } 1644 }
1665#endif 1645#endif
1666 } 1646 }
1667 } 1647 }
1668 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1648 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1669 { 1649 {
1670 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1650 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1671 MotionNotify, &ev)) 1651 MotionNotify, &ev))
1672 ; 1652 ;
1673 1653
… …
1675 &unused_root, &unused_child, 1655 &unused_root, &unused_child,
1676 &unused_root_x, &unused_root_y, 1656 &unused_root_x, &unused_root_y,
1677 &ev.xbutton.x, &ev.xbutton.y, 1657 &ev.xbutton.x, &ev.xbutton.y,
1678 &unused_mask); 1658 &unused_mask);
1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1659 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1680 scrollbar_size ()); 1660 scrollBar.size ());
1681 want_refresh = 1; 1661 want_refresh = 1;
1682 scrollbar_show (1); 1662 scrollBar.show (1);
1683 } 1663 }
1684 break; 1664 break;
1685 } 1665 }
1686 1666
1687#if defined(CURSOR_BLINK) 1667#if defined(CURSOR_BLINK)
… …
1691 { 1671 {
1692 hidden_cursor = 0; 1672 hidden_cursor = 0;
1693 want_refresh = 1; 1673 want_refresh = 1;
1694 } 1674 }
1695 1675
1696 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1676 cursor_blink_ev.again ();
1697 } 1677 }
1698#endif 1678#endif
1699 1679
1700#if defined(POINTER_BLANK) 1680#if defined(POINTER_BLANK)
1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1681 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1708 1688
1709 if (ev.type == KeyPress && hidden_pointer == 0) 1689 if (ev.type == KeyPress && hidden_pointer == 0)
1710 pointer_blank (); 1690 pointer_blank ();
1711 } 1691 }
1712#endif 1692#endif
1693
1694 refresh_check ();
1713} 1695}
1696
1697#if ENABLE_FRILLS
1698void
1699rxvt_term::set_urgency (bool enable)
1700{
1701 if (enable == urgency_hint)
1702 return;
1703
1704 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1705 {
1706 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1707 XSetWMHints (dpy, parent[0], h);
1708 urgency_hint = enable;
1709 }
1710}
1711#endif
1714 1712
1715void 1713void
1716rxvt_term::focus_in () 1714rxvt_term::focus_in ()
1717{ 1715{
1718 if (!focus) 1716 if (!focus)
1719 { 1717 {
1720 focus = 1; 1718 focus = 1;
1721 want_refresh = 1; 1719 want_refresh = 1;
1722 1720
1723 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1724
1725#if USE_XIM 1721#if USE_XIM
1726 if (Input_Context != NULL) 1722 if (Input_Context != NULL)
1727 { 1723 {
1728 IMSetPosition (); 1724 IMSetPosition ();
1729 XSetICFocus (Input_Context); 1725 XSetICFocus (Input_Context);
1730 } 1726 }
1731#endif 1727#endif
1732#if CURSOR_BLINK 1728#if CURSOR_BLINK
1733 if (option (Opt_cursorBlink)) 1729 if (option (Opt_cursorBlink))
1734 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1730 cursor_blink_ev.again ();
1735#endif 1731#endif
1736#if OFF_FOCUS_FADING 1732#if OFF_FOCUS_FADING
1737 if (rs[Rs_fade]) 1733 if (rs[Rs_fade])
1738 { 1734 {
1739 pix_colors = pix_colors_focused; 1735 pix_colors = pix_colors_focused;
1740 scr_recolour (); 1736 scr_recolour ();
1741 } 1737 }
1742#endif 1738#endif
1743#if ENABLE_FRILLS 1739#if ENABLE_FRILLS
1744 if (option (Opt_urgentOnBell)) 1740 if (option (Opt_urgentOnBell))
1745 { 1741 set_urgency (0);
1746 XWMHints *h;
1747
1748 h = XGetWMHints(dpy, parent[0]);
1749 if (h != NULL)
1750 {
1751 h->flags &= ~XUrgencyHint;
1752 XSetWMHints(dpy, parent[0], h);
1753 }
1754 }
1755#endif 1742#endif
1743
1744 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1756 } 1745 }
1757} 1746}
1758 1747
1759void 1748void
1760rxvt_term::focus_out () 1749rxvt_term::focus_out ()
… …
1762 if (focus) 1751 if (focus)
1763 { 1752 {
1764 focus = 0; 1753 focus = 0;
1765 want_refresh = 1; 1754 want_refresh = 1;
1766 1755
1767 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1756#if ENABLE_FRILLS
1768 1757 if (option (Opt_urgentOnBell))
1758 set_urgency (0);
1759#endif
1769#if ENABLE_FRILLS || ISO_14755 1760#if ENABLE_FRILLS || ISO_14755
1770 if (iso14755buf) 1761 if (iso14755buf)
1771 { 1762 {
1772 iso14755buf = 0; 1763 iso14755buf = 0;
1773# if ISO_14755 1764# if ISO_14755
… …
1780 XUnsetICFocus (Input_Context); 1771 XUnsetICFocus (Input_Context);
1781#endif 1772#endif
1782#if CURSOR_BLINK 1773#if CURSOR_BLINK
1783 if (option (Opt_cursorBlink)) 1774 if (option (Opt_cursorBlink))
1784 cursor_blink_ev.stop (); 1775 cursor_blink_ev.stop ();
1776
1785 hidden_cursor = 0; 1777 hidden_cursor = 0;
1786#endif 1778#endif
1787#if OFF_FOCUS_FADING 1779#if OFF_FOCUS_FADING
1788 if (rs[Rs_fade]) 1780 if (rs[Rs_fade])
1789 { 1781 {
1790 pix_colors = pix_colors_unfocused; 1782 pix_colors = pix_colors_unfocused;
1791 scr_recolour (); 1783 scr_recolour ();
1792 } 1784 }
1793#endif 1785#endif
1786
1787 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1794 } 1788 }
1795} 1789}
1796 1790
1797void 1791void
1798rxvt_term::update_fade_color (unsigned int idx) 1792rxvt_term::update_fade_color (unsigned int idx)
… …
1827 */ 1821 */
1828 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1822 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1829 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1823 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1830 { 1824 {
1831 bgPixmap.set_root_pixmap (); 1825 bgPixmap.set_root_pixmap ();
1832 bgPixmap.render (); 1826 update_background ();
1833 } 1827 }
1828
1834 break; 1829 break;
1835 } 1830 }
1836# endif 1831# endif
1832
1833 refresh_check ();
1837} 1834}
1838#endif 1835#endif
1839 1836
1840void 1837void
1841rxvt_term::button_press (XButtonEvent &ev) 1838rxvt_term::button_press (XButtonEvent &ev)
… …
1872 /* save the xbutton state (for ButtonRelease) */ 1869 /* save the xbutton state (for ButtonRelease) */
1873 MEvent.state = ev.state; 1870 MEvent.state = ev.state;
1874#ifdef MOUSE_REPORT_DOUBLECLICK 1871#ifdef MOUSE_REPORT_DOUBLECLICK
1875 if (ev.button == MEvent.button && clickintime) 1872 if (ev.button == MEvent.button && clickintime)
1876 { 1873 {
1877 /* same button, within alloted time */ 1874 /* same button, within allowed time */
1878 MEvent.clicks++; 1875 MEvent.clicks++;
1879 1876
1880 if (MEvent.clicks > 1) 1877 if (MEvent.clicks > 1)
1881 { 1878 {
1882 /* only report double clicks */ 1879 /* only report double clicks */
… …
1896 mouse_report (ev); 1893 mouse_report (ev);
1897 } 1894 }
1898#else 1895#else
1899 MEvent.button = ev.button; 1896 MEvent.button = ev.button;
1900 mouse_report (ev); 1897 mouse_report (ev);
1901#endif /* MOUSE_REPORT_DOUBLECLICK */ 1898#endif /* MOUSE_REPORT_DOUBLECLICK */
1902 1899
1903 } 1900 }
1904 else 1901 else
1905 { 1902 {
1906 if (ev.button != MEvent.button) 1903 if (ev.button != MEvent.button)
… …
1954 } 1951 }
1955 1952
1956 /* 1953 /*
1957 * Scrollbar window processing of button press 1954 * Scrollbar window processing of button press
1958 */ 1955 */
1959 if (isScrollbarWindow (ev.window)) 1956 if (scrollBar.state && ev.window == scrollBar.win)
1960 { 1957 {
1961 scrollBar.setIdle (); 1958 page_dirn direction = NO_DIR;
1959
1960 if (scrollBar.upButton (ev.y))
1961 direction = UP; /* up */
1962 else if (scrollBar.dnButton (ev.y))
1963 direction = DN; /* down */
1964
1965 scrollBar.state = STATE_IDLE;
1962 /* 1966 /*
1963 * Rxvt-style scrollbar: 1967 * Rxvt-style scrollbar:
1964 * move up if mouse is above slider 1968 * move up if mouse is above slider
1965 * move dn if mouse is below slider 1969 * move dn if mouse is below slider
1966 * 1970 *
… …
1975 /* 1979 /*
1976 * Mouse report disabled scrollbar: 1980 * Mouse report disabled scrollbar:
1977 * arrow buttons - send up/down 1981 * arrow buttons - send up/down
1978 * click on scrollbar - send pageup/down 1982 * click on scrollbar - send pageup/down
1979 */ 1983 */
1980 if ((scrollBar.style == R_SB_NEXT 1984 if (direction == UP)
1981 && scrollbarnext_upButton (ev.y))
1982 || (scrollBar.style == R_SB_RXVT
1983 && scrollbarrxvt_upButton (ev.y)))
1984 tt_printf ("\033[A"); 1985 tt_printf ("\033[A");
1985 else if ((scrollBar.style == R_SB_NEXT 1986 else if (direction == DN)
1986 && scrollbarnext_dnButton (ev.y))
1987 || (scrollBar.style == R_SB_RXVT
1988 && scrollbarrxvt_dnButton (ev.y)))
1989 tt_printf ("\033[B"); 1987 tt_printf ("\033[B");
1990 else 1988 else
1991 switch (ev.button) 1989 switch (ev.button)
1992 { 1990 {
1993 case Button2: 1991 case Button2:
… …
2000 tt_printf ("\033[5~"); 1998 tt_printf ("\033[5~");
2001 break; 1999 break;
2002 } 2000 }
2003 } 2001 }
2004 else 2002 else
2005#endif /* NO_SCROLLBAR_REPORT */ 2003#endif /* NO_SCROLLBAR_REPORT */
2006
2007 {
2008 char upordown = 0;
2009
2010 if (scrollBar.style == R_SB_NEXT)
2011 { 2004 {
2012 if (scrollbarnext_upButton (ev.y)) 2005 if (direction != NO_DIR)
2013 upordown = -1; /* up */
2014 else if (scrollbarnext_dnButton (ev.y))
2015 upordown = 1; /* down */
2016 }
2017 else if (scrollBar.style == R_SB_RXVT)
2018 {
2019 if (scrollbarrxvt_upButton (ev.y))
2020 upordown = -1; /* up */
2021 else if (scrollbarrxvt_dnButton (ev.y))
2022 upordown = 1; /* down */
2023 }
2024 if (upordown)
2025 { 2006 {
2026#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2007#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2008 if (!cont_scroll_ev.is_active ())
2027 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2009 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2028#endif 2010#endif
2029 if (scr_page (upordown < 0 ? UP : DN, 1)) 2011 if (scr_page (direction, 1))
2030 { 2012 {
2031 if (upordown < 0) 2013 if (direction == UP)
2032 scrollBar.setUp (); 2014 scrollBar.state = STATE_UP;
2033 else 2015 else
2034 scrollBar.setDn (); 2016 scrollBar.state = STATE_DOWN;
2035 } 2017 }
2036 } 2018 }
2037 else 2019 else
2038 switch (ev.button) 2020 switch (ev.button)
2039 { 2021 {
2040 case Button2: 2022 case Button2:
2041 switch (scrollbar_align) 2023 switch (scrollBar.align)
2042 { 2024 {
2043 case R_SB_ALIGN_TOP: 2025 case R_SB_ALIGN_TOP:
2044 csrO = 0; 2026 csrO = 0;
2045 break; 2027 break;
2046 case R_SB_ALIGN_CENTRE: 2028 case R_SB_ALIGN_CENTRE:
… …
2052 } 2034 }
2053 2035
2054 if (scrollBar.style == R_SB_XTERM 2036 if (scrollBar.style == R_SB_XTERM
2055 || scrollbar_above_slider (ev.y) 2037 || scrollbar_above_slider (ev.y)
2056 || scrollbar_below_slider (ev.y)) 2038 || scrollbar_below_slider (ev.y))
2057 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2039 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2058 2040
2059 scrollBar.setMotion (); 2041 scrollBar.state = STATE_MOTION;
2060 break; 2042 break;
2061 2043
2062 case Button1: 2044 case Button1:
2063 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2045 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2064 csrO = ev.y - scrollBar.top; 2046 csrO = ev.y - scrollBar.top;
2065 /* FALLTHROUGH */ 2047 /* FALLTHROUGH */
2066 2048
2067 case Button3: 2049 case Button3:
2068 if (scrollBar.style != R_SB_XTERM) 2050 if (scrollBar.style != R_SB_XTERM)
… …
2078 scr_page (DN, nrow - 1); 2060 scr_page (DN, nrow - 1);
2079# else 2061# else
2080 scr_page (DN, nrow / 4); 2062 scr_page (DN, nrow / 4);
2081# endif 2063# endif
2082 else 2064 else
2083 scrollBar.setMotion (); 2065 scrollBar.state = STATE_MOTION;
2084 } 2066 }
2085 else 2067 else
2086 { 2068 {
2087 scr_page ((ev.button == Button1 ? DN : UP), 2069 scr_page ((ev.button == Button1 ? DN : UP),
2088 (nrow 2070 (nrow
2089 * scrollbar_position (ev.y) 2071 * scrollbar_position (ev.y)
2090 / scrollbar_size ())); 2072 / scrollBar.size ()));
2091 } 2073 }
2092 2074
2093 break; 2075 break;
2094 } 2076 }
2095 } 2077 }
… …
2105 2087
2106 csrO = 0; /* reset csr Offset */ 2088 csrO = 0; /* reset csr Offset */
2107 if (!bypass_keystate) 2089 if (!bypass_keystate)
2108 reportmode = !! (priv_modes & PrivMode_mouse_report); 2090 reportmode = !! (priv_modes & PrivMode_mouse_report);
2109 2091
2110 if (scrollbar_isUpDn ()) 2092 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2111 { 2093 {
2112 scrollBar.setIdle (); 2094 scrollBar.state = STATE_IDLE;
2113 scrollbar_show (0); 2095 scrollBar.show (0);
2114 } 2096 }
2115 2097
2116#ifdef SELECTION_SCROLLING 2098#ifdef SELECTION_SCROLLING
2117 if (sel_scroll_ev.active)
2118 sel_scroll_ev.stop(); 2099 sel_scroll_ev.stop();
2119#endif 2100#endif
2120 2101
2121 if (ev.window == vt) 2102 if (ev.window == vt)
2122 { 2103 {
2123 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2104 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2147 mouse_report (ev); 2128 mouse_report (ev);
2148 } 2129 }
2149#else /* MOUSE_REPORT_DOUBLECLICK */ 2130#else /* MOUSE_REPORT_DOUBLECLICK */
2150 MEvent.button = AnyButton; 2131 MEvent.button = AnyButton;
2151 mouse_report (ev); 2132 mouse_report (ev);
2152#endif /* MOUSE_REPORT_DOUBLECLICK */ 2133#endif /* MOUSE_REPORT_DOUBLECLICK */
2153 return; 2134 return;
2154 } 2135 }
2155 2136
2156 /* 2137 /*
2157 * dumb hack to compensate for the failure of click-and-drag 2138 * dumb hack to compensate for the failure of click-and-drag
… …
2169 selection_make (ev.time); 2150 selection_make (ev.time);
2170 break; 2151 break;
2171 2152
2172 case Button2: 2153 case Button2:
2173 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2154 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2174 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2155 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2175 break; 2156 break;
2176 2157
2177#ifdef MOUSE_WHEEL 2158#ifdef MOUSE_WHEEL
2178 case Button4: 2159 case Button4:
2179 case Button5: 2160 case Button5:
… …
2195 { 2176 {
2196 mouse_slip_wheel_speed += v ? -1 : 1; 2177 mouse_slip_wheel_speed += v ? -1 : 1;
2197 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2178 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2198 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2179 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2199 2180
2200 if (slip_wheel_ev.at < NOW) 2181 if (!slip_wheel_ev.is_active ())
2201 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2182 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2202
2203 slip_wheel_ev.start ();
2204 } 2183 }
2205 else 2184 else
2185# endif
2206 { 2186 {
2207# endif
2208 scr_page (v, i); 2187 scr_page (v, i);
2209 scrollbar_show (1); 2188 scrollBar.show (1);
2210# ifdef MOUSE_SLIP_WHEELING
2211 } 2189 }
2212# endif
2213 } 2190 }
2214 break; 2191 break;
2215#endif 2192#endif
2216 } 2193 }
2217 } 2194 }
2218} 2195}
2219 2196
2220/*}}} */ 2197/*}}} */
2221 2198
2222bool 2199void
2223rxvt_term::cmd_parse () 2200rxvt_term::cmd_parse ()
2224{ 2201{
2225 bool flag = false;
2226 wchar_t ch = NOCHAR; 2202 wchar_t ch = NOCHAR;
2227 char *seq_begin; // remember start of esc-sequence here 2203 char *seq_begin; // remember start of esc-sequence here
2228 2204
2229 for (;;) 2205 for (;;)
2230 { 2206 {
2231 if (ch == NOCHAR) 2207 if (expect_false (ch == NOCHAR))
2232 { 2208 {
2233 seq_begin = cmdbuf_ptr; 2209 seq_begin = cmdbuf_ptr;
2234 ch = next_char (); 2210 ch = next_char ();
2235 2211
2236 if (ch == NOCHAR) 2212 if (ch == NOCHAR)
2237 break; 2213 break;
2238 } 2214 }
2239 2215
2240 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2216 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2241 { 2217 {
2242 if (!seen_input) 2218 if (expect_false (!seen_input))
2243 { 2219 {
2244 seen_input = 1; 2220 seen_input = 1;
2245 // many badly-written programs (e.g. jed) contain a race condition: 2221 // many badly-written programs (e.g. jed) contain a race condition:
2246 // they first read the screensize and then install a SIGWINCH handler. 2222 // they first read the screensize and then install a SIGWINCH handler.
2247 // some window managers resize the window early, and these programs 2223 // some window managers resize the window early, and these programs
… …
2260 wchar_t *str = buf; 2236 wchar_t *str = buf;
2261 wchar_t *eol = str + min (ncol, UBUFSIZ); 2237 wchar_t *eol = str + min (ncol, UBUFSIZ);
2262 2238
2263 for (;;) 2239 for (;;)
2264 { 2240 {
2265 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2241 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2266 break; 2242 break;
2267 2243
2268 *str++ = ch; 2244 *str++ = ch;
2269 2245
2270 if (ch == C0_LF || str >= eol) 2246 if (expect_false (ch == C0_LF || str >= eol))
2271 { 2247 {
2272 if (ch == C0_LF) 2248 if (ch == C0_LF)
2273 nlines++; 2249 nlines++;
2274 2250
2275 refresh_count++; 2251 refresh_count++;
2276 2252
2277 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2253 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2278 { 2254 {
2279 refresh_count = 0; 2255 refresh_count = 0;
2280 2256
2281 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2257 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2282 { 2258 {
2283 refreshnow = true; 2259 refreshnow = true;
2284 ch = NOCHAR; 2260 ch = NOCHAR;
2285 break; 2261 break;
2286 } 2262 }
… …
2324 * What the heck we'll cheat and only refresh less than every page-full. 2300 * What the heck we'll cheat and only refresh less than every page-full.
2325 * if skipScroll is enabled. 2301 * if skipScroll is enabled.
2326 */ 2302 */
2327 if (refreshnow) 2303 if (refreshnow)
2328 { 2304 {
2329 flag = true;
2330 scr_refresh (); 2305 scr_refresh ();
2331 want_refresh = 1; 2306 want_refresh = 1;
2332 } 2307 }
2333
2334 } 2308 }
2335 else 2309 else
2336 { 2310 {
2337 try 2311 try
2338 { 2312 {
… …
2346 } 2320 }
2347 2321
2348 ch = NOCHAR; 2322 ch = NOCHAR;
2349 } 2323 }
2350 } 2324 }
2351
2352 return flag;
2353} 2325}
2354 2326
2355// read the next character 2327// read the next character
2356wchar_t 2328wchar_t
2357rxvt_term::next_char () NOTHROW 2329rxvt_term::next_char () NOTHROW
2358{ 2330{
2359 while (cmdbuf_ptr < cmdbuf_endp) 2331 while (cmdbuf_ptr < cmdbuf_endp)
2360 { 2332 {
2361 // assume 7-bit to be ascii ALWAYS 2333 // assume 7-bit to be ascii ALWAYS
2362 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2334 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2363 return *cmdbuf_ptr++; 2335 return *cmdbuf_ptr++;
2364 2336
2365 wchar_t wc; 2337 wchar_t wc;
2366 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2338 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2367 2339
… …
2371 cmdbuf_ptr = cmdbuf_endp; 2343 cmdbuf_ptr = cmdbuf_endp;
2372 break; 2344 break;
2373 } 2345 }
2374 2346
2375 if (len == (size_t)-1) 2347 if (len == (size_t)-1)
2348 {
2349 mbstate.reset (); // reset now undefined conversion state
2376 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2350 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2351 }
2377 2352
2378 // assume wchar == unicode 2353 // assume wchar == unicode
2379 cmdbuf_ptr += len; 2354 cmdbuf_ptr += len;
2380 return wc & UNICODE_MASK; 2355 return wc & UNICODE_MASK;
2381 } 2356 }
… …
2425/*----------------------------------------------------------------------*/ 2400/*----------------------------------------------------------------------*/
2426#ifdef PRINTPIPE 2401#ifdef PRINTPIPE
2427FILE * 2402FILE *
2428rxvt_term::popen_printer () 2403rxvt_term::popen_printer ()
2429{ 2404{
2430 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2405 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2431 2406
2432 if (stream == NULL) 2407 if (stream == NULL)
2433 rxvt_warn ("can't open printer pipe, not printing.\n"); 2408 rxvt_warn ("can't open printer pipe, not printing.\n");
2434 2409
2435 return stream; 2410 return stream;
… …
2446 * simulate attached vt100 printer 2421 * simulate attached vt100 printer
2447 */ 2422 */
2448void 2423void
2449rxvt_term::process_print_pipe () 2424rxvt_term::process_print_pipe ()
2450{ 2425{
2451 int done; 2426 FILE *fd = popen_printer ();
2452 FILE *fd;
2453 2427
2454 if ((fd = popen_printer ()) == NULL) 2428 if (!fd)
2455 return; 2429 return;
2456 2430
2457 /* 2431 /*
2458 * Send all input to the printer until either ESC[4i or ESC[?4i 2432 * Send all input to the printer until either ESC[4i or ESC[?4i
2459 * is received. 2433 * is received.
2460 */ 2434 */
2461 for (done = 0; !done;) 2435 for (int done = 0; !done; )
2462 { 2436 {
2463 unsigned char buf[8]; 2437 unsigned char buf[8];
2464 unicode_t ch; 2438 unicode_t ch;
2465 unsigned int i, len; 2439 unsigned int i, len;
2466 2440
… …
2497 } 2471 }
2498 } 2472 }
2499 2473
2500 pclose_printer (fd); 2474 pclose_printer (fd);
2501} 2475}
2502#endif /* PRINTPIPE */ 2476#endif /* PRINTPIPE */
2503/*}}} */ 2477/*}}} */
2504 2478
2505/* *INDENT-OFF* */ 2479/* *INDENT-OFF* */
2506enum { 2480enum {
2507 C1_40 = 0x40, 2481 C1_40 = 0x40,
… …
2611 break; 2585 break;
2612 case 'Z': /* identify the terminal type */ 2586 case 'Z': /* identify the terminal type */
2613 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2587 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2614 break; 2588 break;
2615 case '<': /* turn off VT52 mode */ 2589 case '<': /* turn off VT52 mode */
2616 PrivMode (0, PrivMode_vt52); 2590 set_privmode (PrivMode_vt52, 0);
2617 break; 2591 break;
2618 case 'F': /* use special graphics character set */ 2592 case 'F': /* use special graphics character set */
2619 case 'G': /* use regular character set */ 2593 case 'G': /* use regular character set */
2620 /* unimplemented */ 2594 /* unimplemented */
2621 break; 2595 break;
… …
2675 scr_forwardindex (); 2649 scr_forwardindex ();
2676 break; 2650 break;
2677#endif 2651#endif
2678 case '=': 2652 case '=':
2679 case '>': 2653 case '>':
2680 PrivMode ((ch == '='), PrivMode_aplKP); 2654 set_privmode (PrivMode_aplKP, ch == '=');
2681 break; 2655 break;
2682 2656
2683 case C1_40: 2657 case C1_40:
2684 cmd_getc (); 2658 cmd_getc ();
2685 break; 2659 break;
… …
2724 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2698 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2725 case C1_SCI: /* ESC Z */ 2699 case C1_SCI: /* ESC Z */
2726 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2700 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2727 break; /* steal obsolete ESC [ c */ 2701 break; /* steal obsolete ESC [ c */
2728 2702
2729 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2703 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2730 case C1_CSI: /* ESC [ */ 2704 case C1_CSI: /* ESC [ */
2731 process_csi_seq (); 2705 process_csi_seq ();
2732 break; 2706 break;
2733 2707
2734 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2708 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2735 case C1_OSC: /* ESC ] */ 2709 case C1_OSC: /* ESC ] */
2736 process_osc_seq (); 2710 process_osc_seq ();
2737 break; 2711 break;
2738 2712
2739 /* 8.3.106: RESET TO INITIAL STATE */ 2713 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2740 case 'c': 2714 case 'c':
2741 mbstate.reset (); 2715 mbstate.reset ();
2742 scr_poweron (); 2716 scr_poweron ();
2743 scrollbar_show (1); 2717 scrollBar.show (1);
2744 break; 2718 break;
2745 2719
2746 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2720 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2747 case 'n': 2721 case 'n':
2748 scr_charset_choose (2); 2722 scr_charset_choose (2);
… …
2793rxvt_term::process_csi_seq () 2767rxvt_term::process_csi_seq ()
2794{ 2768{
2795 unicode_t ch, priv, i; 2769 unicode_t ch, priv, i;
2796 unsigned int nargs, p; 2770 unsigned int nargs, p;
2797 int n, ndef; 2771 int n, ndef;
2798 int arg[ESC_ARGS]; 2772 int arg[ESC_ARGS] = { };
2799 2773
2800 memset (arg, 0, sizeof (arg));
2801 nargs = 0; 2774 nargs = 0;
2802 2775
2803 priv = 0; 2776 priv = 0;
2804 ch = cmd_getc (); 2777 ch = cmd_getc ();
2805 if (ch >= '<' && ch <= '?') 2778 if ((ch >= '<' && ch <= '?') || ch == '!')
2779 {
2806 { /* '<' '=' '>' '?' */ 2780 /* '<' '=' '>' '?' '!' */
2807 priv = ch; 2781 priv = ch;
2808 ch = cmd_getc (); 2782 ch = cmd_getc ();
2809 } 2783 }
2810 2784
2811 /* read any numerical arguments */ 2785 /* read any numerical arguments */
… …
2854 { 2828 {
2855 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2829 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2856 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2830 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2857 // 2831 //
2858 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2832 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2859 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2833 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2860 // that we do not support xterm mouse reporting (should be 95 when we do). 2834 // versions.
2861 // 2835 //
2862 tt_printf ("\033[>%d;94;0c", 'U'); 2836 tt_printf ("\033[>%d;95;0c", 'U');
2863 } 2837 }
2864 break; 2838 break;
2839
2865 case '?': 2840 case '?':
2866 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2841 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2867 process_terminal_mode (ch, priv, nargs, arg); 2842 process_terminal_mode (ch, priv, nargs, arg);
2868 break; 2843 break;
2844
2845 case '!':
2846 if (ch == CSI_70)
2847 {
2848 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2849 scr_soft_reset ();
2850
2851 static const int pm_h[] = { 7, 25 };
2852 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2853
2854 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2855 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2869 } 2856 }
2857 break;
2858 }
2859
2870 return; 2860 return;
2871 } 2861 }
2872 2862
2873 switch (ch) 2863 switch (ch)
2874 { 2864 {
… …
3241 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3231 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3242 */ 3232 */
3243void 3233void
3244rxvt_term::process_dcs_seq () 3234rxvt_term::process_dcs_seq ()
3245{ 3235{
3246 char *s;
3247 unicode_t eh;
3248
3249 /* 3236 /*
3250 * Not handled yet 3237 * Not handled yet
3251 */ 3238 */
3239
3240 unicode_t eh;
3252 s = get_to_st (eh); 3241 char *s = get_to_st (eh);
3253 if (s) 3242 if (s)
3254 free (s); 3243 free (s);
3255 3244
3256 return; 3245 return;
3257} 3246}
… …
3261 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3250 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3262 */ 3251 */
3263void 3252void
3264rxvt_term::process_osc_seq () 3253rxvt_term::process_osc_seq ()
3265{ 3254{
3266 unicode_t ch, eh;
3267 int arg; 3255 int arg;
3268 3256
3269 ch = cmd_getc (); 3257 unicode_t ch = cmd_getc ();
3270 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3258 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3271 arg = arg * 10 + (ch - '0'); 3259 arg = arg * 10 + (ch - '0');
3272 3260
3273 if (ch == ';') 3261 if (ch == ';')
3274 { 3262 {
3263 unicode_t eh;
3275 char *s = get_to_st (eh); 3264 char *s = get_to_st (eh);
3276 3265
3277 if (s) 3266 if (s)
3278 { 3267 {
3279 process_xterm_seq (arg, s, eh); 3268 process_xterm_seq (arg, s, eh);
… …
3303 3292
3304/* 3293/*
3305 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3294 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3306 */ 3295 */
3307void 3296void
3308rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3297rxvt_term::process_xterm_seq (int op, char *str, char resp)
3309{ 3298{
3310 int color; 3299 int color;
3311 char *buf, *name; 3300 char *buf, *name;
3312 bool query = str[0] == '?' && !str[1]; 3301 bool query = str[0] == '?' && !str[1];
3313 int saveop = op; 3302 int saveop = op;
… …
3354 3343
3355 XFree (value); 3344 XFree (value);
3356 } 3345 }
3357 else 3346 else
3358 { 3347 {
3359 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3348 char *eq = strchr (str, '=');
3360 3349
3361 if (eq) 3350 if (eq)
3362 { 3351 {
3363 *eq = 0; 3352 *eq = 0;
3364 set_utf8_property (display->atom (str), eq + 1); 3353 set_utf8_property (display->atom (str), eq + 1);
… …
3385 *buf++ = '\0'; 3374 *buf++ = '\0';
3386 3375
3387 process_color_seq (op, color, name, resp); 3376 process_color_seq (op, color, name, resp);
3388 } 3377 }
3389 break; 3378 break;
3379 case Rxvt_restoreFG:
3390 case XTerm_Color00: 3380 case XTerm_Color00:
3391 process_color_seq (op, Color_fg, str, resp); 3381 process_color_seq (op, Color_fg, str, resp);
3392 break; 3382 break;
3383 case Rxvt_restoreBG:
3393 case XTerm_Color01: 3384 case XTerm_Color01:
3394 process_color_seq (op, Color_bg, str, resp); 3385 process_color_seq (op, Color_bg, str, resp);
3395 break; 3386 break;
3396#ifndef NO_CURSORCOLOR 3387#ifndef NO_CURSORCOLOR
3397 case XTerm_Color_cursor: 3388 case XTerm_Color_cursor:
… …
3402 process_color_seq (op, Color_pointer_fg, str, resp); 3393 process_color_seq (op, Color_pointer_fg, str, resp);
3403 break; 3394 break;
3404 case XTerm_Color_pointer_bg: 3395 case XTerm_Color_pointer_bg:
3405 process_color_seq (op, Color_pointer_bg, str, resp); 3396 process_color_seq (op, Color_pointer_bg, str, resp);
3406 break; 3397 break;
3398#ifdef OPTION_HC
3399 case XTerm_Color_HC:
3400 process_color_seq (op, Color_HC, str, resp);
3401 break;
3402 case XTerm_Color_HTC:
3403 process_color_seq (op, Color_HTC, str, resp);
3404 break;
3405#endif
3407#ifndef NO_BOLD_UNDERLINE_REVERSE 3406#ifndef NO_BOLD_UNDERLINE_REVERSE
3408 case XTerm_Color_RV:
3409 process_color_seq (op, Color_RV, str, resp);
3410 break;
3411 case Rxvt_Color_BD:
3412 case URxvt_Color_BD: 3407 case URxvt_Color_BD:
3413 process_color_seq (op, Color_BD, str, resp); 3408 process_color_seq (op, Color_BD, str, resp);
3414 break; 3409 break;
3415 case Rxvt_Color_UL:
3416 case URxvt_Color_UL: 3410 case URxvt_Color_UL:
3417 process_color_seq (op, Color_UL, str, resp); 3411 process_color_seq (op, Color_UL, str, resp);
3418 break; 3412 break;
3419 case URxvt_Color_IT: 3413 case URxvt_Color_IT:
3420 process_color_seq (op, Color_IT, str, resp); 3414 process_color_seq (op, Color_IT, str, resp);
3421 break; 3415 break;
3422#endif 3416#endif
3417 case URxvt_Color_border:
3418 process_color_seq (op, Color_border, str, resp);
3419 break;
3423#if ENABLE_TRANSPARENCY 3420#if ENABLE_TRANSPARENCY
3424 case URxvt_Color_tint: 3421 case URxvt_Color_tint:
3425 process_color_seq (op, Color_tint, str, resp); 3422 process_color_seq (op, Color_tint, str, resp);
3426 { 3423 {
3427 bool changed = false; 3424 bool changed = false;
3425
3428 if (ISSET_PIXCOLOR (Color_tint)) 3426 if (ISSET_PIXCOLOR (Color_tint))
3429 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3427 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3430 else 3428 else
3431 changed = bgPixmap.unset_tint (); 3429 changed = bgPixmap.unset_tint ();
3430
3432 if (changed) 3431 if (changed)
3433 bgPixmap.render (); 3432 update_background ();
3434 } 3433 }
3435 3434
3436 break; 3435 break;
3437#endif 3436#endif
3438 3437
3439#if XPM_BACKGROUND 3438#if BG_IMAGE_FROM_FILE
3440 case Rxvt_Pixmap: 3439 case Rxvt_Pixmap:
3441 if (!strcmp (str, "?")) 3440 if (!strcmp (str, "?"))
3442 { 3441 {
3443 char str[256]; 3442 char str[256];
3444 3443
3445 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3444 sprintf (str, "[%dx%d+%d+%d]",
3446 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3445 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3447 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3446 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3448 process_xterm_seq (XTerm_title, str, CHAR_ST); 3447 process_xterm_seq (XTerm_title, str, CHAR_ST);
3449 } 3448 }
3450 else 3449 else
… …
3459 changed++; 3458 changed++;
3460 str = strchr (str, ';'); 3459 str = strchr (str, ';');
3461 if (str == NULL) 3460 if (str == NULL)
3462 bgPixmap.set_defaultGeometry (); 3461 bgPixmap.set_defaultGeometry ();
3463 } 3462 }
3463
3464 while (str) 3464 while (str)
3465 { 3465 {
3466 str++; 3466 str++;
3467 if (bgPixmap.set_geometry (str)) 3467 if (bgPixmap.set_geometry (str))
3468 changed++; 3468 changed++;
3469 str = strchr (str, ';'); 3469 str = strchr (str, ';');
3470 } 3470 }
3471
3471 if (changed) 3472 if (changed)
3472 { 3473 update_background ();
3473 bgPixmap.render ();
3474 scr_touch (true);
3475 }
3476 } 3474 }
3477 break; 3475 break;
3478#endif 3476#endif
3479
3480 case Rxvt_restoreFG:
3481 set_window_color (Color_fg, str);
3482 break;
3483 case Rxvt_restoreBG:
3484 set_window_color (Color_bg, str);
3485 break;
3486 3477
3487 case XTerm_logfile: 3478 case XTerm_logfile:
3488 // TODO, when secure mode? 3479 // TODO, when secure mode?
3489 break; 3480 break;
3490 3481
… …
3557 break; 3548 break;
3558#endif 3549#endif
3559 3550
3560#if ENABLE_PERL 3551#if ENABLE_PERL
3561 case URxvt_perl: 3552 case URxvt_perl:
3562 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3553 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3563 ; // no responses yet
3564 break; 3554 break;
3565#endif 3555#endif
3566 } 3556 }
3567} 3557}
3568/*----------------------------------------------------------------------*/ 3558/*----------------------------------------------------------------------*/
… …
3591 { 3581 {
3592 if (mode == 'r') 3582 if (mode == 'r')
3593 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3583 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3594 else 3584 else
3595 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3585 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3596 PrivMode (state, bit); 3586
3587 set_privmode (bit, state);
3597 } 3588 }
3598 3589
3599 return state; 3590 return state;
3600} 3591}
3601 3592
… …
3609 static const struct 3600 static const struct
3610 { 3601 {
3611 const int argval; 3602 const int argval;
3612 const unsigned long bit; 3603 const unsigned long bit;
3613 } argtopriv[] = { 3604 } argtopriv[] = {
3614 { 1, PrivMode_aplCUR }, 3605 { 1, PrivMode_aplCUR }, // DECCKM
3615 { 2, PrivMode_vt52 }, 3606 { 2, PrivMode_vt52 },
3616 { 3, PrivMode_132 }, 3607 { 3, PrivMode_132 }, // DECCOLM
3617 { 4, PrivMode_smoothScroll }, 3608 { 4, PrivMode_smoothScroll }, // DECSCLM
3618 { 5, PrivMode_rVideo }, 3609 { 5, PrivMode_rVideo }, // DECSCNM
3619 { 6, PrivMode_relOrigin }, 3610 { 6, PrivMode_relOrigin }, // DECOM
3620 { 7, PrivMode_Autowrap }, 3611 { 7, PrivMode_Autowrap }, // DECAWM
3621 // 8, bi-directional support mode 3612 // 8, auto-repeat keys // DECARM
3622 { 9, PrivMode_MouseX10 }, 3613 { 9, PrivMode_MouseX10 },
3623 // 18, 19 printing-related 3614 // 18 end FF to printer after print screen
3615 // 19 Print screen prints full screen/scorll region
3624 { 25, PrivMode_VisibleCursor }, 3616 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3625#ifdef scrollBar_esc 3617#ifdef scrollBar_esc
3626 { scrollBar_esc, PrivMode_scrollBar }, 3618 { scrollBar_esc, PrivMode_scrollBar },
3627#endif 3619#endif
3628 { 35, PrivMode_ShiftKeys }, // rxvt extension 3620 { 35, PrivMode_ShiftKeys }, // rxvt extension
3621 // 38, tektronix mode // DECTEK
3629 { 40, PrivMode_132OK }, 3622 { 40, PrivMode_132OK },
3630 // 41 xterm more fixes NYI 3623 // 41 xterm more fixes NYI
3631 // 45 margin bell NYI 3624 // 45 margin bell NYI
3632 // 46 start logging 3625 // 46 start logging
3633 { 47, PrivMode_Screen }, 3626 { 47, PrivMode_Screen },
3634 { 66, PrivMode_aplKP }, 3627 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3635#ifndef NO_BACKSPACE_KEY 3628#ifndef NO_BACKSPACE_KEY
3636 { 67, PrivMode_BackSpace }, 3629 { 67, PrivMode_BackSpace }, // DECBKM
3637#endif 3630#endif
3638 { 1000, PrivMode_MouseX11 }, 3631 { 1000, PrivMode_MouseX11 },
3639 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3632 { 1002, PrivMode_MouseBtnEvent },
3640 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3633 { 1003, PrivMode_MouseAnyEvent },
3641 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3642 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3634 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3643 { 1011, PrivMode_Keypress }, // rxvt extension 3635 { 1011, PrivMode_Keypress }, // rxvt extension
3644 // 1035 enable modifiers for alt, numlock NYI 3636 // 1035 enable modifiers for alt, numlock NYI
3645 // 1036 send ESC for meta keys NYI 3637 // 1036 send ESC for meta keys NYI
3646 // 1037 send DEL for keypad delete NYI 3638 // 1037 send DEL for keypad delete NYI
3647 { 1047, PrivMode_Screen }, 3639 { 1047, PrivMode_Screen },
3648 // 1048 save and restore cursor 3640 // 1048 save and restore cursor
3649 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3641 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3650 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3642 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3643 { 2004, PrivMode_BracketPaste },
3651 }; 3644 };
3652 3645
3653 if (nargs == 0) 3646 if (nargs == 0)
3654 return; 3647 return;
3655 3648
… …
3680 3673
3681 scr_touch (true); 3674 scr_touch (true);
3682 break; 3675 break;
3683#endif 3676#endif
3684 case 1048: /* alternative cursor save */ 3677 case 1048: /* alternative cursor save */
3685 case 1049:
3686 if (option (Opt_secondaryScreen)) 3678 if (option (Opt_secondaryScreen))
3687 if (mode == 0) 3679 if (mode == 0)
3688 scr_cursor (RESTORE); 3680 scr_cursor (RESTORE);
3689 else if (mode == 1) 3681 else if (mode == 1)
3690 scr_cursor (SAVE); 3682 scr_cursor (SAVE);
… …
3699 case 2: /* VT52 mode */ 3691 case 2: /* VT52 mode */
3700 /* oddball mode. should be set regardless of set/reset 3692 /* oddball mode. should be set regardless of set/reset
3701 * parameter. Return from VT52 mode with an ESC < from 3693 * parameter. Return from VT52 mode with an ESC < from
3702 * within VT52 mode 3694 * within VT52 mode
3703 */ 3695 */
3704 PrivMode (1, PrivMode_vt52); 3696 set_privmode (PrivMode_vt52, 1);
3705 break; 3697 break;
3706 case 3: /* 80/132 */ 3698 case 3: /* 80/132 */
3707 if (priv_modes & PrivMode_132OK) 3699 if (priv_modes & PrivMode_132OK)
3708 set_widthheight (((state ? 132 : 80) * fwidth), height); 3700 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3709 break; 3701 break;
3710 case 4: /* smooth scrolling */ 3702 case 4: /* smooth scrolling */
3711 set_option (Opt_jumpScroll, !state); 3703 set_option (Opt_jumpScroll, !state);
3712 break; 3704 break;
3713 case 5: /* reverse video */ 3705 case 5: /* reverse video */
… …
3720 scr_autowrap (state); 3712 scr_autowrap (state);
3721 break; 3713 break;
3722 /* case 8: - auto repeat, can't do on a per window basis */ 3714 /* case 8: - auto repeat, can't do on a per window basis */
3723 case 9: /* X10 mouse reporting */ 3715 case 9: /* X10 mouse reporting */
3724 if (state) /* orthogonal */ 3716 if (state) /* orthogonal */
3725 priv_modes &= ~PrivMode_MouseX11; 3717 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3726 break; 3718 break;
3727#ifdef scrollBar_esc 3719#ifdef scrollBar_esc
3728 case scrollBar_esc: 3720 case scrollBar_esc:
3729 if (scrollbar_mapping (state)) 3721 if (scrollBar.map (state))
3730 { 3722 {
3731 resize_all_windows (0, 0, 0); 3723 resize_all_windows (0, 0, 0);
3732 scr_touch (true); 3724 scr_touch (true);
3733 } 3725 }
3734 break; 3726 break;
… …
3743 break; 3735 break;
3744 /* case 66: - application key pad */ 3736 /* case 66: - application key pad */
3745 /* case 67: - backspace key */ 3737 /* case 67: - backspace key */
3746 case 1000: /* X11 mouse reporting */ 3738 case 1000: /* X11 mouse reporting */
3747 if (state) /* orthogonal */ 3739 if (state) /* orthogonal */
3748 priv_modes &= ~PrivMode_MouseX10; 3740 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3749 break; 3741 break;
3750#if 0
3751 case 1001: 3742 case 1002:
3752 break; /* X11 mouse highlighting */ 3743 case 1003:
3753#endif 3744 if (state)
3745 {
3746 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3747 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3748 vt_emask_mouse = PointerMotionMask;
3749 }
3750 else
3751 vt_emask_mouse = NoEventMask;
3752
3753 vt_select_input ();
3754 break;
3754 case 1010: /* scroll to bottom on TTY output inhibit */ 3755 case 1010: /* scroll to bottom on TTY output inhibit */
3755 set_option (Opt_scrollTtyOutput, !state); 3756 set_option (Opt_scrollTtyOutput, !state);
3756 break; 3757 break;
3757 case 1011: /* scroll to bottom on key press */ 3758 case 1011: /* scroll to bottom on key press */
3758 set_option (Opt_scrollTtyKeypress, state); 3759 set_option (Opt_scrollTtyKeypress, state);
3759 break; 3760 break;
3760 case 1047: /* secondary screen w/ clearing last */ 3761 case 1047: /* secondary screen w/ clearing last */
3761 if (option (Opt_secondaryScreen)) 3762 if (option (Opt_secondaryScreen))
3762 if (current_screen != PRIMARY) 3763 if (!state)
3763 scr_erase_screen (2); 3764 scr_erase_screen (2);
3765
3764 scr_change_screen (state); 3766 scr_change_screen (state);
3765 break; 3767 break;
3766 case 1049: /* secondary screen w/ clearing first */ 3768 case 1049: /* secondary screen w/ clearing first */
3769 if (option (Opt_secondaryScreen))
3770 if (state)
3771 scr_cursor (SAVE);
3772
3767 scr_change_screen (state); 3773 scr_change_screen (state);
3774
3768 if (option (Opt_secondaryScreen)) 3775 if (option (Opt_secondaryScreen))
3769 if (current_screen != PRIMARY) 3776 if (state)
3770 scr_erase_screen (2); 3777 scr_erase_screen (2);
3778 else
3779 scr_cursor (RESTORE);
3771 break; 3780 break;
3772 default: 3781 default:
3773 break; 3782 break;
3774 } 3783 }
3775 } 3784 }
… …
3935rxvt_term::process_graphics () 3944rxvt_term::process_graphics ()
3936{ 3945{
3937 unicode_t ch, cmd = cmd_getc (); 3946 unicode_t ch, cmd = cmd_getc ();
3938 3947
3939 if (cmd == 'Q') 3948 if (cmd == 'Q')
3949 {
3940 { /* query graphics */ 3950 /* query graphics */
3941 tt_printf ("\033G0\012"); /* no graphics */ 3951 tt_printf ("\033G0\012"); /* no graphics */
3942 return; 3952 return;
3943 } 3953 }
3944 /* swallow other graphics sequences until terminating ':' */ 3954 /* swallow other graphics sequences until terminating ':' */
3945 do 3955 do
… …
3995 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4005 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3996 4006
3997 memcpy (v_buffer + v_buflen, data, len); 4007 memcpy (v_buffer + v_buflen, data, len);
3998 v_buflen += len; 4008 v_buflen += len;
3999 4009
4000 pty_ev.set (EVENT_READ | EVENT_WRITE); 4010 pty_ev.set (ev::READ | ev::WRITE);
4001} 4011}
4002 4012
4003void rxvt_term::pty_write () 4013void rxvt_term::pty_write ()
4004{ 4014{
4005 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4015 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4010 4020
4011 if (v_buflen == 0) 4021 if (v_buflen == 0)
4012 { 4022 {
4013 free (v_buffer); 4023 free (v_buffer);
4014 v_buffer = 0; 4024 v_buffer = 0;
4015 v_buflen = 0;
4016 4025
4017 pty_ev.set (EVENT_READ); 4026 pty_ev.set (ev::READ);
4018 return; 4027 return;
4019 } 4028 }
4020 4029
4021 memmove (v_buffer, v_buffer + written, v_buflen); 4030 memmove (v_buffer, v_buffer + written, v_buflen);
4022 } 4031 }
4023 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4032 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4024 pty_ev.set (EVENT_READ); 4033 pty_ev.set (ev::READ);
4025} 4034}
4026 4035
4027/*----------------------- end-of-file (C source) -----------------------*/ 4036/*----------------------- end-of-file (C source) -----------------------*/
4028 4037

Diff Legend

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