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

Diff Legend

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