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

Diff Legend

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