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

Diff Legend

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