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.402 by ayin, Fri Feb 1 14:13:52 2008 UTC vs.
Revision 1.478 by root, Thu Feb 24 12:42:41 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
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
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.state = STATE_IDLE; 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:
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 int upordown = 0; 1977 page_dirn direction = NO_DIR;
1953 1978
1954 if (scrollBar.upButton (ev.y)) 1979 if (scrollBar.upButton (ev.y))
1955 upordown = -1; /* up */ 1980 direction = UP; /* up */
1956 else if (scrollBar.dnButton (ev.y)) 1981 else if (scrollBar.dnButton (ev.y))
1957 upordown = 1; /* down */ 1982 direction = DN; /* down */
1958 1983
1959 scrollBar.state = STATE_IDLE; 1984 scrollBar.state = STATE_IDLE;
1960 /* 1985 /*
1961 * Rxvt-style scrollbar: 1986 * Rxvt-style scrollbar:
1962 * move up if mouse is above slider 1987 * move up if mouse is above slider
1973 /* 1998 /*
1974 * Mouse report disabled scrollbar: 1999 * Mouse report disabled scrollbar:
1975 * arrow buttons - send up/down 2000 * arrow buttons - send up/down
1976 * click on scrollbar - send pageup/down 2001 * click on scrollbar - send pageup/down
1977 */ 2002 */
1978 if (upordown < 0) 2003 if (direction == UP)
1979 tt_printf ("\033[A"); 2004 tt_printf ("\033[A");
1980 else if (upordown > 0) 2005 else if (direction == DN)
1981 tt_printf ("\033[B"); 2006 tt_printf ("\033[B");
1982 else 2007 else
1983 switch (ev.button) 2008 switch (ev.button)
1984 { 2009 {
1985 case Button2: 2010 case Button2:
1993 break; 2018 break;
1994 } 2019 }
1995 } 2020 }
1996 else 2021 else
1997#endif /* NO_SCROLLBAR_REPORT */ 2022#endif /* NO_SCROLLBAR_REPORT */
1998
1999 { 2023 {
2000 if (upordown) 2024 if (direction != NO_DIR)
2001 { 2025 {
2002#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2026#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2003 if (!cont_scroll_ev.is_active ()) 2027 if (!cont_scroll_ev.is_active ())
2004 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2028 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2005#endif 2029#endif
2006 if (scr_page (upordown < 0 ? UP : DN, 1)) 2030 if (scr_page (direction, 1))
2007 { 2031 {
2008 if (upordown < 0) 2032 if (direction == UP)
2009 scrollBar.state = STATE_UP; 2033 scrollBar.state = STATE_UP;
2010 else 2034 else
2011 scrollBar.state = STATE_DOWN; 2035 scrollBar.state = STATE_DOWN;
2012 } 2036 }
2013 } 2037 }
2029 } 2053 }
2030 2054
2031 if (scrollBar.style == R_SB_XTERM 2055 if (scrollBar.style == R_SB_XTERM
2032 || scrollbar_above_slider (ev.y) 2056 || scrollbar_above_slider (ev.y)
2033 || scrollbar_below_slider (ev.y)) 2057 || scrollbar_below_slider (ev.y))
2034 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2058 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2035 2059
2036 scrollBar.state = STATE_MOTION; 2060 scrollBar.state = STATE_MOTION;
2037 break; 2061 break;
2038 2062
2039 case Button1: 2063 case Button1:
2062 else 2086 else
2063 { 2087 {
2064 scr_page ((ev.button == Button1 ? DN : UP), 2088 scr_page ((ev.button == Button1 ? DN : UP),
2065 (nrow 2089 (nrow
2066 * scrollbar_position (ev.y) 2090 * scrollbar_position (ev.y)
2067 / scrollbar_size ())); 2091 / scrollBar.size ()));
2068 } 2092 }
2069 2093
2070 break; 2094 break;
2071 } 2095 }
2072 } 2096 }
2085 reportmode = !! (priv_modes & PrivMode_mouse_report); 2109 reportmode = !! (priv_modes & PrivMode_mouse_report);
2086 2110
2087 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2111 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2088 { 2112 {
2089 scrollBar.state = STATE_IDLE; 2113 scrollBar.state = STATE_IDLE;
2090 scrollbar_show (0); 2114 scrollBar.show (0);
2091 } 2115 }
2092 2116
2093#ifdef SELECTION_SCROLLING 2117#ifdef SELECTION_SCROLLING
2094 sel_scroll_ev.stop(); 2118 sel_scroll_ev.stop();
2095#endif 2119#endif
2145 selection_make (ev.time); 2169 selection_make (ev.time);
2146 break; 2170 break;
2147 2171
2148 case Button2: 2172 case Button2:
2149 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?
2150 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2174 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2151 break; 2175 break;
2152 2176
2153#ifdef MOUSE_WHEEL 2177#ifdef MOUSE_WHEEL
2154 case Button4: 2178 case Button4:
2155 case Button5: 2179 case Button5:
2178 } 2202 }
2179 else 2203 else
2180# endif 2204# endif
2181 { 2205 {
2182 scr_page (v, i); 2206 scr_page (v, i);
2183 scrollbar_show (1); 2207 scrollBar.show (1);
2184 } 2208 }
2185 } 2209 }
2186 break; 2210 break;
2187#endif 2211#endif
2188 } 2212 }
2189 } 2213 }
2190} 2214}
2191 2215
2192/*}}} */ 2216/*}}} */
2193 2217
2194bool 2218void
2195rxvt_term::cmd_parse () 2219rxvt_term::cmd_parse ()
2196{ 2220{
2197 bool flag = false;
2198 wchar_t ch = NOCHAR; 2221 wchar_t ch = NOCHAR;
2199 char *seq_begin; // remember start of esc-sequence here 2222 char *seq_begin; // remember start of esc-sequence here
2200 2223
2201 for (;;) 2224 for (;;)
2202 { 2225 {
2203 if (ch == NOCHAR) 2226 if (expect_false (ch == NOCHAR))
2204 { 2227 {
2205 seq_begin = cmdbuf_ptr; 2228 seq_begin = cmdbuf_ptr;
2206 ch = next_char (); 2229 ch = next_char ();
2207 2230
2208 if (ch == NOCHAR) 2231 if (ch == NOCHAR)
2209 break; 2232 break;
2210 } 2233 }
2211 2234
2212 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))
2213 { 2236 {
2214 if (!seen_input) 2237 if (expect_false (!seen_input))
2215 { 2238 {
2216 seen_input = 1; 2239 seen_input = 1;
2217 // many badly-written programs (e.g. jed) contain a race condition: 2240 // many badly-written programs (e.g. jed) contain a race condition:
2218 // they first read the screensize and then install a SIGWINCH handler. 2241 // they first read the screensize and then install a SIGWINCH handler.
2219 // some window managers resize the window early, and these programs 2242 // some window managers resize the window early, and these programs
2232 wchar_t *str = buf; 2255 wchar_t *str = buf;
2233 wchar_t *eol = str + min (ncol, UBUFSIZ); 2256 wchar_t *eol = str + min (ncol, UBUFSIZ);
2234 2257
2235 for (;;) 2258 for (;;)
2236 { 2259 {
2237 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)))
2238 break; 2261 break;
2239 2262
2240 *str++ = ch; 2263 *str++ = ch;
2241 2264
2242 if (ch == C0_LF || str >= eol) 2265 if (expect_false (ch == C0_LF || str >= eol))
2243 { 2266 {
2244 if (ch == C0_LF) 2267 if (ch == C0_LF)
2245 nlines++; 2268 nlines++;
2246 2269
2247 refresh_count++; 2270 refresh_count++;
2296 * 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.
2297 * if skipScroll is enabled. 2320 * if skipScroll is enabled.
2298 */ 2321 */
2299 if (refreshnow) 2322 if (refreshnow)
2300 { 2323 {
2301 flag = true;
2302 scr_refresh (); 2324 scr_refresh ();
2303 want_refresh = 1; 2325 want_refresh = 1;
2304 } 2326 }
2305
2306 } 2327 }
2307 else 2328 else
2308 { 2329 {
2309 try 2330 try
2310 { 2331 {
2318 } 2339 }
2319 2340
2320 ch = NOCHAR; 2341 ch = NOCHAR;
2321 } 2342 }
2322 } 2343 }
2323
2324 return flag;
2325} 2344}
2326 2345
2327// read the next character 2346// read the next character
2328wchar_t 2347wchar_t
2329rxvt_term::next_char () NOTHROW 2348rxvt_term::next_char () NOTHROW
2330{ 2349{
2331 while (cmdbuf_ptr < cmdbuf_endp) 2350 while (cmdbuf_ptr < cmdbuf_endp)
2332 { 2351 {
2333 // assume 7-bit to be ascii ALWAYS 2352 // assume 7-bit to be ascii ALWAYS
2334 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2353 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2335 return *cmdbuf_ptr++; 2354 return *cmdbuf_ptr++;
2336 2355
2337 wchar_t wc; 2356 wchar_t wc;
2338 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);
2339 2358
2343 cmdbuf_ptr = cmdbuf_endp; 2362 cmdbuf_ptr = cmdbuf_endp;
2344 break; 2363 break;
2345 } 2364 }
2346 2365
2347 if (len == (size_t)-1) 2366 if (len == (size_t)-1)
2367 {
2368 mbstate.reset (); // reset now undefined conversion state
2348 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 }
2349 2371
2350 // assume wchar == unicode 2372 // assume wchar == unicode
2351 cmdbuf_ptr += len; 2373 cmdbuf_ptr += len;
2352 return wc & UNICODE_MASK; 2374 return wc & UNICODE_MASK;
2353 } 2375 }
2397/*----------------------------------------------------------------------*/ 2419/*----------------------------------------------------------------------*/
2398#ifdef PRINTPIPE 2420#ifdef PRINTPIPE
2399FILE * 2421FILE *
2400rxvt_term::popen_printer () 2422rxvt_term::popen_printer ()
2401{ 2423{
2402 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2424 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2403 2425
2404 if (stream == NULL) 2426 if (stream == NULL)
2405 rxvt_warn ("can't open printer pipe, not printing.\n"); 2427 rxvt_warn ("can't open printer pipe, not printing.\n");
2406 2428
2407 return stream; 2429 return stream;
2418 * simulate attached vt100 printer 2440 * simulate attached vt100 printer
2419 */ 2441 */
2420void 2442void
2421rxvt_term::process_print_pipe () 2443rxvt_term::process_print_pipe ()
2422{ 2444{
2423 int done; 2445 FILE *fd = popen_printer ();
2424 FILE *fd;
2425 2446
2426 if ((fd = popen_printer ()) == NULL) 2447 if (!fd)
2427 return; 2448 return;
2428 2449
2429 /* 2450 /*
2430 * 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
2431 * is received. 2452 * is received.
2432 */ 2453 */
2433 for (done = 0; !done;) 2454 for (int done = 0; !done; )
2434 { 2455 {
2435 unsigned char buf[8]; 2456 unsigned char buf[8];
2436 unicode_t ch; 2457 unicode_t ch;
2437 unsigned int i, len; 2458 unsigned int i, len;
2438 2459
2583 break; 2604 break;
2584 case 'Z': /* identify the terminal type */ 2605 case 'Z': /* identify the terminal type */
2585 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2606 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2586 break; 2607 break;
2587 case '<': /* turn off VT52 mode */ 2608 case '<': /* turn off VT52 mode */
2588 PrivMode (0, PrivMode_vt52); 2609 set_privmode (PrivMode_vt52, 0);
2589 break; 2610 break;
2590 case 'F': /* use special graphics character set */ 2611 case 'F': /* use special graphics character set */
2591 case 'G': /* use regular character set */ 2612 case 'G': /* use regular character set */
2592 /* unimplemented */ 2613 /* unimplemented */
2593 break; 2614 break;
2647 scr_forwardindex (); 2668 scr_forwardindex ();
2648 break; 2669 break;
2649#endif 2670#endif
2650 case '=': 2671 case '=':
2651 case '>': 2672 case '>':
2652 PrivMode ((ch == '='), PrivMode_aplKP); 2673 set_privmode (PrivMode_aplKP, ch == '=');
2653 break; 2674 break;
2654 2675
2655 case C1_40: 2676 case C1_40:
2656 cmd_getc (); 2677 cmd_getc ();
2657 break; 2678 break;
2661 2682
2662 /* 8.3.87: NEXT LINE */ 2683 /* 8.3.87: NEXT LINE */
2663 case C1_NEL: /* ESC E */ 2684 case C1_NEL: /* ESC E */
2664 { 2685 {
2665 wchar_t nlcr[] = { C0_LF, C0_CR }; 2686 wchar_t nlcr[] = { C0_LF, C0_CR };
2666 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2687 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2667 } 2688 }
2668 break; 2689 break;
2669 2690
2670 /* kidnapped escape sequence: Should be 8.3.48 */ 2691 /* kidnapped escape sequence: Should be 8.3.48 */
2671 case C1_ESA: /* ESC G */ 2692 case C1_ESA: /* ESC G */
2696 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2717 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2697 case C1_SCI: /* ESC Z */ 2718 case C1_SCI: /* ESC Z */
2698 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2719 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2699 break; /* steal obsolete ESC [ c */ 2720 break; /* steal obsolete ESC [ c */
2700 2721
2701 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2722 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2702 case C1_CSI: /* ESC [ */ 2723 case C1_CSI: /* ESC [ */
2703 process_csi_seq (); 2724 process_csi_seq ();
2704 break; 2725 break;
2705 2726
2706 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2727 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2707 case C1_OSC: /* ESC ] */ 2728 case C1_OSC: /* ESC ] */
2708 process_osc_seq (); 2729 process_osc_seq ();
2709 break; 2730 break;
2710 2731
2711 /* 8.3.106: RESET TO INITIAL STATE */ 2732 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2712 case 'c': 2733 case 'c':
2713 mbstate.reset (); 2734 mbstate.reset ();
2714 scr_poweron (); 2735 scr_poweron ();
2715 scrollbar_show (1); 2736 scrollBar.show (1);
2716 break; 2737 break;
2717 2738
2718 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2739 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2719 case 'n': 2740 case 'n':
2720 scr_charset_choose (2); 2741 scr_charset_choose (2);
2740 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2761 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2741 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2762 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2742 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2763 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2743}; 2764};
2744 2765
2745#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2766#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2746 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2767 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2747 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2768 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2748#define get_byte_array_bit(array, bit) \ 2769#define get_byte_array_bit(array, bit) \
2749 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2770 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2750 2771
2751const unsigned char csi_defaults[] = 2772static const unsigned char csi_defaults[] =
2752 { 2773 {
2753 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2774 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2754 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2775 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2755 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2776 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2756 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2777 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2771 2792
2772 nargs = 0; 2793 nargs = 0;
2773 2794
2774 priv = 0; 2795 priv = 0;
2775 ch = cmd_getc (); 2796 ch = cmd_getc ();
2776 if (ch >= '<' && ch <= '?') 2797 if ((ch >= '<' && ch <= '?') || ch == '!')
2777 { 2798 {
2778 /* '<' '=' '>' '?' */ 2799 /* '<' '=' '>' '?' '!' */
2779 priv = ch; 2800 priv = ch;
2780 ch = cmd_getc (); 2801 ch = cmd_getc ();
2781 } 2802 }
2782 2803
2783 /* read any numerical arguments */ 2804 /* read any numerical arguments */
2837 2858
2838 case '?': 2859 case '?':
2839 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2860 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2840 process_terminal_mode (ch, priv, nargs, arg); 2861 process_terminal_mode (ch, priv, nargs, arg);
2841 break; 2862 break;
2863
2864 case '!':
2865 if (ch == CSI_70)
2866 {
2867 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2868 scr_soft_reset ();
2869
2870 static const int pm_h[] = { 7, 25 };
2871 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2872
2873 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2874 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2842 } 2875 }
2876 break;
2877 }
2878
2843 return; 2879 return;
2844 } 2880 }
2845 2881
2846 switch (ch) 2882 switch (ch)
2847 { 2883 {
3214 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3250 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3215 */ 3251 */
3216void 3252void
3217rxvt_term::process_dcs_seq () 3253rxvt_term::process_dcs_seq ()
3218{ 3254{
3219 char *s;
3220 unicode_t eh;
3221
3222 /* 3255 /*
3223 * Not handled yet 3256 * Not handled yet
3224 */ 3257 */
3258
3259 unicode_t eh;
3225 s = get_to_st (eh); 3260 char *s = get_to_st (eh);
3226 if (s) 3261 if (s)
3227 free (s); 3262 free (s);
3228 3263
3229 return; 3264 return;
3230} 3265}
3234 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3269 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3235 */ 3270 */
3236void 3271void
3237rxvt_term::process_osc_seq () 3272rxvt_term::process_osc_seq ()
3238{ 3273{
3239 unicode_t ch, eh;
3240 int arg; 3274 int arg;
3241 3275
3242 ch = cmd_getc (); 3276 unicode_t ch = cmd_getc ();
3243 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3277 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3244 arg = arg * 10 + (ch - '0'); 3278 arg = arg * 10 + (ch - '0');
3245 3279
3246 if (ch == ';') 3280 if (ch == ';')
3247 { 3281 {
3282 unicode_t eh;
3248 char *s = get_to_st (eh); 3283 char *s = get_to_st (eh);
3249 3284
3250 if (s) 3285 if (s)
3251 { 3286 {
3252 process_xterm_seq (arg, s, eh); 3287 process_xterm_seq (arg, s, eh);
3276 3311
3277/* 3312/*
3278 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3313 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3279 */ 3314 */
3280void 3315void
3281rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3316rxvt_term::process_xterm_seq (int op, char *str, char resp)
3282{ 3317{
3283 int color; 3318 int color;
3284 char *buf, *name; 3319 char *buf, *name;
3285 bool query = str[0] == '?' && !str[1]; 3320 bool query = str[0] == '?' && !str[1];
3286 int saveop = op; 3321 int saveop = op;
3327 3362
3328 XFree (value); 3363 XFree (value);
3329 } 3364 }
3330 else 3365 else
3331 { 3366 {
3332 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3367 char *eq = strchr (str, '=');
3333 3368
3334 if (eq) 3369 if (eq)
3335 { 3370 {
3336 *eq = 0; 3371 *eq = 0;
3337 set_utf8_property (display->atom (str), eq + 1); 3372 set_utf8_property (display->atom (str), eq + 1);
3377 process_color_seq (op, Color_pointer_fg, str, resp); 3412 process_color_seq (op, Color_pointer_fg, str, resp);
3378 break; 3413 break;
3379 case XTerm_Color_pointer_bg: 3414 case XTerm_Color_pointer_bg:
3380 process_color_seq (op, Color_pointer_bg, str, resp); 3415 process_color_seq (op, Color_pointer_bg, str, resp);
3381 break; 3416 break;
3417#ifdef OPTION_HC
3418 case XTerm_Color_HC:
3419 process_color_seq (op, Color_HC, str, resp);
3420 break;
3421 case XTerm_Color_HTC:
3422 process_color_seq (op, Color_HTC, str, resp);
3423 break;
3424#endif
3382#ifndef NO_BOLD_UNDERLINE_REVERSE 3425#ifndef NO_BOLD_UNDERLINE_REVERSE
3383 case XTerm_Color_RV:
3384 process_color_seq (op, Color_RV, str, resp);
3385 break;
3386 case Rxvt_Color_BD:
3387 case URxvt_Color_BD: 3426 case URxvt_Color_BD:
3388 process_color_seq (op, Color_BD, str, resp); 3427 process_color_seq (op, Color_BD, str, resp);
3389 break; 3428 break;
3390 case Rxvt_Color_UL:
3391 case URxvt_Color_UL: 3429 case URxvt_Color_UL:
3392 process_color_seq (op, Color_UL, str, resp); 3430 process_color_seq (op, Color_UL, str, resp);
3393 break; 3431 break;
3394 case URxvt_Color_IT: 3432 case URxvt_Color_IT:
3395 process_color_seq (op, Color_IT, str, resp); 3433 process_color_seq (op, Color_IT, str, resp);
3396 break; 3434 break;
3397#endif 3435#endif
3436 case URxvt_Color_border:
3437 process_color_seq (op, Color_border, str, resp);
3438 break;
3398#if ENABLE_TRANSPARENCY 3439#if ENABLE_TRANSPARENCY
3399 case URxvt_Color_tint: 3440 case URxvt_Color_tint:
3400 process_color_seq (op, Color_tint, str, resp); 3441 process_color_seq (op, Color_tint, str, resp);
3401 { 3442 {
3402 bool changed = false; 3443 bool changed = false;
3403 3444
3404 if (ISSET_PIXCOLOR (Color_tint)) 3445 if (ISSET_PIXCOLOR (Color_tint))
3405 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3446 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3406 else
3407 changed = bgPixmap.unset_tint ();
3408 3447
3409 if (changed) 3448 if (changed)
3410 update_background (); 3449 update_background ();
3411 } 3450 }
3412 3451
3417 case Rxvt_Pixmap: 3456 case Rxvt_Pixmap:
3418 if (!strcmp (str, "?")) 3457 if (!strcmp (str, "?"))
3419 { 3458 {
3420 char str[256]; 3459 char str[256];
3421 3460
3422 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3461 sprintf (str, "[%dx%d+%d+%d]",
3423 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3462 min (h_scale, 32767), min (v_scale, 32767),
3424 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3463 min (h_align, 32767), min (v_align, 32767));
3425 process_xterm_seq (XTerm_title, str, CHAR_ST); 3464 process_xterm_seq (XTerm_title, str, CHAR_ST);
3426 } 3465 }
3427 else 3466 else
3428 { 3467 {
3429 int changed = 0; 3468 int changed = 0;
3430 3469
3431 if (*str != ';') 3470 if (*str != ';')
3432 { 3471 {
3433 /* reset to default scaling :*/
3434 bgPixmap.unset_geometry ();
3435 if (bgPixmap.set_file (str)) /* change pixmap */ 3472 if (bg_set_file (str)) /* change pixmap */
3473 {
3436 changed++; 3474 changed++;
3437 str = strchr (str, ';'); 3475 str = strchr (str, ';');
3438 if (str == NULL) 3476 if (str == NULL)
3439 bgPixmap.set_defaultGeometry (); 3477 bg_set_default_geometry ();
3478 else
3479 bg_set_geometry (str+1);
3480 }
3440 } 3481 }
3441 3482 else
3442 while (str)
3443 { 3483 {
3444 str++; 3484 str++;
3445 if (bgPixmap.set_geometry (str)) 3485 if (bg_set_geometry (str, true))
3446 changed++; 3486 changed++;
3447 str = strchr (str, ';');
3448 } 3487 }
3449 3488
3450 if (changed) 3489 if (changed)
3490 {
3491 if (bg_window_position_sensitive ())
3492 {
3493 int x, y;
3494 get_window_origin (x, y);
3495 bg_set_position (x, y);
3496 }
3451 update_background (); 3497 update_background ();
3498 }
3452 } 3499 }
3453 break; 3500 break;
3454#endif 3501#endif
3455 3502
3456 case XTerm_logfile: 3503 case XTerm_logfile:
3526 break; 3573 break;
3527#endif 3574#endif
3528 3575
3529#if ENABLE_PERL 3576#if ENABLE_PERL
3530 case URxvt_perl: 3577 case URxvt_perl:
3531 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3578 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3532 ; // no responses yet
3533 break; 3579 break;
3534#endif 3580#endif
3535 } 3581 }
3536} 3582}
3537/*----------------------------------------------------------------------*/ 3583/*----------------------------------------------------------------------*/
3560 { 3606 {
3561 if (mode == 'r') 3607 if (mode == 'r')
3562 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3608 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3563 else 3609 else
3564 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3610 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3565 PrivMode (state, bit); 3611
3612 set_privmode (bit, state);
3566 } 3613 }
3567 3614
3568 return state; 3615 return state;
3569} 3616}
3570 3617
3578 static const struct 3625 static const struct
3579 { 3626 {
3580 const int argval; 3627 const int argval;
3581 const unsigned long bit; 3628 const unsigned long bit;
3582 } argtopriv[] = { 3629 } argtopriv[] = {
3583 { 1, PrivMode_aplCUR }, 3630 { 1, PrivMode_aplCUR }, // DECCKM
3584 { 2, PrivMode_vt52 }, 3631 { 2, PrivMode_vt52 },
3585 { 3, PrivMode_132 }, 3632 { 3, PrivMode_132 }, // DECCOLM
3586 { 4, PrivMode_smoothScroll }, 3633 { 4, PrivMode_smoothScroll }, // DECSCLM
3587 { 5, PrivMode_rVideo }, 3634 { 5, PrivMode_rVideo }, // DECSCNM
3588 { 6, PrivMode_relOrigin }, 3635 { 6, PrivMode_relOrigin }, // DECOM
3589 { 7, PrivMode_Autowrap }, 3636 { 7, PrivMode_Autowrap }, // DECAWM
3590 // 8, bi-directional support mode 3637 // 8, auto-repeat keys // DECARM
3591 { 9, PrivMode_MouseX10 }, 3638 { 9, PrivMode_MouseX10 },
3592 // 18, 19 printing-related 3639 // 18 end FF to printer after print screen
3640 // 19 Print screen prints full screen/scroll region
3593 { 25, PrivMode_VisibleCursor }, 3641 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3594#ifdef scrollBar_esc 3642#ifdef scrollBar_esc
3595 { scrollBar_esc, PrivMode_scrollBar }, 3643 { scrollBar_esc, PrivMode_scrollBar },
3596#endif 3644#endif
3597 { 35, PrivMode_ShiftKeys }, // rxvt extension 3645 { 35, PrivMode_ShiftKeys }, // rxvt extension
3646 // 38, tektronix mode // DECTEK
3598 { 40, PrivMode_132OK }, 3647 { 40, PrivMode_132OK },
3599 // 41 xterm more fixes NYI 3648 // 41 xterm more fixes NYI
3600 // 45 margin bell NYI 3649 // 45 margin bell NYI
3601 // 46 start logging 3650 // 46 start logging
3602 { 47, PrivMode_Screen }, 3651 { 47, PrivMode_Screen },
3603 { 66, PrivMode_aplKP }, 3652 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3604#ifndef NO_BACKSPACE_KEY 3653#ifndef NO_BACKSPACE_KEY
3605 { 67, PrivMode_BackSpace }, 3654 { 67, PrivMode_BackSpace }, // DECBKM
3606#endif 3655#endif
3607 { 1000, PrivMode_MouseX11 }, 3656 { 1000, PrivMode_MouseX11 },
3608 { 1002, PrivMode_MouseBtnEvent }, 3657 { 1002, PrivMode_MouseBtnEvent },
3609 { 1003, PrivMode_MouseAnyEvent }, 3658 { 1003, PrivMode_MouseAnyEvent },
3659#if ENABLE_FRILLS
3660 { 1005, PrivMode_ExtModeMouse },
3661#endif
3610 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3662 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3611 { 1011, PrivMode_Keypress }, // rxvt extension 3663 { 1011, PrivMode_Keypress }, // rxvt extension
3664#if ENABLE_FRILLS
3665 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3666#endif
3612 // 1035 enable modifiers for alt, numlock NYI 3667 // 1035 enable modifiers for alt, numlock NYI
3613 // 1036 send ESC for meta keys NYI 3668 // 1036 send ESC for meta keys NYI
3614 // 1037 send DEL for keypad delete NYI 3669 // 1037 send DEL for keypad delete NYI
3615 { 1047, PrivMode_Screen }, 3670 { 1047, PrivMode_Screen },
3616 // 1048 save and restore cursor 3671 // 1048 save and restore cursor, implemented in code
3617 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3672 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3618 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3673 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3619 { 2004, PrivMode_BracketPaste }, 3674 { 2004, PrivMode_BracketPaste },
3620 }; 3675 };
3621 3676
3631 for (i = 0; i < nargs; i++) 3686 for (i = 0; i < nargs; i++)
3632 { 3687 {
3633 state = -1; 3688 state = -1;
3634 3689
3635 /* basic handling */ 3690 /* basic handling */
3636 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3691 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3637 if (argtopriv[j].argval == arg[i]) 3692 if (argtopriv[j].argval == arg[i])
3638 { 3693 {
3639 state = privcases (mode, argtopriv[j].bit); 3694 state = privcases (mode, argtopriv[j].bit);
3640 break; 3695 break;
3641 } 3696 }
3649 3704
3650 scr_touch (true); 3705 scr_touch (true);
3651 break; 3706 break;
3652#endif 3707#endif
3653 case 1048: /* alternative cursor save */ 3708 case 1048: /* alternative cursor save */
3654 case 1049:
3655 if (option (Opt_secondaryScreen)) 3709 if (option (Opt_secondaryScreen))
3656 if (mode == 0) 3710 if (mode == 0)
3657 scr_cursor (RESTORE); 3711 scr_cursor (RESTORE);
3658 else if (mode == 1) 3712 else if (mode == 1)
3659 scr_cursor (SAVE); 3713 scr_cursor (SAVE);
3668 case 2: /* VT52 mode */ 3722 case 2: /* VT52 mode */
3669 /* oddball mode. should be set regardless of set/reset 3723 /* oddball mode. should be set regardless of set/reset
3670 * parameter. Return from VT52 mode with an ESC < from 3724 * parameter. Return from VT52 mode with an ESC < from
3671 * within VT52 mode 3725 * within VT52 mode
3672 */ 3726 */
3673 PrivMode (1, PrivMode_vt52); 3727 set_privmode (PrivMode_vt52, 1);
3674 break; 3728 break;
3675 case 3: /* 80/132 */ 3729 case 3: /* 80/132 */
3676 if (priv_modes & PrivMode_132OK) 3730 if (priv_modes & PrivMode_132OK)
3677 {
3678 scr_poweron ();
3679 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3731 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3680 }
3681 break; 3732 break;
3682 case 4: /* smooth scrolling */ 3733 case 4: /* smooth scrolling */
3683 set_option (Opt_jumpScroll, !state); 3734 set_option (Opt_jumpScroll, !state);
3684 break; 3735 break;
3685 case 5: /* reverse video */ 3736 case 5: /* reverse video */
3696 if (state) /* orthogonal */ 3747 if (state) /* orthogonal */
3697 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3748 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3698 break; 3749 break;
3699#ifdef scrollBar_esc 3750#ifdef scrollBar_esc
3700 case scrollBar_esc: 3751 case scrollBar_esc:
3701 if (scrollbar_mapping (state)) 3752 if (scrollBar.map (state))
3702 { 3753 {
3703 resize_all_windows (0, 0, 0); 3754 resize_all_windows (0, 0, 0);
3704 scr_touch (true); 3755 scr_touch (true);
3705 } 3756 }
3706 break; 3757 break;
3723 case 1003: 3774 case 1003:
3724 if (state) 3775 if (state)
3725 { 3776 {
3726 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3777 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3727 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3778 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3779 mouse_row = mouse_col = 0;
3728 vt_emask_mouse = PointerMotionMask; 3780 vt_emask_mouse = PointerMotionMask;
3729 } 3781 }
3730 else 3782 else
3731 vt_emask_mouse = NoEventMask; 3783 vt_emask_mouse = NoEventMask;
3784
3732 vt_select_input (); 3785 vt_select_input ();
3733 break; 3786 break;
3734 case 1010: /* scroll to bottom on TTY output inhibit */ 3787 case 1010: /* scroll to bottom on TTY output inhibit */
3735 set_option (Opt_scrollTtyOutput, !state); 3788 set_option (Opt_scrollTtyOutput, !state);
3736 break; 3789 break;
3737 case 1011: /* scroll to bottom on key press */ 3790 case 1011: /* scroll to bottom on key press */
3738 set_option (Opt_scrollTtyKeypress, state); 3791 set_option (Opt_scrollTtyKeypress, state);
3739 break; 3792 break;
3740 case 1047: /* secondary screen w/ clearing last */ 3793 case 1047: /* secondary screen w/ clearing last */
3741 if (option (Opt_secondaryScreen)) 3794 if (option (Opt_secondaryScreen))
3742 if (current_screen != PRIMARY) 3795 if (!state)
3743 scr_erase_screen (2); 3796 scr_erase_screen (2);
3797
3744 scr_change_screen (state); 3798 scr_change_screen (state);
3745 break; 3799 break;
3746 case 1049: /* secondary screen w/ clearing first */ 3800 case 1049: /* secondary screen w/ clearing first */
3801 if (option (Opt_secondaryScreen))
3802 if (state)
3803 scr_cursor (SAVE);
3804
3747 scr_change_screen (state); 3805 scr_change_screen (state);
3806
3748 if (option (Opt_secondaryScreen)) 3807 if (option (Opt_secondaryScreen))
3749 if (current_screen != PRIMARY) 3808 if (state)
3750 scr_erase_screen (2); 3809 scr_erase_screen (2);
3810 else
3811 scr_cursor (RESTORE);
3751 break; 3812 break;
3752 default: 3813 default:
3753 break; 3814 break;
3754 } 3815 }
3755 } 3816 }
3949 4010
3950/* ---------------------------------------------------------------------- */ 4011/* ---------------------------------------------------------------------- */
3951/* Write data to the pty as typed by the user, pasted with the mouse, 4012/* Write data to the pty as typed by the user, pasted with the mouse,
3952 * or generated by us in response to a query ESC sequence. 4013 * or generated by us in response to a query ESC sequence.
3953 */ 4014 */
3954const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4015static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3955 4016
3956void 4017void
3957rxvt_term::tt_write (const char *data, unsigned int len) 4018rxvt_term::tt_write (const char *data, unsigned int len)
3958{ 4019{
3959 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4020 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3971 4032
3972 data += written; 4033 data += written;
3973 len -= written; 4034 len -= written;
3974 } 4035 }
3975 4036
3976 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4037 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3977 4038
3978 memcpy (v_buffer + v_buflen, data, len); 4039 memcpy (v_buffer + v_buflen, data, len);
3979 v_buflen += len; 4040 v_buflen += len;
3980 4041
3981 pty_ev.set (ev::READ | ev::WRITE); 4042 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines