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.214 by root, Thu Dec 22 21:56:19 2005 UTC vs.
Revision 1.404 by root, Sat Feb 2 15:19:55 2008 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
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-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 44 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 45 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 46 *----------------------------------------------------------------------*/
46 47
47/*{{{ includes: */ 48/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 49#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 50#include "rxvt.h"
51#include "rxvtperl.h"
50#include "version.h" 52#include "version.h"
51#include "command.h" 53#include "command.h"
52 54
53#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 56# include "keyboard.h"
55#endif 57#endif
56 58
57#include <csignal> 59#include <csignal>
58 60
61#if LINUX_YIELD_HACK
62# include <ctime>
63#endif
64
59/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
60 66
61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
62
63// exception thrown when the command parser runs out of input data
64class out_of_input { } out_of_input;
65 68
66#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
67 70
68#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
69#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
93 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
94 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
95 98
96 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
97 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
98 XK_ISO_Lock, 0x21eb,
99 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
100 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
101 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
102 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
103 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
141 || !IN_RANGE_EXC (y, 0, nrow)) 143 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 144 return;
143 145
144 for (;;) 146 for (;;)
145 { 147 {
146 const line_t &l = ROW(y - view_start); 148 const line_t &l = ROW(y + view_start);
147 149
148 text_t t = l.t[x]; 150 text_t t = l.t[x];
149 151
150 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
151 { 153 {
152 iso14755_51 (l.t[x], l.r[x]); 154 iso14755_51 (l.t[x], l.r[x], x, y);
153 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
154 break; 156 break;
155 } 157 }
156 158
157 x--; 159 x--;
158 } 160 }
159} 161}
160#endif
161 162
162#if ENABLE_OVERLAY
163void 163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 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)]; 167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 168 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 169 int len;
170 170
171 fname = rxvt_utf8towcs (f->name); 171 fname = rxvt_utf8towcs (f->name);
172 172
173#if ENABLE_COMBINING 173# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 174 if (IS_COMPOSE (ch))
175 { 175 {
176 len = rxvt_composite.expand (ch, 0); 176 len = rxvt_composite.expand (ch, 0);
177 alloc = chr = new wchar_t[len]; 177 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr); 178 rxvt_composite.expand (ch, chr);
179 } 179 }
180 else 180 else
181#endif 181# endif
182 { 182 {
183 ch2 = ch; 183 ch2 = ch;
184 184
185 alloc = 0; 185 alloc = 0;
186 chr = &ch2; 186 chr = &ch2;
187 len = 1; 187 len = 1;
188 } 188 }
189 189
190 char attr[80]; // plenty
191
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r,
194 fgcolor_of (r), bgcolor_of (r),
195 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : "");
201
190 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
191 203
192 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 204 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr));
206
207 if (y >= 0)
208 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0;
211 }
212
213 scr_overlay_new (x, y, width, len + 2);
193 214
194 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
195 216
196 for (int y = 0; y < len; y++) 217 for (int y = 0; y < len; y++)
197 { 218 {
… …
200 ch = *chr++; 221 ch = *chr++;
201 222
202 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
203 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
204 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
205#if !UNICODE3 226# if !UNICODE_3
206 if (ch >= 0x10000) 227 if (ch >= 0x10000)
207 ch = 0xfffd; 228 ch = 0xfffd;
208#endif 229# endif
209 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
210 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
211 } 234 }
212 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
241 scr_overlay_set (0, len , attr);
213 scr_overlay_set (0, len, fname); 242 scr_overlay_set (0, len + 1, fname);
214 243
215 free (fname); 244 free (fname);
216 245
217#if ENABLE_COMBINING 246# if ENABLE_COMBINING
218 if (alloc) 247 if (alloc)
219 delete [] alloc; 248 delete [] alloc;
220#endif 249# endif
221} 250}
222#endif 251#endif
223 252
224void 253void
225rxvt_term::commit_iso14755 () 254rxvt_term::commit_iso14755 ()
… …
242 mb[0] = ch[0]; 271 mb[0] = ch[0];
243 len = 1; 272 len = 1;
244 } 273 }
245 274
246 if (len > 0) 275 if (len > 0)
247 tt_write ((unsigned char *)mb, len); 276 tt_write (mb, len);
248 else 277 else
249 scr_bell (); 278 scr_bell ();
250 } 279 }
251 280
252 iso14755buf = 0; 281 iso14755buf = 0;
… …
269 298
270 return -1; 299 return -1;
271} 300}
272#endif 301#endif
273 302
274/*{{{ Convert the keypress event into a string */
275void 303void
276rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
277{ 305{
278 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
279 unsigned int newlen; 307 unsigned int newlen;
280 KeySym keysym; 308 KeySym keysym;
281#ifdef DEBUG_CMD
282 static int debug_key = 1; /* accessible by a debugger only */
283#endif
284 int valid_keysym; 309 int valid_keysym;
285 unsigned char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
286 316
287 /* 317 /*
288 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 318 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
289 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
290 * 320 *
… …
308 Status status_return; 338 Status status_return;
309 339
310#if 0 340#if 0
311#ifdef X_HAVE_UTF8_STRING 341#ifdef X_HAVE_UTF8_STRING
312 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 342 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
313 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 343 len = Xutf8LookupString (Input_Context, &ev, kbuf,
314 KBUFSZ, &keysym, &status_return); 344 KBUFSZ, &keysym, &status_return);
315 else 345 else
316#endif 346#endif
317#endif 347#endif
318 { 348 {
… …
355 || status_return == XLookupBoth; 385 || status_return == XLookupBoth;
356 } 386 }
357 else 387 else
358#endif 388#endif
359 { 389 {
360 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 390 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
361 valid_keysym = keysym != NoSymbol; 391 valid_keysym = keysym != NoSymbol;
362 } 392 }
363 393
364 if (valid_keysym) 394 if (valid_keysym)
365 { 395 {
… …
417 scr_move_to (0, 1); 447 scr_move_to (0, 1);
418 return; 448 return;
419 } 449 }
420 else if (keysym == XK_End) 450 else if (keysym == XK_End)
421 { 451 {
422 scr_move_to (1, 0); 452 scr_move_to (1, 1);
423 return; 453 return;
424 } 454 }
425 } 455 }
426#endif 456#endif
427 } 457 }
… …
438 { 468 {
439 switch (keysym) 469 switch (keysym)
440 { 470 {
441 /* normal XTerm key bindings */ 471 /* normal XTerm key bindings */
442 case XK_Insert: /* Shift+Insert = paste mouse selection */ 472 case XK_Insert: /* Shift+Insert = paste mouse selection */
443 selection_request (ev.time, 0, 0); 473 selection_request (ev.time);
444 return; 474 return;
445#if TODO 475#if TODO
446 /* rxvt extras */ 476 /* rxvt extras */
447 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 477 case XK_KP_Add: /* Shift+KP_Add = bigger font */
448 change_font (FONT_UP); 478 change_font (FONT_UP);
… …
467 { 497 {
468 commit_iso14755 (); 498 commit_iso14755 ();
469 iso14755buf = ISO_14755_51; 499 iso14755buf = ISO_14755_51;
470# if ISO_14755 500# if ISO_14755
471 iso14755_51 (0); 501 iso14755_51 (0);
502# endif
503 return;
504 }
505 else if (keysym == XK_BackSpace)
506 {
507 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
508# if ISO_14755
509 iso14755_51 (iso14755buf & ISO_14755_MASK);
472# endif 510# endif
473 return; 511 return;
474 } 512 }
475 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
476 { 514 {
… …
481# endif 519# endif
482 return; 520 return;
483 } 521 }
484 else 522 else
485 { 523 {
486# if ENABLE_OVERLAY 524# if ISO_14755
487 scr_overlay_off (); 525 scr_overlay_off ();
488# endif 526# endif
489 iso14755buf = 0; 527 iso14755buf = 0;
490 } 528 }
491 } 529 }
492 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
493 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
494 if (!(iso14755buf & ISO_14755_STARTED)) 532 if (!(iso14755buf & ISO_14755_STARTED))
495 { 533 {
496 iso14755buf |= ISO_14755_STARTED; 534 iso14755buf |= ISO_14755_STARTED;
497# if ENABLE_OVERLAY 535# if ISO_14755
498 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
499 scr_overlay_set (0, 0, "ISO 14755 mode"); 537 scr_overlay_set (0, 0, "ISO 14755 mode");
500# endif 538# endif
501 } 539 }
502#endif 540#endif
503 541
504#ifdef PRINTPIPE 542#ifdef PRINTPIPE
505 if (keysym == XK_Print) 543 if (keysym == XK_Print)
506 { 544 {
507 scr_printscreen (ctrl | shft); 545 scr_printscreen (ctrl | shft);
508 return; 546 return;
… …
510#endif 548#endif
511 549
512 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 550 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
513 { 551 {
514 { 552 {
553 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
515 newlen = 1; 554 newlen = 1;
555#ifdef XK_KP_Home
556 static const KeySym keypadtrans[] = {
557 XK_KP_7, // XK_KP_Home
558 XK_KP_4, // XK_KP_Left
559 XK_KP_8, // XK_KP_Up
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 };
572
573 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
574 {
575 unsigned int index = keysym - XK_KP_Home;
576 keysym = kp ? keypadtrans[index] : XK_Home + index;
577 }
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
516 switch (keysym) 585 switch (keysym)
517 { 586 {
518#ifndef NO_BACKSPACE_KEY 587#ifndef NO_BACKSPACE_KEY
519 case XK_BackSpace: 588 case XK_BackSpace:
520 if (priv_modes & PrivMode_HaveBackSpace) 589 if (priv_modes & PrivMode_HaveBackSpace)
… …
522 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 591 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
523 ^ !!ctrl) ? '\b' : '\177'; 592 ^ !!ctrl) ? '\b' : '\177';
524 kbuf[1] = '\0'; 593 kbuf[1] = '\0';
525 } 594 }
526 else 595 else
527 strcpy (kbuf, key_backspace); 596 strcpy (kbuf, rs[Rs_backspace_key]);
528 break; 597 break;
529#endif 598#endif
530#ifndef NO_DELETE_KEY 599#ifndef NO_DELETE_KEY
531# ifdef XK_KP_Prior
532 case XK_KP_Delete:
533 /* allow shift to override */
534 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
535 {
536 strcpy (kbuf, "\033On");
537 break;
538 }
539 /* FALLTHROUGH */
540# endif
541 case XK_Delete: 600 case XK_Delete:
542 strcpy (kbuf, key_delete); 601 strcpy (kbuf, rs[Rs_delete_key]);
543 break; 602 break;
544#endif 603#endif
545 case XK_Tab: 604 case XK_Tab:
546 if (shft) 605 if (shft)
547 strcpy (kbuf, "\033[Z"); 606 strcpy (kbuf, "\033[Z");
… …
557#endif 616#endif
558 newlen = 0; 617 newlen = 0;
559 } 618 }
560 break; 619 break;
561 620
562#ifdef XK_KP_Left
563 case XK_KP_Up: /* \033Ox or standard */
564 case XK_KP_Down: /* \033Or or standard */
565 case XK_KP_Right: /* \033Ov or standard */
566 case XK_KP_Left: /* \033Ot or standard */
567 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
568 {
569 strcpy (kbuf, "\033OZ");
570 kbuf[2] = "txvr"[keysym - XK_KP_Left];
571 break;
572 }
573 else
574 /* translate to std. cursor key */
575 keysym = XK_Left + (keysym - XK_KP_Left);
576 /* FALLTHROUGH */
577#endif
578 case XK_Up: /* "\033[A" */ 621 case XK_Up: /* "\033[A" */
579 case XK_Down: /* "\033[B" */ 622 case XK_Down: /* "\033[B" */
580 case XK_Right: /* "\033[C" */ 623 case XK_Right: /* "\033[C" */
581 case XK_Left: /* "\033[D" */ 624 case XK_Left: /* "\033[D" */
582 strcpy (kbuf, "\033[Z"); 625 strcpy (kbuf, "\033[Z");
… …
592 else if (priv_modes & PrivMode_aplCUR) 635 else if (priv_modes & PrivMode_aplCUR)
593 kbuf[1] = 'O'; 636 kbuf[1] = 'O';
594 break; 637 break;
595 638
596#ifndef UNSHIFTED_SCROLLKEYS 639#ifndef UNSHIFTED_SCROLLKEYS
597# ifdef XK_KP_Prior
598 case XK_KP_Prior:
599 /* allow shift to override */
600 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
601 {
602 strcpy (kbuf, "\033Oy");
603 break;
604 }
605 /* FALLTHROUGH */
606# endif
607 case XK_Prior: 640 case XK_Prior:
608 strcpy (kbuf, "\033[5~"); 641 strcpy (kbuf, "\033[5~");
609 break; 642 break;
610# ifdef XK_KP_Next
611 case XK_KP_Next:
612 /* allow shift to override */
613 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
614 {
615 strcpy (kbuf, "\033Os");
616 break;
617 }
618 /* FALLTHROUGH */
619# endif
620 case XK_Next: 643 case XK_Next:
621 strcpy (kbuf, "\033[6~"); 644 strcpy (kbuf, "\033[6~");
622 break; 645 break;
623#endif 646#endif
624 case XK_KP_Enter: 647 case XK_KP_Enter:
625 /* allow shift to override */ 648 /* allow shift to override */
626 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 649 if (kp)
627 { 650 {
628 strcpy (kbuf, "\033OM"); 651 strcpy (kbuf, "\033OM");
629 break; 652 break;
630 } 653 }
631 654
… …
643 kbuf[0] = '\015'; 666 kbuf[0] = '\015';
644 kbuf[1] = '\0'; 667 kbuf[1] = '\0';
645 } 668 }
646 break; 669 break;
647 670
648#ifdef XK_KP_Begin
649 case XK_KP_Begin:
650 strcpy (kbuf, "\033Ou");
651 break;
652
653#endif
654 case XK_KP_F1: /* "\033OP" */ 671 case XK_KP_F1: /* "\033OP" */
655 case XK_KP_F2: /* "\033OQ" */ 672 case XK_KP_F2: /* "\033OQ" */
656 case XK_KP_F3: /* "\033OR" */ 673 case XK_KP_F3: /* "\033OR" */
657 case XK_KP_F4: /* "\033OS" */ 674 case XK_KP_F4: /* "\033OS" */
658 strcpy (kbuf, "\033OP"); 675 strcpy (kbuf, "\033OP");
… …
674 case XK_KP_6: /* "\033Ov" : "6" */ 691 case XK_KP_6: /* "\033Ov" : "6" */
675 case XK_KP_7: /* "\033Ow" : "7" */ 692 case XK_KP_7: /* "\033Ow" : "7" */
676 case XK_KP_8: /* "\033Ox" : "8" */ 693 case XK_KP_8: /* "\033Ox" : "8" */
677 case XK_KP_9: /* "\033Oy" : "9" */ 694 case XK_KP_9: /* "\033Oy" : "9" */
678 /* allow shift to override */ 695 /* allow shift to override */
679 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 696 if (kp)
680 { 697 {
681 strcpy (kbuf, "\033Oj"); 698 strcpy (kbuf, "\033Oj");
682 kbuf[2] += (keysym - XK_KP_Multiply); 699 kbuf[2] += (keysym - XK_KP_Multiply);
683 } 700 }
684 else 701 else
… …
690 707
691 case XK_Find: 708 case XK_Find:
692 strcpy (kbuf, "\033[1~"); 709 strcpy (kbuf, "\033[1~");
693 break; 710 break;
694 711
695#ifdef XK_KP_End
696 case XK_KP_Insert:
697 /* allow shift to override */
698 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
699 {
700 strcpy (kbuf, "\033Op");
701 break;
702 }
703 /* FALLTHROUGH */
704#endif
705 case XK_Insert: 712 case XK_Insert:
706 strcpy (kbuf, "\033[2~"); 713 strcpy (kbuf, "\033[2~");
707 break; 714 break;
708#ifdef DXK_Remove /* support for DEC remove like key */ 715#ifdef DXK_Remove /* support for DEC remove like key */
709 case DXK_Remove: 716 case DXK_Remove:
… …
713 strcpy (kbuf, "\033[3~"); 720 strcpy (kbuf, "\033[3~");
714 break; 721 break;
715 case XK_Select: 722 case XK_Select:
716 strcpy (kbuf, "\033[4~"); 723 strcpy (kbuf, "\033[4~");
717 break; 724 break;
718#ifdef XK_KP_End
719 case XK_KP_End:
720 /* allow shift to override */
721 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
722 {
723 strcpy (kbuf, "\033Oq");
724 break;
725 }
726 /* FALLTHROUGH */
727#endif
728 case XK_End: 725 case XK_End:
729 strcpy (kbuf, KS_END); 726 strcpy (kbuf, KS_END);
730 break; 727 break;
731#ifdef XK_KP_Home
732 case XK_KP_Home:
733 /* allow shift to override */
734 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
735 {
736 strcpy (kbuf, "\033Ow");
737 break;
738 }
739 /* FALLTHROUGH */
740#endif
741 case XK_Home: 728 case XK_Home:
742 strcpy (kbuf, KS_HOME); 729 strcpy (kbuf, KS_HOME);
743 break; 730 break;
744 731
745#define FKEY(n, fkey) \ 732#define FKEY(n, fkey) \
… …
829 { 816 {
830#ifdef META8_OPTION 817#ifdef META8_OPTION
831 /* set 8-bit on */ 818 /* set 8-bit on */
832 if (meta && (meta_char == 0x80)) 819 if (meta && (meta_char == 0x80))
833 { 820 {
834 unsigned char *ch; 821 char *ch;
835 822
836 for (ch = kbuf; ch < kbuf + len; ch++) 823 for (ch = kbuf; ch < kbuf + len; ch++)
837 *ch |= 0x80; 824 *ch |= 0x80;
838 825
839 meta = 0; 826 meta = 0;
… …
841#endif 828#endif
842 /* nil */ ; 829 /* nil */ ;
843 } 830 }
844 } 831 }
845 832
833 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
834 return;
835
846 if (len <= 0) 836 if (len <= 0)
847 return; /* not mapped */ 837 return; /* not mapped */
848 838
849 if (options & Opt_scrollTtyKeypress) 839 if (option (Opt_scrollTtyKeypress))
850 if (view_start) 840 if (view_start)
851 { 841 {
852 view_start = 0; 842 view_start = 0;
853 want_refresh = 1; 843 want_refresh = 1;
854 } 844 }
… …
872#ifdef META8_OPTION 862#ifdef META8_OPTION
873 && meta_char == C0_ESC 863 && meta_char == C0_ESC
874#endif 864#endif
875 ) 865 )
876 { 866 {
877 const unsigned char ch = C0_ESC; 867 const char ch = C0_ESC;
878 tt_write (&ch, 1); 868 tt_write (&ch, 1);
879 } 869 }
880 870
881#if defined(DEBUG_CMD)
882 /* Display keyboard buffer contents */
883 unsigned char *p;
884 int i;
885
886 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
887 for (i = 0, p = kbuf; i < len; i++, p++)
888 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
889 fprintf (stderr, "'\n");
890#endif /* DEBUG_CMD */
891 tt_write (kbuf, (unsigned int)len); 871 tt_write (kbuf, (unsigned int)len);
892} 872}
893/*}}} */
894 873
874void
875rxvt_term::key_release (XKeyEvent &ev)
876{
877#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
878 KeySym keysym;
879
880 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
881#endif
882
883#if ENABLE_FRILLS || ISO_14755
884 // ISO 14755 support
885 if (iso14755buf)
886 if (iso14755buf & ISO_14755_52)
887 {
888# if ISO_14755
889 scr_overlay_off ();
890# endif
891# if ISO_14755
892 // iso14755 part 5.2 handling: release time
893 // first: controls
894 if ((ev.state & ControlMask)
895 && ((keysym >= 0x40 && keysym <= 0x5f)
896 || (keysym >= 0x61 && keysym <= 0x7f)))
897 {
898 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
899 commit_iso14755 ();
900
901 return;
902 }
903
904 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
905 if (i[0] == keysym)
906 {
907 iso14755buf = ISO_14755_51 | i[1];
908 commit_iso14755 ();
909
910 return;
911 }
912
913 scr_bell ();
914# endif
915 iso14755buf = 0;
916
917 return;
918 }
919 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
920 {
921# if ISO_14755
922 scr_overlay_off ();
923# endif
924 if (iso14755buf & ISO_14755_51)
925 commit_iso14755 ();
926#if ISO_14755
927 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
928 {
929 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
930
931 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
932 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
933 }
934# endif
935 else
936 iso14755buf = 0;
937 }
938#endif
939
940 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
941 return;
942
943#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
944 if (!(ev.state & ControlMask))
945 slip_wheel_ev.stop ();
946 else if (keysym == XK_Control_L || keysym == XK_Control_R)
947 mouse_slip_wheel_speed = 0;
948#endif
949}
950
895#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 951#if defined (KEYSYM_RESOURCE)
896/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
897/* attempt to `write' count to the input buffer */
898unsigned int 952unsigned int
899rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 953rxvt_term::cmd_write (const char *str, unsigned int count)
900{ 954{
901 unsigned int n, s; 955 unsigned int n, s;
902 956
903 n = cmdbuf_ptr - cmdbuf_base; 957 n = cmdbuf_ptr - cmdbuf_base;
904 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 958 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
930void 984void
931rxvt_term::flush () 985rxvt_term::flush ()
932{ 986{
933 flush_ev.stop (); 987 flush_ev.stop ();
934 988
935#ifdef TRANSPARENT 989#ifdef HAVE_BG_PIXMAP
936 if (want_full_refresh) 990 if (bgPixmap.check_clearChanged ())
937 { 991 {
938 want_full_refresh = 0; 992// scr_clear (true); This needs to be researched further!
939 scr_clear ();
940 scr_touch (false); 993 scr_touch (false);
941 } 994 }
942#endif 995#endif
943 996
944 if (want_refresh) 997 if (want_refresh)
945 { 998 {
999 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1000 {
1001 int row = view_start;
1002 int end_row = row + nrow;
1003
1004 while (row > top_row && ROW (row - 1).is_longer ())
1005 --row;
1006
1007 do
1008 {
1009 int start_row = row;
1010 line_t *l;
1011
1012 do
1013 {
1014 l = &ROW (row++);
1015
1016 if (!(l->f & LINE_FILTERED))
1017 {
1018 // line not filtered, mark it as filtered
1019 l->f |= LINE_FILTERED;
1020 while (l->is_longer ())
1021 {
1022 l = &ROW (row++);
1023 l->f |= LINE_FILTERED;
1024 }
1025
1026 // and filter it
1027 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1028
1029 break;
1030 }
1031 }
1032 while (l->is_longer () && row < end_row);
1033 }
1034 while (row < end_row);
1035 }
1036
946 scr_refresh (refresh_type); 1037 scr_refresh ();
947 scrollbar_show (1); 1038 scrollbar_show (1);
948#ifdef USE_XIM 1039#ifdef USE_XIM
949 IMSendSpot (); 1040 IMSendSpot ();
950#endif 1041#endif
951 } 1042 }
952 1043
953 display->flush (); 1044 display->flush ();
954} 1045}
955 1046
1047/* checks wether a refresh is requested and starts the refresh timer */
956void 1048void
957rxvt_term::check_cb (check_watcher &w) 1049rxvt_term::refresh_check ()
958{ 1050{
959 SET_R (this); 1051 if (want_refresh && !flush_ev.is_active ())
960 SET_LOCALE (locale); 1052 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
961 1053
962 display->flush (); 1054 display->flush ();
963
964 if (want_refresh && !flush_ev.active)
965 flush_ev.start (NOW + 0.01);
966} 1055}
967 1056
968void 1057void
969rxvt_term::flush_cb (time_watcher &w) 1058rxvt_term::flush_cb (ev::timer &w, int revents)
970{ 1059{
971 SET_R (this); 1060 make_current ();
972 SET_LOCALE (locale);
973 1061
974 refresh_limit = 1;
975 refresh_count = 0; 1062 refresh_count = 0;
976 flush (); 1063 flush ();
977} 1064}
978 1065
979#ifdef CURSOR_BLINK 1066#ifdef CURSOR_BLINK
980void 1067void
981rxvt_term::cursor_blink_cb (time_watcher &w) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
982{ 1069{
983 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
984 want_refresh = 1; 1071 want_refresh = 1;
985 1072 refresh_check ();
986 w.start (w.at + BLINK_INTERVAL);
987} 1073}
988#endif 1074#endif
989 1075
990#ifdef TEXT_BLINK 1076#ifdef TEXT_BLINK
991void 1077void
992rxvt_term::text_blink_cb (time_watcher &w) 1078rxvt_term::text_blink_cb (ev::timer &w, int revents)
993{ 1079{
994 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1080 if (scr_refresh_rend (RS_Blink, RS_Blink))
995 { 1081 {
996 hidden_text = !hidden_text; 1082 hidden_text = !hidden_text;
997 want_refresh = 1; 1083 want_refresh = 1;
998 w.start (w.at + TEXT_BLINK_INTERVAL); 1084 refresh_check ();
999 } 1085 }
1086 else
1087 w.stop ();
1000} 1088}
1001#endif 1089#endif
1002 1090
1003#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1004void 1092void
1005rxvt_term::cont_scroll_cb (time_watcher &w) 1093rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1006{ 1094{
1007 if ((scrollbar_isUp() || scrollbar_isDn()) && 1095 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1008 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1096 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1009 { 1097 {
1010 refresh_type |= SMOOTH_REFRESH;
1011 want_refresh = 1; 1098 want_refresh = 1;
1012 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1099 refresh_check ();
1013 } 1100 }
1101 else
1102 w.stop ();
1014} 1103}
1015#endif 1104#endif
1016 1105
1017#ifdef SELECTION_SCROLLING 1106#ifdef SELECTION_SCROLLING
1018void 1107void
1019rxvt_term::sel_scroll_cb (time_watcher &w) 1108rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1020{ 1109{
1021 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1110 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1022 { 1111 {
1023 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1112 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1024 refresh_type |= SMOOTH_REFRESH;
1025 want_refresh = 1; 1113 want_refresh = 1;
1026 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1114 refresh_check ();
1027 } 1115 }
1116 else
1117 w.stop ();
1028} 1118}
1029#endif 1119#endif
1030 1120
1031#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1121#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1032void 1122void
1033rxvt_term::slip_wheel_cb (time_watcher &w) 1123rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1034{ 1124{
1035 if (mouse_slip_wheel_speed == 0 1125 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1036 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1037 : scr_page (UP, mouse_slip_wheel_speed))
1038 { 1126 {
1039 if (view_start == nsaved ||
1040 view_start == 0)
1041 mouse_slip_wheel_speed = 0;
1042
1043 refresh_type |= SMOOTH_REFRESH;
1044 want_refresh = 1; 1127 want_refresh = 1;
1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1128 refresh_check ();
1129 }
1130
1131 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1046 } 1132 {
1133 mouse_slip_wheel_speed = 0;
1134 w.stop ();
1135 }
1047} 1136}
1137#endif
1138
1139#if LINUX_YIELD_HACK
1140static struct event_handler
1141{
1142 ev::prepare yield_ev;
1143
1144 void yield_cb (ev::prepare &w, int revents)
1145 {
1146 // this should really be sched_yield(), but the linux guys thought
1147 // 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
1149 // allowed by the sus... as is returning ENOSYS.
1150
1151 struct timespec ts = { 0, 0 };
1152 nanosleep (&ts, 0);
1153
1154 w.stop ();
1155 }
1156
1157 event_handler ()
1158 : yield_ev (this, &event_handler::yield_cb)
1159 {
1160 }
1161} event_handler;
1048#endif 1162#endif
1049 1163
1050bool 1164bool
1051rxvt_term::pty_fill () 1165rxvt_term::pty_fill ()
1052{ 1166{
1053 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1167 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1054 1168
1055 if (CBUFSIZ == n) 1169 if (CBUFSIZ == n)
1056 { 1170 {
1057 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1171 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1058 n = 0; 1172 n = 0;
1059 } 1173 }
1060 1174
1061 memmove (cmdbuf_base, cmdbuf_ptr, n); 1175 memmove (cmdbuf_base, cmdbuf_ptr, n);
1062 cmdbuf_ptr = cmdbuf_base; 1176 cmdbuf_ptr = cmdbuf_base;
1063 cmdbuf_endp = cmdbuf_ptr + n; 1177 cmdbuf_endp = cmdbuf_ptr + n;
1064 1178
1065 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1179 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1066 1180
1067 if (n > 0) 1181 if (r > 0)
1068 { 1182 {
1069 cmdbuf_endp += n; 1183 cmdbuf_endp += r;
1070 return true; 1184 return true;
1071 } 1185 }
1072 else if (n < 0 && errno != EAGAIN && errno != EINTR) 1186 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1187 {
1188#if LINUX_YIELD_HACK
1189 if (display->is_local)
1190 event_handler.yield_ev.start ();
1191#endif
1192 }
1193 else
1194 {
1073 pty_ev.stop (); 1195 pty_ev.stop ();
1074 1196
1197 if (!option (Opt_hold))
1198 destroy ();
1199 }
1200
1075 return false; 1201 return false;
1076} 1202}
1077 1203
1078void 1204void
1079rxvt_term::pty_cb (io_watcher &w, short revents) 1205rxvt_term::pty_cb (ev::io &w, int revents)
1080{ 1206{
1081 SET_R (this); 1207 make_current ();
1082 SET_LOCALE (locale);
1083 1208
1084 if (revents & EVENT_READ) 1209 if (revents & ev::READ)
1085 // loop, but don't allow a single term to monopolize us 1210 // loop, but don't allow a single term to monopolize us
1086 while (pty_fill ()) 1211 while (pty_fill ())
1087 if (cmd_parse ()) 1212 if (cmd_parse ())
1088 break; 1213 break;
1089 1214
1090 if (revents & EVENT_WRITE) 1215 if (revents & ev::WRITE)
1091 pty_write (); 1216 pty_write ();
1217
1218 refresh_check ();
1092} 1219}
1093 1220
1094void 1221void
1095rxvt_term::pointer_unblank () 1222rxvt_term::pointer_unblank ()
1096{ 1223{
1097 XDefineCursor (display->display, vt, TermWin_cursor); 1224 XDefineCursor (dpy, vt, TermWin_cursor);
1098 recolour_cursor (); 1225 recolour_cursor ();
1099 1226
1100#ifdef POINTER_BLANK 1227#ifdef POINTER_BLANK
1101 hidden_pointer = 0; 1228 hidden_pointer = 0;
1102 1229
1103 if (options & Opt_pointerBlank) 1230 if (option (Opt_pointerBlank))
1104 pointer_ev.start (NOW + pointerBlankDelay); 1231 pointer_ev.start (pointerBlankDelay);
1105#endif 1232#endif
1106} 1233}
1107 1234
1108#ifdef POINTER_BLANK 1235#ifdef POINTER_BLANK
1109void 1236void
1110rxvt_term::pointer_blank () 1237rxvt_term::pointer_blank ()
1111{ 1238{
1112 if (! (options & Opt_pointerBlank)) 1239 if (!option (Opt_pointerBlank))
1113 return; 1240 return;
1114 1241
1115 XDefineCursor (display->display, vt, display->blank_cursor); 1242 XDefineCursor (dpy, vt, display->blank_cursor);
1116 XFlush (display->display); 1243 XFlush (dpy);
1117 1244
1118 hidden_pointer = 1; 1245 hidden_pointer = 1;
1119} 1246}
1120 1247
1121void 1248void
1122rxvt_term::pointer_cb (time_watcher &w) 1249rxvt_term::pointer_cb (ev::timer &w, int revents)
1123{ 1250{
1124 SET_R (this); 1251 make_current ();
1125 SET_LOCALE (locale);
1126 1252
1127 pointer_blank (); 1253 pointer_blank ();
1128} 1254}
1129#endif 1255#endif
1130 1256
1131void 1257void
1132rxvt_term::mouse_report (XButtonEvent &ev) 1258rxvt_term::mouse_report (XButtonEvent &ev)
1133{ 1259{
1134 int button_number, key_state = 0; 1260 int button_number, key_state = 0;
1135 int x, y; 1261 int x, y;
1262 int code = 32;
1136 1263
1137 x = ev.x; 1264 x = Pixel2Col (ev.x);
1138 y = ev.y; 1265 y = Pixel2Row (ev.y);
1139 pixel_position (&x, &y); 1266 if (ev.type == MotionNotify)
1267 {
1268 if (x == mouse_row && y == mouse_col)
1269 return;
1270 mouse_row = x;
1271 mouse_col = y;
1272 code += 32;
1273 }
1140 1274
1141 if (MEvent.button == AnyButton) 1275 if (MEvent.button == AnyButton)
1142 button_number = 3; 1276 button_number = 3;
1143 else 1277 else
1144 { 1278 {
… …
1190 x + 1, 1324 x + 1,
1191 y + 1); 1325 y + 1);
1192#endif 1326#endif
1193 1327
1194 tt_printf ("\033[M%c%c%c", 1328 tt_printf ("\033[M%c%c%c",
1195 (32 + button_number + key_state), 1329 (code + button_number + key_state),
1196 (32 + x + 1), 1330 (32 + x + 1),
1197 (32 + y + 1)); 1331 (32 + y + 1));
1198} 1332}
1199
1200#ifdef USING_W11LIB
1201void
1202rxvt_W11_process_x_event (XEvent *ev)
1203{
1204 rxvt_t *r = rxvt_get_r ();
1205
1206 x_cb (*ev);
1207}
1208#endif
1209 1333
1210/*{{{ process an X event */ 1334/*{{{ process an X event */
1211void 1335void
1212rxvt_term::x_cb (XEvent &ev) 1336rxvt_term::x_cb (XEvent &ev)
1213{ 1337{
1214 dDisp; 1338 make_current ();
1215 1339
1216 SET_R (this); 1340 dLocal (Display *, dpy);
1217 SET_LOCALE (locale);
1218 1341
1219#if defined(CURSOR_BLINK) 1342 if (ev.xany.window == vt
1220 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1343 && SHOULD_INVOKE (HOOK_X_EVENT)
1221 { 1344 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1222 if (hidden_cursor) 1345 return;
1223 {
1224 hidden_cursor = 0;
1225 want_refresh = 1;
1226 }
1227 1346
1228 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1347 // for XQueryPointer
1229 }
1230#endif
1231
1232#if defined(POINTER_BLANK)
1233 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1234 {
1235 if (ev.type == MotionNotify
1236 || ev.type == ButtonPress
1237 || ev.type == ButtonRelease)
1238 if (hidden_pointer)
1239 pointer_unblank ();
1240
1241 if (ev.type == KeyPress && hidden_pointer == 0)
1242 pointer_blank ();
1243 }
1244#endif
1245
1246 Window unused_root, unused_child; 1348 Window unused_root, unused_child;
1247 int unused_root_x, unused_root_y; 1349 int unused_root_x, unused_root_y;
1248 unsigned int unused_mask; 1350 unsigned int unused_mask;
1249 1351
1250 switch (ev.type) 1352 switch (ev.type)
1251 { 1353 {
1252 case KeyPress: 1354 case KeyPress:
1253#if ISO_14755 1355 key_press (ev.xkey);
1254 if (!(iso14755buf & ISO_14755_52))
1255#endif
1256 lookup_key (ev.xkey);
1257
1258 break; 1356 break;
1259 1357
1260 case KeyRelease: 1358 case KeyRelease:
1261 { 1359 key_release (ev.xkey);
1262#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1263 KeySym ks;
1264
1265 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1266#endif
1267
1268#if ENABLE_FRILLS || ISO_14755
1269 // ISO 14755 support
1270 if (iso14755buf)
1271 if (iso14755buf & ISO_14755_52)
1272 {
1273# if ENABLE_OVERLAY
1274 scr_overlay_off ();
1275# endif
1276# if ISO_14755
1277 // iso14755 part 5.2 handling: release time
1278 // first: controls
1279 if ((ev.xkey.state & ControlMask)
1280 && ((ks >= 0x40 && ks <= 0x5f)
1281 || (ks >= 0x61 && ks <= 0x7f)))
1282 {
1283 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1284 commit_iso14755 ();
1285 return; // case-break;
1286 }
1287
1288 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1289 if (i[0] == ks)
1290 {
1291 iso14755buf = ISO_14755_51 | i[1];
1292 commit_iso14755 ();
1293 return; // case-break;
1294 }
1295
1296 scr_bell ();
1297# endif
1298 iso14755buf = 0;
1299 break;
1300 }
1301 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1302 {
1303# if ENABLE_OVERLAY
1304 scr_overlay_off ();
1305# endif
1306 if (iso14755buf & ISO_14755_51)
1307 commit_iso14755 ();
1308#if ISO_14755
1309 else if (iso14755buf & ISO_14755_STARTED)
1310 {
1311 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1312
1313 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1314 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1315 }
1316# endif
1317 else
1318 iso14755buf = 0;
1319 }
1320#endif
1321
1322#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1323 if (!(ev.xkey.state & ControlMask))
1324 slip_wheel_ev.stop ();
1325 else if (ks == XK_Control_L || ks == XK_Control_R)
1326 mouse_slip_wheel_speed = 0;
1327#endif
1328 break; 1360 break;
1329 }
1330 1361
1331 case ButtonPress: 1362 case ButtonPress:
1332 button_press (ev.xbutton); 1363 button_press (ev.xbutton);
1333 break; 1364 break;
1334 1365
… …
1336 button_release (ev.xbutton); 1367 button_release (ev.xbutton);
1337 break; 1368 break;
1338 1369
1339 case ClientMessage: 1370 case ClientMessage:
1340 if (ev.xclient.format == 32 1371 if (ev.xclient.format == 32
1341 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1372 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1342 { 1373 {
1374 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1375 {
1376 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1377 {
1343 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1378 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1379 {
1380 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1344 destroy (); 1381 destroy ();
1382 }
1345#if ENABLE_EWMH 1383#if ENABLE_EWMH
1346 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1384 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1347 XSendEvent (disp, ev.xclient.window = display->root, 1385 XSendEvent (dpy, ev.xclient.window = display->root,
1348 False, SubstructureRedirectMask | SubstructureNotifyMask, 1386 False, SubstructureRedirectMask | SubstructureNotifyMask,
1349 &ev); 1387 &ev);
1388#endif
1389 }
1390 }
1391#if ENABLE_XEMBED
1392 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1393 {
1394 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1395 focus_in ();
1396 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1397 focus_out ();
1398 }
1350#endif 1399#endif
1351 } 1400 }
1352#if ENABLE_XEMBED
1353 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1354 {
1355 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1356 focus_in ();
1357 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1358 focus_out ();
1359 }
1360#endif
1361#ifdef OFFIX_DND
1362 /* OffiX Dnd (drag 'n' drop) protocol */
1363 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1364 && (ev.xclient.data.l[0] == DndFile
1365 || ev.xclient.data.l[0] == DndDir
1366 || ev.xclient.data.l[0] == DndLink))
1367 {
1368 /* Get Dnd data */
1369 Atom ActualType;
1370 int ActualFormat;
1371 unsigned char *data;
1372 unsigned long Size, RemainingBytes;
1373
1374 XGetWindowProperty (disp, display->root,
1375 xa[XA_DNDSELECTION],
1376 0L, 1000000L,
1377 False, AnyPropertyType,
1378 &ActualType, &ActualFormat,
1379 &Size, &RemainingBytes,
1380 &data);
1381 set_string_property (XA_CUT_BUFFER0, data);
1382 XFree (data);
1383 selection_paste (display->root, XA_CUT_BUFFER0, true);
1384 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1385 }
1386#endif /* OFFIX_DND */
1387 break;
1388
1389 case MappingNotify:
1390 XRefreshKeyboardMapping (&ev.xmapping);
1391 break; 1401 break;
1392 1402
1393 /* 1403 /*
1394 * XXX: this is not the _current_ arrangement 1404 * XXX: this is not the _current_ arrangement
1395 * Here's my conclusion: 1405 * Here's my conclusion:
… …
1414 break; 1424 break;
1415 } 1425 }
1416 break; 1426 break;
1417 1427
1418 case FocusIn: 1428 case FocusIn:
1429 if (ev.xfocus.detail != NotifyInferior
1430 && ev.xfocus.detail != NotifyPointer
1431 && ev.xfocus.mode != NotifyGrab)
1419 focus_in (); 1432 focus_in ();
1420 break; 1433 break;
1421 1434
1422 case FocusOut: 1435 case FocusOut:
1436 if (ev.xfocus.detail != NotifyInferior
1437 && ev.xfocus.detail != NotifyPointer
1438 && ev.xfocus.mode != NotifyGrab)
1423 focus_out (); 1439 focus_out ();
1424 break; 1440 break;
1425 1441
1426 case ConfigureNotify: 1442 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);*/
1427 if (ev.xconfigure.window == parent[0]) 1446 if (ev.xconfigure.window == parent[0])
1428 { 1447 {
1429 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1430 ; 1449 ;
1431 1450
1432 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1451 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1433 { 1452 {
1434 seen_resize = 1; 1453 seen_resize = 1;
1435 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1454 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1436 } 1455 }
1437 1456 else
1438#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1457 {
1439 if (options & Opt_transparent) 1458#ifdef HAVE_BG_PIXMAP
1440 check_our_parents (); 1459 if (bgPixmap.window_position_sensitive ())
1460 {
1461 if (mapped)
1462 update_background ();
1463 else
1464 bgPixmap.invalidate ();
1465 }
1441#endif 1466#endif
1467 }
1468
1469 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1442 } 1470 }
1443 break; 1471 break;
1444 1472
1445 case PropertyNotify: 1473 case PropertyNotify:
1474 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1446 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1475 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1447 && ev.xproperty.state == PropertyNewValue) 1476 && ev.xproperty.state == PropertyNewValue)
1448 selection_property (ev.xproperty.window, ev.xproperty.atom); 1477 selection_property (ev.xproperty.window, ev.xproperty.atom);
1449 1478
1450 break; 1479 break;
1451 1480
1452 case SelectionClear: 1481 case SelectionClear:
1453 selection_clear (); 1482 selection_clear ();
… …
1458 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1487 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1459 break; 1488 break;
1460 1489
1461 case SelectionRequest: 1490 case SelectionRequest:
1462 selection_send (ev.xselectionrequest); 1491 selection_send (ev.xselectionrequest);
1492 break;
1493
1494 case MapNotify:
1495#ifdef HAVE_BG_PIXMAP
1496 /* This is needed spcifically to fix the case of no window manager or a
1497 * non-reparenting window manager. In those cases we never get first
1498 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1499 * care of multiplicity of ConfigureNotify events arriwing while WM does
1500 * reparenting.
1501 * We should not render background immidiately, as there could be several
1502 * 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
1504 * bit of time for ConfigureNotifies to arrive.
1505 * We should render background PRIOR to drawing any text, but AFTER all
1506 * of ConfigureNotifys for the best results.
1507 */
1508 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1509 update_background_ev.start (0.025);
1510#endif
1511 mapped = 1;
1512#ifdef TEXT_BLINK
1513 text_blink_ev.start ();
1514#endif
1515 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1463 break; 1516 break;
1464 1517
1465 case UnmapNotify: 1518 case UnmapNotify:
1466 mapped = 0; 1519 mapped = 0;
1467#ifdef TEXT_BLINK 1520#ifdef TEXT_BLINK
1468 text_blink_ev.stop (); 1521 text_blink_ev.stop ();
1469#endif 1522#endif
1523 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1470 break; 1524 break;
1471
1472 case MapNotify:
1473 mapped = 1;
1474#ifdef TEXT_BLINK
1475 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1476#endif
1477 break;
1478
1479#ifdef TRANSPARENT
1480 case ReparentNotify:
1481 rootwin_cb (ev);
1482 break;
1483#endif /* TRANSPARENT */
1484 1525
1485 case GraphicsExpose: 1526 case GraphicsExpose:
1486 case Expose: 1527 case Expose:
1487 if (ev.xany.window == vt) 1528 if (ev.xany.window == vt)
1488 { 1529 {
1489 do 1530 do
1531 {
1490 scr_expose (ev.xexpose.x, ev.xexpose.y, 1532 scr_expose (ev.xexpose.x, ev.xexpose.y,
1491 ev.xexpose.width, ev.xexpose.height, False); 1533 ev.xexpose.width, ev.xexpose.height, False);
1534 }
1492 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1535 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1493 1536
1494 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1537 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1495 1538
1496 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1540 {
1497 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1498 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, False);
1543 }
1499 1544
1500 scr_refresh (refresh_type); 1545 want_refresh = 1;
1501 } 1546 }
1502 else 1547 else
1503 { 1548 {
1504 XEvent unused_event; 1549 XEvent unused_event;
1505 1550
1506 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1551 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1507 ; 1552 ;
1508 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1509 ; 1554 ;
1510 1555
1511 if (isScrollbarWindow (ev.xany.window)) 1556 if (scrollBar.state && ev.xany.window == scrollBar.win)
1512 { 1557 {
1513 scrollBar.setIdle (); 1558 scrollBar.state = STATE_IDLE;
1514 scrollbar_show (0); 1559 scrollbar_show (0);
1515 } 1560 }
1516#ifdef MENUBAR
1517 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1518 menubar_expose ();
1519#endif
1520
1521#ifdef TRANSPARENT
1522 if (am_transparent && ev.xany.window == parent[0])
1523 XClearWindow (disp, ev.xany.window);
1524#endif
1525 } 1561 }
1526 break; 1562 break;
1527 1563
1528 case MotionNotify: 1564 case MotionNotify:
1529#ifdef POINTER_BLANK 1565#ifdef POINTER_BLANK
1530 if (hidden_pointer) 1566 if (hidden_pointer)
1531 pointer_unblank (); 1567 pointer_unblank ();
1532#endif 1568#endif
1533#if MENUBAR 1569 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1534 if (isMenuBarWindow (ev.xany.window)) 1570 || priv_modes & PrivMode_MouseAnyEvent)
1535 {
1536 menubar_control (ev.xbutton); 1571 mouse_report (ev.xbutton);
1537 break;
1538 }
1539#endif
1540 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1572 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1541 break; 1573 break;
1542 1574
1543 if (ev.xany.window == vt) 1575 if (ev.xany.window == vt)
1544 { 1576 {
1577 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1578 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1579 ; // nop
1545 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1580 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1546 { 1581 {
1547 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1582 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1548 ; 1583 ;
1549 1584
1550 XQueryPointer (disp, vt, 1585 XQueryPointer (dpy, vt,
1551 &unused_root, &unused_child, 1586 &unused_root, &unused_child,
1552 &unused_root_x, &unused_root_y, 1587 &unused_root_x, &unused_root_y,
1553 &ev.xbutton.x, &ev.xbutton.y, 1588 &ev.xbutton.x, &ev.xbutton.y,
1554 &ev.xbutton.state); 1589 &ev.xbutton.state);
1555#ifdef MOUSE_THRESHOLD 1590#ifdef MOUSE_THRESHOLD
… …
1575 int dist; 1610 int dist;
1576 1611
1577 /* don't clobber the current delay if we are 1612 /* don't clobber the current delay if we are
1578 * already in the middle of scrolling. 1613 * already in the middle of scrolling.
1579 */ 1614 */
1580 if (!sel_scroll_ev.active) 1615 if (!sel_scroll_ev.is_active ())
1581 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1616 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1582 1617
1583 /* save the event params so we can highlight 1618 /* save the event params so we can highlight
1584 * the selection in the pending-scroll loop 1619 * the selection in the pending-scroll loop
1585 */ 1620 */
1586 selection_save_x = ev.xbutton.x; 1621 selection_save_x = ev.xbutton.x;
… …
1608 else 1643 else
1609 { 1644 {
1610 /* we are within the text window, so we 1645 /* we are within the text window, so we
1611 * shouldn't be scrolling 1646 * shouldn't be scrolling
1612 */ 1647 */
1613 if (sel_scroll_ev.active)
1614 sel_scroll_ev.stop(); 1648 sel_scroll_ev.stop();
1615 } 1649 }
1616#endif 1650#endif
1617#ifdef MOUSE_THRESHOLD 1651#ifdef MOUSE_THRESHOLD
1618 } 1652 }
1619#endif 1653#endif
1620 } 1654 }
1621 } 1655 }
1622 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1656 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1623 { 1657 {
1624 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1625 MotionNotify, &ev)) 1659 MotionNotify, &ev))
1626 ; 1660 ;
1627 1661
1628 XQueryPointer (disp, scrollBar.win, 1662 XQueryPointer (dpy, scrollBar.win,
1629 &unused_root, &unused_child, 1663 &unused_root, &unused_child,
1630 &unused_root_x, &unused_root_y, 1664 &unused_root_x, &unused_root_y,
1631 &ev.xbutton.x, &ev.xbutton.y, 1665 &ev.xbutton.x, &ev.xbutton.y,
1632 &unused_mask); 1666 &unused_mask);
1633 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1667 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1634 scrollbar_size ()); 1668 scrollbar_size ());
1635 scr_refresh (refresh_type);
1636 refresh_limit = 0; 1669 want_refresh = 1;
1637 scrollbar_show (1); 1670 scrollbar_show (1);
1638 } 1671 }
1639 break; 1672 break;
1640 } 1673 }
1674
1675#if defined(CURSOR_BLINK)
1676 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1677 {
1678 if (hidden_cursor)
1679 {
1680 hidden_cursor = 0;
1681 want_refresh = 1;
1682 }
1683
1684 cursor_blink_ev.again ();
1685 }
1686#endif
1687
1688#if defined(POINTER_BLANK)
1689 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1690 {
1691 if (ev.type == MotionNotify
1692 || ev.type == ButtonPress
1693 || ev.type == ButtonRelease)
1694 if (hidden_pointer)
1695 pointer_unblank ();
1696
1697 if (ev.type == KeyPress && hidden_pointer == 0)
1698 pointer_blank ();
1699 }
1700#endif
1701
1702 refresh_check ();
1641} 1703}
1642 1704
1643void 1705void
1644rxvt_term::focus_in () 1706rxvt_term::focus_in ()
1645{ 1707{
1646 if (!focus) 1708 if (!focus)
1647 { 1709 {
1648 focus = 1; 1710 focus = 1;
1649 want_refresh = 1; 1711 want_refresh = 1;
1712
1713 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1714
1650#if USE_XIM 1715#if USE_XIM
1651 if (Input_Context != NULL) 1716 if (Input_Context != NULL)
1652 { 1717 {
1653 IMSetStatusPosition (); 1718 IMSetPosition ();
1654 XSetICFocus (Input_Context); 1719 XSetICFocus (Input_Context);
1655 } 1720 }
1656#endif 1721#endif
1657#if CURSOR_BLINK 1722#if CURSOR_BLINK
1658 if (options & Opt_cursorBlink) 1723 if (option (Opt_cursorBlink))
1659 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1724 cursor_blink_ev.again ();
1660#endif 1725#endif
1661#if OFF_FOCUS_FADING 1726#if OFF_FOCUS_FADING
1662 if (rs[Rs_fade]) 1727 if (rs[Rs_fade])
1663 { 1728 {
1664 pix_colors = pix_colors_focused; 1729 pix_colors = pix_colors_focused;
1665 scr_recolour (); 1730 scr_recolour ();
1666 } 1731 }
1667#endif 1732#endif
1733#if ENABLE_FRILLS
1734 if (option (Opt_urgentOnBell))
1735 {
1736 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1737 {
1738 h->flags &= ~XUrgencyHint;
1739 XSetWMHints (dpy, parent[0], h);
1740 }
1741 }
1742#endif
1668 } 1743 }
1669} 1744}
1670 1745
1671void 1746void
1672rxvt_term::focus_out () 1747rxvt_term::focus_out ()
… …
1674 if (focus) 1749 if (focus)
1675 { 1750 {
1676 focus = 0; 1751 focus = 0;
1677 want_refresh = 1; 1752 want_refresh = 1;
1678 1753
1754 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1755
1679#if ENABLE_FRILLS || ISO_14755 1756#if ENABLE_FRILLS || ISO_14755
1757 if (iso14755buf)
1758 {
1680 iso14755buf = 0; 1759 iso14755buf = 0;
1681#endif 1760# if ISO_14755
1682#if ENABLE_OVERLAY
1683 scr_overlay_off (); 1761 scr_overlay_off ();
1762# endif
1763 }
1684#endif 1764#endif
1685#if USE_XIM 1765#if USE_XIM
1686 if (Input_Context != NULL) 1766 if (Input_Context != NULL)
1687 XUnsetICFocus (Input_Context); 1767 XUnsetICFocus (Input_Context);
1688#endif 1768#endif
1689#if CURSOR_BLINK 1769#if CURSOR_BLINK
1690 if (options & Opt_cursorBlink) 1770 if (option (Opt_cursorBlink))
1691 cursor_blink_ev.stop (); 1771 cursor_blink_ev.stop ();
1772
1692 hidden_cursor = 0; 1773 hidden_cursor = 0;
1693#endif 1774#endif
1694#if OFF_FOCUS_FADING 1775#if OFF_FOCUS_FADING
1695 if (rs[Rs_fade]) 1776 if (rs[Rs_fade])
1696 { 1777 {
… …
1699 } 1780 }
1700#endif 1781#endif
1701 } 1782 }
1702} 1783}
1703 1784
1704#if TRANSPARENT 1785void
1786rxvt_term::update_fade_color (unsigned int idx)
1787{
1788#if OFF_FOCUS_FADING
1789 if (rs[Rs_fade])
1790 {
1791 rgba c;
1792 pix_colors [Color_fade].get (c);
1793 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1794 }
1795#endif
1796}
1797
1798#if ENABLE_TRANSPARENCY || ENABLE_PERL
1705void 1799void
1706rxvt_term::rootwin_cb (XEvent &ev) 1800rxvt_term::rootwin_cb (XEvent &ev)
1707{ 1801{
1708 SET_R (this); 1802 make_current ();
1709 SET_LOCALE (locale);
1710 1803
1804 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1805 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1806 return;
1807
1808# if ENABLE_TRANSPARENCY
1711 switch (ev.type) 1809 switch (ev.type)
1712 { 1810 {
1713 case PropertyNotify: 1811 case PropertyNotify:
1714 /* 1812 /*
1715 * if user used some Esetroot compatible prog to set the root bg, 1813 * if user used some Esetroot compatible prog to set the root bg,
1716 * use the property to determine the pixmap. We use it later on. 1814 * use the property to determine the pixmap. We use it later on.
1717 */ 1815 */
1718 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1816 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1719 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1817 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1720 return; 1818 {
1819 bgPixmap.set_root_pixmap ();
1820 update_background ();
1821 }
1721 1822
1722 /* FALLTHROUGH */
1723 case ReparentNotify:
1724 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1725 want_refresh = want_full_refresh = 1;
1726 break; 1823 break;
1727 } 1824 }
1825# endif
1826
1827 refresh_check ();
1728} 1828}
1729#endif 1829#endif
1730 1830
1731void 1831void
1732rxvt_term::button_press (XButtonEvent &ev) 1832rxvt_term::button_press (XButtonEvent &ev)
1733{ 1833{
1734 int reportmode = 0, clickintime; 1834 int reportmode = 0, clickintime;
1735 1835
1736 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1836 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1837
1737 if (!bypass_keystate) 1838 if (!bypass_keystate)
1738 reportmode = !! (priv_modes & PrivMode_mouse_report); 1839 reportmode = !! (priv_modes & PrivMode_mouse_report);
1739 1840
1740 /* 1841 /*
1741 * VT window processing of button press 1842 * VT window processing of button press
1742 */ 1843 */
1743 if (ev.window == vt) 1844 if (ev.window == vt)
1744 { 1845 {
1846 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1847 return;
1848
1745#if ISO_14755 1849#if ISO_14755
1746 // 5.4 1850 // 5.4
1747 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1851 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1748 { 1852 {
1749 iso14755_54 (ev.x, ev.y); 1853 iso14755_54 (ev.x, ev.y);
… …
1761#ifdef MOUSE_REPORT_DOUBLECLICK 1865#ifdef MOUSE_REPORT_DOUBLECLICK
1762 if (ev.button == MEvent.button && clickintime) 1866 if (ev.button == MEvent.button && clickintime)
1763 { 1867 {
1764 /* same button, within alloted time */ 1868 /* same button, within alloted time */
1765 MEvent.clicks++; 1869 MEvent.clicks++;
1870
1766 if (MEvent.clicks > 1) 1871 if (MEvent.clicks > 1)
1767 { 1872 {
1768 /* only report double clicks */ 1873 /* only report double clicks */
1769 MEvent.clicks = 2; 1874 MEvent.clicks = 2;
1770 mouse_report (ev); 1875 mouse_report (ev);
… …
1782 mouse_report (ev); 1887 mouse_report (ev);
1783 } 1888 }
1784#else 1889#else
1785 MEvent.button = ev.button; 1890 MEvent.button = ev.button;
1786 mouse_report (ev); 1891 mouse_report (ev);
1787#endif /* MOUSE_REPORT_DOUBLECLICK */ 1892#endif /* MOUSE_REPORT_DOUBLECLICK */
1788 1893
1789 } 1894 }
1790 else 1895 else
1791 { 1896 {
1792 if (ev.button != MEvent.button) 1897 if (ev.button != MEvent.button)
… …
1802#else 1907#else
1803 selection.rect = false; 1908 selection.rect = false;
1804#endif 1909#endif
1805 1910
1806 /* allow shift+left click to extend selection */ 1911 /* allow shift+left click to extend selection */
1807 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1912 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1808 { 1913 {
1809 if (MEvent.button == Button1 && clickintime) 1914 if (MEvent.button == Button1 && clickintime)
1810 selection_rotate (ev.x, ev.y); 1915 selection_rotate (ev.x, ev.y);
1811 else 1916 else
1812 selection_extend (ev.x, ev.y, 1); 1917 selection_extend (ev.x, ev.y, 1);
… …
1840 } 1945 }
1841 1946
1842 /* 1947 /*
1843 * Scrollbar window processing of button press 1948 * Scrollbar window processing of button press
1844 */ 1949 */
1845 if (isScrollbarWindow (ev.window)) 1950 if (scrollBar.state && ev.window == scrollBar.win)
1846 { 1951 {
1847 scrollBar.setIdle (); 1952 page_dirn direction = NO_DIR;
1953
1954 if (scrollBar.upButton (ev.y))
1955 direction = UP; /* up */
1956 else if (scrollBar.dnButton (ev.y))
1957 direction = DN; /* down */
1958
1959 scrollBar.state = STATE_IDLE;
1848 /* 1960 /*
1849 * Rxvt-style scrollbar: 1961 * Rxvt-style scrollbar:
1850 * move up if mouse is above slider 1962 * move up if mouse is above slider
1851 * move dn if mouse is below slider 1963 * move dn if mouse is below slider
1852 * 1964 *
… …
1861 /* 1973 /*
1862 * Mouse report disabled scrollbar: 1974 * Mouse report disabled scrollbar:
1863 * arrow buttons - send up/down 1975 * arrow buttons - send up/down
1864 * click on scrollbar - send pageup/down 1976 * click on scrollbar - send pageup/down
1865 */ 1977 */
1866 if ((scrollBar.style == R_SB_NEXT 1978 if (direction == UP)
1867 && scrollbarnext_upButton (ev.y))
1868 || (scrollBar.style == R_SB_RXVT
1869 && scrollbarrxvt_upButton (ev.y)))
1870 tt_printf ("\033[A"); 1979 tt_printf ("\033[A");
1871 else if ((scrollBar.style == R_SB_NEXT 1980 else if (direction == DN)
1872 && scrollbarnext_dnButton (ev.y))
1873 || (scrollBar.style == R_SB_RXVT
1874 && scrollbarrxvt_dnButton (ev.y)))
1875 tt_printf ("\033[B"); 1981 tt_printf ("\033[B");
1876 else 1982 else
1877 switch (ev.button) 1983 switch (ev.button)
1878 { 1984 {
1879 case Button2: 1985 case Button2:
… …
1886 tt_printf ("\033[5~"); 1992 tt_printf ("\033[5~");
1887 break; 1993 break;
1888 } 1994 }
1889 } 1995 }
1890 else 1996 else
1891#endif /* NO_SCROLLBAR_REPORT */ 1997#endif /* NO_SCROLLBAR_REPORT */
1892
1893 {
1894 char upordown = 0;
1895
1896 if (scrollBar.style == R_SB_NEXT)
1897 { 1998 {
1898 if (scrollbarnext_upButton (ev.y)) 1999 if (direction != NO_DIR)
1899 upordown = -1; /* up */
1900 else if (scrollbarnext_dnButton (ev.y))
1901 upordown = 1; /* down */
1902 }
1903 else if (scrollBar.style == R_SB_RXVT)
1904 {
1905 if (scrollbarrxvt_upButton (ev.y))
1906 upordown = -1; /* up */
1907 else if (scrollbarrxvt_dnButton (ev.y))
1908 upordown = 1; /* down */
1909 }
1910 if (upordown)
1911 { 2000 {
1912#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2001#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2002 if (!cont_scroll_ev.is_active ())
1913 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2003 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1914#endif 2004#endif
1915 if (scr_page (upordown < 0 ? UP : DN, 1)) 2005 if (scr_page (direction, 1))
1916 { 2006 {
1917 if (upordown < 0) 2007 if (direction == UP)
1918 scrollBar.setUp (); 2008 scrollBar.state = STATE_UP;
1919 else 2009 else
1920 scrollBar.setDn (); 2010 scrollBar.state = STATE_DOWN;
1921 } 2011 }
1922 } 2012 }
1923 else 2013 else
1924 switch (ev.button) 2014 switch (ev.button)
1925 { 2015 {
1926 case Button2: 2016 case Button2:
1927 switch (scrollbar_align) 2017 switch (scrollBar.align)
1928 { 2018 {
1929 case R_SB_ALIGN_TOP: 2019 case R_SB_ALIGN_TOP:
1930 csrO = 0; 2020 csrO = 0;
1931 break; 2021 break;
1932 case R_SB_ALIGN_CENTRE: 2022 case R_SB_ALIGN_CENTRE:
… …
1940 if (scrollBar.style == R_SB_XTERM 2030 if (scrollBar.style == R_SB_XTERM
1941 || scrollbar_above_slider (ev.y) 2031 || scrollbar_above_slider (ev.y)
1942 || scrollbar_below_slider (ev.y)) 2032 || scrollbar_below_slider (ev.y))
1943 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2033 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1944 2034
1945 scrollBar.setMotion (); 2035 scrollBar.state = STATE_MOTION;
1946 break; 2036 break;
1947 2037
1948 case Button1: 2038 case Button1:
1949 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2039 if (scrollBar.align == R_SB_ALIGN_CENTRE)
1950 csrO = ev.y - scrollBar.top; 2040 csrO = ev.y - scrollBar.top;
1951 /* FALLTHROUGH */ 2041 /* FALLTHROUGH */
1952 2042
1953 case Button3: 2043 case Button3:
1954 if (scrollBar.style != R_SB_XTERM) 2044 if (scrollBar.style != R_SB_XTERM)
… …
1964 scr_page (DN, nrow - 1); 2054 scr_page (DN, nrow - 1);
1965# else 2055# else
1966 scr_page (DN, nrow / 4); 2056 scr_page (DN, nrow / 4);
1967# endif 2057# endif
1968 else 2058 else
1969 scrollBar.setMotion (); 2059 scrollBar.state = STATE_MOTION;
1970 } 2060 }
1971 else 2061 else
1972 { 2062 {
1973 scr_page ((ev.button == Button1 ? DN : UP), 2063 scr_page ((ev.button == Button1 ? DN : UP),
1974 (nrow 2064 (nrow
… …
1977 } 2067 }
1978 2068
1979 break; 2069 break;
1980 } 2070 }
1981 } 2071 }
2072
1982 return; 2073 return;
1983 } 2074 }
1984#if MENUBAR
1985 /*
1986 * Menubar window processing of button press
1987 */
1988 if (isMenuBarWindow (ev.window))
1989 menubar_control (ev);
1990#endif
1991} 2075}
1992 2076
1993void 2077void
1994rxvt_term::button_release (XButtonEvent &ev) 2078rxvt_term::button_release (XButtonEvent &ev)
1995{ 2079{
… …
1997 2081
1998 csrO = 0; /* reset csr Offset */ 2082 csrO = 0; /* reset csr Offset */
1999 if (!bypass_keystate) 2083 if (!bypass_keystate)
2000 reportmode = !! (priv_modes & PrivMode_mouse_report); 2084 reportmode = !! (priv_modes & PrivMode_mouse_report);
2001 2085
2002 if (scrollbar_isUpDn ()) 2086 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2003 { 2087 {
2004 scrollBar.setIdle (); 2088 scrollBar.state = STATE_IDLE;
2005 scrollbar_show (0); 2089 scrollbar_show (0);
2006#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2007 refresh_type &= ~SMOOTH_REFRESH;
2008#endif
2009 } 2090 }
2010 2091
2011#ifdef SELECTION_SCROLLING 2092#ifdef SELECTION_SCROLLING
2012 if (sel_scroll_ev.active)
2013 sel_scroll_ev.stop(); 2093 sel_scroll_ev.stop();
2014#endif 2094#endif
2015 2095
2016 if (ev.window == vt) 2096 if (ev.window == vt)
2017 { 2097 {
2098 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2099 return;
2100
2018#if ISO_14755 2101#if ISO_14755
2019 // 5.4 2102 // 5.4
2020 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2103 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2021 return; 2104 return;
2022#endif 2105#endif
2106
2023 if (reportmode) 2107 if (reportmode)
2024 { 2108 {
2025 /* mouse report from vt window */ 2109 /* mouse report from vt window */
2026 /* don't report release of wheel "buttons" */ 2110 /* don't report release of wheel "buttons" */
2027 if (ev.button >= 4) 2111 if (ev.button >= 4)
… …
2038 mouse_report (ev); 2122 mouse_report (ev);
2039 } 2123 }
2040#else /* MOUSE_REPORT_DOUBLECLICK */ 2124#else /* MOUSE_REPORT_DOUBLECLICK */
2041 MEvent.button = AnyButton; 2125 MEvent.button = AnyButton;
2042 mouse_report (ev); 2126 mouse_report (ev);
2043#endif /* MOUSE_REPORT_DOUBLECLICK */ 2127#endif /* MOUSE_REPORT_DOUBLECLICK */
2044 return; 2128 return;
2045 } 2129 }
2046 2130
2047 /* 2131 /*
2048 * dumb hack to compensate for the failure of click-and-drag 2132 * dumb hack to compensate for the failure of click-and-drag
… …
2057 { 2141 {
2058 case Button1: 2142 case Button1:
2059 case Button3: 2143 case Button3:
2060 selection_make (ev.time); 2144 selection_make (ev.time);
2061 break; 2145 break;
2146
2062 case Button2: 2147 case Button2:
2063 selection_request (ev.time, ev.x, ev.y); 2148 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2149 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2064 break; 2150 break;
2151
2065#ifdef MOUSE_WHEEL 2152#ifdef MOUSE_WHEEL
2066 case Button4: 2153 case Button4:
2067 case Button5: 2154 case Button5:
2068 { 2155 {
2069 int i; 2156 int i;
… …
2071 2158
2072 v = ev.button == Button4 ? UP : DN; 2159 v = ev.button == Button4 ? UP : DN;
2073 2160
2074 if (ev.state & ShiftMask) 2161 if (ev.state & ShiftMask)
2075 i = 1; 2162 i = 1;
2076 else if (options & Opt_mouseWheelScrollPage) 2163 else if (option (Opt_mouseWheelScrollPage))
2077 i = nrow - 1; 2164 i = nrow - 1;
2078 else 2165 else
2079 i = 5; 2166 i = 5;
2080 2167
2081# ifdef MOUSE_SLIP_WHEELING 2168# ifdef MOUSE_SLIP_WHEELING
… …
2083 { 2170 {
2084 mouse_slip_wheel_speed += v ? -1 : 1; 2171 mouse_slip_wheel_speed += v ? -1 : 1;
2085 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2172 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2086 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2173 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2087 2174
2088 if (slip_wheel_ev.at < NOW) 2175 if (!slip_wheel_ev.is_active ())
2089 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2176 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2090
2091 slip_wheel_ev.start ();
2092 } 2177 }
2093 else 2178 else
2179# endif
2094 { 2180 {
2095# endif
2096# ifdef JUMP_MOUSE_WHEEL
2097 scr_page (v, i); 2181 scr_page (v, i);
2098 scr_refresh (SMOOTH_REFRESH);
2099 scrollbar_show (1); 2182 scrollbar_show (1);
2100# else
2101 while (i--)
2102 {
2103 scr_page (v, 1);
2104 scr_refresh (SMOOTH_REFRESH);
2105 scrollbar_show (1);
2106 }
2107# endif
2108# ifdef MOUSE_SLIP_WHEELING
2109 } 2183 }
2110#endif
2111 } 2184 }
2112 break; 2185 break;
2113#endif 2186#endif
2114 } 2187 }
2115 } 2188 }
2116#ifdef MENUBAR
2117 else if (isMenuBarWindow (ev.window))
2118 menubar_control (ev);
2119#endif
2120} 2189}
2121
2122#ifdef TRANSPARENT
2123#if TINTING
2124/* taken from aterm-0.4.2 */
2125
2126typedef uint32_t RUINT32T;
2127
2128void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2129{
2130 int sh_r, sh_g, sh_b;
2131 RUINT32T mask_r, mask_g, mask_b;
2132 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2133 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2134 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2135 int i;
2136
2137 Visual *visual = display->visual;
2138
2139 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2140
2141 /* for convenience */
2142 mask_r = visual->red_mask;
2143 mask_g = visual->green_mask;
2144 mask_b = visual->blue_mask;
2145
2146 /* boring lookup table pre-initialization */
2147 switch (srcImage->bits_per_pixel) {
2148 case 15:
2149 if ((mask_r != 0x7c00) ||
2150 (mask_g != 0x03e0) ||
2151 (mask_b != 0x001f))
2152 return;
2153 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2154 lookup_r = lookup;
2155 lookup_g = lookup+32;
2156 lookup_b = lookup+32+32;
2157 sh_r = 10;
2158 sh_g = 5;
2159 sh_b = 0;
2160 break;
2161 case 16:
2162 if ((mask_r != 0xf800) ||
2163 (mask_g != 0x07e0) ||
2164 (mask_b != 0x001f))
2165 return;
2166 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2167 lookup_r = lookup;
2168 lookup_g = lookup+32;
2169 lookup_b = lookup+32+64;
2170 sh_r = 11;
2171 sh_g = 5;
2172 sh_b = 0;
2173 break;
2174 case 24:
2175 if ((mask_r != 0xff0000) ||
2176 (mask_g != 0x00ff00) ||
2177 (mask_b != 0x0000ff))
2178 return;
2179 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2180 lookup_r = lookup;
2181 lookup_g = lookup+256;
2182 lookup_b = lookup+256+256;
2183 sh_r = 16;
2184 sh_g = 8;
2185 sh_b = 0;
2186 break;
2187 case 32:
2188 if ((mask_r != 0xff0000) ||
2189 (mask_g != 0x00ff00) ||
2190 (mask_b != 0x0000ff))
2191 return;
2192 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2193 lookup_r = lookup;
2194 lookup_g = lookup+256;
2195 lookup_b = lookup+256+256;
2196 sh_r = 16;
2197 sh_g = 8;
2198 sh_b = 0;
2199 break;
2200 default:
2201 return; /* we do not support this color depth */
2202 }
2203
2204 /* prepare limits for color transformation (each channel is handled separately) */
2205 if (shade < 0) {
2206 shade = -shade;
2207 if (shade < 0) shade = 0;
2208 if (shade > 100) shade = 100;
2209
2210 lower_lim_r = 65535-rm;
2211 lower_lim_g = 65535-gm;
2212 lower_lim_b = 65535-bm;
2213
2214 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2215 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2216 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2217
2218 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2219 } else {
2220 if (shade < 0) shade = 0;
2221 if (shade > 100) shade = 100;
2222
2223 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2224
2225 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2226 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2227 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2228 }
2229
2230 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2231 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2232 {
2233 unsigned int tmp;
2234
2235 tmp = lower_lim_r;
2236 lower_lim_r = lower_lim_b;
2237 lower_lim_b = tmp;
2238
2239 tmp = upper_lim_r;
2240 upper_lim_r = upper_lim_b;
2241 upper_lim_b = tmp;
2242 }
2243
2244 /* fill our lookup tables */
2245 for (i = 0; i <= mask_r>>sh_r; i++)
2246 {
2247 RUINT32T tmp;
2248 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2249 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2250 lookup_r[i] = (tmp/65535)<<sh_r;
2251 }
2252 for (i = 0; i <= mask_g>>sh_g; i++)
2253 {
2254 RUINT32T tmp;
2255 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2256 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2257 lookup_g[i] = (tmp/65535)<<sh_g;
2258 }
2259 for (i = 0; i <= mask_b>>sh_b; i++)
2260 {
2261 RUINT32T tmp;
2262 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2263 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2264 lookup_b[i] = (tmp/65535)<<sh_b;
2265 }
2266
2267 /* apply table to input image (replacing colors by newly calculated ones) */
2268 switch (srcImage->bits_per_pixel)
2269 {
2270 case 15:
2271 {
2272 unsigned short *p1, *pf, *p, *pl;
2273 p1 = (unsigned short *) srcImage->data;
2274 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2275 while (p1 < pf)
2276 {
2277 p = p1;
2278 pl = p1 + srcImage->width;
2279 for (; p < pl; p++)
2280 {
2281 *p = lookup_r[(*p & 0x7c00)>>10] |
2282 lookup_g[(*p & 0x03e0)>> 5] |
2283 lookup_b[(*p & 0x001f)];
2284 }
2285 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2286 }
2287 break;
2288 }
2289 case 16:
2290 {
2291 unsigned short *p1, *pf, *p, *pl;
2292 p1 = (unsigned short *) srcImage->data;
2293 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2294 while (p1 < pf)
2295 {
2296 p = p1;
2297 pl = p1 + srcImage->width;
2298 for (; p < pl; p++)
2299 {
2300 *p = lookup_r[(*p & 0xf800)>>11] |
2301 lookup_g[(*p & 0x07e0)>> 5] |
2302 lookup_b[(*p & 0x001f)];
2303 }
2304 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2305 }
2306 break;
2307 }
2308 case 24:
2309 {
2310 unsigned char *p1, *pf, *p, *pl;
2311 p1 = (unsigned char *) srcImage->data;
2312 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2313 while (p1 < pf)
2314 {
2315 p = p1;
2316 pl = p1 + srcImage->width * 3;
2317 for (; p < pl; p += 3)
2318 {
2319 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2320 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2321 p[2] = lookup_r[(p[2] & 0x0000ff)];
2322 }
2323 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2324 }
2325 break;
2326 }
2327 case 32:
2328 {
2329 RUINT32T *p1, *pf, *p, *pl;
2330 p1 = (RUINT32T *) srcImage->data;
2331 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2332
2333 while (p1 < pf)
2334 {
2335 p = p1;
2336 pl = p1 + srcImage->width;
2337 for (; p < pl; p++)
2338 {
2339 *p = lookup_r[(*p & 0xff0000)>>16] |
2340 lookup_g[(*p & 0x00ff00)>> 8] |
2341 lookup_b[(*p & 0x0000ff)] |
2342 (*p & ~0xffffff);
2343 }
2344 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2345 }
2346 break;
2347 }
2348 }
2349
2350 free (lookup);
2351}
2352#endif
2353
2354/*
2355 * Check our parents are still who we think they are.
2356 * Do transparency updates if required
2357 */
2358int
2359rxvt_term::check_our_parents ()
2360{
2361 int i, pchanged, aformat, have_pixmap, rootdepth;
2362 unsigned long nitems, bytes_after;
2363 Atom atype;
2364 unsigned char *prop = NULL;
2365 Window root, oldp, *list;
2366 Pixmap rootpixmap = None;
2367 XWindowAttributes wattr, wrootattr;
2368 dDisp;
2369
2370 pchanged = 0;
2371
2372 if (!(options & Opt_transparent))
2373 return pchanged; /* Don't try any more */
2374
2375 XGetWindowAttributes (disp, display->root, &wrootattr);
2376 rootdepth = wrootattr.depth;
2377
2378 XGetWindowAttributes (disp, parent[0], &wattr);
2379
2380 if (rootdepth != wattr.depth)
2381 {
2382 if (am_transparent)
2383 {
2384 pchanged = 1;
2385 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2386 am_transparent = am_pixmap_trans = 0;
2387 }
2388
2389 return pchanged; /* Don't try any more */
2390 }
2391
2392 /* Get all X ops out of the queue so that our information is up-to-date. */
2393 XSync (disp, False);
2394
2395 /*
2396 * Make the frame window set by the window manager have
2397 * the root background. Some window managers put multiple nested frame
2398 * windows for each client, so we have to take care about that.
2399 */
2400 i = (xa[XA_XROOTPMAP_ID]
2401 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2402 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2403 &nitems, &bytes_after, &prop) == Success);
2404
2405 if (!i || prop == NULL)
2406 i = (xa[XA_ESETROOT_PMAP_ID]
2407 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2408 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2409 &nitems, &bytes_after, &prop) == Success);
2410
2411 if (!i || prop == NULL
2412#if TINTING
2413 || !rs[Rs_color + Color_tint]
2414#endif
2415 )
2416 have_pixmap = 0;
2417 else
2418 {
2419 have_pixmap = 1;
2420 rootpixmap = *(Pixmap *)prop;
2421 XFree (prop);
2422 }
2423
2424 if (have_pixmap)
2425 {
2426 /*
2427 * Copy display->root pixmap transparency
2428 */
2429 int sx, sy, nx, ny;
2430 unsigned int nw, nh;
2431 Window cr;
2432 XImage *image;
2433 GC gc;
2434 XGCValues gcvalue;
2435
2436 XTranslateCoordinates (disp, parent[0], display->root,
2437 0, 0, &sx, &sy, &cr);
2438 nw = (unsigned int)szHint.width;
2439 nh = (unsigned int)szHint.height;
2440 nx = ny = 0;
2441
2442 if (sx < 0)
2443 {
2444 nw += sx;
2445 nx = -sx;
2446 sx = 0;
2447 }
2448
2449 if (sy < 0)
2450 {
2451 nh += sy;
2452 ny = -sy;
2453 sy = 0;
2454 }
2455
2456 min_it (nw, (unsigned int) (wrootattr.width - sx));
2457 min_it (nh, (unsigned int) (wrootattr.height - sy));
2458
2459 XSync (disp, False);
2460 allowedxerror = -1;
2461 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2462
2463 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2464 /* XXX: may need a delay here? */
2465 allowedxerror = 0;
2466
2467 if (image == NULL)
2468 {
2469 if (am_transparent && am_pixmap_trans)
2470 {
2471 pchanged = 1;
2472 if (pixmap != None)
2473 {
2474 XFreePixmap (disp, pixmap);
2475 pixmap = None;
2476 }
2477 }
2478
2479 am_pixmap_trans = 0;
2480 }
2481 else
2482 {
2483 if (pixmap != None)
2484 XFreePixmap (disp, pixmap);
2485
2486#if TINTING
2487 if (ISSET_PIXCOLOR (Color_tint))
2488 {
2489 unsigned short rm, gm, bm;
2490 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2491
2492 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2493
2494 ShadeXImage (display, image, shade, rm, gm, bm);
2495 }
2496#endif
2497
2498 pixmap = XCreatePixmap (disp, vt,
2499 szHint.width, szHint.height, image->depth);
2500 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2501 XPutImage (disp, pixmap, gc, image, 0, 0,
2502 nx, ny, image->width, image->height);
2503 XFreeGC (disp, gc);
2504 XDestroyImage (image);
2505 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2506 XClearWindow (disp, parent[0]);
2507
2508 if (!am_transparent || !am_pixmap_trans)
2509 pchanged = 1;
2510
2511 am_transparent = am_pixmap_trans = 1;
2512 }
2513 }
2514
2515 if (am_pixmap_trans)
2516 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2517 else
2518 {
2519 unsigned int n;
2520 /*
2521 * InheritPixmap transparency
2522 */
2523 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2524 {
2525 oldp = parent[i];
2526 XQueryTree (disp, parent[i - 1], &root,
2527 &parent[i], &list, &n);
2528 XFree (list);
2529
2530 if (parent[i] == display->root)
2531 {
2532 if (oldp != None)
2533 pchanged = 1;
2534
2535 break;
2536 }
2537
2538 if (oldp != parent[i])
2539 pchanged = 1;
2540 }
2541
2542 n = 0;
2543
2544 if (pchanged)
2545 {
2546 for (; n < (unsigned int)i; n++)
2547 {
2548 XGetWindowAttributes (disp, parent[n], &wattr);
2549 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2550 {
2551 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2552 break;
2553 }
2554 }
2555 }
2556
2557 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2558 {
2559 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2560 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2561 am_transparent = 0;
2562 /* XXX: also turn off Opt_transparent? */
2563 }
2564 else
2565 {
2566#if WAIT_FOR_WM
2567 /* wait (an arbitrary period) for the WM to do its thing
2568 * needed for fvwm2.2.2 (and before?) */
2569 sleep (1);
2570#endif
2571 for (n = 0; n < (unsigned int)i; n++)
2572 {
2573 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2574 XClearWindow (disp, parent[n]);
2575 }
2576
2577 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2578 am_transparent = 1;
2579 }
2580
2581 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2582 parent[i] = None;
2583 }
2584
2585 if (scrollBar.win)
2586 {
2587 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2588 scrollBar.setIdle ();
2589 scrollbar_show (0);
2590 }
2591
2592 if (am_transparent)
2593 {
2594 want_refresh = want_full_refresh = 1;
2595 if (am_pixmap_trans)
2596 flush ();
2597 }
2598
2599 return pchanged;
2600}
2601#endif
2602 2190
2603/*}}} */ 2191/*}}} */
2604 2192
2605bool 2193bool
2606rxvt_term::cmd_parse () 2194rxvt_term::cmd_parse ()
2607{ 2195{
2608 bool flag = false; 2196 bool flag = false;
2609 unicode_t ch = NOCHAR; 2197 wchar_t ch = NOCHAR;
2610 unsigned char *seq_begin; // remember start of esc-sequence here 2198 char *seq_begin; // remember start of esc-sequence here
2611 2199
2612 for (;;) 2200 for (;;)
2613 { 2201 {
2614 if (ch == NOCHAR) 2202 if (ch == NOCHAR)
2615 { 2203 {
2616 seq_begin = cmdbuf_ptr; 2204 seq_begin = cmdbuf_ptr;
2617 ch = next_char (); 2205 ch = next_char ();
2618 }
2619 2206
2620 if (ch == NOCHAR) // TODO: improve 2207 if (ch == NOCHAR)
2621 break; 2208 break;
2209 }
2622 2210
2623 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2211 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2624 { 2212 {
2625 if (!seen_input) 2213 if (!seen_input)
2626 { 2214 {
… …
2635 if (seen_resize && cmd_pid) 2223 if (seen_resize && cmd_pid)
2636 kill (-cmd_pid, SIGWINCH); 2224 kill (-cmd_pid, SIGWINCH);
2637 } 2225 }
2638 2226
2639 /* Read a text string from the input buffer */ 2227 /* Read a text string from the input buffer */
2640 unicode_t buf[UBUFSIZ]; 2228 wchar_t buf[UBUFSIZ];
2641 bool refreshnow = false; 2229 bool refreshnow = false;
2642 int nlines = 0; 2230 int nlines = 0;
2643 unicode_t *str = buf; 2231 wchar_t *str = buf;
2644 unicode_t *eol = str + min (ncol, UBUFSIZ); 2232 wchar_t *eol = str + min (ncol, UBUFSIZ);
2645 2233
2646 for (;;) 2234 for (;;)
2647 { 2235 {
2648 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2236 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2649 break; 2237 break;
… …
2655 if (ch == C0_LF) 2243 if (ch == C0_LF)
2656 nlines++; 2244 nlines++;
2657 2245
2658 refresh_count++; 2246 refresh_count++;
2659 2247
2660 if (!(options & Opt_jumpScroll) 2248 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2661 || (refresh_count >= refresh_limit * (nrow - 1)))
2662 { 2249 {
2250 refresh_count = 0;
2251
2252 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2253 {
2663 refreshnow = true; 2254 refreshnow = true;
2664 ch = NOCHAR; 2255 ch = NOCHAR;
2665 break; 2256 break;
2257 }
2666 } 2258 }
2667 2259
2668 // scr_add_lines only works for nlines <= nrow - 1. 2260 // scr_add_lines only works for nlines <= nrow - 1.
2669 if (nlines >= nrow - 1) 2261 if (nlines >= nrow - 1)
2670 { 2262 {
2263 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2264 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2671 scr_add_lines (buf, nlines, str - buf); 2265 scr_add_lines (buf, str - buf, nlines);
2266
2672 nlines = 0; 2267 nlines = 0;
2673 str = buf; 2268 str = buf;
2674 eol = str + min (ncol, UBUFSIZ); 2269 eol = str + min (ncol, UBUFSIZ);
2675 } 2270 }
2676 2271
… …
2689 2284
2690 seq_begin = cmdbuf_ptr; 2285 seq_begin = cmdbuf_ptr;
2691 ch = next_char (); 2286 ch = next_char ();
2692 } 2287 }
2693 2288
2289 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2290 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2694 scr_add_lines (buf, nlines, str - buf); 2291 scr_add_lines (buf, str - buf, nlines);
2695 2292
2696 /* 2293 /*
2697 * If there have been a lot of new lines, then update the screen 2294 * If there have been a lot of new lines, then update the screen
2698 * What the heck I'll cheat and only refresh less than every page-full. 2295 * What the heck we'll cheat and only refresh less than every page-full.
2699 * the number of pages between refreshes is refresh_limit, which 2296 * if skipScroll is enabled.
2700 * is incremented here because we must be doing flat-out scrolling.
2701 */ 2297 */
2702 if (refreshnow) 2298 if (refreshnow)
2703 { 2299 {
2704 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2705 refresh_limit++;
2706 else
2707 {
2708 flag = true; 2300 flag = true;
2709 scr_refresh (refresh_type); 2301 scr_refresh ();
2710 } 2302 want_refresh = 1;
2711 } 2303 }
2712 2304
2713 } 2305 }
2714 else 2306 else
2715 { 2307 {
… …
2729 } 2321 }
2730 2322
2731 return flag; 2323 return flag;
2732} 2324}
2733 2325
2734// read the next octet
2735unicode_t
2736rxvt_term::next_octet ()
2737{
2738 return cmdbuf_ptr < cmdbuf_endp
2739 ? *cmdbuf_ptr++
2740 : NOCHAR;
2741}
2742
2743// read the next character 2326// read the next character
2744unicode_t 2327wchar_t
2745rxvt_term::next_char () 2328rxvt_term::next_char () NOTHROW
2746{ 2329{
2747 while (cmdbuf_ptr < cmdbuf_endp) 2330 while (cmdbuf_ptr < cmdbuf_endp)
2748 { 2331 {
2749 // assume 7-bit to be ascii ALWAYS 2332 // assume 7-bit to be ascii ALWAYS
2750 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2333 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2751 return *cmdbuf_ptr++; 2334 return *cmdbuf_ptr++;
2752 2335
2753 wchar_t wc; 2336 wchar_t wc;
2754 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2337 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2755 2338
2756 if (len == (size_t)-2) 2339 if (len == (size_t)-2)
2757 { 2340 {
2758 // the mbstate stores incomplete sequences. didn't know this :/ 2341 // the mbstate stores incomplete sequences. didn't know this :/
2759 cmdbuf_ptr = cmdbuf_endp; 2342 cmdbuf_ptr = cmdbuf_endp;
2760 break; 2343 break;
2761 } 2344 }
2762 2345
2763 if (len == (size_t)-1) 2346 if (len == (size_t)-1)
2764 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2347 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2765 2348
2766 // assume wchar == unicode 2349 // assume wchar == unicode
2767 cmdbuf_ptr += len; 2350 cmdbuf_ptr += len;
2768 return wc & UNICODE_MASK; 2351 return wc & UNICODE_MASK;
2769 } 2352 }
2770 2353
2771 return NOCHAR; 2354 return NOCHAR;
2772} 2355}
2356
2357// read the next octet
2358uint32_t
2359rxvt_term::next_octet () NOTHROW
2360{
2361 return cmdbuf_ptr < cmdbuf_endp
2362 ? (unsigned char)*cmdbuf_ptr++
2363 : NOCHAR;
2364}
2365
2366static class out_of_input out_of_input;
2773 2367
2774/* rxvt_cmd_getc () - Return next input character */ 2368/* rxvt_cmd_getc () - Return next input character */
2775/* 2369/*
2776 * Return the next input character after first passing any keyboard input 2370 * Return the next input character after first passing any keyboard input
2777 * to the command. 2371 * to the command.
2778 */ 2372 */
2779unicode_t 2373wchar_t
2780rxvt_term::cmd_getc () 2374rxvt_term::cmd_getc () THROW ((class out_of_input))
2781{ 2375{
2782 unicode_t c = next_char (); 2376 wchar_t c = next_char ();
2783 2377
2784 if (c == NOCHAR) 2378 if (c == NOCHAR)
2785 throw out_of_input; 2379 throw out_of_input;
2786 2380
2787 return c; 2381 return c;
2788} 2382}
2789 2383
2790unicode_t 2384uint32_t
2791rxvt_term::cmd_get8 () 2385rxvt_term::cmd_get8 () THROW ((class out_of_input))
2792{ 2386{
2793 unicode_t c = next_octet (); 2387 uint32_t c = next_octet ();
2794 2388
2795 if (c == NOCHAR) 2389 if (c == NOCHAR)
2796 throw out_of_input; 2390 throw out_of_input;
2797 2391
2798 return c; 2392 return c;
… …
2862 { 2456 {
2863 if ((buf[len++] = cmd_getc ()) == 'i') 2457 if ((buf[len++] = cmd_getc ()) == 'i')
2864 break; /* done = 1 */ 2458 break; /* done = 1 */
2865 } 2459 }
2866 } 2460 }
2867 2461
2868 for (i = 0; i < len; i++) 2462 for (i = 0; i < len; i++)
2869 if (putc (buf[i], fd) == EOF) 2463 if (putc (buf[i], fd) == EOF)
2870 { 2464 {
2871 done = 1; 2465 done = 1;
2872 break; 2466 break;
… …
2874 } 2468 }
2875 } 2469 }
2876 2470
2877 pclose_printer (fd); 2471 pclose_printer (fd);
2878} 2472}
2879#endif /* PRINTPIPE */ 2473#endif /* PRINTPIPE */
2880/*}}} */ 2474/*}}} */
2881 2475
2882/* *INDENT-OFF* */ 2476/* *INDENT-OFF* */
2883enum { 2477enum {
2884 C1_40 = 0x40, 2478 C1_40 = 0x40,
… …
2898 case C0_ESC: 2492 case C0_ESC:
2899 process_escape_seq (); 2493 process_escape_seq ();
2900 break; 2494 break;
2901 case C0_ENQ: /* terminal Status */ 2495 case C0_ENQ: /* terminal Status */
2902 if (rs[Rs_answerbackstring]) 2496 if (rs[Rs_answerbackstring])
2903 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2497 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2904 (unsigned int)strlen (rs[Rs_answerbackstring]));
2905 else 2498 else
2906 tt_write ((unsigned char *)VT100_ANS, 2499 tt_write (VT100_ANS, strlen (VT100_ANS));
2907 (unsigned int)strlen (VT100_ANS));
2908 break; 2500 break;
2909 case C0_BEL: /* bell */ 2501 case C0_BEL: /* bell */
2910 scr_bell (); 2502 scr_bell ();
2911 break; 2503 break;
2912 case C0_BS: /* backspace */ 2504 case C0_BS: /* backspace */
… …
2936 process_dcs_seq (); 2528 process_dcs_seq ();
2937 break; 2529 break;
2938 case 0x9b: /* CSI */ 2530 case 0x9b: /* CSI */
2939 process_csi_seq (); 2531 process_csi_seq ();
2940 break; 2532 break;
2941 case 0x9d: /* CSI */ 2533 case 0x9d: /* OSC */
2942 process_osc_seq (); 2534 process_osc_seq ();
2943 break; 2535 break;
2944#endif 2536#endif
2945 } 2537 }
2946} 2538}
… …
3036 scr_charset_set (2, (unsigned int)cmd_getc ()); 2628 scr_charset_set (2, (unsigned int)cmd_getc ());
3037 break; 2629 break;
3038 case '+': 2630 case '+':
3039 scr_charset_set (3, (unsigned int)cmd_getc ()); 2631 scr_charset_set (3, (unsigned int)cmd_getc ());
3040 break; 2632 break;
3041#if ENABLE_FRILLS 2633#if !ENABLE_MINIMAL
3042 case '6': 2634 case '6':
3043 scr_backindex (); 2635 scr_backindex ();
3044 break; 2636 break;
3045#endif 2637#endif
3046 case '7': 2638 case '7':
3047 scr_cursor (SAVE); 2639 scr_cursor (SAVE);
3048 break; 2640 break;
3049 case '8': 2641 case '8':
3050 scr_cursor (RESTORE); 2642 scr_cursor (RESTORE);
3051 break; 2643 break;
3052#if ENABLE_FRILLS 2644#if !ENABLE_MINIMAL
3053 case '9': 2645 case '9':
3054 scr_forwardindex (); 2646 scr_forwardindex ();
3055 break; 2647 break;
3056#endif 2648#endif
3057 case '=': 2649 case '=':
… …
3067 break; 2659 break;
3068 2660
3069 /* 8.3.87: NEXT LINE */ 2661 /* 8.3.87: NEXT LINE */
3070 case C1_NEL: /* ESC E */ 2662 case C1_NEL: /* ESC E */
3071 { 2663 {
3072 unicode_t nlcr[] = { C0_LF, C0_CR }; 2664 wchar_t nlcr[] = { C0_LF, C0_CR };
3073 scr_add_lines (nlcr, 1, 2); 2665 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3074 } 2666 }
3075 break; 2667 break;
3076 2668
3077 /* kidnapped escape sequence: Should be 8.3.48 */ 2669 /* kidnapped escape sequence: Should be 8.3.48 */
3078 case C1_ESA: /* ESC G */ 2670 case C1_ESA: /* ESC G */
… …
3100 process_dcs_seq (); 2692 process_dcs_seq ();
3101 break; 2693 break;
3102 2694
3103 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2695 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3104 case C1_SCI: /* ESC Z */ 2696 case C1_SCI: /* ESC Z */
3105 tt_write ((const unsigned char *)ESCZ_ANSWER, 2697 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3106 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3107 break; /* steal obsolete ESC [ c */ 2698 break; /* steal obsolete ESC [ c */
3108 2699
3109 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2700 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3110 case C1_CSI: /* ESC [ */ 2701 case C1_CSI: /* ESC [ */
3111 process_csi_seq (); 2702 process_csi_seq ();
… …
3173rxvt_term::process_csi_seq () 2764rxvt_term::process_csi_seq ()
3174{ 2765{
3175 unicode_t ch, priv, i; 2766 unicode_t ch, priv, i;
3176 unsigned int nargs, p; 2767 unsigned int nargs, p;
3177 int n, ndef; 2768 int n, ndef;
3178 int arg[ESC_ARGS]; 2769 int arg[ESC_ARGS] = { };
3179 2770
3180 for (nargs = ESC_ARGS; nargs > 0;) 2771 nargs = 0;
3181 arg[--nargs] = 0;
3182 2772
3183 priv = 0; 2773 priv = 0;
3184 ch = cmd_getc (); 2774 ch = cmd_getc ();
3185 if (ch >= '<' && ch <= '?') 2775 if (ch >= '<' && ch <= '?')
2776 {
3186 { /* '<' '=' '>' '?' */ 2777 /* '<' '=' '>' '?' */
3187 priv = ch; 2778 priv = ch;
3188 ch = cmd_getc (); 2779 ch = cmd_getc ();
3189 } 2780 }
3190 2781
3191 /* read any numerical arguments */ 2782 /* read any numerical arguments */
… …
3220 ndef = get_byte_array_bit (csi_defaults, i); 2811 ndef = get_byte_array_bit (csi_defaults, i);
3221 for (p = 0; p < nargs; p++) 2812 for (p = 0; p < nargs; p++)
3222 if (arg[p] == -1) 2813 if (arg[p] == -1)
3223 arg[p] = ndef; 2814 arg[p] = ndef;
3224 2815
3225#ifdef DEBUG_CMD
3226 fprintf (stderr, "CSI ");
3227 for (p = 0; p < nargs; p++)
3228 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3229 fprintf (stderr, "%c\n", ch);
3230#endif
3231
3232 /* 2816 /*
3233 * private mode handling 2817 * private mode handling
3234 */ 2818 */
3235 if (priv) 2819 if (priv)
3236 { 2820 {
3237 switch (priv) 2821 switch (priv)
3238 { 2822 {
3239 case '>': 2823 case '>':
3240 if (ch == CSI_DA) /* secondary device attributes */ 2824 if (ch == CSI_DA) /* secondary device attributes */
3241 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2825 {
2826 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2827 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2828 //
2829 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2830 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2831 // versions.
2832 //
2833 tt_printf ("\033[>%d;95;0c", 'U');
2834 }
3242 break; 2835 break;
2836
3243 case '?': 2837 case '?':
3244 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2838 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3245 process_terminal_mode (ch, priv, nargs, arg); 2839 process_terminal_mode (ch, priv, nargs, arg);
3246 break; 2840 break;
3247 } 2841 }
… …
3355 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2949 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3356 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 2950 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3357 break; 2951 break;
3358 2952
3359 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2953 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3360 tt_write ((const unsigned char *)VT100_ANS, 2954 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3361 (unsigned int) (sizeof (VT100_ANS) - 1));
3362 break; 2955 break;
3363 2956
3364 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2957 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3365 process_sgr_mode (nargs, arg); 2958 process_sgr_mode (nargs, arg);
3366 break; 2959 break;
… …
3373 break; 2966 break;
3374 case 6: /* CPR requested */ 2967 case 6: /* CPR requested */
3375 scr_report_position (); 2968 scr_report_position ();
3376 break; 2969 break;
3377 case 7: /* unofficial extension */ 2970 case 7: /* unofficial extension */
3378 if (options & Opt_insecure) 2971 if (option (Opt_insecure))
3379 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2972 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3380 break; 2973 break;
3381 case 8: /* unofficial extension */ 2974 case 8: /* unofficial extension */
3382 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2975 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3383 break; 2976 break;
… …
3450 break; 3043 break;
3451 case CSI_75: 3044 case CSI_75:
3452 scr_cursor (RESTORE); 3045 scr_cursor (RESTORE);
3453 break; 3046 break;
3454 3047
3455#if ENABLE_FRILLS 3048#if !ENABLE_MINIMAL
3456 case CSI_74: 3049 case CSI_74:
3457 process_window_ops (arg, nargs); 3050 process_window_ops (arg, nargs);
3458 break; 3051 break;
3459#endif 3052#endif
3460 3053
… …
3467 break; 3060 break;
3468 } 3061 }
3469} 3062}
3470/*}}} */ 3063/*}}} */
3471 3064
3472#if ENABLE_FRILLS 3065#if !ENABLE_MINIMAL
3473/* ARGSUSED */ 3066/* ARGSUSED */
3474void 3067void
3475rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3068rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3476{ 3069{
3477 int x, y; 3070 int x, y;
3478 XWindowAttributes wattr; 3071 XWindowAttributes wattr;
3479 Window wdummy; 3072 Window wdummy;
3480 dDisp; 3073
3074 dLocal (Display *, dpy);
3481 3075
3482 if (nargs == 0) 3076 if (nargs == 0)
3483 return; 3077 return;
3484 3078
3485 switch (args[0]) 3079 switch (args[0])
3486 { 3080 {
3487 /* 3081 /*
3488 * commands 3082 * commands
3489 */ 3083 */
3490 case 1: /* deiconify window */ 3084 case 1: /* deiconify window */
3491 XMapWindow (disp, parent[0]); 3085 XMapWindow (dpy, parent[0]);
3492 break; 3086 break;
3493 case 2: /* iconify window */ 3087 case 2: /* iconify window */
3494 XIconifyWindow (disp, parent[0], display->screen); 3088 XIconifyWindow (dpy, parent[0], display->screen);
3495 break; 3089 break;
3496 case 3: /* set position (pixels) */ 3090 case 3: /* set position (pixels) */
3497 XMoveWindow (disp, parent[0], args[1], args[2]); 3091 XMoveWindow (dpy, parent[0], args[1], args[2]);
3498 break; 3092 break;
3499 case 4: /* set size (pixels) */ 3093 case 4: /* set size (pixels) */
3500 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3094 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3501 break; 3095 break;
3502 case 5: /* raise window */ 3096 case 5: /* raise window */
3503 XRaiseWindow (disp, parent[0]); 3097 XRaiseWindow (dpy, parent[0]);
3504 break; 3098 break;
3505 case 6: /* lower window */ 3099 case 6: /* lower window */
3506 XLowerWindow (disp, parent[0]); 3100 XLowerWindow (dpy, parent[0]);
3507 break; 3101 break;
3508 case 7: /* refresh window */ 3102 case 7: /* refresh window */
3509 scr_touch (true); 3103 scr_touch (true);
3510 break; 3104 break;
3511 case 8: /* set size (chars) */ 3105 case 8: /* set size (chars) */
… …
3518 if (args[0] >= 24) /* set height (chars) */ 3112 if (args[0] >= 24) /* set height (chars) */
3519 set_widthheight ((unsigned int)width, 3113 set_widthheight ((unsigned int)width,
3520 (unsigned int) (args[1] * fheight)); 3114 (unsigned int) (args[1] * fheight));
3521 break; 3115 break;
3522 3116
3523
3524 /* 3117 /*
3525 * reports - some output format copied from XTerm 3118 * reports - some output format copied from XTerm
3526 */ 3119 */
3527 case 11: /* report window state */ 3120 case 11: /* report window state */
3528 XGetWindowAttributes (disp, parent[0], &wattr); 3121 XGetWindowAttributes (dpy, parent[0], &wattr);
3529 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3122 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3530 break; 3123 break;
3531 case 13: /* report window position */ 3124 case 13: /* report window position */
3532 XGetWindowAttributes (disp, parent[0], &wattr); 3125 XGetWindowAttributes (dpy, parent[0], &wattr);
3533 XTranslateCoordinates (disp, parent[0], wattr.root, 3126 XTranslateCoordinates (dpy, parent[0], wattr.root,
3534 -wattr.border_width, -wattr.border_width, 3127 -wattr.border_width, -wattr.border_width,
3535 &x, &y, &wdummy); 3128 &x, &y, &wdummy);
3536 tt_printf ("\033[3;%d;%dt", x, y); 3129 tt_printf ("\033[3;%d;%dt", x, y);
3537 break; 3130 break;
3538 case 14: /* report window size (pixels) */ 3131 case 14: /* report window size (pixels) */
3539 XGetWindowAttributes (disp, parent[0], &wattr); 3132 XGetWindowAttributes (dpy, parent[0], &wattr);
3540 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3133 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3541 break; 3134 break;
3542 case 18: /* report text area size (chars) */ 3135 case 18: /* report text area size (chars) */
3543 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3136 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3544 break; 3137 break;
… …
3546 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3139 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3547 break; 3140 break;
3548 case 20: /* report icon label */ 3141 case 20: /* report icon label */
3549 { 3142 {
3550 char *s; 3143 char *s;
3551 XGetIconName (disp, parent[0], &s); 3144 XGetIconName (dpy, parent[0], &s);
3552 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3145 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3553 XFree (s); 3146 XFree (s);
3554 } 3147 }
3555 break; 3148 break;
3556 case 21: /* report window title */ 3149 case 21: /* report window title */
3557 { 3150 {
3558 char *s; 3151 char *s;
3559 XFetchName (disp, parent[0], &s); 3152 XFetchName (dpy, parent[0], &s);
3560 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3153 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3561 XFree (s); 3154 XFree (s);
3562 } 3155 }
3563 break; 3156 break;
3564 } 3157 }
3565} 3158}
… …
3568/*----------------------------------------------------------------------*/ 3161/*----------------------------------------------------------------------*/
3569/* 3162/*
3570 * get input up until STRING TERMINATOR (or BEL) 3163 * get input up until STRING TERMINATOR (or BEL)
3571 * ends_how is terminator used. returned input must be free()'d 3164 * ends_how is terminator used. returned input must be free()'d
3572 */ 3165 */
3573unsigned char * 3166char *
3574rxvt_term::get_to_st (unicode_t &ends_how) 3167rxvt_term::get_to_st (unicode_t &ends_how)
3575{ 3168{
3576 unicode_t ch; 3169 unicode_t ch;
3577 bool seen_esc = false; 3170 bool seen_esc = false;
3578 unsigned int n = 0; 3171 unsigned int n = 0;
… …
3592 seen_esc = true; 3185 seen_esc = true;
3593 continue; 3186 continue;
3594 } 3187 }
3595 else if (ch == C0_BEL || ch == CHAR_ST) 3188 else if (ch == C0_BEL || ch == CHAR_ST)
3596 break; 3189 break;
3190 else if (ch == C0_SYN)
3191 ch = cmd_get8 ();
3597 else if (ch < 0x20) 3192 else if (ch < 0x20)
3598 return NULL; /* other control character - exit */ 3193 return NULL; /* other control character - exit */
3599 3194
3600 seen_esc = false; 3195 seen_esc = false;
3601 3196
3602 if (n >= STRING_MAX - 1) 3197 if (n >= STRING_MAX - 1)
3603 // stop at some sane length 3198 // stop at some sane length
3604 return NULL; 3199 return NULL;
3605 3200
3606 if (ch == C0_SYN)
3607 string[n++] = cmd_get8 ();
3608 else
3609 string[n++] = ch; 3201 string[n++] = ch;
3610 } 3202 }
3611 3203
3612 string[n++] = '\0'; 3204 string[n++] = '\0';
3613 3205
3614 ends_how = (ch == 0x5c ? C0_ESC : ch); 3206 ends_how = (ch == 0x5c ? C0_ESC : ch);
3615 3207
3616 return (unsigned char *)rxvt_wcstombs (string); 3208 return rxvt_wcstombs (string);
3617} 3209}
3618 3210
3619/*----------------------------------------------------------------------*/ 3211/*----------------------------------------------------------------------*/
3620/* 3212/*
3621 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3213 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3622 */ 3214 */
3623void 3215void
3624rxvt_term::process_dcs_seq () 3216rxvt_term::process_dcs_seq ()
3625{ 3217{
3626 unsigned char *s; 3218 char *s;
3627 unicode_t eh; 3219 unicode_t eh;
3628 3220
3629 /* 3221 /*
3630 * Not handled yet 3222 * Not handled yet
3631 */ 3223 */
… …
3650 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3242 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3651 arg = arg * 10 + (ch - '0'); 3243 arg = arg * 10 + (ch - '0');
3652 3244
3653 if (ch == ';') 3245 if (ch == ';')
3654 { 3246 {
3655 unsigned char *s = get_to_st (eh); 3247 char *s = get_to_st (eh);
3656 3248
3657 if (s) 3249 if (s)
3658 { 3250 {
3659 process_xterm_seq (arg, (char *)s, eh); 3251 process_xterm_seq (arg, s, eh);
3660 free (s); 3252 free (s);
3661 } 3253 }
3662 } 3254 }
3663} 3255}
3664 3256
3665void 3257void
3666rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3258rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3667{ 3259{
3668 if (str[0] == '?' && !str[1]) 3260 if (str[0] == '?' && !str[1])
3669 { 3261 {
3670 unsigned short r, g, b; 3262 rgba c;
3671 pix_colors_focused[color].get (display, r, g, b); 3263 pix_colors_focused[color].get (c);
3264
3265#if XFT
3266 if (c.a != rgba::MAX_CC)
3267 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3268 else
3269#endif
3672 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3270 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3673 } 3271 }
3674 else 3272 else
3675 set_window_color (color, str); 3273 set_window_color (color, str);
3676} 3274}
3677 3275
3678/* 3276/*
3679 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3277 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3680 */ 3278 */
3681void 3279void
3682rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3280rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3683{ 3281{
3684 int changed = 0;
3685 int color; 3282 int color;
3686 char *buf, *name; 3283 char *buf, *name;
3687 bool query = str[0] == '?' && !str[1]; 3284 bool query = str[0] == '?' && !str[1];
3688 int saveop = op; 3285 int saveop = op;
3689 dDisp; 3286
3287 dLocal (Display *, dpy);
3690 3288
3691 assert (str != NULL); 3289 assert (str != NULL);
3290
3291 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3292 return;
3293
3692 switch (op) 3294 switch (op)
3693 { 3295 {
3694 case XTerm_name: 3296 case XTerm_name:
3695 set_title (str); 3297 set_title (str);
3696 /* FALLTHROUGH */ 3298 /* FALLTHROUGH */
… …
3710 unsigned long bytes_after; 3312 unsigned long bytes_after;
3711 unsigned char *value = 0; 3313 unsigned char *value = 0;
3712 const char *str = ""; 3314 const char *str = "";
3713 3315
3714 if (prop 3316 if (prop
3715 && XGetWindowProperty (disp, parent[0], 3317 && XGetWindowProperty (dpy, parent[0],
3716 prop, 0, 1<<16, 0, AnyPropertyType, 3318 prop, 0, 1<<16, 0, AnyPropertyType,
3717 &actual_type, &actual_format, 3319 &actual_type, &actual_format,
3718 &nitems, &bytes_after, &value) == Success 3320 &nitems, &bytes_after, &value) == Success
3719 && actual_type != None 3321 && actual_type != None
3720 && actual_format == 8) 3322 && actual_format == 8)
3721 str = (const char *)(value); 3323 str = (const char *)(value);
3722 3324
3723 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3325 tt_printf ("\033]%d;%s%c", op, str, resp);
3724 3326
3725 XFree (value); 3327 XFree (value);
3726 } 3328 }
3727 else 3329 else
3728 { 3330 {
… …
3732 { 3334 {
3733 *eq = 0; 3335 *eq = 0;
3734 set_utf8_property (display->atom (str), eq + 1); 3336 set_utf8_property (display->atom (str), eq + 1);
3735 } 3337 }
3736 else 3338 else
3737 XDeleteProperty (disp, parent[0], 3339 XDeleteProperty (dpy, parent[0],
3738 display->atom (str)); 3340 display->atom (str));
3739 } 3341 }
3740 break; 3342 break;
3741 3343
3742 case XTerm_Color: 3344 case XTerm_Color:
… …
3744 { 3346 {
3745 if ((name = strchr (buf, ';')) == NULL) 3347 if ((name = strchr (buf, ';')) == NULL)
3746 break; 3348 break;
3747 3349
3748 *name++ = '\0'; 3350 *name++ = '\0';
3749 color = atoi (buf); 3351 color = atoi (buf) + minCOLOR;
3750 3352
3751 if (color < 0 || color >= TOTAL_COLORS) 3353 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3752 break; 3354 break;
3753 3355
3754 if ((buf = strchr (name, ';')) != NULL) 3356 if ((buf = strchr (name, ';')) != NULL)
3755 *buf++ = '\0'; 3357 *buf++ = '\0';
3756 3358
3757 if (name[0] == '?' && !name[1]) 3359 process_color_seq (op, color, name, resp);
3758 {
3759 unsigned short r, g, b;
3760 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3761 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3762 }
3763 else
3764 set_window_color (color + minCOLOR, name);
3765 } 3360 }
3766 break; 3361 break;
3362 case Rxvt_restoreFG:
3767 case XTerm_Color00: 3363 case XTerm_Color00:
3768 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3364 process_color_seq (op, Color_fg, str, resp);
3769 break; 3365 break;
3366 case Rxvt_restoreBG:
3770 case XTerm_Color01: 3367 case XTerm_Color01:
3771 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3368 process_color_seq (op, Color_bg, str, resp);
3772 break; 3369 break;
3773#ifndef NO_CURSORCOLOR 3370#ifndef NO_CURSORCOLOR
3774 case XTerm_Color_cursor: 3371 case XTerm_Color_cursor:
3775 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3372 process_color_seq (op, Color_cursor, str, resp);
3776 break; 3373 break;
3777#endif 3374#endif
3778 case XTerm_Color_pointer_fg: 3375 case XTerm_Color_pointer_fg:
3779 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3376 process_color_seq (op, Color_pointer_fg, str, resp);
3780 break; 3377 break;
3781 case XTerm_Color_pointer_bg: 3378 case XTerm_Color_pointer_bg:
3782 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3379 process_color_seq (op, Color_pointer_bg, str, resp);
3783 break; 3380 break;
3784#ifndef NO_BOLD_UNDERLINE_REVERSE 3381#ifndef NO_BOLD_UNDERLINE_REVERSE
3785 case XTerm_Color_BD:
3786 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3787 break;
3788 case XTerm_Color_UL:
3789 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3790 break;
3791 case XTerm_Color_RV: 3382 case XTerm_Color_RV:
3792 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3383 process_color_seq (op, Color_RV, str, resp);
3384 break;
3385 case Rxvt_Color_BD:
3386 case URxvt_Color_BD:
3387 process_color_seq (op, Color_BD, str, resp);
3388 break;
3389 case Rxvt_Color_UL:
3390 case URxvt_Color_UL:
3391 process_color_seq (op, Color_UL, str, resp);
3793 break; 3392 break;
3794 case URxvt_Color_IT: 3393 case URxvt_Color_IT:
3795 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3394 process_color_seq (op, Color_IT, str, resp);
3796 break; 3395 break;
3797#endif 3396#endif
3798#if TRANSPARENT && TINTING 3397#if ENABLE_TRANSPARENCY
3799 case URxvt_Color_tint: 3398 case URxvt_Color_tint:
3800 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3399 process_color_seq (op, Color_tint, str, resp);
3801 check_our_parents (); 3400 {
3802 if (am_transparent) 3401 bool changed = false;
3803 want_full_refresh = want_refresh = 1;
3804 break;
3805#endif
3806 3402
3403 if (ISSET_PIXCOLOR (Color_tint))
3404 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3405 else
3406 changed = bgPixmap.unset_tint ();
3407
3408 if (changed)
3409 update_background ();
3410 }
3411
3412 break;
3413#endif
3414
3415#if BG_IMAGE_FROM_FILE
3807 case XTerm_Pixmap: 3416 case Rxvt_Pixmap:
3808 if (*str != ';') 3417 if (!strcmp (str, "?"))
3809 { 3418 {
3810#if XPM_BACKGROUND 3419 char str[256];
3811 scale_pixmap (""); /* reset to default scaling */ 3420
3812 set_bgPixmap (str); /* change pixmap */ 3421 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3813#endif 3422 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3814 scr_touch (true); 3423 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3424 process_xterm_seq (XTerm_title, str, CHAR_ST);
3815 } 3425 }
3816 while ((str = strchr (str, ';')) != NULL) 3426 else
3817 { 3427 {
3428 int changed = 0;
3429
3430 if (*str != ';')
3431 {
3432 /* reset to default scaling :*/
3433 bgPixmap.unset_geometry ();
3434 if (bgPixmap.set_file (str)) /* change pixmap */
3435 changed++;
3436 str = strchr (str, ';');
3437 if (str == NULL)
3438 bgPixmap.set_defaultGeometry ();
3439 }
3440
3441 while (str)
3442 {
3818 str++; 3443 str++;
3819#if XPM_BACKGROUND 3444 if (bgPixmap.set_geometry (str))
3820 changed += scale_pixmap (str); 3445 changed++;
3821#endif 3446 str = strchr (str, ';');
3447 }
3448
3449 if (changed)
3450 update_background ();
3822 } 3451 }
3823
3824 if (changed)
3825 {
3826#ifdef XPM_BACKGROUND
3827 resize_pixmap ();
3828#endif
3829 scr_touch (true);
3830 }
3831 break; 3452 break;
3832 3453#endif
3833 case XTerm_restoreFG:
3834 set_window_color (Color_fg, str);
3835 break;
3836 case XTerm_restoreBG:
3837 set_window_color (Color_bg, str);
3838 break;
3839 3454
3840 case XTerm_logfile: 3455 case XTerm_logfile:
3841 // TODO, when secure mode? 3456 // TODO, when secure mode?
3842 break; 3457 break;
3843 3458
3844#ifdef MENUBAR
3845 case URxvt_Menu:
3846 if (options & Opt_insecure)
3847 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3848 break;
3849#endif
3850#if 0 3459#if 0
3851 case XTerm_dumpscreen: /* no error notices */ 3460 case Rxvt_dumpscreen: /* no error notices */
3852 { 3461 {
3853 int fd; 3462 int fd;
3854 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3463 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3855 { 3464 {
3856 scr_dump (fd); 3465 scr_dump (fd);
… …
3867 case URxvt_italicFont: 3476 case URxvt_italicFont:
3868 case URxvt_boldItalicFont: 3477 case URxvt_boldItalicFont:
3869#endif 3478#endif
3870 if (query) 3479 if (query)
3871 tt_printf ("\33]%d;%-.250s%c", saveop, 3480 tt_printf ("\33]%d;%-.250s%c", saveop,
3872 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3481 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3873 ? fontset[op - URxvt_font]->fontdesc : "", 3482 ? fontset[op - URxvt_font]->fontdesc : "",
3874 resp); 3483 resp);
3875 else 3484 else
3876 { 3485 {
3877 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3486 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3880 allocated.push_back ((void *)res); 3489 allocated.push_back ((void *)res);
3881 set_fonts (); 3490 set_fonts ();
3882 } 3491 }
3883 break; 3492 break;
3884 3493
3885#if ENABLE_FRILLS 3494 case URxvt_version:
3495 if (query)
3496 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3497 op,
3498 rs[Rs_name], VERSION[0], VERSION[2],
3499 resp);
3500 break;
3501
3502#if !ENABLE_MINIMAL
3886 case URxvt_locale: 3503 case URxvt_locale:
3887 if (query) 3504 if (query)
3888 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3505 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3889 else 3506 else
3890 { 3507 {
3891 set_locale (str); 3508 set_locale (str);
3892 pty.set_utf8_mode (enc_utf8); 3509 pty->set_utf8_mode (enc_utf8);
3893 init_xlocale (); 3510 init_xlocale ();
3894 } 3511 }
3895 break; 3512 break;
3896 3513
3897 case URxvt_view_up: 3514 case URxvt_view_up:
3898 case URxvt_view_down: 3515 case URxvt_view_down:
3516 {
3899 int lines = atoi (str); 3517 int lines = atoi (str);
3900 3518
3901 if (lines) 3519 if (lines)
3902 scr_page (op == URxvt_view_up ? UP : DN, lines); 3520 scr_page (op == URxvt_view_up ? UP : DN, lines);
3903 else 3521 else
3904 {
3905 scr_erase_savelines (); 3522 scr_erase_savelines ();
3906 } 3523 }
3907 3524
3525 break;
3526#endif
3527
3528#if ENABLE_PERL
3529 case URxvt_perl:
3530 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3531 ; // no responses yet
3908 break; 3532 break;
3909#endif 3533#endif
3910 } 3534 }
3911} 3535}
3912/*----------------------------------------------------------------------*/ 3536/*----------------------------------------------------------------------*/
… …
3943 return state; 3567 return state;
3944} 3568}
3945 3569
3946/* we're not using priv _yet_ */ 3570/* we're not using priv _yet_ */
3947void 3571void
3948rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3572rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3949{ 3573{
3950 unsigned int i, j; 3574 unsigned int i, j;
3951 int state; 3575 int state;
3952 3576
3953 static const struct 3577 static const struct
3954 { 3578 {
3955 const int argval; 3579 const int argval;
3956 const unsigned long bit; 3580 const unsigned long bit;
3957 }
3958
3959 argtopriv[] = { 3581 } argtopriv[] = {
3960 { 1, PrivMode_aplCUR }, 3582 { 1, PrivMode_aplCUR },
3961 { 2, PrivMode_vt52 }, 3583 { 2, PrivMode_vt52 },
3962 { 3, PrivMode_132 }, 3584 { 3, PrivMode_132 },
3963 { 4, PrivMode_smoothScroll }, 3585 { 4, PrivMode_smoothScroll },
3964 { 5, PrivMode_rVideo }, 3586 { 5, PrivMode_rVideo },
3965 { 6, PrivMode_relOrigin }, 3587 { 6, PrivMode_relOrigin },
3966 { 7, PrivMode_Autowrap }, 3588 { 7, PrivMode_Autowrap },
3967 // 8, bi-directional support mode 3589 // 8, bi-directional support mode
3968 { 9, PrivMode_MouseX10 }, 3590 { 9, PrivMode_MouseX10 },
3969#ifdef menuBar_esc
3970 { menuBar_esc, PrivMode_menuBar },
3971#endif
3972 // 18, 19 printing-related 3591 // 18, 19 printing-related
3973 { 25, PrivMode_VisibleCursor }, 3592 { 25, PrivMode_VisibleCursor },
3974#ifdef scrollBar_esc 3593#ifdef scrollBar_esc
3975 { scrollBar_esc, PrivMode_scrollBar }, 3594 { scrollBar_esc, PrivMode_scrollBar },
3976#endif 3595#endif
… …
3983 { 66, PrivMode_aplKP }, 3602 { 66, PrivMode_aplKP },
3984#ifndef NO_BACKSPACE_KEY 3603#ifndef NO_BACKSPACE_KEY
3985 { 67, PrivMode_BackSpace }, 3604 { 67, PrivMode_BackSpace },
3986#endif 3605#endif
3987 { 1000, PrivMode_MouseX11 }, 3606 { 1000, PrivMode_MouseX11 },
3988 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3607 { 1002, PrivMode_MouseBtnEvent },
3989 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3608 { 1003, PrivMode_MouseAnyEvent },
3990 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3991 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3609 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3992 { 1011, PrivMode_Keypress }, // rxvt extension 3610 { 1011, PrivMode_Keypress }, // rxvt extension
3993 // 1035 enable modifiers for alt, numlock NYI 3611 // 1035 enable modifiers for alt, numlock NYI
3994 // 1036 send ESC for meta keys NYI 3612 // 1036 send ESC for meta keys NYI
3995 // 1037 send DEL for keypad delete NYI 3613 // 1037 send DEL for keypad delete NYI
3996 { 1047, PrivMode_Screen }, 3614 { 1047, PrivMode_Screen },
3997 // 1048 save and restore cursor 3615 // 1048 save and restore cursor
3998 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3616 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3999 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3617 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3618 { 2004, PrivMode_BracketPaste },
4000 }; 3619 };
4001 3620
4002 if (nargs == 0) 3621 if (nargs == 0)
4003 return; 3622 return;
4004 3623
… …
4021 } 3640 }
4022 3641
4023 /* extra handling for values with state unkept */ 3642 /* extra handling for values with state unkept */
4024 switch (arg[i]) 3643 switch (arg[i])
4025 { 3644 {
3645#if ENABLE_STYLES
3646 case 1021:
3647 set_option (Opt_intensityStyles, mode);
3648
3649 scr_touch (true);
3650 break;
3651#endif
4026 case 1048: /* alternative cursor save */ 3652 case 1048: /* alternative cursor save */
4027 case 1049: 3653 case 1049:
4028 if (options & Opt_secondaryScreen) 3654 if (option (Opt_secondaryScreen))
4029 if (mode == 0) 3655 if (mode == 0)
4030 scr_cursor (RESTORE); 3656 scr_cursor (RESTORE);
4031 else if (mode == 1) 3657 else if (mode == 1)
4032 scr_cursor (SAVE); 3658 scr_cursor (SAVE);
4033 break; 3659 break;
… …
4045 */ 3671 */
4046 PrivMode (1, PrivMode_vt52); 3672 PrivMode (1, PrivMode_vt52);
4047 break; 3673 break;
4048 case 3: /* 80/132 */ 3674 case 3: /* 80/132 */
4049 if (priv_modes & PrivMode_132OK) 3675 if (priv_modes & PrivMode_132OK)
3676 {
3677 scr_poweron ();
4050 set_widthheight (((state ? 132 : 80) * fwidth), height); 3678 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3679 }
4051 break; 3680 break;
4052 case 4: /* smooth scrolling */ 3681 case 4: /* smooth scrolling */
4053 if (state)
4054 options &= ~Opt_jumpScroll;
4055 else
4056 options |= Opt_jumpScroll; 3682 set_option (Opt_jumpScroll, !state);
4057 break; 3683 break;
4058 case 5: /* reverse video */ 3684 case 5: /* reverse video */
4059 scr_rvideo_mode (state); 3685 scr_rvideo_mode (state);
4060 break; 3686 break;
4061 case 6: /* relative/absolute origins */ 3687 case 6: /* relative/absolute origins */
… …
4065 scr_autowrap (state); 3691 scr_autowrap (state);
4066 break; 3692 break;
4067 /* case 8: - auto repeat, can't do on a per window basis */ 3693 /* case 8: - auto repeat, can't do on a per window basis */
4068 case 9: /* X10 mouse reporting */ 3694 case 9: /* X10 mouse reporting */
4069 if (state) /* orthogonal */ 3695 if (state) /* orthogonal */
4070 priv_modes &= ~PrivMode_MouseX11; 3696 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4071 break; 3697 break;
4072#ifdef menuBar_esc
4073 case menuBar_esc:
4074#ifdef MENUBAR
4075 map_menuBar (state);
4076#endif
4077 break;
4078#endif
4079#ifdef scrollBar_esc 3698#ifdef scrollBar_esc
4080 case scrollBar_esc: 3699 case scrollBar_esc:
4081 if (scrollbar_mapping (state)) 3700 if (scrollbar_mapping (state))
4082 { 3701 {
4083 resize_all_windows (0, 0, 0); 3702 resize_all_windows (0, 0, 0);
… …
4095 break; 3714 break;
4096 /* case 66: - application key pad */ 3715 /* case 66: - application key pad */
4097 /* case 67: - backspace key */ 3716 /* case 67: - backspace key */
4098 case 1000: /* X11 mouse reporting */ 3717 case 1000: /* X11 mouse reporting */
4099 if (state) /* orthogonal */ 3718 if (state) /* orthogonal */
4100 priv_modes &= ~PrivMode_MouseX10; 3719 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4101 break; 3720 break;
4102#if 0
4103 case 1001: 3721 case 1002:
4104 break; /* X11 mouse highlighting */ 3722 case 1003:
4105#endif 3723 if (state)
3724 {
3725 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3726 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3727 vt_emask_mouse = PointerMotionMask;
3728 }
3729 else
3730 vt_emask_mouse = NoEventMask;
3731 vt_select_input ();
3732 break;
4106 case 1010: /* scroll to bottom on TTY output inhibit */ 3733 case 1010: /* scroll to bottom on TTY output inhibit */
4107 if (state)
4108 options &= ~Opt_scrollTtyOutput;
4109 else
4110 options |= Opt_scrollTtyOutput; 3734 set_option (Opt_scrollTtyOutput, !state);
4111 break; 3735 break;
4112 case 1011: /* scroll to bottom on key press */ 3736 case 1011: /* scroll to bottom on key press */
4113 if (state)
4114 options |= Opt_scrollTtyKeypress; 3737 set_option (Opt_scrollTtyKeypress, state);
4115 else
4116 options &= ~Opt_scrollTtyKeypress;
4117 break; 3738 break;
4118 case 1047: /* secondary screen w/ clearing last */ 3739 case 1047: /* secondary screen w/ clearing last */
4119 if (options & Opt_secondaryScreen) 3740 if (option (Opt_secondaryScreen))
4120 if (current_screen != PRIMARY) 3741 if (current_screen != PRIMARY)
4121 scr_erase_screen (2); 3742 scr_erase_screen (2);
4122 scr_change_screen (state); 3743 scr_change_screen (state);
4123 break; 3744 break;
4124 case 1049: /* secondary screen w/ clearing first */ 3745 case 1049: /* secondary screen w/ clearing first */
4125 scr_change_screen (state); 3746 scr_change_screen (state);
4126 if (options & Opt_secondaryScreen) 3747 if (option (Opt_secondaryScreen))
4127 if (current_screen != PRIMARY) 3748 if (current_screen != PRIMARY)
4128 scr_erase_screen (2); 3749 scr_erase_screen (2);
4129 break; 3750 break;
4130 default: 3751 default:
4131 break; 3752 break;
… …
4259 scr_color (Color_bg, Color_bg); 3880 scr_color (Color_bg, Color_bg);
4260 break; 3881 break;
4261 3882
4262 //case 50: // not variable spacing 3883 //case 50: // not variable spacing
4263 3884
4264#ifndef NO_BRIGHTCOLOR 3885#if !ENABLE_MINIMAL
4265 case 90: 3886 case 90:
4266 case 91: /* set bright fg color */ 3887 case 91: /* set bright fg color */
4267 case 92: 3888 case 92:
4268 case 93: 3889 case 93:
4269 case 94: 3890 case 94:
… …
4281 case 106: 3902 case 106:
4282 case 107: 3903 case 107:
4283 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 3904 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4284 break; 3905 break;
4285#endif 3906#endif
4286
4287 } 3907 }
4288 } 3908 }
4289} 3909}
4290/*}}} */ 3910/*}}} */
4291 3911
… …
4294rxvt_term::process_graphics () 3914rxvt_term::process_graphics ()
4295{ 3915{
4296 unicode_t ch, cmd = cmd_getc (); 3916 unicode_t ch, cmd = cmd_getc ();
4297 3917
4298 if (cmd == 'Q') 3918 if (cmd == 'Q')
3919 {
4299 { /* query graphics */ 3920 /* query graphics */
4300 tt_printf ("\033G0\012"); /* no graphics */ 3921 tt_printf ("\033G0\012"); /* no graphics */
4301 return; 3922 return;
4302 } 3923 }
4303 /* swallow other graphics sequences until terminating ':' */ 3924 /* swallow other graphics sequences until terminating ':' */
4304 do 3925 do
… …
4315 */ 3936 */
4316void 3937void
4317rxvt_term::tt_printf (const char *fmt,...) 3938rxvt_term::tt_printf (const char *fmt,...)
4318{ 3939{
4319 va_list arg_ptr; 3940 va_list arg_ptr;
4320 unsigned char buf[256]; 3941 char buf[256];
4321 3942
4322 va_start (arg_ptr, fmt); 3943 va_start (arg_ptr, fmt);
4323 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3944 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4324 va_end (arg_ptr); 3945 va_end (arg_ptr);
4325 tt_write (buf, strlen (buf)); 3946 tt_write (buf, strlen (buf));
… …
4330 * or generated by us in response to a query ESC sequence. 3951 * or generated by us in response to a query ESC sequence.
4331 */ 3952 */
4332const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3953const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4333 3954
4334void 3955void
4335rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3956rxvt_term::tt_write (const char *data, unsigned int len)
4336{ 3957{
3958 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3959 return;
3960
3961 if (pty->pty < 0)
3962 return;
3963
4337 if (v_buflen == 0) 3964 if (v_buflen == 0)
4338 { 3965 {
4339 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3966 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4340 3967
4341 if ((unsigned int)written == len) 3968 if ((unsigned int)written == len)
4342 return; 3969 return;
4343 3970
4344 data += written; 3971 data += written;
4345 len -= written; 3972 len -= written;
4346 } 3973 }
4347 3974
4348 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 3975 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4349 3976
4350 memcpy (v_buffer + v_buflen, data, len); 3977 memcpy (v_buffer + v_buflen, data, len);
4351 v_buflen += len; 3978 v_buflen += len;
4352 3979
4353 pty_ev.set (EVENT_READ | EVENT_WRITE); 3980 pty_ev.set (ev::READ | ev::WRITE);
4354} 3981}
4355 3982
4356void rxvt_term::pty_write () 3983void rxvt_term::pty_write ()
4357{ 3984{
4358 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3985 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4359 3986
4360 if (written > 0) 3987 if (written > 0)
4361 { 3988 {
4362 v_buflen -= written; 3989 v_buflen -= written;
4363 3990
4364 if (v_buflen == 0) 3991 if (v_buflen == 0)
4365 { 3992 {
4366 free (v_buffer); 3993 free (v_buffer);
4367 v_buffer = 0; 3994 v_buffer = 0;
4368 v_buflen = 0;
4369 3995
4370 pty_ev.set (EVENT_READ); 3996 pty_ev.set (ev::READ);
4371 return; 3997 return;
4372 } 3998 }
4373 3999
4374 memmove (v_buffer, v_buffer + written, v_buflen); 4000 memmove (v_buffer, v_buffer + written, v_buflen);
4375 } 4001 }
4376 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4002 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4377 pty_ev.set (EVENT_READ); 4003 pty_ev.set (ev::READ);
4378} 4004}
4379 4005
4380/*----------------------- end-of-file (C source) -----------------------*/ 4006/*----------------------- end-of-file (C source) -----------------------*/
4381 4007

Diff Legend

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