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

Diff Legend

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