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.407 by ayin, Fri Feb 15 10:56:29 2008 UTC vs.
Revision 1.476 by sf-exg, Fri Feb 11 01:24:46 2011 UTC

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
282} 288}
283 289
284static int 290static int
285hex_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
297 } 303 }
298 304
299 return -1; 305 return -1;
300} 306}
301#endif 307#endif
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}
302 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;
320 * Always permit `shift' to override the current setting 421 * Always permit `shift' to override the current setting
321 */ 422 */
322 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
323 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
324 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
325
326 if (numlock_state || (ev.state & ModNumLockMask))
327 {
328 numlock_state = (ev.state & ModNumLockMask);
329 PrivMode ((!numlock_state), PrivMode_aplKP);
330 }
331 426
332 kbuf[0] = 0; 427 kbuf[0] = 0;
333 428
334#ifdef USE_XIM 429#ifdef USE_XIM
335 if (Input_Context) 430 if (Input_Context)
410#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
411 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
412#else 507#else
413 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
414#endif 509#endif
510 max_it (lnsppg, 1);
511
415 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
416 { 513 {
417 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
418 return; 515 return;
419 } 516 }
484 } 581 }
485 } 582 }
486 583
487#if ENABLE_FRILLS || ISO_14755 584#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 585 // ISO 14755 support
489 if (shft && ctrl) 586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 587 {
491 int hv; 588 int hv;
492 589
493 if (iso14755buf & ISO_14755_51 590 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 591 && (keysym == XK_space || keysym == XK_KP_Space
524 scr_overlay_off (); 621 scr_overlay_off ();
525# endif 622# endif
526 iso14755buf = 0; 623 iso14755buf = 0;
527 } 624 }
528 } 625 }
626 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 627 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 628 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 629 if (!(iso14755buf & ISO_14755_STARTED))
532 { 630 {
533 iso14755buf |= ISO_14755_STARTED; 631 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 632# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 633 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
546 } 644 }
547#endif 645#endif
548 646
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 648 {
551 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
552 unsigned int newlen = 1; 650 unsigned int newlen = 1;
553#ifdef XK_KP_Home 651
554 static const KeySym keypadtrans[] = { 652 if (ev.state & ModNumLockMask)
555 XK_KP_7, // XK_KP_Home 653 kp = false;
556 XK_KP_4, // XK_KP_Left 654
557 XK_KP_8, // XK_KP_Up 655 keysym = translate_keypad (keysym, kp);
558 XK_KP_6, // XK_KP_Right 656
559 XK_KP_2, // XK_KP_Down 657 switch (keysym)
560#ifndef UNSHIFTED_SCROLLKEYS 658 {
561 XK_KP_9, // XK_KP_Prior 659#ifndef NO_BACKSPACE_KEY
562 XK_KP_3, // XK_KP_Next 660 case XK_BackSpace:
563#else 661 if (priv_modes & PrivMode_HaveBackSpace)
564 XK_Prior, 662 {
565 XK_Next, 663 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
566#endif 664 ^ !!ctrl) ? '\b' : '\177';
567 XK_KP_1, // XK_KP_End 665 kbuf[1] = '\0';
568 XK_KP_5, // XK_KP_Begin
569 }; 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;
570 692
571 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:
572 { 773 {
573 unsigned int index = keysym - XK_KP_Home; 774 int param = map_function_key (keysym);
574 keysym = kp ? keypadtrans[index] : XK_Home + index; 775 if (param > 0)
776 sprintf (kbuf,"\033[%d~", param);
777 else
778 newlen = 0;
575 } 779 }
576 else if (keysym == XK_KP_Insert)
577 keysym = kp ? XK_KP_0 : XK_Insert;
578#ifndef NO_DELETE_KEY
579 else if (keysym == XK_KP_Delete)
580 keysym = kp ? XK_KP_Decimal : XK_Delete;
581#endif
582#endif
583 switch (keysym)
584 {
585#ifndef NO_BACKSPACE_KEY
586 case XK_BackSpace:
587 if (priv_modes & PrivMode_HaveBackSpace)
588 {
589 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
590 ^ !!ctrl) ? '\b' : '\177';
591 kbuf[1] = '\0';
592 }
593 else
594 strcpy (kbuf, rs[Rs_backspace_key]);
595 break; 780 break;
596#endif
597#ifndef NO_DELETE_KEY
598 case XK_Delete:
599 strcpy (kbuf, rs[Rs_delete_key]);
600 break;
601#endif
602 case XK_Tab:
603 if (shft)
604 strcpy (kbuf, "\033[Z");
605 else
606 {
607#ifdef CTRL_TAB_MAKES_META
608 if (ctrl)
609 meta = 1;
610#endif
611#ifdef MOD4_TAB_MAKES_META
612 if (ev.state & Mod4Mask)
613 meta = 1;
614#endif
615 newlen = 0;
616 }
617 break;
618
619 case XK_Up: /* "\033[A" */
620 case XK_Down: /* "\033[B" */
621 case XK_Right: /* "\033[C" */
622 case XK_Left: /* "\033[D" */
623 strcpy (kbuf, "\033[Z");
624 kbuf[2] = "DACB"[keysym - XK_Left];
625 /* do Shift first */
626 if (shft)
627 kbuf[2] = "dacb"[keysym - XK_Left];
628 else if (ctrl)
629 {
630 kbuf[1] = 'O';
631 kbuf[2] = "dacb"[keysym - XK_Left];
632 }
633 else if (priv_modes & PrivMode_aplCUR)
634 kbuf[1] = 'O';
635 break;
636
637#ifndef UNSHIFTED_SCROLLKEYS
638 case XK_Prior:
639 strcpy (kbuf, "\033[5~");
640 break;
641 case XK_Next:
642 strcpy (kbuf, "\033[6~");
643 break;
644#endif
645 case XK_KP_Enter:
646 /* allow shift to override */
647 if (kp)
648 {
649 strcpy (kbuf, "\033OM");
650 break;
651 }
652
653 /* FALLTHROUGH */
654
655 case XK_Return:
656 if (priv_modes & PrivMode_LFNL)
657 {
658 kbuf[0] = '\015';
659 kbuf[1] = '\012';
660 kbuf[2] = '\0';
661 }
662 else
663 {
664 kbuf[0] = '\015';
665 kbuf[1] = '\0';
666 }
667 break;
668
669 case XK_KP_F1: /* "\033OP" */
670 case XK_KP_F2: /* "\033OQ" */
671 case XK_KP_F3: /* "\033OR" */
672 case XK_KP_F4: /* "\033OS" */
673 strcpy (kbuf, "\033OP");
674 kbuf[2] += (keysym - XK_KP_F1);
675 break;
676
677 case XK_KP_Multiply: /* "\033Oj" : "*" */
678 case XK_KP_Add: /* "\033Ok" : "+" */
679 case XK_KP_Separator: /* "\033Ol" : "," */
680 case XK_KP_Subtract: /* "\033Om" : "-" */
681 case XK_KP_Decimal: /* "\033On" : "." */
682 case XK_KP_Divide: /* "\033Oo" : "/" */
683 case XK_KP_0: /* "\033Op" : "0" */
684 case XK_KP_1: /* "\033Oq" : "1" */
685 case XK_KP_2: /* "\033Or" : "2" */
686 case XK_KP_3: /* "\033Os" : "3" */
687 case XK_KP_4: /* "\033Ot" : "4" */
688 case XK_KP_5: /* "\033Ou" : "5" */
689 case XK_KP_6: /* "\033Ov" : "6" */
690 case XK_KP_7: /* "\033Ow" : "7" */
691 case XK_KP_8: /* "\033Ox" : "8" */
692 case XK_KP_9: /* "\033Oy" : "9" */
693 /* allow shift to override */
694 if (kp)
695 {
696 strcpy (kbuf, "\033Oj");
697 kbuf[2] += (keysym - XK_KP_Multiply);
698 }
699 else
700 {
701 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
702 kbuf[1] = '\0';
703 }
704 break;
705
706 case XK_Find:
707 strcpy (kbuf, "\033[1~");
708 break;
709
710 case XK_Insert:
711 strcpy (kbuf, "\033[2~");
712 break;
713#ifdef DXK_Remove /* support for DEC remove like key */
714 case DXK_Remove:
715 /* FALLTHROUGH */
716#endif
717 case XK_Execute:
718 strcpy (kbuf, "\033[3~");
719 break;
720 case XK_Select:
721 strcpy (kbuf, "\033[4~");
722 break;
723 case XK_End:
724 strcpy (kbuf, KS_END);
725 break;
726 case XK_Home:
727 strcpy (kbuf, KS_HOME);
728 break;
729
730#define FKEY(n, fkey) \
731 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
732
733 case XK_F1: /* "\033[11~" */
734 case XK_F2: /* "\033[12~" */
735 case XK_F3: /* "\033[13~" */
736 case XK_F4: /* "\033[14~" */
737 case XK_F5: /* "\033[15~" */
738 FKEY (11, XK_F1);
739 break;
740 case XK_F6: /* "\033[17~" */
741 case XK_F7: /* "\033[18~" */
742 case XK_F8: /* "\033[19~" */
743 case XK_F9: /* "\033[20~" */
744 case XK_F10: /* "\033[21~" */
745 FKEY (17, XK_F6);
746 break;
747 case XK_F11: /* "\033[23~" */
748 case XK_F12: /* "\033[24~" */
749 case XK_F13: /* "\033[25~" */
750 case XK_F14: /* "\033[26~" */
751 FKEY (23, XK_F11);
752 break;
753 case XK_F15: /* "\033[28~" */
754 case XK_F16: /* "\033[29~" */
755 FKEY (28, XK_F15);
756 break;
757 case XK_Help: /* "\033[28~" */
758 FKEY (28, XK_Help);
759 break;
760 case XK_Menu: /* "\033[29~" */
761 FKEY (29, XK_Menu);
762 break;
763 case XK_F17: /* "\033[31~" */
764 case XK_F18: /* "\033[32~" */
765 case XK_F19: /* "\033[33~" */
766 case XK_F20: /* "\033[34~" */
767 case XK_F21: /* "\033[35~" */
768 case XK_F22: /* "\033[36~" */
769 case XK_F23: /* "\033[37~" */
770 case XK_F24: /* "\033[38~" */
771 case XK_F25: /* "\033[39~" */
772 case XK_F26: /* "\033[40~" */
773 case XK_F27: /* "\033[41~" */
774 case XK_F28: /* "\033[42~" */
775 case XK_F29: /* "\033[43~" */
776 case XK_F30: /* "\033[44~" */
777 case XK_F31: /* "\033[45~" */
778 case XK_F32: /* "\033[46~" */
779 case XK_F33: /* "\033[47~" */
780 case XK_F34: /* "\033[48~" */
781 case XK_F35: /* "\033[49~" */
782 FKEY (31, XK_F17);
783 break;
784#undef FKEY
785 default:
786 newlen = 0;
787 break;
788 } 781 }
789 782
790 if (newlen) 783 if (newlen)
791 len = strlen (kbuf); 784 len = strlen (kbuf);
792 785
793 /* 786 /*
794 * Pass meta for all function keys, if 'meta' option set 787 * Pass meta for all function keys, if 'meta' option set
795 */ 788 */
796#ifdef META8_OPTION 789#ifdef META8_OPTION
896 commit_iso14755 (); 889 commit_iso14755 ();
897 890
898 return; 891 return;
899 } 892 }
900 893
901 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
902 if (i[0] == keysym) 895 if (i[0] == keysym)
903 { 896 {
904 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
905 commit_iso14755 (); 898 commit_iso14755 ();
906 899
982rxvt_term::flush () 975rxvt_term::flush ()
983{ 976{
984 flush_ev.stop (); 977 flush_ev.stop ();
985 978
986#ifdef HAVE_BG_PIXMAP 979#ifdef HAVE_BG_PIXMAP
987 if (bgPixmap.check_clearChanged ()) 980 if (bg_flags & BG_NEEDS_REFRESH)
988 { 981 {
989// scr_clear (true); This needs to be researched further! 982 bg_flags &= ~BG_NEEDS_REFRESH;
990 scr_touch (false); 983 scr_touch (false);
991 } 984 }
992#endif 985#endif
993 986
994 if (want_refresh) 987 if (want_refresh)
1030 } 1023 }
1031 while (row < end_row); 1024 while (row < end_row);
1032 } 1025 }
1033 1026
1034 scr_refresh (); 1027 scr_refresh ();
1035 scrollbar_show (1); 1028 scrollBar.show (1);
1036#ifdef USE_XIM 1029#ifdef USE_XIM
1037 IMSendSpot (); 1030 IMSendSpot ();
1038#endif 1031#endif
1039 } 1032 }
1040 1033
1041 display->flush (); 1034 display->flush ();
1042} 1035}
1043 1036
1044/* checks wether a refresh is requested and starts the refresh timer */ 1037/* checks whether a refresh is requested and starts the refresh timer */
1045void 1038void
1046rxvt_term::refresh_check () 1039rxvt_term::refresh_check ()
1047{ 1040{
1048 if (want_refresh && !flush_ev.is_active ()) 1041 if (want_refresh && !flush_ev.is_active ())
1049 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1042 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1142 { 1135 {
1143 // this should really be sched_yield(), but the linux guys thought 1136 // this should really be sched_yield(), but the linux guys thought
1144 // that giving a process calling sched_yield () less cpu time than 1137 // that giving a process calling sched_yield () less cpu time than
1145 // 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
1146 // 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.
1147 1143
1148 struct timespec ts = { 0, 0 }; 1144 struct timespec ts = { 0, 1000 };
1149 nanosleep (&ts, 0); 1145 nanosleep (&ts, 0);
1150 1146
1151 w.stop (); 1147 w.stop ();
1152 } 1148 }
1153 1149
1203{ 1199{
1204 make_current (); 1200 make_current ();
1205 1201
1206 if (revents & ev::READ) 1202 if (revents & ev::READ)
1207 // loop, but don't allow a single term to monopolize us 1203 // loop, but don't allow a single term to monopolize us
1208 while (pty_fill ()) 1204 for (int i = CBUFCNT; i-- && pty_fill (); )
1209 if (cmd_parse ()) 1205 cmd_parse ();
1210 break;
1211 1206
1212 if (revents & ev::WRITE) 1207 if (revents & ev::WRITE)
1213 pty_write (); 1208 pty_write ();
1214 1209
1215 refresh_check (); 1210 refresh_check ();
1256{ 1251{
1257 int button_number, key_state = 0; 1252 int button_number, key_state = 0;
1258 int x, y; 1253 int x, y;
1259 int code = 32; 1254 int code = 32;
1260 1255
1261 x = Pixel2Col (ev.x); 1256 x = Pixel2Col (ev.x) + 1;
1262 y = Pixel2Row (ev.y); 1257 y = Pixel2Row (ev.y) + 1;
1258
1263 if (ev.type == MotionNotify) 1259 if (ev.type == MotionNotify)
1264 { 1260 {
1265 if (x == mouse_row && y == mouse_col) 1261 if (x == mouse_row && y == mouse_col)
1266 return; 1262 return;
1263
1267 mouse_row = x; 1264 mouse_row = x;
1268 mouse_col = y; 1265 mouse_col = y;
1269 code += 32; 1266 code += 32;
1270 } 1267 }
1271 1268
1274 else 1271 else
1275 { 1272 {
1276 button_number = MEvent.button - Button1; 1273 button_number = MEvent.button - Button1;
1277 /* add 0x3D for wheel events, like xterm does */ 1274 /* add 0x3D for wheel events, like xterm does */
1278 if (button_number >= 3) 1275 if (button_number >= 3)
1279 button_number += (64 - 3); 1276 button_number += 64 - 3;
1280 } 1277 }
1281 1278
1282 if (priv_modes & PrivMode_MouseX10) 1279 if (priv_modes & PrivMode_MouseX10)
1283 { 1280 {
1284 /* 1281 /*
1316 fputc ('A', stderr); 1313 fputc ('A', stderr);
1317 if (key_state & 32) 1314 if (key_state & 32)
1318 fputc ('2', stderr); 1315 fputc ('2', stderr);
1319 fprintf (stderr, "]: <%d>, %d/%d\n", 1316 fprintf (stderr, "]: <%d>, %d/%d\n",
1320 button_number, 1317 button_number,
1321 x + 1, 1318 x,
1322 y + 1); 1319 y);
1323#endif 1320#endif
1324 1321
1322#if ENABLE_FRILLS
1323 if (priv_modes & PrivMode_ExtMouseRight)
1324 tt_printf ("\033[%d;%d;%dM",
1325 code + button_number + key_state,
1326 x,
1327 y);
1328 else if (priv_modes & PrivMode_ExtModeMouse)
1329 tt_printf ("\033[M%c%lc%lc",
1330 code + button_number + key_state,
1331 wint_t (32 + x),
1332 wint_t (32 + y));
1333 else
1334#endif
1325 tt_printf ("\033[M%c%c%c", 1335 tt_printf ("\033[M%c%c%c",
1326 (code + button_number + key_state), 1336 code + button_number + key_state,
1327 (32 + x + 1), 1337 32 + x,
1328 (32 + y + 1)); 1338 32 + y);
1329} 1339}
1330 1340
1331/*{{{ process an X event */ 1341/*{{{ process an X event */
1332void 1342void
1333rxvt_term::x_cb (XEvent &ev) 1343rxvt_term::x_cb (XEvent &ev)
1435 && ev.xfocus.mode != NotifyGrab) 1445 && ev.xfocus.mode != NotifyGrab)
1436 focus_out (); 1446 focus_out ();
1437 break; 1447 break;
1438 1448
1439 case ConfigureNotify: 1449 case ConfigureNotify:
1440 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1441 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1442 szHint.width, szHint.height);*/
1443 if (ev.xconfigure.window == parent[0]) 1450 if (ev.xconfigure.window == parent[0])
1444 { 1451 {
1445 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1446 ; 1453 ;
1454
1455#ifdef HAVE_BG_PIXMAP
1456 bool moved = false;
1457 if (bg_window_position_sensitive ())
1458 {
1459 int x, y;
1460 if (ev.xconfigure.send_event)
1461 {
1462 x = ev.xconfigure.x;
1463 y = ev.xconfigure.y;
1464 }
1465 else
1466 get_window_origin (x, y);
1467
1468 if (bg_set_position (x, y)
1469 || !(bg_flags & BG_IS_VALID))
1470 moved = true;
1471 }
1472#endif
1447 1473
1448 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1449 { 1475 {
1450 seen_resize = 1; 1476 seen_resize = 1;
1451 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1477 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1452 } 1478 }
1453 else 1479 else
1454 { 1480 {
1455#ifdef HAVE_BG_PIXMAP 1481#ifdef HAVE_BG_PIXMAP
1456 if (bgPixmap.window_position_sensitive ()) 1482 if (moved)
1457 { 1483 {
1458 if (mapped) 1484 if (mapped)
1459 update_background (); 1485 update_background ();
1460 else 1486 else
1461 bgPixmap.invalidate (); 1487 bg_invalidate ();
1462 } 1488 }
1463#endif 1489#endif
1464 } 1490 }
1465 1491
1466 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1467 } 1493 }
1468 break; 1494 break;
1469 1495
1470 case PropertyNotify: 1496 case PropertyNotify:
1471 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1497 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1472 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1473 && ev.xproperty.state == PropertyNewValue)
1474 selection_property (ev.xproperty.window, ev.xproperty.atom);
1475
1476 break; 1498 break;
1477 1499
1478 case SelectionClear: 1500 case SelectionClear:
1479 selection_clear (); 1501 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1480 break;
1481
1482 case SelectionNotify:
1483 if (selection_wait == Sel_normal)
1484 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1485 break; 1502 break;
1486 1503
1487 case SelectionRequest: 1504 case SelectionRequest:
1488 selection_send (ev.xselectionrequest); 1505 selection_send (ev.xselectionrequest);
1489 break; 1506 break;
1490 1507
1491 case MapNotify: 1508 case MapNotify:
1492#ifdef HAVE_BG_PIXMAP 1509#ifdef HAVE_BG_PIXMAP
1493 /* This is needed spcifically to fix the case of no window manager or a 1510 /* This is needed specifically to fix the case of no window manager or a
1494 * non-reparenting window manager. In those cases we never get first 1511 * non-reparenting window manager. In those cases we never get first
1495 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1512 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1496 * care of multiplicity of ConfigureNotify events arriwing while WM does 1513 * care of multiplicity of ConfigureNotify events arriving while WM does
1497 * reparenting. 1514 * reparenting.
1498 * We should not render background immidiately, as there could be several 1515 * We should not render background immediately, as there could be several
1499 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1516 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1500 * by scheduling background redraw as soon as we can, but giving a short 1517 * by scheduling background redraw as soon as we can, but giving a short
1501 * bit of time for ConfigureNotifies to arrive. 1518 * bit of time for ConfigureNotifies to arrive.
1502 * We should render background PRIOR to drawing any text, but AFTER all 1519 * We should render background PRIOR to drawing any text, but AFTER all
1503 * of ConfigureNotifys for the best results. 1520 * of ConfigureNotifys for the best results.
1504 */ 1521 */
1505 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1522 if (!(bg_flags & BG_IS_VALID))
1506 update_background_ev.start (0.025); 1523 update_background_ev.start (0.025);
1507#endif 1524#endif
1508 mapped = 1; 1525 mapped = 1;
1509#ifdef TEXT_BLINK 1526#ifdef TEXT_BLINK
1510 text_blink_ev.start (); 1527 text_blink_ev.start ();
1525 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1526 { 1543 {
1527 do 1544 do
1528 { 1545 {
1529 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1530 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, false);
1531 } 1548 }
1532 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1549 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1533 1550
1534 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1551 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1535 1552
1536 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1537 { 1554 {
1538 scr_expose (ev.xexpose.x, ev.xexpose.y, 1555 scr_expose (ev.xexpose.x, ev.xexpose.y,
1539 ev.xexpose.width, ev.xexpose.height, False); 1556 ev.xexpose.width, ev.xexpose.height, false);
1540 } 1557 }
1541 1558
1542 want_refresh = 1; 1559 want_refresh = 1;
1543 } 1560 }
1544 else 1561 else
1551 ; 1568 ;
1552 1569
1553 if (scrollBar.state && ev.xany.window == scrollBar.win) 1570 if (scrollBar.state && ev.xany.window == scrollBar.win)
1554 { 1571 {
1555 scrollBar.state = STATE_IDLE; 1572 scrollBar.state = STATE_IDLE;
1556 scrollbar_show (0); 1573 scrollBar.show (0);
1557 } 1574 }
1558 } 1575 }
1559 break; 1576 break;
1560 1577
1561 case MotionNotify: 1578 case MotionNotify:
1660 &unused_root, &unused_child, 1677 &unused_root, &unused_child,
1661 &unused_root_x, &unused_root_y, 1678 &unused_root_x, &unused_root_y,
1662 &ev.xbutton.x, &ev.xbutton.y, 1679 &ev.xbutton.x, &ev.xbutton.y,
1663 &unused_mask); 1680 &unused_mask);
1664 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1681 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1665 scrollbar_size ()); 1682 scrollBar.size ());
1666 want_refresh = 1; 1683 want_refresh = 1;
1667 scrollbar_show (1); 1684 scrollBar.show (1);
1668 } 1685 }
1669 break; 1686 break;
1670 } 1687 }
1671 1688
1672#if defined(CURSOR_BLINK) 1689#if defined(CURSOR_BLINK)
1697#endif 1714#endif
1698 1715
1699 refresh_check (); 1716 refresh_check ();
1700} 1717}
1701 1718
1719#if ENABLE_FRILLS
1720void
1721rxvt_term::set_urgency (bool enable)
1722{
1723 if (enable == urgency_hint)
1724 return;
1725
1726 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1727 {
1728 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1729 XSetWMHints (dpy, parent[0], h);
1730 urgency_hint = enable;
1731 }
1732}
1733#endif
1734
1702void 1735void
1703rxvt_term::focus_in () 1736rxvt_term::focus_in ()
1704{ 1737{
1705 if (!focus) 1738 if (!focus)
1706 { 1739 {
1707 focus = 1; 1740 focus = 1;
1708 want_refresh = 1; 1741 want_refresh = 1;
1709
1710 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1711 1742
1712#if USE_XIM 1743#if USE_XIM
1713 if (Input_Context != NULL) 1744 if (Input_Context != NULL)
1714 { 1745 {
1715 IMSetPosition (); 1746 IMSetPosition ();
1727 scr_recolour (); 1758 scr_recolour ();
1728 } 1759 }
1729#endif 1760#endif
1730#if ENABLE_FRILLS 1761#if ENABLE_FRILLS
1731 if (option (Opt_urgentOnBell)) 1762 if (option (Opt_urgentOnBell))
1732 { 1763 set_urgency (0);
1733 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1734 {
1735 h->flags &= ~XUrgencyHint;
1736 XSetWMHints (dpy, parent[0], h);
1737 }
1738 }
1739#endif 1764#endif
1765
1766 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1740 } 1767 }
1741} 1768}
1742 1769
1743void 1770void
1744rxvt_term::focus_out () 1771rxvt_term::focus_out ()
1746 if (focus) 1773 if (focus)
1747 { 1774 {
1748 focus = 0; 1775 focus = 0;
1749 want_refresh = 1; 1776 want_refresh = 1;
1750 1777
1751 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1778#if ENABLE_FRILLS
1752 1779 if (option (Opt_urgentOnBell))
1780 set_urgency (0);
1781#endif
1753#if ENABLE_FRILLS || ISO_14755 1782#if ENABLE_FRILLS || ISO_14755
1754 if (iso14755buf) 1783 if (iso14755buf)
1755 { 1784 {
1756 iso14755buf = 0; 1785 iso14755buf = 0;
1757# if ISO_14755 1786# if ISO_14755
1774 { 1803 {
1775 pix_colors = pix_colors_unfocused; 1804 pix_colors = pix_colors_unfocused;
1776 scr_recolour (); 1805 scr_recolour ();
1777 } 1806 }
1778#endif 1807#endif
1808
1809 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1779 } 1810 }
1780} 1811}
1781 1812
1782void 1813void
1783rxvt_term::update_fade_color (unsigned int idx) 1814rxvt_term::update_fade_color (unsigned int idx)
1811 * use the property to determine the pixmap. We use it later on. 1842 * use the property to determine the pixmap. We use it later on.
1812 */ 1843 */
1813 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1844 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1814 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1845 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1815 { 1846 {
1816 bgPixmap.set_root_pixmap (); 1847 bg_set_root_pixmap ();
1817 update_background (); 1848 update_background ();
1818 } 1849 }
1819 1850
1820 break; 1851 break;
1821 } 1852 }
1860 /* save the xbutton state (for ButtonRelease) */ 1891 /* save the xbutton state (for ButtonRelease) */
1861 MEvent.state = ev.state; 1892 MEvent.state = ev.state;
1862#ifdef MOUSE_REPORT_DOUBLECLICK 1893#ifdef MOUSE_REPORT_DOUBLECLICK
1863 if (ev.button == MEvent.button && clickintime) 1894 if (ev.button == MEvent.button && clickintime)
1864 { 1895 {
1865 /* same button, within alloted time */ 1896 /* same button, within allowed time */
1866 MEvent.clicks++; 1897 MEvent.clicks++;
1867 1898
1868 if (MEvent.clicks > 1) 1899 if (MEvent.clicks > 1)
1869 { 1900 {
1870 /* only report double clicks */ 1901 /* only report double clicks */
2025 } 2056 }
2026 2057
2027 if (scrollBar.style == R_SB_XTERM 2058 if (scrollBar.style == R_SB_XTERM
2028 || scrollbar_above_slider (ev.y) 2059 || scrollbar_above_slider (ev.y)
2029 || scrollbar_below_slider (ev.y)) 2060 || scrollbar_below_slider (ev.y))
2030 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2061 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2031 2062
2032 scrollBar.state = STATE_MOTION; 2063 scrollBar.state = STATE_MOTION;
2033 break; 2064 break;
2034 2065
2035 case Button1: 2066 case Button1:
2058 else 2089 else
2059 { 2090 {
2060 scr_page ((ev.button == Button1 ? DN : UP), 2091 scr_page ((ev.button == Button1 ? DN : UP),
2061 (nrow 2092 (nrow
2062 * scrollbar_position (ev.y) 2093 * scrollbar_position (ev.y)
2063 / scrollbar_size ())); 2094 / scrollBar.size ()));
2064 } 2095 }
2065 2096
2066 break; 2097 break;
2067 } 2098 }
2068 } 2099 }
2081 reportmode = !! (priv_modes & PrivMode_mouse_report); 2112 reportmode = !! (priv_modes & PrivMode_mouse_report);
2082 2113
2083 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2114 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2084 { 2115 {
2085 scrollBar.state = STATE_IDLE; 2116 scrollBar.state = STATE_IDLE;
2086 scrollbar_show (0); 2117 scrollBar.show (0);
2087 } 2118 }
2088 2119
2089#ifdef SELECTION_SCROLLING 2120#ifdef SELECTION_SCROLLING
2090 sel_scroll_ev.stop(); 2121 sel_scroll_ev.stop();
2091#endif 2122#endif
2141 selection_make (ev.time); 2172 selection_make (ev.time);
2142 break; 2173 break;
2143 2174
2144 case Button2: 2175 case Button2:
2145 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2176 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2146 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2177 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2147 break; 2178 break;
2148 2179
2149#ifdef MOUSE_WHEEL 2180#ifdef MOUSE_WHEEL
2150 case Button4: 2181 case Button4:
2151 case Button5: 2182 case Button5:
2174 } 2205 }
2175 else 2206 else
2176# endif 2207# endif
2177 { 2208 {
2178 scr_page (v, i); 2209 scr_page (v, i);
2179 scrollbar_show (1); 2210 scrollBar.show (1);
2180 } 2211 }
2181 } 2212 }
2182 break; 2213 break;
2183#endif 2214#endif
2184 } 2215 }
2185 } 2216 }
2186} 2217}
2187 2218
2188/*}}} */ 2219/*}}} */
2189 2220
2190bool 2221void
2191rxvt_term::cmd_parse () 2222rxvt_term::cmd_parse ()
2192{ 2223{
2193 bool flag = false;
2194 wchar_t ch = NOCHAR; 2224 wchar_t ch = NOCHAR;
2195 char *seq_begin; // remember start of esc-sequence here 2225 char *seq_begin; // remember start of esc-sequence here
2196 2226
2197 for (;;) 2227 for (;;)
2198 { 2228 {
2199 if (ch == NOCHAR) 2229 if (expect_false (ch == NOCHAR))
2200 { 2230 {
2201 seq_begin = cmdbuf_ptr; 2231 seq_begin = cmdbuf_ptr;
2202 ch = next_char (); 2232 ch = next_char ();
2203 2233
2204 if (ch == NOCHAR) 2234 if (ch == NOCHAR)
2205 break; 2235 break;
2206 } 2236 }
2207 2237
2208 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2238 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2209 { 2239 {
2210 if (!seen_input) 2240 if (expect_false (!seen_input))
2211 { 2241 {
2212 seen_input = 1; 2242 seen_input = 1;
2213 // many badly-written programs (e.g. jed) contain a race condition: 2243 // many badly-written programs (e.g. jed) contain a race condition:
2214 // they first read the screensize and then install a SIGWINCH handler. 2244 // they first read the screensize and then install a SIGWINCH handler.
2215 // some window managers resize the window early, and these programs 2245 // some window managers resize the window early, and these programs
2228 wchar_t *str = buf; 2258 wchar_t *str = buf;
2229 wchar_t *eol = str + min (ncol, UBUFSIZ); 2259 wchar_t *eol = str + min (ncol, UBUFSIZ);
2230 2260
2231 for (;;) 2261 for (;;)
2232 { 2262 {
2233 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2263 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2234 break; 2264 break;
2235 2265
2236 *str++ = ch; 2266 *str++ = ch;
2237 2267
2238 if (ch == C0_LF || str >= eol) 2268 if (expect_false (ch == C0_LF || str >= eol))
2239 { 2269 {
2240 if (ch == C0_LF) 2270 if (ch == C0_LF)
2241 nlines++; 2271 nlines++;
2242 2272
2243 refresh_count++; 2273 refresh_count++;
2292 * What the heck we'll cheat and only refresh less than every page-full. 2322 * What the heck we'll cheat and only refresh less than every page-full.
2293 * if skipScroll is enabled. 2323 * if skipScroll is enabled.
2294 */ 2324 */
2295 if (refreshnow) 2325 if (refreshnow)
2296 { 2326 {
2297 flag = true;
2298 scr_refresh (); 2327 scr_refresh ();
2299 want_refresh = 1; 2328 want_refresh = 1;
2300 } 2329 }
2301
2302 } 2330 }
2303 else 2331 else
2304 { 2332 {
2305 try 2333 try
2306 { 2334 {
2314 } 2342 }
2315 2343
2316 ch = NOCHAR; 2344 ch = NOCHAR;
2317 } 2345 }
2318 } 2346 }
2319
2320 return flag;
2321} 2347}
2322 2348
2323// read the next character 2349// read the next character
2324wchar_t 2350wchar_t
2325rxvt_term::next_char () NOTHROW 2351rxvt_term::next_char () NOTHROW
2326{ 2352{
2327 while (cmdbuf_ptr < cmdbuf_endp) 2353 while (cmdbuf_ptr < cmdbuf_endp)
2328 { 2354 {
2329 // assume 7-bit to be ascii ALWAYS 2355 // assume 7-bit to be ascii ALWAYS
2330 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2356 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2331 return *cmdbuf_ptr++; 2357 return *cmdbuf_ptr++;
2332 2358
2333 wchar_t wc; 2359 wchar_t wc;
2334 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2360 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2335 2361
2339 cmdbuf_ptr = cmdbuf_endp; 2365 cmdbuf_ptr = cmdbuf_endp;
2340 break; 2366 break;
2341 } 2367 }
2342 2368
2343 if (len == (size_t)-1) 2369 if (len == (size_t)-1)
2370 {
2371 mbstate.reset (); // reset now undefined conversion state
2344 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2372 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2373 }
2345 2374
2346 // assume wchar == unicode 2375 // assume wchar == unicode
2347 cmdbuf_ptr += len; 2376 cmdbuf_ptr += len;
2348 return wc & UNICODE_MASK; 2377 return wc & UNICODE_MASK;
2349 } 2378 }
2393/*----------------------------------------------------------------------*/ 2422/*----------------------------------------------------------------------*/
2394#ifdef PRINTPIPE 2423#ifdef PRINTPIPE
2395FILE * 2424FILE *
2396rxvt_term::popen_printer () 2425rxvt_term::popen_printer ()
2397{ 2426{
2398 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2427 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2399 2428
2400 if (stream == NULL) 2429 if (stream == NULL)
2401 rxvt_warn ("can't open printer pipe, not printing.\n"); 2430 rxvt_warn ("can't open printer pipe, not printing.\n");
2402 2431
2403 return stream; 2432 return stream;
2414 * simulate attached vt100 printer 2443 * simulate attached vt100 printer
2415 */ 2444 */
2416void 2445void
2417rxvt_term::process_print_pipe () 2446rxvt_term::process_print_pipe ()
2418{ 2447{
2419 int done; 2448 FILE *fd = popen_printer ();
2420 FILE *fd;
2421 2449
2422 if ((fd = popen_printer ()) == NULL) 2450 if (!fd)
2423 return; 2451 return;
2424 2452
2425 /* 2453 /*
2426 * Send all input to the printer until either ESC[4i or ESC[?4i 2454 * Send all input to the printer until either ESC[4i or ESC[?4i
2427 * is received. 2455 * is received.
2428 */ 2456 */
2429 for (done = 0; !done;) 2457 for (int done = 0; !done; )
2430 { 2458 {
2431 unsigned char buf[8]; 2459 unsigned char buf[8];
2432 unicode_t ch; 2460 unicode_t ch;
2433 unsigned int i, len; 2461 unsigned int i, len;
2434 2462
2579 break; 2607 break;
2580 case 'Z': /* identify the terminal type */ 2608 case 'Z': /* identify the terminal type */
2581 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2609 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2582 break; 2610 break;
2583 case '<': /* turn off VT52 mode */ 2611 case '<': /* turn off VT52 mode */
2584 PrivMode (0, PrivMode_vt52); 2612 set_privmode (PrivMode_vt52, 0);
2585 break; 2613 break;
2586 case 'F': /* use special graphics character set */ 2614 case 'F': /* use special graphics character set */
2587 case 'G': /* use regular character set */ 2615 case 'G': /* use regular character set */
2588 /* unimplemented */ 2616 /* unimplemented */
2589 break; 2617 break;
2643 scr_forwardindex (); 2671 scr_forwardindex ();
2644 break; 2672 break;
2645#endif 2673#endif
2646 case '=': 2674 case '=':
2647 case '>': 2675 case '>':
2648 PrivMode ((ch == '='), PrivMode_aplKP); 2676 set_privmode (PrivMode_aplKP, ch == '=');
2649 break; 2677 break;
2650 2678
2651 case C1_40: 2679 case C1_40:
2652 cmd_getc (); 2680 cmd_getc ();
2653 break; 2681 break;
2657 2685
2658 /* 8.3.87: NEXT LINE */ 2686 /* 8.3.87: NEXT LINE */
2659 case C1_NEL: /* ESC E */ 2687 case C1_NEL: /* ESC E */
2660 { 2688 {
2661 wchar_t nlcr[] = { C0_LF, C0_CR }; 2689 wchar_t nlcr[] = { C0_LF, C0_CR };
2662 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2690 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2663 } 2691 }
2664 break; 2692 break;
2665 2693
2666 /* kidnapped escape sequence: Should be 8.3.48 */ 2694 /* kidnapped escape sequence: Should be 8.3.48 */
2667 case C1_ESA: /* ESC G */ 2695 case C1_ESA: /* ESC G */
2692 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2720 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2693 case C1_SCI: /* ESC Z */ 2721 case C1_SCI: /* ESC Z */
2694 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2722 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2695 break; /* steal obsolete ESC [ c */ 2723 break; /* steal obsolete ESC [ c */
2696 2724
2697 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2725 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2698 case C1_CSI: /* ESC [ */ 2726 case C1_CSI: /* ESC [ */
2699 process_csi_seq (); 2727 process_csi_seq ();
2700 break; 2728 break;
2701 2729
2702 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2730 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2703 case C1_OSC: /* ESC ] */ 2731 case C1_OSC: /* ESC ] */
2704 process_osc_seq (); 2732 process_osc_seq ();
2705 break; 2733 break;
2706 2734
2707 /* 8.3.106: RESET TO INITIAL STATE */ 2735 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2708 case 'c': 2736 case 'c':
2709 mbstate.reset (); 2737 mbstate.reset ();
2710 scr_poweron (); 2738 scr_poweron ();
2711 scrollbar_show (1); 2739 scrollBar.show (1);
2712 break; 2740 break;
2713 2741
2714 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2742 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2715 case 'n': 2743 case 'n':
2716 scr_charset_choose (2); 2744 scr_charset_choose (2);
2736 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2764 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2737 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2765 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2738 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2766 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2739}; 2767};
2740 2768
2741#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2769#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2742 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2770 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2743 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2771 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2744#define get_byte_array_bit(array, bit) \ 2772#define get_byte_array_bit(array, bit) \
2745 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2773 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2746 2774
2747const unsigned char csi_defaults[] = 2775static const unsigned char csi_defaults[] =
2748 { 2776 {
2749 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2777 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2750 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2778 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2751 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2779 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2752 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2780 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2767 2795
2768 nargs = 0; 2796 nargs = 0;
2769 2797
2770 priv = 0; 2798 priv = 0;
2771 ch = cmd_getc (); 2799 ch = cmd_getc ();
2772 if (ch >= '<' && ch <= '?') 2800 if ((ch >= '<' && ch <= '?') || ch == '!')
2773 { 2801 {
2774 /* '<' '=' '>' '?' */ 2802 /* '<' '=' '>' '?' '!' */
2775 priv = ch; 2803 priv = ch;
2776 ch = cmd_getc (); 2804 ch = cmd_getc ();
2777 } 2805 }
2778 2806
2779 /* read any numerical arguments */ 2807 /* read any numerical arguments */
2833 2861
2834 case '?': 2862 case '?':
2835 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2863 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2836 process_terminal_mode (ch, priv, nargs, arg); 2864 process_terminal_mode (ch, priv, nargs, arg);
2837 break; 2865 break;
2866
2867 case '!':
2868 if (ch == CSI_70)
2869 {
2870 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2871 scr_soft_reset ();
2872
2873 static const int pm_h[] = { 7, 25 };
2874 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2875
2876 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2877 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2838 } 2878 }
2879 break;
2880 }
2881
2839 return; 2882 return;
2840 } 2883 }
2841 2884
2842 switch (ch) 2885 switch (ch)
2843 { 2886 {
3210 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3253 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3211 */ 3254 */
3212void 3255void
3213rxvt_term::process_dcs_seq () 3256rxvt_term::process_dcs_seq ()
3214{ 3257{
3215 char *s;
3216 unicode_t eh;
3217
3218 /* 3258 /*
3219 * Not handled yet 3259 * Not handled yet
3220 */ 3260 */
3261
3262 unicode_t eh;
3221 s = get_to_st (eh); 3263 char *s = get_to_st (eh);
3222 if (s) 3264 if (s)
3223 free (s); 3265 free (s);
3224 3266
3225 return; 3267 return;
3226} 3268}
3230 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3272 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3231 */ 3273 */
3232void 3274void
3233rxvt_term::process_osc_seq () 3275rxvt_term::process_osc_seq ()
3234{ 3276{
3235 unicode_t ch, eh;
3236 int arg; 3277 int arg;
3237 3278
3238 ch = cmd_getc (); 3279 unicode_t ch = cmd_getc ();
3239 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3280 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3240 arg = arg * 10 + (ch - '0'); 3281 arg = arg * 10 + (ch - '0');
3241 3282
3242 if (ch == ';') 3283 if (ch == ';')
3243 { 3284 {
3285 unicode_t eh;
3244 char *s = get_to_st (eh); 3286 char *s = get_to_st (eh);
3245 3287
3246 if (s) 3288 if (s)
3247 { 3289 {
3248 process_xterm_seq (arg, s, eh); 3290 process_xterm_seq (arg, s, eh);
3272 3314
3273/* 3315/*
3274 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3316 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3275 */ 3317 */
3276void 3318void
3277rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3319rxvt_term::process_xterm_seq (int op, char *str, char resp)
3278{ 3320{
3279 int color; 3321 int color;
3280 char *buf, *name; 3322 char *buf, *name;
3281 bool query = str[0] == '?' && !str[1]; 3323 bool query = str[0] == '?' && !str[1];
3282 int saveop = op; 3324 int saveop = op;
3323 3365
3324 XFree (value); 3366 XFree (value);
3325 } 3367 }
3326 else 3368 else
3327 { 3369 {
3328 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3370 char *eq = strchr (str, '=');
3329 3371
3330 if (eq) 3372 if (eq)
3331 { 3373 {
3332 *eq = 0; 3374 *eq = 0;
3333 set_utf8_property (display->atom (str), eq + 1); 3375 set_utf8_property (display->atom (str), eq + 1);
3373 process_color_seq (op, Color_pointer_fg, str, resp); 3415 process_color_seq (op, Color_pointer_fg, str, resp);
3374 break; 3416 break;
3375 case XTerm_Color_pointer_bg: 3417 case XTerm_Color_pointer_bg:
3376 process_color_seq (op, Color_pointer_bg, str, resp); 3418 process_color_seq (op, Color_pointer_bg, str, resp);
3377 break; 3419 break;
3420#ifdef OPTION_HC
3421 case XTerm_Color_HC:
3422 process_color_seq (op, Color_HC, str, resp);
3423 break;
3424 case XTerm_Color_HTC:
3425 process_color_seq (op, Color_HTC, str, resp);
3426 break;
3427#endif
3378#ifndef NO_BOLD_UNDERLINE_REVERSE 3428#ifndef NO_BOLD_UNDERLINE_REVERSE
3379 case XTerm_Color_RV:
3380 process_color_seq (op, Color_RV, str, resp);
3381 break;
3382 case Rxvt_Color_BD:
3383 case URxvt_Color_BD: 3429 case URxvt_Color_BD:
3384 process_color_seq (op, Color_BD, str, resp); 3430 process_color_seq (op, Color_BD, str, resp);
3385 break; 3431 break;
3386 case Rxvt_Color_UL:
3387 case URxvt_Color_UL: 3432 case URxvt_Color_UL:
3388 process_color_seq (op, Color_UL, str, resp); 3433 process_color_seq (op, Color_UL, str, resp);
3389 break; 3434 break;
3390 case URxvt_Color_IT: 3435 case URxvt_Color_IT:
3391 process_color_seq (op, Color_IT, str, resp); 3436 process_color_seq (op, Color_IT, str, resp);
3392 break; 3437 break;
3393#endif 3438#endif
3439 case URxvt_Color_border:
3440 process_color_seq (op, Color_border, str, resp);
3441 break;
3394#if ENABLE_TRANSPARENCY 3442#if ENABLE_TRANSPARENCY
3395 case URxvt_Color_tint: 3443 case URxvt_Color_tint:
3396 process_color_seq (op, Color_tint, str, resp); 3444 process_color_seq (op, Color_tint, str, resp);
3397 { 3445 {
3398 bool changed = false; 3446 bool changed = false;
3399 3447
3400 if (ISSET_PIXCOLOR (Color_tint)) 3448 if (ISSET_PIXCOLOR (Color_tint))
3401 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3449 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3402 else
3403 changed = bgPixmap.unset_tint ();
3404 3450
3405 if (changed) 3451 if (changed)
3406 update_background (); 3452 update_background ();
3407 } 3453 }
3408 3454
3413 case Rxvt_Pixmap: 3459 case Rxvt_Pixmap:
3414 if (!strcmp (str, "?")) 3460 if (!strcmp (str, "?"))
3415 { 3461 {
3416 char str[256]; 3462 char str[256];
3417 3463
3418 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3464 sprintf (str, "[%dx%d+%d+%d]",
3419 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3465 min (h_scale, 32767), min (v_scale, 32767),
3420 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3466 min (h_align, 32767), min (v_align, 32767));
3421 process_xterm_seq (XTerm_title, str, CHAR_ST); 3467 process_xterm_seq (XTerm_title, str, CHAR_ST);
3422 } 3468 }
3423 else 3469 else
3424 { 3470 {
3425 int changed = 0; 3471 int changed = 0;
3426 3472
3427 if (*str != ';') 3473 if (*str != ';')
3428 { 3474 {
3429 /* reset to default scaling :*/
3430 bgPixmap.unset_geometry ();
3431 if (bgPixmap.set_file (str)) /* change pixmap */ 3475 if (bg_set_file (str)) /* change pixmap */
3476 {
3432 changed++; 3477 changed++;
3433 str = strchr (str, ';'); 3478 str = strchr (str, ';');
3434 if (str == NULL) 3479 if (str == NULL)
3435 bgPixmap.set_defaultGeometry (); 3480 bg_set_default_geometry ();
3481 else
3482 bg_set_geometry (str+1);
3483 }
3436 } 3484 }
3437 3485 else
3438 while (str)
3439 { 3486 {
3440 str++; 3487 str++;
3441 if (bgPixmap.set_geometry (str)) 3488 if (bg_set_geometry (str, true))
3442 changed++; 3489 changed++;
3443 str = strchr (str, ';');
3444 } 3490 }
3445 3491
3446 if (changed) 3492 if (changed)
3493 {
3494 if (bg_window_position_sensitive ())
3495 {
3496 int x, y;
3497 get_window_origin (x, y);
3498 bg_set_position (x, y);
3499 }
3447 update_background (); 3500 update_background ();
3501 }
3448 } 3502 }
3449 break; 3503 break;
3450#endif 3504#endif
3451 3505
3452 case XTerm_logfile: 3506 case XTerm_logfile:
3522 break; 3576 break;
3523#endif 3577#endif
3524 3578
3525#if ENABLE_PERL 3579#if ENABLE_PERL
3526 case URxvt_perl: 3580 case URxvt_perl:
3527 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3581 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3528 ; // no responses yet
3529 break; 3582 break;
3530#endif 3583#endif
3531 } 3584 }
3532} 3585}
3533/*----------------------------------------------------------------------*/ 3586/*----------------------------------------------------------------------*/
3556 { 3609 {
3557 if (mode == 'r') 3610 if (mode == 'r')
3558 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3611 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3559 else 3612 else
3560 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3613 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3561 PrivMode (state, bit); 3614
3615 set_privmode (bit, state);
3562 } 3616 }
3563 3617
3564 return state; 3618 return state;
3565} 3619}
3566 3620
3574 static const struct 3628 static const struct
3575 { 3629 {
3576 const int argval; 3630 const int argval;
3577 const unsigned long bit; 3631 const unsigned long bit;
3578 } argtopriv[] = { 3632 } argtopriv[] = {
3579 { 1, PrivMode_aplCUR }, 3633 { 1, PrivMode_aplCUR }, // DECCKM
3580 { 2, PrivMode_vt52 }, 3634 { 2, PrivMode_vt52 },
3581 { 3, PrivMode_132 }, 3635 { 3, PrivMode_132 }, // DECCOLM
3582 { 4, PrivMode_smoothScroll }, 3636 { 4, PrivMode_smoothScroll }, // DECSCLM
3583 { 5, PrivMode_rVideo }, 3637 { 5, PrivMode_rVideo }, // DECSCNM
3584 { 6, PrivMode_relOrigin }, 3638 { 6, PrivMode_relOrigin }, // DECOM
3585 { 7, PrivMode_Autowrap }, 3639 { 7, PrivMode_Autowrap }, // DECAWM
3586 // 8, bi-directional support mode 3640 // 8, auto-repeat keys // DECARM
3587 { 9, PrivMode_MouseX10 }, 3641 { 9, PrivMode_MouseX10 },
3588 // 18, 19 printing-related 3642 // 18 end FF to printer after print screen
3643 // 19 Print screen prints full screen/scroll region
3589 { 25, PrivMode_VisibleCursor }, 3644 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3590#ifdef scrollBar_esc 3645#ifdef scrollBar_esc
3591 { scrollBar_esc, PrivMode_scrollBar }, 3646 { scrollBar_esc, PrivMode_scrollBar },
3592#endif 3647#endif
3593 { 35, PrivMode_ShiftKeys }, // rxvt extension 3648 { 35, PrivMode_ShiftKeys }, // rxvt extension
3649 // 38, tektronix mode // DECTEK
3594 { 40, PrivMode_132OK }, 3650 { 40, PrivMode_132OK },
3595 // 41 xterm more fixes NYI 3651 // 41 xterm more fixes NYI
3596 // 45 margin bell NYI 3652 // 45 margin bell NYI
3597 // 46 start logging 3653 // 46 start logging
3598 { 47, PrivMode_Screen }, 3654 { 47, PrivMode_Screen },
3599 { 66, PrivMode_aplKP }, 3655 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3600#ifndef NO_BACKSPACE_KEY 3656#ifndef NO_BACKSPACE_KEY
3601 { 67, PrivMode_BackSpace }, 3657 { 67, PrivMode_BackSpace }, // DECBKM
3602#endif 3658#endif
3603 { 1000, PrivMode_MouseX11 }, 3659 { 1000, PrivMode_MouseX11 },
3604 { 1002, PrivMode_MouseBtnEvent }, 3660 { 1002, PrivMode_MouseBtnEvent },
3605 { 1003, PrivMode_MouseAnyEvent }, 3661 { 1003, PrivMode_MouseAnyEvent },
3662#if ENABLE_FRILLS
3663 { 1005, PrivMode_ExtModeMouse },
3664#endif
3606 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3665 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3607 { 1011, PrivMode_Keypress }, // rxvt extension 3666 { 1011, PrivMode_Keypress }, // rxvt extension
3667#if ENABLE_FRILLS
3668 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3669#endif
3608 // 1035 enable modifiers for alt, numlock NYI 3670 // 1035 enable modifiers for alt, numlock NYI
3609 // 1036 send ESC for meta keys NYI 3671 // 1036 send ESC for meta keys NYI
3610 // 1037 send DEL for keypad delete NYI 3672 // 1037 send DEL for keypad delete NYI
3611 { 1047, PrivMode_Screen }, 3673 { 1047, PrivMode_Screen },
3612 // 1048 save and restore cursor 3674 // 1048 save and restore cursor, implemented in code
3613 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3675 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3614 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3676 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3615 { 2004, PrivMode_BracketPaste }, 3677 { 2004, PrivMode_BracketPaste },
3616 }; 3678 };
3617 3679
3627 for (i = 0; i < nargs; i++) 3689 for (i = 0; i < nargs; i++)
3628 { 3690 {
3629 state = -1; 3691 state = -1;
3630 3692
3631 /* basic handling */ 3693 /* basic handling */
3632 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3694 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3633 if (argtopriv[j].argval == arg[i]) 3695 if (argtopriv[j].argval == arg[i])
3634 { 3696 {
3635 state = privcases (mode, argtopriv[j].bit); 3697 state = privcases (mode, argtopriv[j].bit);
3636 break; 3698 break;
3637 } 3699 }
3645 3707
3646 scr_touch (true); 3708 scr_touch (true);
3647 break; 3709 break;
3648#endif 3710#endif
3649 case 1048: /* alternative cursor save */ 3711 case 1048: /* alternative cursor save */
3650 case 1049:
3651 if (option (Opt_secondaryScreen)) 3712 if (option (Opt_secondaryScreen))
3652 if (mode == 0) 3713 if (mode == 0)
3653 scr_cursor (RESTORE); 3714 scr_cursor (RESTORE);
3654 else if (mode == 1) 3715 else if (mode == 1)
3655 scr_cursor (SAVE); 3716 scr_cursor (SAVE);
3664 case 2: /* VT52 mode */ 3725 case 2: /* VT52 mode */
3665 /* oddball mode. should be set regardless of set/reset 3726 /* oddball mode. should be set regardless of set/reset
3666 * parameter. Return from VT52 mode with an ESC < from 3727 * parameter. Return from VT52 mode with an ESC < from
3667 * within VT52 mode 3728 * within VT52 mode
3668 */ 3729 */
3669 PrivMode (1, PrivMode_vt52); 3730 set_privmode (PrivMode_vt52, 1);
3670 break; 3731 break;
3671 case 3: /* 80/132 */ 3732 case 3: /* 80/132 */
3672 if (priv_modes & PrivMode_132OK) 3733 if (priv_modes & PrivMode_132OK)
3673 {
3674 scr_poweron ();
3675 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3734 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3676 }
3677 break; 3735 break;
3678 case 4: /* smooth scrolling */ 3736 case 4: /* smooth scrolling */
3679 set_option (Opt_jumpScroll, !state); 3737 set_option (Opt_jumpScroll, !state);
3680 break; 3738 break;
3681 case 5: /* reverse video */ 3739 case 5: /* reverse video */
3692 if (state) /* orthogonal */ 3750 if (state) /* orthogonal */
3693 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3751 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3694 break; 3752 break;
3695#ifdef scrollBar_esc 3753#ifdef scrollBar_esc
3696 case scrollBar_esc: 3754 case scrollBar_esc:
3697 if (scrollbar_mapping (state)) 3755 if (scrollBar.map (state))
3698 { 3756 {
3699 resize_all_windows (0, 0, 0); 3757 resize_all_windows (0, 0, 0);
3700 scr_touch (true); 3758 scr_touch (true);
3701 } 3759 }
3702 break; 3760 break;
3719 case 1003: 3777 case 1003:
3720 if (state) 3778 if (state)
3721 { 3779 {
3722 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3780 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3723 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3781 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3782 mouse_row = mouse_col = 0;
3724 vt_emask_mouse = PointerMotionMask; 3783 vt_emask_mouse = PointerMotionMask;
3725 } 3784 }
3726 else 3785 else
3727 vt_emask_mouse = NoEventMask; 3786 vt_emask_mouse = NoEventMask;
3787
3728 vt_select_input (); 3788 vt_select_input ();
3729 break; 3789 break;
3730 case 1010: /* scroll to bottom on TTY output inhibit */ 3790 case 1010: /* scroll to bottom on TTY output inhibit */
3731 set_option (Opt_scrollTtyOutput, !state); 3791 set_option (Opt_scrollTtyOutput, !state);
3732 break; 3792 break;
3733 case 1011: /* scroll to bottom on key press */ 3793 case 1011: /* scroll to bottom on key press */
3734 set_option (Opt_scrollTtyKeypress, state); 3794 set_option (Opt_scrollTtyKeypress, state);
3735 break; 3795 break;
3736 case 1047: /* secondary screen w/ clearing last */ 3796 case 1047: /* secondary screen w/ clearing last */
3737 if (option (Opt_secondaryScreen)) 3797 if (option (Opt_secondaryScreen))
3738 if (current_screen != PRIMARY) 3798 if (!state)
3739 scr_erase_screen (2); 3799 scr_erase_screen (2);
3800
3740 scr_change_screen (state); 3801 scr_change_screen (state);
3741 break; 3802 break;
3742 case 1049: /* secondary screen w/ clearing first */ 3803 case 1049: /* secondary screen w/ clearing first */
3804 if (option (Opt_secondaryScreen))
3805 if (state)
3806 scr_cursor (SAVE);
3807
3743 scr_change_screen (state); 3808 scr_change_screen (state);
3809
3744 if (option (Opt_secondaryScreen)) 3810 if (option (Opt_secondaryScreen))
3745 if (current_screen != PRIMARY) 3811 if (state)
3746 scr_erase_screen (2); 3812 scr_erase_screen (2);
3813 else
3814 scr_cursor (RESTORE);
3747 break; 3815 break;
3748 default: 3816 default:
3749 break; 3817 break;
3750 } 3818 }
3751 } 3819 }
3945 4013
3946/* ---------------------------------------------------------------------- */ 4014/* ---------------------------------------------------------------------- */
3947/* Write data to the pty as typed by the user, pasted with the mouse, 4015/* Write data to the pty as typed by the user, pasted with the mouse,
3948 * or generated by us in response to a query ESC sequence. 4016 * or generated by us in response to a query ESC sequence.
3949 */ 4017 */
3950const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4018static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3951 4019
3952void 4020void
3953rxvt_term::tt_write (const char *data, unsigned int len) 4021rxvt_term::tt_write (const char *data, unsigned int len)
3954{ 4022{
3955 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4023 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3967 4035
3968 data += written; 4036 data += written;
3969 len -= written; 4037 len -= written;
3970 } 4038 }
3971 4039
3972 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4040 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3973 4041
3974 memcpy (v_buffer + v_buflen, data, len); 4042 memcpy (v_buffer + v_buflen, data, len);
3975 v_buflen += len; 4043 v_buflen += len;
3976 4044
3977 pty_ev.set (ev::READ | ev::WRITE); 4045 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines