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.243 by root, Fri Jan 6 05:43:36 2006 UTC vs.
Revision 1.539 by sf-exg, Tue Apr 16 08:44:45 2013 UTC

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

Diff Legend

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