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.404 by root, Sat Feb 2 15:19:55 2008 UTC vs.
Revision 1.450 by sf-exg, Sun Apr 18 11:11:28 2010 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
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
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
1206{ 1199{
1207 make_current (); 1200 make_current ();
1208 1201
1209 if (revents & ev::READ) 1202 if (revents & ev::READ)
1210 // loop, but don't allow a single term to monopolize us 1203 // loop, but don't allow a single term to monopolize us
1211 while (pty_fill ()) 1204 for (int i = CBUFCNT; i-- && pty_fill (); )
1212 if (cmd_parse ()) 1205 cmd_parse ();
1213 break;
1214 1206
1215 if (revents & ev::WRITE) 1207 if (revents & ev::WRITE)
1216 pty_write (); 1208 pty_write ();
1217 1209
1218 refresh_check (); 1210 refresh_check ();
1477 selection_property (ev.xproperty.window, ev.xproperty.atom); 1469 selection_property (ev.xproperty.window, ev.xproperty.atom);
1478 1470
1479 break; 1471 break;
1480 1472
1481 case SelectionClear: 1473 case SelectionClear:
1482 selection_clear (); 1474 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1483 break; 1475 break;
1484 1476
1485 case SelectionNotify: 1477 case SelectionNotify:
1486 if (selection_wait == Sel_normal) 1478 if (selection_wait == Sel_normal)
1487 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1479 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1554 ; 1546 ;
1555 1547
1556 if (scrollBar.state && ev.xany.window == scrollBar.win) 1548 if (scrollBar.state && ev.xany.window == scrollBar.win)
1557 { 1549 {
1558 scrollBar.state = STATE_IDLE; 1550 scrollBar.state = STATE_IDLE;
1559 scrollbar_show (0); 1551 scrollBar.show (0);
1560 } 1552 }
1561 } 1553 }
1562 break; 1554 break;
1563 1555
1564 case MotionNotify: 1556 case MotionNotify:
1663 &unused_root, &unused_child, 1655 &unused_root, &unused_child,
1664 &unused_root_x, &unused_root_y, 1656 &unused_root_x, &unused_root_y,
1665 &ev.xbutton.x, &ev.xbutton.y, 1657 &ev.xbutton.x, &ev.xbutton.y,
1666 &unused_mask); 1658 &unused_mask);
1667 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1659 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1668 scrollbar_size ()); 1660 scrollBar.size ());
1669 want_refresh = 1; 1661 want_refresh = 1;
1670 scrollbar_show (1); 1662 scrollBar.show (1);
1671 } 1663 }
1672 break; 1664 break;
1673 } 1665 }
1674 1666
1675#if defined(CURSOR_BLINK) 1667#if defined(CURSOR_BLINK)
1700#endif 1692#endif
1701 1693
1702 refresh_check (); 1694 refresh_check ();
1703} 1695}
1704 1696
1697#if ENABLE_FRILLS
1698void
1699rxvt_term::set_urgency (bool enable)
1700{
1701 if (enable == urgency_hint)
1702 return;
1703
1704 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1705 {
1706 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1707 XSetWMHints (dpy, parent[0], h);
1708 urgency_hint = enable;
1709 }
1710}
1711#endif
1712
1705void 1713void
1706rxvt_term::focus_in () 1714rxvt_term::focus_in ()
1707{ 1715{
1708 if (!focus) 1716 if (!focus)
1709 { 1717 {
1710 focus = 1; 1718 focus = 1;
1711 want_refresh = 1; 1719 want_refresh = 1;
1712
1713 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1714 1720
1715#if USE_XIM 1721#if USE_XIM
1716 if (Input_Context != NULL) 1722 if (Input_Context != NULL)
1717 { 1723 {
1718 IMSetPosition (); 1724 IMSetPosition ();
1730 scr_recolour (); 1736 scr_recolour ();
1731 } 1737 }
1732#endif 1738#endif
1733#if ENABLE_FRILLS 1739#if ENABLE_FRILLS
1734 if (option (Opt_urgentOnBell)) 1740 if (option (Opt_urgentOnBell))
1735 { 1741 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 1742#endif
1743
1744 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1743 } 1745 }
1744} 1746}
1745 1747
1746void 1748void
1747rxvt_term::focus_out () 1749rxvt_term::focus_out ()
1749 if (focus) 1751 if (focus)
1750 { 1752 {
1751 focus = 0; 1753 focus = 0;
1752 want_refresh = 1; 1754 want_refresh = 1;
1753 1755
1754 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1756#if ENABLE_FRILLS
1755 1757 if (option (Opt_urgentOnBell))
1758 set_urgency (0);
1759#endif
1756#if ENABLE_FRILLS || ISO_14755 1760#if ENABLE_FRILLS || ISO_14755
1757 if (iso14755buf) 1761 if (iso14755buf)
1758 { 1762 {
1759 iso14755buf = 0; 1763 iso14755buf = 0;
1760# if ISO_14755 1764# if ISO_14755
1777 { 1781 {
1778 pix_colors = pix_colors_unfocused; 1782 pix_colors = pix_colors_unfocused;
1779 scr_recolour (); 1783 scr_recolour ();
1780 } 1784 }
1781#endif 1785#endif
1786
1787 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1782 } 1788 }
1783} 1789}
1784 1790
1785void 1791void
1786rxvt_term::update_fade_color (unsigned int idx) 1792rxvt_term::update_fade_color (unsigned int idx)
2028 } 2034 }
2029 2035
2030 if (scrollBar.style == R_SB_XTERM 2036 if (scrollBar.style == R_SB_XTERM
2031 || scrollbar_above_slider (ev.y) 2037 || scrollbar_above_slider (ev.y)
2032 || scrollbar_below_slider (ev.y)) 2038 || scrollbar_below_slider (ev.y))
2033 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2039 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2034 2040
2035 scrollBar.state = STATE_MOTION; 2041 scrollBar.state = STATE_MOTION;
2036 break; 2042 break;
2037 2043
2038 case Button1: 2044 case Button1:
2061 else 2067 else
2062 { 2068 {
2063 scr_page ((ev.button == Button1 ? DN : UP), 2069 scr_page ((ev.button == Button1 ? DN : UP),
2064 (nrow 2070 (nrow
2065 * scrollbar_position (ev.y) 2071 * scrollbar_position (ev.y)
2066 / scrollbar_size ())); 2072 / scrollBar.size ()));
2067 } 2073 }
2068 2074
2069 break; 2075 break;
2070 } 2076 }
2071 } 2077 }
2084 reportmode = !! (priv_modes & PrivMode_mouse_report); 2090 reportmode = !! (priv_modes & PrivMode_mouse_report);
2085 2091
2086 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2092 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2087 { 2093 {
2088 scrollBar.state = STATE_IDLE; 2094 scrollBar.state = STATE_IDLE;
2089 scrollbar_show (0); 2095 scrollBar.show (0);
2090 } 2096 }
2091 2097
2092#ifdef SELECTION_SCROLLING 2098#ifdef SELECTION_SCROLLING
2093 sel_scroll_ev.stop(); 2099 sel_scroll_ev.stop();
2094#endif 2100#endif
2144 selection_make (ev.time); 2150 selection_make (ev.time);
2145 break; 2151 break;
2146 2152
2147 case Button2: 2153 case Button2:
2148 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2154 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2149 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2155 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2150 break; 2156 break;
2151 2157
2152#ifdef MOUSE_WHEEL 2158#ifdef MOUSE_WHEEL
2153 case Button4: 2159 case Button4:
2154 case Button5: 2160 case Button5:
2177 } 2183 }
2178 else 2184 else
2179# endif 2185# endif
2180 { 2186 {
2181 scr_page (v, i); 2187 scr_page (v, i);
2182 scrollbar_show (1); 2188 scrollBar.show (1);
2183 } 2189 }
2184 } 2190 }
2185 break; 2191 break;
2186#endif 2192#endif
2187 } 2193 }
2188 } 2194 }
2189} 2195}
2190 2196
2191/*}}} */ 2197/*}}} */
2192 2198
2193bool 2199void
2194rxvt_term::cmd_parse () 2200rxvt_term::cmd_parse ()
2195{ 2201{
2196 bool flag = false;
2197 wchar_t ch = NOCHAR; 2202 wchar_t ch = NOCHAR;
2198 char *seq_begin; // remember start of esc-sequence here 2203 char *seq_begin; // remember start of esc-sequence here
2199 2204
2200 for (;;) 2205 for (;;)
2201 { 2206 {
2202 if (ch == NOCHAR) 2207 if (expect_false (ch == NOCHAR))
2203 { 2208 {
2204 seq_begin = cmdbuf_ptr; 2209 seq_begin = cmdbuf_ptr;
2205 ch = next_char (); 2210 ch = next_char ();
2206 2211
2207 if (ch == NOCHAR) 2212 if (ch == NOCHAR)
2208 break; 2213 break;
2209 } 2214 }
2210 2215
2211 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2216 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2212 { 2217 {
2213 if (!seen_input) 2218 if (expect_false (!seen_input))
2214 { 2219 {
2215 seen_input = 1; 2220 seen_input = 1;
2216 // many badly-written programs (e.g. jed) contain a race condition: 2221 // many badly-written programs (e.g. jed) contain a race condition:
2217 // they first read the screensize and then install a SIGWINCH handler. 2222 // they first read the screensize and then install a SIGWINCH handler.
2218 // some window managers resize the window early, and these programs 2223 // some window managers resize the window early, and these programs
2231 wchar_t *str = buf; 2236 wchar_t *str = buf;
2232 wchar_t *eol = str + min (ncol, UBUFSIZ); 2237 wchar_t *eol = str + min (ncol, UBUFSIZ);
2233 2238
2234 for (;;) 2239 for (;;)
2235 { 2240 {
2236 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2241 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2237 break; 2242 break;
2238 2243
2239 *str++ = ch; 2244 *str++ = ch;
2240 2245
2241 if (ch == C0_LF || str >= eol) 2246 if (expect_false (ch == C0_LF || str >= eol))
2242 { 2247 {
2243 if (ch == C0_LF) 2248 if (ch == C0_LF)
2244 nlines++; 2249 nlines++;
2245 2250
2246 refresh_count++; 2251 refresh_count++;
2295 * What the heck we'll cheat and only refresh less than every page-full. 2300 * What the heck we'll cheat and only refresh less than every page-full.
2296 * if skipScroll is enabled. 2301 * if skipScroll is enabled.
2297 */ 2302 */
2298 if (refreshnow) 2303 if (refreshnow)
2299 { 2304 {
2300 flag = true;
2301 scr_refresh (); 2305 scr_refresh ();
2302 want_refresh = 1; 2306 want_refresh = 1;
2303 } 2307 }
2304
2305 } 2308 }
2306 else 2309 else
2307 { 2310 {
2308 try 2311 try
2309 { 2312 {
2317 } 2320 }
2318 2321
2319 ch = NOCHAR; 2322 ch = NOCHAR;
2320 } 2323 }
2321 } 2324 }
2322
2323 return flag;
2324} 2325}
2325 2326
2326// read the next character 2327// read the next character
2327wchar_t 2328wchar_t
2328rxvt_term::next_char () NOTHROW 2329rxvt_term::next_char () NOTHROW
2329{ 2330{
2330 while (cmdbuf_ptr < cmdbuf_endp) 2331 while (cmdbuf_ptr < cmdbuf_endp)
2331 { 2332 {
2332 // assume 7-bit to be ascii ALWAYS 2333 // assume 7-bit to be ascii ALWAYS
2333 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2334 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2334 return *cmdbuf_ptr++; 2335 return *cmdbuf_ptr++;
2335 2336
2336 wchar_t wc; 2337 wchar_t wc;
2337 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2338 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2338 2339
2342 cmdbuf_ptr = cmdbuf_endp; 2343 cmdbuf_ptr = cmdbuf_endp;
2343 break; 2344 break;
2344 } 2345 }
2345 2346
2346 if (len == (size_t)-1) 2347 if (len == (size_t)-1)
2348 {
2349 mbstate.reset (); // reset now undefined conversion state
2347 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2350 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2351 }
2348 2352
2349 // assume wchar == unicode 2353 // assume wchar == unicode
2350 cmdbuf_ptr += len; 2354 cmdbuf_ptr += len;
2351 return wc & UNICODE_MASK; 2355 return wc & UNICODE_MASK;
2352 } 2356 }
2396/*----------------------------------------------------------------------*/ 2400/*----------------------------------------------------------------------*/
2397#ifdef PRINTPIPE 2401#ifdef PRINTPIPE
2398FILE * 2402FILE *
2399rxvt_term::popen_printer () 2403rxvt_term::popen_printer ()
2400{ 2404{
2401 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2405 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2402 2406
2403 if (stream == NULL) 2407 if (stream == NULL)
2404 rxvt_warn ("can't open printer pipe, not printing.\n"); 2408 rxvt_warn ("can't open printer pipe, not printing.\n");
2405 2409
2406 return stream; 2410 return stream;
2417 * simulate attached vt100 printer 2421 * simulate attached vt100 printer
2418 */ 2422 */
2419void 2423void
2420rxvt_term::process_print_pipe () 2424rxvt_term::process_print_pipe ()
2421{ 2425{
2422 int done; 2426 FILE *fd = popen_printer ();
2423 FILE *fd;
2424 2427
2425 if ((fd = popen_printer ()) == NULL) 2428 if (!fd)
2426 return; 2429 return;
2427 2430
2428 /* 2431 /*
2429 * Send all input to the printer until either ESC[4i or ESC[?4i 2432 * Send all input to the printer until either ESC[4i or ESC[?4i
2430 * is received. 2433 * is received.
2431 */ 2434 */
2432 for (done = 0; !done;) 2435 for (int done = 0; !done; )
2433 { 2436 {
2434 unsigned char buf[8]; 2437 unsigned char buf[8];
2435 unicode_t ch; 2438 unicode_t ch;
2436 unsigned int i, len; 2439 unsigned int i, len;
2437 2440
2582 break; 2585 break;
2583 case 'Z': /* identify the terminal type */ 2586 case 'Z': /* identify the terminal type */
2584 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2587 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2585 break; 2588 break;
2586 case '<': /* turn off VT52 mode */ 2589 case '<': /* turn off VT52 mode */
2587 PrivMode (0, PrivMode_vt52); 2590 set_privmode (PrivMode_vt52, 0);
2588 break; 2591 break;
2589 case 'F': /* use special graphics character set */ 2592 case 'F': /* use special graphics character set */
2590 case 'G': /* use regular character set */ 2593 case 'G': /* use regular character set */
2591 /* unimplemented */ 2594 /* unimplemented */
2592 break; 2595 break;
2646 scr_forwardindex (); 2649 scr_forwardindex ();
2647 break; 2650 break;
2648#endif 2651#endif
2649 case '=': 2652 case '=':
2650 case '>': 2653 case '>':
2651 PrivMode ((ch == '='), PrivMode_aplKP); 2654 set_privmode (PrivMode_aplKP, ch == '=');
2652 break; 2655 break;
2653 2656
2654 case C1_40: 2657 case C1_40:
2655 cmd_getc (); 2658 cmd_getc ();
2656 break; 2659 break;
2695 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2698 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2696 case C1_SCI: /* ESC Z */ 2699 case C1_SCI: /* ESC Z */
2697 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2700 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2698 break; /* steal obsolete ESC [ c */ 2701 break; /* steal obsolete ESC [ c */
2699 2702
2700 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2703 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2701 case C1_CSI: /* ESC [ */ 2704 case C1_CSI: /* ESC [ */
2702 process_csi_seq (); 2705 process_csi_seq ();
2703 break; 2706 break;
2704 2707
2705 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2708 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2706 case C1_OSC: /* ESC ] */ 2709 case C1_OSC: /* ESC ] */
2707 process_osc_seq (); 2710 process_osc_seq ();
2708 break; 2711 break;
2709 2712
2710 /* 8.3.106: RESET TO INITIAL STATE */ 2713 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2711 case 'c': 2714 case 'c':
2712 mbstate.reset (); 2715 mbstate.reset ();
2713 scr_poweron (); 2716 scr_poweron ();
2714 scrollbar_show (1); 2717 scrollBar.show (1);
2715 break; 2718 break;
2716 2719
2717 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2720 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2718 case 'n': 2721 case 'n':
2719 scr_charset_choose (2); 2722 scr_charset_choose (2);
2770 2773
2771 nargs = 0; 2774 nargs = 0;
2772 2775
2773 priv = 0; 2776 priv = 0;
2774 ch = cmd_getc (); 2777 ch = cmd_getc ();
2775 if (ch >= '<' && ch <= '?') 2778 if ((ch >= '<' && ch <= '?') || ch == '!')
2776 { 2779 {
2777 /* '<' '=' '>' '?' */ 2780 /* '<' '=' '>' '?' '!' */
2778 priv = ch; 2781 priv = ch;
2779 ch = cmd_getc (); 2782 ch = cmd_getc ();
2780 } 2783 }
2781 2784
2782 /* read any numerical arguments */ 2785 /* read any numerical arguments */
2836 2839
2837 case '?': 2840 case '?':
2838 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2841 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2839 process_terminal_mode (ch, priv, nargs, arg); 2842 process_terminal_mode (ch, priv, nargs, arg);
2840 break; 2843 break;
2844
2845 case '!':
2846 if (ch == CSI_70)
2847 {
2848 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2849 scr_soft_reset ();
2850
2851 static const int pm_h[] = { 7, 25 };
2852 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2853
2854 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2855 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2841 } 2856 }
2857 break;
2858 }
2859
2842 return; 2860 return;
2843 } 2861 }
2844 2862
2845 switch (ch) 2863 switch (ch)
2846 { 2864 {
3275 3293
3276/* 3294/*
3277 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3295 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3278 */ 3296 */
3279void 3297void
3280rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3298rxvt_term::process_xterm_seq (int op, char *str, char resp)
3281{ 3299{
3282 int color; 3300 int color;
3283 char *buf, *name; 3301 char *buf, *name;
3284 bool query = str[0] == '?' && !str[1]; 3302 bool query = str[0] == '?' && !str[1];
3285 int saveop = op; 3303 int saveop = op;
3326 3344
3327 XFree (value); 3345 XFree (value);
3328 } 3346 }
3329 else 3347 else
3330 { 3348 {
3331 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3349 char *eq = strchr (str, '=');
3332 3350
3333 if (eq) 3351 if (eq)
3334 { 3352 {
3335 *eq = 0; 3353 *eq = 0;
3336 set_utf8_property (display->atom (str), eq + 1); 3354 set_utf8_property (display->atom (str), eq + 1);
3376 process_color_seq (op, Color_pointer_fg, str, resp); 3394 process_color_seq (op, Color_pointer_fg, str, resp);
3377 break; 3395 break;
3378 case XTerm_Color_pointer_bg: 3396 case XTerm_Color_pointer_bg:
3379 process_color_seq (op, Color_pointer_bg, str, resp); 3397 process_color_seq (op, Color_pointer_bg, str, resp);
3380 break; 3398 break;
3399#ifdef OPTION_HC
3400 case XTerm_Color_HC:
3401 process_color_seq (op, Color_HC, str, resp);
3402 break;
3403 case XTerm_Color_HTC:
3404 process_color_seq (op, Color_HTC, str, resp);
3405 break;
3406#endif
3381#ifndef NO_BOLD_UNDERLINE_REVERSE 3407#ifndef NO_BOLD_UNDERLINE_REVERSE
3382 case XTerm_Color_RV:
3383 process_color_seq (op, Color_RV, str, resp);
3384 break;
3385 case Rxvt_Color_BD:
3386 case URxvt_Color_BD: 3408 case URxvt_Color_BD:
3387 process_color_seq (op, Color_BD, str, resp); 3409 process_color_seq (op, Color_BD, str, resp);
3388 break; 3410 break;
3389 case Rxvt_Color_UL:
3390 case URxvt_Color_UL: 3411 case URxvt_Color_UL:
3391 process_color_seq (op, Color_UL, str, resp); 3412 process_color_seq (op, Color_UL, str, resp);
3392 break; 3413 break;
3393 case URxvt_Color_IT: 3414 case URxvt_Color_IT:
3394 process_color_seq (op, Color_IT, str, resp); 3415 process_color_seq (op, Color_IT, str, resp);
3395 break; 3416 break;
3396#endif 3417#endif
3418 case URxvt_Color_border:
3419 process_color_seq (op, Color_border, str, resp);
3420 break;
3397#if ENABLE_TRANSPARENCY 3421#if ENABLE_TRANSPARENCY
3398 case URxvt_Color_tint: 3422 case URxvt_Color_tint:
3399 process_color_seq (op, Color_tint, str, resp); 3423 process_color_seq (op, Color_tint, str, resp);
3400 { 3424 {
3401 bool changed = false; 3425 bool changed = false;
3416 case Rxvt_Pixmap: 3440 case Rxvt_Pixmap:
3417 if (!strcmp (str, "?")) 3441 if (!strcmp (str, "?"))
3418 { 3442 {
3419 char str[256]; 3443 char str[256];
3420 3444
3421 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3445 sprintf (str, "[%dx%d+%d+%d]",
3422 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3446 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3423 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3447 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3424 process_xterm_seq (XTerm_title, str, CHAR_ST); 3448 process_xterm_seq (XTerm_title, str, CHAR_ST);
3425 } 3449 }
3426 else 3450 else
3525 break; 3549 break;
3526#endif 3550#endif
3527 3551
3528#if ENABLE_PERL 3552#if ENABLE_PERL
3529 case URxvt_perl: 3553 case URxvt_perl:
3530 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3554 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3531 ; // no responses yet
3532 break; 3555 break;
3533#endif 3556#endif
3534 } 3557 }
3535} 3558}
3536/*----------------------------------------------------------------------*/ 3559/*----------------------------------------------------------------------*/
3559 { 3582 {
3560 if (mode == 'r') 3583 if (mode == 'r')
3561 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3584 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3562 else 3585 else
3563 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3586 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3564 PrivMode (state, bit); 3587 set_privmode (bit, state);
3565 } 3588 }
3566 3589
3567 return state; 3590 return state;
3568} 3591}
3569 3592
3577 static const struct 3600 static const struct
3578 { 3601 {
3579 const int argval; 3602 const int argval;
3580 const unsigned long bit; 3603 const unsigned long bit;
3581 } argtopriv[] = { 3604 } argtopriv[] = {
3582 { 1, PrivMode_aplCUR }, 3605 { 1, PrivMode_aplCUR }, // DECCKM
3583 { 2, PrivMode_vt52 }, 3606 { 2, PrivMode_vt52 },
3584 { 3, PrivMode_132 }, 3607 { 3, PrivMode_132 }, // DECCOLM
3585 { 4, PrivMode_smoothScroll }, 3608 { 4, PrivMode_smoothScroll }, // DECSCLM
3586 { 5, PrivMode_rVideo }, 3609 { 5, PrivMode_rVideo }, // DECSCNM
3587 { 6, PrivMode_relOrigin }, 3610 { 6, PrivMode_relOrigin }, // DECOM
3588 { 7, PrivMode_Autowrap }, 3611 { 7, PrivMode_Autowrap }, // DECAWM
3589 // 8, bi-directional support mode 3612 // 8, auto-repeat keys // DECARM
3590 { 9, PrivMode_MouseX10 }, 3613 { 9, PrivMode_MouseX10 },
3591 // 18, 19 printing-related 3614 // 18 end FF to printer after print screen
3615 // 19 Print screen prints full screen/scorll region
3592 { 25, PrivMode_VisibleCursor }, 3616 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3593#ifdef scrollBar_esc 3617#ifdef scrollBar_esc
3594 { scrollBar_esc, PrivMode_scrollBar }, 3618 { scrollBar_esc, PrivMode_scrollBar },
3595#endif 3619#endif
3596 { 35, PrivMode_ShiftKeys }, // rxvt extension 3620 { 35, PrivMode_ShiftKeys }, // rxvt extension
3621 // 38, tektronix mode // DECTEK
3597 { 40, PrivMode_132OK }, 3622 { 40, PrivMode_132OK },
3598 // 41 xterm more fixes NYI 3623 // 41 xterm more fixes NYI
3599 // 45 margin bell NYI 3624 // 45 margin bell NYI
3600 // 46 start logging 3625 // 46 start logging
3601 { 47, PrivMode_Screen }, 3626 { 47, PrivMode_Screen },
3602 { 66, PrivMode_aplKP }, 3627 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3603#ifndef NO_BACKSPACE_KEY 3628#ifndef NO_BACKSPACE_KEY
3604 { 67, PrivMode_BackSpace }, 3629 { 67, PrivMode_BackSpace }, // DECBKM
3605#endif 3630#endif
3606 { 1000, PrivMode_MouseX11 }, 3631 { 1000, PrivMode_MouseX11 },
3607 { 1002, PrivMode_MouseBtnEvent }, 3632 { 1002, PrivMode_MouseBtnEvent },
3608 { 1003, PrivMode_MouseAnyEvent }, 3633 { 1003, PrivMode_MouseAnyEvent },
3609 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3634 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3648 3673
3649 scr_touch (true); 3674 scr_touch (true);
3650 break; 3675 break;
3651#endif 3676#endif
3652 case 1048: /* alternative cursor save */ 3677 case 1048: /* alternative cursor save */
3653 case 1049:
3654 if (option (Opt_secondaryScreen)) 3678 if (option (Opt_secondaryScreen))
3655 if (mode == 0) 3679 if (mode == 0)
3656 scr_cursor (RESTORE); 3680 scr_cursor (RESTORE);
3657 else if (mode == 1) 3681 else if (mode == 1)
3658 scr_cursor (SAVE); 3682 scr_cursor (SAVE);
3667 case 2: /* VT52 mode */ 3691 case 2: /* VT52 mode */
3668 /* oddball mode. should be set regardless of set/reset 3692 /* oddball mode. should be set regardless of set/reset
3669 * parameter. Return from VT52 mode with an ESC < from 3693 * parameter. Return from VT52 mode with an ESC < from
3670 * within VT52 mode 3694 * within VT52 mode
3671 */ 3695 */
3672 PrivMode (1, PrivMode_vt52); 3696 set_privmode (PrivMode_vt52, 1);
3673 break; 3697 break;
3674 case 3: /* 80/132 */ 3698 case 3: /* 80/132 */
3675 if (priv_modes & PrivMode_132OK) 3699 if (priv_modes & PrivMode_132OK)
3676 {
3677 scr_poweron ();
3678 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3700 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3679 }
3680 break; 3701 break;
3681 case 4: /* smooth scrolling */ 3702 case 4: /* smooth scrolling */
3682 set_option (Opt_jumpScroll, !state); 3703 set_option (Opt_jumpScroll, !state);
3683 break; 3704 break;
3684 case 5: /* reverse video */ 3705 case 5: /* reverse video */
3695 if (state) /* orthogonal */ 3716 if (state) /* orthogonal */
3696 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3717 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3697 break; 3718 break;
3698#ifdef scrollBar_esc 3719#ifdef scrollBar_esc
3699 case scrollBar_esc: 3720 case scrollBar_esc:
3700 if (scrollbar_mapping (state)) 3721 if (scrollBar.map (state))
3701 { 3722 {
3702 resize_all_windows (0, 0, 0); 3723 resize_all_windows (0, 0, 0);
3703 scr_touch (true); 3724 scr_touch (true);
3704 } 3725 }
3705 break; 3726 break;
3726 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3747 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3727 vt_emask_mouse = PointerMotionMask; 3748 vt_emask_mouse = PointerMotionMask;
3728 } 3749 }
3729 else 3750 else
3730 vt_emask_mouse = NoEventMask; 3751 vt_emask_mouse = NoEventMask;
3752
3731 vt_select_input (); 3753 vt_select_input ();
3732 break; 3754 break;
3733 case 1010: /* scroll to bottom on TTY output inhibit */ 3755 case 1010: /* scroll to bottom on TTY output inhibit */
3734 set_option (Opt_scrollTtyOutput, !state); 3756 set_option (Opt_scrollTtyOutput, !state);
3735 break; 3757 break;
3736 case 1011: /* scroll to bottom on key press */ 3758 case 1011: /* scroll to bottom on key press */
3737 set_option (Opt_scrollTtyKeypress, state); 3759 set_option (Opt_scrollTtyKeypress, state);
3738 break; 3760 break;
3739 case 1047: /* secondary screen w/ clearing last */ 3761 case 1047: /* secondary screen w/ clearing last */
3740 if (option (Opt_secondaryScreen)) 3762 if (option (Opt_secondaryScreen))
3741 if (current_screen != PRIMARY) 3763 if (!state)
3742 scr_erase_screen (2); 3764 scr_erase_screen (2);
3765
3743 scr_change_screen (state); 3766 scr_change_screen (state);
3744 break; 3767 break;
3745 case 1049: /* secondary screen w/ clearing first */ 3768 case 1049: /* secondary screen w/ clearing first */
3769 if (option (Opt_secondaryScreen))
3770 if (state)
3771 scr_cursor (SAVE);
3772
3746 scr_change_screen (state); 3773 scr_change_screen (state);
3774
3747 if (option (Opt_secondaryScreen)) 3775 if (option (Opt_secondaryScreen))
3748 if (current_screen != PRIMARY) 3776 if (state)
3749 scr_erase_screen (2); 3777 scr_erase_screen (2);
3778 else
3779 scr_cursor (RESTORE);
3750 break; 3780 break;
3751 default: 3781 default:
3752 break; 3782 break;
3753 } 3783 }
3754 } 3784 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines