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.255 by root, Wed Jan 11 03:13:26 2006 UTC vs.
Revision 1.541 by root, Thu Feb 20 18:59:13 2014 UTC

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

Diff Legend

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