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.263 by root, Sun Jan 15 16:48:17 2006 UTC vs.
Revision 1.540 by sf-exg, Sat Apr 20 19:50:04 2013 UTC

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

Diff Legend

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