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.381 by root, Fri Dec 14 05:25:23 2007 UTC vs.
Revision 1.485 by sf-exg, Fri Apr 29 13:08:24 2011 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
161 162
162void 163void
163rxvt_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)
164{ 165{
165 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
166 rxvt_font *f = (*fs)[fs->find_font (ch)];
167 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169
170 fname = rxvt_utf8towcs (f->name);
171 169
172# if ENABLE_COMBINING 170# if ENABLE_COMBINING
173 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
174 { 172 {
175 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
196 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
200 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);
201 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
202 207
203 max_it (width, 8+5); // for char + hey 208 max_it (width, 8+5); // for char + hex
204 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
205 210
206 if (y >= 0) 211 if (y >= 0)
207 { 212 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
209 x = 0; 214 x = 0;
210 } 215 }
211 216
212 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
213 218
214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
215 220
216 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
217 { 222 {
… …
220 ch = *chr++; 225 ch = *chr++;
221 226
222 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
224 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
225# if !UNICODE3 230# if !UNICODE_3
226 if (ch >= 0x10000) 231 if (ch >= 0x10000)
227 ch = 0xfffd; 232 ch = 0xfffd;
228# endif 233# endif
229 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
230 235
… …
236// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
239// } 244// }
240 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
241 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
242
243 free (fname); 249 free (fname[i]);
250 }
244 251
245# if ENABLE_COMBINING 252# if ENABLE_COMBINING
246 if (alloc) 253 if (alloc)
247 delete [] alloc; 254 delete [] alloc;
248# endif 255# endif
… …
278 } 285 }
279 286
280 iso14755buf = 0; 287 iso14755buf = 0;
281} 288}
282 289
283int 290static int
284rxvt_term::hex_keyval (XKeyEvent &ev) 291hex_keyval (XKeyEvent &ev)
285{ 292{
286 // check wether this event corresponds to a hex digit 293 // check whether this event corresponds to a hex digit
287 // if the modifiers had not been pressed. 294 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++) 295 for (int index = 0; index < 8; index++)
289 { 296 {
290 KeySym k = XLookupKeysym (&ev, index); 297 KeySym k = XLookupKeysym (&ev, index);
291 298
… …
297 304
298 return -1; 305 return -1;
299} 306}
300#endif 307#endif
301 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
302void 404void
303rxvt_term::key_press (XKeyEvent &ev) 405rxvt_term::key_press (XKeyEvent &ev)
304{ 406{
305 int ctrl, meta, shft, len; 407 int ctrl, meta, shft, len;
306 unsigned int newlen;
307 KeySym keysym; 408 KeySym keysym;
308 int valid_keysym; 409 int valid_keysym;
309 char kbuf[KBUFSZ]; 410 char kbuf[KBUFSZ];
310 411
311#if ISO_14755 412#if ISO_14755
… …
320 * Always permit `shift' to override the current setting 421 * Always permit `shift' to override the current setting
321 */ 422 */
322 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
323 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
324 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
325
326 if (numlock_state || (ev.state & ModNumLockMask))
327 {
328 numlock_state = (ev.state & ModNumLockMask);
329 PrivMode ((!numlock_state), PrivMode_aplKP);
330 }
331 426
332 kbuf[0] = 0; 427 kbuf[0] = 0;
333 428
334#ifdef USE_XIM 429#ifdef USE_XIM
335 if (Input_Context) 430 if (Input_Context)
… …
410#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
411 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
412#else 507#else
413 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
414#endif 509#endif
510 max_it (lnsppg, 1);
511
415 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
416 { 513 {
417 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
418 return; 515 return;
419 } 516 }
… …
472 selection_request (ev.time); 569 selection_request (ev.time);
473 return; 570 return;
474#if TODO 571#if TODO
475 /* rxvt extras */ 572 /* rxvt extras */
476 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 573 case XK_KP_Add: /* Shift+KP_Add = bigger font */
477 change_font (FONT_UP);
478 return; 574 return;
479 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 575 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
480 change_font (FONT_DN);
481 return; 576 return;
482#endif 577#endif
483 } 578 }
484 } 579 }
485 } 580 }
486 581
487#if ENABLE_FRILLS || ISO_14755 582#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 583 // ISO 14755 support
489 if (shft && ctrl) 584 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 585 {
491 int hv; 586 int hv;
492 587
493 if (iso14755buf & ISO_14755_51 588 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 589 && (keysym == XK_space || keysym == XK_KP_Space
… …
524 scr_overlay_off (); 619 scr_overlay_off ();
525# endif 620# endif
526 iso14755buf = 0; 621 iso14755buf = 0;
527 } 622 }
528 } 623 }
624 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 625 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 626 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 627 if (!(iso14755buf & ISO_14755_STARTED))
532 { 628 {
533 iso14755buf |= ISO_14755_STARTED; 629 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 630# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 631 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
546 } 642 }
547#endif 643#endif
548 644
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 645 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 646 {
647 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
648 unsigned int newlen = 1;
649
650 if (ev.state & ModNumLockMask)
651 kp = false;
652
653 keysym = translate_keypad (keysym, kp);
654
655 switch (keysym)
551 { 656 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 657#ifndef NO_BACKSPACE_KEY
553 newlen = 1; 658 case XK_BackSpace:
554#ifdef XK_KP_Home 659 if (priv_modes & PrivMode_HaveBackSpace)
555 static const KeySym keypadtrans[] = { 660 {
556 XK_KP_7, // XK_KP_Home 661 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
557 XK_KP_4, // XK_KP_Left 662 ^ !!ctrl) ? '\b' : '\177';
558 XK_KP_8, // XK_KP_Up 663 kbuf[1] = '\0';
559 XK_KP_6, // XK_KP_Right
560 XK_KP_2, // XK_KP_Down
561#ifndef UNSHIFTED_SCROLLKEYS
562 XK_KP_9, // XK_KP_Prior
563 XK_KP_3, // XK_KP_Next
564#else
565 XK_Prior,
566 XK_Next,
567#endif
568 XK_KP_1, // XK_KP_End
569 XK_KP_5, // XK_KP_Begin
570 }; 664 }
665 else
666 strcpy (kbuf, rs[Rs_backspace_key]);
667 break;
668#endif
669#ifndef NO_DELETE_KEY
670 case XK_Delete:
671 strcpy (kbuf, rs[Rs_delete_key]);
672 break;
673#endif
674 case XK_Tab:
675 if (shft)
676 strcpy (kbuf, "\033[Z");
677 else
678 {
679#ifdef CTRL_TAB_MAKES_META
680 if (ctrl)
681 meta = 1;
682#endif
683#ifdef MOD4_TAB_MAKES_META
684 if (ev.state & Mod4Mask)
685 meta = 1;
686#endif
687 newlen = 0;
688 }
689 break;
571 690
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 691 case XK_Up: /* "\033[A" */
692 case XK_Down: /* "\033[B" */
693 case XK_Right: /* "\033[C" */
694 case XK_Left: /* "\033[D" */
695 strcpy (kbuf, "\033[Z");
696 kbuf[2] = "DACB"[keysym - XK_Left];
697 /* do Shift first */
698 if (shft)
699 kbuf[2] = "dacb"[keysym - XK_Left];
700 else if (ctrl)
701 {
702 kbuf[1] = 'O';
703 kbuf[2] = "dacb"[keysym - XK_Left];
704 }
705 else if (priv_modes & PrivMode_aplCUR)
706 kbuf[1] = 'O';
707 break;
708
709 case XK_KP_Enter:
710 /* allow shift to override */
711 if (kp)
712 {
713 strcpy (kbuf, "\033OM");
714 break;
715 }
716
717 /* FALLTHROUGH */
718
719 case XK_Return:
720 if (priv_modes & PrivMode_LFNL)
721 {
722 kbuf[0] = '\015';
723 kbuf[1] = '\012';
724 kbuf[2] = '\0';
725 }
726 else
727 {
728 kbuf[0] = '\015';
729 kbuf[1] = '\0';
730 }
731 break;
732
733 case XK_KP_F1: /* "\033OP" */
734 case XK_KP_F2: /* "\033OQ" */
735 case XK_KP_F3: /* "\033OR" */
736 case XK_KP_F4: /* "\033OS" */
737 strcpy (kbuf, "\033OP");
738 kbuf[2] += (keysym - XK_KP_F1);
739 break;
740
741 case XK_KP_Multiply: /* "\033Oj" : "*" */
742 case XK_KP_Add: /* "\033Ok" : "+" */
743 case XK_KP_Separator: /* "\033Ol" : "," */
744 case XK_KP_Subtract: /* "\033Om" : "-" */
745 case XK_KP_Decimal: /* "\033On" : "." */
746 case XK_KP_Divide: /* "\033Oo" : "/" */
747 case XK_KP_0: /* "\033Op" : "0" */
748 case XK_KP_1: /* "\033Oq" : "1" */
749 case XK_KP_2: /* "\033Or" : "2" */
750 case XK_KP_3: /* "\033Os" : "3" */
751 case XK_KP_4: /* "\033Ot" : "4" */
752 case XK_KP_5: /* "\033Ou" : "5" */
753 case XK_KP_6: /* "\033Ov" : "6" */
754 case XK_KP_7: /* "\033Ow" : "7" */
755 case XK_KP_8: /* "\033Ox" : "8" */
756 case XK_KP_9: /* "\033Oy" : "9" */
757 /* allow shift to override */
758 if (kp)
759 {
760 strcpy (kbuf, "\033Oj");
761 kbuf[2] += (keysym - XK_KP_Multiply);
762 }
763 else
764 {
765 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
766 kbuf[1] = '\0';
767 }
768 break;
769
770 default:
573 { 771 {
574 unsigned int index = keysym - XK_KP_Home; 772 int param = map_function_key (keysym);
575 keysym = kp ? keypadtrans[index] : XK_Home + index; 773 if (param > 0)
774 sprintf (kbuf,"\033[%d~", param);
775 else
776 newlen = 0;
576 } 777 }
577 else if (keysym == XK_KP_Insert)
578 keysym = kp ? XK_KP_0 : XK_Insert;
579#ifndef NO_DELETE_KEY
580 else if (keysym == XK_KP_Delete)
581 keysym = kp ? XK_KP_Decimal : XK_Delete;
582#endif
583#endif
584 switch (keysym)
585 {
586#ifndef NO_BACKSPACE_KEY
587 case XK_BackSpace:
588 if (priv_modes & PrivMode_HaveBackSpace)
589 {
590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
591 ^ !!ctrl) ? '\b' : '\177';
592 kbuf[1] = '\0';
593 }
594 else
595 strcpy (kbuf, rs[Rs_backspace_key]);
596 break; 778 break;
597#endif
598#ifndef NO_DELETE_KEY
599 case XK_Delete:
600 strcpy (kbuf, rs[Rs_delete_key]);
601 break;
602#endif
603 case XK_Tab:
604 if (shft)
605 strcpy (kbuf, "\033[Z");
606 else
607 {
608#ifdef CTRL_TAB_MAKES_META
609 if (ctrl)
610 meta = 1;
611#endif
612#ifdef MOD4_TAB_MAKES_META
613 if (ev.state & Mod4Mask)
614 meta = 1;
615#endif
616 newlen = 0;
617 }
618 break;
619
620 case XK_Up: /* "\033[A" */
621 case XK_Down: /* "\033[B" */
622 case XK_Right: /* "\033[C" */
623 case XK_Left: /* "\033[D" */
624 strcpy (kbuf, "\033[Z");
625 kbuf[2] = "DACB"[keysym - XK_Left];
626 /* do Shift first */
627 if (shft)
628 kbuf[2] = "dacb"[keysym - XK_Left];
629 else if (ctrl)
630 {
631 kbuf[1] = 'O';
632 kbuf[2] = "dacb"[keysym - XK_Left];
633 }
634 else if (priv_modes & PrivMode_aplCUR)
635 kbuf[1] = 'O';
636 break;
637
638#ifndef UNSHIFTED_SCROLLKEYS
639 case XK_Prior:
640 strcpy (kbuf, "\033[5~");
641 break;
642 case XK_Next:
643 strcpy (kbuf, "\033[6~");
644 break;
645#endif
646 case XK_KP_Enter:
647 /* allow shift to override */
648 if (kp)
649 {
650 strcpy (kbuf, "\033OM");
651 break;
652 }
653
654 /* FALLTHROUGH */
655
656 case XK_Return:
657 if (priv_modes & PrivMode_LFNL)
658 {
659 kbuf[0] = '\015';
660 kbuf[1] = '\012';
661 kbuf[2] = '\0';
662 }
663 else
664 {
665 kbuf[0] = '\015';
666 kbuf[1] = '\0';
667 }
668 break;
669
670 case XK_KP_F1: /* "\033OP" */
671 case XK_KP_F2: /* "\033OQ" */
672 case XK_KP_F3: /* "\033OR" */
673 case XK_KP_F4: /* "\033OS" */
674 strcpy (kbuf, "\033OP");
675 kbuf[2] += (keysym - XK_KP_F1);
676 break;
677
678 case XK_KP_Multiply: /* "\033Oj" : "*" */
679 case XK_KP_Add: /* "\033Ok" : "+" */
680 case XK_KP_Separator: /* "\033Ol" : "," */
681 case XK_KP_Subtract: /* "\033Om" : "-" */
682 case XK_KP_Decimal: /* "\033On" : "." */
683 case XK_KP_Divide: /* "\033Oo" : "/" */
684 case XK_KP_0: /* "\033Op" : "0" */
685 case XK_KP_1: /* "\033Oq" : "1" */
686 case XK_KP_2: /* "\033Or" : "2" */
687 case XK_KP_3: /* "\033Os" : "3" */
688 case XK_KP_4: /* "\033Ot" : "4" */
689 case XK_KP_5: /* "\033Ou" : "5" */
690 case XK_KP_6: /* "\033Ov" : "6" */
691 case XK_KP_7: /* "\033Ow" : "7" */
692 case XK_KP_8: /* "\033Ox" : "8" */
693 case XK_KP_9: /* "\033Oy" : "9" */
694 /* allow shift to override */
695 if (kp)
696 {
697 strcpy (kbuf, "\033Oj");
698 kbuf[2] += (keysym - XK_KP_Multiply);
699 }
700 else
701 {
702 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
703 kbuf[1] = '\0';
704 }
705 break;
706
707 case XK_Find:
708 strcpy (kbuf, "\033[1~");
709 break;
710
711 case XK_Insert:
712 strcpy (kbuf, "\033[2~");
713 break;
714#ifdef DXK_Remove /* support for DEC remove like key */
715 case DXK_Remove:
716 /* FALLTHROUGH */
717#endif
718 case XK_Execute:
719 strcpy (kbuf, "\033[3~");
720 break;
721 case XK_Select:
722 strcpy (kbuf, "\033[4~");
723 break;
724 case XK_End:
725 strcpy (kbuf, KS_END);
726 break;
727 case XK_Home:
728 strcpy (kbuf, KS_HOME);
729 break;
730
731#define FKEY(n, fkey) \
732 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
733
734 case XK_F1: /* "\033[11~" */
735 case XK_F2: /* "\033[12~" */
736 case XK_F3: /* "\033[13~" */
737 case XK_F4: /* "\033[14~" */
738 case XK_F5: /* "\033[15~" */
739 FKEY (11, XK_F1);
740 break;
741 case XK_F6: /* "\033[17~" */
742 case XK_F7: /* "\033[18~" */
743 case XK_F8: /* "\033[19~" */
744 case XK_F9: /* "\033[20~" */
745 case XK_F10: /* "\033[21~" */
746 FKEY (17, XK_F6);
747 break;
748 case XK_F11: /* "\033[23~" */
749 case XK_F12: /* "\033[24~" */
750 case XK_F13: /* "\033[25~" */
751 case XK_F14: /* "\033[26~" */
752 FKEY (23, XK_F11);
753 break;
754 case XK_F15: /* "\033[28~" */
755 case XK_F16: /* "\033[29~" */
756 FKEY (28, XK_F15);
757 break;
758 case XK_Help: /* "\033[28~" */
759 FKEY (28, XK_Help);
760 break;
761 case XK_Menu: /* "\033[29~" */
762 FKEY (29, XK_Menu);
763 break;
764 case XK_F17: /* "\033[31~" */
765 case XK_F18: /* "\033[32~" */
766 case XK_F19: /* "\033[33~" */
767 case XK_F20: /* "\033[34~" */
768 case XK_F21: /* "\033[35~" */
769 case XK_F22: /* "\033[36~" */
770 case XK_F23: /* "\033[37~" */
771 case XK_F24: /* "\033[38~" */
772 case XK_F25: /* "\033[39~" */
773 case XK_F26: /* "\033[40~" */
774 case XK_F27: /* "\033[41~" */
775 case XK_F28: /* "\033[42~" */
776 case XK_F29: /* "\033[43~" */
777 case XK_F30: /* "\033[44~" */
778 case XK_F31: /* "\033[45~" */
779 case XK_F32: /* "\033[46~" */
780 case XK_F33: /* "\033[47~" */
781 case XK_F34: /* "\033[48~" */
782 case XK_F35: /* "\033[49~" */
783 FKEY (31, XK_F17);
784 break;
785#undef FKEY
786 default:
787 newlen = 0;
788 break;
789 }
790
791 if (newlen)
792 len = strlen (kbuf);
793 } 779 }
780
781 if (newlen)
782 len = strlen (kbuf);
794 783
795 /* 784 /*
796 * Pass meta for all function keys, if 'meta' option set 785 * Pass meta for all function keys, if 'meta' option set
797 */ 786 */
798#ifdef META8_OPTION 787#ifdef META8_OPTION
… …
898 commit_iso14755 (); 887 commit_iso14755 ();
899 888
900 return; 889 return;
901 } 890 }
902 891
903 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 892 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
904 if (i[0] == keysym) 893 if (i[0] == keysym)
905 { 894 {
906 iso14755buf = ISO_14755_51 | i[1]; 895 iso14755buf = ISO_14755_51 | i[1];
907 commit_iso14755 (); 896 commit_iso14755 ();
908 897
… …
945 else if (keysym == XK_Control_L || keysym == XK_Control_R) 934 else if (keysym == XK_Control_L || keysym == XK_Control_R)
946 mouse_slip_wheel_speed = 0; 935 mouse_slip_wheel_speed = 0;
947#endif 936#endif
948} 937}
949 938
950#if defined (KEYSYM_RESOURCE)
951unsigned int
952rxvt_term::cmd_write (const char *str, unsigned int count)
953{
954 unsigned int n, s;
955
956 n = cmdbuf_ptr - cmdbuf_base;
957 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
958
959 if (n > 0 && s < count)
960 {
961 memmove (cmdbuf_base, cmdbuf_ptr,
962 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
963 cmdbuf_ptr = cmdbuf_base;
964 cmdbuf_endp -= n;
965 s += n;
966 }
967
968 if (count > s)
969 {
970 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
971 count = s;
972 }
973
974 for (; count--;)
975 *cmdbuf_endp++ = *str++;
976
977 cmd_parse ();
978
979 return 0;
980}
981#endif
982
983void 939void
984rxvt_term::flush () 940rxvt_term::flush ()
985{ 941{
986 flush_ev.stop (); 942 flush_ev.stop ();
987 943
988#ifdef HAVE_BG_PIXMAP 944#ifdef HAVE_BG_PIXMAP
989 if (bgPixmap.check_clearChanged ()) 945 if (bg_flags & BG_NEEDS_REFRESH)
990 { 946 {
991// scr_clear (true); This needs to be researched further! 947 bg_flags &= ~BG_NEEDS_REFRESH;
992 scr_touch (false); 948 scr_touch (false);
993 } 949 }
994#endif 950#endif
995 951
996 if (want_refresh) 952 if (want_refresh)
… …
1032 } 988 }
1033 while (row < end_row); 989 while (row < end_row);
1034 } 990 }
1035 991
1036 scr_refresh (); 992 scr_refresh ();
1037 scrollbar_show (1); 993 scrollBar.show (1);
1038#ifdef USE_XIM 994#ifdef USE_XIM
1039 IMSendSpot (); 995 IMSendSpot ();
1040#endif 996#endif
1041 } 997 }
1042 998
1043 display->flush (); 999 display->flush ();
1044} 1000}
1045 1001
1046/* checks wether a refresh is requested and starts the refresh timer */ 1002/* checks whether a refresh is requested and starts the refresh timer */
1047void 1003void
1048rxvt_term::refresh_check () 1004rxvt_term::refresh_check ()
1049{ 1005{
1050 if (want_refresh && !flush_ev.is_active ()) 1006 if (want_refresh && !flush_ev.is_active ())
1051 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1007 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1008
1009 display->flush ();
1052} 1010}
1053 1011
1054void 1012void
1055rxvt_term::flush_cb (ev::timer &w, int revents) 1013rxvt_term::flush_cb (ev::timer &w, int revents)
1056{ 1014{
… …
1076{ 1034{
1077 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1035 if (scr_refresh_rend (RS_Blink, RS_Blink))
1078 { 1036 {
1079 hidden_text = !hidden_text; 1037 hidden_text = !hidden_text;
1080 want_refresh = 1; 1038 want_refresh = 1;
1081 refresh_check (); 1039 refresh_check ();
1082 } 1040 }
1083 else 1041 else
1084 w.stop (); 1042 w.stop ();
1085} 1043}
1086#endif 1044#endif
1087 1045
1088#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1046#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1089void 1047void
1090rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1048rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1091{ 1049{
1092 if ((scrollbar_isUp () || scrollbar_isDn ()) 1050 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1093 && scr_page (scrollbar_isUp () ? UP : DN, 1)) 1051 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1094 { 1052 {
1095 want_refresh = 1; 1053 want_refresh = 1;
1096 refresh_check (); 1054 refresh_check ();
1097 } 1055 }
1098 else 1056 else
… …
1142 { 1100 {
1143 // this should really be sched_yield(), but the linux guys thought 1101 // this should really be sched_yield(), but the linux guys thought
1144 // that giving a process calling sched_yield () less cpu time than 1102 // that giving a process calling sched_yield () less cpu time than
1145 // ones with high nice levels is a useful thing to do. It surely is is 1103 // ones with high nice levels is a useful thing to do. It surely is is
1146 // allowed by the sus... as is returning ENOSYS. 1104 // allowed by the sus... as is returning ENOSYS.
1105 // since the linux guys additionally thought that breaking the only
1106 // known workaround against their unusable sched_yield hack is cool,
1107 // we just nanosleep a bit and hope for the best.
1147 1108
1148 struct timespec ts = { 0, 0 }; 1109 struct timespec ts = { 0, 1000 };
1149 nanosleep (&ts, 0); 1110 nanosleep (&ts, 0);
1150 1111
1151 w.stop (); 1112 w.stop ();
1152 } 1113 }
1153 1114
… …
1156 { 1117 {
1157 } 1118 }
1158} event_handler; 1119} event_handler;
1159#endif 1120#endif
1160 1121
1122/* make sure all the cmd data is at beginning of cmdbuf */
1123void
1124rxvt_term::cmdbuf_reify ()
1125{
1126 if (cmdbuf_ptr == cmdbuf_base)
1127 return;
1128
1129 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1130
1131 memmove (cmdbuf_base, cmdbuf_ptr, used);
1132 cmdbuf_ptr = cmdbuf_base;
1133 cmdbuf_endp = cmdbuf_ptr + used;
1134
1135}
1136
1137#if defined (KEYSYM_RESOURCE)
1138void
1139rxvt_term::cmdbuf_append (const char *str, size_t count)
1140{
1141 cmdbuf_reify ();
1142
1143 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1144
1145 if (count > avail)
1146 return;
1147
1148 memcpy (cmdbuf_endp, str, count);
1149 cmdbuf_endp += count;
1150
1151 cmd_parse ();
1152}
1153#endif
1154
1161bool 1155bool
1162rxvt_term::pty_fill () 1156rxvt_term::pty_fill ()
1163{ 1157{
1164 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1158 cmdbuf_reify ();
1165 1159
1166 if (CBUFSIZ == n) 1160 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1167 { 1161
1168 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1162 if (!avail)
1169 n = 0;
1170 } 1163 {
1171 1164 // normally this indicates a "too long" command sequence - just drop the data we have
1172 memmove (cmdbuf_base, cmdbuf_ptr, n);
1173 cmdbuf_ptr = cmdbuf_base; 1165 cmdbuf_ptr = cmdbuf_base;
1174 cmdbuf_endp = cmdbuf_ptr + n; 1166 cmdbuf_endp = cmdbuf_ptr;
1167 avail = CBUFSIZ;
1168 }
1175 1169
1176 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1170 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1177 1171
1178 if (r > 0) 1172 if (r > 0)
1179 { 1173 {
1180 cmdbuf_endp += r; 1174 cmdbuf_endp += r;
1181 return true; 1175 return true;
… …
1203{ 1197{
1204 make_current (); 1198 make_current ();
1205 1199
1206 if (revents & ev::READ) 1200 if (revents & ev::READ)
1207 // loop, but don't allow a single term to monopolize us 1201 // loop, but don't allow a single term to monopolize us
1208 while (pty_fill ()) 1202 for (int i = CBUFCNT; i-- && pty_fill (); )
1209 if (cmd_parse ()) 1203 cmd_parse ();
1210 break;
1211 1204
1212 if (revents & ev::WRITE) 1205 if (revents & ev::WRITE)
1213 pty_write (); 1206 pty_write ();
1207
1208 refresh_check ();
1214} 1209}
1215 1210
1216void 1211void
1217rxvt_term::pointer_unblank () 1212rxvt_term::pointer_unblank ()
1218{ 1213{
… …
1254{ 1249{
1255 int button_number, key_state = 0; 1250 int button_number, key_state = 0;
1256 int x, y; 1251 int x, y;
1257 int code = 32; 1252 int code = 32;
1258 1253
1259 x = Pixel2Col (ev.x); 1254 x = Pixel2Col (ev.x) + 1;
1260 y = Pixel2Row (ev.y); 1255 y = Pixel2Row (ev.y) + 1;
1256
1261 if (ev.type == MotionNotify) 1257 if (ev.type == MotionNotify)
1262 { 1258 {
1263 if (x == mouse_row && y == mouse_col) 1259 if (x == mouse_row && y == mouse_col)
1264 return; 1260 return;
1261
1265 mouse_row = x; 1262 mouse_row = x;
1266 mouse_col = y; 1263 mouse_col = y;
1267 code += 32; 1264 code += 32;
1268 } 1265 }
1269 1266
… …
1272 else 1269 else
1273 { 1270 {
1274 button_number = MEvent.button - Button1; 1271 button_number = MEvent.button - Button1;
1275 /* add 0x3D for wheel events, like xterm does */ 1272 /* add 0x3D for wheel events, like xterm does */
1276 if (button_number >= 3) 1273 if (button_number >= 3)
1277 button_number += (64 - 3); 1274 button_number += 64 - 3;
1278 } 1275 }
1279 1276
1280 if (priv_modes & PrivMode_MouseX10) 1277 if (priv_modes & PrivMode_MouseX10)
1281 { 1278 {
1282 /* 1279 /*
… …
1314 fputc ('A', stderr); 1311 fputc ('A', stderr);
1315 if (key_state & 32) 1312 if (key_state & 32)
1316 fputc ('2', stderr); 1313 fputc ('2', stderr);
1317 fprintf (stderr, "]: <%d>, %d/%d\n", 1314 fprintf (stderr, "]: <%d>, %d/%d\n",
1318 button_number, 1315 button_number,
1319 x + 1, 1316 x,
1320 y + 1); 1317 y);
1321#endif 1318#endif
1322 1319
1320#if ENABLE_FRILLS
1321 if (priv_modes & PrivMode_ExtMouseRight)
1322 tt_printf ("\033[%d;%d;%dM",
1323 code + button_number + key_state,
1324 x,
1325 y);
1326 else if (priv_modes & PrivMode_ExtModeMouse)
1327 tt_printf ("\033[M%c%lc%lc",
1328 code + button_number + key_state,
1329 wint_t (32 + x),
1330 wint_t (32 + y));
1331 else
1332#endif
1323 tt_printf ("\033[M%c%c%c", 1333 tt_printf ("\033[M%c%c%c",
1324 (code + button_number + key_state), 1334 code + button_number + key_state,
1325 (32 + x + 1), 1335 32 + x,
1326 (32 + y + 1)); 1336 32 + y);
1327} 1337}
1328 1338
1329/*{{{ process an X event */ 1339/*{{{ process an X event */
1330void 1340void
1331rxvt_term::x_cb (XEvent &ev) 1341rxvt_term::x_cb (XEvent &ev)
… …
1433 && ev.xfocus.mode != NotifyGrab) 1443 && ev.xfocus.mode != NotifyGrab)
1434 focus_out (); 1444 focus_out ();
1435 break; 1445 break;
1436 1446
1437 case ConfigureNotify: 1447 case ConfigureNotify:
1438 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1439 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1440 szHint.width, szHint.height); */
1441 if (ev.xconfigure.window == parent[0]) 1448 if (ev.xconfigure.window == parent)
1442 { 1449 {
1443 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1450 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1444 ; 1451 ;
1452
1453#ifdef HAVE_BG_PIXMAP
1454 bool moved = false;
1455 if (bg_window_position_sensitive ())
1456 {
1457 int x, y;
1458 if (ev.xconfigure.send_event)
1459 {
1460 x = ev.xconfigure.x;
1461 y = ev.xconfigure.y;
1462 }
1463 else
1464 get_window_origin (x, y);
1465
1466 if (bg_set_position (x, y)
1467 || !(bg_flags & BG_IS_VALID))
1468 moved = true;
1469 }
1470#endif
1445 1471
1446 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1472 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1447 { 1473 {
1448 seen_resize = 1; 1474 seen_resize = 1;
1449 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1475 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1450 } 1476 }
1451 else 1477 else
1452 { 1478 {
1453#ifdef HAVE_BG_PIXMAP 1479#ifdef HAVE_BG_PIXMAP
1454 if (bgPixmap.window_position_sensitive ()) 1480 if (moved)
1481 {
1482 if (mapped)
1455 update_background (); 1483 update_background ();
1484 else
1485 bg_invalidate ();
1486 }
1456#endif 1487#endif
1457 } 1488 }
1489
1458 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1490 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1459 } 1491 }
1460 break; 1492 break;
1461 1493
1462 case PropertyNotify: 1494 case PropertyNotify:
1463 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1495 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1464 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1465 && ev.xproperty.state == PropertyNewValue)
1466 selection_property (ev.xproperty.window, ev.xproperty.atom);
1467
1468 break; 1496 break;
1469 1497
1470 case SelectionClear: 1498 case SelectionClear:
1471 selection_clear (); 1499 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1472 break;
1473
1474 case SelectionNotify:
1475 if (selection_wait == Sel_normal)
1476 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1477 break; 1500 break;
1478 1501
1479 case SelectionRequest: 1502 case SelectionRequest:
1480 selection_send (ev.xselectionrequest); 1503 selection_send (ev.xselectionrequest);
1481 break; 1504 break;
1482 1505
1483 case MapNotify: 1506 case MapNotify:
1507#ifdef HAVE_BG_PIXMAP
1508 /* This is needed specifically to fix the case of no window manager or a
1509 * non-reparenting window manager. In those cases we never get first
1510 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1511 * care of multiplicity of ConfigureNotify events arriving while WM does
1512 * reparenting.
1513 * We should not render background immediately, as there could be several
1514 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1515 * by scheduling background redraw as soon as we can, but giving a short
1516 * bit of time for ConfigureNotifies to arrive.
1517 * We should render background PRIOR to drawing any text, but AFTER all
1518 * of ConfigureNotifys for the best results.
1519 */
1520 if (!(bg_flags & BG_IS_VALID))
1521 update_background_ev.start (0.025);
1522#endif
1484 mapped = 1; 1523 mapped = 1;
1485#ifdef TEXT_BLINK 1524#ifdef TEXT_BLINK
1486 text_blink_ev.start (); 1525 text_blink_ev.start ();
1487#endif 1526#endif
1488 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1527 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1501 if (ev.xany.window == vt) 1540 if (ev.xany.window == vt)
1502 { 1541 {
1503 do 1542 do
1504 { 1543 {
1505 scr_expose (ev.xexpose.x, ev.xexpose.y, 1544 scr_expose (ev.xexpose.x, ev.xexpose.y,
1506 ev.xexpose.width, ev.xexpose.height, False); 1545 ev.xexpose.width, ev.xexpose.height, false);
1507 } 1546 }
1508 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1509 1548
1510 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1511 1550
1512 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1513 { 1552 {
1514 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1515 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, false);
1516 } 1555 }
1517 1556
1518 want_refresh = 1; 1557 want_refresh = 1;
1519 } 1558 }
1520 else 1559 else
… …
1524 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1563 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1525 ; 1564 ;
1526 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1565 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1527 ; 1566 ;
1528 1567
1529 if (isScrollbarWindow (ev.xany.window)) 1568 if (scrollBar.state && ev.xany.window == scrollBar.win)
1530 { 1569 {
1531 scrollBar.setIdle (); 1570 scrollBar.state = STATE_IDLE;
1532 scrollbar_show (0); 1571 scrollBar.show (0);
1533 } 1572 }
1534 } 1573 }
1535 break; 1574 break;
1536 1575
1537 case MotionNotify: 1576 case MotionNotify:
… …
1624#ifdef MOUSE_THRESHOLD 1663#ifdef MOUSE_THRESHOLD
1625 } 1664 }
1626#endif 1665#endif
1627 } 1666 }
1628 } 1667 }
1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1668 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1630 { 1669 {
1631 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1670 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1632 MotionNotify, &ev)) 1671 MotionNotify, &ev))
1633 ; 1672 ;
1634 1673
… …
1636 &unused_root, &unused_child, 1675 &unused_root, &unused_child,
1637 &unused_root_x, &unused_root_y, 1676 &unused_root_x, &unused_root_y,
1638 &ev.xbutton.x, &ev.xbutton.y, 1677 &ev.xbutton.x, &ev.xbutton.y,
1639 &unused_mask); 1678 &unused_mask);
1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1641 scrollbar_size ()); 1680 scrollBar.size ());
1642 want_refresh = 1; 1681 want_refresh = 1;
1643 scrollbar_show (1); 1682 scrollBar.show (1);
1644 } 1683 }
1645 break; 1684 break;
1646 } 1685 }
1647 1686
1648#if defined(CURSOR_BLINK) 1687#if defined(CURSOR_BLINK)
… …
1673#endif 1712#endif
1674 1713
1675 refresh_check (); 1714 refresh_check ();
1676} 1715}
1677 1716
1717#if ENABLE_FRILLS
1718void
1719rxvt_term::set_urgency (bool enable)
1720{
1721 if (enable == urgency_hint)
1722 return;
1723
1724 if (XWMHints *h = XGetWMHints (dpy, parent))
1725 {
1726 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1727 XSetWMHints (dpy, parent, h);
1728 urgency_hint = enable;
1729 }
1730}
1731#endif
1732
1678void 1733void
1679rxvt_term::focus_in () 1734rxvt_term::focus_in ()
1680{ 1735{
1681 if (!focus) 1736 if (!focus)
1682 { 1737 {
1683 focus = 1; 1738 focus = 1;
1684 want_refresh = 1; 1739 want_refresh = 1;
1685
1686 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1687 1740
1688#if USE_XIM 1741#if USE_XIM
1689 if (Input_Context != NULL) 1742 if (Input_Context != NULL)
1690 { 1743 {
1691 IMSetPosition (); 1744 IMSetPosition ();
… …
1703 scr_recolour (); 1756 scr_recolour ();
1704 } 1757 }
1705#endif 1758#endif
1706#if ENABLE_FRILLS 1759#if ENABLE_FRILLS
1707 if (option (Opt_urgentOnBell)) 1760 if (option (Opt_urgentOnBell))
1708 { 1761 set_urgency (0);
1709 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1710 {
1711 h->flags &= ~XUrgencyHint;
1712 XSetWMHints (dpy, parent[0], h);
1713 }
1714 }
1715#endif 1762#endif
1763
1764 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1716 } 1765 }
1717} 1766}
1718 1767
1719void 1768void
1720rxvt_term::focus_out () 1769rxvt_term::focus_out ()
… …
1722 if (focus) 1771 if (focus)
1723 { 1772 {
1724 focus = 0; 1773 focus = 0;
1725 want_refresh = 1; 1774 want_refresh = 1;
1726 1775
1727 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1776#if ENABLE_FRILLS
1728 1777 if (option (Opt_urgentOnBell))
1778 set_urgency (0);
1779#endif
1729#if ENABLE_FRILLS || ISO_14755 1780#if ENABLE_FRILLS || ISO_14755
1730 if (iso14755buf) 1781 if (iso14755buf)
1731 { 1782 {
1732 iso14755buf = 0; 1783 iso14755buf = 0;
1733# if ISO_14755 1784# if ISO_14755
… …
1750 { 1801 {
1751 pix_colors = pix_colors_unfocused; 1802 pix_colors = pix_colors_unfocused;
1752 scr_recolour (); 1803 scr_recolour ();
1753 } 1804 }
1754#endif 1805#endif
1806
1807 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1755 } 1808 }
1756} 1809}
1757 1810
1758void 1811void
1759rxvt_term::update_fade_color (unsigned int idx) 1812rxvt_term::update_fade_color (unsigned int idx)
… …
1787 * use the property to determine the pixmap. We use it later on. 1840 * use the property to determine the pixmap. We use it later on.
1788 */ 1841 */
1789 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1842 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1790 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1843 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1791 { 1844 {
1792 bgPixmap.set_root_pixmap (); 1845 bg_set_root_pixmap ();
1793 update_background (); 1846 update_background ();
1794 } 1847 }
1848
1795 break; 1849 break;
1796 } 1850 }
1797# endif 1851# endif
1798 1852
1799 refresh_check (); 1853 refresh_check ();
… …
1835 /* save the xbutton state (for ButtonRelease) */ 1889 /* save the xbutton state (for ButtonRelease) */
1836 MEvent.state = ev.state; 1890 MEvent.state = ev.state;
1837#ifdef MOUSE_REPORT_DOUBLECLICK 1891#ifdef MOUSE_REPORT_DOUBLECLICK
1838 if (ev.button == MEvent.button && clickintime) 1892 if (ev.button == MEvent.button && clickintime)
1839 { 1893 {
1840 /* same button, within alloted time */ 1894 /* same button, within allowed time */
1841 MEvent.clicks++; 1895 MEvent.clicks++;
1842 1896
1843 if (MEvent.clicks > 1) 1897 if (MEvent.clicks > 1)
1844 { 1898 {
1845 /* only report double clicks */ 1899 /* only report double clicks */
… …
1917 } 1971 }
1918 1972
1919 /* 1973 /*
1920 * Scrollbar window processing of button press 1974 * Scrollbar window processing of button press
1921 */ 1975 */
1922 if (isScrollbarWindow (ev.window)) 1976 if (scrollBar.state && ev.window == scrollBar.win)
1923 { 1977 {
1924 scrollBar.setIdle (); 1978 page_dirn direction = NO_DIR;
1979
1980 if (scrollBar.upButton (ev.y))
1981 direction = UP; /* up */
1982 else if (scrollBar.dnButton (ev.y))
1983 direction = DN; /* down */
1984
1985 scrollBar.state = STATE_IDLE;
1925 /* 1986 /*
1926 * Rxvt-style scrollbar: 1987 * Rxvt-style scrollbar:
1927 * move up if mouse is above slider 1988 * move up if mouse is above slider
1928 * move dn if mouse is below slider 1989 * move dn if mouse is below slider
1929 * 1990 *
… …
1938 /* 1999 /*
1939 * Mouse report disabled scrollbar: 2000 * Mouse report disabled scrollbar:
1940 * arrow buttons - send up/down 2001 * arrow buttons - send up/down
1941 * click on scrollbar - send pageup/down 2002 * click on scrollbar - send pageup/down
1942 */ 2003 */
1943 if ((scrollBar.style == R_SB_NEXT 2004 if (direction == UP)
1944 && scrollbarnext_upButton (ev.y))
1945 || (scrollBar.style == R_SB_RXVT
1946 && scrollbarrxvt_upButton (ev.y)))
1947 tt_printf ("\033[A"); 2005 tt_printf ("\033[A");
1948 else if ((scrollBar.style == R_SB_NEXT 2006 else if (direction == DN)
1949 && scrollbarnext_dnButton (ev.y))
1950 || (scrollBar.style == R_SB_RXVT
1951 && scrollbarrxvt_dnButton (ev.y)))
1952 tt_printf ("\033[B"); 2007 tt_printf ("\033[B");
1953 else 2008 else
1954 switch (ev.button) 2009 switch (ev.button)
1955 { 2010 {
1956 case Button2: 2011 case Button2:
… …
1964 break; 2019 break;
1965 } 2020 }
1966 } 2021 }
1967 else 2022 else
1968#endif /* NO_SCROLLBAR_REPORT */ 2023#endif /* NO_SCROLLBAR_REPORT */
1969
1970 {
1971 char upordown = 0;
1972
1973 if (scrollBar.style == R_SB_NEXT)
1974 { 2024 {
1975 if (scrollbarnext_upButton (ev.y)) 2025 if (direction != NO_DIR)
1976 upordown = -1; /* up */
1977 else if (scrollbarnext_dnButton (ev.y))
1978 upordown = 1; /* down */
1979 }
1980 else if (scrollBar.style == R_SB_RXVT)
1981 {
1982 if (scrollbarrxvt_upButton (ev.y))
1983 upordown = -1; /* up */
1984 else if (scrollbarrxvt_dnButton (ev.y))
1985 upordown = 1; /* down */
1986 }
1987
1988 if (upordown)
1989 { 2026 {
1990#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2027#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1991 if (!cont_scroll_ev.is_active ()) 2028 if (!cont_scroll_ev.is_active ())
1992 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2029 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1993#endif 2030#endif
1994 if (scr_page (upordown < 0 ? UP : DN, 1)) 2031 if (scr_page (direction, 1))
1995 { 2032 {
1996 if (upordown < 0) 2033 if (direction == UP)
1997 scrollBar.setUp (); 2034 scrollBar.state = STATE_UP;
1998 else 2035 else
1999 scrollBar.setDn (); 2036 scrollBar.state = STATE_DOWN;
2000 } 2037 }
2001 } 2038 }
2002 else 2039 else
2003 switch (ev.button) 2040 switch (ev.button)
2004 { 2041 {
2005 case Button2: 2042 case Button2:
2006 switch (scrollbar_align) 2043 switch (scrollBar.align)
2007 { 2044 {
2008 case R_SB_ALIGN_TOP: 2045 case R_SB_ALIGN_TOP:
2009 csrO = 0; 2046 csrO = 0;
2010 break; 2047 break;
2011 case R_SB_ALIGN_CENTRE: 2048 case R_SB_ALIGN_CENTRE:
… …
2017 } 2054 }
2018 2055
2019 if (scrollBar.style == R_SB_XTERM 2056 if (scrollBar.style == R_SB_XTERM
2020 || scrollbar_above_slider (ev.y) 2057 || scrollbar_above_slider (ev.y)
2021 || scrollbar_below_slider (ev.y)) 2058 || scrollbar_below_slider (ev.y))
2022 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2059 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2023 2060
2024 scrollBar.setMotion (); 2061 scrollBar.state = STATE_MOTION;
2025 break; 2062 break;
2026 2063
2027 case Button1: 2064 case Button1:
2028 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2065 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2029 csrO = ev.y - scrollBar.top; 2066 csrO = ev.y - scrollBar.top;
2030 /* FALLTHROUGH */ 2067 /* FALLTHROUGH */
2031 2068
2032 case Button3: 2069 case Button3:
2033 if (scrollBar.style != R_SB_XTERM) 2070 if (scrollBar.style != R_SB_XTERM)
… …
2043 scr_page (DN, nrow - 1); 2080 scr_page (DN, nrow - 1);
2044# else 2081# else
2045 scr_page (DN, nrow / 4); 2082 scr_page (DN, nrow / 4);
2046# endif 2083# endif
2047 else 2084 else
2048 scrollBar.setMotion (); 2085 scrollBar.state = STATE_MOTION;
2049 } 2086 }
2050 else 2087 else
2051 { 2088 {
2052 scr_page ((ev.button == Button1 ? DN : UP), 2089 scr_page ((ev.button == Button1 ? DN : UP),
2053 (nrow 2090 (nrow
2054 * scrollbar_position (ev.y) 2091 * scrollbar_position (ev.y)
2055 / scrollbar_size ())); 2092 / scrollBar.size ()));
2056 } 2093 }
2057 2094
2058 break; 2095 break;
2059 } 2096 }
2060 } 2097 }
… …
2070 2107
2071 csrO = 0; /* reset csr Offset */ 2108 csrO = 0; /* reset csr Offset */
2072 if (!bypass_keystate) 2109 if (!bypass_keystate)
2073 reportmode = !! (priv_modes & PrivMode_mouse_report); 2110 reportmode = !! (priv_modes & PrivMode_mouse_report);
2074 2111
2075 if (scrollbar_isUpDn ()) 2112 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2076 { 2113 {
2077 scrollBar.setIdle (); 2114 scrollBar.state = STATE_IDLE;
2078 scrollbar_show (0); 2115 scrollBar.show (0);
2079 } 2116 }
2080 2117
2081#ifdef SELECTION_SCROLLING 2118#ifdef SELECTION_SCROLLING
2082 sel_scroll_ev.stop(); 2119 sel_scroll_ev.stop();
2083#endif 2120#endif
… …
2133 selection_make (ev.time); 2170 selection_make (ev.time);
2134 break; 2171 break;
2135 2172
2136 case Button2: 2173 case Button2:
2137 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2174 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2138 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2175 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2139 break; 2176 break;
2140 2177
2141#ifdef MOUSE_WHEEL 2178#ifdef MOUSE_WHEEL
2142 case Button4: 2179 case Button4:
2143 case Button5: 2180 case Button5:
… …
2163 2200
2164 if (!slip_wheel_ev.is_active ()) 2201 if (!slip_wheel_ev.is_active ())
2165 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2202 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2166 } 2203 }
2167 else 2204 else
2205# endif
2168 { 2206 {
2169# endif
2170 scr_page (v, i); 2207 scr_page (v, i);
2171 scrollbar_show (1); 2208 scrollBar.show (1);
2172# ifdef MOUSE_SLIP_WHEELING
2173 } 2209 }
2174# endif
2175 } 2210 }
2176 break; 2211 break;
2177#endif 2212#endif
2178 } 2213 }
2179 } 2214 }
2180} 2215}
2181 2216
2182/*}}} */ 2217/*}}} */
2183 2218
2184bool 2219void
2185rxvt_term::cmd_parse () 2220rxvt_term::cmd_parse ()
2186{ 2221{
2187 bool flag = false;
2188 wchar_t ch = NOCHAR; 2222 wchar_t ch = NOCHAR;
2189 char *seq_begin; // remember start of esc-sequence here 2223 char *seq_begin; // remember start of esc-sequence here
2190 2224
2191 for (;;) 2225 for (;;)
2192 { 2226 {
2193 if (ch == NOCHAR) 2227 if (expect_false (ch == NOCHAR))
2194 { 2228 {
2195 seq_begin = cmdbuf_ptr; 2229 seq_begin = cmdbuf_ptr;
2196 ch = next_char (); 2230 ch = next_char ();
2197 2231
2198 if (ch == NOCHAR) 2232 if (ch == NOCHAR)
2199 break; 2233 break;
2200 } 2234 }
2201 2235
2202 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2236 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2203 { 2237 {
2204 if (!seen_input) 2238 if (expect_false (!seen_input))
2205 { 2239 {
2206 seen_input = 1; 2240 seen_input = 1;
2207 // many badly-written programs (e.g. jed) contain a race condition: 2241 // many badly-written programs (e.g. jed) contain a race condition:
2208 // they first read the screensize and then install a SIGWINCH handler. 2242 // they first read the screensize and then install a SIGWINCH handler.
2209 // some window managers resize the window early, and these programs 2243 // some window managers resize the window early, and these programs
… …
2222 wchar_t *str = buf; 2256 wchar_t *str = buf;
2223 wchar_t *eol = str + min (ncol, UBUFSIZ); 2257 wchar_t *eol = str + min (ncol, UBUFSIZ);
2224 2258
2225 for (;;) 2259 for (;;)
2226 { 2260 {
2227 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2261 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2228 break; 2262 break;
2229 2263
2230 *str++ = ch; 2264 *str++ = ch;
2231 2265
2232 if (ch == C0_LF || str >= eol) 2266 if (expect_false (ch == C0_LF || str >= eol))
2233 { 2267 {
2234 if (ch == C0_LF) 2268 if (ch == C0_LF)
2235 nlines++; 2269 nlines++;
2236 2270
2237 refresh_count++; 2271 refresh_count++;
… …
2286 * What the heck we'll cheat and only refresh less than every page-full. 2320 * What the heck we'll cheat and only refresh less than every page-full.
2287 * if skipScroll is enabled. 2321 * if skipScroll is enabled.
2288 */ 2322 */
2289 if (refreshnow) 2323 if (refreshnow)
2290 { 2324 {
2291 flag = true;
2292 scr_refresh (); 2325 scr_refresh ();
2293 want_refresh = 1; 2326 want_refresh = 1;
2294 } 2327 }
2295
2296 } 2328 }
2297 else 2329 else
2298 { 2330 {
2299 try 2331 try
2300 { 2332 {
… …
2308 } 2340 }
2309 2341
2310 ch = NOCHAR; 2342 ch = NOCHAR;
2311 } 2343 }
2312 } 2344 }
2313
2314 refresh_check ();
2315
2316 return flag;
2317} 2345}
2318 2346
2319// read the next character 2347// read the next character
2320wchar_t 2348wchar_t
2321rxvt_term::next_char () NOTHROW 2349rxvt_term::next_char () NOTHROW
2322{ 2350{
2323 while (cmdbuf_ptr < cmdbuf_endp) 2351 while (cmdbuf_ptr < cmdbuf_endp)
2324 { 2352 {
2325 // assume 7-bit to be ascii ALWAYS 2353 // assume 7-bit to be ascii ALWAYS
2326 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2354 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2327 return *cmdbuf_ptr++; 2355 return *cmdbuf_ptr++;
2328 2356
2329 wchar_t wc; 2357 wchar_t wc;
2330 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2358 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2331 2359
… …
2335 cmdbuf_ptr = cmdbuf_endp; 2363 cmdbuf_ptr = cmdbuf_endp;
2336 break; 2364 break;
2337 } 2365 }
2338 2366
2339 if (len == (size_t)-1) 2367 if (len == (size_t)-1)
2368 {
2369 mbstate.reset (); // reset now undefined conversion state
2340 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2370 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2371 }
2341 2372
2342 // assume wchar == unicode 2373 // assume wchar == unicode
2343 cmdbuf_ptr += len; 2374 cmdbuf_ptr += len;
2344 return wc & UNICODE_MASK; 2375 return wc & UNICODE_MASK;
2345 } 2376 }
… …
2356 : NOCHAR; 2387 : NOCHAR;
2357} 2388}
2358 2389
2359static class out_of_input out_of_input; 2390static class out_of_input out_of_input;
2360 2391
2361/* rxvt_cmd_getc () - Return next input character */
2362/*
2363 * Return the next input character after first passing any keyboard input
2364 * to the command.
2365 */
2366wchar_t 2392wchar_t
2367rxvt_term::cmd_getc () THROW ((class out_of_input)) 2393rxvt_term::cmd_getc () THROW ((class out_of_input))
2368{ 2394{
2369 wchar_t c = next_char (); 2395 wchar_t c = next_char ();
2370 2396
… …
2389/*----------------------------------------------------------------------*/ 2415/*----------------------------------------------------------------------*/
2390#ifdef PRINTPIPE 2416#ifdef PRINTPIPE
2391FILE * 2417FILE *
2392rxvt_term::popen_printer () 2418rxvt_term::popen_printer ()
2393{ 2419{
2394 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2420 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2395 2421
2396 if (stream == NULL) 2422 if (stream == NULL)
2397 rxvt_warn ("can't open printer pipe, not printing.\n"); 2423 rxvt_warn ("can't open printer pipe, not printing.\n");
2398 2424
2399 return stream; 2425 return stream;
… …
2410 * simulate attached vt100 printer 2436 * simulate attached vt100 printer
2411 */ 2437 */
2412void 2438void
2413rxvt_term::process_print_pipe () 2439rxvt_term::process_print_pipe ()
2414{ 2440{
2415 int done; 2441 FILE *fd = popen_printer ();
2416 FILE *fd;
2417 2442
2418 if ((fd = popen_printer ()) == NULL) 2443 if (!fd)
2419 return; 2444 return;
2420 2445
2421 /* 2446 /*
2422 * Send all input to the printer until either ESC[4i or ESC[?4i 2447 * Send all input to the printer until either ESC[4i or ESC[?4i
2423 * is received. 2448 * is received.
2424 */ 2449 */
2425 for (done = 0; !done;) 2450 for (int done = 0; !done; )
2426 { 2451 {
2427 unsigned char buf[8]; 2452 unsigned char buf[8];
2428 unicode_t ch; 2453 unicode_t ch;
2429 unsigned int i, len; 2454 unsigned int i, len;
2430 2455
… …
2464 pclose_printer (fd); 2489 pclose_printer (fd);
2465} 2490}
2466#endif /* PRINTPIPE */ 2491#endif /* PRINTPIPE */
2467/*}}} */ 2492/*}}} */
2468 2493
2469/* *INDENT-OFF* */
2470enum { 2494enum {
2471 C1_40 = 0x40, 2495 C1_40 = 0x40,
2472 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2496 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2473 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2497 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2474 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2498 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2475 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2499 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2476}; 2500};
2477/* *INDENT-ON* */
2478 2501
2479/*{{{ process non-printing single characters */ 2502/*{{{ process non-printing single characters */
2480void 2503void
2481rxvt_term::process_nonprinting (unicode_t ch) 2504rxvt_term::process_nonprinting (unicode_t ch)
2482{ 2505{
… …
2575 break; 2598 break;
2576 case 'Z': /* identify the terminal type */ 2599 case 'Z': /* identify the terminal type */
2577 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2600 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2578 break; 2601 break;
2579 case '<': /* turn off VT52 mode */ 2602 case '<': /* turn off VT52 mode */
2580 PrivMode (0, PrivMode_vt52); 2603 set_privmode (PrivMode_vt52, 0);
2581 break; 2604 break;
2582 case 'F': /* use special graphics character set */ 2605 case 'F': /* use special graphics character set */
2583 case 'G': /* use regular character set */ 2606 case 'G': /* use regular character set */
2584 /* unimplemented */ 2607 /* unimplemented */
2585 break; 2608 break;
… …
2639 scr_forwardindex (); 2662 scr_forwardindex ();
2640 break; 2663 break;
2641#endif 2664#endif
2642 case '=': 2665 case '=':
2643 case '>': 2666 case '>':
2644 PrivMode ((ch == '='), PrivMode_aplKP); 2667 set_privmode (PrivMode_aplKP, ch == '=');
2645 break; 2668 break;
2646 2669
2647 case C1_40: 2670 case C1_40:
2648 cmd_getc (); 2671 cmd_getc ();
2649 break; 2672 break;
… …
2653 2676
2654 /* 8.3.87: NEXT LINE */ 2677 /* 8.3.87: NEXT LINE */
2655 case C1_NEL: /* ESC E */ 2678 case C1_NEL: /* ESC E */
2656 { 2679 {
2657 wchar_t nlcr[] = { C0_LF, C0_CR }; 2680 wchar_t nlcr[] = { C0_LF, C0_CR };
2658 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2681 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2659 } 2682 }
2660 break; 2683 break;
2661 2684
2662 /* kidnapped escape sequence: Should be 8.3.48 */ 2685 /* kidnapped escape sequence: Should be 8.3.48 */
2663 case C1_ESA: /* ESC G */ 2686 case C1_ESA: /* ESC G */
2664 process_graphics (); 2687 // used by original rxvt for rob nations own graphics mode
2688 if (cmd_getc () == 'Q')
2689 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2665 break; 2690 break;
2666 2691
2667 /* 8.3.63: CHARACTER TABULATION SET */ 2692 /* 8.3.63: CHARACTER TABULATION SET */
2668 case C1_HTS: /* ESC H */ 2693 case C1_HTS: /* ESC H */
2669 scr_set_tab (1); 2694 scr_set_tab (1);
… …
2688 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2713 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2689 case C1_SCI: /* ESC Z */ 2714 case C1_SCI: /* ESC Z */
2690 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2715 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2691 break; /* steal obsolete ESC [ c */ 2716 break; /* steal obsolete ESC [ c */
2692 2717
2693 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2718 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2694 case C1_CSI: /* ESC [ */ 2719 case C1_CSI: /* ESC [ */
2695 process_csi_seq (); 2720 process_csi_seq ();
2696 break; 2721 break;
2697 2722
2698 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2723 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2699 case C1_OSC: /* ESC ] */ 2724 case C1_OSC: /* ESC ] */
2700 process_osc_seq (); 2725 process_osc_seq ();
2701 break; 2726 break;
2702 2727
2703 /* 8.3.106: RESET TO INITIAL STATE */ 2728 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2704 case 'c': 2729 case 'c':
2705 mbstate.reset (); 2730 mbstate.reset ();
2706 scr_poweron (); 2731 scr_poweron ();
2707 scrollbar_show (1); 2732 scrollBar.show (1);
2708 break; 2733 break;
2709 2734
2710 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2735 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2711 case 'n': 2736 case 'n':
2712 scr_charset_choose (2); 2737 scr_charset_choose (2);
… …
2719 } 2744 }
2720} 2745}
2721/*}}} */ 2746/*}}} */
2722 2747
2723/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2748/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2724/* *INDENT-OFF* */
2725enum { 2749enum {
2726 CSI_ICH = 0x40, 2750 CSI_ICH = 0x40,
2727 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2751 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2728 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2752 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2729 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2753 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2732 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2756 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2733 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2757 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2734 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2758 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2735}; 2759};
2736 2760
2737#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2761#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2738 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2762 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2739 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2763 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2740#define get_byte_array_bit(array, bit) \ 2764#define get_byte_array_bit(array, bit) \
2741 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2765 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2742 2766
2743const unsigned char csi_defaults[] = 2767static const unsigned char csi_defaults[] =
2744 { 2768 {
2745 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2769 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2746 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2770 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2747 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2771 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2748 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2772 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2749 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2773 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2750 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2774 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2751 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2775 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2752 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2776 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2753 }; 2777 };
2754/* *INDENT-ON* */
2755 2778
2756void 2779void
2757rxvt_term::process_csi_seq () 2780rxvt_term::process_csi_seq ()
2758{ 2781{
2759 unicode_t ch, priv, i; 2782 unicode_t ch, priv, i;
… …
2763 2786
2764 nargs = 0; 2787 nargs = 0;
2765 2788
2766 priv = 0; 2789 priv = 0;
2767 ch = cmd_getc (); 2790 ch = cmd_getc ();
2768 if (ch >= '<' && ch <= '?') 2791 if ((ch >= '<' && ch <= '?') || ch == '!')
2769 { 2792 {
2770 /* '<' '=' '>' '?' */ 2793 /* '<' '=' '>' '?' '!' */
2771 priv = ch; 2794 priv = ch;
2772 ch = cmd_getc (); 2795 ch = cmd_getc ();
2773 } 2796 }
2774 2797
2775 /* read any numerical arguments */ 2798 /* read any numerical arguments */
… …
2824 // versions. 2847 // versions.
2825 // 2848 //
2826 tt_printf ("\033[>%d;95;0c", 'U'); 2849 tt_printf ("\033[>%d;95;0c", 'U');
2827 } 2850 }
2828 break; 2851 break;
2852
2829 case '?': 2853 case '?':
2830 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2854 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2831 process_terminal_mode (ch, priv, nargs, arg); 2855 process_terminal_mode (ch, priv, nargs, arg);
2832 break; 2856 break;
2857
2858 case '!':
2859 if (ch == CSI_70)
2860 {
2861 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2862 scr_soft_reset ();
2863
2864 static const int pm_h[] = { 7, 25 };
2865 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2866
2867 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2868 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2833 } 2869 }
2870 break;
2871 }
2872
2834 return; 2873 return;
2835 } 2874 }
2836 2875
2837 switch (ch) 2876 switch (ch)
2838 { 2877 {
… …
3053 } 3092 }
3054} 3093}
3055/*}}} */ 3094/*}}} */
3056 3095
3057#if !ENABLE_MINIMAL 3096#if !ENABLE_MINIMAL
3058/* ARGSUSED */
3059void 3097void
3060rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3098rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3061{ 3099{
3062 int x, y; 3100 int x, y;
3063 XWindowAttributes wattr; 3101 XWindowAttributes wattr;
… …
3072 { 3110 {
3073 /* 3111 /*
3074 * commands 3112 * commands
3075 */ 3113 */
3076 case 1: /* deiconify window */ 3114 case 1: /* deiconify window */
3077 XMapWindow (dpy, parent[0]); 3115 XMapWindow (dpy, parent);
3078 break; 3116 break;
3079 case 2: /* iconify window */ 3117 case 2: /* iconify window */
3080 XIconifyWindow (dpy, parent[0], display->screen); 3118 XIconifyWindow (dpy, parent, display->screen);
3081 break; 3119 break;
3082 case 3: /* set position (pixels) */ 3120 case 3: /* set position (pixels) */
3083 XMoveWindow (dpy, parent[0], args[1], args[2]); 3121 XMoveWindow (dpy, parent, args[1], args[2]);
3084 break; 3122 break;
3085 case 4: /* set size (pixels) */ 3123 case 4: /* set size (pixels) */
3086 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3124 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3087 break; 3125 break;
3088 case 5: /* raise window */ 3126 case 5: /* raise window */
3089 XRaiseWindow (dpy, parent[0]); 3127 XRaiseWindow (dpy, parent);
3090 break; 3128 break;
3091 case 6: /* lower window */ 3129 case 6: /* lower window */
3092 XLowerWindow (dpy, parent[0]); 3130 XLowerWindow (dpy, parent);
3093 break; 3131 break;
3094 case 7: /* refresh window */ 3132 case 7: /* refresh window */
3095 scr_touch (true); 3133 scr_touch (true);
3096 break; 3134 break;
3097 case 8: /* set size (chars) */ 3135 case 8: /* set size (chars) */
… …
3108 3146
3109 /* 3147 /*
3110 * reports - some output format copied from XTerm 3148 * reports - some output format copied from XTerm
3111 */ 3149 */
3112 case 11: /* report window state */ 3150 case 11: /* report window state */
3113 XGetWindowAttributes (dpy, parent[0], &wattr); 3151 XGetWindowAttributes (dpy, parent, &wattr);
3114 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3152 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3115 break; 3153 break;
3116 case 13: /* report window position */ 3154 case 13: /* report window position */
3117 XGetWindowAttributes (dpy, parent[0], &wattr); 3155 XGetWindowAttributes (dpy, parent, &wattr);
3118 XTranslateCoordinates (dpy, parent[0], wattr.root, 3156 XTranslateCoordinates (dpy, parent, wattr.root,
3119 -wattr.border_width, -wattr.border_width, 3157 -wattr.border_width, -wattr.border_width,
3120 &x, &y, &wdummy); 3158 &x, &y, &wdummy);
3121 tt_printf ("\033[3;%d;%dt", x, y); 3159 tt_printf ("\033[3;%d;%dt", x, y);
3122 break; 3160 break;
3123 case 14: /* report window size (pixels) */ 3161 case 14: /* report window size (pixels) */
3124 XGetWindowAttributes (dpy, parent[0], &wattr); 3162 XGetWindowAttributes (dpy, parent, &wattr);
3125 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3163 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3126 break; 3164 break;
3127 case 18: /* report text area size (chars) */ 3165 case 18: /* report text area size (chars) */
3128 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3166 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3129 break; 3167 break;
… …
3131 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3169 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3132 break; 3170 break;
3133 case 20: /* report icon label */ 3171 case 20: /* report icon label */
3134 { 3172 {
3135 char *s; 3173 char *s;
3136 XGetIconName (dpy, parent[0], &s); 3174 XGetIconName (dpy, parent, &s);
3137 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3175 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3138 XFree (s); 3176 XFree (s);
3139 } 3177 }
3140 break; 3178 break;
3141 case 21: /* report window title */ 3179 case 21: /* report window title */
3142 { 3180 {
3143 char *s; 3181 char *s;
3144 XFetchName (dpy, parent[0], &s); 3182 XFetchName (dpy, parent, &s);
3145 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3183 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3146 XFree (s); 3184 XFree (s);
3147 } 3185 }
3148 break; 3186 break;
3149 } 3187 }
… …
3205 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3243 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3206 */ 3244 */
3207void 3245void
3208rxvt_term::process_dcs_seq () 3246rxvt_term::process_dcs_seq ()
3209{ 3247{
3210 char *s;
3211 unicode_t eh;
3212
3213 /* 3248 /*
3214 * Not handled yet 3249 * Not handled yet
3215 */ 3250 */
3251
3252 unicode_t eh;
3216 s = get_to_st (eh); 3253 char *s = get_to_st (eh);
3217 if (s) 3254 if (s)
3218 free (s); 3255 free (s);
3219 3256
3220 return; 3257 return;
3221} 3258}
… …
3225 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3262 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3226 */ 3263 */
3227void 3264void
3228rxvt_term::process_osc_seq () 3265rxvt_term::process_osc_seq ()
3229{ 3266{
3230 unicode_t ch, eh;
3231 int arg; 3267 int arg;
3232 3268
3233 ch = cmd_getc (); 3269 unicode_t ch = cmd_getc ();
3234 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3270 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3235 arg = arg * 10 + (ch - '0'); 3271 arg = arg * 10 + (ch - '0');
3236 3272
3237 if (ch == ';') 3273 if (ch == ';')
3238 { 3274 {
3275 unicode_t eh;
3239 char *s = get_to_st (eh); 3276 char *s = get_to_st (eh);
3240 3277
3241 if (s) 3278 if (s)
3242 { 3279 {
3243 process_xterm_seq (arg, s, eh); 3280 process_xterm_seq (arg, s, eh);
… …
3267 3304
3268/* 3305/*
3269 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3306 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3270 */ 3307 */
3271void 3308void
3272rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3309rxvt_term::process_xterm_seq (int op, char *str, char resp)
3273{ 3310{
3274 int color; 3311 int color;
3275 char *buf, *name; 3312 char *buf, *name;
3276 bool query = str[0] == '?' && !str[1]; 3313 bool query = str[0] == '?' && !str[1];
3277 int saveop = op; 3314 int saveop = op;
… …
3304 unsigned long bytes_after; 3341 unsigned long bytes_after;
3305 unsigned char *value = 0; 3342 unsigned char *value = 0;
3306 const char *str = ""; 3343 const char *str = "";
3307 3344
3308 if (prop 3345 if (prop
3309 && XGetWindowProperty (dpy, parent[0], 3346 && XGetWindowProperty (dpy, parent,
3310 prop, 0, 1<<16, 0, AnyPropertyType, 3347 prop, 0, 1<<16, 0, AnyPropertyType,
3311 &actual_type, &actual_format, 3348 &actual_type, &actual_format,
3312 &nitems, &bytes_after, &value) == Success 3349 &nitems, &bytes_after, &value) == Success
3313 && actual_type != None 3350 && actual_type != None
3314 && actual_format == 8) 3351 && actual_format == 8)
… …
3318 3355
3319 XFree (value); 3356 XFree (value);
3320 } 3357 }
3321 else 3358 else
3322 { 3359 {
3323 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3360 char *eq = strchr (str, '=');
3324 3361
3325 if (eq) 3362 if (eq)
3326 { 3363 {
3327 *eq = 0; 3364 *eq = 0;
3328 set_utf8_property (display->atom (str), eq + 1); 3365 set_utf8_property (display->atom (str), eq + 1);
3329 } 3366 }
3330 else 3367 else
3331 XDeleteProperty (dpy, parent[0], 3368 XDeleteProperty (dpy, parent,
3332 display->atom (str)); 3369 display->atom (str));
3333 } 3370 }
3334 break; 3371 break;
3335 3372
3336 case XTerm_Color: 3373 case XTerm_Color:
… …
3349 *buf++ = '\0'; 3386 *buf++ = '\0';
3350 3387
3351 process_color_seq (op, color, name, resp); 3388 process_color_seq (op, color, name, resp);
3352 } 3389 }
3353 break; 3390 break;
3391 case Rxvt_restoreFG:
3354 case XTerm_Color00: 3392 case XTerm_Color00:
3355 process_color_seq (op, Color_fg, str, resp); 3393 process_color_seq (op, Color_fg, str, resp);
3356 break; 3394 break;
3395 case Rxvt_restoreBG:
3357 case XTerm_Color01: 3396 case XTerm_Color01:
3358 process_color_seq (op, Color_bg, str, resp); 3397 process_color_seq (op, Color_bg, str, resp);
3359 break; 3398 break;
3360#ifndef NO_CURSORCOLOR 3399#ifndef NO_CURSORCOLOR
3361 case XTerm_Color_cursor: 3400 case XTerm_Color_cursor:
… …
3366 process_color_seq (op, Color_pointer_fg, str, resp); 3405 process_color_seq (op, Color_pointer_fg, str, resp);
3367 break; 3406 break;
3368 case XTerm_Color_pointer_bg: 3407 case XTerm_Color_pointer_bg:
3369 process_color_seq (op, Color_pointer_bg, str, resp); 3408 process_color_seq (op, Color_pointer_bg, str, resp);
3370 break; 3409 break;
3410#ifdef OPTION_HC
3411 case XTerm_Color_HC:
3412 process_color_seq (op, Color_HC, str, resp);
3413 break;
3414 case XTerm_Color_HTC:
3415 process_color_seq (op, Color_HTC, str, resp);
3416 break;
3417#endif
3371#ifndef NO_BOLD_UNDERLINE_REVERSE 3418#ifndef NO_BOLD_UNDERLINE_REVERSE
3372 case XTerm_Color_RV:
3373 process_color_seq (op, Color_RV, str, resp);
3374 break;
3375 case Rxvt_Color_BD:
3376 case URxvt_Color_BD: 3419 case URxvt_Color_BD:
3377 process_color_seq (op, Color_BD, str, resp); 3420 process_color_seq (op, Color_BD, str, resp);
3378 break; 3421 break;
3379 case Rxvt_Color_UL:
3380 case URxvt_Color_UL: 3422 case URxvt_Color_UL:
3381 process_color_seq (op, Color_UL, str, resp); 3423 process_color_seq (op, Color_UL, str, resp);
3382 break; 3424 break;
3383 case URxvt_Color_IT: 3425 case URxvt_Color_IT:
3384 process_color_seq (op, Color_IT, str, resp); 3426 process_color_seq (op, Color_IT, str, resp);
3385 break; 3427 break;
3386#endif 3428#endif
3429 case URxvt_Color_border:
3430 process_color_seq (op, Color_border, str, resp);
3431 break;
3387#if ENABLE_TRANSPARENCY 3432#if ENABLE_TRANSPARENCY
3388 case URxvt_Color_tint: 3433 case URxvt_Color_tint:
3389 process_color_seq (op, Color_tint, str, resp); 3434 process_color_seq (op, Color_tint, str, resp);
3390 { 3435 {
3391 bool changed = false; 3436 bool changed = false;
3437
3392 if (ISSET_PIXCOLOR (Color_tint)) 3438 if (ISSET_PIXCOLOR (Color_tint))
3393 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3439 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3394 else 3440
3395 changed = bgPixmap.unset_tint ();
3396 if (changed) 3441 if (changed)
3397 update_background (); 3442 update_background ();
3398 } 3443 }
3399 3444
3400 break; 3445 break;
… …
3404 case Rxvt_Pixmap: 3449 case Rxvt_Pixmap:
3405 if (!strcmp (str, "?")) 3450 if (!strcmp (str, "?"))
3406 { 3451 {
3407 char str[256]; 3452 char str[256];
3408 3453
3409 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3454 sprintf (str, "[%dx%d+%d+%d]",
3410 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3455 min (h_scale, 32767), min (v_scale, 32767),
3411 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3456 min (h_align, 32767), min (v_align, 32767));
3412 process_xterm_seq (XTerm_title, str, CHAR_ST); 3457 process_xterm_seq (XTerm_title, str, CHAR_ST);
3413 } 3458 }
3414 else 3459 else
3415 { 3460 {
3416 int changed = 0; 3461 int changed = 0;
3417 3462
3418 if (*str != ';') 3463 if (*str != ';')
3419 { 3464 {
3420 /* reset to default scaling :*/
3421 bgPixmap.unset_geometry ();
3422 if (bgPixmap.set_file (str)) /* change pixmap */ 3465 if (bg_set_file (str)) /* change pixmap */
3466 {
3423 changed++; 3467 changed++;
3424 str = strchr (str, ';'); 3468 str = strchr (str, ';');
3425 if (str == NULL) 3469 if (str == NULL)
3426 bgPixmap.set_defaultGeometry (); 3470 bg_set_default_geometry ();
3471 else
3472 bg_set_geometry (str+1);
3473 }
3427 } 3474 }
3428 while (str) 3475 else
3429 { 3476 {
3430 str++; 3477 str++;
3431 if (bgPixmap.set_geometry (str)) 3478 if (bg_set_geometry (str, true))
3432 changed++; 3479 changed++;
3433 str = strchr (str, ';');
3434 } 3480 }
3481
3435 if (changed) 3482 if (changed)
3483 {
3484 if (bg_window_position_sensitive ())
3485 {
3486 int x, y;
3487 get_window_origin (x, y);
3488 bg_set_position (x, y);
3489 }
3436 update_background (); 3490 update_background ();
3491 }
3437 } 3492 }
3438 break; 3493 break;
3439#endif 3494#endif
3440
3441 case Rxvt_restoreFG:
3442 set_window_color (Color_fg, str);
3443 break;
3444 case Rxvt_restoreBG:
3445 set_window_color (Color_bg, str);
3446 break;
3447 3495
3448 case XTerm_logfile: 3496 case XTerm_logfile:
3449 // TODO, when secure mode? 3497 // TODO, when secure mode?
3450 break; 3498 break;
3451 3499
… …
3518 break; 3566 break;
3519#endif 3567#endif
3520 3568
3521#if ENABLE_PERL 3569#if ENABLE_PERL
3522 case URxvt_perl: 3570 case URxvt_perl:
3523 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3571 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3524 ; // no responses yet
3525 break; 3572 break;
3526#endif 3573#endif
3527 } 3574 }
3528} 3575}
3529/*----------------------------------------------------------------------*/ 3576/*----------------------------------------------------------------------*/
… …
3552 { 3599 {
3553 if (mode == 'r') 3600 if (mode == 'r')
3554 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3601 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3555 else 3602 else
3556 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3603 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3557 PrivMode (state, bit); 3604
3605 set_privmode (bit, state);
3558 } 3606 }
3559 3607
3560 return state; 3608 return state;
3561} 3609}
3562 3610
… …
3570 static const struct 3618 static const struct
3571 { 3619 {
3572 const int argval; 3620 const int argval;
3573 const unsigned long bit; 3621 const unsigned long bit;
3574 } argtopriv[] = { 3622 } argtopriv[] = {
3575 { 1, PrivMode_aplCUR }, 3623 { 1, PrivMode_aplCUR }, // DECCKM
3576 { 2, PrivMode_vt52 }, 3624 { 2, PrivMode_vt52 },
3577 { 3, PrivMode_132 }, 3625 { 3, PrivMode_132 }, // DECCOLM
3578 { 4, PrivMode_smoothScroll }, 3626 { 4, PrivMode_smoothScroll }, // DECSCLM
3579 { 5, PrivMode_rVideo }, 3627 { 5, PrivMode_rVideo }, // DECSCNM
3580 { 6, PrivMode_relOrigin }, 3628 { 6, PrivMode_relOrigin }, // DECOM
3581 { 7, PrivMode_Autowrap }, 3629 { 7, PrivMode_Autowrap }, // DECAWM
3582 // 8, bi-directional support mode 3630 // 8, auto-repeat keys // DECARM
3583 { 9, PrivMode_MouseX10 }, 3631 { 9, PrivMode_MouseX10 },
3584 // 18, 19 printing-related 3632 // 18 end FF to printer after print screen
3633 // 19 Print screen prints full screen/scroll region
3585 { 25, PrivMode_VisibleCursor }, 3634 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3586#ifdef scrollBar_esc 3635#ifdef scrollBar_esc
3587 { scrollBar_esc, PrivMode_scrollBar }, 3636 { scrollBar_esc, PrivMode_scrollBar },
3588#endif 3637#endif
3589 { 35, PrivMode_ShiftKeys }, // rxvt extension 3638 { 35, PrivMode_ShiftKeys }, // rxvt extension
3639 // 38, tektronix mode // DECTEK
3590 { 40, PrivMode_132OK }, 3640 { 40, PrivMode_132OK },
3591 // 41 xterm more fixes NYI 3641 // 41 xterm more fixes NYI
3592 // 45 margin bell NYI 3642 // 45 margin bell NYI
3593 // 46 start logging 3643 // 46 start logging
3594 { 47, PrivMode_Screen }, 3644 { 47, PrivMode_Screen },
3595 { 66, PrivMode_aplKP }, 3645 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3596#ifndef NO_BACKSPACE_KEY 3646#ifndef NO_BACKSPACE_KEY
3597 { 67, PrivMode_BackSpace }, 3647 { 67, PrivMode_BackSpace }, // DECBKM
3598#endif 3648#endif
3599 { 1000, PrivMode_MouseX11 }, 3649 { 1000, PrivMode_MouseX11 },
3600 { 1002, PrivMode_MouseBtnEvent }, 3650 { 1002, PrivMode_MouseBtnEvent },
3601 { 1003, PrivMode_MouseAnyEvent }, 3651 { 1003, PrivMode_MouseAnyEvent },
3652#if ENABLE_FRILLS
3653 { 1005, PrivMode_ExtModeMouse },
3654#endif
3602 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3655 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3603 { 1011, PrivMode_Keypress }, // rxvt extension 3656 { 1011, PrivMode_Keypress }, // rxvt extension
3657#if ENABLE_FRILLS
3658 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3659#endif
3604 // 1035 enable modifiers for alt, numlock NYI 3660 // 1035 enable modifiers for alt, numlock NYI
3605 // 1036 send ESC for meta keys NYI 3661 // 1036 send ESC for meta keys NYI
3606 // 1037 send DEL for keypad delete NYI 3662 // 1037 send DEL for keypad delete NYI
3607 { 1047, PrivMode_Screen }, 3663 { 1047, PrivMode_Screen },
3608 // 1048 save and restore cursor 3664 // 1048 save and restore cursor, implemented in code
3609 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3665 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3610 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3666 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3667 { 2004, PrivMode_BracketPaste },
3611 }; 3668 };
3612 3669
3613 if (nargs == 0) 3670 if (nargs == 0)
3614 return; 3671 return;
3615 3672
… …
3622 for (i = 0; i < nargs; i++) 3679 for (i = 0; i < nargs; i++)
3623 { 3680 {
3624 state = -1; 3681 state = -1;
3625 3682
3626 /* basic handling */ 3683 /* basic handling */
3627 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3684 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3628 if (argtopriv[j].argval == arg[i]) 3685 if (argtopriv[j].argval == arg[i])
3629 { 3686 {
3630 state = privcases (mode, argtopriv[j].bit); 3687 state = privcases (mode, argtopriv[j].bit);
3631 break; 3688 break;
3632 } 3689 }
… …
3640 3697
3641 scr_touch (true); 3698 scr_touch (true);
3642 break; 3699 break;
3643#endif 3700#endif
3644 case 1048: /* alternative cursor save */ 3701 case 1048: /* alternative cursor save */
3645 case 1049:
3646 if (option (Opt_secondaryScreen)) 3702 if (option (Opt_secondaryScreen))
3647 if (mode == 0) 3703 if (mode == 0)
3648 scr_cursor (RESTORE); 3704 scr_cursor (RESTORE);
3649 else if (mode == 1) 3705 else if (mode == 1)
3650 scr_cursor (SAVE); 3706 scr_cursor (SAVE);
… …
3659 case 2: /* VT52 mode */ 3715 case 2: /* VT52 mode */
3660 /* oddball mode. should be set regardless of set/reset 3716 /* oddball mode. should be set regardless of set/reset
3661 * parameter. Return from VT52 mode with an ESC < from 3717 * parameter. Return from VT52 mode with an ESC < from
3662 * within VT52 mode 3718 * within VT52 mode
3663 */ 3719 */
3664 PrivMode (1, PrivMode_vt52); 3720 set_privmode (PrivMode_vt52, 1);
3665 break; 3721 break;
3666 case 3: /* 80/132 */ 3722 case 3: /* 80/132 */
3667 if (priv_modes & PrivMode_132OK) 3723 if (priv_modes & PrivMode_132OK)
3668 set_widthheight (((state ? 132 : 80) * fwidth), height); 3724 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3669 break; 3725 break;
3670 case 4: /* smooth scrolling */ 3726 case 4: /* smooth scrolling */
3671 set_option (Opt_jumpScroll, !state); 3727 set_option (Opt_jumpScroll, !state);
3672 break; 3728 break;
3673 case 5: /* reverse video */ 3729 case 5: /* reverse video */
… …
3684 if (state) /* orthogonal */ 3740 if (state) /* orthogonal */
3685 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3741 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3686 break; 3742 break;
3687#ifdef scrollBar_esc 3743#ifdef scrollBar_esc
3688 case scrollBar_esc: 3744 case scrollBar_esc:
3689 if (scrollbar_mapping (state)) 3745 if (scrollBar.map (state))
3690 { 3746 {
3691 resize_all_windows (0, 0, 0); 3747 resize_all_windows (0, 0, 0);
3692 scr_touch (true); 3748 scr_touch (true);
3693 } 3749 }
3694 break; 3750 break;
… …
3711 case 1003: 3767 case 1003:
3712 if (state) 3768 if (state)
3713 { 3769 {
3714 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3770 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3715 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3771 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3772 mouse_row = mouse_col = 0;
3716 vt_emask_mouse = PointerMotionMask; 3773 vt_emask_mouse = PointerMotionMask;
3717 } 3774 }
3718 else 3775 else
3719 vt_emask_mouse = NoEventMask; 3776 vt_emask_mouse = NoEventMask;
3777
3720 vt_select_input (); 3778 vt_select_input ();
3721 break; 3779 break;
3722 case 1010: /* scroll to bottom on TTY output inhibit */ 3780 case 1010: /* scroll to bottom on TTY output inhibit */
3723 set_option (Opt_scrollTtyOutput, !state); 3781 set_option (Opt_scrollTtyOutput, !state);
3724 break; 3782 break;
3725 case 1011: /* scroll to bottom on key press */ 3783 case 1011: /* scroll to bottom on key press */
3726 set_option (Opt_scrollTtyKeypress, state); 3784 set_option (Opt_scrollTtyKeypress, state);
3727 break; 3785 break;
3728 case 1047: /* secondary screen w/ clearing last */ 3786 case 1047: /* secondary screen w/ clearing last */
3729 if (option (Opt_secondaryScreen)) 3787 if (option (Opt_secondaryScreen))
3730 if (current_screen != PRIMARY) 3788 if (!state)
3731 scr_erase_screen (2); 3789 scr_erase_screen (2);
3790
3732 scr_change_screen (state); 3791 scr_change_screen (state);
3733 break; 3792 break;
3734 case 1049: /* secondary screen w/ clearing first */ 3793 case 1049: /* secondary screen w/ clearing first */
3794 if (option (Opt_secondaryScreen))
3795 if (state)
3796 scr_cursor (SAVE);
3797
3735 scr_change_screen (state); 3798 scr_change_screen (state);
3799
3736 if (option (Opt_secondaryScreen)) 3800 if (option (Opt_secondaryScreen))
3737 if (current_screen != PRIMARY) 3801 if (state)
3738 scr_erase_screen (2); 3802 scr_erase_screen (2);
3803 else
3804 scr_cursor (RESTORE);
3739 break; 3805 break;
3740 default: 3806 default:
3741 break; 3807 break;
3742 } 3808 }
3743 } 3809 }
… …
3896 } 3962 }
3897 } 3963 }
3898} 3964}
3899/*}}} */ 3965/*}}} */
3900 3966
3901/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3902void
3903rxvt_term::process_graphics ()
3904{
3905 unicode_t ch, cmd = cmd_getc ();
3906
3907 if (cmd == 'Q')
3908 {
3909 /* query graphics */
3910 tt_printf ("\033G0\012"); /* no graphics */
3911 return;
3912 }
3913 /* swallow other graphics sequences until terminating ':' */
3914 do
3915 ch = cmd_getc ();
3916 while (ch != ':');
3917}
3918/*}}} */
3919
3920/* ------------------------------------------------------------------------- */ 3967/* ------------------------------------------------------------------------- */
3921 3968
3922/* 3969/*
3923 * Send printf () formatted output to the command. 3970 * Send printf () formatted output to the command.
3924 * Only use for small amounts of data. 3971 * Only use for small amounts of data.
… …
3937 3984
3938/* ---------------------------------------------------------------------- */ 3985/* ---------------------------------------------------------------------- */
3939/* Write data to the pty as typed by the user, pasted with the mouse, 3986/* Write data to the pty as typed by the user, pasted with the mouse,
3940 * or generated by us in response to a query ESC sequence. 3987 * or generated by us in response to a query ESC sequence.
3941 */ 3988 */
3942const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3989static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3943 3990
3944void 3991void
3945rxvt_term::tt_write (const char *data, unsigned int len) 3992rxvt_term::tt_write (const char *data, unsigned int len)
3946{ 3993{
3947 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3994 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3952 3999
3953 if (v_buflen == 0) 4000 if (v_buflen == 0)
3954 { 4001 {
3955 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4002 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3956 4003
4004 max_it (written, 0);
4005
3957 if ((unsigned int)written == len) 4006 if (written == len)
3958 return; 4007 return;
3959 4008
3960 data += written; 4009 data += written;
3961 len -= written; 4010 len -= written;
3962 } 4011 }
3963 4012
3964 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4013 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3965 4014
3966 memcpy (v_buffer + v_buflen, data, len); 4015 memcpy (v_buffer + v_buflen, data, len);
3967 v_buflen += len; 4016 v_buflen += len;
3968 4017
3969 pty_ev.set (ev::READ | ev::WRITE); 4018 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines