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.376 by root, Fri Dec 14 02:08:18 2007 UTC vs.
Revision 1.459 by sf-exg, Thu Nov 18 17:28:31 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
553 newlen = 1; 660 case XK_BackSpace:
554#ifdef XK_KP_Home 661 if (priv_modes & PrivMode_HaveBackSpace)
555 static const KeySym keypadtrans[] = { 662 {
556 XK_KP_7, // XK_KP_Home 663 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
557 XK_KP_4, // XK_KP_Left 664 ^ !!ctrl) ? '\b' : '\177';
558 XK_KP_8, // XK_KP_Up 665 kbuf[1] = '\0';
559 XK_KP_6, // XK_KP_Right
560 XK_KP_2, // XK_KP_Down
561#ifndef UNSHIFTED_SCROLLKEYS
562 XK_KP_9, // XK_KP_Prior
563 XK_KP_3, // XK_KP_Next
564#else
565 XK_Prior,
566 XK_Next,
567#endif
568 XK_KP_1, // XK_KP_End
569 XK_KP_5, // XK_KP_Begin
570 }; 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
689 newlen = 0;
690 }
691 break;
571 692
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 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:
573 { 773 {
574 unsigned int index = keysym - XK_KP_Home; 774 int param = map_function_key (keysym);
575 keysym = kp ? keypadtrans[index] : XK_Home + index; 775 if (param > 0)
776 sprintf (kbuf,"\033[%d~", param);
777 else
778 newlen = 0;
576 } 779 }
577 else if (keysym == XK_KP_Insert)
578 keysym = kp ? XK_KP_0 : XK_Insert;
579#ifndef NO_DELETE_KEY
580 else if (keysym == XK_KP_Delete)
581 keysym = kp ? XK_KP_Decimal : XK_Delete;
582#endif
583#endif
584 switch (keysym)
585 {
586#ifndef NO_BACKSPACE_KEY
587 case XK_BackSpace:
588 if (priv_modes & PrivMode_HaveBackSpace)
589 {
590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
591 ^ !!ctrl) ? '\b' : '\177';
592 kbuf[1] = '\0';
593 }
594 else
595 strcpy (kbuf, rs[Rs_backspace_key]);
596 break; 780 break;
597#endif
598#ifndef NO_DELETE_KEY
599 case XK_Delete:
600 strcpy (kbuf, rs[Rs_delete_key]);
601 break;
602#endif
603 case XK_Tab:
604 if (shft)
605 strcpy (kbuf, "\033[Z");
606 else
607 {
608#ifdef CTRL_TAB_MAKES_META
609 if (ctrl)
610 meta = 1;
611#endif
612#ifdef MOD4_TAB_MAKES_META
613 if (ev.state & Mod4Mask)
614 meta = 1;
615#endif
616 newlen = 0;
617 }
618 break;
619
620 case XK_Up: /* "\033[A" */
621 case XK_Down: /* "\033[B" */
622 case XK_Right: /* "\033[C" */
623 case XK_Left: /* "\033[D" */
624 strcpy (kbuf, "\033[Z");
625 kbuf[2] = "DACB"[keysym - XK_Left];
626 /* do Shift first */
627 if (shft)
628 kbuf[2] = "dacb"[keysym - XK_Left];
629 else if (ctrl)
630 {
631 kbuf[1] = 'O';
632 kbuf[2] = "dacb"[keysym - XK_Left];
633 }
634 else if (priv_modes & PrivMode_aplCUR)
635 kbuf[1] = 'O';
636 break;
637
638#ifndef UNSHIFTED_SCROLLKEYS
639 case XK_Prior:
640 strcpy (kbuf, "\033[5~");
641 break;
642 case XK_Next:
643 strcpy (kbuf, "\033[6~");
644 break;
645#endif
646 case XK_KP_Enter:
647 /* allow shift to override */
648 if (kp)
649 {
650 strcpy (kbuf, "\033OM");
651 break;
652 }
653
654 /* FALLTHROUGH */
655
656 case XK_Return:
657 if (priv_modes & PrivMode_LFNL)
658 {
659 kbuf[0] = '\015';
660 kbuf[1] = '\012';
661 kbuf[2] = '\0';
662 }
663 else
664 {
665 kbuf[0] = '\015';
666 kbuf[1] = '\0';
667 }
668 break;
669
670 case XK_KP_F1: /* "\033OP" */
671 case XK_KP_F2: /* "\033OQ" */
672 case XK_KP_F3: /* "\033OR" */
673 case XK_KP_F4: /* "\033OS" */
674 strcpy (kbuf, "\033OP");
675 kbuf[2] += (keysym - XK_KP_F1);
676 break;
677
678 case XK_KP_Multiply: /* "\033Oj" : "*" */
679 case XK_KP_Add: /* "\033Ok" : "+" */
680 case XK_KP_Separator: /* "\033Ol" : "," */
681 case XK_KP_Subtract: /* "\033Om" : "-" */
682 case XK_KP_Decimal: /* "\033On" : "." */
683 case XK_KP_Divide: /* "\033Oo" : "/" */
684 case XK_KP_0: /* "\033Op" : "0" */
685 case XK_KP_1: /* "\033Oq" : "1" */
686 case XK_KP_2: /* "\033Or" : "2" */
687 case XK_KP_3: /* "\033Os" : "3" */
688 case XK_KP_4: /* "\033Ot" : "4" */
689 case XK_KP_5: /* "\033Ou" : "5" */
690 case XK_KP_6: /* "\033Ov" : "6" */
691 case XK_KP_7: /* "\033Ow" : "7" */
692 case XK_KP_8: /* "\033Ox" : "8" */
693 case XK_KP_9: /* "\033Oy" : "9" */
694 /* allow shift to override */
695 if (kp)
696 {
697 strcpy (kbuf, "\033Oj");
698 kbuf[2] += (keysym - XK_KP_Multiply);
699 }
700 else
701 {
702 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
703 kbuf[1] = '\0';
704 }
705 break;
706
707 case XK_Find:
708 strcpy (kbuf, "\033[1~");
709 break;
710
711 case XK_Insert:
712 strcpy (kbuf, "\033[2~");
713 break;
714#ifdef DXK_Remove /* support for DEC remove like key */
715 case DXK_Remove:
716 /* FALLTHROUGH */
717#endif
718 case XK_Execute:
719 strcpy (kbuf, "\033[3~");
720 break;
721 case XK_Select:
722 strcpy (kbuf, "\033[4~");
723 break;
724 case XK_End:
725 strcpy (kbuf, KS_END);
726 break;
727 case XK_Home:
728 strcpy (kbuf, KS_HOME);
729 break;
730
731#define FKEY(n, fkey) \
732 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
733
734 case XK_F1: /* "\033[11~" */
735 case XK_F2: /* "\033[12~" */
736 case XK_F3: /* "\033[13~" */
737 case XK_F4: /* "\033[14~" */
738 case XK_F5: /* "\033[15~" */
739 FKEY (11, XK_F1);
740 break;
741 case XK_F6: /* "\033[17~" */
742 case XK_F7: /* "\033[18~" */
743 case XK_F8: /* "\033[19~" */
744 case XK_F9: /* "\033[20~" */
745 case XK_F10: /* "\033[21~" */
746 FKEY (17, XK_F6);
747 break;
748 case XK_F11: /* "\033[23~" */
749 case XK_F12: /* "\033[24~" */
750 case XK_F13: /* "\033[25~" */
751 case XK_F14: /* "\033[26~" */
752 FKEY (23, XK_F11);
753 break;
754 case XK_F15: /* "\033[28~" */
755 case XK_F16: /* "\033[29~" */
756 FKEY (28, XK_F15);
757 break;
758 case XK_Help: /* "\033[28~" */
759 FKEY (28, XK_Help);
760 break;
761 case XK_Menu: /* "\033[29~" */
762 FKEY (29, XK_Menu);
763 break;
764 case XK_F17: /* "\033[31~" */
765 case XK_F18: /* "\033[32~" */
766 case XK_F19: /* "\033[33~" */
767 case XK_F20: /* "\033[34~" */
768 case XK_F21: /* "\033[35~" */
769 case XK_F22: /* "\033[36~" */
770 case XK_F23: /* "\033[37~" */
771 case XK_F24: /* "\033[38~" */
772 case XK_F25: /* "\033[39~" */
773 case XK_F26: /* "\033[40~" */
774 case XK_F27: /* "\033[41~" */
775 case XK_F28: /* "\033[42~" */
776 case XK_F29: /* "\033[43~" */
777 case XK_F30: /* "\033[44~" */
778 case XK_F31: /* "\033[45~" */
779 case XK_F32: /* "\033[46~" */
780 case XK_F33: /* "\033[47~" */
781 case XK_F34: /* "\033[48~" */
782 case XK_F35: /* "\033[49~" */
783 FKEY (31, XK_F17);
784 break;
785#undef FKEY
786 default:
787 newlen = 0;
788 break;
789 }
790
791 if (newlen)
792 len = strlen (kbuf);
793 } 781 }
782
783 if (newlen)
784 len = strlen (kbuf);
794 785
795 /* 786 /*
796 * Pass meta for all function keys, if 'meta' option set 787 * Pass meta for all function keys, if 'meta' option set
797 */ 788 */
798#ifdef META8_OPTION 789#ifdef META8_OPTION
984rxvt_term::flush () 975rxvt_term::flush ()
985{ 976{
986 flush_ev.stop (); 977 flush_ev.stop ();
987 978
988#ifdef HAVE_BG_PIXMAP 979#ifdef HAVE_BG_PIXMAP
989 if (bgPixmap.check_clearChanged ()) 980 if (bgPixmap.flags & bgPixmap_t::hasChanged)
990 { 981 {
982 bgPixmap.flags &= ~bgPixmap_t::hasChanged;
991// scr_clear (true); This needs to be researched further! 983// scr_clear (true); This needs to be researched further!
992 scr_touch (false); 984 scr_touch (false);
993 } 985 }
994#endif 986#endif
995 987
1032 } 1024 }
1033 while (row < end_row); 1025 while (row < end_row);
1034 } 1026 }
1035 1027
1036 scr_refresh (); 1028 scr_refresh ();
1037 scrollbar_show (1); 1029 scrollBar.show (1);
1038#ifdef USE_XIM 1030#ifdef USE_XIM
1039 IMSendSpot (); 1031 IMSendSpot ();
1040#endif 1032#endif
1041 } 1033 }
1042 1034
1043 display->flush (); 1035 display->flush ();
1044} 1036}
1045 1037
1038/* checks whether a refresh is requested and starts the refresh timer */
1046void 1039void
1047rxvt_term::prepare_cb (ev::prepare &w, int revents) 1040rxvt_term::refresh_check ()
1048{ 1041{
1049 make_current ();
1050
1051 display->flush ();
1052
1053 if (want_refresh && !flush_ev.is_active ()) 1042 if (want_refresh && !flush_ev.is_active ())
1054 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1043 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1044
1045 display->flush ();
1055} 1046}
1056 1047
1057void 1048void
1058rxvt_term::flush_cb (ev::timer &w, int revents) 1049rxvt_term::flush_cb (ev::timer &w, int revents)
1059{ 1050{
1067void 1058void
1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1059rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1069{ 1060{
1070 hidden_cursor = !hidden_cursor; 1061 hidden_cursor = !hidden_cursor;
1071 want_refresh = 1; 1062 want_refresh = 1;
1063 refresh_check ();
1072} 1064}
1073#endif 1065#endif
1074 1066
1075#ifdef TEXT_BLINK 1067#ifdef TEXT_BLINK
1076void 1068void
1078{ 1070{
1079 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1071 if (scr_refresh_rend (RS_Blink, RS_Blink))
1080 { 1072 {
1081 hidden_text = !hidden_text; 1073 hidden_text = !hidden_text;
1082 want_refresh = 1; 1074 want_refresh = 1;
1075 refresh_check ();
1083 } 1076 }
1084 else 1077 else
1085 w.stop (); 1078 w.stop ();
1086} 1079}
1087#endif 1080#endif
1088 1081
1089#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1082#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1090void 1083void
1091rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1084rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1092{ 1085{
1093 if ((scrollbar_isUp() || scrollbar_isDn()) && 1086 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1094 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1087 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1088 {
1095 want_refresh = 1; 1089 want_refresh = 1;
1090 refresh_check ();
1091 }
1096 else 1092 else
1097 w.stop (); 1093 w.stop ();
1098} 1094}
1099#endif 1095#endif
1100 1096
1104{ 1100{
1105 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1101 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1106 { 1102 {
1107 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1103 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1108 want_refresh = 1; 1104 want_refresh = 1;
1105 refresh_check ();
1109 } 1106 }
1110 else 1107 else
1111 w.stop (); 1108 w.stop ();
1112} 1109}
1113#endif 1110#endif
1114 1111
1115#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1112#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1116void 1113void
1117rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1114rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1118{ 1115{
1119 if (mouse_slip_wheel_speed == 0 1116 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1120 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1121 : scr_page (UP, mouse_slip_wheel_speed))
1122 { 1117 {
1123 if (view_start == top_row || view_start == 0)
1124 mouse_slip_wheel_speed = 0;
1125
1126 want_refresh = 1; 1118 want_refresh = 1;
1119 refresh_check ();
1120 }
1121
1122 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1127 } 1123 {
1128 else 1124 mouse_slip_wheel_speed = 0;
1129 w.stop (); 1125 w.stop ();
1126 }
1130} 1127}
1131#endif 1128#endif
1132 1129
1133#if LINUX_YIELD_HACK 1130#if LINUX_YIELD_HACK
1134static struct event_handler 1131static struct event_handler
1139 { 1136 {
1140 // this should really be sched_yield(), but the linux guys thought 1137 // this should really be sched_yield(), but the linux guys thought
1141 // that giving a process calling sched_yield () less cpu time than 1138 // that giving a process calling sched_yield () less cpu time than
1142 // 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
1143 // 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.
1144 1144
1145 struct timespec ts = { 0, 0 }; 1145 struct timespec ts = { 0, 1000 };
1146 nanosleep (&ts, 0); 1146 nanosleep (&ts, 0);
1147 1147
1148 w.stop (); 1148 w.stop ();
1149 } 1149 }
1150 1150
1200{ 1200{
1201 make_current (); 1201 make_current ();
1202 1202
1203 if (revents & ev::READ) 1203 if (revents & ev::READ)
1204 // loop, but don't allow a single term to monopolize us 1204 // loop, but don't allow a single term to monopolize us
1205 while (pty_fill ()) 1205 for (int i = CBUFCNT; i-- && pty_fill (); )
1206 if (cmd_parse ()) 1206 cmd_parse ();
1207 break;
1208 1207
1209 if (revents & ev::WRITE) 1208 if (revents & ev::WRITE)
1210 pty_write (); 1209 pty_write ();
1210
1211 refresh_check ();
1211} 1212}
1212 1213
1213void 1214void
1214rxvt_term::pointer_unblank () 1215rxvt_term::pointer_unblank ()
1215{ 1216{
1430 && ev.xfocus.mode != NotifyGrab) 1431 && ev.xfocus.mode != NotifyGrab)
1431 focus_out (); 1432 focus_out ();
1432 break; 1433 break;
1433 1434
1434 case ConfigureNotify: 1435 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); */
1438 if (ev.xconfigure.window == parent[0]) 1436 if (ev.xconfigure.window == parent[0])
1439 { 1437 {
1440 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1441 ; 1439 ;
1442 1440
1447 } 1445 }
1448 else 1446 else
1449 { 1447 {
1450#ifdef HAVE_BG_PIXMAP 1448#ifdef HAVE_BG_PIXMAP
1451 if (bgPixmap.window_position_sensitive ()) 1449 if (bgPixmap.window_position_sensitive ())
1450 {
1451 if (mapped)
1452 update_background (); 1452 update_background ();
1453 else
1454 bgPixmap.invalidate ();
1455 }
1453#endif 1456#endif
1454 } 1457 }
1458
1455 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1459 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1456 } 1460 }
1457 break; 1461 break;
1458 1462
1459 case PropertyNotify: 1463 case PropertyNotify:
1463 selection_property (ev.xproperty.window, ev.xproperty.atom); 1467 selection_property (ev.xproperty.window, ev.xproperty.atom);
1464 1468
1465 break; 1469 break;
1466 1470
1467 case SelectionClear: 1471 case SelectionClear:
1468 selection_clear (); 1472 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1469 break; 1473 break;
1470 1474
1471 case SelectionNotify: 1475 case SelectionNotify:
1472 if (selection_wait == Sel_normal) 1476 if (selection_wait == Sel_normal)
1473 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1477 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1476 case SelectionRequest: 1480 case SelectionRequest:
1477 selection_send (ev.xselectionrequest); 1481 selection_send (ev.xselectionrequest);
1478 break; 1482 break;
1479 1483
1480 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
1481 mapped = 1; 1501 mapped = 1;
1482#ifdef TEXT_BLINK 1502#ifdef TEXT_BLINK
1483 text_blink_ev.start (); 1503 text_blink_ev.start ();
1484#endif 1504#endif
1485 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1505 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1509 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1529 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1510 { 1530 {
1511 scr_expose (ev.xexpose.x, ev.xexpose.y, 1531 scr_expose (ev.xexpose.x, ev.xexpose.y,
1512 ev.xexpose.width, ev.xexpose.height, False); 1532 ev.xexpose.width, ev.xexpose.height, False);
1513 } 1533 }
1534
1514 want_refresh = 1; 1535 want_refresh = 1;
1515 } 1536 }
1516 else 1537 else
1517 { 1538 {
1518 XEvent unused_event; 1539 XEvent unused_event;
1520 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1541 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1521 ; 1542 ;
1522 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1543 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1523 ; 1544 ;
1524 1545
1525 if (isScrollbarWindow (ev.xany.window)) 1546 if (scrollBar.state && ev.xany.window == scrollBar.win)
1526 { 1547 {
1527 scrollBar.setIdle (); 1548 scrollBar.state = STATE_IDLE;
1528 scrollbar_show (0); 1549 scrollBar.show (0);
1529 } 1550 }
1530 } 1551 }
1531 break; 1552 break;
1532 1553
1533 case MotionNotify: 1554 case MotionNotify:
1620#ifdef MOUSE_THRESHOLD 1641#ifdef MOUSE_THRESHOLD
1621 } 1642 }
1622#endif 1643#endif
1623 } 1644 }
1624 } 1645 }
1625 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1646 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1626 { 1647 {
1627 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1648 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1628 MotionNotify, &ev)) 1649 MotionNotify, &ev))
1629 ; 1650 ;
1630 1651
1632 &unused_root, &unused_child, 1653 &unused_root, &unused_child,
1633 &unused_root_x, &unused_root_y, 1654 &unused_root_x, &unused_root_y,
1634 &ev.xbutton.x, &ev.xbutton.y, 1655 &ev.xbutton.x, &ev.xbutton.y,
1635 &unused_mask); 1656 &unused_mask);
1636 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1657 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1637 scrollbar_size ()); 1658 scrollBar.size ());
1638 want_refresh = 1; 1659 want_refresh = 1;
1639 scrollbar_show (1); 1660 scrollBar.show (1);
1640 } 1661 }
1641 break; 1662 break;
1642 } 1663 }
1643 1664
1644#if defined(CURSOR_BLINK) 1665#if defined(CURSOR_BLINK)
1665 1686
1666 if (ev.type == KeyPress && hidden_pointer == 0) 1687 if (ev.type == KeyPress && hidden_pointer == 0)
1667 pointer_blank (); 1688 pointer_blank ();
1668 } 1689 }
1669#endif 1690#endif
1691
1692 refresh_check ();
1670} 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
1671 1710
1672void 1711void
1673rxvt_term::focus_in () 1712rxvt_term::focus_in ()
1674{ 1713{
1675 if (!focus) 1714 if (!focus)
1676 { 1715 {
1677 focus = 1; 1716 focus = 1;
1678 want_refresh = 1; 1717 want_refresh = 1;
1679
1680 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1681 1718
1682#if USE_XIM 1719#if USE_XIM
1683 if (Input_Context != NULL) 1720 if (Input_Context != NULL)
1684 { 1721 {
1685 IMSetPosition (); 1722 IMSetPosition ();
1697 scr_recolour (); 1734 scr_recolour ();
1698 } 1735 }
1699#endif 1736#endif
1700#if ENABLE_FRILLS 1737#if ENABLE_FRILLS
1701 if (option (Opt_urgentOnBell)) 1738 if (option (Opt_urgentOnBell))
1702 { 1739 set_urgency (0);
1703 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1704 {
1705 h->flags &= ~XUrgencyHint;
1706 XSetWMHints (dpy, parent[0], h);
1707 }
1708 }
1709#endif 1740#endif
1741
1742 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1710 } 1743 }
1711} 1744}
1712 1745
1713void 1746void
1714rxvt_term::focus_out () 1747rxvt_term::focus_out ()
1716 if (focus) 1749 if (focus)
1717 { 1750 {
1718 focus = 0; 1751 focus = 0;
1719 want_refresh = 1; 1752 want_refresh = 1;
1720 1753
1721 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1754#if ENABLE_FRILLS
1722 1755 if (option (Opt_urgentOnBell))
1756 set_urgency (0);
1757#endif
1723#if ENABLE_FRILLS || ISO_14755 1758#if ENABLE_FRILLS || ISO_14755
1724 if (iso14755buf) 1759 if (iso14755buf)
1725 { 1760 {
1726 iso14755buf = 0; 1761 iso14755buf = 0;
1727# if ISO_14755 1762# if ISO_14755
1744 { 1779 {
1745 pix_colors = pix_colors_unfocused; 1780 pix_colors = pix_colors_unfocused;
1746 scr_recolour (); 1781 scr_recolour ();
1747 } 1782 }
1748#endif 1783#endif
1784
1785 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1749 } 1786 }
1750} 1787}
1751 1788
1752void 1789void
1753rxvt_term::update_fade_color (unsigned int idx) 1790rxvt_term::update_fade_color (unsigned int idx)
1784 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1821 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1785 { 1822 {
1786 bgPixmap.set_root_pixmap (); 1823 bgPixmap.set_root_pixmap ();
1787 update_background (); 1824 update_background ();
1788 } 1825 }
1826
1789 break; 1827 break;
1790 } 1828 }
1791# endif 1829# endif
1830
1831 refresh_check ();
1792} 1832}
1793#endif 1833#endif
1794 1834
1795void 1835void
1796rxvt_term::button_press (XButtonEvent &ev) 1836rxvt_term::button_press (XButtonEvent &ev)
1827 /* save the xbutton state (for ButtonRelease) */ 1867 /* save the xbutton state (for ButtonRelease) */
1828 MEvent.state = ev.state; 1868 MEvent.state = ev.state;
1829#ifdef MOUSE_REPORT_DOUBLECLICK 1869#ifdef MOUSE_REPORT_DOUBLECLICK
1830 if (ev.button == MEvent.button && clickintime) 1870 if (ev.button == MEvent.button && clickintime)
1831 { 1871 {
1832 /* same button, within alloted time */ 1872 /* same button, within allowed time */
1833 MEvent.clicks++; 1873 MEvent.clicks++;
1834 1874
1835 if (MEvent.clicks > 1) 1875 if (MEvent.clicks > 1)
1836 { 1876 {
1837 /* only report double clicks */ 1877 /* only report double clicks */
1909 } 1949 }
1910 1950
1911 /* 1951 /*
1912 * Scrollbar window processing of button press 1952 * Scrollbar window processing of button press
1913 */ 1953 */
1914 if (isScrollbarWindow (ev.window)) 1954 if (scrollBar.state && ev.window == scrollBar.win)
1915 { 1955 {
1916 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;
1917 /* 1964 /*
1918 * Rxvt-style scrollbar: 1965 * Rxvt-style scrollbar:
1919 * move up if mouse is above slider 1966 * move up if mouse is above slider
1920 * move dn if mouse is below slider 1967 * move dn if mouse is below slider
1921 * 1968 *
1930 /* 1977 /*
1931 * Mouse report disabled scrollbar: 1978 * Mouse report disabled scrollbar:
1932 * arrow buttons - send up/down 1979 * arrow buttons - send up/down
1933 * click on scrollbar - send pageup/down 1980 * click on scrollbar - send pageup/down
1934 */ 1981 */
1935 if ((scrollBar.style == R_SB_NEXT 1982 if (direction == UP)
1936 && scrollbarnext_upButton (ev.y))
1937 || (scrollBar.style == R_SB_RXVT
1938 && scrollbarrxvt_upButton (ev.y)))
1939 tt_printf ("\033[A"); 1983 tt_printf ("\033[A");
1940 else if ((scrollBar.style == R_SB_NEXT 1984 else if (direction == DN)
1941 && scrollbarnext_dnButton (ev.y))
1942 || (scrollBar.style == R_SB_RXVT
1943 && scrollbarrxvt_dnButton (ev.y)))
1944 tt_printf ("\033[B"); 1985 tt_printf ("\033[B");
1945 else 1986 else
1946 switch (ev.button) 1987 switch (ev.button)
1947 { 1988 {
1948 case Button2: 1989 case Button2:
1956 break; 1997 break;
1957 } 1998 }
1958 } 1999 }
1959 else 2000 else
1960#endif /* NO_SCROLLBAR_REPORT */ 2001#endif /* NO_SCROLLBAR_REPORT */
1961
1962 {
1963 char upordown = 0;
1964
1965 if (scrollBar.style == R_SB_NEXT)
1966 { 2002 {
1967 if (scrollbarnext_upButton (ev.y)) 2003 if (direction != NO_DIR)
1968 upordown = -1; /* up */
1969 else if (scrollbarnext_dnButton (ev.y))
1970 upordown = 1; /* down */
1971 }
1972 else if (scrollBar.style == R_SB_RXVT)
1973 {
1974 if (scrollbarrxvt_upButton (ev.y))
1975 upordown = -1; /* up */
1976 else if (scrollbarrxvt_dnButton (ev.y))
1977 upordown = 1; /* down */
1978 }
1979
1980 if (upordown)
1981 { 2004 {
1982#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2005#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1983 if (!cont_scroll_ev.is_active ()) 2006 if (!cont_scroll_ev.is_active ())
1984 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2007 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1985#endif 2008#endif
1986 if (scr_page (upordown < 0 ? UP : DN, 1)) 2009 if (scr_page (direction, 1))
1987 { 2010 {
1988 if (upordown < 0) 2011 if (direction == UP)
1989 scrollBar.setUp (); 2012 scrollBar.state = STATE_UP;
1990 else 2013 else
1991 scrollBar.setDn (); 2014 scrollBar.state = STATE_DOWN;
1992 } 2015 }
1993 } 2016 }
1994 else 2017 else
1995 switch (ev.button) 2018 switch (ev.button)
1996 { 2019 {
1997 case Button2: 2020 case Button2:
1998 switch (scrollbar_align) 2021 switch (scrollBar.align)
1999 { 2022 {
2000 case R_SB_ALIGN_TOP: 2023 case R_SB_ALIGN_TOP:
2001 csrO = 0; 2024 csrO = 0;
2002 break; 2025 break;
2003 case R_SB_ALIGN_CENTRE: 2026 case R_SB_ALIGN_CENTRE:
2009 } 2032 }
2010 2033
2011 if (scrollBar.style == R_SB_XTERM 2034 if (scrollBar.style == R_SB_XTERM
2012 || scrollbar_above_slider (ev.y) 2035 || scrollbar_above_slider (ev.y)
2013 || scrollbar_below_slider (ev.y)) 2036 || scrollbar_below_slider (ev.y))
2014 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2037 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2015 2038
2016 scrollBar.setMotion (); 2039 scrollBar.state = STATE_MOTION;
2017 break; 2040 break;
2018 2041
2019 case Button1: 2042 case Button1:
2020 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2043 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2021 csrO = ev.y - scrollBar.top; 2044 csrO = ev.y - scrollBar.top;
2022 /* FALLTHROUGH */ 2045 /* FALLTHROUGH */
2023 2046
2024 case Button3: 2047 case Button3:
2025 if (scrollBar.style != R_SB_XTERM) 2048 if (scrollBar.style != R_SB_XTERM)
2035 scr_page (DN, nrow - 1); 2058 scr_page (DN, nrow - 1);
2036# else 2059# else
2037 scr_page (DN, nrow / 4); 2060 scr_page (DN, nrow / 4);
2038# endif 2061# endif
2039 else 2062 else
2040 scrollBar.setMotion (); 2063 scrollBar.state = STATE_MOTION;
2041 } 2064 }
2042 else 2065 else
2043 { 2066 {
2044 scr_page ((ev.button == Button1 ? DN : UP), 2067 scr_page ((ev.button == Button1 ? DN : UP),
2045 (nrow 2068 (nrow
2046 * scrollbar_position (ev.y) 2069 * scrollbar_position (ev.y)
2047 / scrollbar_size ())); 2070 / scrollBar.size ()));
2048 } 2071 }
2049 2072
2050 break; 2073 break;
2051 } 2074 }
2052 } 2075 }
2062 2085
2063 csrO = 0; /* reset csr Offset */ 2086 csrO = 0; /* reset csr Offset */
2064 if (!bypass_keystate) 2087 if (!bypass_keystate)
2065 reportmode = !! (priv_modes & PrivMode_mouse_report); 2088 reportmode = !! (priv_modes & PrivMode_mouse_report);
2066 2089
2067 if (scrollbar_isUpDn ()) 2090 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2068 { 2091 {
2069 scrollBar.setIdle (); 2092 scrollBar.state = STATE_IDLE;
2070 scrollbar_show (0); 2093 scrollBar.show (0);
2071 } 2094 }
2072 2095
2073#ifdef SELECTION_SCROLLING 2096#ifdef SELECTION_SCROLLING
2074 sel_scroll_ev.stop(); 2097 sel_scroll_ev.stop();
2075#endif 2098#endif
2125 selection_make (ev.time); 2148 selection_make (ev.time);
2126 break; 2149 break;
2127 2150
2128 case Button2: 2151 case Button2:
2129 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?
2130 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2153 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2131 break; 2154 break;
2132 2155
2133#ifdef MOUSE_WHEEL 2156#ifdef MOUSE_WHEEL
2134 case Button4: 2157 case Button4:
2135 case Button5: 2158 case Button5:
2155 2178
2156 if (!slip_wheel_ev.is_active ()) 2179 if (!slip_wheel_ev.is_active ())
2157 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2180 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2158 } 2181 }
2159 else 2182 else
2183# endif
2160 { 2184 {
2161# endif
2162 scr_page (v, i); 2185 scr_page (v, i);
2163 scrollbar_show (1); 2186 scrollBar.show (1);
2164# ifdef MOUSE_SLIP_WHEELING
2165 } 2187 }
2166# endif
2167 } 2188 }
2168 break; 2189 break;
2169#endif 2190#endif
2170 } 2191 }
2171 } 2192 }
2172} 2193}
2173 2194
2174/*}}} */ 2195/*}}} */
2175 2196
2176bool 2197void
2177rxvt_term::cmd_parse () 2198rxvt_term::cmd_parse ()
2178{ 2199{
2179 bool flag = false;
2180 wchar_t ch = NOCHAR; 2200 wchar_t ch = NOCHAR;
2181 char *seq_begin; // remember start of esc-sequence here 2201 char *seq_begin; // remember start of esc-sequence here
2182 2202
2183 for (;;) 2203 for (;;)
2184 { 2204 {
2185 if (ch == NOCHAR) 2205 if (expect_false (ch == NOCHAR))
2186 { 2206 {
2187 seq_begin = cmdbuf_ptr; 2207 seq_begin = cmdbuf_ptr;
2188 ch = next_char (); 2208 ch = next_char ();
2189 2209
2190 if (ch == NOCHAR) 2210 if (ch == NOCHAR)
2191 break; 2211 break;
2192 } 2212 }
2193 2213
2194 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))
2195 { 2215 {
2196 if (!seen_input) 2216 if (expect_false (!seen_input))
2197 { 2217 {
2198 seen_input = 1; 2218 seen_input = 1;
2199 // many badly-written programs (e.g. jed) contain a race condition: 2219 // many badly-written programs (e.g. jed) contain a race condition:
2200 // they first read the screensize and then install a SIGWINCH handler. 2220 // they first read the screensize and then install a SIGWINCH handler.
2201 // some window managers resize the window early, and these programs 2221 // some window managers resize the window early, and these programs
2214 wchar_t *str = buf; 2234 wchar_t *str = buf;
2215 wchar_t *eol = str + min (ncol, UBUFSIZ); 2235 wchar_t *eol = str + min (ncol, UBUFSIZ);
2216 2236
2217 for (;;) 2237 for (;;)
2218 { 2238 {
2219 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)))
2220 break; 2240 break;
2221 2241
2222 *str++ = ch; 2242 *str++ = ch;
2223 2243
2224 if (ch == C0_LF || str >= eol) 2244 if (expect_false (ch == C0_LF || str >= eol))
2225 { 2245 {
2226 if (ch == C0_LF) 2246 if (ch == C0_LF)
2227 nlines++; 2247 nlines++;
2228 2248
2229 refresh_count++; 2249 refresh_count++;
2278 * 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.
2279 * if skipScroll is enabled. 2299 * if skipScroll is enabled.
2280 */ 2300 */
2281 if (refreshnow) 2301 if (refreshnow)
2282 { 2302 {
2283 flag = true;
2284 scr_refresh (); 2303 scr_refresh ();
2285 want_refresh = 1; 2304 want_refresh = 1;
2286 } 2305 }
2287
2288 } 2306 }
2289 else 2307 else
2290 { 2308 {
2291 try 2309 try
2292 { 2310 {
2300 } 2318 }
2301 2319
2302 ch = NOCHAR; 2320 ch = NOCHAR;
2303 } 2321 }
2304 } 2322 }
2305
2306 return flag;
2307} 2323}
2308 2324
2309// read the next character 2325// read the next character
2310wchar_t 2326wchar_t
2311rxvt_term::next_char () NOTHROW 2327rxvt_term::next_char () NOTHROW
2312{ 2328{
2313 while (cmdbuf_ptr < cmdbuf_endp) 2329 while (cmdbuf_ptr < cmdbuf_endp)
2314 { 2330 {
2315 // assume 7-bit to be ascii ALWAYS 2331 // assume 7-bit to be ascii ALWAYS
2316 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2332 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2317 return *cmdbuf_ptr++; 2333 return *cmdbuf_ptr++;
2318 2334
2319 wchar_t wc; 2335 wchar_t wc;
2320 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);
2321 2337
2325 cmdbuf_ptr = cmdbuf_endp; 2341 cmdbuf_ptr = cmdbuf_endp;
2326 break; 2342 break;
2327 } 2343 }
2328 2344
2329 if (len == (size_t)-1) 2345 if (len == (size_t)-1)
2346 {
2347 mbstate.reset (); // reset now undefined conversion state
2330 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 }
2331 2350
2332 // assume wchar == unicode 2351 // assume wchar == unicode
2333 cmdbuf_ptr += len; 2352 cmdbuf_ptr += len;
2334 return wc & UNICODE_MASK; 2353 return wc & UNICODE_MASK;
2335 } 2354 }
2379/*----------------------------------------------------------------------*/ 2398/*----------------------------------------------------------------------*/
2380#ifdef PRINTPIPE 2399#ifdef PRINTPIPE
2381FILE * 2400FILE *
2382rxvt_term::popen_printer () 2401rxvt_term::popen_printer ()
2383{ 2402{
2384 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2403 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2385 2404
2386 if (stream == NULL) 2405 if (stream == NULL)
2387 rxvt_warn ("can't open printer pipe, not printing.\n"); 2406 rxvt_warn ("can't open printer pipe, not printing.\n");
2388 2407
2389 return stream; 2408 return stream;
2400 * simulate attached vt100 printer 2419 * simulate attached vt100 printer
2401 */ 2420 */
2402void 2421void
2403rxvt_term::process_print_pipe () 2422rxvt_term::process_print_pipe ()
2404{ 2423{
2405 int done; 2424 FILE *fd = popen_printer ();
2406 FILE *fd;
2407 2425
2408 if ((fd = popen_printer ()) == NULL) 2426 if (!fd)
2409 return; 2427 return;
2410 2428
2411 /* 2429 /*
2412 * 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
2413 * is received. 2431 * is received.
2414 */ 2432 */
2415 for (done = 0; !done;) 2433 for (int done = 0; !done; )
2416 { 2434 {
2417 unsigned char buf[8]; 2435 unsigned char buf[8];
2418 unicode_t ch; 2436 unicode_t ch;
2419 unsigned int i, len; 2437 unsigned int i, len;
2420 2438
2565 break; 2583 break;
2566 case 'Z': /* identify the terminal type */ 2584 case 'Z': /* identify the terminal type */
2567 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2585 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2568 break; 2586 break;
2569 case '<': /* turn off VT52 mode */ 2587 case '<': /* turn off VT52 mode */
2570 PrivMode (0, PrivMode_vt52); 2588 set_privmode (PrivMode_vt52, 0);
2571 break; 2589 break;
2572 case 'F': /* use special graphics character set */ 2590 case 'F': /* use special graphics character set */
2573 case 'G': /* use regular character set */ 2591 case 'G': /* use regular character set */
2574 /* unimplemented */ 2592 /* unimplemented */
2575 break; 2593 break;
2629 scr_forwardindex (); 2647 scr_forwardindex ();
2630 break; 2648 break;
2631#endif 2649#endif
2632 case '=': 2650 case '=':
2633 case '>': 2651 case '>':
2634 PrivMode ((ch == '='), PrivMode_aplKP); 2652 set_privmode (PrivMode_aplKP, ch == '=');
2635 break; 2653 break;
2636 2654
2637 case C1_40: 2655 case C1_40:
2638 cmd_getc (); 2656 cmd_getc ();
2639 break; 2657 break;
2678 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2696 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2679 case C1_SCI: /* ESC Z */ 2697 case C1_SCI: /* ESC Z */
2680 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2698 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2681 break; /* steal obsolete ESC [ c */ 2699 break; /* steal obsolete ESC [ c */
2682 2700
2683 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2701 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2684 case C1_CSI: /* ESC [ */ 2702 case C1_CSI: /* ESC [ */
2685 process_csi_seq (); 2703 process_csi_seq ();
2686 break; 2704 break;
2687 2705
2688 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2706 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2689 case C1_OSC: /* ESC ] */ 2707 case C1_OSC: /* ESC ] */
2690 process_osc_seq (); 2708 process_osc_seq ();
2691 break; 2709 break;
2692 2710
2693 /* 8.3.106: RESET TO INITIAL STATE */ 2711 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2694 case 'c': 2712 case 'c':
2695 mbstate.reset (); 2713 mbstate.reset ();
2696 scr_poweron (); 2714 scr_poweron ();
2697 scrollbar_show (1); 2715 scrollBar.show (1);
2698 break; 2716 break;
2699 2717
2700 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2718 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2701 case 'n': 2719 case 'n':
2702 scr_charset_choose (2); 2720 scr_charset_choose (2);
2753 2771
2754 nargs = 0; 2772 nargs = 0;
2755 2773
2756 priv = 0; 2774 priv = 0;
2757 ch = cmd_getc (); 2775 ch = cmd_getc ();
2758 if (ch >= '<' && ch <= '?') 2776 if ((ch >= '<' && ch <= '?') || ch == '!')
2759 { 2777 {
2760 /* '<' '=' '>' '?' */ 2778 /* '<' '=' '>' '?' '!' */
2761 priv = ch; 2779 priv = ch;
2762 ch = cmd_getc (); 2780 ch = cmd_getc ();
2763 } 2781 }
2764 2782
2765 /* read any numerical arguments */ 2783 /* read any numerical arguments */
2814 // versions. 2832 // versions.
2815 // 2833 //
2816 tt_printf ("\033[>%d;95;0c", 'U'); 2834 tt_printf ("\033[>%d;95;0c", 'U');
2817 } 2835 }
2818 break; 2836 break;
2837
2819 case '?': 2838 case '?':
2820 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2839 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2821 process_terminal_mode (ch, priv, nargs, arg); 2840 process_terminal_mode (ch, priv, nargs, arg);
2822 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);
2823 } 2854 }
2855 break;
2856 }
2857
2824 return; 2858 return;
2825 } 2859 }
2826 2860
2827 switch (ch) 2861 switch (ch)
2828 { 2862 {
3195 * 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)'
3196 */ 3230 */
3197void 3231void
3198rxvt_term::process_dcs_seq () 3232rxvt_term::process_dcs_seq ()
3199{ 3233{
3200 char *s;
3201 unicode_t eh;
3202
3203 /* 3234 /*
3204 * Not handled yet 3235 * Not handled yet
3205 */ 3236 */
3237
3238 unicode_t eh;
3206 s = get_to_st (eh); 3239 char *s = get_to_st (eh);
3207 if (s) 3240 if (s)
3208 free (s); 3241 free (s);
3209 3242
3210 return; 3243 return;
3211} 3244}
3215 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3248 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3216 */ 3249 */
3217void 3250void
3218rxvt_term::process_osc_seq () 3251rxvt_term::process_osc_seq ()
3219{ 3252{
3220 unicode_t ch, eh;
3221 int arg; 3253 int arg;
3222 3254
3223 ch = cmd_getc (); 3255 unicode_t ch = cmd_getc ();
3224 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3256 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3225 arg = arg * 10 + (ch - '0'); 3257 arg = arg * 10 + (ch - '0');
3226 3258
3227 if (ch == ';') 3259 if (ch == ';')
3228 { 3260 {
3261 unicode_t eh;
3229 char *s = get_to_st (eh); 3262 char *s = get_to_st (eh);
3230 3263
3231 if (s) 3264 if (s)
3232 { 3265 {
3233 process_xterm_seq (arg, s, eh); 3266 process_xterm_seq (arg, s, eh);
3257 3290
3258/* 3291/*
3259 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3292 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3260 */ 3293 */
3261void 3294void
3262rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3295rxvt_term::process_xterm_seq (int op, char *str, char resp)
3263{ 3296{
3264 int color; 3297 int color;
3265 char *buf, *name; 3298 char *buf, *name;
3266 bool query = str[0] == '?' && !str[1]; 3299 bool query = str[0] == '?' && !str[1];
3267 int saveop = op; 3300 int saveop = op;
3308 3341
3309 XFree (value); 3342 XFree (value);
3310 } 3343 }
3311 else 3344 else
3312 { 3345 {
3313 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3346 char *eq = strchr (str, '=');
3314 3347
3315 if (eq) 3348 if (eq)
3316 { 3349 {
3317 *eq = 0; 3350 *eq = 0;
3318 set_utf8_property (display->atom (str), eq + 1); 3351 set_utf8_property (display->atom (str), eq + 1);
3339 *buf++ = '\0'; 3372 *buf++ = '\0';
3340 3373
3341 process_color_seq (op, color, name, resp); 3374 process_color_seq (op, color, name, resp);
3342 } 3375 }
3343 break; 3376 break;
3377 case Rxvt_restoreFG:
3344 case XTerm_Color00: 3378 case XTerm_Color00:
3345 process_color_seq (op, Color_fg, str, resp); 3379 process_color_seq (op, Color_fg, str, resp);
3346 break; 3380 break;
3381 case Rxvt_restoreBG:
3347 case XTerm_Color01: 3382 case XTerm_Color01:
3348 process_color_seq (op, Color_bg, str, resp); 3383 process_color_seq (op, Color_bg, str, resp);
3349 break; 3384 break;
3350#ifndef NO_CURSORCOLOR 3385#ifndef NO_CURSORCOLOR
3351 case XTerm_Color_cursor: 3386 case XTerm_Color_cursor:
3356 process_color_seq (op, Color_pointer_fg, str, resp); 3391 process_color_seq (op, Color_pointer_fg, str, resp);
3357 break; 3392 break;
3358 case XTerm_Color_pointer_bg: 3393 case XTerm_Color_pointer_bg:
3359 process_color_seq (op, Color_pointer_bg, str, resp); 3394 process_color_seq (op, Color_pointer_bg, str, resp);
3360 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
3361#ifndef NO_BOLD_UNDERLINE_REVERSE 3404#ifndef NO_BOLD_UNDERLINE_REVERSE
3362 case XTerm_Color_RV:
3363 process_color_seq (op, Color_RV, str, resp);
3364 break;
3365 case Rxvt_Color_BD:
3366 case URxvt_Color_BD: 3405 case URxvt_Color_BD:
3367 process_color_seq (op, Color_BD, str, resp); 3406 process_color_seq (op, Color_BD, str, resp);
3368 break; 3407 break;
3369 case Rxvt_Color_UL:
3370 case URxvt_Color_UL: 3408 case URxvt_Color_UL:
3371 process_color_seq (op, Color_UL, str, resp); 3409 process_color_seq (op, Color_UL, str, resp);
3372 break; 3410 break;
3373 case URxvt_Color_IT: 3411 case URxvt_Color_IT:
3374 process_color_seq (op, Color_IT, str, resp); 3412 process_color_seq (op, Color_IT, str, resp);
3375 break; 3413 break;
3376#endif 3414#endif
3415 case URxvt_Color_border:
3416 process_color_seq (op, Color_border, str, resp);
3417 break;
3377#if ENABLE_TRANSPARENCY 3418#if ENABLE_TRANSPARENCY
3378 case URxvt_Color_tint: 3419 case URxvt_Color_tint:
3379 process_color_seq (op, Color_tint, str, resp); 3420 process_color_seq (op, Color_tint, str, resp);
3380 { 3421 {
3381 bool changed = false; 3422 bool changed = false;
3423
3382 if (ISSET_PIXCOLOR (Color_tint)) 3424 if (ISSET_PIXCOLOR (Color_tint))
3383 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3425 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3384 else 3426 else
3385 changed = bgPixmap.unset_tint (); 3427 changed = bgPixmap.unset_tint ();
3428
3386 if (changed) 3429 if (changed)
3387 update_background (); 3430 update_background ();
3388 } 3431 }
3389 3432
3390 break; 3433 break;
3394 case Rxvt_Pixmap: 3437 case Rxvt_Pixmap:
3395 if (!strcmp (str, "?")) 3438 if (!strcmp (str, "?"))
3396 { 3439 {
3397 char str[256]; 3440 char str[256];
3398 3441
3399 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3442 sprintf (str, "[%dx%d+%d+%d]",
3400 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3443 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3401 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3444 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3402 process_xterm_seq (XTerm_title, str, CHAR_ST); 3445 process_xterm_seq (XTerm_title, str, CHAR_ST);
3403 } 3446 }
3404 else 3447 else
3405 { 3448 {
3406 int changed = 0; 3449 int changed = 0;
3407 3450
3408 if (*str != ';') 3451 if (*str != ';')
3409 { 3452 {
3410 /* reset to default scaling :*/
3411 bgPixmap.unset_geometry ();
3412 if (bgPixmap.set_file (str)) /* change pixmap */ 3453 if (bgPixmap.set_file (str)) /* change pixmap */
3454 {
3413 changed++; 3455 changed++;
3414 str = strchr (str, ';'); 3456 str = strchr (str, ';');
3415 if (str == NULL) 3457 if (str == NULL)
3416 bgPixmap.set_defaultGeometry (); 3458 bgPixmap.set_defaultGeometry ();
3459 else
3460 bgPixmap.set_geometry (str+1);
3461 }
3417 } 3462 }
3418 while (str) 3463 else
3419 { 3464 {
3420 str++; 3465 str++;
3421 if (bgPixmap.set_geometry (str)) 3466 if (bgPixmap.set_geometry (str, true))
3422 changed++; 3467 changed++;
3423 str = strchr (str, ';');
3424 } 3468 }
3469
3425 if (changed) 3470 if (changed)
3426 update_background (); 3471 update_background ();
3427 } 3472 }
3428 break; 3473 break;
3429#endif 3474#endif
3430
3431 case Rxvt_restoreFG:
3432 set_window_color (Color_fg, str);
3433 break;
3434 case Rxvt_restoreBG:
3435 set_window_color (Color_bg, str);
3436 break;
3437 3475
3438 case XTerm_logfile: 3476 case XTerm_logfile:
3439 // TODO, when secure mode? 3477 // TODO, when secure mode?
3440 break; 3478 break;
3441 3479
3508 break; 3546 break;
3509#endif 3547#endif
3510 3548
3511#if ENABLE_PERL 3549#if ENABLE_PERL
3512 case URxvt_perl: 3550 case URxvt_perl:
3513 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));
3514 ; // no responses yet
3515 break; 3552 break;
3516#endif 3553#endif
3517 } 3554 }
3518} 3555}
3519/*----------------------------------------------------------------------*/ 3556/*----------------------------------------------------------------------*/
3542 { 3579 {
3543 if (mode == 'r') 3580 if (mode == 'r')
3544 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3581 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3545 else 3582 else
3546 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3583 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3547 PrivMode (state, bit); 3584
3585 set_privmode (bit, state);
3548 } 3586 }
3549 3587
3550 return state; 3588 return state;
3551} 3589}
3552 3590
3560 static const struct 3598 static const struct
3561 { 3599 {
3562 const int argval; 3600 const int argval;
3563 const unsigned long bit; 3601 const unsigned long bit;
3564 } argtopriv[] = { 3602 } argtopriv[] = {
3565 { 1, PrivMode_aplCUR }, 3603 { 1, PrivMode_aplCUR }, // DECCKM
3566 { 2, PrivMode_vt52 }, 3604 { 2, PrivMode_vt52 },
3567 { 3, PrivMode_132 }, 3605 { 3, PrivMode_132 }, // DECCOLM
3568 { 4, PrivMode_smoothScroll }, 3606 { 4, PrivMode_smoothScroll }, // DECSCLM
3569 { 5, PrivMode_rVideo }, 3607 { 5, PrivMode_rVideo }, // DECSCNM
3570 { 6, PrivMode_relOrigin }, 3608 { 6, PrivMode_relOrigin }, // DECOM
3571 { 7, PrivMode_Autowrap }, 3609 { 7, PrivMode_Autowrap }, // DECAWM
3572 // 8, bi-directional support mode 3610 // 8, auto-repeat keys // DECARM
3573 { 9, PrivMode_MouseX10 }, 3611 { 9, PrivMode_MouseX10 },
3574 // 18, 19 printing-related 3612 // 18 end FF to printer after print screen
3613 // 19 Print screen prints full screen/scroll region
3575 { 25, PrivMode_VisibleCursor }, 3614 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3576#ifdef scrollBar_esc 3615#ifdef scrollBar_esc
3577 { scrollBar_esc, PrivMode_scrollBar }, 3616 { scrollBar_esc, PrivMode_scrollBar },
3578#endif 3617#endif
3579 { 35, PrivMode_ShiftKeys }, // rxvt extension 3618 { 35, PrivMode_ShiftKeys }, // rxvt extension
3619 // 38, tektronix mode // DECTEK
3580 { 40, PrivMode_132OK }, 3620 { 40, PrivMode_132OK },
3581 // 41 xterm more fixes NYI 3621 // 41 xterm more fixes NYI
3582 // 45 margin bell NYI 3622 // 45 margin bell NYI
3583 // 46 start logging 3623 // 46 start logging
3584 { 47, PrivMode_Screen }, 3624 { 47, PrivMode_Screen },
3585 { 66, PrivMode_aplKP }, 3625 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3586#ifndef NO_BACKSPACE_KEY 3626#ifndef NO_BACKSPACE_KEY
3587 { 67, PrivMode_BackSpace }, 3627 { 67, PrivMode_BackSpace }, // DECBKM
3588#endif 3628#endif
3589 { 1000, PrivMode_MouseX11 }, 3629 { 1000, PrivMode_MouseX11 },
3590 { 1002, PrivMode_MouseBtnEvent }, 3630 { 1002, PrivMode_MouseBtnEvent },
3591 { 1003, PrivMode_MouseAnyEvent }, 3631 { 1003, PrivMode_MouseAnyEvent },
3592 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3632 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3596 // 1037 send DEL for keypad delete NYI 3636 // 1037 send DEL for keypad delete NYI
3597 { 1047, PrivMode_Screen }, 3637 { 1047, PrivMode_Screen },
3598 // 1048 save and restore cursor 3638 // 1048 save and restore cursor
3599 { 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 */
3600 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3640 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3641 { 2004, PrivMode_BracketPaste },
3601 }; 3642 };
3602 3643
3603 if (nargs == 0) 3644 if (nargs == 0)
3604 return; 3645 return;
3605 3646
3630 3671
3631 scr_touch (true); 3672 scr_touch (true);
3632 break; 3673 break;
3633#endif 3674#endif
3634 case 1048: /* alternative cursor save */ 3675 case 1048: /* alternative cursor save */
3635 case 1049:
3636 if (option (Opt_secondaryScreen)) 3676 if (option (Opt_secondaryScreen))
3637 if (mode == 0) 3677 if (mode == 0)
3638 scr_cursor (RESTORE); 3678 scr_cursor (RESTORE);
3639 else if (mode == 1) 3679 else if (mode == 1)
3640 scr_cursor (SAVE); 3680 scr_cursor (SAVE);
3649 case 2: /* VT52 mode */ 3689 case 2: /* VT52 mode */
3650 /* oddball mode. should be set regardless of set/reset 3690 /* oddball mode. should be set regardless of set/reset
3651 * parameter. Return from VT52 mode with an ESC < from 3691 * parameter. Return from VT52 mode with an ESC < from
3652 * within VT52 mode 3692 * within VT52 mode
3653 */ 3693 */
3654 PrivMode (1, PrivMode_vt52); 3694 set_privmode (PrivMode_vt52, 1);
3655 break; 3695 break;
3656 case 3: /* 80/132 */ 3696 case 3: /* 80/132 */
3657 if (priv_modes & PrivMode_132OK) 3697 if (priv_modes & PrivMode_132OK)
3658 set_widthheight (((state ? 132 : 80) * fwidth), height); 3698 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3659 break; 3699 break;
3660 case 4: /* smooth scrolling */ 3700 case 4: /* smooth scrolling */
3661 set_option (Opt_jumpScroll, !state); 3701 set_option (Opt_jumpScroll, !state);
3662 break; 3702 break;
3663 case 5: /* reverse video */ 3703 case 5: /* reverse video */
3674 if (state) /* orthogonal */ 3714 if (state) /* orthogonal */
3675 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3715 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3676 break; 3716 break;
3677#ifdef scrollBar_esc 3717#ifdef scrollBar_esc
3678 case scrollBar_esc: 3718 case scrollBar_esc:
3679 if (scrollbar_mapping (state)) 3719 if (scrollBar.map (state))
3680 { 3720 {
3681 resize_all_windows (0, 0, 0); 3721 resize_all_windows (0, 0, 0);
3682 scr_touch (true); 3722 scr_touch (true);
3683 } 3723 }
3684 break; 3724 break;
3705 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3745 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3706 vt_emask_mouse = PointerMotionMask; 3746 vt_emask_mouse = PointerMotionMask;
3707 } 3747 }
3708 else 3748 else
3709 vt_emask_mouse = NoEventMask; 3749 vt_emask_mouse = NoEventMask;
3750
3710 vt_select_input (); 3751 vt_select_input ();
3711 break; 3752 break;
3712 case 1010: /* scroll to bottom on TTY output inhibit */ 3753 case 1010: /* scroll to bottom on TTY output inhibit */
3713 set_option (Opt_scrollTtyOutput, !state); 3754 set_option (Opt_scrollTtyOutput, !state);
3714 break; 3755 break;
3715 case 1011: /* scroll to bottom on key press */ 3756 case 1011: /* scroll to bottom on key press */
3716 set_option (Opt_scrollTtyKeypress, state); 3757 set_option (Opt_scrollTtyKeypress, state);
3717 break; 3758 break;
3718 case 1047: /* secondary screen w/ clearing last */ 3759 case 1047: /* secondary screen w/ clearing last */
3719 if (option (Opt_secondaryScreen)) 3760 if (option (Opt_secondaryScreen))
3720 if (current_screen != PRIMARY) 3761 if (!state)
3721 scr_erase_screen (2); 3762 scr_erase_screen (2);
3763
3722 scr_change_screen (state); 3764 scr_change_screen (state);
3723 break; 3765 break;
3724 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
3725 scr_change_screen (state); 3771 scr_change_screen (state);
3772
3726 if (option (Opt_secondaryScreen)) 3773 if (option (Opt_secondaryScreen))
3727 if (current_screen != PRIMARY) 3774 if (state)
3728 scr_erase_screen (2); 3775 scr_erase_screen (2);
3776 else
3777 scr_cursor (RESTORE);
3729 break; 3778 break;
3730 default: 3779 default:
3731 break; 3780 break;
3732 } 3781 }
3733 } 3782 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines