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.233 by root, Wed Jan 4 01:16:34 2006 UTC vs.
Revision 1.519 by root, Thu Jun 7 11:27:08 2012 UTC

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

Diff Legend

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