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.406 by ayin, Thu Feb 14 23:53:05 2008 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
… …
297 } 300 }
298 301
299 return -1; 302 return -1;
300} 303}
301#endif 304#endif
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}
302 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;
… …
320 * Always permit `shift' to override the current setting 418 * Always permit `shift' to override the current setting
321 */ 419 */
322 shft = ev.state & ShiftMask; 420 shft = ev.state & ShiftMask;
323 ctrl = ev.state & ControlMask; 421 ctrl = ev.state & ControlMask;
324 meta = ev.state & ModMetaMask; 422 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 423
332 kbuf[0] = 0; 424 kbuf[0] = 0;
333 425
334#ifdef USE_XIM 426#ifdef USE_XIM
335 if (Input_Context) 427 if (Input_Context)
… …
410#ifdef PAGING_CONTEXT_LINES 502#ifdef PAGING_CONTEXT_LINES
411 lnsppg = nrow - PAGING_CONTEXT_LINES; 503 lnsppg = nrow - PAGING_CONTEXT_LINES;
412#else 504#else
413 lnsppg = nrow * 4 / 5; 505 lnsppg = nrow * 4 / 5;
414#endif 506#endif
507 max_it (lnsppg, 1);
508
415 if (keysym == XK_Prior) 509 if (keysym == XK_Prior)
416 { 510 {
417 scr_page (UP, lnsppg); 511 scr_page (UP, lnsppg);
418 return; 512 return;
419 } 513 }
… …
472 selection_request (ev.time); 566 selection_request (ev.time);
473 return; 567 return;
474#if TODO 568#if TODO
475 /* rxvt extras */ 569 /* rxvt extras */
476 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 570 case XK_KP_Add: /* Shift+KP_Add = bigger font */
477 change_font (FONT_UP);
478 return; 571 return;
479 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 572 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
480 change_font (FONT_DN);
481 return; 573 return;
482#endif 574#endif
483 } 575 }
484 } 576 }
485 } 577 }
486 578
487#if ENABLE_FRILLS || ISO_14755 579#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 580 // ISO 14755 support
489 if (shft && ctrl) 581 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 582 {
491 int hv; 583 int hv;
492 584
493 if (iso14755buf & ISO_14755_51 585 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 586 && (keysym == XK_space || keysym == XK_KP_Space
… …
524 scr_overlay_off (); 616 scr_overlay_off ();
525# endif 617# endif
526 iso14755buf = 0; 618 iso14755buf = 0;
527 } 619 }
528 } 620 }
621 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 622 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 623 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 624 if (!(iso14755buf & ISO_14755_STARTED))
532 { 625 {
533 iso14755buf |= ISO_14755_STARTED; 626 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 627# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 628 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
546 } 639 }
547#endif 640#endif
548 641
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 642 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 643 {
551 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 644 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
552 unsigned int newlen = 1; 645 unsigned int newlen = 1;
553#ifdef XK_KP_Home 646
554 static const KeySym keypadtrans[] = { 647 if (ev.state & ModNumLockMask)
555 XK_KP_7, // XK_KP_Home 648 kp = false;
556 XK_KP_4, // XK_KP_Left 649
557 XK_KP_8, // XK_KP_Up 650 keysym = translate_keypad (keysym, kp);
558 XK_KP_6, // XK_KP_Right 651
559 XK_KP_2, // XK_KP_Down 652 switch (keysym)
560#ifndef UNSHIFTED_SCROLLKEYS 653 {
561 XK_KP_9, // XK_KP_Prior 654#ifndef NO_BACKSPACE_KEY
562 XK_KP_3, // XK_KP_Next 655 case XK_BackSpace:
563#else 656 if (priv_modes & PrivMode_HaveBackSpace)
564 XK_Prior, 657 {
565 XK_Next, 658 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
566#endif 659 ^ !!ctrl) ? '\b' : '\177';
567 XK_KP_1, // XK_KP_End 660 kbuf[1] = '\0';
568 XK_KP_5, // XK_KP_Begin
569 }; 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;
570 687
571 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:
572 { 768 {
573 unsigned int index = keysym - XK_KP_Home; 769 int param = map_function_key (keysym);
574 keysym = kp ? keypadtrans[index] : XK_Home + index; 770 if (param > 0)
771 sprintf (kbuf,"\033[%d~", param);
772 else
773 newlen = 0;
575 } 774 }
576 else if (keysym == XK_KP_Insert)
577 keysym = kp ? XK_KP_0 : XK_Insert;
578#ifndef NO_DELETE_KEY
579 else if (keysym == XK_KP_Delete)
580 keysym = kp ? XK_KP_Decimal : XK_Delete;
581#endif
582#endif
583 switch (keysym)
584 {
585#ifndef NO_BACKSPACE_KEY
586 case XK_BackSpace:
587 if (priv_modes & PrivMode_HaveBackSpace)
588 {
589 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
590 ^ !!ctrl) ? '\b' : '\177';
591 kbuf[1] = '\0';
592 }
593 else
594 strcpy (kbuf, rs[Rs_backspace_key]);
595 break; 775 break;
596#endif
597#ifndef NO_DELETE_KEY
598 case XK_Delete:
599 strcpy (kbuf, rs[Rs_delete_key]);
600 break;
601#endif
602 case XK_Tab:
603 if (shft)
604 strcpy (kbuf, "\033[Z");
605 else
606 {
607#ifdef CTRL_TAB_MAKES_META
608 if (ctrl)
609 meta = 1;
610#endif
611#ifdef MOD4_TAB_MAKES_META
612 if (ev.state & Mod4Mask)
613 meta = 1;
614#endif
615 newlen = 0;
616 }
617 break;
618
619 case XK_Up: /* "\033[A" */
620 case XK_Down: /* "\033[B" */
621 case XK_Right: /* "\033[C" */
622 case XK_Left: /* "\033[D" */
623 strcpy (kbuf, "\033[Z");
624 kbuf[2] = "DACB"[keysym - XK_Left];
625 /* do Shift first */
626 if (shft)
627 kbuf[2] = "dacb"[keysym - XK_Left];
628 else if (ctrl)
629 {
630 kbuf[1] = 'O';
631 kbuf[2] = "dacb"[keysym - XK_Left];
632 }
633 else if (priv_modes & PrivMode_aplCUR)
634 kbuf[1] = 'O';
635 break;
636
637#ifndef UNSHIFTED_SCROLLKEYS
638 case XK_Prior:
639 strcpy (kbuf, "\033[5~");
640 break;
641 case XK_Next:
642 strcpy (kbuf, "\033[6~");
643 break;
644#endif
645 case XK_KP_Enter:
646 /* allow shift to override */
647 if (kp)
648 {
649 strcpy (kbuf, "\033OM");
650 break;
651 }
652
653 /* FALLTHROUGH */
654
655 case XK_Return:
656 if (priv_modes & PrivMode_LFNL)
657 {
658 kbuf[0] = '\015';
659 kbuf[1] = '\012';
660 kbuf[2] = '\0';
661 }
662 else
663 {
664 kbuf[0] = '\015';
665 kbuf[1] = '\0';
666 }
667 break;
668
669 case XK_KP_F1: /* "\033OP" */
670 case XK_KP_F2: /* "\033OQ" */
671 case XK_KP_F3: /* "\033OR" */
672 case XK_KP_F4: /* "\033OS" */
673 strcpy (kbuf, "\033OP");
674 kbuf[2] += (keysym - XK_KP_F1);
675 break;
676
677 case XK_KP_Multiply: /* "\033Oj" : "*" */
678 case XK_KP_Add: /* "\033Ok" : "+" */
679 case XK_KP_Separator: /* "\033Ol" : "," */
680 case XK_KP_Subtract: /* "\033Om" : "-" */
681 case XK_KP_Decimal: /* "\033On" : "." */
682 case XK_KP_Divide: /* "\033Oo" : "/" */
683 case XK_KP_0: /* "\033Op" : "0" */
684 case XK_KP_1: /* "\033Oq" : "1" */
685 case XK_KP_2: /* "\033Or" : "2" */
686 case XK_KP_3: /* "\033Os" : "3" */
687 case XK_KP_4: /* "\033Ot" : "4" */
688 case XK_KP_5: /* "\033Ou" : "5" */
689 case XK_KP_6: /* "\033Ov" : "6" */
690 case XK_KP_7: /* "\033Ow" : "7" */
691 case XK_KP_8: /* "\033Ox" : "8" */
692 case XK_KP_9: /* "\033Oy" : "9" */
693 /* allow shift to override */
694 if (kp)
695 {
696 strcpy (kbuf, "\033Oj");
697 kbuf[2] += (keysym - XK_KP_Multiply);
698 }
699 else
700 {
701 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
702 kbuf[1] = '\0';
703 }
704 break;
705
706 case XK_Find:
707 strcpy (kbuf, "\033[1~");
708 break;
709
710 case XK_Insert:
711 strcpy (kbuf, "\033[2~");
712 break;
713#ifdef DXK_Remove /* support for DEC remove like key */
714 case DXK_Remove:
715 /* FALLTHROUGH */
716#endif
717 case XK_Execute:
718 strcpy (kbuf, "\033[3~");
719 break;
720 case XK_Select:
721 strcpy (kbuf, "\033[4~");
722 break;
723 case XK_End:
724 strcpy (kbuf, KS_END);
725 break;
726 case XK_Home:
727 strcpy (kbuf, KS_HOME);
728 break;
729
730#define FKEY(n, fkey) \
731 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
732
733 case XK_F1: /* "\033[11~" */
734 case XK_F2: /* "\033[12~" */
735 case XK_F3: /* "\033[13~" */
736 case XK_F4: /* "\033[14~" */
737 case XK_F5: /* "\033[15~" */
738 FKEY (11, XK_F1);
739 break;
740 case XK_F6: /* "\033[17~" */
741 case XK_F7: /* "\033[18~" */
742 case XK_F8: /* "\033[19~" */
743 case XK_F9: /* "\033[20~" */
744 case XK_F10: /* "\033[21~" */
745 FKEY (17, XK_F6);
746 break;
747 case XK_F11: /* "\033[23~" */
748 case XK_F12: /* "\033[24~" */
749 case XK_F13: /* "\033[25~" */
750 case XK_F14: /* "\033[26~" */
751 FKEY (23, XK_F11);
752 break;
753 case XK_F15: /* "\033[28~" */
754 case XK_F16: /* "\033[29~" */
755 FKEY (28, XK_F15);
756 break;
757 case XK_Help: /* "\033[28~" */
758 FKEY (28, XK_Help);
759 break;
760 case XK_Menu: /* "\033[29~" */
761 FKEY (29, XK_Menu);
762 break;
763 case XK_F17: /* "\033[31~" */
764 case XK_F18: /* "\033[32~" */
765 case XK_F19: /* "\033[33~" */
766 case XK_F20: /* "\033[34~" */
767 case XK_F21: /* "\033[35~" */
768 case XK_F22: /* "\033[36~" */
769 case XK_F23: /* "\033[37~" */
770 case XK_F24: /* "\033[38~" */
771 case XK_F25: /* "\033[39~" */
772 case XK_F26: /* "\033[40~" */
773 case XK_F27: /* "\033[41~" */
774 case XK_F28: /* "\033[42~" */
775 case XK_F29: /* "\033[43~" */
776 case XK_F30: /* "\033[44~" */
777 case XK_F31: /* "\033[45~" */
778 case XK_F32: /* "\033[46~" */
779 case XK_F33: /* "\033[47~" */
780 case XK_F34: /* "\033[48~" */
781 case XK_F35: /* "\033[49~" */
782 FKEY (31, XK_F17);
783 break;
784#undef FKEY
785 default:
786 newlen = 0;
787 break;
788 } 776 }
789 777
790 if (newlen) 778 if (newlen)
791 len = strlen (kbuf); 779 len = strlen (kbuf);
792 780
793 /* 781 /*
794 * Pass meta for all function keys, if 'meta' option set 782 * Pass meta for all function keys, if 'meta' option set
795 */ 783 */
796#ifdef META8_OPTION 784#ifdef META8_OPTION
… …
896 commit_iso14755 (); 884 commit_iso14755 ();
897 885
898 return; 886 return;
899 } 887 }
900 888
901 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 889 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
902 if (i[0] == keysym) 890 if (i[0] == keysym)
903 { 891 {
904 iso14755buf = ISO_14755_51 | i[1]; 892 iso14755buf = ISO_14755_51 | i[1];
905 commit_iso14755 (); 893 commit_iso14755 ();
906 894
… …
943 else if (keysym == XK_Control_L || keysym == XK_Control_R) 931 else if (keysym == XK_Control_L || keysym == XK_Control_R)
944 mouse_slip_wheel_speed = 0; 932 mouse_slip_wheel_speed = 0;
945#endif 933#endif
946} 934}
947 935
948#if defined (KEYSYM_RESOURCE)
949unsigned int
950rxvt_term::cmd_write (const char *str, unsigned int count)
951{
952 unsigned int n, s;
953
954 n = cmdbuf_ptr - cmdbuf_base;
955 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
956
957 if (n > 0 && s < count)
958 {
959 memmove (cmdbuf_base, cmdbuf_ptr,
960 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
961 cmdbuf_ptr = cmdbuf_base;
962 cmdbuf_endp -= n;
963 s += n;
964 }
965
966 if (count > s)
967 {
968 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
969 count = s;
970 }
971
972 for (; count--;)
973 *cmdbuf_endp++ = *str++;
974
975 cmd_parse ();
976
977 return 0;
978}
979#endif
980
981void 936void
982rxvt_term::flush () 937rxvt_term::flush ()
983{ 938{
984 flush_ev.stop (); 939 flush_ev.stop ();
985 940
986#ifdef HAVE_BG_PIXMAP 941#ifdef HAVE_BG_PIXMAP
987 if (bgPixmap.check_clearChanged ()) 942 if (bg_flags & BG_NEEDS_REFRESH)
988 { 943 {
989// scr_clear (true); This needs to be researched further! 944 bg_flags &= ~BG_NEEDS_REFRESH;
990 scr_touch (false); 945 scr_touch (false);
991 } 946 }
992#endif 947#endif
993 948
994 if (want_refresh) 949 if (want_refresh)
… …
1030 } 985 }
1031 while (row < end_row); 986 while (row < end_row);
1032 } 987 }
1033 988
1034 scr_refresh (); 989 scr_refresh ();
1035 scrollbar_show (1); 990 scrollBar.show (1);
1036#ifdef USE_XIM 991#ifdef USE_XIM
1037 IMSendSpot (); 992 IMSendSpot ();
1038#endif 993#endif
1039 } 994 }
1040 995
1041 display->flush (); 996 display->flush ();
1042} 997}
1043 998
1044/* checks wether a refresh is requested and starts the refresh timer */ 999/* checks whether a refresh is requested and starts the refresh timer */
1045void 1000void
1046rxvt_term::refresh_check () 1001rxvt_term::refresh_check ()
1047{ 1002{
1048 if (want_refresh && !flush_ev.is_active ()) 1003 if (want_refresh && !flush_ev.is_active ())
1049 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1004 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1142 { 1097 {
1143 // this should really be sched_yield(), but the linux guys thought 1098 // this should really be sched_yield(), but the linux guys thought
1144 // that giving a process calling sched_yield () less cpu time than 1099 // 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 1100 // ones with high nice levels is a useful thing to do. It surely is is
1146 // 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.
1147 1105
1148 struct timespec ts = { 0, 0 }; 1106 struct timespec ts = { 0, 1000 };
1149 nanosleep (&ts, 0); 1107 nanosleep (&ts, 0);
1150 1108
1151 w.stop (); 1109 w.stop ();
1152 } 1110 }
1153 1111
… …
1156 { 1114 {
1157 } 1115 }
1158} event_handler; 1116} event_handler;
1159#endif 1117#endif
1160 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
1161bool 1152bool
1162rxvt_term::pty_fill () 1153rxvt_term::pty_fill ()
1163{ 1154{
1164 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1155 cmdbuf_reify ();
1165 1156
1166 if (CBUFSIZ == n) 1157 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1167 { 1158
1168 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1159 if (!avail)
1169 n = 0;
1170 } 1160 {
1171 1161 // 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; 1162 cmdbuf_ptr = cmdbuf_base;
1174 cmdbuf_endp = cmdbuf_ptr + n; 1163 cmdbuf_endp = cmdbuf_ptr;
1164 avail = CBUFSIZ;
1165 }
1175 1166
1176 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1167 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1177 1168
1178 if (r > 0) 1169 if (r > 0)
1179 { 1170 {
1180 cmdbuf_endp += r; 1171 cmdbuf_endp += r;
1181 return true; 1172 return true;
… …
1203{ 1194{
1204 make_current (); 1195 make_current ();
1205 1196
1206 if (revents & ev::READ) 1197 if (revents & ev::READ)
1207 // loop, but don't allow a single term to monopolize us 1198 // loop, but don't allow a single term to monopolize us
1208 while (pty_fill ()) 1199 for (int i = CBUFCNT; i-- && pty_fill (); )
1209 if (cmd_parse ()) 1200 cmd_parse ();
1210 break;
1211 1201
1212 if (revents & ev::WRITE) 1202 if (revents & ev::WRITE)
1213 pty_write (); 1203 pty_write ();
1214 1204
1215 refresh_check (); 1205 refresh_check ();
… …
1256{ 1246{
1257 int button_number, key_state = 0; 1247 int button_number, key_state = 0;
1258 int x, y; 1248 int x, y;
1259 int code = 32; 1249 int code = 32;
1260 1250
1261 x = Pixel2Col (ev.x); 1251 x = Pixel2Col (ev.x) + 1;
1262 y = Pixel2Row (ev.y); 1252 y = Pixel2Row (ev.y) + 1;
1253
1263 if (ev.type == MotionNotify) 1254 if (ev.type == MotionNotify)
1264 { 1255 {
1265 if (x == mouse_row && y == mouse_col) 1256 if (x == mouse_row && y == mouse_col)
1266 return; 1257 return;
1258
1267 mouse_row = x; 1259 mouse_row = x;
1268 mouse_col = y; 1260 mouse_col = y;
1269 code += 32; 1261 code += 32;
1270 } 1262 }
1271 1263
… …
1274 else 1266 else
1275 { 1267 {
1276 button_number = MEvent.button - Button1; 1268 button_number = MEvent.button - Button1;
1277 /* add 0x3D for wheel events, like xterm does */ 1269 /* add 0x3D for wheel events, like xterm does */
1278 if (button_number >= 3) 1270 if (button_number >= 3)
1279 button_number += (64 - 3); 1271 button_number += 64 - 3;
1280 } 1272 }
1281 1273
1282 if (priv_modes & PrivMode_MouseX10) 1274 if (priv_modes & PrivMode_MouseX10)
1283 { 1275 {
1284 /* 1276 /*
… …
1316 fputc ('A', stderr); 1308 fputc ('A', stderr);
1317 if (key_state & 32) 1309 if (key_state & 32)
1318 fputc ('2', stderr); 1310 fputc ('2', stderr);
1319 fprintf (stderr, "]: <%d>, %d/%d\n", 1311 fprintf (stderr, "]: <%d>, %d/%d\n",
1320 button_number, 1312 button_number,
1321 x + 1, 1313 x,
1322 y + 1); 1314 y);
1323#endif 1315#endif
1324 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
1325 tt_printf ("\033[M%c%c%c", 1330 tt_printf ("\033[M%c%c%c",
1326 (code + button_number + key_state), 1331 code + button_number + key_state,
1327 (32 + x + 1), 1332 32 + x,
1328 (32 + y + 1)); 1333 32 + y);
1329} 1334}
1330 1335
1331/*{{{ process an X event */ 1336/*{{{ process an X event */
1332void 1337void
1333rxvt_term::x_cb (XEvent &ev) 1338rxvt_term::x_cb (XEvent &ev)
… …
1435 && ev.xfocus.mode != NotifyGrab) 1440 && ev.xfocus.mode != NotifyGrab)
1436 focus_out (); 1441 focus_out ();
1437 break; 1442 break;
1438 1443
1439 case ConfigureNotify: 1444 case ConfigureNotify:
1440 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1441 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1442 szHint.width, szHint.height);*/
1443 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent)
1444 { 1446 {
1445 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1446 ; 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
1447 1468
1448 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1469 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1449 { 1470 {
1450 seen_resize = 1; 1471 seen_resize = 1;
1451 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1472 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1452 } 1473 }
1453 else 1474 else
1454 { 1475 {
1455#ifdef HAVE_BG_PIXMAP 1476#ifdef HAVE_BG_PIXMAP
1456 if (bgPixmap.window_position_sensitive ()) 1477 if (moved)
1457 { 1478 {
1458 if (mapped) 1479 if (mapped)
1459 update_background (); 1480 update_background ();
1460 else 1481 else
1461 bgPixmap.invalidate (); 1482 bg_invalidate ();
1462 } 1483 }
1463#endif 1484#endif
1464 } 1485 }
1465 1486
1466 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1467 } 1488 }
1468 break; 1489 break;
1469 1490
1470 case PropertyNotify: 1491 case PropertyNotify:
1471 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1492 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1472 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1473 && ev.xproperty.state == PropertyNewValue)
1474 selection_property (ev.xproperty.window, ev.xproperty.atom);
1475
1476 break; 1493 break;
1477 1494
1478 case SelectionClear: 1495 case SelectionClear:
1479 selection_clear (); 1496 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1480 break;
1481
1482 case SelectionNotify:
1483 if (selection_wait == Sel_normal)
1484 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1485 break; 1497 break;
1486 1498
1487 case SelectionRequest: 1499 case SelectionRequest:
1488 selection_send (ev.xselectionrequest); 1500 selection_send (ev.xselectionrequest);
1489 break; 1501 break;
1490 1502
1491 case MapNotify: 1503 case MapNotify:
1492#ifdef HAVE_BG_PIXMAP 1504#ifdef HAVE_BG_PIXMAP
1493 /* This is needed spcifically to fix the case of no window manager or a 1505 /* This is needed specifically to fix the case of no window manager or a
1494 * non-reparenting window manager. In those cases we never get first 1506 * non-reparenting window manager. In those cases we never get first
1495 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1507 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1496 * care of multiplicity of ConfigureNotify events arriwing while WM does 1508 * care of multiplicity of ConfigureNotify events arriving while WM does
1497 * reparenting. 1509 * reparenting.
1498 * We should not render background immidiately, as there could be several 1510 * We should not render background immediately, as there could be several
1499 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1511 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1500 * by scheduling background redraw as soon as we can, but giving a short 1512 * by scheduling background redraw as soon as we can, but giving a short
1501 * bit of time for ConfigureNotifies to arrive. 1513 * bit of time for ConfigureNotifies to arrive.
1502 * We should render background PRIOR to drawing any text, but AFTER all 1514 * We should render background PRIOR to drawing any text, but AFTER all
1503 * of ConfigureNotifys for the best results. 1515 * of ConfigureNotifys for the best results.
1504 */ 1516 */
1505 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1517 if (!(bg_flags & BG_IS_VALID))
1506 update_background_ev.start (0.025); 1518 update_background_ev.start (0.025);
1507#endif 1519#endif
1508 mapped = 1; 1520 mapped = 1;
1509#ifdef TEXT_BLINK 1521#ifdef TEXT_BLINK
1510 text_blink_ev.start (); 1522 text_blink_ev.start ();
… …
1525 if (ev.xany.window == vt) 1537 if (ev.xany.window == vt)
1526 { 1538 {
1527 do 1539 do
1528 { 1540 {
1529 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1530 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, false);
1531 } 1543 }
1532 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1544 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1533 1545
1534 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1546 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1535 1547
1536 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1548 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1537 { 1549 {
1538 scr_expose (ev.xexpose.x, ev.xexpose.y, 1550 scr_expose (ev.xexpose.x, ev.xexpose.y,
1539 ev.xexpose.width, ev.xexpose.height, False); 1551 ev.xexpose.width, ev.xexpose.height, false);
1540 } 1552 }
1541 1553
1542 want_refresh = 1; 1554 want_refresh = 1;
1543 } 1555 }
1544 else 1556 else
… …
1551 ; 1563 ;
1552 1564
1553 if (scrollBar.state && ev.xany.window == scrollBar.win) 1565 if (scrollBar.state && ev.xany.window == scrollBar.win)
1554 { 1566 {
1555 scrollBar.state = STATE_IDLE; 1567 scrollBar.state = STATE_IDLE;
1556 scrollbar_show (0); 1568 scrollBar.show (0);
1557 } 1569 }
1558 } 1570 }
1559 break; 1571 break;
1560 1572
1561 case MotionNotify: 1573 case MotionNotify:
… …
1660 &unused_root, &unused_child, 1672 &unused_root, &unused_child,
1661 &unused_root_x, &unused_root_y, 1673 &unused_root_x, &unused_root_y,
1662 &ev.xbutton.x, &ev.xbutton.y, 1674 &ev.xbutton.x, &ev.xbutton.y,
1663 &unused_mask); 1675 &unused_mask);
1664 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1676 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1665 scrollbar_size ()); 1677 scrollBar.size ());
1666 want_refresh = 1; 1678 want_refresh = 1;
1667 scrollbar_show (1); 1679 scrollBar.show (1);
1668 } 1680 }
1669 break; 1681 break;
1670 } 1682 }
1671 1683
1672#if defined(CURSOR_BLINK) 1684#if defined(CURSOR_BLINK)
… …
1697#endif 1709#endif
1698 1710
1699 refresh_check (); 1711 refresh_check ();
1700} 1712}
1701 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
1702void 1730void
1703rxvt_term::focus_in () 1731rxvt_term::focus_in ()
1704{ 1732{
1705 if (!focus) 1733 if (!focus)
1706 { 1734 {
1707 focus = 1; 1735 focus = 1;
1708 want_refresh = 1; 1736 want_refresh = 1;
1709
1710 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1711 1737
1712#if USE_XIM 1738#if USE_XIM
1713 if (Input_Context != NULL) 1739 if (Input_Context != NULL)
1714 { 1740 {
1715 IMSetPosition (); 1741 IMSetPosition ();
… …
1727 scr_recolour (); 1753 scr_recolour ();
1728 } 1754 }
1729#endif 1755#endif
1730#if ENABLE_FRILLS 1756#if ENABLE_FRILLS
1731 if (option (Opt_urgentOnBell)) 1757 if (option (Opt_urgentOnBell))
1732 { 1758 set_urgency (0);
1733 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1734 {
1735 h->flags &= ~XUrgencyHint;
1736 XSetWMHints (dpy, parent[0], h);
1737 }
1738 }
1739#endif 1759#endif
1760
1761 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1740 } 1762 }
1741} 1763}
1742 1764
1743void 1765void
1744rxvt_term::focus_out () 1766rxvt_term::focus_out ()
… …
1746 if (focus) 1768 if (focus)
1747 { 1769 {
1748 focus = 0; 1770 focus = 0;
1749 want_refresh = 1; 1771 want_refresh = 1;
1750 1772
1751 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1773#if ENABLE_FRILLS
1752 1774 if (option (Opt_urgentOnBell))
1775 set_urgency (0);
1776#endif
1753#if ENABLE_FRILLS || ISO_14755 1777#if ENABLE_FRILLS || ISO_14755
1754 if (iso14755buf) 1778 if (iso14755buf)
1755 { 1779 {
1756 iso14755buf = 0; 1780 iso14755buf = 0;
1757# if ISO_14755 1781# if ISO_14755
… …
1774 { 1798 {
1775 pix_colors = pix_colors_unfocused; 1799 pix_colors = pix_colors_unfocused;
1776 scr_recolour (); 1800 scr_recolour ();
1777 } 1801 }
1778#endif 1802#endif
1803
1804 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1779 } 1805 }
1780} 1806}
1781 1807
1782void 1808void
1783rxvt_term::update_fade_color (unsigned int idx) 1809rxvt_term::update_fade_color (unsigned int idx)
… …
1811 * 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.
1812 */ 1838 */
1813 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1839 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1814 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1840 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1815 { 1841 {
1816 bgPixmap.set_root_pixmap (); 1842 bg_set_root_pixmap ();
1817 update_background (); 1843 update_background ();
1818 } 1844 }
1819 1845
1820 break; 1846 break;
1821 } 1847 }
… …
1860 /* save the xbutton state (for ButtonRelease) */ 1886 /* save the xbutton state (for ButtonRelease) */
1861 MEvent.state = ev.state; 1887 MEvent.state = ev.state;
1862#ifdef MOUSE_REPORT_DOUBLECLICK 1888#ifdef MOUSE_REPORT_DOUBLECLICK
1863 if (ev.button == MEvent.button && clickintime) 1889 if (ev.button == MEvent.button && clickintime)
1864 { 1890 {
1865 /* same button, within alloted time */ 1891 /* same button, within allowed time */
1866 MEvent.clicks++; 1892 MEvent.clicks++;
1867 1893
1868 if (MEvent.clicks > 1) 1894 if (MEvent.clicks > 1)
1869 { 1895 {
1870 /* only report double clicks */ 1896 /* only report double clicks */
… …
2025 } 2051 }
2026 2052
2027 if (scrollBar.style == R_SB_XTERM 2053 if (scrollBar.style == R_SB_XTERM
2028 || scrollbar_above_slider (ev.y) 2054 || scrollbar_above_slider (ev.y)
2029 || scrollbar_below_slider (ev.y)) 2055 || scrollbar_below_slider (ev.y))
2030 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2056 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2031 2057
2032 scrollBar.state = STATE_MOTION; 2058 scrollBar.state = STATE_MOTION;
2033 break; 2059 break;
2034 2060
2035 case Button1: 2061 case Button1:
… …
2058 else 2084 else
2059 { 2085 {
2060 scr_page ((ev.button == Button1 ? DN : UP), 2086 scr_page ((ev.button == Button1 ? DN : UP),
2061 (nrow 2087 (nrow
2062 * scrollbar_position (ev.y) 2088 * scrollbar_position (ev.y)
2063 / scrollbar_size ())); 2089 / scrollBar.size ()));
2064 } 2090 }
2065 2091
2066 break; 2092 break;
2067 } 2093 }
2068 } 2094 }
… …
2081 reportmode = !! (priv_modes & PrivMode_mouse_report); 2107 reportmode = !! (priv_modes & PrivMode_mouse_report);
2082 2108
2083 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2109 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2084 { 2110 {
2085 scrollBar.state = STATE_IDLE; 2111 scrollBar.state = STATE_IDLE;
2086 scrollbar_show (0); 2112 scrollBar.show (0);
2087 } 2113 }
2088 2114
2089#ifdef SELECTION_SCROLLING 2115#ifdef SELECTION_SCROLLING
2090 sel_scroll_ev.stop(); 2116 sel_scroll_ev.stop();
2091#endif 2117#endif
… …
2141 selection_make (ev.time); 2167 selection_make (ev.time);
2142 break; 2168 break;
2143 2169
2144 case Button2: 2170 case Button2:
2145 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?
2146 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2172 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2147 break; 2173 break;
2148 2174
2149#ifdef MOUSE_WHEEL 2175#ifdef MOUSE_WHEEL
2150 case Button4: 2176 case Button4:
2151 case Button5: 2177 case Button5:
… …
2174 } 2200 }
2175 else 2201 else
2176# endif 2202# endif
2177 { 2203 {
2178 scr_page (v, i); 2204 scr_page (v, i);
2179 scrollbar_show (1); 2205 scrollBar.show (1);
2180 } 2206 }
2181 } 2207 }
2182 break; 2208 break;
2183#endif 2209#endif
2184 } 2210 }
2185 } 2211 }
2186} 2212}
2187 2213
2188/*}}} */ 2214/*}}} */
2189 2215
2190bool 2216void
2191rxvt_term::cmd_parse () 2217rxvt_term::cmd_parse ()
2192{ 2218{
2193 bool flag = false;
2194 wchar_t ch = NOCHAR; 2219 wchar_t ch = NOCHAR;
2195 char *seq_begin; // remember start of esc-sequence here 2220 char *seq_begin; // remember start of esc-sequence here
2196 2221
2197 for (;;) 2222 for (;;)
2198 { 2223 {
2199 if (ch == NOCHAR) 2224 if (expect_false (ch == NOCHAR))
2200 { 2225 {
2201 seq_begin = cmdbuf_ptr; 2226 seq_begin = cmdbuf_ptr;
2202 ch = next_char (); 2227 ch = next_char ();
2203 2228
2204 if (ch == NOCHAR) 2229 if (ch == NOCHAR)
2205 break; 2230 break;
2206 } 2231 }
2207 2232
2208 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))
2209 { 2234 {
2210 if (!seen_input) 2235 if (expect_false (!seen_input))
2211 { 2236 {
2212 seen_input = 1; 2237 seen_input = 1;
2213 // many badly-written programs (e.g. jed) contain a race condition: 2238 // many badly-written programs (e.g. jed) contain a race condition:
2214 // they first read the screensize and then install a SIGWINCH handler. 2239 // they first read the screensize and then install a SIGWINCH handler.
2215 // some window managers resize the window early, and these programs 2240 // some window managers resize the window early, and these programs
… …
2228 wchar_t *str = buf; 2253 wchar_t *str = buf;
2229 wchar_t *eol = str + min (ncol, UBUFSIZ); 2254 wchar_t *eol = str + min (ncol, UBUFSIZ);
2230 2255
2231 for (;;) 2256 for (;;)
2232 { 2257 {
2233 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)))
2234 break; 2259 break;
2235 2260
2236 *str++ = ch; 2261 *str++ = ch;
2237 2262
2238 if (ch == C0_LF || str >= eol) 2263 if (expect_false (ch == C0_LF || str >= eol))
2239 { 2264 {
2240 if (ch == C0_LF) 2265 if (ch == C0_LF)
2241 nlines++; 2266 nlines++;
2242 2267
2243 refresh_count++; 2268 refresh_count++;
… …
2292 * 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.
2293 * if skipScroll is enabled. 2318 * if skipScroll is enabled.
2294 */ 2319 */
2295 if (refreshnow) 2320 if (refreshnow)
2296 { 2321 {
2297 flag = true;
2298 scr_refresh (); 2322 scr_refresh ();
2299 want_refresh = 1; 2323 want_refresh = 1;
2300 } 2324 }
2301
2302 } 2325 }
2303 else 2326 else
2304 { 2327 {
2305 try 2328 try
2306 { 2329 {
… …
2314 } 2337 }
2315 2338
2316 ch = NOCHAR; 2339 ch = NOCHAR;
2317 } 2340 }
2318 } 2341 }
2319
2320 return flag;
2321} 2342}
2322 2343
2323// read the next character 2344// read the next character
2324wchar_t 2345wchar_t
2325rxvt_term::next_char () NOTHROW 2346rxvt_term::next_char () NOTHROW
2326{ 2347{
2327 while (cmdbuf_ptr < cmdbuf_endp) 2348 while (cmdbuf_ptr < cmdbuf_endp)
2328 { 2349 {
2329 // assume 7-bit to be ascii ALWAYS 2350 // assume 7-bit to be ascii ALWAYS
2330 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2351 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2331 return *cmdbuf_ptr++; 2352 return *cmdbuf_ptr++;
2332 2353
2333 wchar_t wc; 2354 wchar_t wc;
2334 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);
2335 2356
… …
2339 cmdbuf_ptr = cmdbuf_endp; 2360 cmdbuf_ptr = cmdbuf_endp;
2340 break; 2361 break;
2341 } 2362 }
2342 2363
2343 if (len == (size_t)-1) 2364 if (len == (size_t)-1)
2365 {
2366 mbstate.reset (); // reset now undefined conversion state
2344 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 }
2345 2369
2346 // assume wchar == unicode 2370 // assume wchar == unicode
2347 cmdbuf_ptr += len; 2371 cmdbuf_ptr += len;
2348 return wc & UNICODE_MASK; 2372 return wc & UNICODE_MASK;
2349 } 2373 }
… …
2360 : NOCHAR; 2384 : NOCHAR;
2361} 2385}
2362 2386
2363static class out_of_input out_of_input; 2387static class out_of_input out_of_input;
2364 2388
2365/* rxvt_cmd_getc () - Return next input character */
2366/*
2367 * Return the next input character after first passing any keyboard input
2368 * to the command.
2369 */
2370wchar_t 2389wchar_t
2371rxvt_term::cmd_getc () THROW ((class out_of_input)) 2390rxvt_term::cmd_getc () THROW ((class out_of_input))
2372{ 2391{
2373 wchar_t c = next_char (); 2392 wchar_t c = next_char ();
2374 2393
… …
2393/*----------------------------------------------------------------------*/ 2412/*----------------------------------------------------------------------*/
2394#ifdef PRINTPIPE 2413#ifdef PRINTPIPE
2395FILE * 2414FILE *
2396rxvt_term::popen_printer () 2415rxvt_term::popen_printer ()
2397{ 2416{
2398 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2417 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2399 2418
2400 if (stream == NULL) 2419 if (stream == NULL)
2401 rxvt_warn ("can't open printer pipe, not printing.\n"); 2420 rxvt_warn ("can't open printer pipe, not printing.\n");
2402 2421
2403 return stream; 2422 return stream;
… …
2414 * simulate attached vt100 printer 2433 * simulate attached vt100 printer
2415 */ 2434 */
2416void 2435void
2417rxvt_term::process_print_pipe () 2436rxvt_term::process_print_pipe ()
2418{ 2437{
2419 int done; 2438 FILE *fd = popen_printer ();
2420 FILE *fd;
2421 2439
2422 if ((fd = popen_printer ()) == NULL) 2440 if (!fd)
2423 return; 2441 return;
2424 2442
2425 /* 2443 /*
2426 * 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
2427 * is received. 2445 * is received.
2428 */ 2446 */
2429 for (done = 0; !done;) 2447 for (int done = 0; !done; )
2430 { 2448 {
2431 unsigned char buf[8]; 2449 unsigned char buf[8];
2432 unicode_t ch; 2450 unicode_t ch;
2433 unsigned int i, len; 2451 unsigned int i, len;
2434 2452
… …
2468 pclose_printer (fd); 2486 pclose_printer (fd);
2469} 2487}
2470#endif /* PRINTPIPE */ 2488#endif /* PRINTPIPE */
2471/*}}} */ 2489/*}}} */
2472 2490
2473/* *INDENT-OFF* */
2474enum { 2491enum {
2475 C1_40 = 0x40, 2492 C1_40 = 0x40,
2476 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,
2477 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,
2478 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,
2479 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,
2480}; 2497};
2481/* *INDENT-ON* */
2482 2498
2483/*{{{ process non-printing single characters */ 2499/*{{{ process non-printing single characters */
2484void 2500void
2485rxvt_term::process_nonprinting (unicode_t ch) 2501rxvt_term::process_nonprinting (unicode_t ch)
2486{ 2502{
… …
2579 break; 2595 break;
2580 case 'Z': /* identify the terminal type */ 2596 case 'Z': /* identify the terminal type */
2581 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2597 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2582 break; 2598 break;
2583 case '<': /* turn off VT52 mode */ 2599 case '<': /* turn off VT52 mode */
2584 PrivMode (0, PrivMode_vt52); 2600 set_privmode (PrivMode_vt52, 0);
2585 break; 2601 break;
2586 case 'F': /* use special graphics character set */ 2602 case 'F': /* use special graphics character set */
2587 case 'G': /* use regular character set */ 2603 case 'G': /* use regular character set */
2588 /* unimplemented */ 2604 /* unimplemented */
2589 break; 2605 break;
… …
2608 return; 2624 return;
2609 } 2625 }
2610 2626
2611 switch (ch) 2627 switch (ch)
2612 { 2628 {
2613 /* case 1: do_tek_mode (); break; */
2614 case '#': 2629 case '#':
2615 if (cmd_getc () == '8') 2630 if (cmd_getc () == '8')
2616 scr_E (); 2631 scr_E ();
2617 break; 2632 break;
2618 case '(': 2633 case '(':
… …
2643 scr_forwardindex (); 2658 scr_forwardindex ();
2644 break; 2659 break;
2645#endif 2660#endif
2646 case '=': 2661 case '=':
2647 case '>': 2662 case '>':
2648 PrivMode ((ch == '='), PrivMode_aplKP); 2663 set_privmode (PrivMode_aplKP, ch == '=');
2649 break; 2664 break;
2650 2665
2651 case C1_40: 2666 case C1_40:
2652 cmd_getc (); 2667 cmd_getc ();
2653 break; 2668 break;
… …
2657 2672
2658 /* 8.3.87: NEXT LINE */ 2673 /* 8.3.87: NEXT LINE */
2659 case C1_NEL: /* ESC E */ 2674 case C1_NEL: /* ESC E */
2660 { 2675 {
2661 wchar_t nlcr[] = { C0_LF, C0_CR }; 2676 wchar_t nlcr[] = { C0_LF, C0_CR };
2662 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2677 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2663 } 2678 }
2664 break; 2679 break;
2665 2680
2666 /* kidnapped escape sequence: Should be 8.3.48 */ 2681 /* kidnapped escape sequence: Should be 8.3.48 */
2667 case C1_ESA: /* ESC G */ 2682 case C1_ESA: /* ESC G */
2668 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 */
2669 break; 2686 break;
2670 2687
2671 /* 8.3.63: CHARACTER TABULATION SET */ 2688 /* 8.3.63: CHARACTER TABULATION SET */
2672 case C1_HTS: /* ESC H */ 2689 case C1_HTS: /* ESC H */
2673 scr_set_tab (1); 2690 scr_set_tab (1);
… …
2677 case C1_RI: /* ESC M */ 2694 case C1_RI: /* ESC M */
2678 scr_index (DN); 2695 scr_index (DN);
2679 break; 2696 break;
2680 2697
2681 /* 8.3.142: SINGLE-SHIFT TWO */ 2698 /* 8.3.142: SINGLE-SHIFT TWO */
2682 /*case C1_SS2: scr_single_shift (2); break; */ 2699 /* case C1_SS2: break; */
2683 2700
2684 /* 8.3.143: SINGLE-SHIFT THREE */ 2701 /* 8.3.143: SINGLE-SHIFT THREE */
2685 /*case C1_SS3: scr_single_shift (3); break; */ 2702 /* case C1_SS3: break; */
2686 2703
2687 /* 8.3.27: DEVICE CONTROL STRING */ 2704 /* 8.3.27: DEVICE CONTROL STRING */
2688 case C1_DCS: /* ESC P */ 2705 case C1_DCS: /* ESC P */
2689 process_dcs_seq (); 2706 process_dcs_seq ();
2690 break; 2707 break;
… …
2692 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2709 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2693 case C1_SCI: /* ESC Z */ 2710 case C1_SCI: /* ESC Z */
2694 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2711 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2695 break; /* steal obsolete ESC [ c */ 2712 break; /* steal obsolete ESC [ c */
2696 2713
2697 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2714 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2698 case C1_CSI: /* ESC [ */ 2715 case C1_CSI: /* ESC [ */
2699 process_csi_seq (); 2716 process_csi_seq ();
2700 break; 2717 break;
2701 2718
2702 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2719 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2703 case C1_OSC: /* ESC ] */ 2720 case C1_OSC: /* ESC ] */
2704 process_osc_seq (); 2721 process_osc_seq ();
2705 break; 2722 break;
2706 2723
2707 /* 8.3.106: RESET TO INITIAL STATE */ 2724 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2708 case 'c': 2725 case 'c':
2709 mbstate.reset (); 2726 mbstate.reset ();
2710 scr_poweron (); 2727 scr_poweron ();
2711 scrollbar_show (1); 2728 scrollBar.show (1);
2712 break; 2729 break;
2713 2730
2714 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2731 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2715 case 'n': 2732 case 'n':
2716 scr_charset_choose (2); 2733 scr_charset_choose (2);
… …
2723 } 2740 }
2724} 2741}
2725/*}}} */ 2742/*}}} */
2726 2743
2727/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2744/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2728/* *INDENT-OFF* */
2729enum { 2745enum {
2730 CSI_ICH = 0x40, 2746 CSI_ICH = 0x40,
2731 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,
2732 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 ,
2733 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,
… …
2736 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,
2737 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 ,
2738 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
2739}; 2755};
2740 2756
2741#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2757#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2742 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2758 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2743 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2759 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2744#define get_byte_array_bit(array, bit) \ 2760#define get_byte_array_bit(array, bit) \
2745 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2761 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2746 2762
2747const unsigned char csi_defaults[] = 2763static const unsigned char csi_defaults[] =
2748 { 2764 {
2749 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, */
2750 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, */
2751 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, */
2752 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, [, \, ], ^, _, */
2753 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, */
2754 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, */
2755 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, */
2756 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, {, |, }, ~, */
2757 }; 2773 };
2758/* *INDENT-ON* */
2759 2774
2760void 2775void
2761rxvt_term::process_csi_seq () 2776rxvt_term::process_csi_seq ()
2762{ 2777{
2763 unicode_t ch, priv, i; 2778 unicode_t ch, priv, i;
… …
2767 2782
2768 nargs = 0; 2783 nargs = 0;
2769 2784
2770 priv = 0; 2785 priv = 0;
2771 ch = cmd_getc (); 2786 ch = cmd_getc ();
2772 if (ch >= '<' && ch <= '?') 2787 if ((ch >= '<' && ch <= '?') || ch == '!')
2773 { 2788 {
2774 /* '<' '=' '>' '?' */ 2789 /* '<' '=' '>' '?' '!' */
2775 priv = ch; 2790 priv = ch;
2776 ch = cmd_getc (); 2791 ch = cmd_getc ();
2777 } 2792 }
2778 2793
2779 /* read any numerical arguments */ 2794 /* read any numerical arguments */
… …
2833 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:
… …
3373 process_color_seq (op, Color_pointer_fg, str, resp); 3401 process_color_seq (op, Color_pointer_fg, str, resp);
3374 break; 3402 break;
3375 case XTerm_Color_pointer_bg: 3403 case XTerm_Color_pointer_bg:
3376 process_color_seq (op, Color_pointer_bg, str, resp); 3404 process_color_seq (op, Color_pointer_bg, str, resp);
3377 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
3378#ifndef NO_BOLD_UNDERLINE_REVERSE 3414#ifndef NO_BOLD_UNDERLINE_REVERSE
3379 case XTerm_Color_RV:
3380 process_color_seq (op, Color_RV, str, resp);
3381 break;
3382 case Rxvt_Color_BD:
3383 case URxvt_Color_BD: 3415 case URxvt_Color_BD:
3384 process_color_seq (op, Color_BD, str, resp); 3416 process_color_seq (op, Color_BD, str, resp);
3385 break; 3417 break;
3386 case Rxvt_Color_UL:
3387 case URxvt_Color_UL: 3418 case URxvt_Color_UL:
3388 process_color_seq (op, Color_UL, str, resp); 3419 process_color_seq (op, Color_UL, str, resp);
3389 break; 3420 break;
3390 case URxvt_Color_IT: 3421 case URxvt_Color_IT:
3391 process_color_seq (op, Color_IT, str, resp); 3422 process_color_seq (op, Color_IT, str, resp);
3392 break; 3423 break;
3393#endif 3424#endif
3425 case URxvt_Color_border:
3426 process_color_seq (op, Color_border, str, resp);
3427 break;
3394#if ENABLE_TRANSPARENCY 3428#if ENABLE_TRANSPARENCY
3395 case URxvt_Color_tint: 3429 case URxvt_Color_tint:
3396 process_color_seq (op, Color_tint, str, resp); 3430 process_color_seq (op, Color_tint, str, resp);
3397 { 3431 {
3398 bool changed = false; 3432 bool changed = false;
3399 3433
3400 if (ISSET_PIXCOLOR (Color_tint)) 3434 if (ISSET_PIXCOLOR (Color_tint))
3401 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3435 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3402 else
3403 changed = bgPixmap.unset_tint ();
3404 3436
3405 if (changed) 3437 if (changed)
3406 update_background (); 3438 update_background ();
3407 } 3439 }
3408 3440
… …
3413 case Rxvt_Pixmap: 3445 case Rxvt_Pixmap:
3414 if (!strcmp (str, "?")) 3446 if (!strcmp (str, "?"))
3415 { 3447 {
3416 char str[256]; 3448 char str[256];
3417 3449
3418 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3450 sprintf (str, "[%dx%d+%d+%d]",
3419 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3451 min (h_scale, 32767), min (v_scale, 32767),
3420 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3452 min (h_align, 32767), min (v_align, 32767));
3421 process_xterm_seq (XTerm_title, str, CHAR_ST); 3453 process_xterm_seq (XTerm_title, str, CHAR_ST);
3422 } 3454 }
3423 else 3455 else
3424 { 3456 {
3425 int changed = 0; 3457 int changed = 0;
3426 3458
3427 if (*str != ';') 3459 if (*str != ';')
3428 { 3460 {
3429 /* reset to default scaling :*/
3430 bgPixmap.unset_geometry ();
3431 if (bgPixmap.set_file (str)) /* change pixmap */ 3461 if (bg_set_file (str)) /* change pixmap */
3462 {
3432 changed++; 3463 changed++;
3433 str = strchr (str, ';'); 3464 str = strchr (str, ';');
3434 if (str == NULL) 3465 if (str == NULL)
3435 bgPixmap.set_defaultGeometry (); 3466 bg_set_default_geometry ();
3467 else
3468 bg_set_geometry (str+1);
3469 }
3436 } 3470 }
3437 3471 else
3438 while (str)
3439 { 3472 {
3440 str++; 3473 str++;
3441 if (bgPixmap.set_geometry (str)) 3474 if (bg_set_geometry (str, true))
3442 changed++; 3475 changed++;
3443 str = strchr (str, ';');
3444 } 3476 }
3445 3477
3446 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 }
3447 update_background (); 3486 update_background ();
3487 }
3448 } 3488 }
3449 break; 3489 break;
3450#endif 3490#endif
3451 3491
3452 case XTerm_logfile: 3492 case XTerm_logfile:
… …
3522 break; 3562 break;
3523#endif 3563#endif
3524 3564
3525#if ENABLE_PERL 3565#if ENABLE_PERL
3526 case URxvt_perl: 3566 case URxvt_perl:
3527 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));
3528 ; // no responses yet
3529 break; 3568 break;
3530#endif 3569#endif
3531 } 3570 }
3532} 3571}
3533/*----------------------------------------------------------------------*/ 3572/*----------------------------------------------------------------------*/
… …
3556 { 3595 {
3557 if (mode == 'r') 3596 if (mode == 'r')
3558 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3597 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3559 else 3598 else
3560 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3599 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3561 PrivMode (state, bit); 3600
3601 set_privmode (bit, state);
3562 } 3602 }
3563 3603
3564 return state; 3604 return state;
3565} 3605}
3566 3606
… …
3574 static const struct 3614 static const struct
3575 { 3615 {
3576 const int argval; 3616 const int argval;
3577 const unsigned long bit; 3617 const unsigned long bit;
3578 } argtopriv[] = { 3618 } argtopriv[] = {
3579 { 1, PrivMode_aplCUR }, 3619 { 1, PrivMode_aplCUR }, // DECCKM
3580 { 2, PrivMode_vt52 }, 3620 { 2, PrivMode_vt52 },
3581 { 3, PrivMode_132 }, 3621 { 3, PrivMode_132 }, // DECCOLM
3582 { 4, PrivMode_smoothScroll }, 3622 { 4, PrivMode_smoothScroll }, // DECSCLM
3583 { 5, PrivMode_rVideo }, 3623 { 5, PrivMode_rVideo }, // DECSCNM
3584 { 6, PrivMode_relOrigin }, 3624 { 6, PrivMode_relOrigin }, // DECOM
3585 { 7, PrivMode_Autowrap }, 3625 { 7, PrivMode_Autowrap }, // DECAWM
3586 // 8, bi-directional support mode 3626 // 8, auto-repeat keys // DECARM
3587 { 9, PrivMode_MouseX10 }, 3627 { 9, PrivMode_MouseX10 },
3588 // 18, 19 printing-related 3628 // 18 end FF to printer after print screen
3629 // 19 Print screen prints full screen/scroll region
3589 { 25, PrivMode_VisibleCursor }, 3630 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3590#ifdef scrollBar_esc 3631#ifdef scrollBar_esc
3591 { scrollBar_esc, PrivMode_scrollBar }, 3632 { scrollBar_esc, PrivMode_scrollBar },
3592#endif 3633#endif
3593 { 35, PrivMode_ShiftKeys }, // rxvt extension 3634 { 35, PrivMode_ShiftKeys }, // rxvt extension
3635 // 38, tektronix mode // DECTEK
3594 { 40, PrivMode_132OK }, 3636 { 40, PrivMode_132OK },
3595 // 41 xterm more fixes NYI 3637 // 41 xterm more fixes NYI
3596 // 45 margin bell NYI 3638 // 45 margin bell NYI
3597 // 46 start logging 3639 // 46 start logging
3598 { 47, PrivMode_Screen }, 3640 { 47, PrivMode_Screen },
3599 { 66, PrivMode_aplKP }, 3641 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3600#ifndef NO_BACKSPACE_KEY 3642#ifndef NO_BACKSPACE_KEY
3601 { 67, PrivMode_BackSpace }, 3643 { 67, PrivMode_BackSpace }, // DECBKM
3602#endif 3644#endif
3603 { 1000, PrivMode_MouseX11 }, 3645 { 1000, PrivMode_MouseX11 },
3604 { 1002, PrivMode_MouseBtnEvent }, 3646 { 1002, PrivMode_MouseBtnEvent },
3605 { 1003, PrivMode_MouseAnyEvent }, 3647 { 1003, PrivMode_MouseAnyEvent },
3648#if ENABLE_FRILLS
3649 { 1005, PrivMode_ExtModeMouse },
3650#endif
3606 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3651 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3607 { 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
3608 // 1035 enable modifiers for alt, numlock NYI 3656 // 1035 enable modifiers for alt, numlock NYI
3609 // 1036 send ESC for meta keys NYI 3657 // 1036 send ESC for meta keys NYI
3610 // 1037 send DEL for keypad delete NYI 3658 // 1037 send DEL for keypad delete NYI
3611 { 1047, PrivMode_Screen }, 3659 { 1047, PrivMode_Screen },
3612 // 1048 save and restore cursor 3660 // 1048 save and restore cursor, implemented in code
3613 { 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 */
3614 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3662 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3615 { 2004, PrivMode_BracketPaste }, 3663 { 2004, PrivMode_BracketPaste },
3616 }; 3664 };
3617 3665
… …
3627 for (i = 0; i < nargs; i++) 3675 for (i = 0; i < nargs; i++)
3628 { 3676 {
3629 state = -1; 3677 state = -1;
3630 3678
3631 /* basic handling */ 3679 /* basic handling */
3632 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3680 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3633 if (argtopriv[j].argval == arg[i]) 3681 if (argtopriv[j].argval == arg[i])
3634 { 3682 {
3635 state = privcases (mode, argtopriv[j].bit); 3683 state = privcases (mode, argtopriv[j].bit);
3636 break; 3684 break;
3637 } 3685 }
… …
3645 3693
3646 scr_touch (true); 3694 scr_touch (true);
3647 break; 3695 break;
3648#endif 3696#endif
3649 case 1048: /* alternative cursor save */ 3697 case 1048: /* alternative cursor save */
3650 case 1049:
3651 if (option (Opt_secondaryScreen)) 3698 if (option (Opt_secondaryScreen))
3652 if (mode == 0) 3699 if (mode == 0)
3653 scr_cursor (RESTORE); 3700 scr_cursor (RESTORE);
3654 else if (mode == 1) 3701 else if (mode == 1)
3655 scr_cursor (SAVE); 3702 scr_cursor (SAVE);
… …
3664 case 2: /* VT52 mode */ 3711 case 2: /* VT52 mode */
3665 /* oddball mode. should be set regardless of set/reset 3712 /* oddball mode. should be set regardless of set/reset
3666 * parameter. Return from VT52 mode with an ESC < from 3713 * parameter. Return from VT52 mode with an ESC < from
3667 * within VT52 mode 3714 * within VT52 mode
3668 */ 3715 */
3669 PrivMode (1, PrivMode_vt52); 3716 set_privmode (PrivMode_vt52, 1);
3670 break; 3717 break;
3671 case 3: /* 80/132 */ 3718 case 3: /* 80/132 */
3672 if (priv_modes & PrivMode_132OK) 3719 if (priv_modes & PrivMode_132OK)
3673 {
3674 scr_poweron ();
3675 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3720 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3676 }
3677 break; 3721 break;
3678 case 4: /* smooth scrolling */ 3722 case 4: /* smooth scrolling */
3679 set_option (Opt_jumpScroll, !state); 3723 set_option (Opt_jumpScroll, !state);
3680 break; 3724 break;
3681 case 5: /* reverse video */ 3725 case 5: /* reverse video */
… …
3692 if (state) /* orthogonal */ 3736 if (state) /* orthogonal */
3693 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3737 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3694 break; 3738 break;
3695#ifdef scrollBar_esc 3739#ifdef scrollBar_esc
3696 case scrollBar_esc: 3740 case scrollBar_esc:
3697 if (scrollbar_mapping (state)) 3741 if (scrollBar.map (state))
3698 { 3742 {
3699 resize_all_windows (0, 0, 0); 3743 resize_all_windows (0, 0, 0);
3700 scr_touch (true); 3744 scr_touch (true);
3701 } 3745 }
3702 break; 3746 break;
… …
3719 case 1003: 3763 case 1003:
3720 if (state) 3764 if (state)
3721 { 3765 {
3722 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3766 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3723 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;
3724 vt_emask_mouse = PointerMotionMask; 3769 vt_emask_mouse = PointerMotionMask;
3725 } 3770 }
3726 else 3771 else
3727 vt_emask_mouse = NoEventMask; 3772 vt_emask_mouse = NoEventMask;
3773
3728 vt_select_input (); 3774 vt_select_input ();
3729 break; 3775 break;
3730 case 1010: /* scroll to bottom on TTY output inhibit */ 3776 case 1010: /* scroll to bottom on TTY output inhibit */
3731 set_option (Opt_scrollTtyOutput, !state); 3777 set_option (Opt_scrollTtyOutput, !state);
3732 break; 3778 break;
3733 case 1011: /* scroll to bottom on key press */ 3779 case 1011: /* scroll to bottom on key press */
3734 set_option (Opt_scrollTtyKeypress, state); 3780 set_option (Opt_scrollTtyKeypress, state);
3735 break; 3781 break;
3736 case 1047: /* secondary screen w/ clearing last */ 3782 case 1047: /* secondary screen w/ clearing last */
3737 if (option (Opt_secondaryScreen)) 3783 if (option (Opt_secondaryScreen))
3738 if (current_screen != PRIMARY) 3784 if (!state)
3739 scr_erase_screen (2); 3785 scr_erase_screen (2);
3786
3740 scr_change_screen (state); 3787 scr_change_screen (state);
3741 break; 3788 break;
3742 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
3743 scr_change_screen (state); 3794 scr_change_screen (state);
3795
3744 if (option (Opt_secondaryScreen)) 3796 if (option (Opt_secondaryScreen))
3745 if (current_screen != PRIMARY) 3797 if (state)
3746 scr_erase_screen (2); 3798 scr_erase_screen (2);
3799 else
3800 scr_cursor (RESTORE);
3747 break; 3801 break;
3748 default: 3802 default:
3749 break; 3803 break;
3750 } 3804 }
3751 } 3805 }
… …
3904 } 3958 }
3905 } 3959 }
3906} 3960}
3907/*}}} */ 3961/*}}} */
3908 3962
3909/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3910void
3911rxvt_term::process_graphics ()
3912{
3913 unicode_t ch, cmd = cmd_getc ();
3914
3915 if (cmd == 'Q')
3916 {
3917 /* query graphics */
3918 tt_printf ("\033G0\012"); /* no graphics */
3919 return;
3920 }
3921 /* swallow other graphics sequences until terminating ':' */
3922 do
3923 ch = cmd_getc ();
3924 while (ch != ':');
3925}
3926/*}}} */
3927
3928/* ------------------------------------------------------------------------- */ 3963/* ------------------------------------------------------------------------- */
3929 3964
3930/* 3965/*
3931 * Send printf () formatted output to the command. 3966 * Send printf () formatted output to the command.
3932 * Only use for small amounts of data. 3967 * Only use for small amounts of data.
… …
3945 3980
3946/* ---------------------------------------------------------------------- */ 3981/* ---------------------------------------------------------------------- */
3947/* 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,
3948 * or generated by us in response to a query ESC sequence. 3983 * or generated by us in response to a query ESC sequence.
3949 */ 3984 */
3950const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3985static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3951 3986
3952void 3987void
3953rxvt_term::tt_write (const char *data, unsigned int len) 3988rxvt_term::tt_write (const char *data, unsigned int len)
3954{ 3989{
3955 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)))
… …
3960 3995
3961 if (v_buflen == 0) 3996 if (v_buflen == 0)
3962 { 3997 {
3963 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));
3964 3999
4000 max_it (written, 0);
4001
3965 if ((unsigned int)written == len) 4002 if (written == len)
3966 return; 4003 return;
3967 4004
3968 data += written; 4005 data += written;
3969 len -= written; 4006 len -= written;
3970 } 4007 }
3971 4008
3972 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4009 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3973 4010
3974 memcpy (v_buffer + v_buflen, data, len); 4011 memcpy (v_buffer + v_buflen, data, len);
3975 v_buflen += len; 4012 v_buflen += len;
3976 4013
3977 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