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.394 by ayin, Sat Jan 19 15:00:49 2008 UTC vs.
Revision 1.480 by sf-exg, Mon Mar 7 11:48:55 2011 UTC

25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * 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
34 * 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
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
162 162
163void 163void
164rxvt_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)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
197 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
201 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);
202 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
203 207
204 max_it (width, 8+5); // for char + hex 208 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
206 210
207 if (y >= 0) 211 if (y >= 0)
208 { 212 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 214 x = 0;
211 } 215 }
212 216
213 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
214 218
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 220
217 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
218 { 222 {
237// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
240// } 244// }
241 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
242 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
243
244 free (fname); 249 free (fname[i]);
250 }
245 251
246# if ENABLE_COMBINING 252# if ENABLE_COMBINING
247 if (alloc) 253 if (alloc)
248 delete [] alloc; 254 delete [] alloc;
249# endif 255# endif
279 } 285 }
280 286
281 iso14755buf = 0; 287 iso14755buf = 0;
282} 288}
283 289
284int 290static int
285rxvt_term::hex_keyval (XKeyEvent &ev) 291hex_keyval (XKeyEvent &ev)
286{ 292{
287 // check wether this event corresponds to a hex digit 293 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 294 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 295 for (int index = 0; index < 8; index++)
290 { 296 {
291 KeySym k = XLookupKeysym (&ev, index); 297 KeySym k = XLookupKeysym (&ev, index);
292 298
298 304
299 return -1; 305 return -1;
300} 306}
301#endif 307#endif
302 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
303void 404void
304rxvt_term::key_press (XKeyEvent &ev) 405rxvt_term::key_press (XKeyEvent &ev)
305{ 406{
306 int ctrl, meta, shft, len; 407 int ctrl, meta, shft, len;
307 unsigned int newlen;
308 KeySym keysym; 408 KeySym keysym;
309 int valid_keysym; 409 int valid_keysym;
310 char kbuf[KBUFSZ]; 410 char kbuf[KBUFSZ];
311 411
312#if ISO_14755 412#if ISO_14755
321 * Always permit `shift' to override the current setting 421 * Always permit `shift' to override the current setting
322 */ 422 */
323 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
324 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
325 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
326
327 if (numlock_state || (ev.state & ModNumLockMask))
328 {
329 numlock_state = (ev.state & ModNumLockMask);
330 PrivMode ((!numlock_state), PrivMode_aplKP);
331 }
332 426
333 kbuf[0] = 0; 427 kbuf[0] = 0;
334 428
335#ifdef USE_XIM 429#ifdef USE_XIM
336 if (Input_Context) 430 if (Input_Context)
411#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
412 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
413#else 507#else
414 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
415#endif 509#endif
510 max_it (lnsppg, 1);
511
416 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
417 { 513 {
418 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
419 return; 515 return;
420 } 516 }
485 } 581 }
486 } 582 }
487 583
488#if ENABLE_FRILLS || ISO_14755 584#if ENABLE_FRILLS || ISO_14755
489 // ISO 14755 support 585 // ISO 14755 support
490 if (shft && ctrl) 586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
491 { 587 {
492 int hv; 588 int hv;
493 589
494 if (iso14755buf & ISO_14755_51 590 if (iso14755buf & ISO_14755_51
495 && (keysym == XK_space || keysym == XK_KP_Space 591 && (keysym == XK_space || keysym == XK_KP_Space
525 scr_overlay_off (); 621 scr_overlay_off ();
526# endif 622# endif
527 iso14755buf = 0; 623 iso14755buf = 0;
528 } 624 }
529 } 625 }
626 else if (option (Opt_iso14755) &&
530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 627 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 628 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
532 if (!(iso14755buf & ISO_14755_STARTED)) 629 if (!(iso14755buf & ISO_14755_STARTED))
533 { 630 {
534 iso14755buf |= ISO_14755_STARTED; 631 iso14755buf |= ISO_14755_STARTED;
535# if ISO_14755 632# if ISO_14755
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 633 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
547 } 644 }
548#endif 645#endif
549 646
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 { 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)
552 { 658 {
553 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 659#ifndef NO_BACKSPACE_KEY
554 newlen = 1; 660 case XK_BackSpace:
555#ifdef XK_KP_Home 661 if (priv_modes & PrivMode_HaveBackSpace)
556 static const KeySym keypadtrans[] = { 662 {
557 XK_KP_7, // XK_KP_Home 663 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
558 XK_KP_4, // XK_KP_Left 664 ^ !!ctrl) ? '\b' : '\177';
559 XK_KP_8, // XK_KP_Up 665 kbuf[1] = '\0';
560 XK_KP_6, // XK_KP_Right
561 XK_KP_2, // XK_KP_Down
562#ifndef UNSHIFTED_SCROLLKEYS
563 XK_KP_9, // XK_KP_Prior
564 XK_KP_3, // XK_KP_Next
565#else
566 XK_Prior,
567 XK_Next,
568#endif
569 XK_KP_1, // XK_KP_End
570 XK_KP_5, // XK_KP_Begin
571 }; 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;
572 692
573 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:
574 { 773 {
575 unsigned int index = keysym - XK_KP_Home; 774 int param = map_function_key (keysym);
576 keysym = kp ? keypadtrans[index] : XK_Home + index; 775 if (param > 0)
776 sprintf (kbuf,"\033[%d~", param);
777 else
778 newlen = 0;
577 } 779 }
578 else if (keysym == XK_KP_Insert)
579 keysym = kp ? XK_KP_0 : XK_Insert;
580#ifndef NO_DELETE_KEY
581 else if (keysym == XK_KP_Delete)
582 keysym = kp ? XK_KP_Decimal : XK_Delete;
583#endif
584#endif
585 switch (keysym)
586 {
587#ifndef NO_BACKSPACE_KEY
588 case XK_BackSpace:
589 if (priv_modes & PrivMode_HaveBackSpace)
590 {
591 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
592 ^ !!ctrl) ? '\b' : '\177';
593 kbuf[1] = '\0';
594 }
595 else
596 strcpy (kbuf, rs[Rs_backspace_key]);
597 break; 780 break;
598#endif
599#ifndef NO_DELETE_KEY
600 case XK_Delete:
601 strcpy (kbuf, rs[Rs_delete_key]);
602 break;
603#endif
604 case XK_Tab:
605 if (shft)
606 strcpy (kbuf, "\033[Z");
607 else
608 {
609#ifdef CTRL_TAB_MAKES_META
610 if (ctrl)
611 meta = 1;
612#endif
613#ifdef MOD4_TAB_MAKES_META
614 if (ev.state & Mod4Mask)
615 meta = 1;
616#endif
617 newlen = 0;
618 }
619 break;
620
621 case XK_Up: /* "\033[A" */
622 case XK_Down: /* "\033[B" */
623 case XK_Right: /* "\033[C" */
624 case XK_Left: /* "\033[D" */
625 strcpy (kbuf, "\033[Z");
626 kbuf[2] = "DACB"[keysym - XK_Left];
627 /* do Shift first */
628 if (shft)
629 kbuf[2] = "dacb"[keysym - XK_Left];
630 else if (ctrl)
631 {
632 kbuf[1] = 'O';
633 kbuf[2] = "dacb"[keysym - XK_Left];
634 }
635 else if (priv_modes & PrivMode_aplCUR)
636 kbuf[1] = 'O';
637 break;
638
639#ifndef UNSHIFTED_SCROLLKEYS
640 case XK_Prior:
641 strcpy (kbuf, "\033[5~");
642 break;
643 case XK_Next:
644 strcpy (kbuf, "\033[6~");
645 break;
646#endif
647 case XK_KP_Enter:
648 /* allow shift to override */
649 if (kp)
650 {
651 strcpy (kbuf, "\033OM");
652 break;
653 }
654
655 /* FALLTHROUGH */
656
657 case XK_Return:
658 if (priv_modes & PrivMode_LFNL)
659 {
660 kbuf[0] = '\015';
661 kbuf[1] = '\012';
662 kbuf[2] = '\0';
663 }
664 else
665 {
666 kbuf[0] = '\015';
667 kbuf[1] = '\0';
668 }
669 break;
670
671 case XK_KP_F1: /* "\033OP" */
672 case XK_KP_F2: /* "\033OQ" */
673 case XK_KP_F3: /* "\033OR" */
674 case XK_KP_F4: /* "\033OS" */
675 strcpy (kbuf, "\033OP");
676 kbuf[2] += (keysym - XK_KP_F1);
677 break;
678
679 case XK_KP_Multiply: /* "\033Oj" : "*" */
680 case XK_KP_Add: /* "\033Ok" : "+" */
681 case XK_KP_Separator: /* "\033Ol" : "," */
682 case XK_KP_Subtract: /* "\033Om" : "-" */
683 case XK_KP_Decimal: /* "\033On" : "." */
684 case XK_KP_Divide: /* "\033Oo" : "/" */
685 case XK_KP_0: /* "\033Op" : "0" */
686 case XK_KP_1: /* "\033Oq" : "1" */
687 case XK_KP_2: /* "\033Or" : "2" */
688 case XK_KP_3: /* "\033Os" : "3" */
689 case XK_KP_4: /* "\033Ot" : "4" */
690 case XK_KP_5: /* "\033Ou" : "5" */
691 case XK_KP_6: /* "\033Ov" : "6" */
692 case XK_KP_7: /* "\033Ow" : "7" */
693 case XK_KP_8: /* "\033Ox" : "8" */
694 case XK_KP_9: /* "\033Oy" : "9" */
695 /* allow shift to override */
696 if (kp)
697 {
698 strcpy (kbuf, "\033Oj");
699 kbuf[2] += (keysym - XK_KP_Multiply);
700 }
701 else
702 {
703 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
704 kbuf[1] = '\0';
705 }
706 break;
707
708 case XK_Find:
709 strcpy (kbuf, "\033[1~");
710 break;
711
712 case XK_Insert:
713 strcpy (kbuf, "\033[2~");
714 break;
715#ifdef DXK_Remove /* support for DEC remove like key */
716 case DXK_Remove:
717 /* FALLTHROUGH */
718#endif
719 case XK_Execute:
720 strcpy (kbuf, "\033[3~");
721 break;
722 case XK_Select:
723 strcpy (kbuf, "\033[4~");
724 break;
725 case XK_End:
726 strcpy (kbuf, KS_END);
727 break;
728 case XK_Home:
729 strcpy (kbuf, KS_HOME);
730 break;
731
732#define FKEY(n, fkey) \
733 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
734
735 case XK_F1: /* "\033[11~" */
736 case XK_F2: /* "\033[12~" */
737 case XK_F3: /* "\033[13~" */
738 case XK_F4: /* "\033[14~" */
739 case XK_F5: /* "\033[15~" */
740 FKEY (11, XK_F1);
741 break;
742 case XK_F6: /* "\033[17~" */
743 case XK_F7: /* "\033[18~" */
744 case XK_F8: /* "\033[19~" */
745 case XK_F9: /* "\033[20~" */
746 case XK_F10: /* "\033[21~" */
747 FKEY (17, XK_F6);
748 break;
749 case XK_F11: /* "\033[23~" */
750 case XK_F12: /* "\033[24~" */
751 case XK_F13: /* "\033[25~" */
752 case XK_F14: /* "\033[26~" */
753 FKEY (23, XK_F11);
754 break;
755 case XK_F15: /* "\033[28~" */
756 case XK_F16: /* "\033[29~" */
757 FKEY (28, XK_F15);
758 break;
759 case XK_Help: /* "\033[28~" */
760 FKEY (28, XK_Help);
761 break;
762 case XK_Menu: /* "\033[29~" */
763 FKEY (29, XK_Menu);
764 break;
765 case XK_F17: /* "\033[31~" */
766 case XK_F18: /* "\033[32~" */
767 case XK_F19: /* "\033[33~" */
768 case XK_F20: /* "\033[34~" */
769 case XK_F21: /* "\033[35~" */
770 case XK_F22: /* "\033[36~" */
771 case XK_F23: /* "\033[37~" */
772 case XK_F24: /* "\033[38~" */
773 case XK_F25: /* "\033[39~" */
774 case XK_F26: /* "\033[40~" */
775 case XK_F27: /* "\033[41~" */
776 case XK_F28: /* "\033[42~" */
777 case XK_F29: /* "\033[43~" */
778 case XK_F30: /* "\033[44~" */
779 case XK_F31: /* "\033[45~" */
780 case XK_F32: /* "\033[46~" */
781 case XK_F33: /* "\033[47~" */
782 case XK_F34: /* "\033[48~" */
783 case XK_F35: /* "\033[49~" */
784 FKEY (31, XK_F17);
785 break;
786#undef FKEY
787 default:
788 newlen = 0;
789 break;
790 }
791
792 if (newlen)
793 len = strlen (kbuf);
794 } 781 }
782
783 if (newlen)
784 len = strlen (kbuf);
795 785
796 /* 786 /*
797 * Pass meta for all function keys, if 'meta' option set 787 * Pass meta for all function keys, if 'meta' option set
798 */ 788 */
799#ifdef META8_OPTION 789#ifdef META8_OPTION
899 commit_iso14755 (); 889 commit_iso14755 ();
900 890
901 return; 891 return;
902 } 892 }
903 893
904 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
905 if (i[0] == keysym) 895 if (i[0] == keysym)
906 { 896 {
907 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
908 commit_iso14755 (); 898 commit_iso14755 ();
909 899
985rxvt_term::flush () 975rxvt_term::flush ()
986{ 976{
987 flush_ev.stop (); 977 flush_ev.stop ();
988 978
989#ifdef HAVE_BG_PIXMAP 979#ifdef HAVE_BG_PIXMAP
990 if (bgPixmap.check_clearChanged ()) 980 if (bg_flags & BG_NEEDS_REFRESH)
991 { 981 {
992// scr_clear (true); This needs to be researched further! 982 bg_flags &= ~BG_NEEDS_REFRESH;
993 scr_touch (false); 983 scr_touch (false);
994 } 984 }
995#endif 985#endif
996 986
997 if (want_refresh) 987 if (want_refresh)
1033 } 1023 }
1034 while (row < end_row); 1024 while (row < end_row);
1035 } 1025 }
1036 1026
1037 scr_refresh (); 1027 scr_refresh ();
1038 scrollbar_show (1); 1028 scrollBar.show (1);
1039#ifdef USE_XIM 1029#ifdef USE_XIM
1040 IMSendSpot (); 1030 IMSendSpot ();
1041#endif 1031#endif
1042 } 1032 }
1043 1033
1044 display->flush (); 1034 display->flush ();
1045} 1035}
1046 1036
1047/* checks wether a refresh is requested and starts the refresh timer */ 1037/* checks whether a refresh is requested and starts the refresh timer */
1048void 1038void
1049rxvt_term::refresh_check () 1039rxvt_term::refresh_check ()
1050{ 1040{
1051 if (want_refresh && !flush_ev.is_active ()) 1041 if (want_refresh && !flush_ev.is_active ())
1052 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1042 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1090 1080
1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1081#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1092void 1082void
1093rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1083rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1094{ 1084{
1095 if ((scrollbar_isUp () || scrollbar_isDn ()) 1085 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1096 && scr_page (scrollbar_isUp () ? UP : DN, 1)) 1086 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1097 { 1087 {
1098 want_refresh = 1; 1088 want_refresh = 1;
1099 refresh_check (); 1089 refresh_check ();
1100 } 1090 }
1101 else 1091 else
1145 { 1135 {
1146 // this should really be sched_yield(), but the linux guys thought 1136 // this should really be sched_yield(), but the linux guys thought
1147 // that giving a process calling sched_yield () less cpu time than 1137 // that giving a process calling sched_yield () less cpu time than
1148 // 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
1149 // 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.
1150 1143
1151 struct timespec ts = { 0, 0 }; 1144 struct timespec ts = { 0, 1000 };
1152 nanosleep (&ts, 0); 1145 nanosleep (&ts, 0);
1153 1146
1154 w.stop (); 1147 w.stop ();
1155 } 1148 }
1156 1149
1165rxvt_term::pty_fill () 1158rxvt_term::pty_fill ()
1166{ 1159{
1167 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1160 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1168 1161
1169 if (CBUFSIZ == n) 1162 if (CBUFSIZ == n)
1170 { 1163 n = 0; // normally this indicates a "too long" command sequence - just drop the data we have
1171 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1172 n = 0;
1173 }
1174 1164
1175 memmove (cmdbuf_base, cmdbuf_ptr, n); 1165 memmove (cmdbuf_base, cmdbuf_ptr, n);
1176 cmdbuf_ptr = cmdbuf_base; 1166 cmdbuf_ptr = cmdbuf_base;
1177 cmdbuf_endp = cmdbuf_ptr + n; 1167 cmdbuf_endp = cmdbuf_ptr + n;
1178 1168
1206{ 1196{
1207 make_current (); 1197 make_current ();
1208 1198
1209 if (revents & ev::READ) 1199 if (revents & ev::READ)
1210 // loop, but don't allow a single term to monopolize us 1200 // loop, but don't allow a single term to monopolize us
1211 while (pty_fill ()) 1201 for (int i = CBUFCNT; i-- && pty_fill (); )
1212 if (cmd_parse ()) 1202 cmd_parse ();
1213 break;
1214 1203
1215 if (revents & ev::WRITE) 1204 if (revents & ev::WRITE)
1216 pty_write (); 1205 pty_write ();
1217 1206
1218 refresh_check (); 1207 refresh_check ();
1259{ 1248{
1260 int button_number, key_state = 0; 1249 int button_number, key_state = 0;
1261 int x, y; 1250 int x, y;
1262 int code = 32; 1251 int code = 32;
1263 1252
1264 x = Pixel2Col (ev.x); 1253 x = Pixel2Col (ev.x) + 1;
1265 y = Pixel2Row (ev.y); 1254 y = Pixel2Row (ev.y) + 1;
1255
1266 if (ev.type == MotionNotify) 1256 if (ev.type == MotionNotify)
1267 { 1257 {
1268 if (x == mouse_row && y == mouse_col) 1258 if (x == mouse_row && y == mouse_col)
1269 return; 1259 return;
1260
1270 mouse_row = x; 1261 mouse_row = x;
1271 mouse_col = y; 1262 mouse_col = y;
1272 code += 32; 1263 code += 32;
1273 } 1264 }
1274 1265
1277 else 1268 else
1278 { 1269 {
1279 button_number = MEvent.button - Button1; 1270 button_number = MEvent.button - Button1;
1280 /* add 0x3D for wheel events, like xterm does */ 1271 /* add 0x3D for wheel events, like xterm does */
1281 if (button_number >= 3) 1272 if (button_number >= 3)
1282 button_number += (64 - 3); 1273 button_number += 64 - 3;
1283 } 1274 }
1284 1275
1285 if (priv_modes & PrivMode_MouseX10) 1276 if (priv_modes & PrivMode_MouseX10)
1286 { 1277 {
1287 /* 1278 /*
1319 fputc ('A', stderr); 1310 fputc ('A', stderr);
1320 if (key_state & 32) 1311 if (key_state & 32)
1321 fputc ('2', stderr); 1312 fputc ('2', stderr);
1322 fprintf (stderr, "]: <%d>, %d/%d\n", 1313 fprintf (stderr, "]: <%d>, %d/%d\n",
1323 button_number, 1314 button_number,
1324 x + 1, 1315 x,
1325 y + 1); 1316 y);
1326#endif 1317#endif
1327 1318
1319#if ENABLE_FRILLS
1320 if (priv_modes & PrivMode_ExtMouseRight)
1321 tt_printf ("\033[%d;%d;%dM",
1322 code + button_number + key_state,
1323 x,
1324 y);
1325 else if (priv_modes & PrivMode_ExtModeMouse)
1326 tt_printf ("\033[M%c%lc%lc",
1327 code + button_number + key_state,
1328 wint_t (32 + x),
1329 wint_t (32 + y));
1330 else
1331#endif
1328 tt_printf ("\033[M%c%c%c", 1332 tt_printf ("\033[M%c%c%c",
1329 (code + button_number + key_state), 1333 code + button_number + key_state,
1330 (32 + x + 1), 1334 32 + x,
1331 (32 + y + 1)); 1335 32 + y);
1332} 1336}
1333 1337
1334/*{{{ process an X event */ 1338/*{{{ process an X event */
1335void 1339void
1336rxvt_term::x_cb (XEvent &ev) 1340rxvt_term::x_cb (XEvent &ev)
1438 && ev.xfocus.mode != NotifyGrab) 1442 && ev.xfocus.mode != NotifyGrab)
1439 focus_out (); 1443 focus_out ();
1440 break; 1444 break;
1441 1445
1442 case ConfigureNotify: 1446 case ConfigureNotify:
1443 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1444 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1445 szHint.width, szHint.height); */
1446 if (ev.xconfigure.window == parent[0]) 1447 if (ev.xconfigure.window == parent[0])
1447 { 1448 {
1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1449 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1449 ; 1450 ;
1451
1452#ifdef HAVE_BG_PIXMAP
1453 bool moved = false;
1454 if (bg_window_position_sensitive ())
1455 {
1456 int x, y;
1457 if (ev.xconfigure.send_event)
1458 {
1459 x = ev.xconfigure.x;
1460 y = ev.xconfigure.y;
1461 }
1462 else
1463 get_window_origin (x, y);
1464
1465 if (bg_set_position (x, y)
1466 || !(bg_flags & BG_IS_VALID))
1467 moved = true;
1468 }
1469#endif
1450 1470
1451 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1471 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1452 { 1472 {
1453 seen_resize = 1; 1473 seen_resize = 1;
1454 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1474 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1455 } 1475 }
1456 else 1476 else
1457 { 1477 {
1458#ifdef HAVE_BG_PIXMAP 1478#ifdef HAVE_BG_PIXMAP
1459 if (bgPixmap.window_position_sensitive ()) 1479 if (moved)
1460 { 1480 {
1461 if (mapped) 1481 if (mapped)
1462 update_background (); 1482 update_background ();
1463 else 1483 else
1464 bgPixmap.invalidate (); 1484 bg_invalidate ();
1465 } 1485 }
1466#endif 1486#endif
1467 } 1487 }
1468 1488
1469 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1489 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1470 } 1490 }
1471 break; 1491 break;
1472 1492
1473 case PropertyNotify: 1493 case PropertyNotify:
1474 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1494 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1475 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1476 && ev.xproperty.state == PropertyNewValue)
1477 selection_property (ev.xproperty.window, ev.xproperty.atom);
1478
1479 break; 1495 break;
1480 1496
1481 case SelectionClear: 1497 case SelectionClear:
1482 selection_clear (); 1498 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1483 break;
1484
1485 case SelectionNotify:
1486 if (selection_wait == Sel_normal)
1487 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1488 break; 1499 break;
1489 1500
1490 case SelectionRequest: 1501 case SelectionRequest:
1491 selection_send (ev.xselectionrequest); 1502 selection_send (ev.xselectionrequest);
1492 break; 1503 break;
1493 1504
1494 case MapNotify: 1505 case MapNotify:
1495#ifdef HAVE_BG_PIXMAP 1506#ifdef HAVE_BG_PIXMAP
1496 /* This is needed spcifically to fix the case of no window manager or a 1507 /* This is needed specifically to fix the case of no window manager or a
1497 * non-reparenting window manager. In those cases we never get first 1508 * non-reparenting window manager. In those cases we never get first
1498 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1509 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1499 * care of multiplicity of ConfigureNotify events arriwing while WM does 1510 * care of multiplicity of ConfigureNotify events arriving while WM does
1500 * reparenting. 1511 * reparenting.
1501 * We should not render background immidiately, as there could be several 1512 * We should not render background immediately, as there could be several
1502 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1513 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1503 * by scheduling background redraw as soon as we can, but giving a short 1514 * by scheduling background redraw as soon as we can, but giving a short
1504 * bit of time for ConfigureNotifies to arrive. 1515 * bit of time for ConfigureNotifies to arrive.
1505 * We should render background PRIOR to drawing any text, but AFTER all 1516 * We should render background PRIOR to drawing any text, but AFTER all
1506 * of ConfigureNotifys for the best results. 1517 * of ConfigureNotifys for the best results.
1507 */ 1518 */
1508 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1519 if (!(bg_flags & BG_IS_VALID))
1509 update_background_ev.start (0.025); 1520 update_background_ev.start (0.025);
1510#endif 1521#endif
1511 mapped = 1; 1522 mapped = 1;
1512#ifdef TEXT_BLINK 1523#ifdef TEXT_BLINK
1513 text_blink_ev.start (); 1524 text_blink_ev.start ();
1528 if (ev.xany.window == vt) 1539 if (ev.xany.window == vt)
1529 { 1540 {
1530 do 1541 do
1531 { 1542 {
1532 scr_expose (ev.xexpose.x, ev.xexpose.y, 1543 scr_expose (ev.xexpose.x, ev.xexpose.y,
1533 ev.xexpose.width, ev.xexpose.height, False); 1544 ev.xexpose.width, ev.xexpose.height, false);
1534 } 1545 }
1535 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1546 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1536 1547
1537 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1538 1549
1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1550 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1540 { 1551 {
1541 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1542 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, false);
1543 } 1554 }
1544 1555
1545 want_refresh = 1; 1556 want_refresh = 1;
1546 } 1557 }
1547 else 1558 else
1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1564 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1554 ; 1565 ;
1555 1566
1556 if (scrollBar.state && ev.xany.window == scrollBar.win) 1567 if (scrollBar.state && ev.xany.window == scrollBar.win)
1557 { 1568 {
1558 scrollBar.setIdle (); 1569 scrollBar.state = STATE_IDLE;
1559 scrollbar_show (0); 1570 scrollBar.show (0);
1560 } 1571 }
1561 } 1572 }
1562 break; 1573 break;
1563 1574
1564 case MotionNotify: 1575 case MotionNotify:
1651#ifdef MOUSE_THRESHOLD 1662#ifdef MOUSE_THRESHOLD
1652 } 1663 }
1653#endif 1664#endif
1654 } 1665 }
1655 } 1666 }
1656 else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win) 1667 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1657 { 1668 {
1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1669 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1659 MotionNotify, &ev)) 1670 MotionNotify, &ev))
1660 ; 1671 ;
1661 1672
1663 &unused_root, &unused_child, 1674 &unused_root, &unused_child,
1664 &unused_root_x, &unused_root_y, 1675 &unused_root_x, &unused_root_y,
1665 &ev.xbutton.x, &ev.xbutton.y, 1676 &ev.xbutton.x, &ev.xbutton.y,
1666 &unused_mask); 1677 &unused_mask);
1667 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1678 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1668 scrollbar_size ()); 1679 scrollBar.size ());
1669 want_refresh = 1; 1680 want_refresh = 1;
1670 scrollbar_show (1); 1681 scrollBar.show (1);
1671 } 1682 }
1672 break; 1683 break;
1673 } 1684 }
1674 1685
1675#if defined(CURSOR_BLINK) 1686#if defined(CURSOR_BLINK)
1700#endif 1711#endif
1701 1712
1702 refresh_check (); 1713 refresh_check ();
1703} 1714}
1704 1715
1716#if ENABLE_FRILLS
1717void
1718rxvt_term::set_urgency (bool enable)
1719{
1720 if (enable == urgency_hint)
1721 return;
1722
1723 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1724 {
1725 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1726 XSetWMHints (dpy, parent[0], h);
1727 urgency_hint = enable;
1728 }
1729}
1730#endif
1731
1705void 1732void
1706rxvt_term::focus_in () 1733rxvt_term::focus_in ()
1707{ 1734{
1708 if (!focus) 1735 if (!focus)
1709 { 1736 {
1710 focus = 1; 1737 focus = 1;
1711 want_refresh = 1; 1738 want_refresh = 1;
1712
1713 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1714 1739
1715#if USE_XIM 1740#if USE_XIM
1716 if (Input_Context != NULL) 1741 if (Input_Context != NULL)
1717 { 1742 {
1718 IMSetPosition (); 1743 IMSetPosition ();
1730 scr_recolour (); 1755 scr_recolour ();
1731 } 1756 }
1732#endif 1757#endif
1733#if ENABLE_FRILLS 1758#if ENABLE_FRILLS
1734 if (option (Opt_urgentOnBell)) 1759 if (option (Opt_urgentOnBell))
1735 { 1760 set_urgency (0);
1736 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1737 {
1738 h->flags &= ~XUrgencyHint;
1739 XSetWMHints (dpy, parent[0], h);
1740 }
1741 }
1742#endif 1761#endif
1762
1763 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1743 } 1764 }
1744} 1765}
1745 1766
1746void 1767void
1747rxvt_term::focus_out () 1768rxvt_term::focus_out ()
1749 if (focus) 1770 if (focus)
1750 { 1771 {
1751 focus = 0; 1772 focus = 0;
1752 want_refresh = 1; 1773 want_refresh = 1;
1753 1774
1754 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1775#if ENABLE_FRILLS
1755 1776 if (option (Opt_urgentOnBell))
1777 set_urgency (0);
1778#endif
1756#if ENABLE_FRILLS || ISO_14755 1779#if ENABLE_FRILLS || ISO_14755
1757 if (iso14755buf) 1780 if (iso14755buf)
1758 { 1781 {
1759 iso14755buf = 0; 1782 iso14755buf = 0;
1760# if ISO_14755 1783# if ISO_14755
1777 { 1800 {
1778 pix_colors = pix_colors_unfocused; 1801 pix_colors = pix_colors_unfocused;
1779 scr_recolour (); 1802 scr_recolour ();
1780 } 1803 }
1781#endif 1804#endif
1805
1806 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1782 } 1807 }
1783} 1808}
1784 1809
1785void 1810void
1786rxvt_term::update_fade_color (unsigned int idx) 1811rxvt_term::update_fade_color (unsigned int idx)
1814 * use the property to determine the pixmap. We use it later on. 1839 * use the property to determine the pixmap. We use it later on.
1815 */ 1840 */
1816 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1841 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1817 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1842 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1818 { 1843 {
1819 bgPixmap.set_root_pixmap (); 1844 bg_set_root_pixmap ();
1820 update_background (); 1845 update_background ();
1821 } 1846 }
1822 1847
1823 break; 1848 break;
1824 } 1849 }
1863 /* save the xbutton state (for ButtonRelease) */ 1888 /* save the xbutton state (for ButtonRelease) */
1864 MEvent.state = ev.state; 1889 MEvent.state = ev.state;
1865#ifdef MOUSE_REPORT_DOUBLECLICK 1890#ifdef MOUSE_REPORT_DOUBLECLICK
1866 if (ev.button == MEvent.button && clickintime) 1891 if (ev.button == MEvent.button && clickintime)
1867 { 1892 {
1868 /* same button, within alloted time */ 1893 /* same button, within allowed time */
1869 MEvent.clicks++; 1894 MEvent.clicks++;
1870 1895
1871 if (MEvent.clicks > 1) 1896 if (MEvent.clicks > 1)
1872 { 1897 {
1873 /* only report double clicks */ 1898 /* only report double clicks */
1947 /* 1972 /*
1948 * Scrollbar window processing of button press 1973 * Scrollbar window processing of button press
1949 */ 1974 */
1950 if (scrollBar.state && ev.window == scrollBar.win) 1975 if (scrollBar.state && ev.window == scrollBar.win)
1951 { 1976 {
1952 scrollBar.setIdle (); 1977 page_dirn direction = NO_DIR;
1978
1979 if (scrollBar.upButton (ev.y))
1980 direction = UP; /* up */
1981 else if (scrollBar.dnButton (ev.y))
1982 direction = DN; /* down */
1983
1984 scrollBar.state = STATE_IDLE;
1953 /* 1985 /*
1954 * Rxvt-style scrollbar: 1986 * Rxvt-style scrollbar:
1955 * move up if mouse is above slider 1987 * move up if mouse is above slider
1956 * move dn if mouse is below slider 1988 * move dn if mouse is below slider
1957 * 1989 *
1966 /* 1998 /*
1967 * Mouse report disabled scrollbar: 1999 * Mouse report disabled scrollbar:
1968 * arrow buttons - send up/down 2000 * arrow buttons - send up/down
1969 * click on scrollbar - send pageup/down 2001 * click on scrollbar - send pageup/down
1970 */ 2002 */
1971 if ((scrollBar.style == R_SB_NEXT 2003 if (direction == UP)
1972 && scrollbarnext_upButton (ev.y))
1973 || (scrollBar.style == R_SB_RXVT
1974 && scrollbarrxvt_upButton (ev.y)))
1975 tt_printf ("\033[A"); 2004 tt_printf ("\033[A");
1976 else if ((scrollBar.style == R_SB_NEXT 2005 else if (direction == DN)
1977 && scrollbarnext_dnButton (ev.y))
1978 || (scrollBar.style == R_SB_RXVT
1979 && scrollbarrxvt_dnButton (ev.y)))
1980 tt_printf ("\033[B"); 2006 tt_printf ("\033[B");
1981 else 2007 else
1982 switch (ev.button) 2008 switch (ev.button)
1983 { 2009 {
1984 case Button2: 2010 case Button2:
1992 break; 2018 break;
1993 } 2019 }
1994 } 2020 }
1995 else 2021 else
1996#endif /* NO_SCROLLBAR_REPORT */ 2022#endif /* NO_SCROLLBAR_REPORT */
1997
1998 {
1999 char upordown = 0;
2000
2001 if (scrollBar.style == R_SB_NEXT)
2002 { 2023 {
2003 if (scrollbarnext_upButton (ev.y)) 2024 if (direction != NO_DIR)
2004 upordown = -1; /* up */
2005 else if (scrollbarnext_dnButton (ev.y))
2006 upordown = 1; /* down */
2007 }
2008 else if (scrollBar.style == R_SB_RXVT)
2009 {
2010 if (scrollbarrxvt_upButton (ev.y))
2011 upordown = -1; /* up */
2012 else if (scrollbarrxvt_dnButton (ev.y))
2013 upordown = 1; /* down */
2014 }
2015
2016 if (upordown)
2017 { 2025 {
2018#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2026#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2019 if (!cont_scroll_ev.is_active ()) 2027 if (!cont_scroll_ev.is_active ())
2020 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2028 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2021#endif 2029#endif
2022 if (scr_page (upordown < 0 ? UP : DN, 1)) 2030 if (scr_page (direction, 1))
2023 { 2031 {
2024 if (upordown < 0) 2032 if (direction == UP)
2025 scrollBar.setUp (); 2033 scrollBar.state = STATE_UP;
2026 else 2034 else
2027 scrollBar.setDn (); 2035 scrollBar.state = STATE_DOWN;
2028 } 2036 }
2029 } 2037 }
2030 else 2038 else
2031 switch (ev.button) 2039 switch (ev.button)
2032 { 2040 {
2045 } 2053 }
2046 2054
2047 if (scrollBar.style == R_SB_XTERM 2055 if (scrollBar.style == R_SB_XTERM
2048 || scrollbar_above_slider (ev.y) 2056 || scrollbar_above_slider (ev.y)
2049 || scrollbar_below_slider (ev.y)) 2057 || scrollbar_below_slider (ev.y))
2050 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2058 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2051 2059
2052 scrollBar.setMotion (); 2060 scrollBar.state = STATE_MOTION;
2053 break; 2061 break;
2054 2062
2055 case Button1: 2063 case Button1:
2056 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2064 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2057 csrO = ev.y - scrollBar.top; 2065 csrO = ev.y - scrollBar.top;
2071 scr_page (DN, nrow - 1); 2079 scr_page (DN, nrow - 1);
2072# else 2080# else
2073 scr_page (DN, nrow / 4); 2081 scr_page (DN, nrow / 4);
2074# endif 2082# endif
2075 else 2083 else
2076 scrollBar.setMotion (); 2084 scrollBar.state = STATE_MOTION;
2077 } 2085 }
2078 else 2086 else
2079 { 2087 {
2080 scr_page ((ev.button == Button1 ? DN : UP), 2088 scr_page ((ev.button == Button1 ? DN : UP),
2081 (nrow 2089 (nrow
2082 * scrollbar_position (ev.y) 2090 * scrollbar_position (ev.y)
2083 / scrollbar_size ())); 2091 / scrollBar.size ()));
2084 } 2092 }
2085 2093
2086 break; 2094 break;
2087 } 2095 }
2088 } 2096 }
2098 2106
2099 csrO = 0; /* reset csr Offset */ 2107 csrO = 0; /* reset csr Offset */
2100 if (!bypass_keystate) 2108 if (!bypass_keystate)
2101 reportmode = !! (priv_modes & PrivMode_mouse_report); 2109 reportmode = !! (priv_modes & PrivMode_mouse_report);
2102 2110
2103 if (scrollbar_isUpDn ()) 2111 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2104 { 2112 {
2105 scrollBar.setIdle (); 2113 scrollBar.state = STATE_IDLE;
2106 scrollbar_show (0); 2114 scrollBar.show (0);
2107 } 2115 }
2108 2116
2109#ifdef SELECTION_SCROLLING 2117#ifdef SELECTION_SCROLLING
2110 sel_scroll_ev.stop(); 2118 sel_scroll_ev.stop();
2111#endif 2119#endif
2161 selection_make (ev.time); 2169 selection_make (ev.time);
2162 break; 2170 break;
2163 2171
2164 case Button2: 2172 case Button2:
2165 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2173 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2166 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2174 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2167 break; 2175 break;
2168 2176
2169#ifdef MOUSE_WHEEL 2177#ifdef MOUSE_WHEEL
2170 case Button4: 2178 case Button4:
2171 case Button5: 2179 case Button5:
2194 } 2202 }
2195 else 2203 else
2196# endif 2204# endif
2197 { 2205 {
2198 scr_page (v, i); 2206 scr_page (v, i);
2199 scrollbar_show (1); 2207 scrollBar.show (1);
2200 } 2208 }
2201 } 2209 }
2202 break; 2210 break;
2203#endif 2211#endif
2204 } 2212 }
2205 } 2213 }
2206} 2214}
2207 2215
2208/*}}} */ 2216/*}}} */
2209 2217
2210bool 2218void
2211rxvt_term::cmd_parse () 2219rxvt_term::cmd_parse ()
2212{ 2220{
2213 bool flag = false;
2214 wchar_t ch = NOCHAR; 2221 wchar_t ch = NOCHAR;
2215 char *seq_begin; // remember start of esc-sequence here 2222 char *seq_begin; // remember start of esc-sequence here
2216 2223
2217 for (;;) 2224 for (;;)
2218 { 2225 {
2219 if (ch == NOCHAR) 2226 if (expect_false (ch == NOCHAR))
2220 { 2227 {
2221 seq_begin = cmdbuf_ptr; 2228 seq_begin = cmdbuf_ptr;
2222 ch = next_char (); 2229 ch = next_char ();
2223 2230
2224 if (ch == NOCHAR) 2231 if (ch == NOCHAR)
2225 break; 2232 break;
2226 } 2233 }
2227 2234
2228 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2235 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2229 { 2236 {
2230 if (!seen_input) 2237 if (expect_false (!seen_input))
2231 { 2238 {
2232 seen_input = 1; 2239 seen_input = 1;
2233 // many badly-written programs (e.g. jed) contain a race condition: 2240 // many badly-written programs (e.g. jed) contain a race condition:
2234 // they first read the screensize and then install a SIGWINCH handler. 2241 // they first read the screensize and then install a SIGWINCH handler.
2235 // some window managers resize the window early, and these programs 2242 // some window managers resize the window early, and these programs
2248 wchar_t *str = buf; 2255 wchar_t *str = buf;
2249 wchar_t *eol = str + min (ncol, UBUFSIZ); 2256 wchar_t *eol = str + min (ncol, UBUFSIZ);
2250 2257
2251 for (;;) 2258 for (;;)
2252 { 2259 {
2253 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2260 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2254 break; 2261 break;
2255 2262
2256 *str++ = ch; 2263 *str++ = ch;
2257 2264
2258 if (ch == C0_LF || str >= eol) 2265 if (expect_false (ch == C0_LF || str >= eol))
2259 { 2266 {
2260 if (ch == C0_LF) 2267 if (ch == C0_LF)
2261 nlines++; 2268 nlines++;
2262 2269
2263 refresh_count++; 2270 refresh_count++;
2312 * What the heck we'll cheat and only refresh less than every page-full. 2319 * What the heck we'll cheat and only refresh less than every page-full.
2313 * if skipScroll is enabled. 2320 * if skipScroll is enabled.
2314 */ 2321 */
2315 if (refreshnow) 2322 if (refreshnow)
2316 { 2323 {
2317 flag = true;
2318 scr_refresh (); 2324 scr_refresh ();
2319 want_refresh = 1; 2325 want_refresh = 1;
2320 } 2326 }
2321
2322 } 2327 }
2323 else 2328 else
2324 { 2329 {
2325 try 2330 try
2326 { 2331 {
2334 } 2339 }
2335 2340
2336 ch = NOCHAR; 2341 ch = NOCHAR;
2337 } 2342 }
2338 } 2343 }
2339
2340 return flag;
2341} 2344}
2342 2345
2343// read the next character 2346// read the next character
2344wchar_t 2347wchar_t
2345rxvt_term::next_char () NOTHROW 2348rxvt_term::next_char () NOTHROW
2346{ 2349{
2347 while (cmdbuf_ptr < cmdbuf_endp) 2350 while (cmdbuf_ptr < cmdbuf_endp)
2348 { 2351 {
2349 // assume 7-bit to be ascii ALWAYS 2352 // assume 7-bit to be ascii ALWAYS
2350 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2353 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2351 return *cmdbuf_ptr++; 2354 return *cmdbuf_ptr++;
2352 2355
2353 wchar_t wc; 2356 wchar_t wc;
2354 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2357 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2355 2358
2359 cmdbuf_ptr = cmdbuf_endp; 2362 cmdbuf_ptr = cmdbuf_endp;
2360 break; 2363 break;
2361 } 2364 }
2362 2365
2363 if (len == (size_t)-1) 2366 if (len == (size_t)-1)
2367 {
2368 mbstate.reset (); // reset now undefined conversion state
2364 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2369 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2370 }
2365 2371
2366 // assume wchar == unicode 2372 // assume wchar == unicode
2367 cmdbuf_ptr += len; 2373 cmdbuf_ptr += len;
2368 return wc & UNICODE_MASK; 2374 return wc & UNICODE_MASK;
2369 } 2375 }
2413/*----------------------------------------------------------------------*/ 2419/*----------------------------------------------------------------------*/
2414#ifdef PRINTPIPE 2420#ifdef PRINTPIPE
2415FILE * 2421FILE *
2416rxvt_term::popen_printer () 2422rxvt_term::popen_printer ()
2417{ 2423{
2418 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2424 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2419 2425
2420 if (stream == NULL) 2426 if (stream == NULL)
2421 rxvt_warn ("can't open printer pipe, not printing.\n"); 2427 rxvt_warn ("can't open printer pipe, not printing.\n");
2422 2428
2423 return stream; 2429 return stream;
2434 * simulate attached vt100 printer 2440 * simulate attached vt100 printer
2435 */ 2441 */
2436void 2442void
2437rxvt_term::process_print_pipe () 2443rxvt_term::process_print_pipe ()
2438{ 2444{
2439 int done; 2445 FILE *fd = popen_printer ();
2440 FILE *fd;
2441 2446
2442 if ((fd = popen_printer ()) == NULL) 2447 if (!fd)
2443 return; 2448 return;
2444 2449
2445 /* 2450 /*
2446 * Send all input to the printer until either ESC[4i or ESC[?4i 2451 * Send all input to the printer until either ESC[4i or ESC[?4i
2447 * is received. 2452 * is received.
2448 */ 2453 */
2449 for (done = 0; !done;) 2454 for (int done = 0; !done; )
2450 { 2455 {
2451 unsigned char buf[8]; 2456 unsigned char buf[8];
2452 unicode_t ch; 2457 unicode_t ch;
2453 unsigned int i, len; 2458 unsigned int i, len;
2454 2459
2599 break; 2604 break;
2600 case 'Z': /* identify the terminal type */ 2605 case 'Z': /* identify the terminal type */
2601 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2606 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2602 break; 2607 break;
2603 case '<': /* turn off VT52 mode */ 2608 case '<': /* turn off VT52 mode */
2604 PrivMode (0, PrivMode_vt52); 2609 set_privmode (PrivMode_vt52, 0);
2605 break; 2610 break;
2606 case 'F': /* use special graphics character set */ 2611 case 'F': /* use special graphics character set */
2607 case 'G': /* use regular character set */ 2612 case 'G': /* use regular character set */
2608 /* unimplemented */ 2613 /* unimplemented */
2609 break; 2614 break;
2663 scr_forwardindex (); 2668 scr_forwardindex ();
2664 break; 2669 break;
2665#endif 2670#endif
2666 case '=': 2671 case '=':
2667 case '>': 2672 case '>':
2668 PrivMode ((ch == '='), PrivMode_aplKP); 2673 set_privmode (PrivMode_aplKP, ch == '=');
2669 break; 2674 break;
2670 2675
2671 case C1_40: 2676 case C1_40:
2672 cmd_getc (); 2677 cmd_getc ();
2673 break; 2678 break;
2677 2682
2678 /* 8.3.87: NEXT LINE */ 2683 /* 8.3.87: NEXT LINE */
2679 case C1_NEL: /* ESC E */ 2684 case C1_NEL: /* ESC E */
2680 { 2685 {
2681 wchar_t nlcr[] = { C0_LF, C0_CR }; 2686 wchar_t nlcr[] = { C0_LF, C0_CR };
2682 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2687 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2683 } 2688 }
2684 break; 2689 break;
2685 2690
2686 /* kidnapped escape sequence: Should be 8.3.48 */ 2691 /* kidnapped escape sequence: Should be 8.3.48 */
2687 case C1_ESA: /* ESC G */ 2692 case C1_ESA: /* ESC G */
2688 process_graphics (); 2693 // used by original rxvt for rob nations own graphics mode
2694 if (cmd_getc () == 'Q')
2695 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2689 break; 2696 break;
2690 2697
2691 /* 8.3.63: CHARACTER TABULATION SET */ 2698 /* 8.3.63: CHARACTER TABULATION SET */
2692 case C1_HTS: /* ESC H */ 2699 case C1_HTS: /* ESC H */
2693 scr_set_tab (1); 2700 scr_set_tab (1);
2712 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2719 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2713 case C1_SCI: /* ESC Z */ 2720 case C1_SCI: /* ESC Z */
2714 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2721 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2715 break; /* steal obsolete ESC [ c */ 2722 break; /* steal obsolete ESC [ c */
2716 2723
2717 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2724 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2718 case C1_CSI: /* ESC [ */ 2725 case C1_CSI: /* ESC [ */
2719 process_csi_seq (); 2726 process_csi_seq ();
2720 break; 2727 break;
2721 2728
2722 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2729 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2723 case C1_OSC: /* ESC ] */ 2730 case C1_OSC: /* ESC ] */
2724 process_osc_seq (); 2731 process_osc_seq ();
2725 break; 2732 break;
2726 2733
2727 /* 8.3.106: RESET TO INITIAL STATE */ 2734 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2728 case 'c': 2735 case 'c':
2729 mbstate.reset (); 2736 mbstate.reset ();
2730 scr_poweron (); 2737 scr_poweron ();
2731 scrollbar_show (1); 2738 scrollBar.show (1);
2732 break; 2739 break;
2733 2740
2734 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2741 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2735 case 'n': 2742 case 'n':
2736 scr_charset_choose (2); 2743 scr_charset_choose (2);
2756 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2763 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2757 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2764 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2758 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2765 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2759}; 2766};
2760 2767
2761#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2768#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2762 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2769 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2763 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2770 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2764#define get_byte_array_bit(array, bit) \ 2771#define get_byte_array_bit(array, bit) \
2765 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2772 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2766 2773
2767const unsigned char csi_defaults[] = 2774static const unsigned char csi_defaults[] =
2768 { 2775 {
2769 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2776 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2770 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2777 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2771 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2778 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2772 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2779 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2787 2794
2788 nargs = 0; 2795 nargs = 0;
2789 2796
2790 priv = 0; 2797 priv = 0;
2791 ch = cmd_getc (); 2798 ch = cmd_getc ();
2792 if (ch >= '<' && ch <= '?') 2799 if ((ch >= '<' && ch <= '?') || ch == '!')
2793 { 2800 {
2794 /* '<' '=' '>' '?' */ 2801 /* '<' '=' '>' '?' '!' */
2795 priv = ch; 2802 priv = ch;
2796 ch = cmd_getc (); 2803 ch = cmd_getc ();
2797 } 2804 }
2798 2805
2799 /* read any numerical arguments */ 2806 /* read any numerical arguments */
2848 // versions. 2855 // versions.
2849 // 2856 //
2850 tt_printf ("\033[>%d;95;0c", 'U'); 2857 tt_printf ("\033[>%d;95;0c", 'U');
2851 } 2858 }
2852 break; 2859 break;
2860
2853 case '?': 2861 case '?':
2854 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2862 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2855 process_terminal_mode (ch, priv, nargs, arg); 2863 process_terminal_mode (ch, priv, nargs, arg);
2856 break; 2864 break;
2865
2866 case '!':
2867 if (ch == CSI_70)
2868 {
2869 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2870 scr_soft_reset ();
2871
2872 static const int pm_h[] = { 7, 25 };
2873 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2874
2875 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2876 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2857 } 2877 }
2878 break;
2879 }
2880
2858 return; 2881 return;
2859 } 2882 }
2860 2883
2861 switch (ch) 2884 switch (ch)
2862 { 2885 {
3229 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3252 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3230 */ 3253 */
3231void 3254void
3232rxvt_term::process_dcs_seq () 3255rxvt_term::process_dcs_seq ()
3233{ 3256{
3234 char *s;
3235 unicode_t eh;
3236
3237 /* 3257 /*
3238 * Not handled yet 3258 * Not handled yet
3239 */ 3259 */
3260
3261 unicode_t eh;
3240 s = get_to_st (eh); 3262 char *s = get_to_st (eh);
3241 if (s) 3263 if (s)
3242 free (s); 3264 free (s);
3243 3265
3244 return; 3266 return;
3245} 3267}
3249 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3271 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3250 */ 3272 */
3251void 3273void
3252rxvt_term::process_osc_seq () 3274rxvt_term::process_osc_seq ()
3253{ 3275{
3254 unicode_t ch, eh;
3255 int arg; 3276 int arg;
3256 3277
3257 ch = cmd_getc (); 3278 unicode_t ch = cmd_getc ();
3258 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3279 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3259 arg = arg * 10 + (ch - '0'); 3280 arg = arg * 10 + (ch - '0');
3260 3281
3261 if (ch == ';') 3282 if (ch == ';')
3262 { 3283 {
3284 unicode_t eh;
3263 char *s = get_to_st (eh); 3285 char *s = get_to_st (eh);
3264 3286
3265 if (s) 3287 if (s)
3266 { 3288 {
3267 process_xterm_seq (arg, s, eh); 3289 process_xterm_seq (arg, s, eh);
3291 3313
3292/* 3314/*
3293 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3315 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3294 */ 3316 */
3295void 3317void
3296rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3318rxvt_term::process_xterm_seq (int op, char *str, char resp)
3297{ 3319{
3298 int color; 3320 int color;
3299 char *buf, *name; 3321 char *buf, *name;
3300 bool query = str[0] == '?' && !str[1]; 3322 bool query = str[0] == '?' && !str[1];
3301 int saveop = op; 3323 int saveop = op;
3342 3364
3343 XFree (value); 3365 XFree (value);
3344 } 3366 }
3345 else 3367 else
3346 { 3368 {
3347 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3369 char *eq = strchr (str, '=');
3348 3370
3349 if (eq) 3371 if (eq)
3350 { 3372 {
3351 *eq = 0; 3373 *eq = 0;
3352 set_utf8_property (display->atom (str), eq + 1); 3374 set_utf8_property (display->atom (str), eq + 1);
3392 process_color_seq (op, Color_pointer_fg, str, resp); 3414 process_color_seq (op, Color_pointer_fg, str, resp);
3393 break; 3415 break;
3394 case XTerm_Color_pointer_bg: 3416 case XTerm_Color_pointer_bg:
3395 process_color_seq (op, Color_pointer_bg, str, resp); 3417 process_color_seq (op, Color_pointer_bg, str, resp);
3396 break; 3418 break;
3419#ifdef OPTION_HC
3420 case XTerm_Color_HC:
3421 process_color_seq (op, Color_HC, str, resp);
3422 break;
3423 case XTerm_Color_HTC:
3424 process_color_seq (op, Color_HTC, str, resp);
3425 break;
3426#endif
3397#ifndef NO_BOLD_UNDERLINE_REVERSE 3427#ifndef NO_BOLD_UNDERLINE_REVERSE
3398 case XTerm_Color_RV:
3399 process_color_seq (op, Color_RV, str, resp);
3400 break;
3401 case Rxvt_Color_BD:
3402 case URxvt_Color_BD: 3428 case URxvt_Color_BD:
3403 process_color_seq (op, Color_BD, str, resp); 3429 process_color_seq (op, Color_BD, str, resp);
3404 break; 3430 break;
3405 case Rxvt_Color_UL:
3406 case URxvt_Color_UL: 3431 case URxvt_Color_UL:
3407 process_color_seq (op, Color_UL, str, resp); 3432 process_color_seq (op, Color_UL, str, resp);
3408 break; 3433 break;
3409 case URxvt_Color_IT: 3434 case URxvt_Color_IT:
3410 process_color_seq (op, Color_IT, str, resp); 3435 process_color_seq (op, Color_IT, str, resp);
3411 break; 3436 break;
3412#endif 3437#endif
3438 case URxvt_Color_border:
3439 process_color_seq (op, Color_border, str, resp);
3440 break;
3413#if ENABLE_TRANSPARENCY 3441#if ENABLE_TRANSPARENCY
3414 case URxvt_Color_tint: 3442 case URxvt_Color_tint:
3415 process_color_seq (op, Color_tint, str, resp); 3443 process_color_seq (op, Color_tint, str, resp);
3416 { 3444 {
3417 bool changed = false; 3445 bool changed = false;
3418 3446
3419 if (ISSET_PIXCOLOR (Color_tint)) 3447 if (ISSET_PIXCOLOR (Color_tint))
3420 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3448 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3421 else
3422 changed = bgPixmap.unset_tint ();
3423 3449
3424 if (changed) 3450 if (changed)
3425 update_background (); 3451 update_background ();
3426 } 3452 }
3427 3453
3432 case Rxvt_Pixmap: 3458 case Rxvt_Pixmap:
3433 if (!strcmp (str, "?")) 3459 if (!strcmp (str, "?"))
3434 { 3460 {
3435 char str[256]; 3461 char str[256];
3436 3462
3437 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3463 sprintf (str, "[%dx%d+%d+%d]",
3438 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3464 min (h_scale, 32767), min (v_scale, 32767),
3439 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3465 min (h_align, 32767), min (v_align, 32767));
3440 process_xterm_seq (XTerm_title, str, CHAR_ST); 3466 process_xterm_seq (XTerm_title, str, CHAR_ST);
3441 } 3467 }
3442 else 3468 else
3443 { 3469 {
3444 int changed = 0; 3470 int changed = 0;
3445 3471
3446 if (*str != ';') 3472 if (*str != ';')
3447 { 3473 {
3448 /* reset to default scaling :*/
3449 bgPixmap.unset_geometry ();
3450 if (bgPixmap.set_file (str)) /* change pixmap */ 3474 if (bg_set_file (str)) /* change pixmap */
3475 {
3451 changed++; 3476 changed++;
3452 str = strchr (str, ';'); 3477 str = strchr (str, ';');
3453 if (str == NULL) 3478 if (str == NULL)
3454 bgPixmap.set_defaultGeometry (); 3479 bg_set_default_geometry ();
3480 else
3481 bg_set_geometry (str+1);
3482 }
3455 } 3483 }
3456 3484 else
3457 while (str)
3458 { 3485 {
3459 str++; 3486 str++;
3460 if (bgPixmap.set_geometry (str)) 3487 if (bg_set_geometry (str, true))
3461 changed++; 3488 changed++;
3462 str = strchr (str, ';');
3463 } 3489 }
3464 3490
3465 if (changed) 3491 if (changed)
3492 {
3493 if (bg_window_position_sensitive ())
3494 {
3495 int x, y;
3496 get_window_origin (x, y);
3497 bg_set_position (x, y);
3498 }
3466 update_background (); 3499 update_background ();
3500 }
3467 } 3501 }
3468 break; 3502 break;
3469#endif 3503#endif
3470 3504
3471 case XTerm_logfile: 3505 case XTerm_logfile:
3541 break; 3575 break;
3542#endif 3576#endif
3543 3577
3544#if ENABLE_PERL 3578#if ENABLE_PERL
3545 case URxvt_perl: 3579 case URxvt_perl:
3546 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3580 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3547 ; // no responses yet
3548 break; 3581 break;
3549#endif 3582#endif
3550 } 3583 }
3551} 3584}
3552/*----------------------------------------------------------------------*/ 3585/*----------------------------------------------------------------------*/
3575 { 3608 {
3576 if (mode == 'r') 3609 if (mode == 'r')
3577 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3610 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3578 else 3611 else
3579 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3612 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3580 PrivMode (state, bit); 3613
3614 set_privmode (bit, state);
3581 } 3615 }
3582 3616
3583 return state; 3617 return state;
3584} 3618}
3585 3619
3593 static const struct 3627 static const struct
3594 { 3628 {
3595 const int argval; 3629 const int argval;
3596 const unsigned long bit; 3630 const unsigned long bit;
3597 } argtopriv[] = { 3631 } argtopriv[] = {
3598 { 1, PrivMode_aplCUR }, 3632 { 1, PrivMode_aplCUR }, // DECCKM
3599 { 2, PrivMode_vt52 }, 3633 { 2, PrivMode_vt52 },
3600 { 3, PrivMode_132 }, 3634 { 3, PrivMode_132 }, // DECCOLM
3601 { 4, PrivMode_smoothScroll }, 3635 { 4, PrivMode_smoothScroll }, // DECSCLM
3602 { 5, PrivMode_rVideo }, 3636 { 5, PrivMode_rVideo }, // DECSCNM
3603 { 6, PrivMode_relOrigin }, 3637 { 6, PrivMode_relOrigin }, // DECOM
3604 { 7, PrivMode_Autowrap }, 3638 { 7, PrivMode_Autowrap }, // DECAWM
3605 // 8, bi-directional support mode 3639 // 8, auto-repeat keys // DECARM
3606 { 9, PrivMode_MouseX10 }, 3640 { 9, PrivMode_MouseX10 },
3607 // 18, 19 printing-related 3641 // 18 end FF to printer after print screen
3642 // 19 Print screen prints full screen/scroll region
3608 { 25, PrivMode_VisibleCursor }, 3643 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3609#ifdef scrollBar_esc 3644#ifdef scrollBar_esc
3610 { scrollBar_esc, PrivMode_scrollBar }, 3645 { scrollBar_esc, PrivMode_scrollBar },
3611#endif 3646#endif
3612 { 35, PrivMode_ShiftKeys }, // rxvt extension 3647 { 35, PrivMode_ShiftKeys }, // rxvt extension
3648 // 38, tektronix mode // DECTEK
3613 { 40, PrivMode_132OK }, 3649 { 40, PrivMode_132OK },
3614 // 41 xterm more fixes NYI 3650 // 41 xterm more fixes NYI
3615 // 45 margin bell NYI 3651 // 45 margin bell NYI
3616 // 46 start logging 3652 // 46 start logging
3617 { 47, PrivMode_Screen }, 3653 { 47, PrivMode_Screen },
3618 { 66, PrivMode_aplKP }, 3654 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3619#ifndef NO_BACKSPACE_KEY 3655#ifndef NO_BACKSPACE_KEY
3620 { 67, PrivMode_BackSpace }, 3656 { 67, PrivMode_BackSpace }, // DECBKM
3621#endif 3657#endif
3622 { 1000, PrivMode_MouseX11 }, 3658 { 1000, PrivMode_MouseX11 },
3623 { 1002, PrivMode_MouseBtnEvent }, 3659 { 1002, PrivMode_MouseBtnEvent },
3624 { 1003, PrivMode_MouseAnyEvent }, 3660 { 1003, PrivMode_MouseAnyEvent },
3661#if ENABLE_FRILLS
3662 { 1005, PrivMode_ExtModeMouse },
3663#endif
3625 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3664 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3626 { 1011, PrivMode_Keypress }, // rxvt extension 3665 { 1011, PrivMode_Keypress }, // rxvt extension
3666#if ENABLE_FRILLS
3667 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3668#endif
3627 // 1035 enable modifiers for alt, numlock NYI 3669 // 1035 enable modifiers for alt, numlock NYI
3628 // 1036 send ESC for meta keys NYI 3670 // 1036 send ESC for meta keys NYI
3629 // 1037 send DEL for keypad delete NYI 3671 // 1037 send DEL for keypad delete NYI
3630 { 1047, PrivMode_Screen }, 3672 { 1047, PrivMode_Screen },
3631 // 1048 save and restore cursor 3673 // 1048 save and restore cursor, implemented in code
3632 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3674 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3633 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3675 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3676 { 2004, PrivMode_BracketPaste },
3634 }; 3677 };
3635 3678
3636 if (nargs == 0) 3679 if (nargs == 0)
3637 return; 3680 return;
3638 3681
3645 for (i = 0; i < nargs; i++) 3688 for (i = 0; i < nargs; i++)
3646 { 3689 {
3647 state = -1; 3690 state = -1;
3648 3691
3649 /* basic handling */ 3692 /* basic handling */
3650 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3693 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3651 if (argtopriv[j].argval == arg[i]) 3694 if (argtopriv[j].argval == arg[i])
3652 { 3695 {
3653 state = privcases (mode, argtopriv[j].bit); 3696 state = privcases (mode, argtopriv[j].bit);
3654 break; 3697 break;
3655 } 3698 }
3663 3706
3664 scr_touch (true); 3707 scr_touch (true);
3665 break; 3708 break;
3666#endif 3709#endif
3667 case 1048: /* alternative cursor save */ 3710 case 1048: /* alternative cursor save */
3668 case 1049:
3669 if (option (Opt_secondaryScreen)) 3711 if (option (Opt_secondaryScreen))
3670 if (mode == 0) 3712 if (mode == 0)
3671 scr_cursor (RESTORE); 3713 scr_cursor (RESTORE);
3672 else if (mode == 1) 3714 else if (mode == 1)
3673 scr_cursor (SAVE); 3715 scr_cursor (SAVE);
3682 case 2: /* VT52 mode */ 3724 case 2: /* VT52 mode */
3683 /* oddball mode. should be set regardless of set/reset 3725 /* oddball mode. should be set regardless of set/reset
3684 * parameter. Return from VT52 mode with an ESC < from 3726 * parameter. Return from VT52 mode with an ESC < from
3685 * within VT52 mode 3727 * within VT52 mode
3686 */ 3728 */
3687 PrivMode (1, PrivMode_vt52); 3729 set_privmode (PrivMode_vt52, 1);
3688 break; 3730 break;
3689 case 3: /* 80/132 */ 3731 case 3: /* 80/132 */
3690 if (priv_modes & PrivMode_132OK) 3732 if (priv_modes & PrivMode_132OK)
3691 {
3692 scr_poweron ();
3693 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3733 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3694 }
3695 break; 3734 break;
3696 case 4: /* smooth scrolling */ 3735 case 4: /* smooth scrolling */
3697 set_option (Opt_jumpScroll, !state); 3736 set_option (Opt_jumpScroll, !state);
3698 break; 3737 break;
3699 case 5: /* reverse video */ 3738 case 5: /* reverse video */
3710 if (state) /* orthogonal */ 3749 if (state) /* orthogonal */
3711 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3750 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3712 break; 3751 break;
3713#ifdef scrollBar_esc 3752#ifdef scrollBar_esc
3714 case scrollBar_esc: 3753 case scrollBar_esc:
3715 if (scrollbar_mapping (state)) 3754 if (scrollBar.map (state))
3716 { 3755 {
3717 resize_all_windows (0, 0, 0); 3756 resize_all_windows (0, 0, 0);
3718 scr_touch (true); 3757 scr_touch (true);
3719 } 3758 }
3720 break; 3759 break;
3737 case 1003: 3776 case 1003:
3738 if (state) 3777 if (state)
3739 { 3778 {
3740 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3779 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3741 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3780 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3781 mouse_row = mouse_col = 0;
3742 vt_emask_mouse = PointerMotionMask; 3782 vt_emask_mouse = PointerMotionMask;
3743 } 3783 }
3744 else 3784 else
3745 vt_emask_mouse = NoEventMask; 3785 vt_emask_mouse = NoEventMask;
3786
3746 vt_select_input (); 3787 vt_select_input ();
3747 break; 3788 break;
3748 case 1010: /* scroll to bottom on TTY output inhibit */ 3789 case 1010: /* scroll to bottom on TTY output inhibit */
3749 set_option (Opt_scrollTtyOutput, !state); 3790 set_option (Opt_scrollTtyOutput, !state);
3750 break; 3791 break;
3751 case 1011: /* scroll to bottom on key press */ 3792 case 1011: /* scroll to bottom on key press */
3752 set_option (Opt_scrollTtyKeypress, state); 3793 set_option (Opt_scrollTtyKeypress, state);
3753 break; 3794 break;
3754 case 1047: /* secondary screen w/ clearing last */ 3795 case 1047: /* secondary screen w/ clearing last */
3755 if (option (Opt_secondaryScreen)) 3796 if (option (Opt_secondaryScreen))
3756 if (current_screen != PRIMARY) 3797 if (!state)
3757 scr_erase_screen (2); 3798 scr_erase_screen (2);
3799
3758 scr_change_screen (state); 3800 scr_change_screen (state);
3759 break; 3801 break;
3760 case 1049: /* secondary screen w/ clearing first */ 3802 case 1049: /* secondary screen w/ clearing first */
3803 if (option (Opt_secondaryScreen))
3804 if (state)
3805 scr_cursor (SAVE);
3806
3761 scr_change_screen (state); 3807 scr_change_screen (state);
3808
3762 if (option (Opt_secondaryScreen)) 3809 if (option (Opt_secondaryScreen))
3763 if (current_screen != PRIMARY) 3810 if (state)
3764 scr_erase_screen (2); 3811 scr_erase_screen (2);
3812 else
3813 scr_cursor (RESTORE);
3765 break; 3814 break;
3766 default: 3815 default:
3767 break; 3816 break;
3768 } 3817 }
3769 } 3818 }
3922 } 3971 }
3923 } 3972 }
3924} 3973}
3925/*}}} */ 3974/*}}} */
3926 3975
3927/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3928void
3929rxvt_term::process_graphics ()
3930{
3931 unicode_t ch, cmd = cmd_getc ();
3932
3933 if (cmd == 'Q')
3934 {
3935 /* query graphics */
3936 tt_printf ("\033G0\012"); /* no graphics */
3937 return;
3938 }
3939 /* swallow other graphics sequences until terminating ':' */
3940 do
3941 ch = cmd_getc ();
3942 while (ch != ':');
3943}
3944/*}}} */
3945
3946/* ------------------------------------------------------------------------- */ 3976/* ------------------------------------------------------------------------- */
3947 3977
3948/* 3978/*
3949 * Send printf () formatted output to the command. 3979 * Send printf () formatted output to the command.
3950 * Only use for small amounts of data. 3980 * Only use for small amounts of data.
3963 3993
3964/* ---------------------------------------------------------------------- */ 3994/* ---------------------------------------------------------------------- */
3965/* Write data to the pty as typed by the user, pasted with the mouse, 3995/* Write data to the pty as typed by the user, pasted with the mouse,
3966 * or generated by us in response to a query ESC sequence. 3996 * or generated by us in response to a query ESC sequence.
3967 */ 3997 */
3968const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3998static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3969 3999
3970void 4000void
3971rxvt_term::tt_write (const char *data, unsigned int len) 4001rxvt_term::tt_write (const char *data, unsigned int len)
3972{ 4002{
3973 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4003 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3978 4008
3979 if (v_buflen == 0) 4009 if (v_buflen == 0)
3980 { 4010 {
3981 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4011 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3982 4012
4013 max_it (written, 0);
4014
3983 if ((unsigned int)written == len) 4015 if (written == len)
3984 return; 4016 return;
3985 4017
3986 data += written; 4018 data += written;
3987 len -= written; 4019 len -= written;
3988 } 4020 }
3989 4021
3990 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4022 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3991 4023
3992 memcpy (v_buffer + v_buflen, data, len); 4024 memcpy (v_buffer + v_buflen, data, len);
3993 v_buflen += len; 4025 v_buflen += len;
3994 4026
3995 pty_ev.set (ev::READ | ev::WRITE); 4027 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines