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

Diff Legend

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