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

Diff Legend

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