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

Diff Legend

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