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

Diff Legend

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