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

Diff Legend

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