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

Diff Legend

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