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.400 by ayin, Mon Jan 28 12:54:47 2008 UTC vs.
Revision 1.493 by sf-exg, Sun Aug 21 20:17:40 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 im_send_spot ();
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
… …
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 ())
1460 {
1461 if (mapped) 1477 if (moved)
1462 update_background (); 1478 update_background ();
1463 else
1464 bgPixmap.invalidate ();
1465 }
1466#endif 1479#endif
1467 } 1480 }
1468 1481
1469 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1470 } 1483 }
1471 break; 1484 break;
1472 1485
1473 case PropertyNotify: 1486 case PropertyNotify:
1474 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1487 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1475 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1476 && ev.xproperty.state == PropertyNewValue)
1477 selection_property (ev.xproperty.window, ev.xproperty.atom);
1478
1479 break; 1488 break;
1480 1489
1481 case SelectionClear: 1490 case SelectionClear:
1482 selection_clear (); 1491 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1483 break;
1484
1485 case SelectionNotify:
1486 if (selection_wait == Sel_normal)
1487 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1488 break; 1492 break;
1489 1493
1490 case SelectionRequest: 1494 case SelectionRequest:
1491 selection_send (ev.xselectionrequest); 1495 selection_send (ev.xselectionrequest);
1492 break; 1496 break;
1493 1497
1494 case MapNotify: 1498 case MapNotify:
1495#ifdef HAVE_BG_PIXMAP 1499#ifdef HAVE_BG_PIXMAP
1496 /* This is needed spcifically to fix the case of no window manager or a 1500 /* This is needed specifically to fix the case of no window manager or a
1497 * non-reparenting window manager. In those cases we never get first 1501 * non-reparenting window manager. In those cases we never get first
1498 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1502 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1499 * care of multiplicity of ConfigureNotify events arriwing while WM does 1503 * care of multiplicity of ConfigureNotify events arriving while WM does
1500 * reparenting. 1504 * reparenting.
1501 * We should not render background immidiately, as there could be several 1505 * We should not render background immediately, as there could be several
1502 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1506 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1503 * by scheduling background redraw as soon as we can, but giving a short 1507 * by scheduling background redraw as soon as we can, but giving a short
1504 * bit of time for ConfigureNotifies to arrive. 1508 * bit of time for ConfigureNotifies to arrive.
1505 * We should render background PRIOR to drawing any text, but AFTER all 1509 * We should render background PRIOR to drawing any text, but AFTER all
1506 * of ConfigureNotifys for the best results. 1510 * of ConfigureNotifys for the best results.
1507 */ 1511 */
1508 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1512 if (!(bg_flags & BG_IS_VALID))
1509 update_background_ev.start (0.025); 1513 update_background_ev.start (0.025);
1510#endif 1514#endif
1511 mapped = 1; 1515 mapped = 1;
1512#ifdef TEXT_BLINK 1516#ifdef TEXT_BLINK
1513 text_blink_ev.start (); 1517 text_blink_ev.start ();
… …
1528 if (ev.xany.window == vt) 1532 if (ev.xany.window == vt)
1529 { 1533 {
1530 do 1534 do
1531 { 1535 {
1532 scr_expose (ev.xexpose.x, ev.xexpose.y, 1536 scr_expose (ev.xexpose.x, ev.xexpose.y,
1533 ev.xexpose.width, ev.xexpose.height, False); 1537 ev.xexpose.width, ev.xexpose.height, false);
1534 } 1538 }
1535 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1536 1540
1537 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1538 1542
1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1540 { 1544 {
1541 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1542 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, false);
1543 } 1547 }
1544 1548
1545 want_refresh = 1; 1549 want_refresh = 1;
1546 } 1550 }
1547 else 1551 else
… …
1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1554 ; 1558 ;
1555 1559
1556 if (scrollBar.state && ev.xany.window == scrollBar.win) 1560 if (scrollBar.state && ev.xany.window == scrollBar.win)
1557 { 1561 {
1558 scrollBar.setIdle (); 1562 scrollBar.state = STATE_IDLE;
1559 scrollbar_show (0); 1563 scrollBar.show (0);
1560 } 1564 }
1561 } 1565 }
1562 break; 1566 break;
1563 1567
1564 case MotionNotify: 1568 case MotionNotify:
… …
1651#ifdef MOUSE_THRESHOLD 1655#ifdef MOUSE_THRESHOLD
1652 } 1656 }
1653#endif 1657#endif
1654 } 1658 }
1655 } 1659 }
1656 else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win) 1660 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1657 { 1661 {
1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1662 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1659 MotionNotify, &ev)) 1663 MotionNotify, &ev))
1660 ; 1664 ;
1661 1665
… …
1663 &unused_root, &unused_child, 1667 &unused_root, &unused_child,
1664 &unused_root_x, &unused_root_y, 1668 &unused_root_x, &unused_root_y,
1665 &ev.xbutton.x, &ev.xbutton.y, 1669 &ev.xbutton.x, &ev.xbutton.y,
1666 &unused_mask); 1670 &unused_mask);
1667 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1671 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1668 scrollbar_size ()); 1672 scrollBar.size ());
1669 want_refresh = 1; 1673 want_refresh = 1;
1670 scrollbar_show (1); 1674 scrollBar.show (1);
1671 } 1675 }
1672 break; 1676 break;
1673 } 1677 }
1674 1678
1675#if defined(CURSOR_BLINK) 1679#if defined(CURSOR_BLINK)
… …
1700#endif 1704#endif
1701 1705
1702 refresh_check (); 1706 refresh_check ();
1703} 1707}
1704 1708
1709#if ENABLE_FRILLS
1710void
1711rxvt_term::set_urgency (bool enable)
1712{
1713 if (enable == urgency_hint)
1714 return;
1715
1716 if (XWMHints *h = XGetWMHints (dpy, parent))
1717 {
1718 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1719 XSetWMHints (dpy, parent, h);
1720 urgency_hint = enable;
1721 }
1722}
1723#endif
1724
1705void 1725void
1706rxvt_term::focus_in () 1726rxvt_term::focus_in ()
1707{ 1727{
1708 if (!focus) 1728 if (!focus)
1709 { 1729 {
1710 focus = 1; 1730 focus = 1;
1711 want_refresh = 1; 1731 want_refresh = 1;
1712 1732
1713 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1714
1715#if USE_XIM 1733#if USE_XIM
1716 if (Input_Context != NULL) 1734 if (Input_Context != NULL)
1717 { 1735 {
1718 IMSetPosition (); 1736 im_set_position ();
1719 XSetICFocus (Input_Context); 1737 XSetICFocus (Input_Context);
1720 } 1738 }
1721#endif 1739#endif
1722#if CURSOR_BLINK 1740#if CURSOR_BLINK
1723 if (option (Opt_cursorBlink)) 1741 if (option (Opt_cursorBlink))
… …
1730 scr_recolour (); 1748 scr_recolour ();
1731 } 1749 }
1732#endif 1750#endif
1733#if ENABLE_FRILLS 1751#if ENABLE_FRILLS
1734 if (option (Opt_urgentOnBell)) 1752 if (option (Opt_urgentOnBell))
1735 { 1753 set_urgency (0);
1736 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1737 {
1738 h->flags &= ~XUrgencyHint;
1739 XSetWMHints (dpy, parent[0], h);
1740 }
1741 }
1742#endif 1754#endif
1755
1756 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1743 } 1757 }
1744} 1758}
1745 1759
1746void 1760void
1747rxvt_term::focus_out () 1761rxvt_term::focus_out ()
… …
1749 if (focus) 1763 if (focus)
1750 { 1764 {
1751 focus = 0; 1765 focus = 0;
1752 want_refresh = 1; 1766 want_refresh = 1;
1753 1767
1754 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1768#if ENABLE_FRILLS
1755 1769 if (option (Opt_urgentOnBell))
1770 set_urgency (0);
1771#endif
1756#if ENABLE_FRILLS || ISO_14755 1772#if ENABLE_FRILLS || ISO_14755
1757 if (iso14755buf) 1773 if (iso14755buf)
1758 { 1774 {
1759 iso14755buf = 0; 1775 iso14755buf = 0;
1760# if ISO_14755 1776# if ISO_14755
… …
1777 { 1793 {
1778 pix_colors = pix_colors_unfocused; 1794 pix_colors = pix_colors_unfocused;
1779 scr_recolour (); 1795 scr_recolour ();
1780 } 1796 }
1781#endif 1797#endif
1798
1799 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1782 } 1800 }
1783} 1801}
1784 1802
1785void 1803void
1786rxvt_term::update_fade_color (unsigned int idx) 1804rxvt_term::update_fade_color (unsigned int idx)
… …
1814 * use the property to determine the pixmap. We use it later on. 1832 * use the property to determine the pixmap. We use it later on.
1815 */ 1833 */
1816 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1834 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1817 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1835 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1818 { 1836 {
1819 bgPixmap.set_root_pixmap (); 1837 bg_set_root_pixmap ();
1820 update_background (); 1838 update_background ();
1821 } 1839 }
1822 1840
1823 break; 1841 break;
1824 } 1842 }
… …
1863 /* save the xbutton state (for ButtonRelease) */ 1881 /* save the xbutton state (for ButtonRelease) */
1864 MEvent.state = ev.state; 1882 MEvent.state = ev.state;
1865#ifdef MOUSE_REPORT_DOUBLECLICK 1883#ifdef MOUSE_REPORT_DOUBLECLICK
1866 if (ev.button == MEvent.button && clickintime) 1884 if (ev.button == MEvent.button && clickintime)
1867 { 1885 {
1868 /* same button, within alloted time */ 1886 /* same button, within allowed time */
1869 MEvent.clicks++; 1887 MEvent.clicks++;
1870 1888
1871 if (MEvent.clicks > 1) 1889 if (MEvent.clicks > 1)
1872 { 1890 {
1873 /* only report double clicks */ 1891 /* only report double clicks */
… …
1947 /* 1965 /*
1948 * Scrollbar window processing of button press 1966 * Scrollbar window processing of button press
1949 */ 1967 */
1950 if (scrollBar.state && ev.window == scrollBar.win) 1968 if (scrollBar.state && ev.window == scrollBar.win)
1951 { 1969 {
1952 int upordown = 0; 1970 page_dirn direction = NO_DIR;
1953 1971
1954 if (scrollBar.upButton (ev.y)) 1972 if (scrollBar.upButton (ev.y))
1955 upordown = -1; /* up */ 1973 direction = UP; /* up */
1956 else if (scrollBar.dnButton (ev.y)) 1974 else if (scrollBar.dnButton (ev.y))
1957 upordown = 1; /* down */ 1975 direction = DN; /* down */
1958 1976
1959 scrollBar.setIdle (); 1977 scrollBar.state = STATE_IDLE;
1960 /* 1978 /*
1961 * Rxvt-style scrollbar: 1979 * Rxvt-style scrollbar:
1962 * move up if mouse is above slider 1980 * move up if mouse is above slider
1963 * move dn if mouse is below slider 1981 * move dn if mouse is below slider
1964 * 1982 *
… …
1973 /* 1991 /*
1974 * Mouse report disabled scrollbar: 1992 * Mouse report disabled scrollbar:
1975 * arrow buttons - send up/down 1993 * arrow buttons - send up/down
1976 * click on scrollbar - send pageup/down 1994 * click on scrollbar - send pageup/down
1977 */ 1995 */
1978 if (upordown < 0) 1996 if (direction == UP)
1979 tt_printf ("\033[A"); 1997 tt_printf ("\033[A");
1980 else if (upordown > 0) 1998 else if (direction == DN)
1981 tt_printf ("\033[B"); 1999 tt_printf ("\033[B");
1982 else 2000 else
1983 switch (ev.button) 2001 switch (ev.button)
1984 { 2002 {
1985 case Button2: 2003 case Button2:
… …
1993 break; 2011 break;
1994 } 2012 }
1995 } 2013 }
1996 else 2014 else
1997#endif /* NO_SCROLLBAR_REPORT */ 2015#endif /* NO_SCROLLBAR_REPORT */
1998
1999 { 2016 {
2000 if (upordown) 2017 if (direction != NO_DIR)
2001 { 2018 {
2002#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2019#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2003 if (!cont_scroll_ev.is_active ()) 2020 if (!cont_scroll_ev.is_active ())
2004 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2021 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2005#endif 2022#endif
2006 if (scr_page (upordown < 0 ? UP : DN, 1)) 2023 if (scr_page (direction, 1))
2007 { 2024 {
2008 if (upordown < 0) 2025 if (direction == UP)
2009 scrollBar.setUp (); 2026 scrollBar.state = STATE_UP;
2010 else 2027 else
2011 scrollBar.setDn (); 2028 scrollBar.state = STATE_DOWN;
2012 } 2029 }
2013 } 2030 }
2014 else 2031 else
2015 switch (ev.button) 2032 switch (ev.button)
2016 { 2033 {
… …
2029 } 2046 }
2030 2047
2031 if (scrollBar.style == R_SB_XTERM 2048 if (scrollBar.style == R_SB_XTERM
2032 || scrollbar_above_slider (ev.y) 2049 || scrollbar_above_slider (ev.y)
2033 || scrollbar_below_slider (ev.y)) 2050 || scrollbar_below_slider (ev.y))
2034 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2051 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2035 2052
2036 scrollBar.setMotion (); 2053 scrollBar.state = STATE_MOTION;
2037 break; 2054 break;
2038 2055
2039 case Button1: 2056 case Button1:
2040 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2057 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2041 csrO = ev.y - scrollBar.top; 2058 csrO = ev.y - scrollBar.top;
… …
2055 scr_page (DN, nrow - 1); 2072 scr_page (DN, nrow - 1);
2056# else 2073# else
2057 scr_page (DN, nrow / 4); 2074 scr_page (DN, nrow / 4);
2058# endif 2075# endif
2059 else 2076 else
2060 scrollBar.setMotion (); 2077 scrollBar.state = STATE_MOTION;
2061 } 2078 }
2062 else 2079 else
2063 { 2080 {
2064 scr_page ((ev.button == Button1 ? DN : UP), 2081 scr_page ((ev.button == Button1 ? DN : UP),
2065 (nrow 2082 (nrow
2066 * scrollbar_position (ev.y) 2083 * scrollbar_position (ev.y)
2067 / scrollbar_size ())); 2084 / scrollBar.size ()));
2068 } 2085 }
2069 2086
2070 break; 2087 break;
2071 } 2088 }
2072 } 2089 }
… …
2082 2099
2083 csrO = 0; /* reset csr Offset */ 2100 csrO = 0; /* reset csr Offset */
2084 if (!bypass_keystate) 2101 if (!bypass_keystate)
2085 reportmode = !! (priv_modes & PrivMode_mouse_report); 2102 reportmode = !! (priv_modes & PrivMode_mouse_report);
2086 2103
2087 if (scrollbar_isUpDn ()) 2104 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2088 { 2105 {
2089 scrollBar.setIdle (); 2106 scrollBar.state = STATE_IDLE;
2090 scrollbar_show (0); 2107 scrollBar.show (0);
2091 } 2108 }
2092 2109
2093#ifdef SELECTION_SCROLLING 2110#ifdef SELECTION_SCROLLING
2094 sel_scroll_ev.stop(); 2111 sel_scroll_ev.stop();
2095#endif 2112#endif
… …
2145 selection_make (ev.time); 2162 selection_make (ev.time);
2146 break; 2163 break;
2147 2164
2148 case Button2: 2165 case Button2:
2149 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2166 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2150 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2167 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2151 break; 2168 break;
2152 2169
2153#ifdef MOUSE_WHEEL 2170#ifdef MOUSE_WHEEL
2154 case Button4: 2171 case Button4:
2155 case Button5: 2172 case Button5:
… …
2178 } 2195 }
2179 else 2196 else
2180# endif 2197# endif
2181 { 2198 {
2182 scr_page (v, i); 2199 scr_page (v, i);
2183 scrollbar_show (1); 2200 scrollBar.show (1);
2184 } 2201 }
2185 } 2202 }
2186 break; 2203 break;
2187#endif 2204#endif
2188 } 2205 }
2189 } 2206 }
2190} 2207}
2191 2208
2192/*}}} */ 2209/*}}} */
2193 2210
2194bool 2211void
2195rxvt_term::cmd_parse () 2212rxvt_term::cmd_parse ()
2196{ 2213{
2197 bool flag = false;
2198 wchar_t ch = NOCHAR; 2214 wchar_t ch = NOCHAR;
2199 char *seq_begin; // remember start of esc-sequence here 2215 char *seq_begin; // remember start of esc-sequence here
2200 2216
2201 for (;;) 2217 for (;;)
2202 { 2218 {
2203 if (ch == NOCHAR) 2219 if (ecb_unlikely (ch == NOCHAR))
2204 { 2220 {
2205 seq_begin = cmdbuf_ptr; 2221 seq_begin = cmdbuf_ptr;
2206 ch = next_char (); 2222 ch = next_char ();
2207 2223
2208 if (ch == NOCHAR) 2224 if (ch == NOCHAR)
2209 break; 2225 break;
2210 } 2226 }
2211 2227
2212 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2228 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2213 { 2229 {
2214 if (!seen_input) 2230 if (ecb_unlikely (!seen_input))
2215 { 2231 {
2216 seen_input = 1; 2232 seen_input = 1;
2217 // many badly-written programs (e.g. jed) contain a race condition: 2233 // many badly-written programs (e.g. jed) contain a race condition:
2218 // they first read the screensize and then install a SIGWINCH handler. 2234 // they first read the screensize and then install a SIGWINCH handler.
2219 // some window managers resize the window early, and these programs 2235 // some window managers resize the window early, and these programs
… …
2232 wchar_t *str = buf; 2248 wchar_t *str = buf;
2233 wchar_t *eol = str + min (ncol, UBUFSIZ); 2249 wchar_t *eol = str + min (ncol, UBUFSIZ);
2234 2250
2235 for (;;) 2251 for (;;)
2236 { 2252 {
2237 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2253 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2238 break; 2254 break;
2239 2255
2240 *str++ = ch; 2256 *str++ = ch;
2241 2257
2242 if (ch == C0_LF || str >= eol) 2258 if (ecb_unlikely (ch == C0_LF || str >= eol))
2243 { 2259 {
2244 if (ch == C0_LF) 2260 if (ch == C0_LF)
2245 nlines++; 2261 nlines++;
2246 2262
2247 refresh_count++; 2263 refresh_count++;
… …
2296 * What the heck we'll cheat and only refresh less than every page-full. 2312 * What the heck we'll cheat and only refresh less than every page-full.
2297 * if skipScroll is enabled. 2313 * if skipScroll is enabled.
2298 */ 2314 */
2299 if (refreshnow) 2315 if (refreshnow)
2300 { 2316 {
2301 flag = true;
2302 scr_refresh (); 2317 scr_refresh ();
2303 want_refresh = 1; 2318 want_refresh = 1;
2304 } 2319 }
2305
2306 } 2320 }
2307 else 2321 else
2308 { 2322 {
2309 try 2323 try
2310 { 2324 {
… …
2318 } 2332 }
2319 2333
2320 ch = NOCHAR; 2334 ch = NOCHAR;
2321 } 2335 }
2322 } 2336 }
2323
2324 return flag;
2325} 2337}
2326 2338
2327// read the next character 2339// read the next character
2328wchar_t 2340wchar_t
2329rxvt_term::next_char () NOTHROW 2341rxvt_term::next_char () NOTHROW
2330{ 2342{
2331 while (cmdbuf_ptr < cmdbuf_endp) 2343 while (cmdbuf_ptr < cmdbuf_endp)
2332 { 2344 {
2333 // assume 7-bit to be ascii ALWAYS 2345 // assume 7-bit to be ascii ALWAYS
2334 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2346 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2335 return *cmdbuf_ptr++; 2347 return *cmdbuf_ptr++;
2336 2348
2337 wchar_t wc; 2349 wchar_t wc;
2338 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2350 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2339 2351
… …
2343 cmdbuf_ptr = cmdbuf_endp; 2355 cmdbuf_ptr = cmdbuf_endp;
2344 break; 2356 break;
2345 } 2357 }
2346 2358
2347 if (len == (size_t)-1) 2359 if (len == (size_t)-1)
2360 {
2361 mbstate.reset (); // reset now undefined conversion state
2348 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2362 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2363 }
2349 2364
2350 // assume wchar == unicode 2365 // assume wchar == unicode
2351 cmdbuf_ptr += len; 2366 cmdbuf_ptr += len;
2352 return wc & UNICODE_MASK; 2367 return wc & UNICODE_MASK;
2353 } 2368 }
… …
2364 : NOCHAR; 2379 : NOCHAR;
2365} 2380}
2366 2381
2367static class out_of_input out_of_input; 2382static class out_of_input out_of_input;
2368 2383
2369/* rxvt_cmd_getc () - Return next input character */
2370/*
2371 * Return the next input character after first passing any keyboard input
2372 * to the command.
2373 */
2374wchar_t 2384wchar_t
2375rxvt_term::cmd_getc () THROW ((class out_of_input)) 2385rxvt_term::cmd_getc () THROW ((class out_of_input))
2376{ 2386{
2377 wchar_t c = next_char (); 2387 wchar_t c = next_char ();
2378 2388
… …
2397/*----------------------------------------------------------------------*/ 2407/*----------------------------------------------------------------------*/
2398#ifdef PRINTPIPE 2408#ifdef PRINTPIPE
2399FILE * 2409FILE *
2400rxvt_term::popen_printer () 2410rxvt_term::popen_printer ()
2401{ 2411{
2402 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2412 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2403 2413
2404 if (stream == NULL) 2414 if (stream == NULL)
2405 rxvt_warn ("can't open printer pipe, not printing.\n"); 2415 rxvt_warn ("can't open printer pipe, not printing.\n");
2406 2416
2407 return stream; 2417 return stream;
… …
2418 * simulate attached vt100 printer 2428 * simulate attached vt100 printer
2419 */ 2429 */
2420void 2430void
2421rxvt_term::process_print_pipe () 2431rxvt_term::process_print_pipe ()
2422{ 2432{
2423 int done; 2433 FILE *fd = popen_printer ();
2424 FILE *fd;
2425 2434
2426 if ((fd = popen_printer ()) == NULL) 2435 if (!fd)
2427 return; 2436 return;
2428 2437
2429 /* 2438 /*
2430 * Send all input to the printer until either ESC[4i or ESC[?4i 2439 * Send all input to the printer until either ESC[4i or ESC[?4i
2431 * is received. 2440 * is received.
2432 */ 2441 */
2433 for (done = 0; !done;) 2442 for (int done = 0; !done; )
2434 { 2443 {
2435 unsigned char buf[8]; 2444 unsigned char buf[8];
2436 unicode_t ch; 2445 unicode_t ch;
2437 unsigned int i, len; 2446 unsigned int i, len;
2438 2447
… …
2472 pclose_printer (fd); 2481 pclose_printer (fd);
2473} 2482}
2474#endif /* PRINTPIPE */ 2483#endif /* PRINTPIPE */
2475/*}}} */ 2484/*}}} */
2476 2485
2477/* *INDENT-OFF* */
2478enum { 2486enum {
2479 C1_40 = 0x40, 2487 C1_40 = 0x40,
2480 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2488 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2481 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2489 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2482 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2490 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2483 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2491 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2484}; 2492};
2485/* *INDENT-ON* */
2486 2493
2487/*{{{ process non-printing single characters */ 2494/*{{{ process non-printing single characters */
2488void 2495void
2489rxvt_term::process_nonprinting (unicode_t ch) 2496rxvt_term::process_nonprinting (unicode_t ch)
2490{ 2497{
… …
2583 break; 2590 break;
2584 case 'Z': /* identify the terminal type */ 2591 case 'Z': /* identify the terminal type */
2585 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2592 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2586 break; 2593 break;
2587 case '<': /* turn off VT52 mode */ 2594 case '<': /* turn off VT52 mode */
2588 PrivMode (0, PrivMode_vt52); 2595 set_privmode (PrivMode_vt52, 0);
2589 break; 2596 break;
2590 case 'F': /* use special graphics character set */ 2597 case 'F': /* use special graphics character set */
2591 case 'G': /* use regular character set */ 2598 case 'G': /* use regular character set */
2592 /* unimplemented */ 2599 /* unimplemented */
2593 break; 2600 break;
… …
2612 return; 2619 return;
2613 } 2620 }
2614 2621
2615 switch (ch) 2622 switch (ch)
2616 { 2623 {
2617 /* case 1: do_tek_mode (); break; */
2618 case '#': 2624 case '#':
2619 if (cmd_getc () == '8') 2625 if (cmd_getc () == '8')
2620 scr_E (); 2626 scr_E ();
2621 break; 2627 break;
2622 case '(': 2628 case '(':
… …
2645#if !ENABLE_MINIMAL 2651#if !ENABLE_MINIMAL
2646 case '9': 2652 case '9':
2647 scr_forwardindex (); 2653 scr_forwardindex ();
2648 break; 2654 break;
2649#endif 2655#endif
2656 // DECPAM/DECPNM
2650 case '=': 2657 case '=':
2651 case '>': 2658 case '>':
2652 PrivMode ((ch == '='), PrivMode_aplKP); 2659 set_privmode (PrivMode_aplKP, ch == '=');
2653 break; 2660 break;
2654 2661
2655 case C1_40: 2662 case C1_40:
2656 cmd_getc (); 2663 cmd_getc ();
2657 break; 2664 break;
… …
2661 2668
2662 /* 8.3.87: NEXT LINE */ 2669 /* 8.3.87: NEXT LINE */
2663 case C1_NEL: /* ESC E */ 2670 case C1_NEL: /* ESC E */
2664 { 2671 {
2665 wchar_t nlcr[] = { C0_LF, C0_CR }; 2672 wchar_t nlcr[] = { C0_LF, C0_CR };
2666 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2673 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2667 } 2674 }
2668 break; 2675 break;
2669 2676
2670 /* kidnapped escape sequence: Should be 8.3.48 */ 2677 /* kidnapped escape sequence: Should be 8.3.48 */
2671 case C1_ESA: /* ESC G */ 2678 case C1_ESA: /* ESC G */
2672 process_graphics (); 2679 // used by original rxvt for rob nations own graphics mode
2680 if (cmd_getc () == 'Q')
2681 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2673 break; 2682 break;
2674 2683
2675 /* 8.3.63: CHARACTER TABULATION SET */ 2684 /* 8.3.63: CHARACTER TABULATION SET */
2676 case C1_HTS: /* ESC H */ 2685 case C1_HTS: /* ESC H */
2677 scr_set_tab (1); 2686 scr_set_tab (1);
… …
2681 case C1_RI: /* ESC M */ 2690 case C1_RI: /* ESC M */
2682 scr_index (DN); 2691 scr_index (DN);
2683 break; 2692 break;
2684 2693
2685 /* 8.3.142: SINGLE-SHIFT TWO */ 2694 /* 8.3.142: SINGLE-SHIFT TWO */
2686 /*case C1_SS2: scr_single_shift (2); break; */ 2695 /* case C1_SS2: break; */
2687 2696
2688 /* 8.3.143: SINGLE-SHIFT THREE */ 2697 /* 8.3.143: SINGLE-SHIFT THREE */
2689 /*case C1_SS3: scr_single_shift (3); break; */ 2698 /* case C1_SS3: break; */
2690 2699
2691 /* 8.3.27: DEVICE CONTROL STRING */ 2700 /* 8.3.27: DEVICE CONTROL STRING */
2692 case C1_DCS: /* ESC P */ 2701 case C1_DCS: /* ESC P */
2693 process_dcs_seq (); 2702 process_dcs_seq ();
2694 break; 2703 break;
… …
2696 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2705 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2697 case C1_SCI: /* ESC Z */ 2706 case C1_SCI: /* ESC Z */
2698 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2707 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2699 break; /* steal obsolete ESC [ c */ 2708 break; /* steal obsolete ESC [ c */
2700 2709
2701 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2710 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2702 case C1_CSI: /* ESC [ */ 2711 case C1_CSI: /* ESC [ */
2703 process_csi_seq (); 2712 process_csi_seq ();
2704 break; 2713 break;
2705 2714
2706 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2715 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2707 case C1_OSC: /* ESC ] */ 2716 case C1_OSC: /* ESC ] */
2708 process_osc_seq (); 2717 process_osc_seq ();
2709 break; 2718 break;
2710 2719
2711 /* 8.3.106: RESET TO INITIAL STATE */ 2720 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2712 case 'c': 2721 case 'c':
2713 mbstate.reset (); 2722 mbstate.reset ();
2714 scr_poweron (); 2723 scr_poweron ();
2715 scrollbar_show (1); 2724 scrollBar.show (1);
2716 break; 2725 break;
2717 2726
2718 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2727 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2719 case 'n': 2728 case 'n':
2720 scr_charset_choose (2); 2729 scr_charset_choose (2);
… …
2727 } 2736 }
2728} 2737}
2729/*}}} */ 2738/*}}} */
2730 2739
2731/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2740/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2732/* *INDENT-OFF* */
2733enum { 2741enum {
2734 CSI_ICH = 0x40, 2742 CSI_ICH = 0x40,
2735 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2743 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2736 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2744 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2737 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2745 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2740 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2748 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2741 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2749 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2742 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2750 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2743}; 2751};
2744 2752
2745#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2753#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2746 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2754 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2747 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2755 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2748#define get_byte_array_bit(array, bit) \ 2756#define get_byte_array_bit(array, bit) \
2749 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2757 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2750 2758
2751const unsigned char csi_defaults[] = 2759static const unsigned char csi_defaults[] =
2752 { 2760 {
2753 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2761 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2754 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2762 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2755 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2763 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2756 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2764 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2757 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2765 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2758 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2766 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2759 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2767 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2760 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2768 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2761 }; 2769 };
2762/* *INDENT-ON* */
2763 2770
2764void 2771void
2765rxvt_term::process_csi_seq () 2772rxvt_term::process_csi_seq ()
2766{ 2773{
2767 unicode_t ch, priv, i; 2774 unicode_t ch, priv, i;
… …
2771 2778
2772 nargs = 0; 2779 nargs = 0;
2773 2780
2774 priv = 0; 2781 priv = 0;
2775 ch = cmd_getc (); 2782 ch = cmd_getc ();
2776 if (ch >= '<' && ch <= '?') 2783 if ((ch >= '<' && ch <= '?') || ch == '!')
2777 { 2784 {
2778 /* '<' '=' '>' '?' */ 2785 /* '<' '=' '>' '?' '!' */
2779 priv = ch; 2786 priv = ch;
2780 ch = cmd_getc (); 2787 ch = cmd_getc ();
2781 } 2788 }
2782 2789
2783 /* read any numerical arguments */ 2790 /* read any numerical arguments */
… …
2837 2844
2838 case '?': 2845 case '?':
2839 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2846 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2840 process_terminal_mode (ch, priv, nargs, arg); 2847 process_terminal_mode (ch, priv, nargs, arg);
2841 break; 2848 break;
2849
2850 case '!':
2851 if (ch == CSI_70)
2852 {
2853 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2854 scr_soft_reset ();
2855
2856 static const int pm_h[] = { 7, 25 };
2857 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2858
2859 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2860 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2842 } 2861 }
2862 break;
2863 }
2864
2843 return; 2865 return;
2844 } 2866 }
2845 2867
2846 switch (ch) 2868 switch (ch)
2847 { 2869 {
… …
3062 } 3084 }
3063} 3085}
3064/*}}} */ 3086/*}}} */
3065 3087
3066#if !ENABLE_MINIMAL 3088#if !ENABLE_MINIMAL
3067/* ARGSUSED */
3068void 3089void
3069rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3090rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3070{ 3091{
3071 int x, y; 3092 int x, y;
3072 XWindowAttributes wattr; 3093 XWindowAttributes wattr;
… …
3081 { 3102 {
3082 /* 3103 /*
3083 * commands 3104 * commands
3084 */ 3105 */
3085 case 1: /* deiconify window */ 3106 case 1: /* deiconify window */
3086 XMapWindow (dpy, parent[0]); 3107 XMapWindow (dpy, parent);
3087 break; 3108 break;
3088 case 2: /* iconify window */ 3109 case 2: /* iconify window */
3089 XIconifyWindow (dpy, parent[0], display->screen); 3110 XIconifyWindow (dpy, parent, display->screen);
3090 break; 3111 break;
3091 case 3: /* set position (pixels) */ 3112 case 3: /* set position (pixels) */
3092 XMoveWindow (dpy, parent[0], args[1], args[2]); 3113 XMoveWindow (dpy, parent, args[1], args[2]);
3093 break; 3114 break;
3094 case 4: /* set size (pixels) */ 3115 case 4: /* set size (pixels) */
3095 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3116 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3096 break; 3117 break;
3097 case 5: /* raise window */ 3118 case 5: /* raise window */
3098 XRaiseWindow (dpy, parent[0]); 3119 XRaiseWindow (dpy, parent);
3099 break; 3120 break;
3100 case 6: /* lower window */ 3121 case 6: /* lower window */
3101 XLowerWindow (dpy, parent[0]); 3122 XLowerWindow (dpy, parent);
3102 break; 3123 break;
3103 case 7: /* refresh window */ 3124 case 7: /* refresh window */
3104 scr_touch (true); 3125 scr_touch (true);
3105 break; 3126 break;
3106 case 8: /* set size (chars) */ 3127 case 8: /* set size (chars) */
… …
3117 3138
3118 /* 3139 /*
3119 * reports - some output format copied from XTerm 3140 * reports - some output format copied from XTerm
3120 */ 3141 */
3121 case 11: /* report window state */ 3142 case 11: /* report window state */
3122 XGetWindowAttributes (dpy, parent[0], &wattr); 3143 XGetWindowAttributes (dpy, parent, &wattr);
3123 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3144 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3124 break; 3145 break;
3125 case 13: /* report window position */ 3146 case 13: /* report window position */
3126 XGetWindowAttributes (dpy, parent[0], &wattr); 3147 XGetWindowAttributes (dpy, parent, &wattr);
3127 XTranslateCoordinates (dpy, parent[0], wattr.root, 3148 XTranslateCoordinates (dpy, parent, wattr.root,
3128 -wattr.border_width, -wattr.border_width, 3149 -wattr.border_width, -wattr.border_width,
3129 &x, &y, &wdummy); 3150 &x, &y, &wdummy);
3130 tt_printf ("\033[3;%d;%dt", x, y); 3151 tt_printf ("\033[3;%d;%dt", x, y);
3131 break; 3152 break;
3132 case 14: /* report window size (pixels) */ 3153 case 14: /* report window size (pixels) */
3133 XGetWindowAttributes (dpy, parent[0], &wattr); 3154 XGetWindowAttributes (dpy, parent, &wattr);
3134 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3155 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3135 break; 3156 break;
3136 case 18: /* report text area size (chars) */ 3157 case 18: /* report text area size (chars) */
3137 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3158 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3138 break; 3159 break;
… …
3140 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3161 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3141 break; 3162 break;
3142 case 20: /* report icon label */ 3163 case 20: /* report icon label */
3143 { 3164 {
3144 char *s; 3165 char *s;
3145 XGetIconName (dpy, parent[0], &s); 3166 XGetIconName (dpy, parent, &s);
3146 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3167 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3147 XFree (s); 3168 XFree (s);
3148 } 3169 }
3149 break; 3170 break;
3150 case 21: /* report window title */ 3171 case 21: /* report window title */
3151 { 3172 {
3152 char *s; 3173 char *s;
3153 XFetchName (dpy, parent[0], &s); 3174 XFetchName (dpy, parent, &s);
3154 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3175 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3155 XFree (s); 3176 XFree (s);
3156 } 3177 }
3157 break; 3178 break;
3158 } 3179 }
… …
3214 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3235 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3215 */ 3236 */
3216void 3237void
3217rxvt_term::process_dcs_seq () 3238rxvt_term::process_dcs_seq ()
3218{ 3239{
3219 char *s;
3220 unicode_t eh;
3221
3222 /* 3240 /*
3223 * Not handled yet 3241 * Not handled yet
3224 */ 3242 */
3243
3244 unicode_t eh;
3225 s = get_to_st (eh); 3245 char *s = get_to_st (eh);
3226 if (s) 3246 if (s)
3227 free (s); 3247 free (s);
3228 3248
3229 return; 3249 return;
3230} 3250}
… …
3234 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3254 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3235 */ 3255 */
3236void 3256void
3237rxvt_term::process_osc_seq () 3257rxvt_term::process_osc_seq ()
3238{ 3258{
3239 unicode_t ch, eh;
3240 int arg; 3259 int arg;
3241 3260
3242 ch = cmd_getc (); 3261 unicode_t ch = cmd_getc ();
3243 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3262 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3244 arg = arg * 10 + (ch - '0'); 3263 arg = arg * 10 + (ch - '0');
3245 3264
3246 if (ch == ';') 3265 if (ch == ';')
3247 { 3266 {
3267 unicode_t eh;
3248 char *s = get_to_st (eh); 3268 char *s = get_to_st (eh);
3249 3269
3250 if (s) 3270 if (s)
3251 { 3271 {
3252 process_xterm_seq (arg, s, eh); 3272 process_xterm_seq (arg, s, eh);
… …
3276 3296
3277/* 3297/*
3278 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3298 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3279 */ 3299 */
3280void 3300void
3281rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3301rxvt_term::process_xterm_seq (int op, char *str, char resp)
3282{ 3302{
3283 int color; 3303 int color;
3284 char *buf, *name; 3304 char *buf, *name;
3285 bool query = str[0] == '?' && !str[1]; 3305 bool query = str[0] == '?' && !str[1];
3286 int saveop = op; 3306 int saveop = op;
… …
3313 unsigned long bytes_after; 3333 unsigned long bytes_after;
3314 unsigned char *value = 0; 3334 unsigned char *value = 0;
3315 const char *str = ""; 3335 const char *str = "";
3316 3336
3317 if (prop 3337 if (prop
3318 && XGetWindowProperty (dpy, parent[0], 3338 && XGetWindowProperty (dpy, parent,
3319 prop, 0, 1<<16, 0, AnyPropertyType, 3339 prop, 0, 1<<16, 0, AnyPropertyType,
3320 &actual_type, &actual_format, 3340 &actual_type, &actual_format,
3321 &nitems, &bytes_after, &value) == Success 3341 &nitems, &bytes_after, &value) == Success
3322 && actual_type != None 3342 && actual_type != None
3323 && actual_format == 8) 3343 && actual_format == 8)
… …
3327 3347
3328 XFree (value); 3348 XFree (value);
3329 } 3349 }
3330 else 3350 else
3331 { 3351 {
3332 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3352 char *eq = strchr (str, '=');
3333 3353
3334 if (eq) 3354 if (eq)
3335 { 3355 {
3336 *eq = 0; 3356 *eq = 0;
3337 set_utf8_property (display->atom (str), eq + 1); 3357 set_utf8_property (display->atom (str), eq + 1);
3338 } 3358 }
3339 else 3359 else
3340 XDeleteProperty (dpy, parent[0], 3360 XDeleteProperty (dpy, parent,
3341 display->atom (str)); 3361 display->atom (str));
3342 } 3362 }
3343 break; 3363 break;
3344 3364
3345 case XTerm_Color: 3365 case XTerm_Color:
… …
3377 process_color_seq (op, Color_pointer_fg, str, resp); 3397 process_color_seq (op, Color_pointer_fg, str, resp);
3378 break; 3398 break;
3379 case XTerm_Color_pointer_bg: 3399 case XTerm_Color_pointer_bg:
3380 process_color_seq (op, Color_pointer_bg, str, resp); 3400 process_color_seq (op, Color_pointer_bg, str, resp);
3381 break; 3401 break;
3402#ifdef OPTION_HC
3403 case XTerm_Color_HC:
3404 process_color_seq (op, Color_HC, str, resp);
3405 break;
3406 case XTerm_Color_HTC:
3407 process_color_seq (op, Color_HTC, str, resp);
3408 break;
3409#endif
3382#ifndef NO_BOLD_UNDERLINE_REVERSE 3410#ifndef NO_BOLD_UNDERLINE_REVERSE
3383 case XTerm_Color_RV:
3384 process_color_seq (op, Color_RV, str, resp);
3385 break;
3386 case Rxvt_Color_BD:
3387 case URxvt_Color_BD: 3411 case URxvt_Color_BD:
3388 process_color_seq (op, Color_BD, str, resp); 3412 process_color_seq (op, Color_BD, str, resp);
3389 break; 3413 break;
3390 case Rxvt_Color_UL:
3391 case URxvt_Color_UL: 3414 case URxvt_Color_UL:
3392 process_color_seq (op, Color_UL, str, resp); 3415 process_color_seq (op, Color_UL, str, resp);
3393 break; 3416 break;
3394 case URxvt_Color_IT: 3417 case URxvt_Color_IT:
3395 process_color_seq (op, Color_IT, str, resp); 3418 process_color_seq (op, Color_IT, str, resp);
3396 break; 3419 break;
3397#endif 3420#endif
3421 case URxvt_Color_border:
3422 process_color_seq (op, Color_border, str, resp);
3423 break;
3398#if ENABLE_TRANSPARENCY 3424#if ENABLE_TRANSPARENCY
3399 case URxvt_Color_tint: 3425 case URxvt_Color_tint:
3400 process_color_seq (op, Color_tint, str, resp); 3426 process_color_seq (op, Color_tint, str, resp);
3401 { 3427 {
3402 bool changed = false; 3428 bool changed = false;
3403 3429
3404 if (ISSET_PIXCOLOR (Color_tint)) 3430 if (ISSET_PIXCOLOR (Color_tint))
3405 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3431 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3406 else
3407 changed = bgPixmap.unset_tint ();
3408 3432
3409 if (changed) 3433 if (changed)
3410 update_background (); 3434 update_background ();
3411 } 3435 }
3412 3436
… …
3417 case Rxvt_Pixmap: 3441 case Rxvt_Pixmap:
3418 if (!strcmp (str, "?")) 3442 if (!strcmp (str, "?"))
3419 { 3443 {
3420 char str[256]; 3444 char str[256];
3421 3445
3422 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3446 sprintf (str, "[%dx%d+%d+%d]",
3423 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3447 min (h_scale, 32767), min (v_scale, 32767),
3424 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3448 min (h_align, 32767), min (v_align, 32767));
3425 process_xterm_seq (XTerm_title, str, CHAR_ST); 3449 process_xterm_seq (XTerm_title, str, CHAR_ST);
3426 } 3450 }
3427 else 3451 else
3428 { 3452 {
3429 int changed = 0; 3453 bool changed = false;
3430 3454
3431 if (*str != ';') 3455 if (*str != ';')
3432 { 3456 {
3433 /* reset to default scaling :*/
3434 bgPixmap.unset_geometry ();
3435 if (bgPixmap.set_file (str)) /* change pixmap */ 3457 if (bg_set_file (str)) /* change pixmap */
3436 changed++; 3458 changed = true;
3437 str = strchr (str, ';');
3438 if (str == NULL)
3439 bgPixmap.set_defaultGeometry ();
3440 } 3459 }
3441 3460 else
3442 while (str)
3443 { 3461 {
3444 str++; 3462 str++;
3445 if (bgPixmap.set_geometry (str)) 3463 if (bg_set_geometry (str, true))
3446 changed++; 3464 changed = true;
3447 str = strchr (str, ';');
3448 } 3465 }
3449 3466
3450 if (changed) 3467 if (changed)
3468 {
3469 if (bg_window_position_sensitive ())
3470 {
3471 int x, y;
3472 get_window_origin (x, y);
3473 bg_set_position (x, y);
3474 }
3451 update_background (); 3475 update_background ();
3476 }
3452 } 3477 }
3453 break; 3478 break;
3454#endif 3479#endif
3455 3480
3456 case XTerm_logfile: 3481 case XTerm_logfile:
… …
3526 break; 3551 break;
3527#endif 3552#endif
3528 3553
3529#if ENABLE_PERL 3554#if ENABLE_PERL
3530 case URxvt_perl: 3555 case URxvt_perl:
3531 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3556 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3532 ; // no responses yet
3533 break; 3557 break;
3534#endif 3558#endif
3535 } 3559 }
3536} 3560}
3537/*----------------------------------------------------------------------*/ 3561/*----------------------------------------------------------------------*/
… …
3560 { 3584 {
3561 if (mode == 'r') 3585 if (mode == 'r')
3562 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3586 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3563 else 3587 else
3564 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3588 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3565 PrivMode (state, bit); 3589
3590 set_privmode (bit, state);
3566 } 3591 }
3567 3592
3568 return state; 3593 return state;
3569} 3594}
3570 3595
3571/* we're not using priv _yet_ */ 3596/* we're not using priv _yet_ */
3572void 3597void
3573rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3598rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3574{ 3599{
3575 unsigned int i, j; 3600 unsigned int i, j;
3576 int state; 3601 int state;
3577 3602
3578 static const struct 3603 static const struct
3579 { 3604 {
3580 const int argval; 3605 const int argval;
3581 const unsigned long bit; 3606 const unsigned long bit;
3582 } argtopriv[] = { 3607 } argtopriv[] = {
3583 { 1, PrivMode_aplCUR }, 3608 { 1, PrivMode_aplCUR }, // DECCKM
3584 { 2, PrivMode_vt52 }, 3609 { 2, PrivMode_vt52 }, // DECANM
3585 { 3, PrivMode_132 }, 3610 { 3, PrivMode_132 }, // DECCOLM
3586 { 4, PrivMode_smoothScroll }, 3611 { 4, PrivMode_smoothScroll }, // DECSCLM
3587 { 5, PrivMode_rVideo }, 3612 { 5, PrivMode_rVideo }, // DECSCNM
3588 { 6, PrivMode_relOrigin }, 3613 { 6, PrivMode_relOrigin }, // DECOM
3589 { 7, PrivMode_Autowrap }, 3614 { 7, PrivMode_Autowrap }, // DECAWM
3590 // 8, bi-directional support mode 3615 // 8, auto-repeat keys // DECARM
3591 { 9, PrivMode_MouseX10 }, 3616 { 9, PrivMode_MouseX10 },
3592 // 18, 19 printing-related 3617 // 18 end FF to printer after print screen
3618 // 19 Print screen prints full screen/scroll region
3593 { 25, PrivMode_VisibleCursor }, 3619 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3594#ifdef scrollBar_esc 3620#ifdef scrollBar_esc
3595 { scrollBar_esc, PrivMode_scrollBar }, 3621 { scrollBar_esc, PrivMode_scrollBar },
3596#endif 3622#endif
3597 { 35, PrivMode_ShiftKeys }, // rxvt extension 3623 { 35, PrivMode_ShiftKeys }, // rxvt extension
3624 // 38, tektronix mode // DECTEK
3598 { 40, PrivMode_132OK }, 3625 { 40, PrivMode_132OK },
3599 // 41 xterm more fixes NYI 3626 // 41 xterm more fixes NYI
3600 // 45 margin bell NYI 3627 // 45 margin bell NYI
3601 // 46 start logging 3628 // 46 start logging
3602 { 47, PrivMode_Screen }, 3629 { 47, PrivMode_Screen },
3603 { 66, PrivMode_aplKP }, 3630 { 66, PrivMode_aplKP }, // DECNKM
3604#ifndef NO_BACKSPACE_KEY 3631#ifndef NO_BACKSPACE_KEY
3605 { 67, PrivMode_BackSpace }, 3632 { 67, PrivMode_BackSpace }, // DECBKM
3606#endif 3633#endif
3607 { 1000, PrivMode_MouseX11 }, 3634 { 1000, PrivMode_MouseX11 },
3608 { 1002, PrivMode_MouseBtnEvent }, 3635 { 1002, PrivMode_MouseBtnEvent },
3609 { 1003, PrivMode_MouseAnyEvent }, 3636 { 1003, PrivMode_MouseAnyEvent },
3637#if ENABLE_FRILLS
3638 { 1005, PrivMode_ExtModeMouse },
3639#endif
3610 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3640 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3611 { 1011, PrivMode_Keypress }, // rxvt extension 3641 { 1011, PrivMode_Keypress }, // rxvt extension
3642#if ENABLE_FRILLS
3643 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3644#endif
3612 // 1035 enable modifiers for alt, numlock NYI 3645 // 1035 enable modifiers for alt, numlock NYI
3613 // 1036 send ESC for meta keys NYI 3646 // 1036 send ESC for meta keys NYI
3614 // 1037 send DEL for keypad delete NYI 3647 // 1037 send DEL for keypad delete NYI
3615 { 1047, PrivMode_Screen }, 3648 { 1047, PrivMode_Screen },
3616 // 1048 save and restore cursor 3649 // 1048 save and restore cursor, implemented in code
3617 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3650 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3618 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3651 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3619 { 2004, PrivMode_BracketPaste }, 3652 { 2004, PrivMode_BracketPaste },
3620 }; 3653 };
3621 3654
… …
3631 for (i = 0; i < nargs; i++) 3664 for (i = 0; i < nargs; i++)
3632 { 3665 {
3633 state = -1; 3666 state = -1;
3634 3667
3635 /* basic handling */ 3668 /* basic handling */
3636 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3669 for (j = 0; j < ecb_array_length (argtopriv); j++)
3637 if (argtopriv[j].argval == arg[i]) 3670 if (argtopriv[j].argval == arg[i])
3638 { 3671 {
3639 state = privcases (mode, argtopriv[j].bit); 3672 state = privcases (mode, argtopriv[j].bit);
3640 break; 3673 break;
3641 } 3674 }
… …
3649 3682
3650 scr_touch (true); 3683 scr_touch (true);
3651 break; 3684 break;
3652#endif 3685#endif
3653 case 1048: /* alternative cursor save */ 3686 case 1048: /* alternative cursor save */
3654 case 1049:
3655 if (option (Opt_secondaryScreen)) 3687 if (option (Opt_secondaryScreen))
3656 if (mode == 0) 3688 if (mode == 0)
3657 scr_cursor (RESTORE); 3689 scr_cursor (RESTORE);
3658 else if (mode == 1) 3690 else if (mode == 1)
3659 scr_cursor (SAVE); 3691 scr_cursor (SAVE);
… …
3668 case 2: /* VT52 mode */ 3700 case 2: /* VT52 mode */
3669 /* oddball mode. should be set regardless of set/reset 3701 /* oddball mode. should be set regardless of set/reset
3670 * parameter. Return from VT52 mode with an ESC < from 3702 * parameter. Return from VT52 mode with an ESC < from
3671 * within VT52 mode 3703 * within VT52 mode
3672 */ 3704 */
3673 PrivMode (1, PrivMode_vt52); 3705 set_privmode (PrivMode_vt52, 1);
3674 break; 3706 break;
3675 case 3: /* 80/132 */ 3707 case 3: /* 80/132 */
3676 if (priv_modes & PrivMode_132OK) 3708 if (priv_modes & PrivMode_132OK)
3677 {
3678 scr_poweron ();
3679 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3709 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3680 }
3681 break; 3710 break;
3682 case 4: /* smooth scrolling */ 3711 case 4: /* smooth scrolling */
3683 set_option (Opt_jumpScroll, !state); 3712 set_option (Opt_jumpScroll, !state);
3684 break; 3713 break;
3685 case 5: /* reverse video */ 3714 case 5: /* reverse video */
… …
3696 if (state) /* orthogonal */ 3725 if (state) /* orthogonal */
3697 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3726 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3698 break; 3727 break;
3699#ifdef scrollBar_esc 3728#ifdef scrollBar_esc
3700 case scrollBar_esc: 3729 case scrollBar_esc:
3701 if (scrollbar_mapping (state)) 3730 if (scrollBar.map (state))
3702 { 3731 {
3703 resize_all_windows (0, 0, 0); 3732 resize_all_windows (0, 0, 0);
3704 scr_touch (true); 3733 scr_touch (true);
3705 } 3734 }
3706 break; 3735 break;
… …
3723 case 1003: 3752 case 1003:
3724 if (state) 3753 if (state)
3725 { 3754 {
3726 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3755 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3727 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3756 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3757 mouse_row = mouse_col = 0;
3728 vt_emask_mouse = PointerMotionMask; 3758 vt_emask_mouse = PointerMotionMask;
3729 } 3759 }
3730 else 3760 else
3731 vt_emask_mouse = NoEventMask; 3761 vt_emask_mouse = NoEventMask;
3762
3732 vt_select_input (); 3763 vt_select_input ();
3733 break; 3764 break;
3734 case 1010: /* scroll to bottom on TTY output inhibit */ 3765 case 1010: /* scroll to bottom on TTY output inhibit */
3735 set_option (Opt_scrollTtyOutput, !state); 3766 set_option (Opt_scrollTtyOutput, !state);
3736 break; 3767 break;
3737 case 1011: /* scroll to bottom on key press */ 3768 case 1011: /* scroll to bottom on key press */
3738 set_option (Opt_scrollTtyKeypress, state); 3769 set_option (Opt_scrollTtyKeypress, state);
3739 break; 3770 break;
3740 case 1047: /* secondary screen w/ clearing last */ 3771 case 1047: /* secondary screen w/ clearing last */
3741 if (option (Opt_secondaryScreen)) 3772 if (option (Opt_secondaryScreen))
3742 if (current_screen != PRIMARY) 3773 if (!state)
3743 scr_erase_screen (2); 3774 scr_erase_screen (2);
3775
3744 scr_change_screen (state); 3776 scr_change_screen (state);
3745 break; 3777 break;
3746 case 1049: /* secondary screen w/ clearing first */ 3778 case 1049: /* secondary screen w/ clearing first */
3779 if (option (Opt_secondaryScreen))
3780 if (state)
3781 scr_cursor (SAVE);
3782
3747 scr_change_screen (state); 3783 scr_change_screen (state);
3784
3748 if (option (Opt_secondaryScreen)) 3785 if (option (Opt_secondaryScreen))
3749 if (current_screen != PRIMARY) 3786 if (state)
3750 scr_erase_screen (2); 3787 scr_erase_screen (2);
3788 else
3789 scr_cursor (RESTORE);
3751 break; 3790 break;
3752 default: 3791 default:
3753 break; 3792 break;
3754 } 3793 }
3755 } 3794 }
… …
3908 } 3947 }
3909 } 3948 }
3910} 3949}
3911/*}}} */ 3950/*}}} */
3912 3951
3913/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3914void
3915rxvt_term::process_graphics ()
3916{
3917 unicode_t ch, cmd = cmd_getc ();
3918
3919 if (cmd == 'Q')
3920 {
3921 /* query graphics */
3922 tt_printf ("\033G0\012"); /* no graphics */
3923 return;
3924 }
3925 /* swallow other graphics sequences until terminating ':' */
3926 do
3927 ch = cmd_getc ();
3928 while (ch != ':');
3929}
3930/*}}} */
3931
3932/* ------------------------------------------------------------------------- */ 3952/* ------------------------------------------------------------------------- */
3933 3953
3934/* 3954/*
3935 * Send printf () formatted output to the command. 3955 * Send printf () formatted output to the command.
3936 * Only use for small amounts of data. 3956 * Only use for small amounts of data.
… …
3949 3969
3950/* ---------------------------------------------------------------------- */ 3970/* ---------------------------------------------------------------------- */
3951/* Write data to the pty as typed by the user, pasted with the mouse, 3971/* Write data to the pty as typed by the user, pasted with the mouse,
3952 * or generated by us in response to a query ESC sequence. 3972 * or generated by us in response to a query ESC sequence.
3953 */ 3973 */
3954const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3974static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3955 3975
3956void 3976void
3957rxvt_term::tt_write (const char *data, unsigned int len) 3977rxvt_term::tt_write (const char *data, unsigned int len)
3958{ 3978{
3959 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3979 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3964 3984
3965 if (v_buflen == 0) 3985 if (v_buflen == 0)
3966 { 3986 {
3967 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 3987 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3968 3988
3989 max_it (written, 0);
3990
3969 if ((unsigned int)written == len) 3991 if (written == len)
3970 return; 3992 return;
3971 3993
3972 data += written; 3994 data += written;
3973 len -= written; 3995 len -= written;
3974 } 3996 }
3975 3997
3976 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3998 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3977 3999
3978 memcpy (v_buffer + v_buflen, data, len); 4000 memcpy (v_buffer + v_buflen, data, len);
3979 v_buflen += len; 4001 v_buflen += len;
3980 4002
3981 pty_ev.set (ev::READ | ev::WRITE); 4003 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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