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

Diff Legend

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