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.487 by sf-exg, Sat Apr 30 13:11:34 2011 UTC

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

Diff Legend

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