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.183 by root, Tue Dec 21 06:43:00 2004 UTC vs.
Revision 1.358 by sasha, Tue Sep 18 22:27:41 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * 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 33 * 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 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
53#include <cwchar> 54#ifdef KEYSYM_RESOURCE
55# include "keyboard.h"
56#endif
57
54#include <csignal> 58#include <csignal>
55 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
56/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
57 65
58#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
59
60// exception thrown when the command parser runs out of input data
61class out_of_input { } out_of_input;
62 67
63#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
64 69
65#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
66#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
90 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
91 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
92 97
93 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
94 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
95 XK_ISO_Lock, 0x21eb,
96 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
97 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
98 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
99 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
100 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
… …
114 XK_Escape, 0x238b, 118 XK_Escape, 0x238b,
115 XK_Undo, 0x238c, 119 XK_Undo, 0x238c,
116 XK_Print, 0x2399, 120 XK_Print, 0x2399,
117 121
118 XK_space, 0x2423, 122 XK_space, 0x2423,
123
124#ifdef XK_KP_Begin
125 XK_KP_Prior, 0x21de,
126 XK_KP_Next, 0x21df,
127 XK_KP_Begin, 0x2320,
128 XK_KP_Insert, 0x2380,
129 XK_KP_Delete, 0x2326,
119 XK_KP_Space, 0x2422, 130 XK_KP_Space, 0x2422,
131#endif
120 0, 132 0,
121}; 133};
122 134
123void 135void
124rxvt_term::iso14755_54 (int x, int y) 136rxvt_term::iso14755_54 (int x, int y)
125{ 137{
126 x = Pixel2Col (x); 138 x = Pixel2Col (x);
127 y = Pixel2Row (y); 139 y = Pixel2Row (y);
128 140
129 if (x < 0 || x >= TermWin.ncol 141 if (!IN_RANGE_EXC (x, 0, ncol)
130 || y < 0 || y >= TermWin.nrow) 142 || !IN_RANGE_EXC (y, 0, nrow))
131 return; 143 return;
132 144
133 for (;;) 145 for (;;)
134 { 146 {
135 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 147 const line_t &l = ROW(y + view_start);
148
149 text_t t = l.t[x];
136 150
137 if (t != NOCHAR || !x) 151 if (t != NOCHAR || !x)
138 { 152 {
139 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 153 iso14755_51 (l.t[x], l.r[x], x, y);
140 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
141 iso14755buf = ISO_14755_54; 154 iso14755buf = ISO_14755_54;
142 break; 155 break;
143 } 156 }
144 157
145 x--; 158 x--;
146 } 159 }
147
148} 160}
149#endif
150 161
151#if ENABLE_OVERLAY
152void 162void
153rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 163rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
154{ 164{
155 rxvt_fontset *fs = FONTSET (r); 165 rxvt_fontset *fs = FONTSET (r);
156 rxvt_font *f = (*fs)[fs->find_font (ch)]; 166 rxvt_font *f = (*fs)[fs->find_font (ch)];
157 wchar_t *chr, *alloc, ch2; 167 wchar_t *chr, *alloc, ch2, *fname;
158 int len; 168 int len;
159 169
170 fname = rxvt_utf8towcs (f->name);
171
160#if ENABLE_COMBINING 172# if ENABLE_COMBINING
161 if (IS_COMPOSE (ch)) 173 if (IS_COMPOSE (ch))
162 { 174 {
163 len = rxvt_composite.expand (ch, 0); 175 len = rxvt_composite.expand (ch, 0);
164 alloc = chr = new wchar_t[len]; 176 alloc = chr = new wchar_t[len];
165 rxvt_composite.expand (ch, chr); 177 rxvt_composite.expand (ch, chr);
166 } 178 }
167 else 179 else
168#endif 180# endif
169 { 181 {
170 ch2 = ch; 182 ch2 = ch;
171 183
172 alloc = 0; 184 alloc = 0;
173 chr = &ch2; 185 chr = &ch2;
174 len = 1; 186 len = 1;
175 } 187 }
176 188
177 int width = strlen (f->name); 189 char attr[80]; // plenty
178 190
179 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 191 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
192 (int)r,
193 fgcolor_of (r), bgcolor_of (r),
194 r & RS_Bold ? " bold" : "",
195 r & RS_Italic ? " italic" : "",
196 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : "");
200
201 int width = wcswidth (fname, wcslen (fname));
202
203 max_it (width, 8+5); // for char + hey
204 max_it (width, strlen (attr));
205
206 if (y >= 0)
207 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
209 x = 0;
210 }
211
212 scr_overlay_new (x, y, width, len + 2);
180 213
181 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
182 215
183 for (int y = 0; y < len; y++) 216 for (int y = 0; y < len; y++)
184 { 217 {
… …
187 ch = *chr++; 220 ch = *chr++;
188 221
189 sprintf (buf, "%8x", ch); 222 sprintf (buf, "%8x", ch);
190 scr_overlay_set (0, y, buf); 223 scr_overlay_set (0, y, buf);
191 scr_overlay_set (9, y, '='); 224 scr_overlay_set (9, y, '=');
192#if !UNICODE3 225# if !UNICODE3
193 if (ch >= 0x10000) 226 if (ch >= 0x10000)
194 ch = 0xfffd; 227 ch = 0xfffd;
195#endif 228# endif
196 scr_overlay_set (11, y, ch, r); 229 scr_overlay_set (11, y, ch, r);
230
231 if (WCWIDTH (ch) >= 2)
197 scr_overlay_set (12, y, NOCHAR, r); 232 scr_overlay_set (12, y, NOCHAR, r);
198 } 233 }
199 234
235// {
236// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf);
239// }
240 scr_overlay_set (0, len , attr);
200 scr_overlay_set (0, len, f->name); 241 scr_overlay_set (0, len + 1, fname);
201 242
243 free (fname);
244
202#if ENABLE_COMBINING 245# if ENABLE_COMBINING
203 if (alloc) 246 if (alloc)
204 delete [] alloc; 247 delete [] alloc;
205#endif 248# endif
206} 249}
207#endif 250#endif
208 251
209void 252void
210rxvt_term::commit_iso14755 () 253rxvt_term::commit_iso14755 ()
… …
227 mb[0] = ch[0]; 270 mb[0] = ch[0];
228 len = 1; 271 len = 1;
229 } 272 }
230 273
231 if (len > 0) 274 if (len > 0)
232 tt_write ((unsigned char *)mb, len); 275 tt_write (mb, len);
233 else 276 else
234 scr_bell (); 277 scr_bell ();
235 } 278 }
236 279
237 iso14755buf = 0; 280 iso14755buf = 0;
… …
254 297
255 return -1; 298 return -1;
256} 299}
257#endif 300#endif
258 301
259/*{{{ Convert the keypress event into a string */
260void 302void
261rxvt_term::lookup_key (XKeyEvent &ev) 303rxvt_term::key_press (XKeyEvent &ev)
262{ 304{
263 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
264 unsigned int newlen; 306 unsigned int newlen;
265 KeySym keysym; 307 KeySym keysym;
266#ifdef DEBUG_CMD
267 static int debug_key = 1; /* accessible by a debugger only */
268#endif
269 int valid_keysym; 308 int valid_keysym;
270 unsigned char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
271 315
272 /* 316 /*
273 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 317 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
274 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
275 * 319 *
276 * Always permit `shift' to override the current setting 320 * Always permit `shift' to override the current setting
277 */ 321 */
278 shft = (ev.state & ShiftMask); 322 shft = ev.state & ShiftMask;
279 ctrl = (ev.state & ControlMask); 323 ctrl = ev.state & ControlMask;
280 meta = (ev.state & ModMetaMask); 324 meta = ev.state & ModMetaMask;
281 325
282 if (numlock_state || (ev.state & ModNumLockMask)) 326 if (numlock_state || (ev.state & ModNumLockMask))
283 { 327 {
284 numlock_state = (ev.state & ModNumLockMask); 328 numlock_state = (ev.state & ModNumLockMask);
285 PrivMode ((!numlock_state), PrivMode_aplKP); 329 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
293 Status status_return; 337 Status status_return;
294 338
295#if 0 339#if 0
296#ifdef X_HAVE_UTF8_STRING 340#ifdef X_HAVE_UTF8_STRING
297 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 341 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
298 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 342 len = Xutf8LookupString (Input_Context, &ev, kbuf,
299 KBUFSZ, &keysym, &status_return); 343 KBUFSZ, &keysym, &status_return);
300 else 344 else
301#endif 345#endif
302#endif 346#endif
303 { 347 {
… …
305 349
306 // the XOpenIM manpage lies about hardcoding the locale 350 // the XOpenIM manpage lies about hardcoding the locale
307 // at the point of XOpenIM, so temporarily switch locales 351 // at the point of XOpenIM, so temporarily switch locales
308 if (rs[Rs_imLocale]) 352 if (rs[Rs_imLocale])
309 SET_LOCALE (rs[Rs_imLocale]); 353 SET_LOCALE (rs[Rs_imLocale]);
354
310 // assume wchar_t == unicode or better 355 // assume wchar_t == unicode or better
311 len = XwcLookupString (Input_Context, &ev, wkbuf, 356 len = XwcLookupString (Input_Context, &ev, wkbuf,
312 KBUFSZ, &keysym, &status_return); 357 KBUFSZ, &keysym, &status_return);
358
313 if (rs[Rs_imLocale]) 359 if (rs[Rs_imLocale])
314 SET_LOCALE (locale); 360 SET_LOCALE (locale);
315 361
316 if (status_return == XLookupChars 362 if (status_return == XLookupChars
317 || status_return == XLookupBoth) 363 || status_return == XLookupBoth)
… …
338 || status_return == XLookupBoth; 384 || status_return == XLookupBoth;
339 } 385 }
340 else 386 else
341#endif 387#endif
342 { 388 {
343 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 389 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
344 valid_keysym = keysym != NoSymbol; 390 valid_keysym = keysym != NoSymbol;
345 } 391 }
346 392
347 if (valid_keysym) 393 if (valid_keysym)
348 { 394 {
395#ifdef KEYSYM_RESOURCE
396 if (keyboard->dispatch (this, keysym, ev.state))
397 return;
398#endif
399
349 if (TermWin.saveLines) 400 if (saveLines)
350 { 401 {
351#ifdef UNSHIFTED_SCROLLKEYS 402#ifdef UNSHIFTED_SCROLLKEYS
352 if (!ctrl && !meta) 403 if (!ctrl && !meta)
353#else 404#else
354 if (IS_SCROLL_MOD) 405 if (IS_SCROLL_MOD)
355#endif 406#endif
356 { 407 {
357 int lnsppg; 408 int lnsppg;
358 409
359#ifdef PAGING_CONTEXT_LINES 410#ifdef PAGING_CONTEXT_LINES
360 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 411 lnsppg = nrow - PAGING_CONTEXT_LINES;
361#else 412#else
362 lnsppg = TermWin.nrow * 4 / 5; 413 lnsppg = nrow * 4 / 5;
363#endif 414#endif
364 if (keysym == XK_Prior) 415 if (keysym == XK_Prior)
365 { 416 {
366 scr_page (UP, lnsppg); 417 scr_page (UP, lnsppg);
367 return; 418 return;
… …
395 scr_move_to (0, 1); 446 scr_move_to (0, 1);
396 return; 447 return;
397 } 448 }
398 else if (keysym == XK_End) 449 else if (keysym == XK_End)
399 { 450 {
400 scr_move_to (1, 0); 451 scr_move_to (1, 1);
401 return; 452 return;
402 } 453 }
403 } 454 }
404#endif 455#endif
405 } 456 }
… …
416 { 467 {
417 switch (keysym) 468 switch (keysym)
418 { 469 {
419 /* normal XTerm key bindings */ 470 /* normal XTerm key bindings */
420 case XK_Insert: /* Shift+Insert = paste mouse selection */ 471 case XK_Insert: /* Shift+Insert = paste mouse selection */
421 selection_request (ev.time, 0, 0); 472 selection_request (ev.time);
422 return; 473 return;
423#if TODO 474#if TODO
424 /* rxvt extras */ 475 /* rxvt extras */
425 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 476 case XK_KP_Add: /* Shift+KP_Add = bigger font */
426 change_font (FONT_UP); 477 change_font (FONT_UP);
… …
445 { 496 {
446 commit_iso14755 (); 497 commit_iso14755 ();
447 iso14755buf = ISO_14755_51; 498 iso14755buf = ISO_14755_51;
448# if ISO_14755 499# if ISO_14755
449 iso14755_51 (0); 500 iso14755_51 (0);
501# endif
502 return;
503 }
504 else if (keysym == XK_BackSpace)
505 {
506 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
507# if ISO_14755
508 iso14755_51 (iso14755buf & ISO_14755_MASK);
450# endif 509# endif
451 return; 510 return;
452 } 511 }
453 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
454 { 513 {
… …
459# endif 518# endif
460 return; 519 return;
461 } 520 }
462 else 521 else
463 { 522 {
464# if ENABLE_OVERLAY 523# if ISO_14755
465 scr_overlay_off (); 524 scr_overlay_off ();
466# endif 525# endif
467 iso14755buf = 0; 526 iso14755buf = 0;
468 } 527 }
469 } 528 }
470 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
471 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
472 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
473 { 532 {
474 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
475# if ENABLE_OVERLAY 534# if ISO_14755
476 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
477 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
478# endif 537# endif
479 } 538 }
480#endif 539#endif
481 540
482#ifdef PRINTPIPE 541#ifdef PRINTPIPE
483 if (keysym == XK_Print) 542 if (keysym == XK_Print)
484 { 543 {
485 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
486 return; 545 return;
487 } 546 }
488#endif 547#endif
489 548
490 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
491 { 550 {
492#ifdef KEYSYM_RESOURCE
493 if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
494 { 551 {
495 unsigned int l; 552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
496 const unsigned char *kbuf0;
497
498 kbuf0 = (Keysym_map[keysym & 0xFF]);
499 l = (unsigned int)*kbuf0++;
500
501 /* escape prefix */
502 if (meta
503# ifdef META8_OPTION
504 && meta_char == C0_ESC
505# endif
506 )
507 {
508 const unsigned char ch = C0_ESC;
509 tt_write (&ch, 1);
510 }
511
512 tt_write (kbuf0, l);
513 return;
514 }
515 else
516#endif
517 {
518 newlen = 1; 553 newlen = 1;
519 switch (keysym) 554 switch (keysym)
520 { 555 {
521#ifndef NO_BACKSPACE_KEY 556#ifndef NO_BACKSPACE_KEY
522 case XK_BackSpace: 557 case XK_BackSpace:
… …
525 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
526 ^ !!ctrl) ? '\b' : '\177'; 561 ^ !!ctrl) ? '\b' : '\177';
527 kbuf[1] = '\0'; 562 kbuf[1] = '\0';
528 } 563 }
529 else 564 else
530 strcpy (kbuf, key_backspace); 565 strcpy (kbuf, rs[Rs_backspace_key]);
531 break; 566 break;
532#endif 567#endif
533#ifndef NO_DELETE_KEY 568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Delete
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if (kp)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
534 case XK_Delete: 579 case XK_Delete:
535 strcpy (kbuf, key_delete); 580 strcpy (kbuf, rs[Rs_delete_key]);
536 break; 581 break;
537#endif 582#endif
538 case XK_Tab: 583 case XK_Tab:
539 if (shft) 584 if (shft)
540 strcpy (kbuf, "\033[Z"); 585 strcpy (kbuf, "\033[Z");
… …
555#ifdef XK_KP_Left 600#ifdef XK_KP_Left
556 case XK_KP_Up: /* \033Ox or standard */ 601 case XK_KP_Up: /* \033Ox or standard */
557 case XK_KP_Down: /* \033Or or standard */ 602 case XK_KP_Down: /* \033Or or standard */
558 case XK_KP_Right: /* \033Ov or standard */ 603 case XK_KP_Right: /* \033Ov or standard */
559 case XK_KP_Left: /* \033Ot or standard */ 604 case XK_KP_Left: /* \033Ot or standard */
560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 605 if (kp)
561 { 606 {
562 strcpy (kbuf, "\033OZ"); 607 strcpy (kbuf, "\033OZ");
563 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
564 break; 609 break;
565 } 610 }
… …
588 633
589#ifndef UNSHIFTED_SCROLLKEYS 634#ifndef UNSHIFTED_SCROLLKEYS
590# ifdef XK_KP_Prior 635# ifdef XK_KP_Prior
591 case XK_KP_Prior: 636 case XK_KP_Prior:
592 /* allow shift to override */ 637 /* allow shift to override */
593 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 638 if (kp)
594 { 639 {
595 strcpy (kbuf, "\033Oy"); 640 strcpy (kbuf, "\033Oy");
596 break; 641 break;
597 } 642 }
598 /* FALLTHROUGH */ 643 /* FALLTHROUGH */
… …
601 strcpy (kbuf, "\033[5~"); 646 strcpy (kbuf, "\033[5~");
602 break; 647 break;
603# ifdef XK_KP_Next 648# ifdef XK_KP_Next
604 case XK_KP_Next: 649 case XK_KP_Next:
605 /* allow shift to override */ 650 /* allow shift to override */
606 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 651 if (kp)
607 { 652 {
608 strcpy (kbuf, "\033Os"); 653 strcpy (kbuf, "\033Os");
609 break; 654 break;
610 } 655 }
611 /* FALLTHROUGH */ 656 /* FALLTHROUGH */
… …
614 strcpy (kbuf, "\033[6~"); 659 strcpy (kbuf, "\033[6~");
615 break; 660 break;
616#endif 661#endif
617 case XK_KP_Enter: 662 case XK_KP_Enter:
618 /* allow shift to override */ 663 /* allow shift to override */
619 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 664 if (kp)
620 { 665 {
621 strcpy (kbuf, "\033OM"); 666 strcpy (kbuf, "\033OM");
622 break; 667 break;
623 } 668 }
624 669
… …
641#ifdef XK_KP_Begin 686#ifdef XK_KP_Begin
642 case XK_KP_Begin: 687 case XK_KP_Begin:
643 strcpy (kbuf, "\033Ou"); 688 strcpy (kbuf, "\033Ou");
644 break; 689 break;
645 690
646 case XK_KP_Insert:
647 strcpy (kbuf, "\033Op");
648 break;
649
650 case XK_KP_Delete:
651 strcpy (kbuf, "\033On");
652 break;
653#endif 691#endif
654 case XK_KP_F1: /* "\033OP" */ 692 case XK_KP_F1: /* "\033OP" */
655 case XK_KP_F2: /* "\033OQ" */ 693 case XK_KP_F2: /* "\033OQ" */
656 case XK_KP_F3: /* "\033OR" */ 694 case XK_KP_F3: /* "\033OR" */
657 case XK_KP_F4: /* "\033OS" */ 695 case XK_KP_F4: /* "\033OS" */
… …
674 case XK_KP_6: /* "\033Ov" : "6" */ 712 case XK_KP_6: /* "\033Ov" : "6" */
675 case XK_KP_7: /* "\033Ow" : "7" */ 713 case XK_KP_7: /* "\033Ow" : "7" */
676 case XK_KP_8: /* "\033Ox" : "8" */ 714 case XK_KP_8: /* "\033Ox" : "8" */
677 case XK_KP_9: /* "\033Oy" : "9" */ 715 case XK_KP_9: /* "\033Oy" : "9" */
678 /* allow shift to override */ 716 /* allow shift to override */
679 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 717 if (kp)
680 { 718 {
681 strcpy (kbuf, "\033Oj"); 719 strcpy (kbuf, "\033Oj");
682 kbuf[2] += (keysym - XK_KP_Multiply); 720 kbuf[2] += (keysym - XK_KP_Multiply);
683 } 721 }
684 else 722 else
… …
689 break; 727 break;
690 728
691 case XK_Find: 729 case XK_Find:
692 strcpy (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
693 break; 731 break;
732
733#ifdef XK_KP_Insert
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if (kp)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
694 case XK_Insert: 743 case XK_Insert:
695 strcpy (kbuf, "\033[2~"); 744 strcpy (kbuf, "\033[2~");
696 break; 745 break;
697#ifdef DXK_Remove /* support for DEC remove like key */ 746#ifdef DXK_Remove /* support for DEC remove like key */
698 case DXK_Remove: 747 case DXK_Remove:
… …
705 strcpy (kbuf, "\033[4~"); 754 strcpy (kbuf, "\033[4~");
706 break; 755 break;
707#ifdef XK_KP_End 756#ifdef XK_KP_End
708 case XK_KP_End: 757 case XK_KP_End:
709 /* allow shift to override */ 758 /* allow shift to override */
710 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 759 if (kp)
711 { 760 {
712 strcpy (kbuf, "\033Oq"); 761 strcpy (kbuf, "\033Oq");
713 break; 762 break;
714 } 763 }
715 /* FALLTHROUGH */ 764 /* FALLTHROUGH */
… …
718 strcpy (kbuf, KS_END); 767 strcpy (kbuf, KS_END);
719 break; 768 break;
720#ifdef XK_KP_Home 769#ifdef XK_KP_Home
721 case XK_KP_Home: 770 case XK_KP_Home:
722 /* allow shift to override */ 771 /* allow shift to override */
723 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 772 if (kp)
724 { 773 {
725 strcpy (kbuf, "\033Ow"); 774 strcpy (kbuf, "\033Ow");
726 break; 775 break;
727 } 776 }
728 /* FALLTHROUGH */ 777 /* FALLTHROUGH */
… …
785 case XK_F35: /* "\033[49~" */ 834 case XK_F35: /* "\033[49~" */
786 FKEY (31, XK_F17); 835 FKEY (31, XK_F17);
787 break; 836 break;
788#undef FKEY 837#undef FKEY
789 default: 838 default:
790 if (len == 0 839 newlen = 0;
791 && (keysym & 0xfff0) != 0xff70 840 break;
792 && (keysym & 0xfff0) != 0xffe0)
793 /* generate a keycode for every remaining keypress */
794 sprintf ((char *)kbuf, "\033[%x;%xA", (unsigned char)ev.state, (unsigned short)keysym);
795 } 841 }
796 842
797 if (newlen) 843 if (newlen)
798 len = strlen (kbuf); 844 len = strlen (kbuf);
799 } 845 }
… …
815 else if (keysym == XK_ISO_Left_Tab) 861 else if (keysym == XK_ISO_Left_Tab)
816 { 862 {
817 strcpy (kbuf, "\033[Z"); 863 strcpy (kbuf, "\033[Z");
818 len = 3; 864 len = 3;
819 } 865 }
820 else if (len == 0
821 && (keysym & 0xffe0) != 0xfe00
822 && (keysym < 0xfe50 || keysym > 0xfe6f))
823 {
824 /* generate a keycode for every remaining keypress */
825 len = sprintf ((char *)kbuf, "\033[%x;%xA", (unsigned char)ev.state, (unsigned short)keysym);
826 }
827 else 866 else
828 { 867 {
829#ifdef META8_OPTION 868#ifdef META8_OPTION
830 /* set 8-bit on */ 869 /* set 8-bit on */
831 if (meta && (meta_char == 0x80)) 870 if (meta && (meta_char == 0x80))
832 { 871 {
833 unsigned char *ch; 872 char *ch;
834 873
835 for (ch = kbuf; ch < kbuf + len; ch++) 874 for (ch = kbuf; ch < kbuf + len; ch++)
836 *ch |= 0x80; 875 *ch |= 0x80;
837 876
838 meta = 0; 877 meta = 0;
… …
840#endif 879#endif
841 /* nil */ ; 880 /* nil */ ;
842 } 881 }
843 } 882 }
844 883
884 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
885 return;
886
845 if (len <= 0) 887 if (len <= 0)
846 return; /* not mapped */ 888 return; /* not mapped */
847 889
848 if (options & Opt_scrollTtyKeypress) 890 if (option (Opt_scrollTtyKeypress))
849 if (TermWin.view_start) 891 if (view_start)
850 { 892 {
851 TermWin.view_start = 0; 893 view_start = 0;
852 want_refresh = 1; 894 want_refresh = 1;
853 } 895 }
854 896
855 /* 897 /*
856 * these modifications only affect the static keybuffer 898 * these modifications only affect the static keybuffer
… …
871#ifdef META8_OPTION 913#ifdef META8_OPTION
872 && meta_char == C0_ESC 914 && meta_char == C0_ESC
873#endif 915#endif
874 ) 916 )
875 { 917 {
876 const unsigned char ch = C0_ESC; 918 const char ch = C0_ESC;
877 tt_write (&ch, 1); 919 tt_write (&ch, 1);
878 } 920 }
879 921
880#if defined(DEBUG_CMD)
881 /* Display keyboard buffer contents */
882 unsigned char *p;
883 int i;
884
885 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
886 for (i = 0, p = kbuf; i < len; i++, p++)
887 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
888 fprintf (stderr, "'\n");
889#endif /* DEBUG_CMD */
890 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
891} 923}
892/*}}} */
893 924
894#if (MENUBAR_MAX) 925void
895/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 926rxvt_term::key_release (XKeyEvent &ev)
896/* attempt to `write' count to the input buffer */ 927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ISO_14755
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ISO_14755
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
1001
1002#if defined (KEYSYM_RESOURCE)
897unsigned int 1003unsigned int
898rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
899{ 1005{
900 unsigned int n, s; 1006 unsigned int n, s;
901 1007
902 n = cmdbuf_ptr - cmdbuf_base; 1008 n = cmdbuf_ptr - cmdbuf_base;
903 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
922 1028
923 cmd_parse (); 1029 cmd_parse ();
924 1030
925 return 0; 1031 return 0;
926} 1032}
927#endif /* MENUBAR_MAX */ 1033#endif
928 1034
929void 1035void
930rxvt_term::flush () 1036rxvt_term::flush ()
931{ 1037{
932 flush_ev.stop (); 1038 flush_ev.stop ();
933 1039
934#ifdef TRANSPARENT 1040#ifdef HAVE_BG_PIXMAP
935 if (want_full_refresh) 1041 if (bgPixmap.check_clearChanged ())
936 { 1042 {
937 want_full_refresh = 0; 1043// scr_clear (true); This needs to be researched further!
938 scr_clear ();
939 scr_touch (false); 1044 scr_touch (false);
940 } 1045 }
941#endif 1046#endif
942 1047
943 if (want_refresh) 1048 if (want_refresh)
944 { 1049 {
1050 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1051 {
1052 int row = view_start;
1053 int end_row = row + nrow;
1054
1055 while (row > top_row && ROW (row - 1).is_longer ())
1056 --row;
1057
1058 do
1059 {
1060 int start_row = row;
1061 line_t *l;
1062
1063 do
1064 {
1065 l = &ROW (row++);
1066
1067 if (!(l->f & LINE_FILTERED))
1068 {
1069 // line not filtered, mark it as filtered
1070 l->f |= LINE_FILTERED;
1071 while (l->is_longer ())
1072 {
1073 l = &ROW (row++);
1074 l->f |= LINE_FILTERED;
1075 }
1076
1077 // and filter it
1078 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1079
1080 break;
1081 }
1082 }
1083 while (l->is_longer () && row < end_row);
1084 }
1085 while (row < end_row);
1086 }
1087
945 scr_refresh (refresh_type); 1088 scr_refresh ();
946 scrollbar_show (1); 1089 scrollbar_show (1);
947#ifdef USE_XIM 1090#ifdef USE_XIM
948 IMSendSpot (); 1091 IMSendSpot ();
949#endif 1092#endif
950 } 1093 }
… …
953} 1096}
954 1097
955void 1098void
956rxvt_term::check_cb (check_watcher &w) 1099rxvt_term::check_cb (check_watcher &w)
957{ 1100{
958 SET_R (this); 1101 make_current ();
959 SET_LOCALE (locale);
960 1102
961 display->flush (); 1103 display->flush ();
962 1104
963 if (want_refresh && !flush_ev.active) 1105 if (want_refresh && !flush_ev.active)
964 flush_ev.start (NOW + 0.01); 1106 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
965} 1107}
966 1108
967void 1109void
968rxvt_term::flush_cb (time_watcher &w) 1110rxvt_term::flush_cb (time_watcher &w)
969{ 1111{
970 SET_R (this); 1112 make_current ();
971 SET_LOCALE (locale);
972 1113
973 refresh_limit = 1;
974 refresh_count = 0; 1114 refresh_count = 0;
975 flush (); 1115 flush ();
976} 1116}
977 1117
978#ifdef CURSOR_BLINK 1118#ifdef CURSOR_BLINK
… …
980rxvt_term::cursor_blink_cb (time_watcher &w) 1120rxvt_term::cursor_blink_cb (time_watcher &w)
981{ 1121{
982 hidden_cursor = !hidden_cursor; 1122 hidden_cursor = !hidden_cursor;
983 want_refresh = 1; 1123 want_refresh = 1;
984 1124
985 w.start (w.at + BLINK_INTERVAL); 1125 w.start (w.at + CURSOR_BLINK_INTERVAL);
986} 1126}
987#endif 1127#endif
988 1128
989#ifdef TEXT_BLINK 1129#ifdef TEXT_BLINK
990void 1130void
… …
1004rxvt_term::cont_scroll_cb (time_watcher &w) 1144rxvt_term::cont_scroll_cb (time_watcher &w)
1005{ 1145{
1006 if ((scrollbar_isUp() || scrollbar_isDn()) && 1146 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1007 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1147 scr_page (scrollbar_isUp() ? UP : DN, 1))
1008 { 1148 {
1009 refresh_type |= SMOOTH_REFRESH;
1010 want_refresh = 1; 1149 want_refresh = 1;
1011 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1150 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1012 } 1151 }
1013} 1152}
1014#endif 1153#endif
… …
1018rxvt_term::sel_scroll_cb (time_watcher &w) 1157rxvt_term::sel_scroll_cb (time_watcher &w)
1019{ 1158{
1020 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1159 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1021 { 1160 {
1022 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1161 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1023 refresh_type |= SMOOTH_REFRESH;
1024 want_refresh = 1; 1162 want_refresh = 1;
1025 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1163 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1026 } 1164 }
1027} 1165}
1028#endif 1166#endif
… …
1033{ 1171{
1034 if (mouse_slip_wheel_speed == 0 1172 if (mouse_slip_wheel_speed == 0
1035 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1173 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1036 : scr_page (UP, mouse_slip_wheel_speed)) 1174 : scr_page (UP, mouse_slip_wheel_speed))
1037 { 1175 {
1038 refresh_type |= SMOOTH_REFRESH; 1176 if (view_start == top_row || view_start == 0)
1177 mouse_slip_wheel_speed = 0;
1178
1039 want_refresh = 1; 1179 want_refresh = 1;
1040 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1180 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1041 } 1181 }
1042} 1182}
1043#endif 1183#endif
1044 1184
1185#if LINUX_YIELD_HACK
1186static struct event_handler
1187{
1188 check_watcher yield_ev;
1189
1190 void yield_cb (check_watcher &w)
1191 {
1192 // this should really be sched_yield(), but the linux guys thought
1193 // that giving a process calling sched_yield () less cpu time than
1194 // ones with high nice levels is a useful thing to do. It surely is is
1195 // allowed by the sus... as is returning ENOSYS.
1196
1197 struct timespec ts = { 0, 0 };
1198 nanosleep (&ts, 0);
1199
1200 w.stop ();
1201 }
1202
1203 event_handler ()
1204 : yield_ev (this, &event_handler::yield_cb)
1205 {
1206 }
1207} event_handler;
1208#endif
1209
1045bool 1210bool
1046rxvt_term::pty_fill () 1211rxvt_term::pty_fill ()
1047{ 1212{
1048 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1213 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1049 1214
1050 if (CBUFSIZ == n) 1215 if (CBUFSIZ == n)
1051 { 1216 {
1052 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1217 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1053 n = 0; 1218 n = 0;
1054 } 1219 }
1055 1220
1056 memmove (cmdbuf_base, cmdbuf_ptr, n); 1221 memmove (cmdbuf_base, cmdbuf_ptr, n);
1057 cmdbuf_ptr = cmdbuf_base; 1222 cmdbuf_ptr = cmdbuf_base;
1058 cmdbuf_endp = cmdbuf_ptr + n; 1223 cmdbuf_endp = cmdbuf_ptr + n;
1059 1224
1060 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1225 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1061 1226
1062 if (n > 0) 1227 if (r > 0)
1063 { 1228 {
1064 cmdbuf_endp += n; 1229 cmdbuf_endp += r;
1065 return true; 1230 return true;
1066 } 1231 }
1067 else if (n < 0 && errno != EAGAIN) 1232 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1233 {
1234#if LINUX_YIELD_HACK
1235 if (display->is_local)
1236 event_handler.yield_ev.start ();
1237#endif
1238 }
1239 else
1240 {
1241 pty_ev.stop ();
1242
1243 if (!option (Opt_hold))
1068 destroy (); 1244 destroy ();
1069 1245 }
1246
1070 return false; 1247 return false;
1071} 1248}
1072 1249
1073void 1250void
1074rxvt_term::pty_cb (io_watcher &w, short revents) 1251rxvt_term::pty_cb (io_watcher &w, short revents)
1075{ 1252{
1076 SET_R (this); 1253 make_current ();
1077 SET_LOCALE (locale);
1078 1254
1079 if (revents & EVENT_READ) 1255 if (revents & EVENT_READ)
1080 // loop, but don't allow a single term to monopolize us 1256 // loop, but don't allow a single term to monopolize us
1081 while (pty_fill ()) 1257 while (pty_fill ())
1082 if (cmd_parse ()) 1258 if (cmd_parse ())
… …
1087} 1263}
1088 1264
1089void 1265void
1090rxvt_term::pointer_unblank () 1266rxvt_term::pointer_unblank ()
1091{ 1267{
1092 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1268 XDefineCursor (dpy, vt, TermWin_cursor);
1093 recolour_cursor (); 1269 recolour_cursor ();
1094 1270
1095#ifdef POINTER_BLANK 1271#ifdef POINTER_BLANK
1096 hidden_pointer = 0; 1272 hidden_pointer = 0;
1097 1273
1098 if (options & Opt_pointerBlank) 1274 if (option (Opt_pointerBlank))
1099 pointer_ev.start (NOW + pointerBlankDelay); 1275 pointer_ev.start (NOW + pointerBlankDelay);
1100#endif 1276#endif
1101} 1277}
1102 1278
1103#ifdef POINTER_BLANK 1279#ifdef POINTER_BLANK
1104void 1280void
1105rxvt_term::pointer_blank () 1281rxvt_term::pointer_blank ()
1106{ 1282{
1107 if (! (options & Opt_pointerBlank)) 1283 if (!option (Opt_pointerBlank))
1108 return; 1284 return;
1109 1285
1110 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1286 XDefineCursor (dpy, vt, display->blank_cursor);
1111 XFlush (display->display); 1287 XFlush (dpy);
1112 1288
1113 hidden_pointer = 1; 1289 hidden_pointer = 1;
1114} 1290}
1115 1291
1116void 1292void
1117rxvt_term::pointer_cb (time_watcher &w) 1293rxvt_term::pointer_cb (time_watcher &w)
1118{ 1294{
1119 SET_R (this); 1295 make_current ();
1120 SET_LOCALE (locale);
1121 1296
1122 pointer_blank (); 1297 pointer_blank ();
1123} 1298}
1124#endif 1299#endif
1125 1300
… …
1190 (32 + button_number + key_state), 1365 (32 + button_number + key_state),
1191 (32 + x + 1), 1366 (32 + x + 1),
1192 (32 + y + 1)); 1367 (32 + y + 1));
1193} 1368}
1194 1369
1195#ifdef USING_W11LIB
1196void
1197rxvt_W11_process_x_event (XEvent *ev)
1198{
1199 rxvt_t *r = rxvt_get_r ();
1200
1201 x_cb (*ev);
1202}
1203#endif
1204
1205/*{{{ process an X event */ 1370/*{{{ process an X event */
1206void 1371void
1207rxvt_term::x_cb (XEvent &ev) 1372rxvt_term::x_cb (XEvent &ev)
1208{ 1373{
1209 SET_R (this); 1374 make_current ();
1210 SET_LOCALE (locale);
1211 1375
1212#if defined(CURSOR_BLINK) 1376 dLocal (Display *, dpy);
1213 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1214 {
1215 if (hidden_cursor)
1216 {
1217 hidden_cursor = 0;
1218 want_refresh = 1;
1219 }
1220 1377
1221 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1378 if (ev.xany.window == vt
1222 } 1379 && SHOULD_INVOKE (HOOK_X_EVENT)
1223#endif 1380 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1381 return;
1224 1382
1225#if defined(POINTER_BLANK) 1383 // for XQueryPointer
1226 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1227 {
1228 if (ev.type == MotionNotify
1229 || ev.type == ButtonPress
1230 || ev.type == ButtonRelease)
1231 if (hidden_pointer)
1232 pointer_unblank ();
1233
1234 if (ev.type == KeyPress && hidden_pointer == 0)
1235 pointer_blank ();
1236 }
1237#endif
1238
1239 Window unused_root, unused_child; 1384 Window unused_root, unused_child;
1240 int unused_root_x, unused_root_y; 1385 int unused_root_x, unused_root_y;
1241 unsigned int unused_mask; 1386 unsigned int unused_mask;
1242 1387
1243 switch (ev.type) 1388 switch (ev.type)
1244 { 1389 {
1245 case KeyPress: 1390 case KeyPress:
1246#if ISO_14755 1391 key_press (ev.xkey);
1247 if (!(iso14755buf & ISO_14755_52))
1248#endif
1249 lookup_key (ev.xkey);
1250
1251 break; 1392 break;
1252 1393
1253 case KeyRelease: 1394 case KeyRelease:
1254 { 1395 key_release (ev.xkey);
1255#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1256 KeySym ks;
1257
1258 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1259#endif
1260
1261#if ENABLE_FRILLS || ISO_14755
1262 // ISO 14755 support
1263 if (iso14755buf)
1264 if (iso14755buf & ISO_14755_52)
1265 {
1266# if ENABLE_OVERLAY
1267 scr_overlay_off ();
1268# endif
1269# if ISO_14755
1270 // iso14755 part 5.2 handling: release time
1271 // first: controls
1272 if ((ev.xkey.state & ControlMask)
1273 && ((ks >= 0x40 && ks <= 0x5f)
1274 || (ks >= 0x61 && ks <= 0x7f)))
1275 {
1276 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1277 commit_iso14755 ();
1278 return; // case-break;
1279 }
1280
1281 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1282 if (i[0] == ks)
1283 {
1284 iso14755buf = ISO_14755_51 | i[1];
1285 commit_iso14755 ();
1286 return; // case-break;
1287 }
1288
1289 scr_bell ();
1290# endif
1291 iso14755buf = 0;
1292 break;
1293 }
1294 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1295 {
1296# if ENABLE_OVERLAY
1297 scr_overlay_off ();
1298# endif
1299 if (iso14755buf & ISO_14755_51)
1300 commit_iso14755 ();
1301#if ISO_14755
1302 else if (iso14755buf & ISO_14755_STARTED)
1303 {
1304 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1305
1306 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1307 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1308 }
1309# endif
1310 else
1311 iso14755buf = 0;
1312 }
1313#endif
1314
1315#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1316 if (!(ev.xkey.state & ControlMask))
1317 slip_wheel_ev.stop ();
1318 else if (ks == XK_Control_L || ks == XK_Control_R)
1319 mouse_slip_wheel_speed = 0;
1320#endif
1321 break; 1396 break;
1322 }
1323 1397
1324 case ButtonPress: 1398 case ButtonPress:
1325 button_press (ev.xbutton); 1399 button_press (ev.xbutton);
1326 break; 1400 break;
1327 1401
… …
1329 button_release (ev.xbutton); 1403 button_release (ev.xbutton);
1330 break; 1404 break;
1331 1405
1332 case ClientMessage: 1406 case ClientMessage:
1333 if (ev.xclient.format == 32 1407 if (ev.xclient.format == 32
1334 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1408 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1335 destroy ();
1336#ifdef OFFIX_DND
1337 /* OffiX Dnd (drag 'n' drop) protocol */
1338 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1339 && (ev.xclient.data.l[0] == DndFile
1340 || ev.xclient.data.l[0] == DndDir
1341 || ev.xclient.data.l[0] == DndLink))
1342 { 1409 {
1343 /* Get Dnd data */ 1410 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1344 Atom ActualType; 1411 {
1345 int ActualFormat; 1412 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1346 unsigned char *data; 1413 {
1347 unsigned long Size, RemainingBytes; 1414 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1348 1415 {
1349 XGetWindowProperty (display->display, display->root, 1416 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1350 xa[XA_DNDSELECTION], 1417 destroy ();
1351 0L, 1000000L, 1418 }
1352 False, AnyPropertyType, 1419#if ENABLE_EWMH
1353 &ActualType, &ActualFormat, 1420 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1354 &Size, &RemainingBytes, 1421 XSendEvent (dpy, ev.xclient.window = display->root,
1422 False, SubstructureRedirectMask | SubstructureNotifyMask,
1355 &data); 1423 &ev);
1356 set_string_property (XA_CUT_BUFFER0, data); 1424#endif
1357 XFree (data); 1425 }
1358 selection_paste (display->root, XA_CUT_BUFFER0, true); 1426 }
1359 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1427#if ENABLE_XEMBED
1428 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1429 {
1430 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1431 focus_in ();
1432 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1433 focus_out ();
1434 }
1435#endif
1360 } 1436 }
1361#endif /* OFFIX_DND */
1362 break;
1363
1364 case MappingNotify:
1365 XRefreshKeyboardMapping (&ev.xmapping);
1366 break; 1437 break;
1367 1438
1368 /* 1439 /*
1369 * XXX: this is not the _current_ arrangement 1440 * XXX: this is not the _current_ arrangement
1370 * Here's my conclusion: 1441 * Here's my conclusion:
… …
1389 break; 1460 break;
1390 } 1461 }
1391 break; 1462 break;
1392 1463
1393 case FocusIn: 1464 case FocusIn:
1394 if (!TermWin.focus) 1465 if (ev.xfocus.detail != NotifyInferior
1466 && ev.xfocus.detail != NotifyPointer
1467 && ev.xfocus.mode != NotifyGrab)
1468 focus_in ();
1469 break;
1470
1471 case FocusOut:
1472 if (ev.xfocus.detail != NotifyInferior
1473 && ev.xfocus.detail != NotifyPointer
1474 && ev.xfocus.mode != NotifyGrab)
1475 focus_out ();
1476 break;
1477
1478 case ConfigureNotify:
1479 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1480 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1481 szHint.width, szHint.height); */
1482 if (ev.xconfigure.window == parent[0])
1395 { 1483 {
1396 TermWin.focus = 1; 1484 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1397 want_refresh = 1;
1398#ifdef USE_XIM
1399 if (Input_Context != NULL)
1400 { 1485 ;
1401 IMSetStatusPosition ();
1402 XSetICFocus (Input_Context);
1403 }
1404#endif
1405#ifdef CURSOR_BLINK
1406 if (options & Opt_cursorBlink)
1407 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1408#endif
1409#ifdef OFF_FOCUS_FADING
1410 if (rs[Rs_fade])
1411 {
1412 pix_colors = pix_colors_focused;
1413 scr_recolour ();
1414 }
1415#endif
1416 1486
1417 }
1418 break;
1419
1420 case FocusOut:
1421 if (TermWin.focus)
1422 {
1423 TermWin.focus = 0;
1424 want_refresh = 1;
1425
1426#if ENABLE_FRILLS || ISO_14755
1427 iso14755buf = 0;
1428#endif
1429#if ENABLE_OVERLAY
1430 scr_overlay_off ();
1431#endif
1432#ifdef USE_XIM
1433 if (Input_Context != NULL)
1434 XUnsetICFocus (Input_Context);
1435#endif
1436#ifdef CURSOR_BLINK
1437 if (options & Opt_cursorBlink)
1438 cursor_blink_ev.stop ();
1439 hidden_cursor = 0;
1440#endif
1441#ifdef OFF_FOCUS_FADING
1442 if (rs[Rs_fade])
1443 {
1444 pix_colors = pix_colors_unfocused;
1445 scr_recolour ();
1446 }
1447#endif
1448 }
1449 break;
1450
1451 case ConfigureNotify:
1452 if (ev.xconfigure.window == TermWin.parent[0])
1453 {
1454 int height, width;
1455
1456 do
1457 { /* Wrap lots of configures into one */
1458 width = ev.xconfigure.width;
1459 height = ev.xconfigure.height;
1460 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1461 }
1462 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1463
1464 if (szHint.width != width || szHint.height != height) 1487 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1465 { 1488 {
1466 seen_resize = 1; 1489 seen_resize = 1;
1467 resize_all_windows (width, height, 1); 1490 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1468 } 1491 }
1469 1492 else
1470#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1493 {
1471 if (options & Opt_transparent) 1494#ifdef HAVE_BG_PIXMAP
1472 check_our_parents (); 1495 if (bgPixmap.window_position_sensitive ())
1496 update_background ();
1473#endif 1497#endif
1498 }
1499 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1474 } 1500 }
1475 break; 1501 break;
1476 1502
1477 case PropertyNotify: 1503 case PropertyNotify:
1504 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1478 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1505 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1479 && ev.xproperty.state == PropertyNewValue) 1506 && ev.xproperty.state == PropertyNewValue)
1480 selection_property (ev.xproperty.window, ev.xproperty.atom); 1507 selection_property (ev.xproperty.window, ev.xproperty.atom);
1481 1508
1482 break; 1509 break;
1483 1510
1484 case SelectionClear: 1511 case SelectionClear:
1485 selection_clear (); 1512 selection_clear ();
… …
1492 1519
1493 case SelectionRequest: 1520 case SelectionRequest:
1494 selection_send (ev.xselectionrequest); 1521 selection_send (ev.xselectionrequest);
1495 break; 1522 break;
1496 1523
1524 case MapNotify:
1525 mapped = 1;
1526#ifdef TEXT_BLINK
1527 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1528#endif
1529 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1530 break;
1531
1497 case UnmapNotify: 1532 case UnmapNotify:
1498 TermWin.mapped = 0; 1533 mapped = 0;
1499#ifdef TEXT_BLINK 1534#ifdef TEXT_BLINK
1500 text_blink_ev.stop (); 1535 text_blink_ev.stop ();
1501#endif 1536#endif
1537 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1502 break; 1538 break;
1503
1504 case MapNotify:
1505 TermWin.mapped = 1;
1506#ifdef TEXT_BLINK
1507 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1508#endif
1509 break;
1510
1511#ifdef TRANSPARENT
1512 case ReparentNotify:
1513 rootwin_cb (ev);
1514 break;
1515#endif /* TRANSPARENT */
1516 1539
1517 case GraphicsExpose: 1540 case GraphicsExpose:
1518 case Expose: 1541 case Expose:
1519 if (ev.xany.window == TermWin.vt) 1542 if (ev.xany.window == vt)
1520 { 1543 {
1521 do 1544 do
1545 {
1522 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1523 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, False);
1548 }
1524 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1549 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1525 1550
1526 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1551 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1527 1552
1528 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1554 {
1529 scr_expose (ev.xexpose.x, ev.xexpose.y, 1555 scr_expose (ev.xexpose.x, ev.xexpose.y,
1530 ev.xexpose.width, ev.xexpose.height, False); 1556 ev.xexpose.width, ev.xexpose.height, False);
1531 1557 }
1532 scr_refresh (refresh_type); 1558 want_refresh = 1;
1533 } 1559 }
1534 else 1560 else
1535 { 1561 {
1536 XEvent unused_event; 1562 XEvent unused_event;
1537 1563
1538 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1564 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1539 ; 1565 ;
1540 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1566 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1541 ; 1567 ;
1542 1568
1543 if (isScrollbarWindow (ev.xany.window)) 1569 if (isScrollbarWindow (ev.xany.window))
1544 { 1570 {
1545 scrollBar.setIdle (); 1571 scrollBar.setIdle ();
1546 scrollbar_show (0); 1572 scrollbar_show (0);
1547 } 1573 }
1548#ifdef MENUBAR
1549 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1550 menubar_expose ();
1551#endif
1552
1553#ifdef TRANSPARENT
1554 if (am_transparent && ev.xany.window == TermWin.parent[0])
1555 XClearWindow (display->display, ev.xany.window);
1556#endif
1557 } 1574 }
1558 break; 1575 break;
1559 1576
1560 case MotionNotify: 1577 case MotionNotify:
1561#ifdef POINTER_BLANK 1578#ifdef POINTER_BLANK
1562 if (hidden_pointer) 1579 if (hidden_pointer)
1563 pointer_unblank (); 1580 pointer_unblank ();
1564#endif 1581#endif
1565#if MENUBAR
1566 if (isMenuBarWindow (ev.xany.window))
1567 {
1568 menubar_control (ev.xbutton);
1569 break;
1570 }
1571#endif
1572 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1582 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1573 break; 1583 break;
1574 1584
1575 if (ev.xany.window == TermWin.vt) 1585 if (ev.xany.window == vt)
1576 { 1586 {
1587 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1588 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1589 ; // nop
1577 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1590 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1578 { 1591 {
1579 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1592 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1580 ; 1593 ;
1581 1594
1582 XQueryPointer (display->display, TermWin.vt, 1595 XQueryPointer (dpy, vt,
1583 &unused_root, &unused_child, 1596 &unused_root, &unused_child,
1584 &unused_root_x, &unused_root_y, 1597 &unused_root_x, &unused_root_y,
1585 &ev.xbutton.x, &ev.xbutton.y, 1598 &ev.xbutton.x, &ev.xbutton.y,
1586 &ev.xbutton.state); 1599 &ev.xbutton.state);
1587#ifdef MOUSE_THRESHOLD 1600#ifdef MOUSE_THRESHOLD
… …
1599#endif 1612#endif
1600 selection_extend (ev.xbutton.x, ev.xbutton.y, 1613 selection_extend (ev.xbutton.x, ev.xbutton.y,
1601 ev.xbutton.state & Button3Mask ? 2 : 0); 1614 ev.xbutton.state & Button3Mask ? 2 : 0);
1602 1615
1603#ifdef SELECTION_SCROLLING 1616#ifdef SELECTION_SCROLLING
1604 if (ev.xbutton.y < TermWin.int_bwidth 1617 if (ev.xbutton.y < int_bwidth
1605 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1618 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1606 { 1619 {
1607 int dist; 1620 int dist;
1608 1621
1609 /* don't clobber the current delay if we are 1622 /* don't clobber the current delay if we are
1610 * already in the middle of scrolling. 1623 * already in the middle of scrolling.
… …
1618 selection_save_x = ev.xbutton.x; 1631 selection_save_x = ev.xbutton.x;
1619 selection_save_y = ev.xbutton.y; 1632 selection_save_y = ev.xbutton.y;
1620 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1633 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1621 1634
1622 /* calc number of lines to scroll */ 1635 /* calc number of lines to scroll */
1623 if (ev.xbutton.y < TermWin.int_bwidth) 1636 if (ev.xbutton.y < int_bwidth)
1624 { 1637 {
1625 scroll_selection_dir = UP; 1638 scroll_selection_dir = UP;
1626 dist = TermWin.int_bwidth - ev.xbutton.y; 1639 dist = int_bwidth - ev.xbutton.y;
1627 } 1640 }
1628 else 1641 else
1629 { 1642 {
1630 scroll_selection_dir = DN; 1643 scroll_selection_dir = DN;
1631 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1644 dist = ev.xbutton.y - (int_bwidth + height);
1632 } 1645 }
1633 1646
1634 scroll_selection_lines = Pixel2Height (dist) 1647 scroll_selection_lines = Pixel2Height (dist)
1635 / SELECTION_SCROLL_LINE_SPEEDUP 1648 / SELECTION_SCROLL_LINE_SPEEDUP
1636 + 1; 1649 + 1;
1637 MIN_IT (scroll_selection_lines, 1650 min_it (scroll_selection_lines,
1638 SELECTION_SCROLL_MAX_LINES); 1651 SELECTION_SCROLL_MAX_LINES);
1639 } 1652 }
1640 else 1653 else
1641 { 1654 {
1642 /* we are within the text window, so we 1655 /* we are within the text window, so we
… …
1651#endif 1664#endif
1652 } 1665 }
1653 } 1666 }
1654 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1667 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1655 { 1668 {
1656 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1669 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1657 MotionNotify, &ev)) 1670 MotionNotify, &ev))
1658 ; 1671 ;
1659 1672
1660 XQueryPointer (display->display, scrollBar.win, 1673 XQueryPointer (dpy, scrollBar.win,
1661 &unused_root, &unused_child, 1674 &unused_root, &unused_child,
1662 &unused_root_x, &unused_root_y, 1675 &unused_root_x, &unused_root_y,
1663 &ev.xbutton.x, &ev.xbutton.y, 1676 &ev.xbutton.x, &ev.xbutton.y,
1664 &unused_mask); 1677 &unused_mask);
1665 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1678 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1666 scrollbar_size ()); 1679 scrollbar_size ());
1667 scr_refresh (refresh_type);
1668 refresh_limit = 0; 1680 want_refresh = 1;
1669 scrollbar_show (1); 1681 scrollbar_show (1);
1670 } 1682 }
1671 break; 1683 break;
1672 } 1684 }
1673}
1674 1685
1675#if TRANSPARENT 1686#if defined(CURSOR_BLINK)
1687 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1688 {
1689 if (hidden_cursor)
1690 {
1691 hidden_cursor = 0;
1692 want_refresh = 1;
1693 }
1694
1695 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1696 }
1697#endif
1698
1699#if defined(POINTER_BLANK)
1700 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1701 {
1702 if (ev.type == MotionNotify
1703 || ev.type == ButtonPress
1704 || ev.type == ButtonRelease)
1705 if (hidden_pointer)
1706 pointer_unblank ();
1707
1708 if (ev.type == KeyPress && hidden_pointer == 0)
1709 pointer_blank ();
1710 }
1711#endif
1712}
1713
1714void
1715rxvt_term::focus_in ()
1716{
1717 if (!focus)
1718 {
1719 focus = 1;
1720 want_refresh = 1;
1721
1722 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1723
1724#if USE_XIM
1725 if (Input_Context != NULL)
1726 {
1727 IMSetPosition ();
1728 XSetICFocus (Input_Context);
1729 }
1730#endif
1731#if CURSOR_BLINK
1732 if (option (Opt_cursorBlink))
1733 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1734#endif
1735#if OFF_FOCUS_FADING
1736 if (rs[Rs_fade])
1737 {
1738 pix_colors = pix_colors_focused;
1739 scr_recolour ();
1740 }
1741#endif
1742#if ENABLE_FRILLS
1743 if (option (Opt_urgentOnBell))
1744 {
1745 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1746 {
1747 h->flags &= ~XUrgencyHint;
1748 XSetWMHints (dpy, parent[0], h);
1749 }
1750 }
1751#endif
1752 }
1753}
1754
1755void
1756rxvt_term::focus_out ()
1757{
1758 if (focus)
1759 {
1760 focus = 0;
1761 want_refresh = 1;
1762
1763 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1764
1765#if ENABLE_FRILLS || ISO_14755
1766 if (iso14755buf)
1767 {
1768 iso14755buf = 0;
1769# if ISO_14755
1770 scr_overlay_off ();
1771# endif
1772 }
1773#endif
1774#if USE_XIM
1775 if (Input_Context != NULL)
1776 XUnsetICFocus (Input_Context);
1777#endif
1778#if CURSOR_BLINK
1779 if (option (Opt_cursorBlink))
1780 cursor_blink_ev.stop ();
1781 hidden_cursor = 0;
1782#endif
1783#if OFF_FOCUS_FADING
1784 if (rs[Rs_fade])
1785 {
1786 pix_colors = pix_colors_unfocused;
1787 scr_recolour ();
1788 }
1789#endif
1790 }
1791}
1792
1793void
1794rxvt_term::update_fade_color (unsigned int idx)
1795{
1796#if OFF_FOCUS_FADING
1797 if (rs[Rs_fade])
1798 {
1799 rgba c;
1800 pix_colors [Color_fade].get (c);
1801 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1802 }
1803#endif
1804}
1805
1806#if ENABLE_TRANSPARENCY || ENABLE_PERL
1676void 1807void
1677rxvt_term::rootwin_cb (XEvent &ev) 1808rxvt_term::rootwin_cb (XEvent &ev)
1678{ 1809{
1679 SET_R (this); 1810 make_current ();
1680 SET_LOCALE (locale);
1681 1811
1812 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1813 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1814 return;
1815
1816# if ENABLE_TRANSPARENCY
1682 switch (ev.type) 1817 switch (ev.type)
1683 { 1818 {
1684 case PropertyNotify: 1819 case PropertyNotify:
1685 /* 1820 /*
1686 * if user used some Esetroot compatible prog to set the root bg, 1821 * if user used some Esetroot compatible prog to set the root bg,
1687 * use the property to determine the pixmap. We use it later on. 1822 * use the property to determine the pixmap. We use it later on.
1688 */ 1823 */
1689 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1824 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1690 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1825 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1691 return; 1826 {
1692 1827 bgPixmap.set_root_pixmap ();
1693 /* FALLTHROUGH */ 1828 update_background ();
1694 case ReparentNotify: 1829 }
1695 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1696 want_refresh = want_full_refresh = 1;
1697 break; 1830 break;
1698 } 1831 }
1832# endif
1699} 1833}
1700#endif 1834#endif
1701 1835
1702void 1836void
1703rxvt_term::button_press (XButtonEvent &ev) 1837rxvt_term::button_press (XButtonEvent &ev)
1704{ 1838{
1705 int reportmode = 0, clickintime; 1839 int reportmode = 0, clickintime;
1706 1840
1707 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1841 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1842
1708 if (!bypass_keystate) 1843 if (!bypass_keystate)
1709 reportmode = !! (priv_modes & PrivMode_mouse_report); 1844 reportmode = !! (priv_modes & PrivMode_mouse_report);
1710 1845
1711 /* 1846 /*
1712 * VT window processing of button press 1847 * VT window processing of button press
1713 */ 1848 */
1714 if (ev.window == TermWin.vt) 1849 if (ev.window == vt)
1715 { 1850 {
1851 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1852 return;
1853
1716#if ISO_14755 1854#if ISO_14755
1717 // 5.4 1855 // 5.4
1718 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1856 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1719 { 1857 {
1720 iso14755_54 (ev.x, ev.y); 1858 iso14755_54 (ev.x, ev.y);
… …
1732#ifdef MOUSE_REPORT_DOUBLECLICK 1870#ifdef MOUSE_REPORT_DOUBLECLICK
1733 if (ev.button == MEvent.button && clickintime) 1871 if (ev.button == MEvent.button && clickintime)
1734 { 1872 {
1735 /* same button, within alloted time */ 1873 /* same button, within alloted time */
1736 MEvent.clicks++; 1874 MEvent.clicks++;
1875
1737 if (MEvent.clicks > 1) 1876 if (MEvent.clicks > 1)
1738 { 1877 {
1739 /* only report double clicks */ 1878 /* only report double clicks */
1740 MEvent.clicks = 2; 1879 MEvent.clicks = 2;
1741 mouse_report (ev); 1880 mouse_report (ev);
… …
1767 { 1906 {
1768 case Button1: 1907 case Button1:
1769 /* allow meta + click to select rectangular areas */ 1908 /* allow meta + click to select rectangular areas */
1770 /* should be done in screen.C */ 1909 /* should be done in screen.C */
1771#if ENABLE_FRILLS 1910#if ENABLE_FRILLS
1772 selection.rect = !! (ev.state & ModMetaMask); 1911 selection.rect = !!(ev.state & ModMetaMask);
1773#else 1912#else
1774 selection.rect = false; 1913 selection.rect = false;
1775#endif 1914#endif
1776 1915
1777 /* allow shift+left click to extend selection */ 1916 /* allow shift+left click to extend selection */
1778 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1917 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1779 { 1918 {
1780 if (MEvent.button == Button1 && clickintime) 1919 if (MEvent.button == Button1 && clickintime)
1781 selection_rotate (ev.x, ev.y); 1920 selection_rotate (ev.x, ev.y);
1782 else 1921 else
1783 selection_extend (ev.x, ev.y, 1); 1922 selection_extend (ev.x, ev.y, 1);
… …
1924 case Button3: 2063 case Button3:
1925 if (scrollBar.style != R_SB_XTERM) 2064 if (scrollBar.style != R_SB_XTERM)
1926 { 2065 {
1927 if (scrollbar_above_slider (ev.y)) 2066 if (scrollbar_above_slider (ev.y))
1928# ifdef RXVT_SCROLL_FULL 2067# ifdef RXVT_SCROLL_FULL
1929 scr_page (UP, TermWin.nrow - 1); 2068 scr_page (UP, nrow - 1);
1930# else 2069# else
1931 scr_page (UP, TermWin.nrow / 4); 2070 scr_page (UP, nrow / 4);
1932# endif 2071# endif
1933 else if (scrollbar_below_slider (ev.y)) 2072 else if (scrollbar_below_slider (ev.y))
1934# ifdef RXVT_SCROLL_FULL 2073# ifdef RXVT_SCROLL_FULL
1935 scr_page (DN, TermWin.nrow - 1); 2074 scr_page (DN, nrow - 1);
1936# else 2075# else
1937 scr_page (DN, TermWin.nrow / 4); 2076 scr_page (DN, nrow / 4);
1938# endif 2077# endif
1939 else 2078 else
1940 scrollBar.setMotion (); 2079 scrollBar.setMotion ();
1941 } 2080 }
1942 else 2081 else
1943 { 2082 {
1944 scr_page ((ev.button == Button1 ? DN : UP), 2083 scr_page ((ev.button == Button1 ? DN : UP),
1945 (TermWin.nrow 2084 (nrow
1946 * scrollbar_position (ev.y) 2085 * scrollbar_position (ev.y)
1947 / scrollbar_size ())); 2086 / scrollbar_size ()));
1948 } 2087 }
1949 2088
1950 break; 2089 break;
1951 } 2090 }
1952 } 2091 }
2092
1953 return; 2093 return;
1954 } 2094 }
1955#if MENUBAR
1956 /*
1957 * Menubar window processing of button press
1958 */
1959 if (isMenuBarWindow (ev.window))
1960 menubar_control (ev);
1961#endif
1962} 2095}
1963 2096
1964void 2097void
1965rxvt_term::button_release (XButtonEvent &ev) 2098rxvt_term::button_release (XButtonEvent &ev)
1966{ 2099{
… …
1972 2105
1973 if (scrollbar_isUpDn ()) 2106 if (scrollbar_isUpDn ())
1974 { 2107 {
1975 scrollBar.setIdle (); 2108 scrollBar.setIdle ();
1976 scrollbar_show (0); 2109 scrollbar_show (0);
1977#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1978 refresh_type &= ~SMOOTH_REFRESH;
1979#endif
1980 } 2110 }
1981 2111
1982#ifdef SELECTION_SCROLLING 2112#ifdef SELECTION_SCROLLING
1983 if (sel_scroll_ev.active) 2113 if (sel_scroll_ev.active)
1984 sel_scroll_ev.stop(); 2114 sel_scroll_ev.stop();
1985#endif 2115#endif
1986 2116
1987 if (ev.window == TermWin.vt) 2117 if (ev.window == vt)
1988 { 2118 {
2119 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2120 return;
2121
1989#if ISO_14755 2122#if ISO_14755
1990 // 5.4 2123 // 5.4
1991 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2124 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1992 return; 2125 return;
1993#endif 2126#endif
2127
1994 if (reportmode) 2128 if (reportmode)
1995 { 2129 {
1996 /* mouse report from vt window */ 2130 /* mouse report from vt window */
1997 /* don't report release of wheel "buttons" */ 2131 /* don't report release of wheel "buttons" */
1998 if (ev.button >= 4) 2132 if (ev.button >= 4)
… …
2028 { 2162 {
2029 case Button1: 2163 case Button1:
2030 case Button3: 2164 case Button3:
2031 selection_make (ev.time); 2165 selection_make (ev.time);
2032 break; 2166 break;
2167
2033 case Button2: 2168 case Button2:
2034 selection_request (ev.time, ev.x, ev.y); 2169 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2170 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2035 break; 2171 break;
2172
2036#ifdef MOUSE_WHEEL 2173#ifdef MOUSE_WHEEL
2037 case Button4: 2174 case Button4:
2038 case Button5: 2175 case Button5:
2039 { 2176 {
2040 int i; 2177 int i;
… …
2042 2179
2043 v = ev.button == Button4 ? UP : DN; 2180 v = ev.button == Button4 ? UP : DN;
2044 2181
2045 if (ev.state & ShiftMask) 2182 if (ev.state & ShiftMask)
2046 i = 1; 2183 i = 1;
2047 else if (options & Opt_mouseWheelScrollPage) 2184 else if (option (Opt_mouseWheelScrollPage))
2048 i = TermWin.nrow - 1; 2185 i = nrow - 1;
2049 else 2186 else
2050 i = 5; 2187 i = 5;
2051 2188
2052# ifdef MOUSE_SLIP_WHEELING 2189# ifdef MOUSE_SLIP_WHEELING
2053 if (ev.state & ControlMask) 2190 if (ev.state & ControlMask)
2054 { 2191 {
2055 mouse_slip_wheel_speed += v ? -1 : 1; 2192 mouse_slip_wheel_speed += v ? -1 : 1;
2056 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2193 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2057 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2194 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2058 2195
2059 if (slip_wheel_ev.at < NOW) 2196 if (slip_wheel_ev.at < NOW)
2060 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2197 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2061 2198
2062 slip_wheel_ev.start (); 2199 slip_wheel_ev.start ();
2063 } 2200 }
2064 else 2201 else
2065 { 2202 {
2066# endif 2203# endif
2067# ifdef JUMP_MOUSE_WHEEL
2068 scr_page (v, i); 2204 scr_page (v, i);
2069 scr_refresh (SMOOTH_REFRESH);
2070 scrollbar_show (1); 2205 scrollbar_show (1);
2071# else
2072 while (i--)
2073 {
2074 scr_page (v, 1);
2075 scr_refresh (SMOOTH_REFRESH);
2076 scrollbar_show (1);
2077 }
2078# endif
2079# ifdef MOUSE_SLIP_WHEELING 2206# ifdef MOUSE_SLIP_WHEELING
2080 } 2207 }
2081#endif 2208# endif
2082 } 2209 }
2083 break; 2210 break;
2084#endif 2211#endif
2085 } 2212 }
2086 } 2213 }
2087#ifdef MENUBAR
2088 else if (isMenuBarWindow (ev.window))
2089 menubar_control (ev);
2090#endif
2091} 2214}
2092
2093#ifdef TRANSPARENT
2094#if TINTING
2095/* taken from aterm-0.4.2 */
2096
2097typedef uint32_t RUINT32T;
2098
2099void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2100{
2101 int sh_r, sh_g, sh_b;
2102 RUINT32T mask_r, mask_g, mask_b;
2103 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2104 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2105 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2106 int i;
2107
2108 Visual* visual = display->visual;
2109
2110 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2111
2112 /* for convenience */
2113 mask_r = visual->red_mask;
2114 mask_g = visual->green_mask;
2115 mask_b = visual->blue_mask;
2116
2117 /* boring lookup table pre-initialization */
2118 switch (srcImage->bits_per_pixel) {
2119 case 15:
2120 if ((mask_r != 0x7c00) ||
2121 (mask_g != 0x03e0) ||
2122 (mask_b != 0x001f))
2123 return;
2124 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2125 lookup_r = lookup;
2126 lookup_g = lookup+32;
2127 lookup_b = lookup+32+32;
2128 sh_r = 10;
2129 sh_g = 5;
2130 sh_b = 0;
2131 break;
2132 case 16:
2133 if ((mask_r != 0xf800) ||
2134 (mask_g != 0x07e0) ||
2135 (mask_b != 0x001f))
2136 return;
2137 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2138 lookup_r = lookup;
2139 lookup_g = lookup+32;
2140 lookup_b = lookup+32+64;
2141 sh_r = 11;
2142 sh_g = 5;
2143 sh_b = 0;
2144 break;
2145 case 24:
2146 if ((mask_r != 0xff0000) ||
2147 (mask_g != 0x00ff00) ||
2148 (mask_b != 0x0000ff))
2149 return;
2150 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2151 lookup_r = lookup;
2152 lookup_g = lookup+256;
2153 lookup_b = lookup+256+256;
2154 sh_r = 16;
2155 sh_g = 8;
2156 sh_b = 0;
2157 break;
2158 case 32:
2159 if ((mask_r != 0xff0000) ||
2160 (mask_g != 0x00ff00) ||
2161 (mask_b != 0x0000ff))
2162 return;
2163 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2164 lookup_r = lookup;
2165 lookup_g = lookup+256;
2166 lookup_b = lookup+256+256;
2167 sh_r = 16;
2168 sh_g = 8;
2169 sh_b = 0;
2170 break;
2171 default:
2172 return; /* we do not support this color depth */
2173 }
2174
2175 /* prepare limits for color transformation (each channel is handled separately) */
2176 if (shade < 0) {
2177 shade = -shade;
2178 if (shade < 0) shade = 0;
2179 if (shade > 100) shade = 100;
2180
2181 lower_lim_r = 65535-rm;
2182 lower_lim_g = 65535-gm;
2183 lower_lim_b = 65535-bm;
2184
2185 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2186 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2187 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2188
2189 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2190 } else {
2191 if (shade < 0) shade = 0;
2192 if (shade > 100) shade = 100;
2193
2194 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2195
2196 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2197 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2198 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2199 }
2200
2201 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2202 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2203 {
2204 unsigned int tmp;
2205
2206 tmp = lower_lim_r;
2207 lower_lim_r = lower_lim_b;
2208 lower_lim_b = tmp;
2209
2210 tmp = upper_lim_r;
2211 upper_lim_r = upper_lim_b;
2212 upper_lim_b = tmp;
2213 }
2214
2215 /* fill our lookup tables */
2216 for (i = 0; i <= mask_r>>sh_r; i++)
2217 {
2218 RUINT32T tmp;
2219 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2220 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2221 lookup_r[i] = (tmp/65535)<<sh_r;
2222 }
2223 for (i = 0; i <= mask_g>>sh_g; i++)
2224 {
2225 RUINT32T tmp;
2226 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2227 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2228 lookup_g[i] = (tmp/65535)<<sh_g;
2229 }
2230 for (i = 0; i <= mask_b>>sh_b; i++)
2231 {
2232 RUINT32T tmp;
2233 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2234 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2235 lookup_b[i] = (tmp/65535)<<sh_b;
2236 }
2237
2238 /* apply table to input image (replacing colors by newly calculated ones) */
2239 switch (srcImage->bits_per_pixel)
2240 {
2241 case 15:
2242 {
2243 unsigned short *p1, *pf, *p, *pl;
2244 p1 = (unsigned short *) srcImage->data;
2245 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2246 while (p1 < pf)
2247 {
2248 p = p1;
2249 pl = p1 + srcImage->width;
2250 for (; p < pl; p++)
2251 {
2252 *p = lookup_r[(*p & 0x7c00)>>10] |
2253 lookup_g[(*p & 0x03e0)>> 5] |
2254 lookup_b[(*p & 0x001f)];
2255 }
2256 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2257 }
2258 break;
2259 }
2260 case 16:
2261 {
2262 unsigned short *p1, *pf, *p, *pl;
2263 p1 = (unsigned short *) srcImage->data;
2264 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2265 while (p1 < pf)
2266 {
2267 p = p1;
2268 pl = p1 + srcImage->width;
2269 for (; p < pl; p++)
2270 {
2271 *p = lookup_r[(*p & 0xf800)>>11] |
2272 lookup_g[(*p & 0x07e0)>> 5] |
2273 lookup_b[(*p & 0x001f)];
2274 }
2275 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2276 }
2277 break;
2278 }
2279 case 24:
2280 {
2281 unsigned char *p1, *pf, *p, *pl;
2282 p1 = (unsigned char *) srcImage->data;
2283 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2284 while (p1 < pf)
2285 {
2286 p = p1;
2287 pl = p1 + srcImage->width * 3;
2288 for (; p < pl; p += 3)
2289 {
2290 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2291 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2292 p[2] = lookup_r[(p[2] & 0x0000ff)];
2293 }
2294 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2295 }
2296 break;
2297 }
2298 case 32:
2299 {
2300 RUINT32T *p1, *pf, *p, *pl;
2301 p1 = (RUINT32T *) srcImage->data;
2302 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2303
2304 while (p1 < pf)
2305 {
2306 p = p1;
2307 pl = p1 + srcImage->width;
2308 for (; p < pl; p++)
2309 {
2310 *p = lookup_r[(*p & 0xff0000)>>16] |
2311 lookup_g[(*p & 0x00ff00)>> 8] |
2312 lookup_b[(*p & 0x0000ff)] |
2313 (*p & ~0xffffff);
2314 }
2315 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2316 }
2317 break;
2318 }
2319 }
2320
2321 free (lookup);
2322}
2323#endif
2324
2325/*
2326 * Check our parents are still who we think they are.
2327 * Do transparency updates if required
2328 */
2329int
2330rxvt_term::check_our_parents ()
2331{
2332 int i, pchanged, aformat, have_pixmap, rootdepth;
2333 unsigned long nitems, bytes_after;
2334 Atom atype;
2335 unsigned char *prop = NULL;
2336 Window root, oldp, *list;
2337 Pixmap rootpixmap = None;
2338 XWindowAttributes wattr, wrootattr;
2339
2340 pchanged = 0;
2341
2342 if (!(options & Opt_transparent))
2343 return pchanged; /* Don't try any more */
2344
2345 XGetWindowAttributes (display->display, display->root, &wrootattr);
2346 rootdepth = wrootattr.depth;
2347
2348 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2349
2350 if (rootdepth != wattr.depth)
2351 {
2352 if (am_transparent)
2353 {
2354 pchanged = 1;
2355 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2356 am_transparent = am_pixmap_trans = 0;
2357 }
2358
2359 return pchanged; /* Don't try any more */
2360 }
2361
2362 /* Get all X ops out of the queue so that our information is up-to-date. */
2363 XSync (display->display, False);
2364
2365 /*
2366 * Make the frame window set by the window manager have
2367 * the root background. Some window managers put multiple nested frame
2368 * windows for each client, so we have to take care about that.
2369 */
2370 i = (xa[XA_XROOTPMAP_ID]
2371 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID],
2372 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2373 &nitems, &bytes_after, &prop) == Success);
2374
2375 if (!i || prop == NULL)
2376 i = (xa[XA_ESETROOT_PMAP_ID]
2377 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID],
2378 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2379 &nitems, &bytes_after, &prop) == Success);
2380
2381 if (!i || prop == NULL
2382#if TINTING
2383 || !rs[Rs_color + Color_tint]
2384#endif
2385 )
2386 have_pixmap = 0;
2387 else
2388 {
2389 have_pixmap = 1;
2390 rootpixmap = *(Pixmap *)prop;
2391 XFree (prop);
2392 }
2393
2394 if (have_pixmap)
2395 {
2396 /*
2397 * Copy display->root pixmap transparency
2398 */
2399 int sx, sy, nx, ny;
2400 unsigned int nw, nh;
2401 Window cr;
2402 XImage *image;
2403 GC gc;
2404 XGCValues gcvalue;
2405
2406 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2407 0, 0, &sx, &sy, &cr);
2408 nw = (unsigned int)szHint.width;
2409 nh = (unsigned int)szHint.height;
2410 nx = ny = 0;
2411
2412 if (sx < 0)
2413 {
2414 nw += sx;
2415 nx = -sx;
2416 sx = 0;
2417 }
2418
2419 if (sy < 0)
2420 {
2421 nh += sy;
2422 ny = -sy;
2423 sy = 0;
2424 }
2425
2426 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2427 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2428
2429 XSync (display->display, False);
2430 allowedxerror = -1;
2431 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2432
2433 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2434 /* XXX: may need a delay here? */
2435 allowedxerror = 0;
2436
2437 if (image == NULL)
2438 {
2439 if (am_transparent && am_pixmap_trans)
2440 {
2441 pchanged = 1;
2442 if (TermWin.pixmap != None)
2443 {
2444 XFreePixmap (display->display, TermWin.pixmap);
2445 TermWin.pixmap = None;
2446 }
2447 }
2448
2449 am_pixmap_trans = 0;
2450 }
2451 else
2452 {
2453 if (TermWin.pixmap != None)
2454 XFreePixmap (display->display, TermWin.pixmap);
2455
2456#if TINTING
2457 if (ISSET_PIXCOLOR (Color_tint))
2458 {
2459 unsigned short rm, gm, bm;
2460 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2461
2462 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2463
2464 ShadeXImage (display, image, shade, rm, gm, bm);
2465 }
2466#endif
2467
2468 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2469 szHint.width, szHint.height, image->depth);
2470 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2471 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2472 nx, ny, image->width, image->height);
2473 XFreeGC (display->display, gc);
2474 XDestroyImage (image);
2475 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2476 XClearWindow (display->display, TermWin.parent[0]);
2477
2478 if (!am_transparent || !am_pixmap_trans)
2479 pchanged = 1;
2480
2481 am_transparent = am_pixmap_trans = 1;
2482 }
2483 }
2484
2485 if (am_pixmap_trans)
2486 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2487 else
2488 {
2489 unsigned int n;
2490 /*
2491 * InheritPixmap transparency
2492 */
2493 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2494 {
2495 oldp = TermWin.parent[i];
2496 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2497 &TermWin.parent[i], &list, &n);
2498 XFree (list);
2499
2500 if (TermWin.parent[i] == display->root)
2501 {
2502 if (oldp != None)
2503 pchanged = 1;
2504
2505 break;
2506 }
2507
2508 if (oldp != TermWin.parent[i])
2509 pchanged = 1;
2510 }
2511
2512 n = 0;
2513
2514 if (pchanged)
2515 {
2516 for (; n < (unsigned int)i; n++)
2517 {
2518 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2519 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2520 {
2521 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2522 break;
2523 }
2524 }
2525 }
2526
2527 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2528 {
2529 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2530 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2531 am_transparent = 0;
2532 /* XXX: also turn off Opt_transparent? */
2533 }
2534 else
2535 {
2536#if WAIT_FOR_WM
2537 /* wait (an arbitrary period) for the WM to do its thing
2538 * needed for fvwm2.2.2 (and before?) */
2539 sleep (1);
2540#endif
2541 for (n = 0; n < (unsigned int)i; n++)
2542 {
2543 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2544 XClearWindow (display->display, TermWin.parent[n]);
2545 }
2546
2547 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2548 am_transparent = 1;
2549 }
2550
2551 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2552 TermWin.parent[i] = None;
2553 }
2554
2555 if (scrollBar.win)
2556 {
2557 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2558 scrollBar.setIdle ();
2559 scrollbar_show (0);
2560 }
2561
2562 if (am_transparent)
2563 {
2564 want_refresh = want_full_refresh = 1;
2565 if (am_pixmap_trans)
2566 flush ();
2567 }
2568
2569 return pchanged;
2570}
2571#endif
2572 2215
2573/*}}} */ 2216/*}}} */
2574 2217
2575bool 2218bool
2576rxvt_term::cmd_parse () 2219rxvt_term::cmd_parse ()
2577{ 2220{
2578 bool flag = false; 2221 bool flag = false;
2579 unicode_t ch = NOCHAR; 2222 wchar_t ch = NOCHAR;
2580 unsigned char *seq_begin; // remember start of esc-sequence here 2223 char *seq_begin; // remember start of esc-sequence here
2581 2224
2582 for (;;) 2225 for (;;)
2583 { 2226 {
2584 if (ch == NOCHAR) 2227 if (ch == NOCHAR)
2585 { 2228 {
2586 seq_begin = cmdbuf_ptr; 2229 seq_begin = cmdbuf_ptr;
2587 ch = next_char (); 2230 ch = next_char ();
2588 }
2589 2231
2590 if (ch == NOCHAR) // TODO: improve 2232 if (ch == NOCHAR)
2591 break; 2233 break;
2234 }
2592 2235
2593 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2236 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2594 { 2237 {
2595 if (!seen_input) 2238 if (!seen_input)
2596 { 2239 {
… …
2600 // some window managers resize the window early, and these programs 2243 // some window managers resize the window early, and these programs
2601 // then sometimes get the size wrong. 2244 // then sometimes get the size wrong.
2602 // unfortunately other programs are even more buggy and dislike 2245 // unfortunately other programs are even more buggy and dislike
2603 // being sent SIGWINCH, so only do it when we were in fact being 2246 // being sent SIGWINCH, so only do it when we were in fact being
2604 // resized. 2247 // resized.
2605 if (seen_resize) 2248 if (seen_resize && cmd_pid)
2606 kill (-cmd_pid, SIGWINCH); 2249 kill (-cmd_pid, SIGWINCH);
2607 } 2250 }
2608 2251
2609 /* Read a text string from the input buffer */ 2252 /* Read a text string from the input buffer */
2610 unicode_t buf[UBUFSIZ]; 2253 wchar_t buf[UBUFSIZ];
2611 bool refreshnow = false; 2254 bool refreshnow = false;
2612 int nlines = 0; 2255 int nlines = 0;
2613 unicode_t *str = buf; 2256 wchar_t *str = buf;
2257 wchar_t *eol = str + min (ncol, UBUFSIZ);
2614 2258
2615 for (;;) 2259 for (;;)
2616 { 2260 {
2617 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2261 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2618 break; 2262 break;
2619 2263
2620 *str++ = ch; 2264 *str++ = ch;
2621 2265
2622 if (ch == C0_LF) 2266 if (ch == C0_LF || str >= eol)
2623 { 2267 {
2268 if (ch == C0_LF)
2624 nlines++; 2269 nlines++;
2270
2625 refresh_count++; 2271 refresh_count++;
2626 2272
2627 if (!(options & Opt_jumpScroll) 2273 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2628 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2629 { 2274 {
2275 refresh_count = 0;
2276
2277 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2278 {
2630 refreshnow = true; 2279 refreshnow = true;
2631 ch = NOCHAR; 2280 ch = NOCHAR;
2632 break; 2281 break;
2282 }
2633 } 2283 }
2634 2284
2635 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2285 // scr_add_lines only works for nlines <= nrow - 1.
2636 if (nlines >= TermWin.nrow - 1) 2286 if (nlines >= nrow - 1)
2637 { 2287 {
2288 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2289 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2638 scr_add_lines (buf, nlines, str - buf); 2290 scr_add_lines (buf, str - buf, nlines);
2291
2639 nlines = 0; 2292 nlines = 0;
2640 str = buf; 2293 str = buf;
2294 eol = str + min (ncol, UBUFSIZ);
2641 } 2295 }
2642 }
2643 2296
2644 if (str >= buf + UBUFSIZ) 2297 if (str >= eol)
2645 { 2298 {
2299 if (eol >= buf + UBUFSIZ)
2300 {
2646 ch = NOCHAR; 2301 ch = NOCHAR;
2647 break; 2302 break;
2303 }
2304 else
2305 eol = min (eol + ncol, buf + UBUFSIZ);
2306 }
2307
2648 } 2308 }
2649 2309
2650 seq_begin = cmdbuf_ptr; 2310 seq_begin = cmdbuf_ptr;
2651 ch = next_char (); 2311 ch = next_char ();
2652 } 2312 }
2653 2313
2314 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2315 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2654 scr_add_lines (buf, nlines, str - buf); 2316 scr_add_lines (buf, str - buf, nlines);
2655 2317
2656 /* 2318 /*
2657 * If there have been a lot of new lines, then update the screen 2319 * If there have been a lot of new lines, then update the screen
2658 * What the heck I'll cheat and only refresh less than every page-full. 2320 * What the heck we'll cheat and only refresh less than every page-full.
2659 * the number of pages between refreshes is refresh_limit, which 2321 * if skipScroll is enabled.
2660 * is incremented here because we must be doing flat-out scrolling.
2661 */ 2322 */
2662 if (refreshnow) 2323 if (refreshnow)
2663 { 2324 {
2664 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2665 refresh_limit++;
2666 else
2667 {
2668 flag = true; 2325 flag = true;
2669 scr_refresh (refresh_type); 2326 scr_refresh ();
2670 } 2327 want_refresh = 1;
2671 } 2328 }
2672 2329
2673 } 2330 }
2674 else 2331 else
2675 { 2332 {
… …
2689 } 2346 }
2690 2347
2691 return flag; 2348 return flag;
2692} 2349}
2693 2350
2694// read the next octet
2695unicode_t
2696rxvt_term::next_octet ()
2697{
2698 return cmdbuf_ptr < cmdbuf_endp
2699 ? *cmdbuf_ptr++
2700 : NOCHAR;
2701}
2702
2703// read the next character 2351// read the next character
2704unicode_t 2352wchar_t
2705rxvt_term::next_char () 2353rxvt_term::next_char () NOTHROW
2706{ 2354{
2707 while (cmdbuf_ptr < cmdbuf_endp) 2355 while (cmdbuf_ptr < cmdbuf_endp)
2708 { 2356 {
2709 // assume 7-bit to be ascii ALWAYS 2357 // assume 7-bit to be ascii ALWAYS
2710 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2358 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2711 return *cmdbuf_ptr++; 2359 return *cmdbuf_ptr++;
2712 2360
2713 wchar_t wc; 2361 wchar_t wc;
2714 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2362 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2715 2363
2716 if (len == (size_t)-2) 2364 if (len == (size_t)-2)
2717 { 2365 {
2718 // the mbstate stores incomplete sequences. didn't know this :/ 2366 // the mbstate stores incomplete sequences. didn't know this :/
2719 cmdbuf_ptr = cmdbuf_endp; 2367 cmdbuf_ptr = cmdbuf_endp;
2720 break; 2368 break;
2721 } 2369 }
2722 2370
2723 if (len == (size_t)-1) 2371 if (len == (size_t)-1)
2724 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2372 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2725 2373
2726 // assume wchar == unicode 2374 // assume wchar == unicode
2727 cmdbuf_ptr += len; 2375 cmdbuf_ptr += len;
2728 return wc & UNICODE_MASK; 2376 return wc & UNICODE_MASK;
2729 } 2377 }
2730 2378
2731 return NOCHAR; 2379 return NOCHAR;
2732} 2380}
2381
2382// read the next octet
2383uint32_t
2384rxvt_term::next_octet () NOTHROW
2385{
2386 return cmdbuf_ptr < cmdbuf_endp
2387 ? (unsigned char)*cmdbuf_ptr++
2388 : NOCHAR;
2389}
2390
2391static class out_of_input out_of_input;
2733 2392
2734/* rxvt_cmd_getc () - Return next input character */ 2393/* rxvt_cmd_getc () - Return next input character */
2735/* 2394/*
2736 * Return the next input character after first passing any keyboard input 2395 * Return the next input character after first passing any keyboard input
2737 * to the command. 2396 * to the command.
2738 */ 2397 */
2739unicode_t 2398wchar_t
2740rxvt_term::cmd_getc () 2399rxvt_term::cmd_getc () THROW ((class out_of_input))
2741{ 2400{
2742 unicode_t c = next_char (); 2401 wchar_t c = next_char ();
2743 2402
2744 if (c == NOCHAR) 2403 if (c == NOCHAR)
2745 throw out_of_input; 2404 throw out_of_input;
2746 2405
2747 return c; 2406 return c;
2748} 2407}
2749 2408
2750unicode_t 2409uint32_t
2751rxvt_term::cmd_get8 () 2410rxvt_term::cmd_get8 () THROW ((class out_of_input))
2752{ 2411{
2753 unicode_t c = next_octet (); 2412 uint32_t c = next_octet ();
2754 2413
2755 if (c == NOCHAR) 2414 if (c == NOCHAR)
2756 throw out_of_input; 2415 throw out_of_input;
2757 2416
2758 return c; 2417 return c;
… …
2822 { 2481 {
2823 if ((buf[len++] = cmd_getc ()) == 'i') 2482 if ((buf[len++] = cmd_getc ()) == 'i')
2824 break; /* done = 1 */ 2483 break; /* done = 1 */
2825 } 2484 }
2826 } 2485 }
2827 2486
2828 for (i = 0; i < len; i++) 2487 for (i = 0; i < len; i++)
2829 if (putc (buf[i], fd) == EOF) 2488 if (putc (buf[i], fd) == EOF)
2830 { 2489 {
2831 done = 1; 2490 done = 1;
2832 break; 2491 break;
… …
2858 case C0_ESC: 2517 case C0_ESC:
2859 process_escape_seq (); 2518 process_escape_seq ();
2860 break; 2519 break;
2861 case C0_ENQ: /* terminal Status */ 2520 case C0_ENQ: /* terminal Status */
2862 if (rs[Rs_answerbackstring]) 2521 if (rs[Rs_answerbackstring])
2863 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2522 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2864 (unsigned int)strlen (rs[Rs_answerbackstring]));
2865 else 2523 else
2866 tt_write ((unsigned char *)VT100_ANS, 2524 tt_write (VT100_ANS, strlen (VT100_ANS));
2867 (unsigned int)strlen (VT100_ANS));
2868 break; 2525 break;
2869 case C0_BEL: /* bell */ 2526 case C0_BEL: /* bell */
2870 scr_bell (); 2527 scr_bell ();
2871 break; 2528 break;
2872 case C0_BS: /* backspace */ 2529 case C0_BS: /* backspace */
… …
2896 process_dcs_seq (); 2553 process_dcs_seq ();
2897 break; 2554 break;
2898 case 0x9b: /* CSI */ 2555 case 0x9b: /* CSI */
2899 process_csi_seq (); 2556 process_csi_seq ();
2900 break; 2557 break;
2901 case 0x9d: /* CSI */ 2558 case 0x9d: /* OSC */
2902 process_osc_seq (); 2559 process_osc_seq ();
2903 break; 2560 break;
2904#endif 2561#endif
2905 } 2562 }
2906} 2563}
… …
2996 scr_charset_set (2, (unsigned int)cmd_getc ()); 2653 scr_charset_set (2, (unsigned int)cmd_getc ());
2997 break; 2654 break;
2998 case '+': 2655 case '+':
2999 scr_charset_set (3, (unsigned int)cmd_getc ()); 2656 scr_charset_set (3, (unsigned int)cmd_getc ());
3000 break; 2657 break;
3001#if ENABLE_FRILLS 2658#if !ENABLE_MINIMAL
3002 case '6': 2659 case '6':
3003 scr_backindex (); 2660 scr_backindex ();
3004 break; 2661 break;
3005#endif 2662#endif
3006 case '7': 2663 case '7':
3007 scr_cursor (SAVE); 2664 scr_cursor (SAVE);
3008 break; 2665 break;
3009 case '8': 2666 case '8':
3010 scr_cursor (RESTORE); 2667 scr_cursor (RESTORE);
3011 break; 2668 break;
3012#if ENABLE_FRILLS 2669#if !ENABLE_MINIMAL
3013 case '9': 2670 case '9':
3014 scr_forwardindex (); 2671 scr_forwardindex ();
3015 break; 2672 break;
3016#endif 2673#endif
3017 case '=': 2674 case '=':
… …
3027 break; 2684 break;
3028 2685
3029 /* 8.3.87: NEXT LINE */ 2686 /* 8.3.87: NEXT LINE */
3030 case C1_NEL: /* ESC E */ 2687 case C1_NEL: /* ESC E */
3031 { 2688 {
3032 unicode_t nlcr[] = { C0_LF, C0_CR }; 2689 wchar_t nlcr[] = { C0_LF, C0_CR };
3033 scr_add_lines (nlcr, 1, 2); 2690 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3034 } 2691 }
3035 break; 2692 break;
3036 2693
3037 /* kidnapped escape sequence: Should be 8.3.48 */ 2694 /* kidnapped escape sequence: Should be 8.3.48 */
3038 case C1_ESA: /* ESC G */ 2695 case C1_ESA: /* ESC G */
… …
3060 process_dcs_seq (); 2717 process_dcs_seq ();
3061 break; 2718 break;
3062 2719
3063 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2720 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3064 case C1_SCI: /* ESC Z */ 2721 case C1_SCI: /* ESC Z */
3065 tt_write ((const unsigned char *)ESCZ_ANSWER, 2722 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3066 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3067 break; /* steal obsolete ESC [ c */ 2723 break; /* steal obsolete ESC [ c */
3068 2724
3069 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2725 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3070 case C1_CSI: /* ESC [ */ 2726 case C1_CSI: /* ESC [ */
3071 process_csi_seq (); 2727 process_csi_seq ();
… …
3133rxvt_term::process_csi_seq () 2789rxvt_term::process_csi_seq ()
3134{ 2790{
3135 unicode_t ch, priv, i; 2791 unicode_t ch, priv, i;
3136 unsigned int nargs, p; 2792 unsigned int nargs, p;
3137 int n, ndef; 2793 int n, ndef;
3138 int arg[ESC_ARGS]; 2794 int arg[ESC_ARGS] = { };
3139 2795
3140 for (nargs = ESC_ARGS; nargs > 0;) 2796 nargs = 0;
3141 arg[--nargs] = 0;
3142 2797
3143 priv = 0; 2798 priv = 0;
3144 ch = cmd_getc (); 2799 ch = cmd_getc ();
3145 if (ch >= '<' && ch <= '?') 2800 if (ch >= '<' && ch <= '?')
3146 { /* '<' '=' '>' '?' */ 2801 { /* '<' '=' '>' '?' */
… …
3180 ndef = get_byte_array_bit (csi_defaults, i); 2835 ndef = get_byte_array_bit (csi_defaults, i);
3181 for (p = 0; p < nargs; p++) 2836 for (p = 0; p < nargs; p++)
3182 if (arg[p] == -1) 2837 if (arg[p] == -1)
3183 arg[p] = ndef; 2838 arg[p] = ndef;
3184 2839
3185#ifdef DEBUG_CMD
3186 fprintf (stderr, "CSI ");
3187 for (p = 0; p < nargs; p++)
3188 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3189 fprintf (stderr, "%c\n", ch);
3190#endif
3191
3192 /* 2840 /*
3193 * private mode handling 2841 * private mode handling
3194 */ 2842 */
3195 if (priv) 2843 if (priv)
3196 { 2844 {
3197 switch (priv) 2845 switch (priv)
3198 { 2846 {
3199 case '>': 2847 case '>':
3200 if (ch == CSI_DA) /* secondary device attributes */ 2848 if (ch == CSI_DA) /* secondary device attributes */
2849 {
2850 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2851 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2852 //
2853 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2854 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2855 // that we do not support xterm mouse reporting (should be 95 when we do).
2856 //
3201 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2857 tt_printf ("\033[>%d;94;0c", 'U');
2858 }
3202 break; 2859 break;
3203 case '?': 2860 case '?':
3204 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2861 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3205 process_terminal_mode (ch, priv, nargs, arg); 2862 process_terminal_mode (ch, priv, nargs, arg);
3206 break; 2863 break;
… …
3311 2968
3312 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2969 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3313 arg[0] = -arg[0]; 2970 arg[0] = -arg[0];
3314 /* FALLTHROUGH */ 2971 /* FALLTHROUGH */
3315 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2972 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3316 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2973 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3317 break; 2974 break;
3318 2975
3319 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2976 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3320 tt_write ((const unsigned char *)VT100_ANS, 2977 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3321 (unsigned int) (sizeof (VT100_ANS) - 1));
3322 break; 2978 break;
3323 2979
3324 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2980 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3325 process_sgr_mode (nargs, arg); 2981 process_sgr_mode (nargs, arg);
3326 break; 2982 break;
… …
3333 break; 2989 break;
3334 case 6: /* CPR requested */ 2990 case 6: /* CPR requested */
3335 scr_report_position (); 2991 scr_report_position ();
3336 break; 2992 break;
3337 case 7: /* unofficial extension */ 2993 case 7: /* unofficial extension */
3338 if (options & Opt_insecure) 2994 if (option (Opt_insecure))
3339 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2995 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3340 break; 2996 break;
3341 case 8: /* unofficial extension */ 2997 case 8: /* unofficial extension */
3342 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2998 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3343 break; 2999 break;
… …
3410 break; 3066 break;
3411 case CSI_75: 3067 case CSI_75:
3412 scr_cursor (RESTORE); 3068 scr_cursor (RESTORE);
3413 break; 3069 break;
3414 3070
3415#if ENABLE_FRILLS 3071#if !ENABLE_MINIMAL
3416 case CSI_74: 3072 case CSI_74:
3417 process_window_ops (arg, nargs); 3073 process_window_ops (arg, nargs);
3418 break; 3074 break;
3419#endif 3075#endif
3420 3076
… …
3427 break; 3083 break;
3428 } 3084 }
3429} 3085}
3430/*}}} */ 3086/*}}} */
3431 3087
3432#if ENABLE_FRILLS 3088#if !ENABLE_MINIMAL
3433/* ARGSUSED */ 3089/* ARGSUSED */
3434void 3090void
3435rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3091rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3436{ 3092{
3437 int x, y; 3093 int x, y;
3438 XWindowAttributes wattr; 3094 XWindowAttributes wattr;
3439 Window wdummy; 3095 Window wdummy;
3096
3097 dLocal (Display *, dpy);
3440 3098
3441 if (nargs == 0) 3099 if (nargs == 0)
3442 return; 3100 return;
3443 3101
3444 switch (args[0]) 3102 switch (args[0])
3445 { 3103 {
3446 /* 3104 /*
3447 * commands 3105 * commands
3448 */ 3106 */
3449 case 1: /* deiconify window */ 3107 case 1: /* deiconify window */
3450 XMapWindow (display->display, TermWin.parent[0]); 3108 XMapWindow (dpy, parent[0]);
3451 break; 3109 break;
3452 case 2: /* iconify window */ 3110 case 2: /* iconify window */
3453 XIconifyWindow (display->display, TermWin.parent[0], 3111 XIconifyWindow (dpy, parent[0], display->screen);
3454 DefaultScreen (display->display));
3455 break; 3112 break;
3456 case 3: /* set position (pixels) */ 3113 case 3: /* set position (pixels) */
3457 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3114 XMoveWindow (dpy, parent[0], args[1], args[2]);
3458 break; 3115 break;
3459 case 4: /* set size (pixels) */ 3116 case 4: /* set size (pixels) */
3460 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3117 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3461 break; 3118 break;
3462 case 5: /* raise window */ 3119 case 5: /* raise window */
3463 XRaiseWindow (display->display, TermWin.parent[0]); 3120 XRaiseWindow (dpy, parent[0]);
3464 break; 3121 break;
3465 case 6: /* lower window */ 3122 case 6: /* lower window */
3466 XLowerWindow (display->display, TermWin.parent[0]); 3123 XLowerWindow (dpy, parent[0]);
3467 break; 3124 break;
3468 case 7: /* refresh window */ 3125 case 7: /* refresh window */
3469 scr_touch (true); 3126 scr_touch (true);
3470 break; 3127 break;
3471 case 8: /* set size (chars) */ 3128 case 8: /* set size (chars) */
3472 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3129 set_widthheight ((unsigned int) (args[2] * fwidth),
3473 (unsigned int) (args[1] * TermWin.fheight)); 3130 (unsigned int) (args[1] * fheight));
3474 break; 3131 break;
3475 3132
3476 //case 9: NYI, TODO, restore maximized window or maximize window 3133 //case 9: NYI, TODO, restore maximized window or maximize window
3477 default: 3134 default:
3478 if (args[0] >= 24) /* set height (chars) */ 3135 if (args[0] >= 24) /* set height (chars) */
3479 set_widthheight ((unsigned int)TermWin.width, 3136 set_widthheight ((unsigned int)width,
3480 (unsigned int) (args[1] * TermWin.fheight)); 3137 (unsigned int) (args[1] * fheight));
3481 break; 3138 break;
3482
3483 3139
3484 /* 3140 /*
3485 * reports - some output format copied from XTerm 3141 * reports - some output format copied from XTerm
3486 */ 3142 */
3487 case 11: /* report window state */ 3143 case 11: /* report window state */
3488 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3144 XGetWindowAttributes (dpy, parent[0], &wattr);
3489 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3145 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3490 break; 3146 break;
3491 case 13: /* report window position */ 3147 case 13: /* report window position */
3492 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3148 XGetWindowAttributes (dpy, parent[0], &wattr);
3493 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3149 XTranslateCoordinates (dpy, parent[0], wattr.root,
3494 -wattr.border_width, -wattr.border_width, 3150 -wattr.border_width, -wattr.border_width,
3495 &x, &y, &wdummy); 3151 &x, &y, &wdummy);
3496 tt_printf ("\033[3;%d;%dt", x, y); 3152 tt_printf ("\033[3;%d;%dt", x, y);
3497 break; 3153 break;
3498 case 14: /* report window size (pixels) */ 3154 case 14: /* report window size (pixels) */
3499 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3155 XGetWindowAttributes (dpy, parent[0], &wattr);
3500 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3156 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3501 break; 3157 break;
3502 case 18: /* report text area size (chars) */ 3158 case 18: /* report text area size (chars) */
3503 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3159 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3504 break; 3160 break;
3505 case 19: /* report window size (chars) */ 3161 case 19: /* report window size (chars) */
3506 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3162 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3507 break; 3163 break;
3508 case 20: /* report icon label */ 3164 case 20: /* report icon label */
3509 { 3165 {
3510 char *s; 3166 char *s;
3511 XGetIconName (display->display, TermWin.parent[0], &s); 3167 XGetIconName (dpy, parent[0], &s);
3512 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3168 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3513 XFree (s); 3169 XFree (s);
3514 } 3170 }
3515 break; 3171 break;
3516 case 21: /* report window title */ 3172 case 21: /* report window title */
3517 { 3173 {
3518 char *s; 3174 char *s;
3519 XFetchName (display->display, TermWin.parent[0], &s); 3175 XFetchName (dpy, parent[0], &s);
3520 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3176 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3521 XFree (s); 3177 XFree (s);
3522 } 3178 }
3523 break; 3179 break;
3524 } 3180 }
3525} 3181}
… …
3528/*----------------------------------------------------------------------*/ 3184/*----------------------------------------------------------------------*/
3529/* 3185/*
3530 * get input up until STRING TERMINATOR (or BEL) 3186 * get input up until STRING TERMINATOR (or BEL)
3531 * ends_how is terminator used. returned input must be free()'d 3187 * ends_how is terminator used. returned input must be free()'d
3532 */ 3188 */
3533unsigned char * 3189char *
3534rxvt_term::get_to_st (unicode_t &ends_how) 3190rxvt_term::get_to_st (unicode_t &ends_how)
3535{ 3191{
3536 unicode_t ch; 3192 unicode_t ch;
3537 bool seen_esc = false; 3193 bool seen_esc = false;
3538 unsigned int n = 0; 3194 unsigned int n = 0;
… …
3552 seen_esc = true; 3208 seen_esc = true;
3553 continue; 3209 continue;
3554 } 3210 }
3555 else if (ch == C0_BEL || ch == CHAR_ST) 3211 else if (ch == C0_BEL || ch == CHAR_ST)
3556 break; 3212 break;
3213 else if (ch == C0_SYN)
3214 ch = cmd_get8 ();
3557 else if (ch < 0x20) 3215 else if (ch < 0x20)
3558 return NULL; /* other control character - exit */ 3216 return NULL; /* other control character - exit */
3559 3217
3560 seen_esc = false; 3218 seen_esc = false;
3561 3219
3562 if (n >= sizeof (string) - 1) 3220 if (n >= STRING_MAX - 1)
3563 // stop at some sane length 3221 // stop at some sane length
3564 return NULL; 3222 return NULL;
3565 3223
3566 if (ch == C0_SYN)
3567 string[n++] = cmd_get8 ();
3568 else
3569 string[n++] = ch; 3224 string[n++] = ch;
3570 } 3225 }
3571 3226
3572 string[n++] = '\0'; 3227 string[n++] = '\0';
3573 3228
3574 ends_how = (ch == 0x5c ? C0_ESC : ch); 3229 ends_how = (ch == 0x5c ? C0_ESC : ch);
3575 3230
3576 return (unsigned char *)rxvt_wcstombs (string); 3231 return rxvt_wcstombs (string);
3577} 3232}
3578 3233
3579/*----------------------------------------------------------------------*/ 3234/*----------------------------------------------------------------------*/
3580/* 3235/*
3581 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3236 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3582 */ 3237 */
3583void 3238void
3584rxvt_term::process_dcs_seq () 3239rxvt_term::process_dcs_seq ()
3585{ 3240{
3586 unsigned char *s; 3241 char *s;
3587 unicode_t eh; 3242 unicode_t eh;
3588 3243
3589 /* 3244 /*
3590 * Not handled yet 3245 * Not handled yet
3591 */ 3246 */
… …
3610 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3265 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3611 arg = arg * 10 + (ch - '0'); 3266 arg = arg * 10 + (ch - '0');
3612 3267
3613 if (ch == ';') 3268 if (ch == ';')
3614 { 3269 {
3615 unsigned char *s = get_to_st (eh); 3270 char *s = get_to_st (eh);
3616 3271
3617 if (s) 3272 if (s)
3618 { 3273 {
3619 process_xterm_seq (arg, (char *)s, eh); 3274 process_xterm_seq (arg, s, eh);
3620 free (s); 3275 free (s);
3621 } 3276 }
3622 } 3277 }
3623} 3278}
3624 3279
3625void 3280void
3626rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3281rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3627{ 3282{
3628 if (str[0] == '?' && !str[1]) 3283 if (str[0] == '?' && !str[1])
3629 { 3284 {
3630 unsigned short r, g, b; 3285 rgba c;
3631 pix_colors_focused[color].get (display, r, g, b); 3286 pix_colors_focused[color].get (c);
3287
3288#if XFT
3289 if (c.a != rgba::MAX_CC)
3290 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3291 else
3292#endif
3632 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3293 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3633 } 3294 }
3634 else 3295 else
3635 set_window_color (color, str); 3296 set_window_color (color, str);
3636} 3297}
3637 3298
3638/* 3299/*
3639 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3300 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3640 * 0 = change iconName/title
3641 * 1 = change iconName
3642 * 2 = change title
3643 * 4 = change color
3644 * 10 = change fg color
3645 * 11 = change bg color
3646 * 12 = change text color
3647 * 13 = change mouse foreground color
3648 * 17 = change highlight character colour
3649 * 18 = change bold character color
3650 * 19 = change underlined character color
3651 * 46 = change logfile (not implemented)
3652 * 50 = change font
3653 *
3654 * rxvt extensions:
3655 * 20 = bg pixmap
3656 * 39 = change default fg color
3657 * 49 = change default bg color
3658 * 55 = dump scrollback buffer and all of screen
3659 * 701 = change locale
3660 * 702 = find font
3661 * 703 = menu
3662 */ 3301 */
3663void 3302void
3664rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3303rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3665{ 3304{
3666 int changed = 0;
3667 int color; 3305 int color;
3668 char *buf, *name; 3306 char *buf, *name;
3669 bool query = str[0] == '?' && !str[1]; 3307 bool query = str[0] == '?' && !str[1];
3670 int saveop = op; 3308 int saveop = op;
3671 3309
3310 dLocal (Display *, dpy);
3311
3672 assert (str != NULL); 3312 assert (str != NULL);
3313
3314 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3315 return;
3316
3673 switch (op) 3317 switch (op)
3674 { 3318 {
3675 case XTerm_name: 3319 case XTerm_name:
3676 set_title (str); 3320 set_title (str);
3677 /* FALLTHROUGH */ 3321 /* FALLTHROUGH */
… …
3691 unsigned long bytes_after; 3335 unsigned long bytes_after;
3692 unsigned char *value = 0; 3336 unsigned char *value = 0;
3693 const char *str = ""; 3337 const char *str = "";
3694 3338
3695 if (prop 3339 if (prop
3696 && XGetWindowProperty (display->display, TermWin.parent[0], 3340 && XGetWindowProperty (dpy, parent[0],
3697 prop, 0, 1<<16, 0, AnyPropertyType, 3341 prop, 0, 1<<16, 0, AnyPropertyType,
3698 &actual_type, &actual_format, 3342 &actual_type, &actual_format,
3699 &nitems, &bytes_after, &value) == Success 3343 &nitems, &bytes_after, &value) == Success
3700 && actual_type != None 3344 && actual_type != None
3701 && actual_format == 8) 3345 && actual_format == 8)
3702 str = (const char *)(value); 3346 str = (const char *)(value);
3703 3347
3704 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3348 tt_printf ("\033]%d;%s%c", op, str, resp);
3705 3349
3706 XFree (value); 3350 XFree (value);
3707 } 3351 }
3708 else 3352 else
3709 { 3353 {
… …
3713 { 3357 {
3714 *eq = 0; 3358 *eq = 0;
3715 set_utf8_property (display->atom (str), eq + 1); 3359 set_utf8_property (display->atom (str), eq + 1);
3716 } 3360 }
3717 else 3361 else
3718 XDeleteProperty (display->display, TermWin.parent[0], 3362 XDeleteProperty (dpy, parent[0],
3719 display->atom (str)); 3363 display->atom (str));
3720 } 3364 }
3721 break; 3365 break;
3722 3366
3723 case XTerm_Color: 3367 case XTerm_Color:
… …
3725 { 3369 {
3726 if ((name = strchr (buf, ';')) == NULL) 3370 if ((name = strchr (buf, ';')) == NULL)
3727 break; 3371 break;
3728 3372
3729 *name++ = '\0'; 3373 *name++ = '\0';
3730 color = atoi (buf); 3374 color = atoi (buf) + minCOLOR;
3731 3375
3732 if (color < 0 || color >= TOTAL_COLORS) 3376 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3733 break; 3377 break;
3734 3378
3735 if ((buf = strchr (name, ';')) != NULL) 3379 if ((buf = strchr (name, ';')) != NULL)
3736 *buf++ = '\0'; 3380 *buf++ = '\0';
3737 3381
3738 if (name[0] == '?' && !name[1]) 3382 process_color_seq (op, color, name, resp);
3739 {
3740 unsigned short r, g, b;
3741 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3742 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3743 }
3744 else
3745 set_window_color (color + minCOLOR, name);
3746 } 3383 }
3747 break; 3384 break;
3748 case XTerm_Color00: 3385 case XTerm_Color00:
3749 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3386 process_color_seq (op, Color_fg, str, resp);
3750 break; 3387 break;
3751 case XTerm_Color01: 3388 case XTerm_Color01:
3752 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3389 process_color_seq (op, Color_bg, str, resp);
3753 break; 3390 break;
3754#ifndef NO_CURSORCOLOR 3391#ifndef NO_CURSORCOLOR
3755 case XTerm_Color_cursor: 3392 case XTerm_Color_cursor:
3756 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3393 process_color_seq (op, Color_cursor, str, resp);
3757 break; 3394 break;
3758#endif 3395#endif
3759 case XTerm_Color_pointer_fg: 3396 case XTerm_Color_pointer_fg:
3760 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3397 process_color_seq (op, Color_pointer_fg, str, resp);
3761 break; 3398 break;
3762 case XTerm_Color_pointer_bg: 3399 case XTerm_Color_pointer_bg:
3763 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3400 process_color_seq (op, Color_pointer_bg, str, resp);
3764 break; 3401 break;
3765#ifndef NO_BOLD_UNDERLINE_REVERSE 3402#ifndef NO_BOLD_UNDERLINE_REVERSE
3766 case XTerm_Color_BD:
3767 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3768 break;
3769 case XTerm_Color_IT:
3770 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3771 break;
3772 case XTerm_Color_UL:
3773 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3774 break;
3775 case XTerm_Color_RV: 3403 case XTerm_Color_RV:
3776 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3404 process_color_seq (op, Color_RV, str, resp);
3777 break; 3405 break;
3406 case Rxvt_Color_BD:
3407 case URxvt_Color_BD:
3408 process_color_seq (op, Color_BD, str, resp);
3409 break;
3410 case Rxvt_Color_UL:
3411 case URxvt_Color_UL:
3412 process_color_seq (op, Color_UL, str, resp);
3413 break;
3414 case URxvt_Color_IT:
3415 process_color_seq (op, Color_IT, str, resp);
3416 break;
3778#endif 3417#endif
3779#if TRANSPARENT && TINTING 3418#if ENABLE_TRANSPARENCY
3780 case XTerm_Color_tint: 3419 case URxvt_Color_tint:
3781 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3420 process_color_seq (op, Color_tint, str, resp);
3782 check_our_parents (); 3421 {
3783 if (am_transparent) 3422 bool changed = false;
3784 want_full_refresh = want_refresh = 1; 3423 if (ISSET_PIXCOLOR (Color_tint))
3785 break; 3424 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3786#endif 3425 else
3426 changed = bgPixmap.unset_tint ();
3427 if (changed)
3428 update_background ();
3429 }
3787 3430
3431 break;
3432#endif
3433
3434#if BG_IMAGE_FROM_FILE
3788 case XTerm_Pixmap: 3435 case Rxvt_Pixmap:
3789 if (*str != ';') 3436 if (!strcmp (str, "?"))
3790 { 3437 {
3791#if XPM_BACKGROUND 3438 char str[256];
3792 scale_pixmap (""); /* reset to default scaling */ 3439
3793 set_bgPixmap (str); /* change pixmap */ 3440 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3794#endif 3441 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3795 scr_touch (true); 3442 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3443 process_xterm_seq (XTerm_title, str, CHAR_ST);
3796 } 3444 }
3797 while ((str = strchr (str, ';')) != NULL) 3445 else
3798 { 3446 {
3447 int changed = 0;
3448
3449 if (*str != ';')
3450 {
3451 /* reset to default scaling :*/
3452 bgPixmap.unset_geometry ();
3453 if (bgPixmap.set_file (str)) /* change pixmap */
3454 changed++;
3455 str = strchr (str, ';');
3456 if (str == NULL)
3457 bgPixmap.set_defaultGeometry ();
3458 }
3459 while (str)
3460 {
3799 str++; 3461 str++;
3800#if XPM_BACKGROUND 3462 if (bgPixmap.set_geometry (str))
3801 changed += scale_pixmap (str); 3463 changed++;
3802#endif 3464 str = strchr (str, ';');
3803 3465 }
3466 if (changed)
3467 update_background ();
3804 } 3468 }
3805 if (changed)
3806 {
3807#ifdef XPM_BACKGROUND
3808 resize_pixmap ();
3809#endif
3810 scr_touch (true);
3811 }
3812 break; 3469 break;
3470#endif
3813 3471
3814 case XTerm_restoreFG: 3472 case Rxvt_restoreFG:
3815 set_window_color (Color_fg, str); 3473 set_window_color (Color_fg, str);
3816 break; 3474 break;
3817 case XTerm_restoreBG: 3475 case Rxvt_restoreBG:
3818 set_window_color (Color_bg, str); 3476 set_window_color (Color_bg, str);
3819 break; 3477 break;
3820 3478
3821 case XTerm_logfile: 3479 case XTerm_logfile:
3822 // TODO, when secure mode? 3480 // TODO, when secure mode?
3823 break; 3481 break;
3824 3482
3483#if 0
3484 case Rxvt_dumpscreen: /* no error notices */
3485 {
3486 int fd;
3487 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3488 {
3489 scr_dump (fd);
3490 close (fd);
3491 }
3492 }
3493 break;
3494#endif
3825 case XTerm_font: 3495 case XTerm_font:
3826 op = URxvt_font; 3496 op = URxvt_font;
3827 case URxvt_font: 3497 case URxvt_font:
3828#if ENABLE_STYLES 3498#if ENABLE_STYLES
3829 case URxvt_boldFont: 3499 case URxvt_boldFont:
3830 case URxvt_italicFont: 3500 case URxvt_italicFont:
3831 case URxvt_boldItalicFont: 3501 case URxvt_boldItalicFont:
3832#endif 3502#endif
3833 if (query) 3503 if (query)
3834 tt_printf ("\33]%d;%-.250s%c", saveop, 3504 tt_printf ("\33]%d;%-.250s%c", saveop,
3835 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3505 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3836 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3506 ? fontset[op - URxvt_font]->fontdesc : "",
3837 resp); 3507 resp);
3838 else 3508 else
3839 { 3509 {
3840 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3510 const char *&res = rs[Rs_font + (op - URxvt_font)];
3841 3511
… …
3843 allocated.push_back ((void *)res); 3513 allocated.push_back ((void *)res);
3844 set_fonts (); 3514 set_fonts ();
3845 } 3515 }
3846 break; 3516 break;
3847 3517
3848#if ENABLE_FRILLS 3518 case URxvt_version:
3849 case XTerm_locale:
3850 if (query) 3519 if (query)
3520 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3521 op,
3522 rs[Rs_name], VERSION[0], VERSION[2],
3523 resp);
3524 break;
3525
3526#if !ENABLE_MINIMAL
3527 case URxvt_locale:
3528 if (query)
3851 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3529 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3852 else 3530 else
3853 { 3531 {
3854 set_locale (str); 3532 set_locale (str);
3855# ifdef USE_XIM 3533 pty->set_utf8_mode (enc_utf8);
3856 im_cb (); 3534 init_xlocale ();
3857# endif
3858 } 3535 }
3859 break; 3536 break;
3860#endif
3861 3537
3862#ifdef MENUBAR 3538 case URxvt_view_up:
3863 case XTerm_Menu: 3539 case URxvt_view_down:
3864 if (options & Opt_insecure) 3540 {
3865 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3541 int lines = atoi (str);
3542
3543 if (lines)
3544 scr_page (op == URxvt_view_up ? UP : DN, lines);
3545 else
3546 scr_erase_savelines ();
3547 }
3548
3866 break; 3549 break;
3867#endif 3550#endif
3868#if 0 3551
3869 case XTerm_dumpscreen: /* no error notices */ 3552#if ENABLE_PERL
3870 { 3553 case URxvt_perl:
3871 int fd; 3554 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3872 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3555 ; // no responses yet
3873 {
3874 scr_dump (fd);
3875 close (fd);
3876 }
3877 }
3878 break; 3556 break;
3879#endif 3557#endif
3880 } 3558 }
3881} 3559}
3882/*----------------------------------------------------------------------*/ 3560/*----------------------------------------------------------------------*/
… …
3913 return state; 3591 return state;
3914} 3592}
3915 3593
3916/* we're not using priv _yet_ */ 3594/* we're not using priv _yet_ */
3917void 3595void
3918rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3596rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3919{ 3597{
3920 unsigned int i, j; 3598 unsigned int i, j;
3921 int state; 3599 int state;
3922 3600
3923 static const struct 3601 static const struct
3924 { 3602 {
3925 const int argval; 3603 const int argval;
3926 const unsigned long bit; 3604 const unsigned long bit;
3927 }
3928
3929 argtopriv[] = { 3605 } argtopriv[] = {
3930 { 1, PrivMode_aplCUR }, 3606 { 1, PrivMode_aplCUR },
3931 { 2, PrivMode_vt52 }, 3607 { 2, PrivMode_vt52 },
3932 { 3, PrivMode_132 }, 3608 { 3, PrivMode_132 },
3933 { 4, PrivMode_smoothScroll }, 3609 { 4, PrivMode_smoothScroll },
3934 { 5, PrivMode_rVideo }, 3610 { 5, PrivMode_rVideo },
3935 { 6, PrivMode_relOrigin }, 3611 { 6, PrivMode_relOrigin },
3936 { 7, PrivMode_Autowrap }, 3612 { 7, PrivMode_Autowrap },
3937 // 8, bi-directional support mode 3613 // 8, bi-directional support mode
3938 { 9, PrivMode_MouseX10 }, 3614 { 9, PrivMode_MouseX10 },
3939#ifdef menuBar_esc
3940 { menuBar_esc, PrivMode_menuBar },
3941#endif
3942 // 18, 19 printing-related 3615 // 18, 19 printing-related
3943 { 25, PrivMode_VisibleCursor }, 3616 { 25, PrivMode_VisibleCursor },
3944#ifdef scrollBar_esc 3617#ifdef scrollBar_esc
3945 { scrollBar_esc, PrivMode_scrollBar }, 3618 { scrollBar_esc, PrivMode_scrollBar },
3946#endif 3619#endif
… …
3991 } 3664 }
3992 3665
3993 /* extra handling for values with state unkept */ 3666 /* extra handling for values with state unkept */
3994 switch (arg[i]) 3667 switch (arg[i])
3995 { 3668 {
3669#if ENABLE_STYLES
3670 case 1021:
3671 set_option (Opt_intensityStyles, mode);
3672
3673 scr_touch (true);
3674 break;
3675#endif
3996 case 1048: /* alternative cursor save */ 3676 case 1048: /* alternative cursor save */
3997 case 1049: 3677 case 1049:
3998 if (options & Opt_secondaryScreen) 3678 if (option (Opt_secondaryScreen))
3999 if (mode == 0) 3679 if (mode == 0)
4000 scr_cursor (RESTORE); 3680 scr_cursor (RESTORE);
4001 else if (mode == 1) 3681 else if (mode == 1)
4002 scr_cursor (SAVE); 3682 scr_cursor (SAVE);
4003 break; 3683 break;
… …
4015 */ 3695 */
4016 PrivMode (1, PrivMode_vt52); 3696 PrivMode (1, PrivMode_vt52);
4017 break; 3697 break;
4018 case 3: /* 80/132 */ 3698 case 3: /* 80/132 */
4019 if (priv_modes & PrivMode_132OK) 3699 if (priv_modes & PrivMode_132OK)
4020 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3700 set_widthheight (((state ? 132 : 80) * fwidth), height);
4021 break; 3701 break;
4022 case 4: /* smooth scrolling */ 3702 case 4: /* smooth scrolling */
4023 if (state)
4024 options &= ~Opt_jumpScroll;
4025 else
4026 options |= Opt_jumpScroll; 3703 set_option (Opt_jumpScroll, !state);
4027 break; 3704 break;
4028 case 5: /* reverse video */ 3705 case 5: /* reverse video */
4029 scr_rvideo_mode (state); 3706 scr_rvideo_mode (state);
4030 break; 3707 break;
4031 case 6: /* relative/absolute origins */ 3708 case 6: /* relative/absolute origins */
… …
4037 /* case 8: - auto repeat, can't do on a per window basis */ 3714 /* case 8: - auto repeat, can't do on a per window basis */
4038 case 9: /* X10 mouse reporting */ 3715 case 9: /* X10 mouse reporting */
4039 if (state) /* orthogonal */ 3716 if (state) /* orthogonal */
4040 priv_modes &= ~PrivMode_MouseX11; 3717 priv_modes &= ~PrivMode_MouseX11;
4041 break; 3718 break;
4042#ifdef menuBar_esc
4043 case menuBar_esc:
4044#ifdef MENUBAR
4045 map_menuBar (state);
4046#endif
4047 break;
4048#endif
4049#ifdef scrollBar_esc 3719#ifdef scrollBar_esc
4050 case scrollBar_esc: 3720 case scrollBar_esc:
4051 if (scrollbar_mapping (state)) 3721 if (scrollbar_mapping (state))
4052 { 3722 {
4053 resize_all_windows (0, 0, 0); 3723 resize_all_windows (0, 0, 0);
… …
4072#if 0 3742#if 0
4073 case 1001: 3743 case 1001:
4074 break; /* X11 mouse highlighting */ 3744 break; /* X11 mouse highlighting */
4075#endif 3745#endif
4076 case 1010: /* scroll to bottom on TTY output inhibit */ 3746 case 1010: /* scroll to bottom on TTY output inhibit */
4077 if (state)
4078 options &= ~Opt_scrollTtyOutput;
4079 else
4080 options |= Opt_scrollTtyOutput; 3747 set_option (Opt_scrollTtyOutput, !state);
4081 break; 3748 break;
4082 case 1011: /* scroll to bottom on key press */ 3749 case 1011: /* scroll to bottom on key press */
4083 if (state)
4084 options |= Opt_scrollTtyKeypress; 3750 set_option (Opt_scrollTtyKeypress, state);
4085 else
4086 options &= ~Opt_scrollTtyKeypress;
4087 break; 3751 break;
4088 case 1047: /* secondary screen w/ clearing last */ 3752 case 1047: /* secondary screen w/ clearing last */
4089 if (options & Opt_secondaryScreen) 3753 if (option (Opt_secondaryScreen))
4090 if (current_screen != PRIMARY) 3754 if (current_screen != PRIMARY)
4091 scr_erase_screen (2); 3755 scr_erase_screen (2);
4092 scr_change_screen (state); 3756 scr_change_screen (state);
4093 break; 3757 break;
4094 case 1049: /* secondary screen w/ clearing first */ 3758 case 1049: /* secondary screen w/ clearing first */
4095 scr_change_screen (state); 3759 scr_change_screen (state);
4096 if (options & Opt_secondaryScreen) 3760 if (option (Opt_secondaryScreen))
4097 if (current_screen != PRIMARY) 3761 if (current_screen != PRIMARY)
4098 scr_erase_screen (2); 3762 scr_erase_screen (2);
4099 break; 3763 break;
4100 default: 3764 default:
4101 break; 3765 break;
… …
4229 scr_color (Color_bg, Color_bg); 3893 scr_color (Color_bg, Color_bg);
4230 break; 3894 break;
4231 3895
4232 //case 50: // not variable spacing 3896 //case 50: // not variable spacing
4233 3897
4234#ifndef NO_BRIGHTCOLOR 3898#if !ENABLE_MINIMAL
4235 case 90: 3899 case 90:
4236 case 91: /* set bright fg color */ 3900 case 91: /* set bright fg color */
4237 case 92: 3901 case 92:
4238 case 93: 3902 case 93:
4239 case 94: 3903 case 94:
… …
4251 case 106: 3915 case 106:
4252 case 107: 3916 case 107:
4253 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 3917 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4254 break; 3918 break;
4255#endif 3919#endif
4256
4257 } 3920 }
4258 } 3921 }
4259} 3922}
4260/*}}} */ 3923/*}}} */
4261 3924
… …
4285 */ 3948 */
4286void 3949void
4287rxvt_term::tt_printf (const char *fmt,...) 3950rxvt_term::tt_printf (const char *fmt,...)
4288{ 3951{
4289 va_list arg_ptr; 3952 va_list arg_ptr;
4290 unsigned char buf[256]; 3953 char buf[256];
4291 3954
4292 va_start (arg_ptr, fmt); 3955 va_start (arg_ptr, fmt);
4293 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3956 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4294 va_end (arg_ptr); 3957 va_end (arg_ptr);
4295 tt_write (buf, strlen (buf)); 3958 tt_write (buf, strlen (buf));
… …
4300 * or generated by us in response to a query ESC sequence. 3963 * or generated by us in response to a query ESC sequence.
4301 */ 3964 */
4302const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3965const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4303 3966
4304void 3967void
4305rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3968rxvt_term::tt_write (const char *data, unsigned int len)
4306{ 3969{
3970 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3971 return;
3972
3973 if (pty->pty < 0)
3974 return;
3975
4307 if (v_buflen == 0) 3976 if (v_buflen == 0)
4308 { 3977 {
4309 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3978 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4310 3979
4311 if ((unsigned int)written == len) 3980 if ((unsigned int)written == len)
4312 return; 3981 return;
4313 3982
4314 data += written; 3983 data += written;
4315 len -= written; 3984 len -= written;
4316 } 3985 }
4317 3986
4318 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 3987 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4319 3988
4320 memcpy (v_buffer + v_buflen, data, len); 3989 memcpy (v_buffer + v_buflen, data, len);
4321 v_buflen += len; 3990 v_buflen += len;
4322 3991
4323 pty_ev.set (EVENT_READ | EVENT_WRITE); 3992 pty_ev.set (EVENT_READ | EVENT_WRITE);
4324} 3993}
4325 3994
4326void rxvt_term::pty_write () 3995void rxvt_term::pty_write ()
4327{ 3996{
4328 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3997 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4329 3998
4330 if (written > 0) 3999 if (written > 0)
4331 { 4000 {
4332 v_buflen -= written; 4001 v_buflen -= written;
4333 4002
4334 if (v_buflen == 0) 4003 if (v_buflen == 0)
4335 { 4004 {
4336 free (v_buffer); 4005 free (v_buffer);
4337 v_buffer = 0; 4006 v_buffer = 0;
4338 v_buflen = 0;
4339 4007
4340 pty_ev.set (EVENT_READ); 4008 pty_ev.set (EVENT_READ);
4341 return; 4009 return;
4342 } 4010 }
4343 4011
4344 memmove (v_buffer, v_buffer + written, v_buflen); 4012 memmove (v_buffer, v_buffer + written, v_buflen);
4345 } 4013 }
4346 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4014 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4347 // original code just ignores this... 4015 pty_ev.set (EVENT_READ);
4348 destroy ();
4349} 4016}
4350 4017
4351/*----------------------- end-of-file (C source) -----------------------*/ 4018/*----------------------- end-of-file (C source) -----------------------*/
4352 4019

Diff Legend

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