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.389 by ayin, Mon Dec 31 13:50:56 2007 UTC vs.
Revision 1.446 by root, Fri Apr 2 19:27:38 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
1079{ 1069{
1080 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1070 if (scr_refresh_rend (RS_Blink, RS_Blink))
1081 { 1071 {
1082 hidden_text = !hidden_text; 1072 hidden_text = !hidden_text;
1083 want_refresh = 1; 1073 want_refresh = 1;
1084 refresh_check (); 1074 refresh_check ();
1085 } 1075 }
1086 else 1076 else
1087 w.stop (); 1077 w.stop ();
1088} 1078}
1089#endif 1079#endif
1090 1080
1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1081#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1092void 1082void
1093rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1083rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1094{ 1084{
1095 if ((scrollbar_isUp () || scrollbar_isDn ()) 1085 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1096 && scr_page (scrollbar_isUp () ? UP : DN, 1)) 1086 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1097 { 1087 {
1098 want_refresh = 1; 1088 want_refresh = 1;
1099 refresh_check (); 1089 refresh_check ();
1100 } 1090 }
1101 else 1091 else
1145 { 1135 {
1146 // this should really be sched_yield(), but the linux guys thought 1136 // this should really be sched_yield(), but the linux guys thought
1147 // that giving a process calling sched_yield () less cpu time than 1137 // that giving a process calling sched_yield () less cpu time than
1148 // ones with high nice levels is a useful thing to do. It surely is is 1138 // ones with high nice levels is a useful thing to do. It surely is is
1149 // allowed by the sus... as is returning ENOSYS. 1139 // allowed by the sus... as is returning ENOSYS.
1140 // since the linux guys additionally thought that breaking the only
1141 // known workaround against their unusable sched_yield hack is cool,
1142 // we just nanosleep a bit and hope for the best.
1150 1143
1151 struct timespec ts = { 0, 0 }; 1144 struct timespec ts = { 0, 1000 };
1152 nanosleep (&ts, 0); 1145 nanosleep (&ts, 0);
1153 1146
1154 w.stop (); 1147 w.stop ();
1155 } 1148 }
1156 1149
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 ();
1438 && ev.xfocus.mode != NotifyGrab) 1430 && ev.xfocus.mode != NotifyGrab)
1439 focus_out (); 1431 focus_out ();
1440 break; 1432 break;
1441 1433
1442 case ConfigureNotify: 1434 case ConfigureNotify:
1443 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n", 1435 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1444 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y, 1436 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1445 szHint.width, szHint.height); */ 1437 szHint.width, szHint.height);*/
1446 if (ev.xconfigure.window == parent[0]) 1438 if (ev.xconfigure.window == parent[0])
1447 { 1439 {
1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1440 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1449 ; 1441 ;
1450 1442
1455 } 1447 }
1456 else 1448 else
1457 { 1449 {
1458#ifdef HAVE_BG_PIXMAP 1450#ifdef HAVE_BG_PIXMAP
1459 if (bgPixmap.window_position_sensitive ()) 1451 if (bgPixmap.window_position_sensitive ())
1452 {
1453 if (mapped)
1460 update_background (); 1454 update_background ();
1455 else
1456 bgPixmap.invalidate ();
1457 }
1461#endif 1458#endif
1462 } 1459 }
1463 1460
1464 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1461 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1465 } 1462 }
1472 selection_property (ev.xproperty.window, ev.xproperty.atom); 1469 selection_property (ev.xproperty.window, ev.xproperty.atom);
1473 1470
1474 break; 1471 break;
1475 1472
1476 case SelectionClear: 1473 case SelectionClear:
1477 selection_clear (); 1474 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1478 break; 1475 break;
1479 1476
1480 case SelectionNotify: 1477 case SelectionNotify:
1481 if (selection_wait == Sel_normal) 1478 if (selection_wait == Sel_normal)
1482 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1479 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1485 case SelectionRequest: 1482 case SelectionRequest:
1486 selection_send (ev.xselectionrequest); 1483 selection_send (ev.xselectionrequest);
1487 break; 1484 break;
1488 1485
1489 case MapNotify: 1486 case MapNotify:
1487#ifdef HAVE_BG_PIXMAP
1488 /* This is needed spcifically to fix the case of no window manager or a
1489 * non-reparenting window manager. In those cases we never get first
1490 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1491 * care of multiplicity of ConfigureNotify events arriwing while WM does
1492 * reparenting.
1493 * We should not render background immidiately, as there could be several
1494 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1495 * by scheduling background redraw as soon as we can, but giving a short
1496 * bit of time for ConfigureNotifies to arrive.
1497 * We should render background PRIOR to drawing any text, but AFTER all
1498 * of ConfigureNotifys for the best results.
1499 */
1500 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1501 update_background_ev.start (0.025);
1502#endif
1490 mapped = 1; 1503 mapped = 1;
1491#ifdef TEXT_BLINK 1504#ifdef TEXT_BLINK
1492 text_blink_ev.start (); 1505 text_blink_ev.start ();
1493#endif 1506#endif
1494 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1507 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1532 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1545 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1533 ; 1546 ;
1534 1547
1535 if (scrollBar.state && ev.xany.window == scrollBar.win) 1548 if (scrollBar.state && ev.xany.window == scrollBar.win)
1536 { 1549 {
1537 scrollBar.setIdle (); 1550 scrollBar.state = STATE_IDLE;
1538 scrollbar_show (0); 1551 scrollBar.show (0);
1539 } 1552 }
1540 } 1553 }
1541 break; 1554 break;
1542 1555
1543 case MotionNotify: 1556 case MotionNotify:
1630#ifdef MOUSE_THRESHOLD 1643#ifdef MOUSE_THRESHOLD
1631 } 1644 }
1632#endif 1645#endif
1633 } 1646 }
1634 } 1647 }
1635 else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win) 1648 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1636 { 1649 {
1637 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1650 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1638 MotionNotify, &ev)) 1651 MotionNotify, &ev))
1639 ; 1652 ;
1640 1653
1642 &unused_root, &unused_child, 1655 &unused_root, &unused_child,
1643 &unused_root_x, &unused_root_y, 1656 &unused_root_x, &unused_root_y,
1644 &ev.xbutton.x, &ev.xbutton.y, 1657 &ev.xbutton.x, &ev.xbutton.y,
1645 &unused_mask); 1658 &unused_mask);
1646 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1659 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1647 scrollbar_size ()); 1660 scrollBar.size ());
1648 want_refresh = 1; 1661 want_refresh = 1;
1649 scrollbar_show (1); 1662 scrollBar.show (1);
1650 } 1663 }
1651 break; 1664 break;
1652 } 1665 }
1653 1666
1654#if defined(CURSOR_BLINK) 1667#if defined(CURSOR_BLINK)
1679#endif 1692#endif
1680 1693
1681 refresh_check (); 1694 refresh_check ();
1682} 1695}
1683 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
1684void 1713void
1685rxvt_term::focus_in () 1714rxvt_term::focus_in ()
1686{ 1715{
1687 if (!focus) 1716 if (!focus)
1688 { 1717 {
1689 focus = 1; 1718 focus = 1;
1690 want_refresh = 1; 1719 want_refresh = 1;
1691
1692 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1693 1720
1694#if USE_XIM 1721#if USE_XIM
1695 if (Input_Context != NULL) 1722 if (Input_Context != NULL)
1696 { 1723 {
1697 IMSetPosition (); 1724 IMSetPosition ();
1709 scr_recolour (); 1736 scr_recolour ();
1710 } 1737 }
1711#endif 1738#endif
1712#if ENABLE_FRILLS 1739#if ENABLE_FRILLS
1713 if (option (Opt_urgentOnBell)) 1740 if (option (Opt_urgentOnBell))
1714 { 1741 set_urgency (0);
1715 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1716 {
1717 h->flags &= ~XUrgencyHint;
1718 XSetWMHints (dpy, parent[0], h);
1719 }
1720 }
1721#endif 1742#endif
1743
1744 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1722 } 1745 }
1723} 1746}
1724 1747
1725void 1748void
1726rxvt_term::focus_out () 1749rxvt_term::focus_out ()
1728 if (focus) 1751 if (focus)
1729 { 1752 {
1730 focus = 0; 1753 focus = 0;
1731 want_refresh = 1; 1754 want_refresh = 1;
1732 1755
1733 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1756#if ENABLE_FRILLS
1734 1757 if (option (Opt_urgentOnBell))
1758 set_urgency (0);
1759#endif
1735#if ENABLE_FRILLS || ISO_14755 1760#if ENABLE_FRILLS || ISO_14755
1736 if (iso14755buf) 1761 if (iso14755buf)
1737 { 1762 {
1738 iso14755buf = 0; 1763 iso14755buf = 0;
1739# if ISO_14755 1764# if ISO_14755
1756 { 1781 {
1757 pix_colors = pix_colors_unfocused; 1782 pix_colors = pix_colors_unfocused;
1758 scr_recolour (); 1783 scr_recolour ();
1759 } 1784 }
1760#endif 1785#endif
1786
1787 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1761 } 1788 }
1762} 1789}
1763 1790
1764void 1791void
1765rxvt_term::update_fade_color (unsigned int idx) 1792rxvt_term::update_fade_color (unsigned int idx)
1926 /* 1953 /*
1927 * Scrollbar window processing of button press 1954 * Scrollbar window processing of button press
1928 */ 1955 */
1929 if (scrollBar.state && ev.window == scrollBar.win) 1956 if (scrollBar.state && ev.window == scrollBar.win)
1930 { 1957 {
1931 scrollBar.setIdle (); 1958 page_dirn direction = NO_DIR;
1959
1960 if (scrollBar.upButton (ev.y))
1961 direction = UP; /* up */
1962 else if (scrollBar.dnButton (ev.y))
1963 direction = DN; /* down */
1964
1965 scrollBar.state = STATE_IDLE;
1932 /* 1966 /*
1933 * Rxvt-style scrollbar: 1967 * Rxvt-style scrollbar:
1934 * move up if mouse is above slider 1968 * move up if mouse is above slider
1935 * move dn if mouse is below slider 1969 * move dn if mouse is below slider
1936 * 1970 *
1945 /* 1979 /*
1946 * Mouse report disabled scrollbar: 1980 * Mouse report disabled scrollbar:
1947 * arrow buttons - send up/down 1981 * arrow buttons - send up/down
1948 * click on scrollbar - send pageup/down 1982 * click on scrollbar - send pageup/down
1949 */ 1983 */
1950 if ((scrollBar.style == R_SB_NEXT 1984 if (direction == UP)
1951 && scrollbarnext_upButton (ev.y))
1952 || (scrollBar.style == R_SB_RXVT
1953 && scrollbarrxvt_upButton (ev.y)))
1954 tt_printf ("\033[A"); 1985 tt_printf ("\033[A");
1955 else if ((scrollBar.style == R_SB_NEXT 1986 else if (direction == DN)
1956 && scrollbarnext_dnButton (ev.y))
1957 || (scrollBar.style == R_SB_RXVT
1958 && scrollbarrxvt_dnButton (ev.y)))
1959 tt_printf ("\033[B"); 1987 tt_printf ("\033[B");
1960 else 1988 else
1961 switch (ev.button) 1989 switch (ev.button)
1962 { 1990 {
1963 case Button2: 1991 case Button2:
1971 break; 1999 break;
1972 } 2000 }
1973 } 2001 }
1974 else 2002 else
1975#endif /* NO_SCROLLBAR_REPORT */ 2003#endif /* NO_SCROLLBAR_REPORT */
1976
1977 {
1978 char upordown = 0;
1979
1980 if (scrollBar.style == R_SB_NEXT)
1981 { 2004 {
1982 if (scrollbarnext_upButton (ev.y)) 2005 if (direction != NO_DIR)
1983 upordown = -1; /* up */
1984 else if (scrollbarnext_dnButton (ev.y))
1985 upordown = 1; /* down */
1986 }
1987 else if (scrollBar.style == R_SB_RXVT)
1988 {
1989 if (scrollbarrxvt_upButton (ev.y))
1990 upordown = -1; /* up */
1991 else if (scrollbarrxvt_dnButton (ev.y))
1992 upordown = 1; /* down */
1993 }
1994
1995 if (upordown)
1996 { 2006 {
1997#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2007#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1998 if (!cont_scroll_ev.is_active ()) 2008 if (!cont_scroll_ev.is_active ())
1999 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2009 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2000#endif 2010#endif
2001 if (scr_page (upordown < 0 ? UP : DN, 1)) 2011 if (scr_page (direction, 1))
2002 { 2012 {
2003 if (upordown < 0) 2013 if (direction == UP)
2004 scrollBar.setUp (); 2014 scrollBar.state = STATE_UP;
2005 else 2015 else
2006 scrollBar.setDn (); 2016 scrollBar.state = STATE_DOWN;
2007 } 2017 }
2008 } 2018 }
2009 else 2019 else
2010 switch (ev.button) 2020 switch (ev.button)
2011 { 2021 {
2024 } 2034 }
2025 2035
2026 if (scrollBar.style == R_SB_XTERM 2036 if (scrollBar.style == R_SB_XTERM
2027 || scrollbar_above_slider (ev.y) 2037 || scrollbar_above_slider (ev.y)
2028 || scrollbar_below_slider (ev.y)) 2038 || scrollbar_below_slider (ev.y))
2029 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2039 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2030 2040
2031 scrollBar.setMotion (); 2041 scrollBar.state = STATE_MOTION;
2032 break; 2042 break;
2033 2043
2034 case Button1: 2044 case Button1:
2035 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2045 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2036 csrO = ev.y - scrollBar.top; 2046 csrO = ev.y - scrollBar.top;
2050 scr_page (DN, nrow - 1); 2060 scr_page (DN, nrow - 1);
2051# else 2061# else
2052 scr_page (DN, nrow / 4); 2062 scr_page (DN, nrow / 4);
2053# endif 2063# endif
2054 else 2064 else
2055 scrollBar.setMotion (); 2065 scrollBar.state = STATE_MOTION;
2056 } 2066 }
2057 else 2067 else
2058 { 2068 {
2059 scr_page ((ev.button == Button1 ? DN : UP), 2069 scr_page ((ev.button == Button1 ? DN : UP),
2060 (nrow 2070 (nrow
2061 * scrollbar_position (ev.y) 2071 * scrollbar_position (ev.y)
2062 / scrollbar_size ())); 2072 / scrollBar.size ()));
2063 } 2073 }
2064 2074
2065 break; 2075 break;
2066 } 2076 }
2067 } 2077 }
2077 2087
2078 csrO = 0; /* reset csr Offset */ 2088 csrO = 0; /* reset csr Offset */
2079 if (!bypass_keystate) 2089 if (!bypass_keystate)
2080 reportmode = !! (priv_modes & PrivMode_mouse_report); 2090 reportmode = !! (priv_modes & PrivMode_mouse_report);
2081 2091
2082 if (scrollbar_isUpDn ()) 2092 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2083 { 2093 {
2084 scrollBar.setIdle (); 2094 scrollBar.state = STATE_IDLE;
2085 scrollbar_show (0); 2095 scrollBar.show (0);
2086 } 2096 }
2087 2097
2088#ifdef SELECTION_SCROLLING 2098#ifdef SELECTION_SCROLLING
2089 sel_scroll_ev.stop(); 2099 sel_scroll_ev.stop();
2090#endif 2100#endif
2170 2180
2171 if (!slip_wheel_ev.is_active ()) 2181 if (!slip_wheel_ev.is_active ())
2172 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2182 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2173 } 2183 }
2174 else 2184 else
2185# endif
2175 { 2186 {
2176# endif
2177 scr_page (v, i); 2187 scr_page (v, i);
2178 scrollbar_show (1); 2188 scrollBar.show (1);
2179# ifdef MOUSE_SLIP_WHEELING
2180 } 2189 }
2181# endif
2182 } 2190 }
2183 break; 2191 break;
2184#endif 2192#endif
2185 } 2193 }
2186 } 2194 }
2187} 2195}
2188 2196
2189/*}}} */ 2197/*}}} */
2190 2198
2191bool 2199void
2192rxvt_term::cmd_parse () 2200rxvt_term::cmd_parse ()
2193{ 2201{
2194 bool flag = false;
2195 wchar_t ch = NOCHAR; 2202 wchar_t ch = NOCHAR;
2196 char *seq_begin; // remember start of esc-sequence here 2203 char *seq_begin; // remember start of esc-sequence here
2197 2204
2198 for (;;) 2205 for (;;)
2199 { 2206 {
2200 if (ch == NOCHAR) 2207 if (expect_false (ch == NOCHAR))
2201 { 2208 {
2202 seq_begin = cmdbuf_ptr; 2209 seq_begin = cmdbuf_ptr;
2203 ch = next_char (); 2210 ch = next_char ();
2204 2211
2205 if (ch == NOCHAR) 2212 if (ch == NOCHAR)
2206 break; 2213 break;
2207 } 2214 }
2208 2215
2209 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))
2210 { 2217 {
2211 if (!seen_input) 2218 if (expect_false (!seen_input))
2212 { 2219 {
2213 seen_input = 1; 2220 seen_input = 1;
2214 // many badly-written programs (e.g. jed) contain a race condition: 2221 // many badly-written programs (e.g. jed) contain a race condition:
2215 // they first read the screensize and then install a SIGWINCH handler. 2222 // they first read the screensize and then install a SIGWINCH handler.
2216 // some window managers resize the window early, and these programs 2223 // some window managers resize the window early, and these programs
2229 wchar_t *str = buf; 2236 wchar_t *str = buf;
2230 wchar_t *eol = str + min (ncol, UBUFSIZ); 2237 wchar_t *eol = str + min (ncol, UBUFSIZ);
2231 2238
2232 for (;;) 2239 for (;;)
2233 { 2240 {
2234 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)))
2235 break; 2242 break;
2236 2243
2237 *str++ = ch; 2244 *str++ = ch;
2238 2245
2239 if (ch == C0_LF || str >= eol) 2246 if (expect_false (ch == C0_LF || str >= eol))
2240 { 2247 {
2241 if (ch == C0_LF) 2248 if (ch == C0_LF)
2242 nlines++; 2249 nlines++;
2243 2250
2244 refresh_count++; 2251 refresh_count++;
2293 * 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.
2294 * if skipScroll is enabled. 2301 * if skipScroll is enabled.
2295 */ 2302 */
2296 if (refreshnow) 2303 if (refreshnow)
2297 { 2304 {
2298 flag = true;
2299 scr_refresh (); 2305 scr_refresh ();
2300 want_refresh = 1; 2306 want_refresh = 1;
2301 } 2307 }
2302
2303 } 2308 }
2304 else 2309 else
2305 { 2310 {
2306 try 2311 try
2307 { 2312 {
2315 } 2320 }
2316 2321
2317 ch = NOCHAR; 2322 ch = NOCHAR;
2318 } 2323 }
2319 } 2324 }
2320
2321 return flag;
2322} 2325}
2323 2326
2324// read the next character 2327// read the next character
2325wchar_t 2328wchar_t
2326rxvt_term::next_char () NOTHROW 2329rxvt_term::next_char () NOTHROW
2327{ 2330{
2328 while (cmdbuf_ptr < cmdbuf_endp) 2331 while (cmdbuf_ptr < cmdbuf_endp)
2329 { 2332 {
2330 // assume 7-bit to be ascii ALWAYS 2333 // assume 7-bit to be ascii ALWAYS
2331 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2334 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2332 return *cmdbuf_ptr++; 2335 return *cmdbuf_ptr++;
2333 2336
2334 wchar_t wc; 2337 wchar_t wc;
2335 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);
2336 2339
2340 cmdbuf_ptr = cmdbuf_endp; 2343 cmdbuf_ptr = cmdbuf_endp;
2341 break; 2344 break;
2342 } 2345 }
2343 2346
2344 if (len == (size_t)-1) 2347 if (len == (size_t)-1)
2348 {
2349 mbstate.reset (); // reset now undefined conversion state
2345 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 }
2346 2352
2347 // assume wchar == unicode 2353 // assume wchar == unicode
2348 cmdbuf_ptr += len; 2354 cmdbuf_ptr += len;
2349 return wc & UNICODE_MASK; 2355 return wc & UNICODE_MASK;
2350 } 2356 }
2394/*----------------------------------------------------------------------*/ 2400/*----------------------------------------------------------------------*/
2395#ifdef PRINTPIPE 2401#ifdef PRINTPIPE
2396FILE * 2402FILE *
2397rxvt_term::popen_printer () 2403rxvt_term::popen_printer ()
2398{ 2404{
2399 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2405 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2400 2406
2401 if (stream == NULL) 2407 if (stream == NULL)
2402 rxvt_warn ("can't open printer pipe, not printing.\n"); 2408 rxvt_warn ("can't open printer pipe, not printing.\n");
2403 2409
2404 return stream; 2410 return stream;
2415 * simulate attached vt100 printer 2421 * simulate attached vt100 printer
2416 */ 2422 */
2417void 2423void
2418rxvt_term::process_print_pipe () 2424rxvt_term::process_print_pipe ()
2419{ 2425{
2420 int done; 2426 FILE *fd = popen_printer ();
2421 FILE *fd;
2422 2427
2423 if ((fd = popen_printer ()) == NULL) 2428 if (!fd)
2424 return; 2429 return;
2425 2430
2426 /* 2431 /*
2427 * 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
2428 * is received. 2433 * is received.
2429 */ 2434 */
2430 for (done = 0; !done;) 2435 for (int done = 0; !done; )
2431 { 2436 {
2432 unsigned char buf[8]; 2437 unsigned char buf[8];
2433 unicode_t ch; 2438 unicode_t ch;
2434 unsigned int i, len; 2439 unsigned int i, len;
2435 2440
2580 break; 2585 break;
2581 case 'Z': /* identify the terminal type */ 2586 case 'Z': /* identify the terminal type */
2582 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2587 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2583 break; 2588 break;
2584 case '<': /* turn off VT52 mode */ 2589 case '<': /* turn off VT52 mode */
2585 PrivMode (0, PrivMode_vt52); 2590 set_privmode (PrivMode_vt52, 0);
2586 break; 2591 break;
2587 case 'F': /* use special graphics character set */ 2592 case 'F': /* use special graphics character set */
2588 case 'G': /* use regular character set */ 2593 case 'G': /* use regular character set */
2589 /* unimplemented */ 2594 /* unimplemented */
2590 break; 2595 break;
2644 scr_forwardindex (); 2649 scr_forwardindex ();
2645 break; 2650 break;
2646#endif 2651#endif
2647 case '=': 2652 case '=':
2648 case '>': 2653 case '>':
2649 PrivMode ((ch == '='), PrivMode_aplKP); 2654 set_privmode (PrivMode_aplKP, ch == '=');
2650 break; 2655 break;
2651 2656
2652 case C1_40: 2657 case C1_40:
2653 cmd_getc (); 2658 cmd_getc ();
2654 break; 2659 break;
2693 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2698 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2694 case C1_SCI: /* ESC Z */ 2699 case C1_SCI: /* ESC Z */
2695 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2700 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2696 break; /* steal obsolete ESC [ c */ 2701 break; /* steal obsolete ESC [ c */
2697 2702
2698 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2703 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2699 case C1_CSI: /* ESC [ */ 2704 case C1_CSI: /* ESC [ */
2700 process_csi_seq (); 2705 process_csi_seq ();
2701 break; 2706 break;
2702 2707
2703 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2708 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2704 case C1_OSC: /* ESC ] */ 2709 case C1_OSC: /* ESC ] */
2705 process_osc_seq (); 2710 process_osc_seq ();
2706 break; 2711 break;
2707 2712
2708 /* 8.3.106: RESET TO INITIAL STATE */ 2713 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2709 case 'c': 2714 case 'c':
2710 mbstate.reset (); 2715 mbstate.reset ();
2711 scr_poweron (); 2716 scr_poweron ();
2712 scrollbar_show (1); 2717 scrollBar.show (1);
2713 break; 2718 break;
2714 2719
2715 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2720 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2716 case 'n': 2721 case 'n':
2717 scr_charset_choose (2); 2722 scr_charset_choose (2);
2768 2773
2769 nargs = 0; 2774 nargs = 0;
2770 2775
2771 priv = 0; 2776 priv = 0;
2772 ch = cmd_getc (); 2777 ch = cmd_getc ();
2773 if (ch >= '<' && ch <= '?') 2778 if ((ch >= '<' && ch <= '?') || ch == '!')
2774 { 2779 {
2775 /* '<' '=' '>' '?' */ 2780 /* '<' '=' '>' '?' '!' */
2776 priv = ch; 2781 priv = ch;
2777 ch = cmd_getc (); 2782 ch = cmd_getc ();
2778 } 2783 }
2779 2784
2780 /* read any numerical arguments */ 2785 /* read any numerical arguments */
2829 // versions. 2834 // versions.
2830 // 2835 //
2831 tt_printf ("\033[>%d;95;0c", 'U'); 2836 tt_printf ("\033[>%d;95;0c", 'U');
2832 } 2837 }
2833 break; 2838 break;
2839
2834 case '?': 2840 case '?':
2835 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2841 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2836 process_terminal_mode (ch, priv, nargs, arg); 2842 process_terminal_mode (ch, priv, nargs, arg);
2837 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);
2838 } 2856 }
2857 break;
2858 }
2859
2839 return; 2860 return;
2840 } 2861 }
2841 2862
2842 switch (ch) 2863 switch (ch)
2843 { 2864 {
3272 3293
3273/* 3294/*
3274 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3295 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3275 */ 3296 */
3276void 3297void
3277rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3298rxvt_term::process_xterm_seq (int op, char *str, char resp)
3278{ 3299{
3279 int color; 3300 int color;
3280 char *buf, *name; 3301 char *buf, *name;
3281 bool query = str[0] == '?' && !str[1]; 3302 bool query = str[0] == '?' && !str[1];
3282 int saveop = op; 3303 int saveop = op;
3323 3344
3324 XFree (value); 3345 XFree (value);
3325 } 3346 }
3326 else 3347 else
3327 { 3348 {
3328 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3349 char *eq = strchr (str, '=');
3329 3350
3330 if (eq) 3351 if (eq)
3331 { 3352 {
3332 *eq = 0; 3353 *eq = 0;
3333 set_utf8_property (display->atom (str), eq + 1); 3354 set_utf8_property (display->atom (str), eq + 1);
3354 *buf++ = '\0'; 3375 *buf++ = '\0';
3355 3376
3356 process_color_seq (op, color, name, resp); 3377 process_color_seq (op, color, name, resp);
3357 } 3378 }
3358 break; 3379 break;
3380 case Rxvt_restoreFG:
3359 case XTerm_Color00: 3381 case XTerm_Color00:
3360 process_color_seq (op, Color_fg, str, resp); 3382 process_color_seq (op, Color_fg, str, resp);
3361 break; 3383 break;
3384 case Rxvt_restoreBG:
3362 case XTerm_Color01: 3385 case XTerm_Color01:
3363 process_color_seq (op, Color_bg, str, resp); 3386 process_color_seq (op, Color_bg, str, resp);
3364 break; 3387 break;
3365#ifndef NO_CURSORCOLOR 3388#ifndef NO_CURSORCOLOR
3366 case XTerm_Color_cursor: 3389 case XTerm_Color_cursor:
3387 break; 3410 break;
3388 case URxvt_Color_IT: 3411 case URxvt_Color_IT:
3389 process_color_seq (op, Color_IT, str, resp); 3412 process_color_seq (op, Color_IT, str, resp);
3390 break; 3413 break;
3391#endif 3414#endif
3415 case URxvt_Color_border:
3416 process_color_seq (op, Color_border, str, resp);
3417 break;
3392#if ENABLE_TRANSPARENCY 3418#if ENABLE_TRANSPARENCY
3393 case URxvt_Color_tint: 3419 case URxvt_Color_tint:
3394 process_color_seq (op, Color_tint, str, resp); 3420 process_color_seq (op, Color_tint, str, resp);
3395 { 3421 {
3396 bool changed = false; 3422 bool changed = false;
3411 case Rxvt_Pixmap: 3437 case Rxvt_Pixmap:
3412 if (!strcmp (str, "?")) 3438 if (!strcmp (str, "?"))
3413 { 3439 {
3414 char str[256]; 3440 char str[256];
3415 3441
3416 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3442 sprintf (str, "[%dx%d+%d+%d]",
3417 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3443 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3418 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3444 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3419 process_xterm_seq (XTerm_title, str, CHAR_ST); 3445 process_xterm_seq (XTerm_title, str, CHAR_ST);
3420 } 3446 }
3421 else 3447 else
3445 update_background (); 3471 update_background ();
3446 } 3472 }
3447 break; 3473 break;
3448#endif 3474#endif
3449 3475
3450 case Rxvt_restoreFG:
3451 set_window_color (Color_fg, str);
3452 break;
3453 case Rxvt_restoreBG:
3454 set_window_color (Color_bg, str);
3455 break;
3456
3457 case XTerm_logfile: 3476 case XTerm_logfile:
3458 // TODO, when secure mode? 3477 // TODO, when secure mode?
3459 break; 3478 break;
3460 3479
3461#if 0 3480#if 0
3527 break; 3546 break;
3528#endif 3547#endif
3529 3548
3530#if ENABLE_PERL 3549#if ENABLE_PERL
3531 case URxvt_perl: 3550 case URxvt_perl:
3532 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3551 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3533 ; // no responses yet
3534 break; 3552 break;
3535#endif 3553#endif
3536 } 3554 }
3537} 3555}
3538/*----------------------------------------------------------------------*/ 3556/*----------------------------------------------------------------------*/
3561 { 3579 {
3562 if (mode == 'r') 3580 if (mode == 'r')
3563 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3581 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3564 else 3582 else
3565 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3583 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3566 PrivMode (state, bit); 3584 set_privmode (bit, state);
3567 } 3585 }
3568 3586
3569 return state; 3587 return state;
3570} 3588}
3571 3589
3579 static const struct 3597 static const struct
3580 { 3598 {
3581 const int argval; 3599 const int argval;
3582 const unsigned long bit; 3600 const unsigned long bit;
3583 } argtopriv[] = { 3601 } argtopriv[] = {
3584 { 1, PrivMode_aplCUR }, 3602 { 1, PrivMode_aplCUR }, // DECCKM
3585 { 2, PrivMode_vt52 }, 3603 { 2, PrivMode_vt52 },
3586 { 3, PrivMode_132 }, 3604 { 3, PrivMode_132 }, // DECCOLM
3587 { 4, PrivMode_smoothScroll }, 3605 { 4, PrivMode_smoothScroll }, // DECSCLM
3588 { 5, PrivMode_rVideo }, 3606 { 5, PrivMode_rVideo }, // DECSCNM
3589 { 6, PrivMode_relOrigin }, 3607 { 6, PrivMode_relOrigin }, // DECOM
3590 { 7, PrivMode_Autowrap }, 3608 { 7, PrivMode_Autowrap }, // DECAWM
3591 // 8, bi-directional support mode 3609 // 8, auto-repeat keys // DECARM
3592 { 9, PrivMode_MouseX10 }, 3610 { 9, PrivMode_MouseX10 },
3593 // 18, 19 printing-related 3611 // 18 end FF to printer after print screen
3612 // 19 Print screen prints full screen/scorll region
3594 { 25, PrivMode_VisibleCursor }, 3613 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3595#ifdef scrollBar_esc 3614#ifdef scrollBar_esc
3596 { scrollBar_esc, PrivMode_scrollBar }, 3615 { scrollBar_esc, PrivMode_scrollBar },
3597#endif 3616#endif
3598 { 35, PrivMode_ShiftKeys }, // rxvt extension 3617 { 35, PrivMode_ShiftKeys }, // rxvt extension
3618 // 38, tektronix mode // DECTEK
3599 { 40, PrivMode_132OK }, 3619 { 40, PrivMode_132OK },
3600 // 41 xterm more fixes NYI 3620 // 41 xterm more fixes NYI
3601 // 45 margin bell NYI 3621 // 45 margin bell NYI
3602 // 46 start logging 3622 // 46 start logging
3603 { 47, PrivMode_Screen }, 3623 { 47, PrivMode_Screen },
3604 { 66, PrivMode_aplKP }, 3624 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3605#ifndef NO_BACKSPACE_KEY 3625#ifndef NO_BACKSPACE_KEY
3606 { 67, PrivMode_BackSpace }, 3626 { 67, PrivMode_BackSpace }, // DECBKM
3607#endif 3627#endif
3608 { 1000, PrivMode_MouseX11 }, 3628 { 1000, PrivMode_MouseX11 },
3609 { 1002, PrivMode_MouseBtnEvent }, 3629 { 1002, PrivMode_MouseBtnEvent },
3610 { 1003, PrivMode_MouseAnyEvent }, 3630 { 1003, PrivMode_MouseAnyEvent },
3611 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3631 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3615 // 1037 send DEL for keypad delete NYI 3635 // 1037 send DEL for keypad delete NYI
3616 { 1047, PrivMode_Screen }, 3636 { 1047, PrivMode_Screen },
3617 // 1048 save and restore cursor 3637 // 1048 save and restore cursor
3618 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3638 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3619 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3639 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3640 { 2004, PrivMode_BracketPaste },
3620 }; 3641 };
3621 3642
3622 if (nargs == 0) 3643 if (nargs == 0)
3623 return; 3644 return;
3624 3645
3649 3670
3650 scr_touch (true); 3671 scr_touch (true);
3651 break; 3672 break;
3652#endif 3673#endif
3653 case 1048: /* alternative cursor save */ 3674 case 1048: /* alternative cursor save */
3654 case 1049:
3655 if (option (Opt_secondaryScreen)) 3675 if (option (Opt_secondaryScreen))
3656 if (mode == 0) 3676 if (mode == 0)
3657 scr_cursor (RESTORE); 3677 scr_cursor (RESTORE);
3658 else if (mode == 1) 3678 else if (mode == 1)
3659 scr_cursor (SAVE); 3679 scr_cursor (SAVE);
3668 case 2: /* VT52 mode */ 3688 case 2: /* VT52 mode */
3669 /* oddball mode. should be set regardless of set/reset 3689 /* oddball mode. should be set regardless of set/reset
3670 * parameter. Return from VT52 mode with an ESC < from 3690 * parameter. Return from VT52 mode with an ESC < from
3671 * within VT52 mode 3691 * within VT52 mode
3672 */ 3692 */
3673 PrivMode (1, PrivMode_vt52); 3693 set_privmode (PrivMode_vt52, 1);
3674 break; 3694 break;
3675 case 3: /* 80/132 */ 3695 case 3: /* 80/132 */
3676 if (priv_modes & PrivMode_132OK) 3696 if (priv_modes & PrivMode_132OK)
3677 set_widthheight (((state ? 132 : 80) * fwidth), height); 3697 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3678 break; 3698 break;
3679 case 4: /* smooth scrolling */ 3699 case 4: /* smooth scrolling */
3680 set_option (Opt_jumpScroll, !state); 3700 set_option (Opt_jumpScroll, !state);
3681 break; 3701 break;
3682 case 5: /* reverse video */ 3702 case 5: /* reverse video */
3693 if (state) /* orthogonal */ 3713 if (state) /* orthogonal */
3694 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3714 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3695 break; 3715 break;
3696#ifdef scrollBar_esc 3716#ifdef scrollBar_esc
3697 case scrollBar_esc: 3717 case scrollBar_esc:
3698 if (scrollbar_mapping (state)) 3718 if (scrollBar.map (state))
3699 { 3719 {
3700 resize_all_windows (0, 0, 0); 3720 resize_all_windows (0, 0, 0);
3701 scr_touch (true); 3721 scr_touch (true);
3702 } 3722 }
3703 break; 3723 break;
3724 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3744 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3725 vt_emask_mouse = PointerMotionMask; 3745 vt_emask_mouse = PointerMotionMask;
3726 } 3746 }
3727 else 3747 else
3728 vt_emask_mouse = NoEventMask; 3748 vt_emask_mouse = NoEventMask;
3749
3729 vt_select_input (); 3750 vt_select_input ();
3730 break; 3751 break;
3731 case 1010: /* scroll to bottom on TTY output inhibit */ 3752 case 1010: /* scroll to bottom on TTY output inhibit */
3732 set_option (Opt_scrollTtyOutput, !state); 3753 set_option (Opt_scrollTtyOutput, !state);
3733 break; 3754 break;
3734 case 1011: /* scroll to bottom on key press */ 3755 case 1011: /* scroll to bottom on key press */
3735 set_option (Opt_scrollTtyKeypress, state); 3756 set_option (Opt_scrollTtyKeypress, state);
3736 break; 3757 break;
3737 case 1047: /* secondary screen w/ clearing last */ 3758 case 1047: /* secondary screen w/ clearing last */
3738 if (option (Opt_secondaryScreen)) 3759 if (option (Opt_secondaryScreen))
3739 if (current_screen != PRIMARY) 3760 if (!state)
3740 scr_erase_screen (2); 3761 scr_erase_screen (2);
3762
3741 scr_change_screen (state); 3763 scr_change_screen (state);
3742 break; 3764 break;
3743 case 1049: /* secondary screen w/ clearing first */ 3765 case 1049: /* secondary screen w/ clearing first */
3766 if (option (Opt_secondaryScreen))
3767 if (state)
3768 scr_cursor (SAVE);
3769
3744 scr_change_screen (state); 3770 scr_change_screen (state);
3771
3745 if (option (Opt_secondaryScreen)) 3772 if (option (Opt_secondaryScreen))
3746 if (current_screen != PRIMARY) 3773 if (state)
3747 scr_erase_screen (2); 3774 scr_erase_screen (2);
3775 else
3776 scr_cursor (RESTORE);
3748 break; 3777 break;
3749 default: 3778 default:
3750 break; 3779 break;
3751 } 3780 }
3752 } 3781 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines