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

Diff Legend

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