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.90 by pcg, Fri Apr 2 19:09:52 2004 UTC vs.
Revision 1.301 by root, Tue Jan 31 21:23:13 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
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 <wchar.h> 54#ifdef KEYSYM_RESOURCE
55# include "keyboard.h"
56#endif
57
58#include <csignal>
54 59
55/*----------------------------------------------------------------------*/ 60/*----------------------------------------------------------------------*/
56 61
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 62#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 63
59// exception thrown when the command parser runs out of input data 64#if ENABLE_FRILLS || ISO_14755
60class out_of_input { } out_of_input; 65
66#define ISO_14755_STARTED 0x80000000UL
67#define ISO_14755_51 0x40000000UL // basic (section 5.1)
68#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
69#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
70#define ISO_14755_MASK 0x0fffffffUL
71
72#if ISO_14755
73static unsigned short iso14755_symtab[] = {
74 // keysym, unicode
75 XK_Left, 0x2190,
76 XK_KP_Left, 0x2190,
77 XK_Up, 0x2191,
78 XK_KP_Up, 0x2191,
79 XK_Right, 0x2192,
80 XK_KP_Right, 0x2192,
81 XK_Down, 0x2193,
82 XK_KP_Down, 0x2193,
83 XK_Linefeed, 0x21b4,
84 XK_Return, 0x21b5,
85 XK_KP_Enter, 0x21b5,
86
87 XK_Prior, 0x21de,
88 XK_Next, 0x21df,
89 XK_Tab, 0x21e5,
90 XK_ISO_Left_Tab, 0x21e6,
91 XK_Shift_L, 0x21e7,
92 XK_Shift_R, 0x21e7,
93
94 XK_Shift_Lock, 0x21eb,
95 XK_ISO_Lock, 0x21eb,
96 XK_ISO_Lock, 0x21eb,
97 XK_Caps_Lock, 0x21ec,
98 XK_Num_Lock, 0x21ed,
99 XK_ISO_Level3_Shift, 0x21ee,
100 XK_ISO_Level3_Lock, 0x21ef,
101 XK_ISO_Group_Lock, 0x21f0,
102 XK_Home, 0x21f1,
103 XK_End, 0x21f2,
104
105 XK_Execute, 0x2318,
106 XK_Begin, 0x2320,
107 XK_Delete, 0x2326,
108 XK_Clear, 0x2327,
109 XK_BackSpace, 0x232b,
110 XK_Insert, 0x2380,
111 XK_Control_L, 0x2388,
112 XK_Control_R, 0x2388,
113 XK_Pause, 0x2389,
114 XK_Break, 0x238a,
115 XK_Escape, 0x238b,
116 XK_Undo, 0x238c,
117 XK_Print, 0x2399,
118
119 XK_space, 0x2423,
120
121#ifdef XK_KP_Begin
122 XK_KP_Prior, 0x21de,
123 XK_KP_Next, 0x21df,
124 XK_KP_Begin, 0x2320,
125 XK_KP_Insert, 0x2380,
126 XK_KP_Delete, 0x2326,
127 XK_KP_Space, 0x2422,
128#endif
129 0,
130};
131
132void
133rxvt_term::iso14755_54 (int x, int y)
134{
135 x = Pixel2Col (x);
136 y = Pixel2Row (y);
137
138 if (!IN_RANGE_EXC (x, 0, ncol)
139 || !IN_RANGE_EXC (y, 0, nrow))
140 return;
141
142 for (;;)
143 {
144 const line_t &l = ROW(y + view_start);
145
146 text_t t = l.t[x];
147
148 if (t != NOCHAR || !x)
149 {
150 iso14755_51 (l.t[x], l.r[x], x, y);
151 iso14755buf = ISO_14755_54;
152 break;
153 }
154
155 x--;
156 }
157}
158
159void
160rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
161{
162 rxvt_fontset *fs = FONTSET (r);
163 rxvt_font *f = (*fs)[fs->find_font (ch)];
164 wchar_t *chr, *alloc, ch2, *fname;
165 int len;
166
167 fname = rxvt_utf8towcs (f->name);
168
169# if ENABLE_COMBINING
170 if (IS_COMPOSE (ch))
171 {
172 len = rxvt_composite.expand (ch, 0);
173 alloc = chr = new wchar_t[len];
174 rxvt_composite.expand (ch, chr);
175 }
176 else
177# endif
178 {
179 ch2 = ch;
180
181 alloc = 0;
182 chr = &ch2;
183 len = 1;
184 }
185
186 char attr[80]; // plenty
187
188 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
189 (int)r,
190 fgcolor_of (r), bgcolor_of (r),
191 r & RS_Bold ? " bold" : "",
192 r & RS_Italic ? " italic" : "",
193 r & RS_Blink ? " blink" : "",
194 r & RS_RVid ? " rvid" : "",
195 r & RS_Uline ? " uline" : "",
196 r & RS_Careful ? " careful" : "");
197
198 int width = wcswidth (fname, wcslen (fname));
199
200 max_it (width, 8+5); // for char + hey
201 max_it (width, strlen (attr));
202
203 if (y >= 0)
204 {
205 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
206 x = 0;
207 }
208
209 scr_overlay_new (x, y, width, len + 2);
210
211 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
212
213 for (int y = 0; y < len; y++)
214 {
215 char buf[9];
216
217 ch = *chr++;
218
219 sprintf (buf, "%8x", ch);
220 scr_overlay_set (0, y, buf);
221 scr_overlay_set (9, y, '=');
222# if !UNICODE3
223 if (ch >= 0x10000)
224 ch = 0xfffd;
225# endif
226 scr_overlay_set (11, y, ch, r);
227
228 if (WCWIDTH (ch) >= 2)
229 scr_overlay_set (12, y, NOCHAR, r);
230 }
231
232// {
233// char buf[4+4+3+1];
234// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
235// scr_overlay_set (0, 0, buf);
236// }
237 scr_overlay_set (0, len , attr);
238 scr_overlay_set (0, len + 1, fname);
239
240 free (fname);
241
242# if ENABLE_COMBINING
243 if (alloc)
244 delete [] alloc;
245# endif
246}
247#endif
248
249void
250rxvt_term::commit_iso14755 ()
251{
252 wchar_t ch[2];
253
254 ch[0] = iso14755buf & ISO_14755_MASK;
255 ch[1] = 0;
256
257 if (iso14755buf & ISO_14755_51)
258 {
259 char mb[16];
260 int len;
261
262 // allow verbatim 0-bytes and control-bytes to be entered
263 if (ch[0] >= 0x20)
264 len = wcstombs (mb, ch, 16);
265 else
266 {
267 mb[0] = ch[0];
268 len = 1;
269 }
270
271 if (len > 0)
272 tt_write (mb, len);
273 else
274 scr_bell ();
275 }
276
277 iso14755buf = 0;
278}
279
280int
281rxvt_term::hex_keyval (XKeyEvent &ev)
282{
283 // check wether this event corresponds to a hex digit
284 // if the modifiers had not been pressed.
285 for (int index = 0; index < 8; index++)
286 {
287 KeySym k = XLookupKeysym (&ev, index);
288
289 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
290 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
291 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
292 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
293 }
294
295 return -1;
296}
297#endif
61 298
62/*{{{ Convert the keypress event into a string */ 299/*{{{ Convert the keypress event into a string */
63void 300void
64rxvt_term::lookup_key (XKeyEvent &ev) 301rxvt_term::lookup_key (XKeyEvent &ev)
65{ 302{
66 int ctrl, meta, shft, len; 303 int ctrl, meta, shft, len;
67 unsigned int newlen; 304 unsigned int newlen;
68 KeySym keysym; 305 KeySym keysym;
69#ifdef DEBUG_CMD
70 static int debug_key = 1; /* accessible by a debugger only */
71#endif
72 int valid_keysym; 306 int valid_keysym;
73 unsigned char kbuf[KBUFSZ]; 307 char kbuf[KBUFSZ];
74 308
75 /* 309 /*
76 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 310 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
77 * escape sequence to toggle the Keypad. 311 * escape sequence to toggle the Keypad.
78 * 312 *
79 * Always permit `shift' to override the current setting 313 * Always permit `shift' to override the current setting
80 */ 314 */
81 shft = (ev.state & ShiftMask); 315 shft = ev.state & ShiftMask;
82 ctrl = (ev.state & ControlMask); 316 ctrl = ev.state & ControlMask;
83 meta = (ev.state & ModMetaMask); 317 meta = ev.state & ModMetaMask;
84 318
85 if (numlock_state || (ev.state & ModNumLockMask)) 319 if (numlock_state || (ev.state & ModNumLockMask))
86 { 320 {
87 numlock_state = (ev.state & ModNumLockMask); 321 numlock_state = (ev.state & ModNumLockMask);
88 PrivMode ((!numlock_state), PrivMode_aplKP); 322 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
96 Status status_return; 330 Status status_return;
97 331
98#if 0 332#if 0
99#ifdef X_HAVE_UTF8_STRING 333#ifdef X_HAVE_UTF8_STRING
100 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 334 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
101 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 335 len = Xutf8LookupString (Input_Context, &ev, kbuf,
102 KBUFSZ, &keysym, &status_return); 336 KBUFSZ, &keysym, &status_return);
103 else 337 else
104#endif 338#endif
105#endif 339#endif
106 { 340 {
… …
108 342
109 // the XOpenIM manpage lies about hardcoding the locale 343 // the XOpenIM manpage lies about hardcoding the locale
110 // at the point of XOpenIM, so temporarily switch locales 344 // at the point of XOpenIM, so temporarily switch locales
111 if (rs[Rs_imLocale]) 345 if (rs[Rs_imLocale])
112 SET_LOCALE (rs[Rs_imLocale]); 346 SET_LOCALE (rs[Rs_imLocale]);
347
113 // assume wchar_t == unicode or better 348 // assume wchar_t == unicode or better
114 len = XwcLookupString (Input_Context, &ev, wkbuf, 349 len = XwcLookupString (Input_Context, &ev, wkbuf,
115 KBUFSZ, &keysym, &status_return); 350 KBUFSZ, &keysym, &status_return);
351
116 if (rs[Rs_imLocale]) 352 if (rs[Rs_imLocale])
117 SET_LOCALE (locale); 353 SET_LOCALE (locale);
118 354
119 if (status_return == XLookupChars 355 if (status_return == XLookupChars
120 || status_return == XLookupBoth) 356 || status_return == XLookupBoth)
… …
141 || status_return == XLookupBoth; 377 || status_return == XLookupBoth;
142 } 378 }
143 else 379 else
144#endif 380#endif
145 { 381 {
146 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 382 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
147 valid_keysym = keysym != NoSymbol; 383 valid_keysym = keysym != NoSymbol;
148 } 384 }
149 385
150 if (valid_keysym) 386 if (valid_keysym)
151 { 387 {
388#ifdef KEYSYM_RESOURCE
389 if (keyboard->dispatch (this, keysym, ev.state))
390 return;
391#endif
392
152 if (TermWin.saveLines) 393 if (saveLines)
153 { 394 {
154#ifdef UNSHIFTED_SCROLLKEYS 395#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 396 if (!ctrl && !meta)
156 {
157#else 397#else
158 if (IS_SCROLL_MOD) 398 if (IS_SCROLL_MOD)
399#endif
159 { 400 {
160#endif
161 int lnsppg; 401 int lnsppg;
162 402
163#ifdef PAGING_CONTEXT_LINES 403#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 404 lnsppg = nrow - PAGING_CONTEXT_LINES;
165#else 405#else
166 lnsppg = TermWin.nrow * 4 / 5; 406 lnsppg = nrow * 4 / 5;
167#endif 407#endif
168 if (keysym == XK_Prior) 408 if (keysym == XK_Prior)
169 { 409 {
170 scr_page (UP, lnsppg); 410 scr_page (UP, lnsppg);
171 return; 411 return;
… …
199 scr_move_to (0, 1); 439 scr_move_to (0, 1);
200 return; 440 return;
201 } 441 }
202 else if (keysym == XK_End) 442 else if (keysym == XK_End)
203 { 443 {
204 scr_move_to (1, 0); 444 scr_move_to (1, 1);
205 return; 445 return;
206 } 446 }
207 } 447 }
208#endif 448#endif
209 } 449 }
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 454 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 455 {
216 keysym += (XK_F11 - XK_F1); 456 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 457 shft = 0; /* turn off Shift */
218 } 458 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 459 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 460 {
221 switch (keysym) 461 switch (keysym)
222 { 462 {
223 /* normal XTerm key bindings */ 463 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 464 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 465 selection_request (ev.time);
226 return; 466 return;
467#if TODO
227 /* rxvt extras */ 468 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 469 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 470 change_font (FONT_UP);
230 return; 471 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 472 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 473 change_font (FONT_DN);
233 return; 474 return;
475#endif
234 } 476 }
235 } 477 }
236 } 478 }
237#ifdef PRINTPIPE 479
238 if (keysym == XK_Print) 480#if ENABLE_FRILLS || ISO_14755
239 { 481 // ISO 14755 support
240 scr_printscreen (ctrl | shft); 482 if (shft && ctrl)
241 return;
242 } 483 {
243#endif 484 int hv;
244 485
245 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 486 if (iso14755buf & ISO_14755_51
246 { 487 && (keysym == XK_space || keysym == XK_KP_Space
247#ifdef KEYSYM_RESOURCE 488 || keysym == XK_Return || keysym == XK_KP_Enter))
248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
249 { 489 {
250 unsigned int l; 490 commit_iso14755 ();
251 const unsigned char *kbuf0; 491 iso14755buf = ISO_14755_51;
252 492# if ISO_14755
253 kbuf0 = (Keysym_map[keysym & 0xFF]); 493 iso14755_51 (0);
254 l = (unsigned int)*kbuf0++;
255
256 /* escape prefix */
257 if (meta
258# ifdef META8_OPTION
259 && meta_char == C0_ESC
260# endif 494# endif
261 ) 495 return;
262 {
263 const unsigned char ch = C0_ESC;
264 tt_write (&ch, 1);
265 } 496 }
266 497 else if ((hv = hex_keyval (ev)) >= 0)
267 tt_write (kbuf0, l); 498 {
499 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
500 | hv | ISO_14755_51;
501# if ISO_14755
502 iso14755_51 (iso14755buf & ISO_14755_MASK);
503# endif
268 return; 504 return;
269 } 505 }
270 else 506 else
507 {
508# if ENABLE_OVERLAY
509 scr_overlay_off ();
271#endif 510# endif
511 iso14755buf = 0;
512 }
513 }
514 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
515 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
516 if (!(iso14755buf & ISO_14755_STARTED))
517 {
518 iso14755buf |= ISO_14755_STARTED;
519# if ENABLE_OVERLAY
520 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
521 scr_overlay_set (0, 0, "ISO 14755 mode");
522# endif
523 }
524#endif
525
526#ifdef PRINTPIPE
527 if (keysym == XK_Print)
528 {
529 scr_printscreen (ctrl | shft);
530 return;
531 }
532#endif
533
534 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
535 {
272 { 536 {
273 newlen = 1; 537 newlen = 1;
274 switch (keysym) 538 switch (keysym)
275 { 539 {
276#ifndef NO_BACKSPACE_KEY 540#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 541 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 542 if (priv_modes & PrivMode_HaveBackSpace)
279 { 543 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 544 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 545 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 546 kbuf[1] = '\0';
283 } 547 }
284 else 548 else
285 STRCPY (kbuf, key_backspace); 549 strcpy (kbuf, key_backspace);
286 break; 550 break;
287#endif 551#endif
288#ifndef NO_DELETE_KEY 552#ifndef NO_DELETE_KEY
553# ifdef XK_KP_Prior
554 case XK_KP_Delete:
555 /* allow shift to override */
556 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
557 {
558 strcpy (kbuf, "\033On");
559 break;
560 }
561 /* FALLTHROUGH */
562# endif
289 case XK_Delete: 563 case XK_Delete:
290 STRCPY (kbuf, key_delete); 564 strcpy (kbuf, key_delete);
291 break; 565 break;
292#endif 566#endif
293 case XK_Tab: 567 case XK_Tab:
294 if (shft) 568 if (shft)
295 STRCPY (kbuf, "\033[Z"); 569 strcpy (kbuf, "\033[Z");
296 else 570 else
297 { 571 {
298#ifdef CTRL_TAB_MAKES_META 572#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 573 if (ctrl)
300 meta = 1; 574 meta = 1;
… …
306 newlen = 0; 580 newlen = 0;
307 } 581 }
308 break; 582 break;
309 583
310#ifdef XK_KP_Left 584#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 585 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 586 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 587 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 588 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 589 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 590 {
317 STRCPY (kbuf, "\033OZ"); 591 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 592 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 593 break;
320 } 594 }
321 else 595 else
322 /* translate to std. cursor key */ 596 /* translate to std. cursor key */
… …
325#endif 599#endif
326 case XK_Up: /* "\033[A" */ 600 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 601 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 602 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 603 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 604 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 605 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 606 /* do Shift first */
333 if (shft) 607 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 608 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 609 else if (ctrl)
336 { 610 {
337 kbuf[1] = 'O'; 611 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 612 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 613 }
340 else if (PrivateModes & PrivMode_aplCUR) 614 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 615 kbuf[1] = 'O';
342 break; 616 break;
343 617
344#ifndef UNSHIFTED_SCROLLKEYS 618#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 619# ifdef XK_KP_Prior
346 case XK_KP_Prior: 620 case XK_KP_Prior:
347 /* allow shift to override */ 621 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 622 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 623 {
350 STRCPY (kbuf, "\033Oy"); 624 strcpy (kbuf, "\033Oy");
351 break; 625 break;
352 } 626 }
353 /* FALLTHROUGH */ 627 /* FALLTHROUGH */
354# endif 628# endif
355 case XK_Prior: 629 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 630 strcpy (kbuf, "\033[5~");
357 break; 631 break;
358# ifdef XK_KP_Next 632# ifdef XK_KP_Next
359 case XK_KP_Next: 633 case XK_KP_Next:
360 /* allow shift to override */ 634 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 635 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 636 {
363 STRCPY (kbuf, "\033Os"); 637 strcpy (kbuf, "\033Os");
364 break; 638 break;
365 } 639 }
366 /* FALLTHROUGH */ 640 /* FALLTHROUGH */
367# endif 641# endif
368 case XK_Next: 642 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 643 strcpy (kbuf, "\033[6~");
370 break; 644 break;
371#endif 645#endif
372 case XK_KP_Enter: 646 case XK_KP_Enter:
373 /* allow shift to override */ 647 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 648 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 649 {
376 STRCPY (kbuf, "\033OM"); 650 strcpy (kbuf, "\033OM");
651 break;
652 }
653
654 /* FALLTHROUGH */
655
656 case XK_Return:
657 if (priv_modes & PrivMode_LFNL)
658 {
659 kbuf[0] = '\015';
660 kbuf[1] = '\012';
661 kbuf[2] = '\0';
377 } 662 }
378 else 663 else
379 { 664 {
380 kbuf[0] = '\r'; 665 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 666 kbuf[1] = '\0';
382 } 667 }
383 break; 668 break;
384 669
385#ifdef XK_KP_Begin 670#ifdef XK_KP_Begin
386 case XK_KP_Begin: 671 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 672 strcpy (kbuf, "\033Ou");
388 break; 673 break;
389 674
390 case XK_KP_Insert:
391 STRCPY (kbuf, "\033Op");
392 break;
393
394 case XK_KP_Delete:
395 STRCPY (kbuf, "\033On");
396 break;
397#endif 675#endif
398 case XK_KP_F1: /* "\033OP" */ 676 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 677 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 678 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 679 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 680 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 681 kbuf[2] += (keysym - XK_KP_F1);
404 break; 682 break;
405 683
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 684 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 685 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 696 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 697 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 698 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 699 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 700 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 701 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 702 {
425 STRCPY (kbuf, "\033Oj"); 703 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 704 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 705 }
428 else 706 else
429 { 707 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 708 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 709 kbuf[1] = '\0';
432 } 710 }
433 break; 711 break;
434 712
435 case XK_Find: 713 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 714 strcpy (kbuf, "\033[1~");
437 break; 715 break;
716
717#ifdef XK_KP_End
718 case XK_KP_Insert:
719 /* allow shift to override */
720 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
721 {
722 strcpy (kbuf, "\033Op");
723 break;
724 }
725 /* FALLTHROUGH */
726#endif
438 case XK_Insert: 727 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 728 strcpy (kbuf, "\033[2~");
440 break; 729 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 730#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 731 case DXK_Remove:
443 /* FALLTHROUGH */ 732 /* FALLTHROUGH */
444#endif 733#endif
445 case XK_Execute: 734 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 735 strcpy (kbuf, "\033[3~");
447 break; 736 break;
448 case XK_Select: 737 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 738 strcpy (kbuf, "\033[4~");
450 break; 739 break;
451#ifdef XK_KP_End 740#ifdef XK_KP_End
452 case XK_KP_End: 741 case XK_KP_End:
453 /* allow shift to override */ 742 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 743 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 744 {
456 STRCPY (kbuf, "\033Oq"); 745 strcpy (kbuf, "\033Oq");
457 break; 746 break;
458 } 747 }
459 /* FALLTHROUGH */ 748 /* FALLTHROUGH */
460#endif 749#endif
461 case XK_End: 750 case XK_End:
462 STRCPY (kbuf, KS_END); 751 strcpy (kbuf, KS_END);
463 break; 752 break;
464#ifdef XK_KP_Home 753#ifdef XK_KP_Home
465 case XK_KP_Home: 754 case XK_KP_Home:
466 /* allow shift to override */ 755 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 756 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 757 {
469 STRCPY (kbuf, "\033Ow"); 758 strcpy (kbuf, "\033Ow");
470 break; 759 break;
471 } 760 }
472 /* FALLTHROUGH */ 761 /* FALLTHROUGH */
473#endif 762#endif
474 case XK_Home: 763 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 764 strcpy (kbuf, KS_HOME);
476 break; 765 break;
477 766
478#define FKEY(n, fkey) \ 767#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 768 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 769
… …
532#undef FKEY 821#undef FKEY
533 default: 822 default:
534 newlen = 0; 823 newlen = 0;
535 break; 824 break;
536 } 825 }
826
537 if (newlen) 827 if (newlen)
538 len = STRLEN (kbuf); 828 len = strlen (kbuf);
539 } 829 }
540 830
541 /* 831 /*
542 * Pass meta for all function keys, if 'meta' option set 832 * Pass meta for all function keys, if 'meta' option set
543 */ 833 */
… …
550 else if (ctrl && keysym == XK_minus) 840 else if (ctrl && keysym == XK_minus)
551 { 841 {
552 len = 1; 842 len = 1;
553 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 843 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
554 } 844 }
845 else if (keysym == XK_ISO_Left_Tab)
846 {
847 strcpy (kbuf, "\033[Z");
848 len = 3;
849 }
555 else 850 else
556 { 851 {
557#ifdef META8_OPTION 852#ifdef META8_OPTION
558 /* set 8-bit on */ 853 /* set 8-bit on */
559 if (meta && (meta_char == 0x80)) 854 if (meta && (meta_char == 0x80))
560 { 855 {
561 unsigned char *ch; 856 char *ch;
562 857
563 for (ch = kbuf; ch < kbuf + len; ch++) 858 for (ch = kbuf; ch < kbuf + len; ch++)
564 *ch |= 0x80; 859 *ch |= 0x80;
565 860
566 meta = 0; 861 meta = 0;
… …
568#endif 863#endif
569 /* nil */ ; 864 /* nil */ ;
570 } 865 }
571 } 866 }
572 867
868 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
869 return;
870
573 if (len <= 0) 871 if (len <= 0)
574 return; /* not mapped */ 872 return; /* not mapped */
575 873
576 if (Options & Opt_scrollTtyKeypress) 874 if (OPTION (Opt_scrollTtyKeypress))
577 if (TermWin.view_start) 875 if (view_start)
578 { 876 {
579 TermWin.view_start = 0; 877 view_start = 0;
580 want_refresh = 1; 878 want_refresh = 1;
581 } 879 }
582 880
583 /* 881 /*
584 * these modifications only affect the static keybuffer 882 * these modifications only affect the static keybuffer
… …
599#ifdef META8_OPTION 897#ifdef META8_OPTION
600 && meta_char == C0_ESC 898 && meta_char == C0_ESC
601#endif 899#endif
602 ) 900 )
603 { 901 {
604 const unsigned char ch = C0_ESC; 902 const char ch = C0_ESC;
605 tt_write (&ch, 1); 903 tt_write (&ch, 1);
606 } 904 }
607 905
608#if defined(DEBUG_CMD)
609 /* Display keyboard buffer contents */
610 unsigned char *p;
611 int i;
612
613 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
614 for (i = 0, p = kbuf; i < len; i++, p++)
615 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
616 fprintf (stderr, "'\n");
617#endif /* DEBUG_CMD */
618 tt_write (kbuf, (unsigned int)len); 906 tt_write (kbuf, (unsigned int)len);
619} 907}
620/*}}} */ 908/*}}} */
621 909
622#if (MENUBAR_MAX) 910#if defined (KEYSYM_RESOURCE)
623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
624/* attempt to `write' count to the input buffer */
625unsigned int 911unsigned int
626rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 912rxvt_term::cmd_write (const char *str, unsigned int count)
627{ 913{
628 unsigned int n, s; 914 unsigned int n, s;
629 915
630 n = cmdbuf_ptr - cmdbuf_base; 916 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 917 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 918
633 if (n > 0 && s < count) 919 if (n > 0 && s < count)
634 { 920 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 921 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 922 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 923 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 924 cmdbuf_endp -= n;
639 s += n; 925 s += n;
640 } 926 }
… …
650 936
651 cmd_parse (); 937 cmd_parse ();
652 938
653 return 0; 939 return 0;
654} 940}
655#endif /* MENUBAR_MAX */ 941#endif
656 942
657void 943void
658rxvt_term::flush () 944rxvt_term::flush ()
659{ 945{
946 flush_ev.stop ();
947
660#ifdef TRANSPARENT 948#ifdef TRANSPARENT
661 if (want_full_refresh) 949 if (want_full_refresh)
662 { 950 {
663 want_full_refresh = 0; 951 want_full_refresh = 0;
664 scr_clear (); 952 scr_clear ();
665 scr_touch (false); 953 scr_touch (false);
666 want_refresh = 1;
667 } 954 }
668#endif 955#endif
669 956
670 if (want_refresh) 957 if (want_refresh)
671 { 958 {
959 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
960 {
961 int row = view_start;
962 int end_row = row + nrow;
963
964 while (row > top_row && ROW (row - 1).is_longer ())
965 --row;
966
967 do
968 {
969 int start_row = row;
970 line_t *l;
971
972 do
973 {
974 l = &ROW (row++);
975
976 if (!(l->f & LINE_FILTERED))
977 {
978 // line not filtered, mark it as filtered
979 l->f |= LINE_FILTERED;
980 while (l->is_longer ())
981 {
982 l = &ROW (row++);
983 l->f |= LINE_FILTERED;
984 }
985
986 // and filter it
987 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
988
989 break;
990 }
991 }
992 while (l->is_longer () && row < end_row);
993 }
994 while (row < end_row);
995 }
996
672 scr_refresh (refresh_type); 997 scr_refresh ();
673 scrollbar_show (1); 998 scrollbar_show (1);
674#ifdef USE_XIM 999#ifdef USE_XIM
675 IMSendSpot (); 1000 IMSendSpot ();
676#endif 1001#endif
677
678 } 1002 }
679 1003
680 display->flush (); 1004 display->flush ();
681} 1005}
682 1006
683void 1007void
684rxvt_term::check_cb (check_watcher &w) 1008rxvt_term::check_cb (check_watcher &w)
685{ 1009{
686 SET_R (this); 1010 make_current ();
687 SET_LOCALE (locale);
688 1011
1012 display->flush ();
1013
1014 if (want_refresh && !flush_ev.active)
1015 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1016}
1017
1018void
1019rxvt_term::flush_cb (time_watcher &w)
1020{
1021 make_current ();
1022
1023 refresh_limit = 1;
1024 refresh_count = 0;
689 flush (); 1025 flush ();
690} 1026}
691 1027
692#ifdef CURSOR_BLINK 1028#ifdef CURSOR_BLINK
693void 1029void
694rxvt_term::cursor_blink_cb (time_watcher &w) 1030rxvt_term::cursor_blink_cb (time_watcher &w)
695{ 1031{
696 hidden_cursor = !hidden_cursor; 1032 hidden_cursor = !hidden_cursor;
697 want_refresh = 1; 1033 want_refresh = 1;
698 1034
699 w.start (w.at + BLINK_INTERVAL); 1035 w.start (w.at + CURSOR_BLINK_INTERVAL);
700} 1036}
701#endif 1037#endif
702 1038
703#ifdef TEXT_BLINK 1039#ifdef TEXT_BLINK
704void 1040void
… …
711 w.start (w.at + TEXT_BLINK_INTERVAL); 1047 w.start (w.at + TEXT_BLINK_INTERVAL);
712 } 1048 }
713} 1049}
714#endif 1050#endif
715 1051
1052#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1053void
1054rxvt_term::cont_scroll_cb (time_watcher &w)
1055{
1056 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1057 scr_page (scrollbar_isUp() ? UP : DN, 1))
1058 {
1059 want_refresh = 1;
1060 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1061 }
1062}
1063#endif
1064
1065#ifdef SELECTION_SCROLLING
1066void
1067rxvt_term::sel_scroll_cb (time_watcher &w)
1068{
1069 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1070 {
1071 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1072 want_refresh = 1;
1073 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1074 }
1075}
1076#endif
1077
1078#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1079void
1080rxvt_term::slip_wheel_cb (time_watcher &w)
1081{
1082 if (mouse_slip_wheel_speed == 0
1083 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1084 : scr_page (UP, mouse_slip_wheel_speed))
1085 {
1086 if (view_start == top_row || view_start == 0)
1087 mouse_slip_wheel_speed = 0;
1088
1089 want_refresh = 1;
1090 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1091 }
1092}
1093#endif
1094
716bool 1095bool
717rxvt_term::pty_fill () 1096rxvt_term::pty_fill ()
718{ 1097{
719 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1098 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1099
1100 if (CBUFSIZ == n)
1101 {
1102 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1103 n = 0;
1104 }
720 1105
721 memmove (cmdbuf_base, cmdbuf_ptr, n); 1106 memmove (cmdbuf_base, cmdbuf_ptr, n);
722 cmdbuf_ptr = cmdbuf_base; 1107 cmdbuf_ptr = cmdbuf_base;
723 cmdbuf_endp = cmdbuf_ptr + n; 1108 cmdbuf_endp = cmdbuf_ptr + n;
724 1109
725 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1110 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
726 1111
727 if (n > 0) 1112 if (r > 0)
728 { 1113 {
729 cmdbuf_endp += n; 1114 cmdbuf_endp += r;
730 return true; 1115 return true;
731 } 1116 }
732 else if (n < 0 && errno != EAGAIN) 1117 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1118 {
1119#if HAVE_SCHED_YIELD
1120 if (display->is_local)
1121 event_handler.cw_yield.start ();
1122#endif
1123 }
1124 else
1125 {
1126 pty_ev.stop ();
1127
1128 if (!OPTION (Opt_hold))
733 destroy (); 1129 destroy ();
1130 }
734 1131
735 return false; 1132 return false;
736} 1133}
737 1134
738void 1135void
739rxvt_term::pty_cb (io_watcher &w, short revents) 1136rxvt_term::pty_cb (io_watcher &w, short revents)
740{ 1137{
741 SET_R (this); 1138 make_current ();
742 SET_LOCALE (locale); 1139
1140 if (revents & EVENT_READ)
1141 // loop, but don't allow a single term to monopolize us
1142 while (pty_fill ())
1143 if (cmd_parse ())
1144 break;
743 1145
744 if (revents & EVENT_WRITE) 1146 if (revents & EVENT_WRITE)
745 tt_write (0, 0); 1147 pty_write ();
746 else if (revents & EVENT_READ) 1148}
747 {
748 // loop, but don't allow a single term to monopolize us
749 // the number of loops is fully arbitrary, and thus wrong
750 while (pty_fill ())
751 {
752 if (!seen_input)
753 {
754 seen_input = 1;
755 /* once we know the shell is running, send the screen size. Again! */
756 // I don't know why, btw.
757 tt_winch ();
758 }
759 1149
760 if (cmd_parse ()) 1150void
761 break; 1151rxvt_term::pointer_unblank ()
762 } 1152{
763 } 1153 XDefineCursor (xdisp, vt, TermWin_cursor);
1154 recolour_cursor ();
1155
1156#ifdef POINTER_BLANK
1157 hidden_pointer = 0;
1158
1159 if (OPTION (Opt_pointerBlank))
1160 pointer_ev.start (NOW + pointerBlankDelay);
1161#endif
764} 1162}
765 1163
766#ifdef POINTER_BLANK 1164#ifdef POINTER_BLANK
767void 1165void
768rxvt_term::pointer_unblank ()
769{
770 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
771 recolour_cursor ();
772
773 hidden_pointer = 0;
774
775 if (Options & Opt_pointerBlank)
776 pointer_ev.start (NOW + pointerBlankDelay);
777}
778
779void
780rxvt_term::pointer_blank () 1166rxvt_term::pointer_blank ()
781{ 1167{
782 if (! (Options & Opt_pointerBlank)) 1168 if (!OPTION (Opt_pointerBlank))
783 return; 1169 return;
784 1170
785 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1171 XDefineCursor (xdisp, vt, display->blank_cursor);
786 XFlush (display->display); 1172 XFlush (xdisp);
787 1173
788 hidden_pointer = 1; 1174 hidden_pointer = 1;
789} 1175}
790 1176
791void 1177void
792rxvt_term::pointer_cb (time_watcher &w) 1178rxvt_term::pointer_cb (time_watcher &w)
793{ 1179{
794 SET_R (this); 1180 make_current ();
795 SET_LOCALE (locale);
796 1181
797 pointer_blank (); 1182 pointer_blank ();
798} 1183}
799#endif 1184#endif
800 1185
… …
807 x = ev.x; 1192 x = ev.x;
808 y = ev.y; 1193 y = ev.y;
809 pixel_position (&x, &y); 1194 pixel_position (&x, &y);
810 1195
811 if (MEvent.button == AnyButton) 1196 if (MEvent.button == AnyButton)
812 {
813 button_number = 3; 1197 button_number = 3;
814 }
815 else 1198 else
816 { 1199 {
817 button_number = MEvent.button - Button1; 1200 button_number = MEvent.button - Button1;
818 /* add 0x3D for wheel events, like xterm does */ 1201 /* add 0x3D for wheel events, like xterm does */
819 if (button_number >= 3) 1202 if (button_number >= 3)
820 button_number += (64 - 3); 1203 button_number += (64 - 3);
821 } 1204 }
822 1205
823 if (PrivateModes & PrivMode_MouseX10) 1206 if (priv_modes & PrivMode_MouseX10)
824 { 1207 {
825 /* 1208 /*
826 * do not report ButtonRelease 1209 * do not report ButtonRelease
827 * no state info allowed 1210 * no state info allowed
828 */ 1211 */
… …
843 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1226 + ((MEvent.state & ModMetaMask) ? 8 : 0)
844 + ((MEvent.state & ControlMask) ? 16 : 0); 1227 + ((MEvent.state & ControlMask) ? 16 : 0);
845#ifdef MOUSE_REPORT_DOUBLECLICK 1228#ifdef MOUSE_REPORT_DOUBLECLICK
846 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1229 key_state += ((MEvent.clicks > 1) ? 32 : 0);
847#endif 1230#endif
848
849 } 1231 }
850 1232
851#ifdef DEBUG_MOUSEREPORT 1233#if DEBUG_MOUSEREPORT
852 fprintf (stderr, "Mouse ["); 1234 fprintf (stderr, "Mouse [");
853 if (key_state & 16) 1235 if (key_state & 16)
854 fputc ('C', stderr); 1236 fputc ('C', stderr);
855 if (key_state & 4) 1237 if (key_state & 4)
856 fputc ('S', stderr); 1238 fputc ('S', stderr);
… …
860 fputc ('2', stderr); 1242 fputc ('2', stderr);
861 fprintf (stderr, "]: <%d>, %d/%d\n", 1243 fprintf (stderr, "]: <%d>, %d/%d\n",
862 button_number, 1244 button_number,
863 x + 1, 1245 x + 1,
864 y + 1); 1246 y + 1);
865#else 1247#endif
1248
866 tt_printf ("\033[M%c%c%c", 1249 tt_printf ("\033[M%c%c%c",
867 (32 + button_number + key_state), 1250 (32 + button_number + key_state),
868 (32 + x + 1), 1251 (32 + x + 1),
869 (32 + y + 1)); 1252 (32 + y + 1));
870#endif
871} 1253}
872
873#ifdef USING_W11LIB
874void
875rxvt_W11_process_x_event (XEvent *ev)
876{
877 rxvt_t *r = rxvt_get_r ();
878
879 x_cb (*ev);
880}
881#endif
882 1254
883/*{{{ process an X event */ 1255/*{{{ process an X event */
884void 1256void
885rxvt_term::x_cb (XEvent &ev) 1257rxvt_term::x_cb (XEvent &ev)
886{ 1258{
887 SET_R (this); 1259 make_current ();
888 SET_LOCALE (locale);
889 1260
890#if defined(CURSOR_BLINK) 1261 dLocal (Display *, xdisp);
891 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
892 {
893 if (hidden_cursor)
894 {
895 hidden_cursor = 0;
896 want_refresh = 1;
897 }
898 1262
899 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1263 if (ev.xany.window == vt
900 } 1264 && SHOULD_INVOKE (HOOK_X_EVENT)
901#endif 1265 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
902
903#if defined(POINTER_BLANK)
904 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
905 {
906 if (ev.type == MotionNotify
907 || ev.type == ButtonPress
908 || ev.type == ButtonRelease)
909 if (hidden_pointer)
910 pointer_unblank ();
911
912 if (ev.type == KeyPress && hidden_pointer == 0)
913 pointer_blank ();
914 }
915#endif
916
917#ifdef USE_XIM
918 if (XFilterEvent (&ev, None))
919 return; 1266 return;
920#endif
921 1267
1268 // for XQueryPointer
922 Window unused_root, unused_child; 1269 Window unused_root, unused_child;
923 int unused_root_x, unused_root_y; 1270 int unused_root_x, unused_root_y;
924 unsigned int unused_mask; 1271 unsigned int unused_mask;
925
926#ifdef DEBUG_X
927 const char *const eventnames[] =
928 { /* mason - this matches my system */
929 "",
930 "",
931 "KeyPress",
932 "KeyRelease",
933 "ButtonPress",
934 "ButtonRelease",
935 "MotionNotify",
936 "EnterNotify",
937 "LeaveNotify",
938 "FocusIn",
939 "FocusOut",
940 "KeymapNotify",
941 "Expose",
942 "GraphicsExpose",
943 "NoExpose",
944 "VisibilityNotify",
945 "CreateNotify",
946 "DestroyNotify",
947 "UnmapNotify",
948 "MapNotify",
949 "MapRequest",
950 "ReparentNotify",
951 "ConfigureNotify",
952 "ConfigureRequest",
953 "GravityNotify",
954 "ResizeRequest",
955 "CirculateNotify",
956 "CirculateRequest",
957 "PropertyNotify",
958 "SelectionClear",
959 "SelectionRequest",
960 "SelectionNotify",
961 "ColormapNotify",
962 "ClientMessage",
963 "MappingNotify"
964 };
965#endif
966
967#ifdef DEBUG_X
968 struct timeval tp;
969 struct tm *ltt;
970 (void)gettimeofday (&tp, NULL);
971 ltt = localtime (& (tp.tv_sec));
972 D_X ((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev.type], (ev.xany.window == TermWin.parent[0] ? "parent" : (ev.xany.window == TermWin.vt ? "vt" : (ev.xany.window == scrollBar.win ? "scroll" : (ev.xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev.xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev.xany.window == TermWin.vt ? TermWin.vt : (ev.xany.window == scrollBar.win ? scrollBar.win : (ev.xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev.xany.send_event ? "S" : " ", ev.xany.serial));
973#endif
974 1272
975 switch (ev.type) 1273 switch (ev.type)
976 { 1274 {
977 case KeyPress: 1275 case KeyPress:
1276#if ISO_14755
1277 if (!(iso14755buf & ISO_14755_52))
1278#endif
978 lookup_key (ev.xkey); 1279 lookup_key (ev.xkey);
1280
1281 break;
1282
1283 case KeyRelease:
1284 {
1285#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1286 KeySym keysym;
1287
1288 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1289#endif
1290
1291#if ENABLE_FRILLS || ISO_14755
1292 // ISO 14755 support
1293 if (iso14755buf)
1294 if (iso14755buf & ISO_14755_52)
1295 {
1296# if ENABLE_OVERLAY
1297 scr_overlay_off ();
1298# endif
1299# if ISO_14755
1300 // iso14755 part 5.2 handling: release time
1301 // first: controls
1302 if ((ev.xkey.state & ControlMask)
1303 && ((keysym >= 0x40 && keysym <= 0x5f)
1304 || (keysym >= 0x61 && keysym <= 0x7f)))
1305 {
1306 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1307 commit_iso14755 ();
1308 goto skip_switch;
1309 }
1310
1311 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1312 if (i[0] == keysym)
1313 {
1314 iso14755buf = ISO_14755_51 | i[1];
1315 commit_iso14755 ();
1316 goto skip_switch;
1317 }
1318
1319 scr_bell ();
1320# endif
1321 iso14755buf = 0;
1322 break;
1323 }
1324 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1325 {
1326# if ENABLE_OVERLAY
1327 scr_overlay_off ();
1328# endif
1329 if (iso14755buf & ISO_14755_51)
1330 commit_iso14755 ();
1331#if ISO_14755
1332 else if (iso14755buf & ISO_14755_STARTED)
1333 {
1334 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1335
1336 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1337 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1338 }
1339# endif
1340 else
1341 iso14755buf = 0;
1342 }
1343#endif
1344
1345 if (ev.xany.window == vt
1346 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
979 break; 1347 break;
980 1348
981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1349#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982 case KeyRelease:
983 {
984 if (! (ev.xkey.state & ControlMask)) 1350 if (!(ev.xkey.state & ControlMask))
1351 slip_wheel_ev.stop ();
1352 else if (keysym == XK_Control_L || keysym == XK_Control_R)
985 mouse_slip_wheel_speed = 0; 1353 mouse_slip_wheel_speed = 0;
986 else 1354#endif
987 {
988 KeySym ks;
989
990 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
991 if (ks == XK_Control_L || ks == XK_Control_R)
992 mouse_slip_wheel_speed = 0;
993 }
994 break; 1355 break;
995 } 1356 }
996#endif
997 1357
998 case ButtonPress: 1358 case ButtonPress:
999 button_press (ev.xbutton); 1359 button_press (ev.xbutton);
1000 break; 1360 break;
1001 1361
… …
1003 button_release (ev.xbutton); 1363 button_release (ev.xbutton);
1004 break; 1364 break;
1005 1365
1006 case ClientMessage: 1366 case ClientMessage:
1007 if (ev.xclient.format == 32 1367 if (ev.xclient.format == 32
1008 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1368 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1009 destroy ();
1010#ifdef OFFIX_DND
1011 /* OffiX Dnd (drag 'n' drop) protocol */
1012 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1013 && (ev.xclient.data.l[0] == DndFile
1014 || ev.xclient.data.l[0] == DndDir
1015 || ev.xclient.data.l[0] == DndLink))
1016 { 1369 {
1017 /* Get Dnd data */ 1370 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1018 Atom ActualType; 1371 {
1019 int ActualFormat; 1372 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1020 unsigned char *data; 1373 {
1021 unsigned long Size, RemainingBytes; 1374 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1022 1375 {
1023 XGetWindowProperty (display->display, display->root, 1376 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1024 xa[XA_DNDSELECTION], 1377 destroy ();
1025 0L, 1000000L, 1378 }
1026 False, AnyPropertyType, 1379#if ENABLE_EWMH
1027 &ActualType, &ActualFormat, 1380 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1028 &Size, &RemainingBytes, 1381 XSendEvent (xdisp, ev.xclient.window = display->root,
1382 False, SubstructureRedirectMask | SubstructureNotifyMask,
1029 &data); 1383 &ev);
1030 XChangeProperty (display->display, display->root, 1384#endif
1031 XA_CUT_BUFFER0, XA_STRING, 1385 }
1032 8, PropModeReplace, 1386 }
1033 data, STRLEN (data)); 1387#if ENABLE_XEMBED
1034 selection_paste (display->root, XA_CUT_BUFFER0, True); 1388 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1035 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1389 {
1390 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1391 focus_in ();
1392 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1393 focus_out ();
1394 }
1395#endif
1036 } 1396 }
1037#endif /* OFFIX_DND */
1038 break; 1397 break;
1039 1398
1040 case MappingNotify: 1399 case MappingNotify:
1041 XRefreshKeyboardMapping (& (ev.xmapping)); 1400 XRefreshKeyboardMapping (&ev.xmapping);
1042 break; 1401 break;
1043 1402
1044 /* 1403 /*
1045 * XXX: this is not the _current_ arrangement 1404 * XXX: this is not the _current_ arrangement
1046 * Here's my conclusion: 1405 * Here's my conclusion:
… …
1065 break; 1424 break;
1066 } 1425 }
1067 break; 1426 break;
1068 1427
1069 case FocusIn: 1428 case FocusIn:
1070 if (!TermWin.focus) 1429 focus_in ();
1430 break;
1431
1432 case FocusOut:
1433 focus_out ();
1434 break;
1435
1436 case ConfigureNotify:
1437 if (ev.xconfigure.window == parent[0])
1071 { 1438 {
1072 TermWin.focus = 1; 1439 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1073 want_refresh = 1; 1440 ;
1074#ifdef USE_XIM
1075 if (Input_Context != NULL)
1076 XSetICFocus (Input_Context);
1077#endif
1078#ifdef CURSOR_BLINK
1079 if (Options & Opt_cursorBlink)
1080 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1081#endif
1082 1441
1442 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1443 {
1444 seen_resize = 1;
1445 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1446 }
1447
1448 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1449
1450#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1451 if (OPTION (Opt_transparent))
1452 check_our_parents ();
1453#endif
1083 } 1454 }
1084 break; 1455 break;
1085 1456
1086 case FocusOut:
1087 if (TermWin.focus)
1088 {
1089 TermWin.focus = 0;
1090 want_refresh = 1;
1091#ifdef USE_XIM
1092 if (Input_Context != NULL)
1093 XUnsetICFocus (Input_Context);
1094#endif
1095#ifdef CURSOR_BLINK
1096 if (Options & Opt_cursorBlink)
1097 cursor_blink_ev.stop ();
1098 hidden_cursor = 0;
1099#endif
1100
1101 }
1102 break;
1103
1104 case ConfigureNotify: 1457 case PropertyNotify:
1105 if (ev.xconfigure.window == TermWin.parent[0]) 1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1106 { 1459 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1107 int height, width; 1460 && ev.xproperty.state == PropertyNewValue)
1461 selection_property (ev.xproperty.window, ev.xproperty.atom);
1108 1462
1109 do
1110 { /* Wrap lots of configures into one */
1111 width = ev.xconfigure.width;
1112 height = ev.xconfigure.height;
1113 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1114 }
1115 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1116
1117 if (szHint.width != width || szHint.height != height)
1118 {
1119 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1120 resize_all_windows (width, height, 1);
1121 }
1122#ifdef DEBUG_SIZE
1123 else
1124 {
1125 D_SIZE ((stderr, "Size: Not resizing"));
1126 }
1127#endif
1128#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1129 if (Options & Opt_transparent)
1130 {
1131 check_our_parents ();
1132 if (am_transparent)
1133 want_full_refresh = 1;
1134 }
1135#endif
1136 }
1137 break; 1463 break;
1138 1464
1139 case SelectionClear: 1465 case SelectionClear:
1140 selection_clear (); 1466 selection_clear ();
1141 break; 1467 break;
1142 1468
1143 case SelectionNotify: 1469 case SelectionNotify:
1144 if (selection_wait == Sel_normal) 1470 if (selection_wait == Sel_normal)
1145 selection_paste (ev.xselection.requestor, 1471 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1146 ev.xselection.property, True);
1147 break; 1472 break;
1148 1473
1149 case SelectionRequest: 1474 case SelectionRequest:
1150 selection_send (ev.xselectionrequest); 1475 selection_send (ev.xselectionrequest);
1151 break; 1476 break;
1152 1477
1478 case MapNotify:
1479 mapped = 1;
1480#ifdef TEXT_BLINK
1481 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1482#endif
1483 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1484 break;
1485
1153 case UnmapNotify: 1486 case UnmapNotify:
1154 TermWin.mapped = 0; 1487 mapped = 0;
1155#ifdef TEXT_BLINK 1488#ifdef TEXT_BLINK
1156 text_blink_ev.stop (); 1489 text_blink_ev.stop ();
1157#endif 1490#endif
1158 break; 1491 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1159
1160 case MapNotify:
1161 TermWin.mapped = 1;
1162#ifdef TEXT_BLINK
1163 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1164#endif
1165 break; 1492 break;
1166 1493
1167#ifdef TRANSPARENT 1494#ifdef TRANSPARENT
1168 case ReparentNotify: 1495 case ReparentNotify:
1169 rootwin_cb (ev); 1496 rootwin_cb (ev);
1170 break; 1497 break;
1171#endif /* TRANSPARENT */ 1498#endif /* TRANSPARENT */
1172 1499
1173 case GraphicsExpose: 1500 case GraphicsExpose:
1174 case Expose: 1501 case Expose:
1175 if (ev.xany.window == TermWin.vt) 1502 if (ev.xany.window == vt)
1176 { 1503 {
1177#ifdef NO_SLOW_LINK_SUPPORT 1504 do
1178 scr_expose (ev.xexpose.x, ev.xexpose.y, 1505 scr_expose (ev.xexpose.x, ev.xexpose.y,
1179 ev.xexpose.width, ev.xexpose.height, False); 1506 ev.xexpose.width, ev.xexpose.height, False);
1180#else 1507 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1181 // don't understand this, so commented it out 1508
1509 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1510
1511 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1182 scr_expose (ev.xexpose.x, ev.xexpose.y, 1512 scr_expose (ev.xexpose.x, ev.xexpose.y,
1183 ev.xexpose.width, ev.xexpose.height, False); 1513 ev.xexpose.width, ev.xexpose.height, False);
1184 //scr_expose (ev.xexpose.x, 0, 1514
1185 // ev.xexpose.width, TermWin.height, False);
1186#endif
1187 want_refresh = 1; 1515 want_refresh = 1;
1188 } 1516 }
1189 else 1517 else
1190 { 1518 {
1191 XEvent unused_event; 1519 XEvent unused_event;
1192 1520
1193 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1521 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1194 Expose, 1522 ;
1195 &unused_event)) ; 1523 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1196 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1524 ;
1197 GraphicsExpose, 1525
1198 &unused_event)) ;
1199 if (isScrollbarWindow (ev.xany.window)) 1526 if (isScrollbarWindow (ev.xany.window))
1200 { 1527 {
1201 scrollBar.setIdle (); 1528 scrollBar.setIdle ();
1202 scrollbar_show (0); 1529 scrollbar_show (0);
1203 } 1530 }
1204#ifdef MENUBAR 1531
1205 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1532#ifdef TRANSPARENT
1206 menubar_expose (); 1533 if (am_transparent && ev.xany.window == parent[0])
1534 XClearWindow (xdisp, ev.xany.window);
1207#endif 1535#endif
1208 } 1536 }
1209 break; 1537 break;
1210 1538
1211 case MotionNotify: 1539 case MotionNotify:
1212#ifdef POINTER_BLANK 1540#ifdef POINTER_BLANK
1213 if (hidden_pointer) 1541 if (hidden_pointer)
1214 pointer_unblank (); 1542 pointer_unblank ();
1215#endif 1543#endif
1216#if MENUBAR 1544 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1217 if (isMenuBarWindow (ev.xany.window)) 1545 break;
1546
1547 if (ev.xany.window == vt)
1218 { 1548 {
1219 menubar_control (ev.xbutton); 1549 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1220 break; 1550 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1221 } 1551 ; // nop
1222#endif
1223 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1224 break;
1225
1226 if (ev.xany.window == TermWin.vt)
1227 {
1228 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1552 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1229 { 1553 {
1230 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1554 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1231 ; 1555 ;
1232 1556
1233 XQueryPointer (display->display, TermWin.vt, 1557 XQueryPointer (xdisp, vt,
1234 &unused_root, &unused_child, 1558 &unused_root, &unused_child,
1235 &unused_root_x, &unused_root_y, 1559 &unused_root_x, &unused_root_y,
1236 & (ev.xbutton.x), & (ev.xbutton.y), 1560 &ev.xbutton.x, &ev.xbutton.y,
1237 &unused_mask); 1561 &ev.xbutton.state);
1238#ifdef MOUSE_THRESHOLD 1562#ifdef MOUSE_THRESHOLD
1239 /* deal with a `jumpy' mouse */ 1563 /* deal with a `jumpy' mouse */
1240 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1564 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1241 { 1565 {
1242#endif 1566#endif
1567#if ISO_14755
1568 // 5.4
1569 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1570 {
1571 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1572 break;
1573 }
1574#endif
1243 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1575 selection_extend (ev.xbutton.x, ev.xbutton.y,
1244 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1576 ev.xbutton.state & Button3Mask ? 2 : 0);
1577
1245#ifdef SELECTION_SCROLLING 1578#ifdef SELECTION_SCROLLING
1246 if (ev.xbutton.y < TermWin.int_bwidth 1579 if (ev.xbutton.y < int_bwidth
1247 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1580 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1248 { 1581 {
1249 int dist; 1582 int dist;
1250
1251 pending_scroll_selection=1;
1252 1583
1253 /* don't clobber the current delay if we are 1584 /* don't clobber the current delay if we are
1254 * already in the middle of scrolling. 1585 * already in the middle of scrolling.
1255 */ 1586 */
1256 if (scroll_selection_delay<=0) 1587 if (!sel_scroll_ev.active)
1257 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1588 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1258 1589
1259 /* save the event params so we can highlight 1590 /* save the event params so we can highlight
1260 * the selection in the pending-scroll loop 1591 * the selection in the pending-scroll loop
1261 */ 1592 */
1262 selection_save_x=ev.xbutton.x; 1593 selection_save_x = ev.xbutton.x;
1263 selection_save_y=ev.xbutton.y; 1594 selection_save_y = ev.xbutton.y;
1264 selection_save_state=
1265 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1595 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1266 1596
1267 /* calc number of lines to scroll */ 1597 /* calc number of lines to scroll */
1268 if (ev.xbutton.y<TermWin.int_bwidth) 1598 if (ev.xbutton.y < int_bwidth)
1269 { 1599 {
1270 scroll_selection_dir = UP; 1600 scroll_selection_dir = UP;
1271 dist = TermWin.int_bwidth - ev.xbutton.y; 1601 dist = int_bwidth - ev.xbutton.y;
1272 } 1602 }
1273 else 1603 else
1274 { 1604 {
1275 scroll_selection_dir = DN; 1605 scroll_selection_dir = DN;
1276 dist = ev.xbutton.y - 1606 dist = ev.xbutton.y - (int_bwidth + height);
1277 (TermWin.int_bwidth + TermWin.height);
1278 } 1607 }
1608
1279 scroll_selection_lines= (Pixel2Height (dist)/ 1609 scroll_selection_lines = Pixel2Height (dist)
1280 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1610 / SELECTION_SCROLL_LINE_SPEEDUP
1611 + 1;
1281 MIN_IT (scroll_selection_lines, 1612 min_it (scroll_selection_lines,
1282 SELECTION_SCROLL_MAX_LINES); 1613 SELECTION_SCROLL_MAX_LINES);
1283 } 1614 }
1284 else 1615 else
1285 { 1616 {
1286 /* we are within the text window, so we 1617 /* we are within the text window, so we
1287 * shouldn't be scrolling 1618 * shouldn't be scrolling
1288 */ 1619 */
1289 pending_scroll_selection = 0; 1620 if (sel_scroll_ev.active)
1621 sel_scroll_ev.stop();
1290 } 1622 }
1291#endif 1623#endif
1292#ifdef MOUSE_THRESHOLD 1624#ifdef MOUSE_THRESHOLD
1293
1294 } 1625 }
1295#endif 1626#endif
1296
1297 } 1627 }
1298 } 1628 }
1299 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1300 { 1630 {
1301 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1631 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1302 MotionNotify, &ev)) ; 1632 MotionNotify, &ev))
1633 ;
1634
1303 XQueryPointer (display->display, scrollBar.win, 1635 XQueryPointer (xdisp, scrollBar.win,
1304 &unused_root, &unused_child, 1636 &unused_root, &unused_child,
1305 &unused_root_x, &unused_root_y, 1637 &unused_root_x, &unused_root_y,
1306 & (ev.xbutton.x), & (ev.xbutton.y), 1638 &ev.xbutton.x, &ev.xbutton.y,
1307 &unused_mask); 1639 &unused_mask);
1308 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1309 scrollbar_size ()); 1641 scrollbar_size ());
1310 scr_refresh (refresh_type); 1642 want_refresh = 1;
1311 refresh_limit = 0; 1643 refresh_limit = 0;
1312 scrollbar_show (1); 1644 scrollbar_show (1);
1313 } 1645 }
1314 break; 1646 break;
1315 } 1647 }
1316}
1317 1648
1649skip_switch: ;
1650
1651#if defined(CURSOR_BLINK)
1652 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1653 {
1654 if (hidden_cursor)
1655 {
1656 hidden_cursor = 0;
1657 want_refresh = 1;
1658 }
1659
1660 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1661 }
1662#endif
1663
1664#if defined(POINTER_BLANK)
1665 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1666 {
1667 if (ev.type == MotionNotify
1668 || ev.type == ButtonPress
1669 || ev.type == ButtonRelease)
1670 if (hidden_pointer)
1671 pointer_unblank ();
1672
1673 if (ev.type == KeyPress && hidden_pointer == 0)
1674 pointer_blank ();
1675 }
1676#endif
1677}
1678
1679void
1680rxvt_term::focus_in ()
1681{
1682 if (!focus)
1683 {
1684 focus = 1;
1685 want_refresh = 1;
1686
1687 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1688
1689#if USE_XIM
1690 if (Input_Context != NULL)
1691 {
1692 IMSetStatusPosition ();
1693 XSetICFocus (Input_Context);
1694 }
1695#endif
1696#if CURSOR_BLINK
1697 if (OPTION (Opt_cursorBlink))
1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1699#endif
1700#if OFF_FOCUS_FADING
1701 if (rs[Rs_fade])
1702 {
1703 pix_colors = pix_colors_focused;
1704 scr_recolour ();
1705 }
1706#endif
1707 }
1708}
1709
1710void
1711rxvt_term::focus_out ()
1712{
1713 if (focus)
1714 {
1715 focus = 0;
1716 want_refresh = 1;
1717
1718 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1719
1720#if ENABLE_FRILLS || ISO_14755
1721 if (iso14755buf)
1722 {
1723 iso14755buf = 0;
1724# if ENABLE_OVERLAY
1725 scr_overlay_off ();
1726# endif
1727 }
1728#endif
1729#if USE_XIM
1730 if (Input_Context != NULL)
1731 XUnsetICFocus (Input_Context);
1732#endif
1733#if CURSOR_BLINK
1734 if (OPTION (Opt_cursorBlink))
1735 cursor_blink_ev.stop ();
1736 hidden_cursor = 0;
1737#endif
1738#if OFF_FOCUS_FADING
1739 if (rs[Rs_fade])
1740 {
1741 pix_colors = pix_colors_unfocused;
1742 scr_recolour ();
1743 }
1744#endif
1745 }
1746}
1747
1748#if TRANSPARENT
1318void 1749void
1319rxvt_term::rootwin_cb (XEvent &ev) 1750rxvt_term::rootwin_cb (XEvent &ev)
1320{ 1751{
1321 SET_R (this); 1752 make_current ();
1322 SET_LOCALE (locale);
1323 1753
1324 switch (ev.type) 1754 switch (ev.type)
1325 { 1755 {
1326 case PropertyNotify: 1756 case PropertyNotify:
1327 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1328 {
1329 if (ev.xproperty.state == PropertyNewValue)
1330 selection_property (ev.xproperty.window, ev.xproperty.atom);
1331 break;
1332 }
1333#ifdef TRANSPARENT
1334 else
1335 {
1336 /* 1757 /*
1337 * if user used some Esetroot compatible prog to set the root bg, 1758 * if user used some Esetroot compatible prog to set the root bg,
1338 * use the property to determine the pixmap. We use it later on. 1759 * use the property to determine the pixmap. We use it later on.
1339 */ 1760 */
1340 if (xa[XA_XROOTPMAPID] == 0)
1341 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1342
1343 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1761 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1762 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1344 return; 1763 return;
1345 }
1346 1764
1347 /* FALLTHROUGH */ 1765 /* FALLTHROUGH */
1348 case ReparentNotify: 1766 case ReparentNotify:
1349 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1767 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1350 want_full_refresh = 1; 1768 want_refresh = want_full_refresh = 1;
1351 break; 1769 break;
1352#endif
1353 } 1770 }
1354} 1771}
1772#endif
1355 1773
1356void 1774void
1357rxvt_term::button_press (XButtonEvent &ev) 1775rxvt_term::button_press (XButtonEvent &ev)
1358{ 1776{
1359 int reportmode = 0, clickintime; 1777 int reportmode = 0, clickintime;
1360 1778
1361 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1779 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1780
1362 if (!bypass_keystate) 1781 if (!bypass_keystate)
1363 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1782 reportmode = !! (priv_modes & PrivMode_mouse_report);
1783
1364 /* 1784 /*
1365 * VT window processing of button press 1785 * VT window processing of button press
1366 */ 1786 */
1367 if (ev.window == TermWin.vt) 1787 if (ev.window == vt)
1368 { 1788 {
1789 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1790 return;
1791
1792#if ISO_14755
1793 // 5.4
1794 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1795 {
1796 iso14755_54 (ev.x, ev.y);
1797 return;
1798 }
1799#endif
1800
1369 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1801 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1802
1370 if (reportmode) 1803 if (reportmode)
1371 { 1804 {
1372 /* mouse report from vt window */ 1805 /* mouse report from vt window */
1373 /* save the xbutton state (for ButtonRelease) */ 1806 /* save the xbutton state (for ButtonRelease) */
1374 MEvent.state = ev.state; 1807 MEvent.state = ev.state;
1375#ifdef MOUSE_REPORT_DOUBLECLICK 1808#ifdef MOUSE_REPORT_DOUBLECLICK
1376 if (ev.button == MEvent.button && clickintime) 1809 if (ev.button == MEvent.button && clickintime)
1377 { 1810 {
1378 /* same button, within alloted time */ 1811 /* same button, within alloted time */
1379 MEvent.clicks++; 1812 MEvent.clicks++;
1813
1380 if (MEvent.clicks > 1) 1814 if (MEvent.clicks > 1)
1381 { 1815 {
1382 /* only report double clicks */ 1816 /* only report double clicks */
1383 MEvent.clicks = 2; 1817 MEvent.clicks = 2;
1384 mouse_report (ev); 1818 mouse_report (ev);
… …
1403 } 1837 }
1404 else 1838 else
1405 { 1839 {
1406 if (ev.button != MEvent.button) 1840 if (ev.button != MEvent.button)
1407 MEvent.clicks = 0; 1841 MEvent.clicks = 0;
1842
1408 switch (ev.button) 1843 switch (ev.button)
1409 { 1844 {
1410 case Button1: 1845 case Button1:
1846 /* allow meta + click to select rectangular areas */
1847 /* should be done in screen.C */
1848#if ENABLE_FRILLS
1849 selection.rect = !!(ev.state & ModMetaMask);
1850#else
1851 selection.rect = false;
1852#endif
1853
1411 /* allow shift+left click to extend selection */ 1854 /* allow shift+left click to extend selection */
1412 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1855 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1413 { 1856 {
1414 if (MEvent.button == Button1 && clickintime) 1857 if (MEvent.button == Button1 && clickintime)
1415 selection_rotate (ev.x, ev.y); 1858 selection_rotate (ev.x, ev.y);
1416 else 1859 else
1417 selection_extend (ev.x, ev.y, 1); 1860 selection_extend (ev.x, ev.y, 1);
… …
1432 case Button3: 1875 case Button3:
1433 if (MEvent.button == Button3 && clickintime) 1876 if (MEvent.button == Button3 && clickintime)
1434 selection_rotate (ev.x, ev.y); 1877 selection_rotate (ev.x, ev.y);
1435 else 1878 else
1436 selection_extend (ev.x, ev.y, 1); 1879 selection_extend (ev.x, ev.y, 1);
1880
1437 MEvent.button = Button3; 1881 MEvent.button = Button3;
1438 break; 1882 break;
1439 } 1883 }
1440 } 1884 }
1885
1441 MEvent.time = ev.time; 1886 MEvent.time = ev.time;
1442 return; 1887 return;
1443 } 1888 }
1444 1889
1445 /* 1890 /*
… …
1511 upordown = 1; /* down */ 1956 upordown = 1; /* down */
1512 } 1957 }
1513 if (upordown) 1958 if (upordown)
1514 { 1959 {
1515#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1960#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1516 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1961 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1517#endif 1962#endif
1518 if (scr_page (upordown < 0 ? UP : DN, 1)) 1963 if (scr_page (upordown < 0 ? UP : DN, 1))
1519 { 1964 {
1520 if (upordown < 0) 1965 if (upordown < 0)
1521 scrollBar.setUp (); 1966 scrollBar.setUp ();
… …
1537 break; 1982 break;
1538 case R_SB_ALIGN_BOTTOM: 1983 case R_SB_ALIGN_BOTTOM:
1539 csrO = scrollBar.bot - scrollBar.top; 1984 csrO = scrollBar.bot - scrollBar.top;
1540 break; 1985 break;
1541 } 1986 }
1987
1542 if (scrollBar.style == R_SB_XTERM 1988 if (scrollBar.style == R_SB_XTERM
1543 || scrollbar_above_slider (ev.y) 1989 || scrollbar_above_slider (ev.y)
1544 || scrollbar_below_slider (ev.y)) 1990 || scrollbar_below_slider (ev.y))
1545 scr_move_to ( scrollbar_position (ev.y) - csrO, 1991 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1546 scrollbar_size ()); 1992
1547 scrollBar.setMotion (); 1993 scrollBar.setMotion ();
1548 break; 1994 break;
1549 1995
1550 case Button1: 1996 case Button1:
1551 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1997 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1555 case Button3: 2001 case Button3:
1556 if (scrollBar.style != R_SB_XTERM) 2002 if (scrollBar.style != R_SB_XTERM)
1557 { 2003 {
1558 if (scrollbar_above_slider (ev.y)) 2004 if (scrollbar_above_slider (ev.y))
1559# ifdef RXVT_SCROLL_FULL 2005# ifdef RXVT_SCROLL_FULL
1560 scr_page (UP, TermWin.nrow - 1); 2006 scr_page (UP, nrow - 1);
1561# else 2007# else
1562 scr_page (UP, TermWin.nrow / 4); 2008 scr_page (UP, nrow / 4);
1563# endif 2009# endif
1564 else if (scrollbar_below_slider (ev.y)) 2010 else if (scrollbar_below_slider (ev.y))
1565# ifdef RXVT_SCROLL_FULL 2011# ifdef RXVT_SCROLL_FULL
1566 scr_page (DN, TermWin.nrow - 1); 2012 scr_page (DN, nrow - 1);
1567# else 2013# else
1568 scr_page (DN, TermWin.nrow / 4); 2014 scr_page (DN, nrow / 4);
1569# endif 2015# endif
1570 else 2016 else
1571 scrollBar.setMotion (); 2017 scrollBar.setMotion ();
1572 } 2018 }
1573 else 2019 else
1574 { 2020 {
1575 scr_page ((ev.button == Button1 ? DN : UP), 2021 scr_page ((ev.button == Button1 ? DN : UP),
1576 (TermWin.nrow 2022 (nrow
1577 * scrollbar_position (ev.y) 2023 * scrollbar_position (ev.y)
1578 / scrollbar_size ())); 2024 / scrollbar_size ()));
1579 } 2025 }
2026
1580 break; 2027 break;
1581 } 2028 }
1582 } 2029 }
2030
1583 return; 2031 return;
1584 } 2032 }
1585#if MENUBAR
1586 /*
1587 * Menubar window processing of button press
1588 */
1589 if (isMenuBarWindow (ev.window))
1590 menubar_control (ev);
1591#endif
1592} 2033}
1593 2034
1594void 2035void
1595rxvt_term::button_release (XButtonEvent &ev) 2036rxvt_term::button_release (XButtonEvent &ev)
1596{ 2037{
1597 int reportmode = 0; 2038 int reportmode = 0;
1598 2039
1599 csrO = 0; /* reset csr Offset */ 2040 csrO = 0; /* reset csr Offset */
1600 if (!bypass_keystate) 2041 if (!bypass_keystate)
1601 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2042 reportmode = !! (priv_modes & PrivMode_mouse_report);
1602 2043
1603 if (scrollbar_isUpDn ()) 2044 if (scrollbar_isUpDn ())
1604 { 2045 {
1605 scrollBar.setIdle (); 2046 scrollBar.setIdle ();
1606 scrollbar_show (0); 2047 scrollbar_show (0);
1607#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1608 refresh_type &= ~SMOOTH_REFRESH;
1609#endif
1610
1611 } 2048 }
2049
1612#ifdef SELECTION_SCROLLING 2050#ifdef SELECTION_SCROLLING
1613 pending_scroll_selection=0; 2051 if (sel_scroll_ev.active)
2052 sel_scroll_ev.stop();
1614#endif 2053#endif
2054
1615 if (ev.window == TermWin.vt) 2055 if (ev.window == vt)
1616 { 2056 {
2057 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2058 return;
2059
2060#if ISO_14755
2061 // 5.4
2062 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2063 return;
2064#endif
2065
1617 if (reportmode) 2066 if (reportmode)
1618 { 2067 {
1619 /* mouse report from vt window */ 2068 /* mouse report from vt window */
1620 /* don't report release of wheel "buttons" */ 2069 /* don't report release of wheel "buttons" */
1621 if (ev.button >= 4) 2070 if (ev.button >= 4)
… …
1635 MEvent.button = AnyButton; 2084 MEvent.button = AnyButton;
1636 mouse_report (ev); 2085 mouse_report (ev);
1637#endif /* MOUSE_REPORT_DOUBLECLICK */ 2086#endif /* MOUSE_REPORT_DOUBLECLICK */
1638 return; 2087 return;
1639 } 2088 }
2089
1640 /* 2090 /*
1641 * dumb hack to compensate for the failure of click-and-drag 2091 * dumb hack to compensate for the failure of click-and-drag
1642 * when overriding mouse reporting 2092 * when overriding mouse reporting
1643 */ 2093 */
1644 if (PrivateModes & PrivMode_mouse_report 2094 if (priv_modes & PrivMode_mouse_report
1645 && bypass_keystate 2095 && bypass_keystate
1646 && ev.button == Button1 && MEvent.clicks <= 1) 2096 && ev.button == Button1 && MEvent.clicks <= 1)
1647 selection_extend (ev.x, ev.y, 0); 2097 selection_extend (ev.x, ev.y, 0);
1648 2098
1649 switch (ev.button) 2099 switch (ev.button)
1650 { 2100 {
1651 case Button1: 2101 case Button1:
1652 case Button3: 2102 case Button3:
1653 selection_make (ev.time); 2103 selection_make (ev.time);
1654 break; 2104 break;
2105
1655 case Button2: 2106 case Button2:
1656 selection_request (ev.time, ev.x, ev.y); 2107 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2108 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
1657 break; 2109 break;
2110
1658#ifdef MOUSE_WHEEL 2111#ifdef MOUSE_WHEEL
1659 case Button4: 2112 case Button4:
1660 case Button5: 2113 case Button5:
1661 { 2114 {
1662 int i; 2115 int i;
1663 page_dirn v; 2116 page_dirn v;
1664 2117
1665 v = (ev.button == Button4) ? UP : DN; 2118 v = ev.button == Button4 ? UP : DN;
2119
1666 if (ev.state & ShiftMask) 2120 if (ev.state & ShiftMask)
1667 i = 1; 2121 i = 1;
1668 else if ((Options & Opt_mouseWheelScrollPage)) 2122 else if (OPTION (Opt_mouseWheelScrollPage))
1669 i = TermWin.nrow - 1; 2123 i = nrow - 1;
1670 else 2124 else
1671 i = 5; 2125 i = 5;
2126
1672# ifdef MOUSE_SLIP_WHEELING 2127# ifdef MOUSE_SLIP_WHEELING
1673 if (ev.state & ControlMask) 2128 if (ev.state & ControlMask)
1674 { 2129 {
1675 mouse_slip_wheel_speed += (v ? -1 : 1); 2130 mouse_slip_wheel_speed += v ? -1 : 1;
2131 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2132 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2133
2134 if (slip_wheel_ev.at < NOW)
1676 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2135 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2136
2137 slip_wheel_ev.start ();
2138 }
2139 else
2140 {
2141# endif
2142 scr_page (v, i);
2143 scrollbar_show (1);
2144# ifdef MOUSE_SLIP_WHEELING
1677 } 2145 }
1678# endif 2146# endif
1679# ifdef JUMP_MOUSE_WHEEL
1680 scr_page (v, i);
1681 scr_refresh (SMOOTH_REFRESH);
1682 scrollbar_show (1);
1683# else
1684 while (i--)
1685 {
1686 scr_page (v, 1);
1687 scr_refresh (SMOOTH_REFRESH);
1688 scrollbar_show (1);
1689 }
1690# endif
1691
1692 } 2147 }
1693 break; 2148 break;
1694#endif 2149#endif
1695
1696 } 2150 }
1697 } 2151 }
1698#ifdef MENUBAR
1699 else if (isMenuBarWindow (ev.window))
1700 menubar_control (ev);
1701#endif
1702} 2152}
1703 2153
1704#ifdef TRANSPARENT 2154#ifdef TRANSPARENT
1705#if TINTING 2155#if TINTING
1706/* shading taken from eterm-0.9.2 */ 2156/* taken from aterm-0.4.2 */
1707/* RGB 15 */
1708 2157
1709static void 2158typedef uint32_t RUINT32T;
1710shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1711{
1712 unsigned char *ptr;
1713 int x, y;
1714 2159
1715 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2160void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
1716 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2161{
1717 /* No saturation */ 2162 int sh_r, sh_g, sh_b;
1718 for (y = h; --y >= 0;) { 2163 RUINT32T mask_r, mask_g, mask_b;
1719 for (x = -w; x < 0; x++) { 2164 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1720 int r, g, b; 2165 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2166 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2167 int i;
1721 2168
1722 b = ((uint16_t *) ptr)[x]; 2169 Visual *visual = term->visual;
1723 r = (b & 0x7c00) * rm; 2170
1724 g = (b & 0x3e0) * gm; 2171 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1725 b = (b & 0x1f) * bm; 2172
1726 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2173 /* for convenience */
1727 | ((g >> 8) & 0x3e0) 2174 mask_r = visual->red_mask;
1728 | ((b >> 8) & 0x1f); 2175 mask_g = visual->green_mask;
1729 } 2176 mask_b = visual->blue_mask;
1730 ptr += bpl; 2177
1731 } 2178 /* boring lookup table pre-initialization */
2179 switch (srcImage->bits_per_pixel) {
2180 case 15:
2181 if ((mask_r != 0x7c00) ||
2182 (mask_g != 0x03e0) ||
2183 (mask_b != 0x001f))
2184 return;
2185 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2186 lookup_r = lookup;
2187 lookup_g = lookup+32;
2188 lookup_b = lookup+32+32;
2189 sh_r = 10;
2190 sh_g = 5;
2191 sh_b = 0;
2192 break;
2193 case 16:
2194 if ((mask_r != 0xf800) ||
2195 (mask_g != 0x07e0) ||
2196 (mask_b != 0x001f))
2197 return;
2198 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2199 lookup_r = lookup;
2200 lookup_g = lookup+32;
2201 lookup_b = lookup+32+64;
2202 sh_r = 11;
2203 sh_g = 5;
2204 sh_b = 0;
2205 break;
2206 case 24:
2207 if ((mask_r != 0xff0000) ||
2208 (mask_g != 0x00ff00) ||
2209 (mask_b != 0x0000ff))
2210 return;
2211 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2212 lookup_r = lookup;
2213 lookup_g = lookup+256;
2214 lookup_b = lookup+256+256;
2215 sh_r = 16;
2216 sh_g = 8;
2217 sh_b = 0;
2218 break;
2219 case 32:
2220 if ((mask_r != 0xff0000) ||
2221 (mask_g != 0x00ff00) ||
2222 (mask_b != 0x0000ff))
2223 return;
2224 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2225 lookup_r = lookup;
2226 lookup_g = lookup+256;
2227 lookup_b = lookup+256+256;
2228 sh_r = 16;
2229 sh_g = 8;
2230 sh_b = 0;
2231 break;
2232 default:
2233 return; /* we do not support this color depth */
2234 }
2235
2236 /* prepare limits for color transformation (each channel is handled separately) */
2237 if (shade < 0) {
2238 shade = -shade;
2239 if (shade < 0) shade = 0;
2240 if (shade > 100) shade = 100;
2241
2242 lower_lim_r = 65535-rm;
2243 lower_lim_g = 65535-gm;
2244 lower_lim_b = 65535-bm;
2245
2246 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2247 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2248 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2249
2250 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1732 } else { 2251 } else {
1733 for (y = h; --y >= 0;) { 2252 if (shade < 0) shade = 0;
1734 for (x = -w; x < 0; x++) { 2253 if (shade > 100) shade = 100;
1735 int r, g, b;
1736 2254
1737 b = ((uint16_t *) ptr)[x]; 2255 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1738 r = (b & 0x7c00) * rm; 2256
1739 g = (b & 0x3e0) * gm; 2257 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1740 b = (b & 0x1f) * bm; 2258 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1741 r |= (!(r >> 15) - 1); 2259 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1742 g |= (!(g >> 10) - 1); 2260 }
1743 b |= (!(b >> 5) - 1); 2261
1744 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2262 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1745 | ((g >> 8) & 0x3e0) 2263 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1746 | ((b >> 8) & 0x1f); 2264 {
1747 } 2265 unsigned int tmp;
1748 ptr += bpl; 2266
2267 tmp = lower_lim_r;
2268 lower_lim_r = lower_lim_b;
2269 lower_lim_b = tmp;
2270
2271 tmp = upper_lim_r;
2272 upper_lim_r = upper_lim_b;
2273 upper_lim_b = tmp;
2274 }
2275
2276 /* fill our lookup tables */
2277 for (i = 0; i <= mask_r>>sh_r; i++)
2278 {
2279 RUINT32T tmp;
2280 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2281 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2282 lookup_r[i] = (tmp/65535)<<sh_r;
2283 }
2284 for (i = 0; i <= mask_g>>sh_g; i++)
2285 {
2286 RUINT32T tmp;
2287 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2288 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2289 lookup_g[i] = (tmp/65535)<<sh_g;
2290 }
2291 for (i = 0; i <= mask_b>>sh_b; i++)
2292 {
2293 RUINT32T tmp;
2294 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2295 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2296 lookup_b[i] = (tmp/65535)<<sh_b;
2297 }
2298
2299 /* apply table to input image (replacing colors by newly calculated ones) */
2300 switch (srcImage->bits_per_pixel)
2301 {
2302 case 15:
2303 {
2304 unsigned short *p1, *pf, *p, *pl;
2305 p1 = (unsigned short *) srcImage->data;
2306 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2307 while (p1 < pf)
2308 {
2309 p = p1;
2310 pl = p1 + srcImage->width;
2311 for (; p < pl; p++)
1749 } 2312 {
2313 *p = lookup_r[(*p & 0x7c00)>>10] |
2314 lookup_g[(*p & 0x03e0)>> 5] |
2315 lookup_b[(*p & 0x001f)];
2316 }
2317 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1750 } 2318 }
1751} 2319 break;
1752 2320 }
1753/* RGB 16 */ 2321 case 16:
1754static void 2322 {
1755shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2323 unsigned short *p1, *pf, *p, *pl;
1756{ 2324 p1 = (unsigned short *) srcImage->data;
1757 unsigned char *ptr; 2325 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1758 int x, y; 2326 while (p1 < pf)
1759 2327 {
1760 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2328 p = p1;
1761 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2329 pl = p1 + srcImage->width;
1762 /* No saturation */ 2330 for (; p < pl; p++)
1763 for (y = h; --y >= 0;) {
1764 for (x = -w; x < 0; x++) {
1765 int r, g, b;
1766
1767 b = ((uint16_t *) ptr)[x];
1768 r = (b & 0xf800) * rm;
1769 g = (b & 0x7e0) * gm;
1770 b = (b & 0x1f) * bm;
1771 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1772 | ((g >> 8) & 0x7e0)
1773 | ((b >> 8) & 0x1f);
1774 }
1775 ptr += bpl;
1776 } 2331 {
1777 } else { 2332 *p = lookup_r[(*p & 0xf800)>>11] |
1778 for (y = h; --y >= 0;) { 2333 lookup_g[(*p & 0x07e0)>> 5] |
1779 for (x = -w; x < 0; x++) { 2334 lookup_b[(*p & 0x001f)];
1780 int r, g, b;
1781
1782 b = ((uint16_t *) ptr)[x];
1783 r = (b & 0xf800) * rm;
1784 g = (b & 0x7e0) * gm;
1785 b = (b & 0x1f) * bm;
1786 r |= (!(r >> 16) - 1);
1787 g |= (!(g >> 11) - 1);
1788 b |= (!(b >> 5) - 1);
1789 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1790 | ((g >> 8) & 0x7e0)
1791 | ((b >> 8) & 0x1f);
1792 } 2335 }
1793 ptr += bpl; 2336 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2337 }
2338 break;
2339 }
2340 case 24:
2341 {
2342 unsigned char *p1, *pf, *p, *pl;
2343 p1 = (unsigned char *) srcImage->data;
2344 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2345 while (p1 < pf)
2346 {
2347 p = p1;
2348 pl = p1 + srcImage->width * 3;
2349 for (; p < pl; p += 3)
1794 } 2350 {
2351 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2352 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2353 p[2] = lookup_r[(p[2] & 0x0000ff)];
2354 }
2355 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1795 } 2356 }
1796} 2357 break;
2358 }
2359 case 32:
2360 {
2361 RUINT32T *p1, *pf, *p, *pl;
2362 p1 = (RUINT32T *) srcImage->data;
2363 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1797 2364
1798/* RGB 24 */ 2365 while (p1 < pf)
1799static void 2366 {
1800shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2367 p = p1;
1801{ 2368 pl = p1 + srcImage->width;
1802 unsigned char *ptr; 2369 for (; p < pl; p++)
1803 int x, y;
1804
1805 ptr = (unsigned char *)data + (w * 3);
1806 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1807 /* No saturation */
1808 for (y = h; --y >= 0;) {
1809 for (x = -(w * 3); x < 0; x += 3) {
1810 int r, g, b;
1811
1812 if (byteorder.big_endian()) {
1813 r = (ptr[x + 0] * rm) >> 8;
1814 g = (ptr[x + 1] * gm) >> 8;
1815 b = (ptr[x + 2] * bm) >> 8;
1816 ptr[x + 0] = r;
1817 ptr[x + 1] = g;
1818 ptr[x + 2] = b;
1819 } else {
1820 r = (ptr[x + 2] * rm) >> 8;
1821 g = (ptr[x + 1] * gm) >> 8;
1822 b = (ptr[x + 0] * bm) >> 8;
1823 ptr[x + 2] = r;
1824 ptr[x + 1] = g;
1825 ptr[x + 0] = b;
1826 }
1827 }
1828 ptr += bpl;
1829 } 2370 {
1830 } else { 2371 *p = lookup_r[(*p & 0xff0000)>>16] |
1831 for (y = h; --y >= 0;) { 2372 lookup_g[(*p & 0x00ff00)>> 8] |
1832 for (x = -(w * 3); x < 0; x += 3) { 2373 lookup_b[(*p & 0x0000ff)] |
1833 int r, g, b; 2374 (*p & ~0xffffff);
1834
1835 if (byteorder.big_endian()) {
1836 r = (ptr[x + 0] * rm) >> 8;
1837 g = (ptr[x + 1] * gm) >> 8;
1838 b = (ptr[x + 2] * bm) >> 8;
1839
1840 r |= (!(r >> 8) - 1);
1841 g |= (!(g >> 8) - 1);
1842 b |= (!(b >> 8) - 1);
1843
1844 ptr[x + 0] = r;
1845 ptr[x + 1] = g;
1846 ptr[x + 2] = b;
1847 } else {
1848 r = (ptr[x + 2] * rm) >> 8;
1849 g = (ptr[x + 1] * gm) >> 8;
1850 b = (ptr[x + 0] * bm) >> 8;
1851
1852 r |= (!(r >> 8) - 1);
1853 g |= (!(g >> 8) - 1);
1854 b |= (!(b >> 8) - 1);
1855
1856 ptr[x + 2] = r;
1857 ptr[x + 1] = g;
1858 ptr[x + 0] = b;
1859 }
1860 } 2375 }
1861 ptr += bpl; 2376 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1862 } 2377 }
2378 break;
2379 }
1863 } 2380 }
1864}
1865 2381
1866/* RGB 32 */ 2382 free (lookup);
1867static void
1868shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1869{
1870 unsigned char *ptr;
1871 int x, y;
1872
1873 ptr = (unsigned char *)data + (w * 4);
1874 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1875 /* No saturation */
1876 for (y = h; --y >= 0;) {
1877 if (byteorder.big_endian()) {
1878 for (x = -(w * 4); x < 0; x += 4) {
1879 int r, g, b;
1880
1881 r = (ptr[x + 1] * rm) >> 8;
1882 g = (ptr[x + 2] * gm) >> 8;
1883 b = (ptr[x + 3] * bm) >> 8;
1884 ptr[x + 1] = r;
1885 ptr[x + 2] = g;
1886 ptr[x + 3] = b;
1887 }
1888 } else {
1889 for (x = -(w * 4); x < 0; x += 4) {
1890 int r, g, b;
1891
1892 r = (ptr[x + 2] * rm) >> 8;
1893 g = (ptr[x + 1] * gm) >> 8;
1894 b = (ptr[x + 0] * bm) >> 8;
1895 ptr[x + 2] = r;
1896 ptr[x + 1] = g;
1897 ptr[x + 0] = b;
1898 }
1899 }
1900 ptr += bpl;
1901 }
1902 } else {
1903 for (y = h; --y >= 0;) {
1904 for (x = -(w * 4); x < 0; x += 4) {
1905 int r, g, b;
1906
1907 if (byteorder.big_endian()) {
1908 r = (ptr[x + 1] * rm) >> 8;
1909 g = (ptr[x + 2] * gm) >> 8;
1910 b = (ptr[x + 3] * bm) >> 8;
1911
1912 r |= (!(r >> 8) - 1);
1913 g |= (!(g >> 8) - 1);
1914 b |= (!(b >> 8) - 1);
1915
1916 ptr[x + 1] = r;
1917 ptr[x + 2] = g;
1918 ptr[x + 3] = b;
1919 } else {
1920 r = (ptr[x + 2] * rm) >> 8;
1921 g = (ptr[x + 1] * gm) >> 8;
1922 b = (ptr[x + 0] * bm) >> 8;
1923
1924 r |= (!(r >> 8) - 1);
1925 g |= (!(g >> 8) - 1);
1926 b |= (!(b >> 8) - 1);
1927
1928 ptr[x + 2] = r;
1929 ptr[x + 1] = g;
1930 ptr[x + 0] = b;
1931 }
1932 }
1933 ptr += bpl;
1934 }
1935 }
1936} 2383}
1937
1938#endif 2384#endif
1939 2385
1940/* 2386/*
1941 * Check our parents are still who we think they are. 2387 * Check our parents are still who we think they are.
1942 * Do transparency updates if required 2388 * Do transparency updates if required
… …
1952 Pixmap rootpixmap = None; 2398 Pixmap rootpixmap = None;
1953 XWindowAttributes wattr, wrootattr; 2399 XWindowAttributes wattr, wrootattr;
1954 2400
1955 pchanged = 0; 2401 pchanged = 0;
1956 2402
1957 if (!(Options & Opt_transparent)) 2403 if (!OPTION (Opt_transparent))
1958 return pchanged; /* Don't try any more */ 2404 return pchanged; /* Don't try any more */
1959 2405
1960 XGetWindowAttributes (display->display, display->root, &wrootattr); 2406 XGetWindowAttributes (xdisp, display->root, &wrootattr);
1961 rootdepth = wrootattr.depth; 2407 rootdepth = wrootattr.depth;
1962 2408
1963 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2409 XGetWindowAttributes (xdisp, parent[0], &wattr);
1964 2410
1965 if (rootdepth != wattr.depth) 2411 if (rootdepth != wattr.depth)
1966 { 2412 {
1967 if (am_transparent) 2413 if (am_transparent)
1968 { 2414 {
1969 pchanged = 1; 2415 pchanged = 1;
1970 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2416 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
1971 am_transparent = am_pixmap_trans = 0; 2417 am_transparent = am_pixmap_trans = 0;
1972 } 2418 }
1973 2419
1974 return pchanged; /* Don't try any more */ 2420 return pchanged; /* Don't try any more */
1975 } 2421 }
1976 2422
1977 /* Get all X ops out of the queue so that our information is up-to-date. */ 2423 /* Get all X ops out of the queue so that our information is up-to-date. */
1978 XSync (display->display, False); 2424 XSync (xdisp, False);
1979 2425
1980 /* 2426 /*
1981 * Make the frame window set by the window manager have 2427 * Make the frame window set by the window manager have
1982 * the root background. Some window managers put multiple nested frame 2428 * the root background. Some window managers put multiple nested frame
1983 * windows for each client, so we have to take care about that. 2429 * windows for each client, so we have to take care about that.
1984 */ 2430 */
1985 i = (xa[XA_XROOTPMAPID] 2431 i = (xa[XA_XROOTPMAP_ID]
1986 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2432 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
1987 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2433 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1988 &nitems, &bytes_after, &prop) == Success); 2434 &nitems, &bytes_after, &prop) == Success);
1989 2435
1990 if (!i || prop == NULL) 2436 if (!i || prop == NULL)
1991 i = (xa[XA_XSETROOTID] 2437 i = (xa[XA_ESETROOT_PMAP_ID]
1992 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2438 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
1993 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2439 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1994 &nitems, &bytes_after, &prop) == Success); 2440 &nitems, &bytes_after, &prop) == Success);
1995 2441
1996 if (!i || prop == NULL) 2442 if (!i || prop == NULL
2443#if TINTING
2444 || !ISSET_PIXCOLOR (Color_tint)
2445#endif
2446 )
1997 have_pixmap = 0; 2447 have_pixmap = 0;
1998 else 2448 else
1999 { 2449 {
2000 have_pixmap = 1; 2450 have_pixmap = 1;
2001 rootpixmap = * ((Pixmap *)prop); 2451 rootpixmap = *(Pixmap *)prop;
2002 XFree (prop); 2452 XFree (prop);
2003 } 2453 }
2004 2454
2005 if (have_pixmap) 2455 if (have_pixmap)
2006 { 2456 {
… …
2012 Window cr; 2462 Window cr;
2013 XImage *image; 2463 XImage *image;
2014 GC gc; 2464 GC gc;
2015 XGCValues gcvalue; 2465 XGCValues gcvalue;
2016 2466
2017 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2467 XTranslateCoordinates (xdisp, parent[0], display->root,
2018 0, 0, &sx, &sy, &cr); 2468 0, 0, &sx, &sy, &cr);
2019 nw = (unsigned int)szHint.width; 2469 nw = (unsigned int)szHint.width;
2020 nh = (unsigned int)szHint.height; 2470 nh = (unsigned int)szHint.height;
2021 nx = ny = 0; 2471 nx = ny = 0;
2022 2472
… …
2032 nh += sy; 2482 nh += sy;
2033 ny = -sy; 2483 ny = -sy;
2034 sy = 0; 2484 sy = 0;
2035 } 2485 }
2036 2486
2037 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2487 min_it (nw, (unsigned int) (wrootattr.width - sx));
2038 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2488 min_it (nh, (unsigned int) (wrootattr.height - sy));
2489
2490 XSync (xdisp, False);
2039 allowedxerror = -1; 2491 allowedxerror = -1;
2040 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2492 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2041 2493
2042 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2494 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2043 /* XXX: may need a delay here? */ 2495 /* XXX: may need a delay here? */
2044 allowedxerror = 0; 2496 allowedxerror = 0;
2045 2497
2046 if (image == NULL) 2498 if (image == NULL)
2047 { 2499 {
2048 if (am_transparent && am_pixmap_trans) 2500 if (am_transparent && am_pixmap_trans)
2049 { 2501 {
2050 pchanged = 1; 2502 pchanged = 1;
2051 if (TermWin.pixmap != None) 2503 if (pixmap != None)
2052 { 2504 {
2053 XFreePixmap (display->display, TermWin.pixmap); 2505 XFreePixmap (xdisp, pixmap);
2054 TermWin.pixmap = None; 2506 pixmap = None;
2055 } 2507 }
2056 } 2508 }
2057 2509
2058 am_pixmap_trans = 0; 2510 am_pixmap_trans = 0;
2059 } 2511 }
2060 else 2512 else
2061 { 2513 {
2062 if (TermWin.pixmap != None) 2514 if (pixmap != None)
2063 XFreePixmap (display->display, TermWin.pixmap); 2515 XFreePixmap (xdisp, pixmap);
2064 2516
2065#if TINTING 2517#if TINTING
2066 if (ISSET_PIXCOLOR (Color_tint)) 2518 if (ISSET_PIXCOLOR (Color_tint))
2067 { 2519 {
2068 unsigned short shade, rm, gm, bm; 2520 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2069 2521
2070 PixColors[Color_tint].get (display, rm, gm, bm); 2522 rgba c;
2523 pix_colors_focused [Color_tint].get (c);
2071 2524
2072 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2525 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2073
2074 /* Determine bitshift and bitmask values */
2075 switch (image->bits_per_pixel)
2076 {
2077 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2078 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2079 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2080 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2081 }
2082 } 2526 }
2083#endif 2527#endif
2084 2528
2085 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2529 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2086 szHint.width, szHint.height, image->depth);
2087 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2530 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2088 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2531 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2089 nx, ny, image->width, image->height); 2532 nx, ny, image->width, image->height);
2090 XFreeGC (display->display, gc); 2533 XFreeGC (xdisp, gc);
2091 XDestroyImage (image); 2534 XDestroyImage (image);
2092 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2535 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2093 TermWin.pixmap); 2536 XClearWindow (xdisp, parent[0]);
2094 2537
2095 if (!am_transparent || !am_pixmap_trans) 2538 if (!am_transparent || !am_pixmap_trans)
2096 pchanged = 1; 2539 pchanged = 1;
2097 2540
2098 am_transparent = am_pixmap_trans = 1; 2541 am_transparent = am_pixmap_trans = 1;
2099 } 2542 }
2100 } 2543 }
2101 2544
2102 if (!am_pixmap_trans) 2545 if (am_pixmap_trans)
2546 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2547 else
2103 { 2548 {
2104 unsigned int n; 2549 unsigned int n;
2105 /* 2550 /*
2106 * InheritPixmap transparency 2551 * InheritPixmap transparency
2107 */ 2552 */
2108 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2109 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2553 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2110 { 2554 {
2111 oldp = TermWin.parent[i]; 2555 oldp = parent[i];
2112 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2556 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2113 &TermWin.parent[i], &list, &n);
2114 XFree (list); 2557 XFree (list);
2115 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2116 2558
2117 if (TermWin.parent[i] == display->root) 2559 if (parent[i] == display->root)
2118 { 2560 {
2119 if (oldp != None) 2561 if (oldp != None)
2120 pchanged = 1; 2562 pchanged = 1;
2121 2563
2122 break; 2564 break;
2123 } 2565 }
2124 2566
2125 if (oldp != TermWin.parent[i]) 2567 if (oldp != parent[i])
2126 pchanged = 1; 2568 pchanged = 1;
2127 } 2569 }
2128 2570
2129 n = 0; 2571 n = 0;
2130 2572
2131 if (pchanged) 2573 if (pchanged)
2132 {
2133 for (; n < (unsigned int)i; n++) 2574 for (; n < (unsigned int)i; n++)
2134 { 2575 {
2135 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2576 XGetWindowAttributes (xdisp, parent[n], &wattr);
2136 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2577
2137 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2578 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2138 { 2579 {
2139 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2580 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2140 break; 2581 break;
2141 } 2582 }
2142 } 2583 }
2584
2585 if (n > (sizeof (parent) / sizeof (parent[0])))
2143 } 2586 {
2144
2145 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2146 {
2147 D_X ((stderr, "InheritPixmap Turning off"));
2148 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); 2587 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2149 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2588 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2150 am_transparent = 0; 2589 am_transparent = 0;
2151 /* XXX: also turn off Opt_transparent? */ 2590 /* XXX: also turn off Opt_transparent? */
2152 } 2591 }
2153 else 2592 else
2154 { 2593 {
2155#if WAIT_FOR_WM
2156 /* wait (an arbitrary period) for the WM to do its thing
2157 * needed for fvwm2.2.2 (and before?) */
2158 sleep (1);
2159#endif
2160 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2161 for (n = 0; n < (unsigned int)i; n++) 2594 for (n = 0; n < (unsigned int)i; n++)
2595 {
2162 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2596 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2597 XClearWindow (xdisp, parent[n]);
2598 }
2163 2599
2164 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2600 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2165 am_transparent = 1; 2601 am_transparent = 1;
2166 } 2602 }
2167 2603
2168 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2604 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2169 TermWin.parent[i] = None; 2605 parent[i] = None;
2606 }
2607
2608 if (scrollBar.win)
2609 {
2610 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2611 scrollBar.setIdle ();
2612 scrollbar_show (0);
2613 }
2614
2615 if (am_transparent)
2616 {
2617 want_refresh = want_full_refresh = 1;
2618 if (am_pixmap_trans)
2619 flush ();
2170 } 2620 }
2171 2621
2172 return pchanged; 2622 return pchanged;
2173} 2623}
2174#endif 2624#endif
… …
2177 2627
2178bool 2628bool
2179rxvt_term::cmd_parse () 2629rxvt_term::cmd_parse ()
2180{ 2630{
2181 bool flag = false; 2631 bool flag = false;
2182 unicode_t ch = NOCHAR; 2632 wchar_t ch = NOCHAR;
2183 unsigned char *seq_begin; // remember start of esc-sequence here 2633 char *seq_begin; // remember start of esc-sequence here
2184 2634
2185 for (;;) 2635 for (;;)
2186 { 2636 {
2187 if (ch == NOCHAR) 2637 if (ch == NOCHAR)
2188 { 2638 {
2189 seq_begin = cmdbuf_ptr; 2639 seq_begin = cmdbuf_ptr;
2190 ch = next_char (); 2640 ch = next_char ();
2191 }
2192 2641
2193 if (ch == NOCHAR) // TODO: improve 2642 if (ch == NOCHAR)
2194 break; 2643 break;
2195
2196 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r')
2197 { 2644 }
2645
2646 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2647 {
2648 if (!seen_input)
2649 {
2650 seen_input = 1;
2651 // many badly-written programs (e.g. jed) contain a race condition:
2652 // they first read the screensize and then install a SIGWINCH handler.
2653 // some window managers resize the window early, and these programs
2654 // then sometimes get the size wrong.
2655 // unfortunately other programs are even more buggy and dislike
2656 // being sent SIGWINCH, so only do it when we were in fact being
2657 // resized.
2658 if (seen_resize && cmd_pid)
2659 kill (-cmd_pid, SIGWINCH);
2660 }
2661
2198 /* Read a text string from the input buffer */ 2662 /* Read a text string from the input buffer */
2199 unicode_t buf[UBUFSIZ]; 2663 wchar_t buf[UBUFSIZ];
2200 bool refreshnow = false; 2664 bool refreshnow = false;
2201 int nlines = 0; 2665 int nlines = 0;
2202 unicode_t *str = buf; 2666 wchar_t *str = buf;
2203 2667 wchar_t *eol = str + min (ncol, UBUFSIZ);
2204 *str++ = ch;
2205 2668
2206 for (;;) 2669 for (;;)
2207 { 2670 {
2208 seq_begin = cmdbuf_ptr;
2209 ch = next_char ();
2210
2211 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r')) 2671 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2212 break; 2672 break;
2213 2673
2214 *str++ = ch; 2674 *str++ = ch;
2215 2675
2216 if (ch == '\n') 2676 if (ch == C0_LF || str >= eol)
2217 { 2677 {
2678 if (ch == C0_LF)
2218 nlines++; 2679 nlines++;
2680
2219 refresh_count++; 2681 refresh_count++;
2220 2682
2221 if (! (Options & Opt_jumpScroll) 2683 if (!OPTION (Opt_jumpScroll)
2222 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2684 || (refresh_count >= refresh_limit * (nrow - 1)))
2223 { 2685 {
2224 refreshnow = true; 2686 refreshnow = true;
2225 flag = true; 2687 refresh_count = 0;
2226 ch = NOCHAR; 2688 ch = NOCHAR;
2227 break; 2689 break;
2228 } 2690 }
2229 2691
2230 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2692 // scr_add_lines only works for nlines <= nrow - 1.
2231 if (nlines >= TermWin.nrow - 1) 2693 if (nlines >= nrow - 1)
2232 { 2694 {
2695 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2696 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2233 scr_add_lines (buf, nlines, str - buf); 2697 scr_add_lines (buf, str - buf, nlines);
2698
2234 nlines = 0; 2699 nlines = 0;
2235 str = buf; 2700 str = buf;
2701 eol = str + min (ncol, UBUFSIZ);
2236 } 2702 }
2703
2704 if (str >= eol)
2705 {
2706 if (eol >= buf + UBUFSIZ)
2707 {
2708 ch = NOCHAR;
2709 break;
2710 }
2711 else
2712 eol = min (eol + ncol, buf + UBUFSIZ);
2713 }
2714
2237 } 2715 }
2238 2716
2239 if (str >= buf + UBUFSIZ) 2717 seq_begin = cmdbuf_ptr;
2240 { 2718 ch = next_char ();
2241 ch = NOCHAR;
2242 break;
2243 }
2244 } 2719 }
2245 2720
2721 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2722 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2246 scr_add_lines (buf, nlines, str - buf); 2723 scr_add_lines (buf, str - buf, nlines);
2247 2724
2248 /* 2725 /*
2249 * If there have been a lot of new lines, then update the screen 2726 * If there have been a lot of new lines, then update the screen
2250 * What the heck I'll cheat and only refresh less than every page-full. 2727 * What the heck I'll cheat and only refresh less than every page-full.
2251 * the number of pages between refreshes is refresh_limit, which 2728 * the number of pages between refreshes is refresh_limit, which
2252 * is incremented here because we must be doing flat-out scrolling. 2729 * is incremented here because we must be doing flat-out scrolling.
2253 *
2254 * refreshing should be correct for small scrolls, because of the
2255 * time-out
2256 */ 2730 */
2257 if (refreshnow) 2731 if (refreshnow)
2258 { 2732 {
2259 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2733 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2260 refresh_limit++; 2734 refresh_limit++;
2261 2735 else
2736 {
2737 flag = true;
2262 scr_refresh (refresh_type); 2738 scr_refresh ();
2739 want_refresh = 1;
2740 }
2263 } 2741 }
2264 2742
2265 } 2743 }
2266 else 2744 else
2267 { 2745 {
… …
2282 2760
2283 return flag; 2761 return flag;
2284} 2762}
2285 2763
2286// read the next character 2764// read the next character
2287unicode_t 2765wchar_t
2288rxvt_term::next_char () 2766rxvt_term::next_char () NOTHROW
2289{ 2767{
2290 while (cmdbuf_ptr < cmdbuf_endp) 2768 while (cmdbuf_ptr < cmdbuf_endp)
2291 { 2769 {
2292 // assume 7-bit to be ascii ALWAYS 2770 // assume 7-bit to be ascii ALWAYS
2293 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2771 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2294 return *cmdbuf_ptr++; 2772 return *cmdbuf_ptr++;
2295 2773
2296 wchar_t wc; 2774 wchar_t wc;
2297 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2775 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2298 2776
2299 if (len == (size_t)-2) 2777 if (len == (size_t)-2)
2300 { 2778 {
2301 // the mbstate stores incomplete sequences. didn't know this :/ 2779 // the mbstate stores incomplete sequences. didn't know this :/
2302 cmdbuf_ptr = cmdbuf_endp; 2780 cmdbuf_ptr = cmdbuf_endp;
2303 break; 2781 break;
2304 } 2782 }
2305 2783
2306 if (len == (size_t)-1) 2784 if (len == (size_t)-1)
2307 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2785 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2308 2786
2309 // assume wchar == unicode 2787 // assume wchar == unicode
2310 cmdbuf_ptr += len; 2788 cmdbuf_ptr += len;
2311 return wc; 2789 return wc & UNICODE_MASK;
2312 } 2790 }
2313 2791
2314 return NOCHAR; 2792 return NOCHAR;
2315} 2793}
2794
2795// read the next octet
2796uint32_t
2797rxvt_term::next_octet () NOTHROW
2798{
2799 return cmdbuf_ptr < cmdbuf_endp
2800 ? (unsigned char)*cmdbuf_ptr++
2801 : NOCHAR;
2802}
2803
2804static class out_of_input out_of_input;
2316 2805
2317/* rxvt_cmd_getc () - Return next input character */ 2806/* rxvt_cmd_getc () - Return next input character */
2318/* 2807/*
2319 * Return the next input character after first passing any keyboard input 2808 * Return the next input character after first passing any keyboard input
2320 * to the command. 2809 * to the command.
2321 */ 2810 */
2322unicode_t 2811wchar_t
2323rxvt_term::cmd_getc () 2812rxvt_term::cmd_getc () THROW ((class out_of_input))
2324{ 2813{
2325 unicode_t c = next_char (); 2814 wchar_t c = next_char ();
2815
2816 if (c == NOCHAR)
2817 throw out_of_input;
2818
2819 return c;
2820}
2821
2822uint32_t
2823rxvt_term::cmd_get8 () THROW ((class out_of_input))
2824{
2825 uint32_t c = next_octet ();
2326 2826
2327 if (c == NOCHAR) 2827 if (c == NOCHAR)
2328 throw out_of_input; 2828 throw out_of_input;
2329 2829
2330 return c; 2830 return c;
… …
2430 case C0_ESC: 2930 case C0_ESC:
2431 process_escape_seq (); 2931 process_escape_seq ();
2432 break; 2932 break;
2433 case C0_ENQ: /* terminal Status */ 2933 case C0_ENQ: /* terminal Status */
2434 if (rs[Rs_answerbackstring]) 2934 if (rs[Rs_answerbackstring])
2435 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2935 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2436 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2437 else 2936 else
2438 tt_write ((unsigned char *)VT100_ANS, 2937 tt_write (VT100_ANS, strlen (VT100_ANS));
2439 (unsigned int)STRLEN (VT100_ANS));
2440 break; 2938 break;
2441 case C0_BEL: /* bell */ 2939 case C0_BEL: /* bell */
2442 scr_bell (); 2940 scr_bell ();
2443 break; 2941 break;
2444 case C0_BS: /* backspace */ 2942 case C0_BS: /* backspace */
… …
2460 break; 2958 break;
2461 case C0_SI: /* shift in - acs */ 2959 case C0_SI: /* shift in - acs */
2462 scr_charset_choose (0); 2960 scr_charset_choose (0);
2463 break; 2961 break;
2464 2962
2963#ifdef EIGHT_BIT_CONTROLS
2465 // 8-bit controls 2964 // 8-bit controls
2466 case 0x90: /* DCS */ 2965 case 0x90: /* DCS */
2467 process_dcs_seq (); 2966 process_dcs_seq ();
2468 break; 2967 break;
2469 case 0x9b: /* CSI */ 2968 case 0x9b: /* CSI */
2470 process_csi_seq (); 2969 process_csi_seq ();
2471 break; 2970 break;
2472 case 0x9d: /* CSI */ 2971 case 0x9d: /* CSI */
2473 process_osc_seq (); 2972 process_osc_seq ();
2474 break; 2973 break;
2974#endif
2475 } 2975 }
2476} 2976}
2477/*}}} */ 2977/*}}} */
2478 2978
2479 2979
… …
2541void 3041void
2542rxvt_term::process_escape_seq () 3042rxvt_term::process_escape_seq ()
2543{ 3043{
2544 unicode_t ch = cmd_getc (); 3044 unicode_t ch = cmd_getc ();
2545 3045
2546 if (PrivateModes & PrivMode_vt52) 3046 if (priv_modes & PrivMode_vt52)
2547 { 3047 {
2548 process_escape_vt52 (ch); 3048 process_escape_vt52 (ch);
2549 return; 3049 return;
2550 } 3050 }
2551 3051
… …
2566 scr_charset_set (2, (unsigned int)cmd_getc ()); 3066 scr_charset_set (2, (unsigned int)cmd_getc ());
2567 break; 3067 break;
2568 case '+': 3068 case '+':
2569 scr_charset_set (3, (unsigned int)cmd_getc ()); 3069 scr_charset_set (3, (unsigned int)cmd_getc ());
2570 break; 3070 break;
2571#ifndef NO_FRILLS 3071#if !ENABLE_MINIMAL
2572 case '6': 3072 case '6':
2573 scr_backindex (); 3073 scr_backindex ();
2574 break; 3074 break;
2575#endif 3075#endif
2576 case '7': 3076 case '7':
2577 scr_cursor (SAVE); 3077 scr_cursor (SAVE);
2578 break; 3078 break;
2579 case '8': 3079 case '8':
2580 scr_cursor (RESTORE); 3080 scr_cursor (RESTORE);
2581 break; 3081 break;
2582#ifndef NO_FRILLS 3082#if !ENABLE_MINIMAL
2583 case '9': 3083 case '9':
2584 scr_forwardindex (); 3084 scr_forwardindex ();
2585 break; 3085 break;
2586#endif 3086#endif
2587 case '=': 3087 case '=':
… …
2597 break; 3097 break;
2598 3098
2599 /* 8.3.87: NEXT LINE */ 3099 /* 8.3.87: NEXT LINE */
2600 case C1_NEL: /* ESC E */ 3100 case C1_NEL: /* ESC E */
2601 { 3101 {
2602 unicode_t nlcr[] = { L'\n', L'\r' }; 3102 wchar_t nlcr[] = { C0_LF, C0_CR };
2603 scr_add_lines (nlcr, 1, 2); 3103 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2604 } 3104 }
2605 break; 3105 break;
2606 3106
2607 /* kidnapped escape sequence: Should be 8.3.48 */ 3107 /* kidnapped escape sequence: Should be 8.3.48 */
2608 case C1_ESA: /* ESC G */ 3108 case C1_ESA: /* ESC G */
… …
2630 process_dcs_seq (); 3130 process_dcs_seq ();
2631 break; 3131 break;
2632 3132
2633 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3133 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2634 case C1_SCI: /* ESC Z */ 3134 case C1_SCI: /* ESC Z */
2635 tt_write ((const unsigned char *)ESCZ_ANSWER, 3135 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2636 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2637 break; /* steal obsolete ESC [ c */ 3136 break; /* steal obsolete ESC [ c */
2638 3137
2639 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3138 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2640 case C1_CSI: /* ESC [ */ 3139 case C1_CSI: /* ESC [ */
2641 process_csi_seq (); 3140 process_csi_seq ();
… …
2668 3167
2669/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3168/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2670/* *INDENT-OFF* */ 3169/* *INDENT-OFF* */
2671enum { 3170enum {
2672 CSI_ICH = 0x40, 3171 CSI_ICH = 0x40,
2673 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3172 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2674 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 3173 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2675 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 3174 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2676 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 3175 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2677 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 3176 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2678 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 3177 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2750 ndef = get_byte_array_bit (csi_defaults, i); 3249 ndef = get_byte_array_bit (csi_defaults, i);
2751 for (p = 0; p < nargs; p++) 3250 for (p = 0; p < nargs; p++)
2752 if (arg[p] == -1) 3251 if (arg[p] == -1)
2753 arg[p] = ndef; 3252 arg[p] = ndef;
2754 3253
2755#ifdef DEBUG_CMD
2756 fprintf (stderr, "CSI ");
2757 for (p = 0; p < nargs; p++)
2758 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2759 fprintf (stderr, "%c\n", ch);
2760#endif
2761
2762 /* 3254 /*
2763 * private mode handling 3255 * private mode handling
2764 */ 3256 */
2765 if (priv) 3257 if (priv)
2766 { 3258 {
2767 switch (priv) 3259 switch (priv)
2768 { 3260 {
2769 case '>': 3261 case '>':
2770 if (ch == CSI_DA) /* secondary device attributes */ 3262 if (ch == CSI_DA) /* secondary device attributes */
3263 {
3264 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3265 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3266 //
3267 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3268 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3269 // that we do not support xterm mouse reporting (should be 95 when we do).
3270 //
2771 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3271 tt_printf ("\033[>%d;94;0c", 'U');
3272 }
2772 break; 3273 break;
2773 case '?': 3274 case '?':
2774 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3275 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2775 process_terminal_mode (ch, priv, nargs, arg); 3276 process_terminal_mode (ch, priv, nargs, arg);
2776 break; 3277 break;
… …
2881 3382
2882 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3383 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2883 arg[0] = -arg[0]; 3384 arg[0] = -arg[0];
2884 /* FALLTHROUGH */ 3385 /* FALLTHROUGH */
2885 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3386 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2886 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3387 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2887 break; 3388 break;
2888 3389
2889 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3390 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2890 tt_write ((const unsigned char *)VT100_ANS, 3391 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2891 (unsigned int) (sizeof (VT100_ANS) - 1));
2892 break; 3392 break;
2893 3393
2894 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3394 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2895 process_sgr_mode (nargs, arg); 3395 process_sgr_mode (nargs, arg);
2896 break; 3396 break;
… …
2903 break; 3403 break;
2904 case 6: /* CPR requested */ 3404 case 6: /* CPR requested */
2905 scr_report_position (); 3405 scr_report_position ();
2906 break; 3406 break;
2907 case 7: /* unofficial extension */ 3407 case 7: /* unofficial extension */
2908 if (Options & Opt_insecure) 3408 if (OPTION (Opt_insecure))
2909 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3409 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2910 break; 3410 break;
2911 case 8: /* unofficial extension */ 3411 case 8: /* unofficial extension */
2912 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3412 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2913 break; 3413 break;
2914 } 3414 }
… …
2950 break; 3450 break;
2951 3451
2952 case CSI_RM: /* 8.3.107: RESET MODE */ 3452 case CSI_RM: /* 8.3.107: RESET MODE */
2953 if (arg[0] == 4) 3453 if (arg[0] == 4)
2954 scr_insert_mode (0); 3454 scr_insert_mode (0);
3455 else if (arg[0] == 20)
3456 priv_modes &= ~PrivMode_LFNL;
2955 break; 3457 break;
2956 3458
2957 case CSI_SM: /* 8.3.126: SET MODE */ 3459 case CSI_SM: /* 8.3.126: SET MODE */
2958 if (arg[0] == 4) 3460 if (arg[0] == 4)
2959 scr_insert_mode (1); 3461 scr_insert_mode (1);
3462 else if (arg[0] == 20)
3463 priv_modes |= PrivMode_LFNL;
2960 break; 3464 break;
2961 3465
2962 /* 3466 /*
2963 * PRIVATE USE beyond this point. All CSI_7? sequences here 3467 * PRIVATE USE beyond this point. All CSI_7? sequences here
2964 */ 3468 */
… …
2976 break; 3480 break;
2977 case CSI_75: 3481 case CSI_75:
2978 scr_cursor (RESTORE); 3482 scr_cursor (RESTORE);
2979 break; 3483 break;
2980 3484
2981#ifndef NO_FRILLS 3485#if !ENABLE_MINIMAL
2982 case CSI_74: 3486 case CSI_74:
2983 process_window_ops (arg, nargs); 3487 process_window_ops (arg, nargs);
2984 break; 3488 break;
2985#endif 3489#endif
2986 3490
… …
2993 break; 3497 break;
2994 } 3498 }
2995} 3499}
2996/*}}} */ 3500/*}}} */
2997 3501
2998#ifndef NO_FRILLS 3502#if !ENABLE_MINIMAL
2999/* ARGSUSED */ 3503/* ARGSUSED */
3000void 3504void
3001rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3505rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3002{ 3506{
3003 int x, y; 3507 int x, y;
3004 XWindowAttributes wattr; 3508 XWindowAttributes wattr;
3005 Window wdummy; 3509 Window wdummy;
3510
3511 dLocal (Display *, xdisp);
3006 3512
3007 if (nargs == 0) 3513 if (nargs == 0)
3008 return; 3514 return;
3009 3515
3010 switch (args[0]) 3516 switch (args[0])
3011 { 3517 {
3012 /* 3518 /*
3013 * commands 3519 * commands
3014 */ 3520 */
3015 case 1: /* deiconify window */ 3521 case 1: /* deiconify window */
3016 XMapWindow (display->display, TermWin.parent[0]); 3522 XMapWindow (xdisp, parent[0]);
3017 break; 3523 break;
3018 case 2: /* iconify window */ 3524 case 2: /* iconify window */
3019 XIconifyWindow (display->display, TermWin.parent[0], 3525 XIconifyWindow (xdisp, parent[0], display->screen);
3020 DefaultScreen (display->display));
3021 break; 3526 break;
3022 case 3: /* set position (pixels) */ 3527 case 3: /* set position (pixels) */
3023 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3528 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3024 break; 3529 break;
3025 case 4: /* set size (pixels) */ 3530 case 4: /* set size (pixels) */
3026 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3531 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3027 break; 3532 break;
3028 case 5: /* raise window */ 3533 case 5: /* raise window */
3029 XRaiseWindow (display->display, TermWin.parent[0]); 3534 XRaiseWindow (xdisp, parent[0]);
3030 break; 3535 break;
3031 case 6: /* lower window */ 3536 case 6: /* lower window */
3032 XLowerWindow (display->display, TermWin.parent[0]); 3537 XLowerWindow (xdisp, parent[0]);
3033 break; 3538 break;
3034 case 7: /* refresh window */ 3539 case 7: /* refresh window */
3035 scr_touch (true); 3540 scr_touch (true);
3036 break; 3541 break;
3037 case 8: /* set size (chars) */ 3542 case 8: /* set size (chars) */
3038 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3543 set_widthheight ((unsigned int) (args[2] * fwidth),
3039 (unsigned int) (args[1] * TermWin.fheight)); 3544 (unsigned int) (args[1] * fheight));
3040 break; 3545 break;
3041 3546
3042 //case 9: NYI, TODO, restore maximized window or maximize window 3547 //case 9: NYI, TODO, restore maximized window or maximize window
3043 default: 3548 default:
3044 if (args[0] >= 24) /* set height (chars) */ 3549 if (args[0] >= 24) /* set height (chars) */
3045 set_widthheight ((unsigned int)TermWin.width, 3550 set_widthheight ((unsigned int)width,
3046 (unsigned int) (args[1] * TermWin.fheight)); 3551 (unsigned int) (args[1] * fheight));
3047 break; 3552 break;
3048
3049 3553
3050 /* 3554 /*
3051 * reports - some output format copied from XTerm 3555 * reports - some output format copied from XTerm
3052 */ 3556 */
3053 case 11: /* report window state */ 3557 case 11: /* report window state */
3054 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3558 XGetWindowAttributes (xdisp, parent[0], &wattr);
3055 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3559 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3056 break; 3560 break;
3057 case 13: /* report window position */ 3561 case 13: /* report window position */
3058 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3562 XGetWindowAttributes (xdisp, parent[0], &wattr);
3059 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3563 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3060 -wattr.border_width, -wattr.border_width, 3564 -wattr.border_width, -wattr.border_width,
3061 &x, &y, &wdummy); 3565 &x, &y, &wdummy);
3062 tt_printf ("\033[3;%d;%dt", x, y); 3566 tt_printf ("\033[3;%d;%dt", x, y);
3063 break; 3567 break;
3064 case 14: /* report window size (pixels) */ 3568 case 14: /* report window size (pixels) */
3065 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3569 XGetWindowAttributes (xdisp, parent[0], &wattr);
3066 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3570 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3067 break; 3571 break;
3068 case 18: /* report text area size (chars) */ 3572 case 18: /* report text area size (chars) */
3069 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3573 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3070 break; 3574 break;
3071 case 19: /* report window size (chars) */ 3575 case 19: /* report window size (chars) */
3072 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3576 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3073 break; 3577 break;
3074 case 20: /* report icon label */ 3578 case 20: /* report icon label */
3075 if (Options & Opt_insecure)
3076 { 3579 {
3077 char *s; 3580 char *s;
3078 XGetIconName (display->display, TermWin.parent[0], &s); 3581 XGetIconName (xdisp, parent[0], &s);
3079 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3582 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3583 XFree (s);
3080 } 3584 }
3081 break; 3585 break;
3082 case 21: /* report window title */ 3586 case 21: /* report window title */
3083 if (Options & Opt_insecure)
3084 { 3587 {
3085 char *s; 3588 char *s;
3086 XFetchName (display->display, TermWin.parent[0], &s); 3589 XFetchName (xdisp, parent[0], &s);
3087 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3590 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3591 XFree (s);
3088 } 3592 }
3089 break; 3593 break;
3090 } 3594 }
3091} 3595}
3092#endif 3596#endif
3093 3597
3094/*----------------------------------------------------------------------*/ 3598/*----------------------------------------------------------------------*/
3095/* 3599/*
3096 * get input up until STRING TERMINATOR (or BEL) 3600 * get input up until STRING TERMINATOR (or BEL)
3097 * ends_how is terminator used. returned input must be free ()d 3601 * ends_how is terminator used. returned input must be free()'d
3098 */ 3602 */
3099unsigned char * 3603char *
3100rxvt_term::get_to_st (unicode_t &ends_how) 3604rxvt_term::get_to_st (unicode_t &ends_how)
3101{ 3605{
3102 int seen_esc = 0; /* seen escape? */ 3606 unicode_t ch;
3607 bool seen_esc = false;
3103 unsigned int n = 0; 3608 unsigned int n = 0;
3104 unsigned char *s;
3105 unicode_t ch;
3106 unsigned char string[STRING_MAX]; 3609 wchar_t string[STRING_MAX];
3107 3610
3108 while ((ch = cmd_getc ())) 3611 while ((ch = cmd_getc ()) != NOCHAR)
3109 { 3612 {
3110 if (ch == C0_BEL || ch == CHAR_ST)
3111 break;
3112
3113 if (seen_esc) 3613 if (seen_esc)
3614 {
3114 if (ch == 0x5c) /* 7bit ST */ 3615 if (ch == 0x5c) /* 7bit ST */
3115 break; 3616 break;
3116 else 3617 else
3117 return NULL; 3618 return NULL;
3118 3619 }
3119 if (ch == C0_ESC) 3620 else if (ch == C0_ESC)
3120 { 3621 {
3121 seen_esc = 1; 3622 seen_esc = true;
3122 continue; 3623 continue;
3123 } 3624 }
3124 else if (ch == '\t') 3625 else if (ch == C0_BEL || ch == CHAR_ST)
3125 ch = ' '; /* translate '\t' to space */ 3626 break;
3126 else if (ch < 0x20 && (ch != 0x0a && ch != 0x0d)) 3627 else if (ch < 0x20)
3127 return NULL; /* other control character - exit */ 3628 return NULL; /* other control character - exit */
3128 3629
3129 if (n >= sizeof (string) - 1) 3630 seen_esc = false;
3631
3632 if (n >= STRING_MAX - 1)
3130 // stop at some sane length 3633 // stop at some sane length
3131 return NULL; 3634 return NULL;
3132 3635
3636 if (ch == C0_SYN)
3637 string[n++] = cmd_get8 ();
3638 else
3133 string[n++] = ch; 3639 string[n++] = ch;
3134 seen_esc = 0;
3135 } 3640 }
3136 3641
3137 string[n++] = '\0'; 3642 string[n++] = '\0';
3138 3643
3139 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3140 return NULL;
3141
3142 ends_how = (ch == 0x5c ? C0_ESC : ch); 3644 ends_how = (ch == 0x5c ? C0_ESC : ch);
3143 STRNCPY (s, string, n); 3645
3144 return s; 3646 return rxvt_wcstombs (string);
3145} 3647}
3146 3648
3147/*----------------------------------------------------------------------*/ 3649/*----------------------------------------------------------------------*/
3148/* 3650/*
3149 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3651 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3150 */ 3652 */
3151void 3653void
3152rxvt_term::process_dcs_seq () 3654rxvt_term::process_dcs_seq ()
3153{ 3655{
3154 unsigned char *s; 3656 char *s;
3155 unicode_t eh; 3657 unicode_t eh;
3156 3658
3157 /* 3659 /*
3158 * Not handled yet 3660 * Not handled yet
3159 */ 3661 */
… …
3178 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3680 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3179 arg = arg * 10 + (ch - '0'); 3681 arg = arg * 10 + (ch - '0');
3180 3682
3181 if (ch == ';') 3683 if (ch == ';')
3182 { 3684 {
3183 unsigned char *s = get_to_st (eh); 3685 char *s = get_to_st (eh);
3184 3686
3185 if (s) 3687 if (s)
3186 { 3688 {
3187 process_xterm_seq (arg, (char *)s, eh); 3689 process_xterm_seq (arg, s, eh);
3188 free (s); 3690 free (s);
3189 } 3691 }
3190 } 3692 }
3191} 3693}
3192 3694
3193void 3695void
3194rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3696rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3195{ 3697{
3196 if (str[0] == '?' && !str[1]) 3698 if (str[0] == '?' && !str[1])
3197 { 3699 {
3198 if (Options & Opt_insecure) 3700 rgba c;
3199 { 3701 pix_colors_focused[color].get (c);
3200 unsigned short r, g, b; 3702
3201 PixColors[color].get (display, r, g, b); 3703#if XFT
3704 if (c.a != rgba::MAX_CC)
3705 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3706 else
3707#endif
3202 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3708 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3203 }
3204 } 3709 }
3205 else 3710 else
3206 set_window_color (color, str); 3711 set_window_color (color, str);
3207} 3712}
3208 3713
3209/* 3714/*
3210 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3715 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3211 * 0 = change iconName/title
3212 * 1 = change iconName
3213 * 2 = change title
3214 * 4 = change color
3215 * 10 = change fg color
3216 * 11 = change bg color
3217 * 12 = change text color
3218 * 13 = change mouse foreground color
3219 * 17 = change highlight character colour
3220 * 18 = change bold character color
3221 * 19 = change underlined character color
3222 * 46 = change logfile (not implemented)
3223 * 50 = change font
3224 *
3225 * rxvt extensions:
3226 * 20 = bg pixmap
3227 * 39 = change default fg color
3228 * 49 = change default bg color
3229 * 55 = dump scrollback buffer and all of screen
3230 * 701 = change locale
3231 * 702 = find font
3232 * 703 = menu
3233 */ 3716 */
3234void 3717void
3235rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3718rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3236{ 3719{
3237 int changed = 0;
3238 int color; 3720 int color;
3239 char *buf, *name; 3721 char *buf, *name;
3240 bool query = str[0] == '?' && !str[1]; 3722 bool query = str[0] == '?' && !str[1];
3723 int saveop = op;
3724
3725 dLocal (Display *, xdisp);
3241 3726
3242 assert (str != NULL); 3727 assert (str != NULL);
3243 switch (op) 3728 switch (op)
3244 { 3729 {
3245 case XTerm_name: 3730 case XTerm_name:
… …
3252 set_title (str); 3737 set_title (str);
3253 break; 3738 break;
3254 case XTerm_property: 3739 case XTerm_property:
3255 if (str[0] == '?') 3740 if (str[0] == '?')
3256 { 3741 {
3257 Atom prop = XInternAtom (display->display, str + 1, True); 3742 Atom prop = display->atom (str + 1);
3258 Atom actual_type; 3743 Atom actual_type;
3259 int actual_format; 3744 int actual_format;
3260 unsigned long nitems; 3745 unsigned long nitems;
3261 unsigned long bytes_after; 3746 unsigned long bytes_after;
3262 unsigned char *value = 0; 3747 unsigned char *value = 0;
3263 const char *str = ""; 3748 const char *str = "";
3264 3749
3265 if (prop 3750 if (prop
3266 && XGetWindowProperty (display->display, TermWin.parent[0], 3751 && XGetWindowProperty (xdisp, parent[0],
3267 prop, 0, 1<<16, 0, AnyPropertyType, 3752 prop, 0, 1<<16, 0, AnyPropertyType,
3268 &actual_type, &actual_format, 3753 &actual_type, &actual_format,
3269 &nitems, &bytes_after, &value) == Success 3754 &nitems, &bytes_after, &value) == Success
3270 && actual_type != None 3755 && actual_type != None
3271 && actual_format == 8) 3756 && actual_format == 8)
3272 str = (const char *)(value); 3757 str = (const char *)(value);
3273 3758
3274 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3759 tt_printf ("\033]%d;%s%c", op, str, resp);
3275 3760
3276 XFree (value); 3761 XFree (value);
3277 } 3762 }
3278 else 3763 else
3279 { 3764 {
3280 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3765 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3281 3766
3282 if (eq) 3767 if (eq)
3283 { 3768 {
3284 *eq = 0; 3769 *eq = 0;
3285 XChangeProperty (display->display, TermWin.parent[0], 3770 set_utf8_property (display->atom (str), eq + 1);
3286 display->atom (str), XA_STRING, 8,
3287 PropModeReplace, (unsigned char *)eq + 1,
3288 strlen (eq + 1));
3289 } 3771 }
3290 else 3772 else
3291 XDeleteProperty (display->display, TermWin.parent[0], 3773 XDeleteProperty (xdisp, parent[0],
3292 display->atom (str)); 3774 display->atom (str));
3293 } 3775 }
3294 break; 3776 break;
3295 3777
3296 case XTerm_Color: 3778 case XTerm_Color:
3297 for (buf = (char *)str; buf && *buf;) 3779 for (buf = (char *)str; buf && *buf;)
3298 { 3780 {
3299 if ((name = STRCHR (buf, ';')) == NULL) 3781 if ((name = strchr (buf, ';')) == NULL)
3300 break; 3782 break;
3301 3783
3302 *name++ = '\0'; 3784 *name++ = '\0';
3303 color = atoi (buf); 3785 color = atoi (buf) + minCOLOR;
3304 3786
3305 if (color < 0 || color >= TOTAL_COLORS) 3787 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3306 break; 3788 break;
3307 3789
3308 if ((buf = STRCHR (name, ';')) != NULL) 3790 if ((buf = strchr (name, ';')) != NULL)
3309 *buf++ = '\0'; 3791 *buf++ = '\0';
3310 3792
3311 if (name[0] == '?' && !name[1]) 3793 process_color_seq (op, color, name, resp);
3312 {
3313 if (Options & Opt_insecure)
3314 {
3315 unsigned short r, g, b;
3316 PixColors[color + minCOLOR].get (display, r, g, b);
3317 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3318 }
3319 }
3320 else
3321 set_window_color (color + minCOLOR, name);
3322 } 3794 }
3323 break; 3795 break;
3324 case XTerm_Color00: 3796 case XTerm_Color00:
3325 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3797 process_color_seq (op, Color_fg, str, resp);
3326 break; 3798 break;
3327 case XTerm_Color01: 3799 case XTerm_Color01:
3328 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3800 process_color_seq (op, Color_bg, str, resp);
3329 break; 3801 break;
3330#ifndef NO_CURSORCOLOR 3802#ifndef NO_CURSORCOLOR
3331 case XTerm_Color_cursor: 3803 case XTerm_Color_cursor:
3332 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3804 process_color_seq (op, Color_cursor, str, resp);
3333 break; 3805 break;
3334#endif 3806#endif
3335 case XTerm_Color_pointer_fg: 3807 case XTerm_Color_pointer_fg:
3336 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3808 process_color_seq (op, Color_pointer_fg, str, resp);
3337 break; 3809 break;
3338 case XTerm_Color_pointer_bg: 3810 case XTerm_Color_pointer_bg:
3339 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3811 process_color_seq (op, Color_pointer_bg, str, resp);
3340 break; 3812 break;
3341#ifndef NO_BOLD_UNDERLINE_REVERSE 3813#ifndef NO_BOLD_UNDERLINE_REVERSE
3342 case XTerm_Color_BD:
3343 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3344 break;
3345 case XTerm_Color_UL:
3346 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3347 break;
3348 case XTerm_Color_RV: 3814 case XTerm_Color_RV:
3349 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3815 process_color_seq (op, Color_RV, str, resp);
3350 break; 3816 break;
3817 case Rxvt_Color_BD:
3818 case URxvt_Color_BD:
3819 process_color_seq (op, Color_BD, str, resp);
3820 break;
3821 case Rxvt_Color_UL:
3822 case URxvt_Color_UL:
3823 process_color_seq (op, Color_UL, str, resp);
3824 break;
3825 case URxvt_Color_IT:
3826 process_color_seq (op, Color_IT, str, resp);
3827 break;
3351#endif 3828#endif
3829#if TRANSPARENT && TINTING
3830 case URxvt_Color_tint:
3831 process_color_seq (op, Color_tint, str, resp);
3352 3832
3833 check_our_parents ();
3834
3835 if (am_transparent)
3836 want_full_refresh = want_refresh = 1;
3837
3838 break;
3839#endif
3840
3353 case XTerm_Pixmap: 3841 case Rxvt_Pixmap:
3842 {
3354 if (*str != ';') 3843 if (*str != ';')
3355 { 3844 {
3356#if XPM_BACKGROUND 3845#if XPM_BACKGROUND
3357 scale_pixmap (""); /* reset to default scaling */ 3846 scale_pixmap (""); /* reset to default scaling */
3358 set_bgPixmap (str); /* change pixmap */ 3847 set_bgPixmap (str); /* change pixmap */
3359#endif
3360 scr_touch (true); 3848 scr_touch (true);
3849#endif
3361 } 3850 }
3851
3852 int changed = 0;
3853
3362 while ((str = STRCHR (str, ';')) != NULL) 3854 while ((str = strchr (str, ';')) != NULL)
3363 { 3855 {
3364 str++; 3856 str++;
3365#if XPM_BACKGROUND 3857#if XPM_BACKGROUND
3366 changed += scale_pixmap (str); 3858 changed += scale_pixmap (str);
3367#endif 3859#endif
3368
3369 } 3860 }
3861
3370 if (changed) 3862 if (changed)
3371 { 3863 {
3372#ifdef XPM_BACKGROUND 3864#ifdef XPM_BACKGROUND
3373 resize_pixmap (); 3865 resize_pixmap ();
3374#endif
3375 scr_touch (true); 3866 scr_touch (true);
3867#endif
3376 } 3868 }
3869 }
3377 break; 3870 break;
3378 3871
3379 case XTerm_restoreFG: 3872 case Rxvt_restoreFG:
3380 set_window_color (Color_fg, str); 3873 set_window_color (Color_fg, str);
3381 break; 3874 break;
3382 case XTerm_restoreBG: 3875 case Rxvt_restoreBG:
3383 set_window_color (Color_bg, str); 3876 set_window_color (Color_bg, str);
3384 break; 3877 break;
3385 3878
3386 case XTerm_logfile: 3879 case XTerm_logfile:
3387 // TODO, when secure mode? 3880 // TODO, when secure mode?
3388 break; 3881 break;
3389 3882
3390 case XTerm_font:
3391 if (query)
3392 {
3393 if (Options & Opt_insecure)
3394 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3395 TermWin.fontset->fontdesc
3396 ? TermWin.fontset->fontdesc
3397 : "",
3398 resp);
3399 }
3400 else
3401 change_font (str);
3402 break;
3403
3404#ifndef NO_FRILLS
3405 case XTerm_locale:
3406 if (query)
3407 {
3408 if (Options & Opt_insecure)
3409 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3410 }
3411 else
3412 {
3413 set_locale (str);
3414# ifdef USE_XIM
3415 im_cb ();
3416# endif
3417 }
3418 break;
3419
3420 case XTerm_findfont:
3421 if (Options & Opt_insecure)
3422 {
3423 int fid = TermWin.fontset->find_font (atoi (str));
3424 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3425 fid, (*TermWin.fontset)[fid]->name, resp);
3426 }
3427 break;
3428#endif
3429
3430#ifdef MENUBAR
3431 case XTerm_Menu:
3432 if (Options & Opt_insecure)
3433 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3434 break;
3435#endif
3436#if 0 3883#if 0
3437 case XTerm_dumpscreen: /* no error notices */ 3884 case Rxvt_dumpscreen: /* no error notices */
3438 { 3885 {
3439 int fd; 3886 int fd;
3440 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3887 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3441 { 3888 {
3442 scr_dump (fd); 3889 scr_dump (fd);
3443 close (fd); 3890 close (fd);
3444 } 3891 }
3445 } 3892 }
3893 break;
3894#endif
3895 case XTerm_font:
3896 op = URxvt_font;
3897 case URxvt_font:
3898#if ENABLE_STYLES
3899 case URxvt_boldFont:
3900 case URxvt_italicFont:
3901 case URxvt_boldItalicFont:
3902#endif
3903 if (query)
3904 tt_printf ("\33]%d;%-.250s%c", saveop,
3905 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3906 ? fontset[op - URxvt_font]->fontdesc : "",
3907 resp);
3908 else
3909 {
3910 const char *&res = rs[Rs_font + (op - URxvt_font)];
3911
3912 res = strdup (str);
3913 allocated.push_back ((void *)res);
3914 set_fonts ();
3915 }
3916 break;
3917
3918 case URxvt_version:
3919 if (query)
3920 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3921 op,
3922 rs[Rs_name], VERSION[0], VERSION[2],
3923 resp);
3924 break;
3925
3926#if !ENABLE_MINIMAL
3927 case URxvt_locale:
3928 if (query)
3929 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3930 else
3931 {
3932 set_locale (str);
3933 pty->set_utf8_mode (enc_utf8);
3934 init_xlocale ();
3935 }
3936 break;
3937
3938 case URxvt_view_up:
3939 case URxvt_view_down:
3940 {
3941 int lines = atoi (str);
3942
3943 if (lines)
3944 scr_page (op == URxvt_view_up ? UP : DN, lines);
3945 else
3946 scr_erase_savelines ();
3947 }
3948
3949 break;
3950#endif
3951
3952#if ENABLE_PERL
3953 case URxvt_perl:
3954 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3955 ; // no responses yet
3446 break; 3956 break;
3447#endif 3957#endif
3448 } 3958 }
3449} 3959}
3450/*----------------------------------------------------------------------*/ 3960/*----------------------------------------------------------------------*/
… …
3464{ 3974{
3465 int state; 3975 int state;
3466 3976
3467 if (mode == 's') 3977 if (mode == 's')
3468 { 3978 {
3469 SavedModes |= (PrivateModes & bit); 3979 SavedModes |= (priv_modes & bit);
3470 return -1; 3980 return -1;
3471 } 3981 }
3472 else 3982 else
3473 { 3983 {
3474 if (mode == 'r') 3984 if (mode == 'r')
3475 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3985 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3476 else 3986 else
3477 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3987 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3478 PrivMode (state, bit); 3988 PrivMode (state, bit);
3479 } 3989 }
3480 3990
3481 return state; 3991 return state;
3482} 3992}
3483 3993
3484/* we're not using priv _yet_ */ 3994/* we're not using priv _yet_ */
3485void 3995void
3486rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3996rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3487{ 3997{
3488 unsigned int i, j; 3998 unsigned int i, j;
3489 int state; 3999 int state;
3490 4000
3491 static const struct 4001 static const struct
… …
3500 { 3, PrivMode_132 }, 4010 { 3, PrivMode_132 },
3501 { 4, PrivMode_smoothScroll }, 4011 { 4, PrivMode_smoothScroll },
3502 { 5, PrivMode_rVideo }, 4012 { 5, PrivMode_rVideo },
3503 { 6, PrivMode_relOrigin }, 4013 { 6, PrivMode_relOrigin },
3504 { 7, PrivMode_Autowrap }, 4014 { 7, PrivMode_Autowrap },
4015 // 8, bi-directional support mode
3505 { 9, PrivMode_MouseX10 }, 4016 { 9, PrivMode_MouseX10 },
3506#ifdef menuBar_esc 4017 // 18, 19 printing-related
3507 { menuBar_esc, PrivMode_menuBar }, 4018 { 25, PrivMode_VisibleCursor },
3508#endif
3509#ifdef scrollBar_esc 4019#ifdef scrollBar_esc
3510 { scrollBar_esc, PrivMode_scrollBar }, 4020 { scrollBar_esc, PrivMode_scrollBar },
3511#endif 4021#endif
3512 // 18, 19 printing-related
3513 { 25, PrivMode_VisibleCursor },
3514 // 30 show scrollbar rxvt. extension
3515 { 35, PrivMode_ShiftKeys }, // rxvt extension 4022 { 35, PrivMode_ShiftKeys }, // rxvt extension
3516 { 40, PrivMode_132OK }, 4023 { 40, PrivMode_132OK },
3517 // 41 xterm more fixes NYI 4024 // 41 xterm more fixes NYI
3518 // 45 margin bell NYI 4025 // 45 margin bell NYI
3519 // 46 start logging 4026 // 46 start logging
… …
3559 } 4066 }
3560 4067
3561 /* extra handling for values with state unkept */ 4068 /* extra handling for values with state unkept */
3562 switch (arg[i]) 4069 switch (arg[i])
3563 { 4070 {
4071#if ENABLE_STYLES
4072 case 1021:
4073 set_option (Opt_intensityStyles, mode);
4074
4075 scr_touch (true);
4076 break;
4077#endif
3564 case 1048: /* alternative cursor save */ 4078 case 1048: /* alternative cursor save */
4079 case 1049:
3565 if (Options & Opt_secondaryScreen) 4080 if (OPTION (Opt_secondaryScreen))
3566 if (mode == 0) 4081 if (mode == 0)
3567 scr_cursor (RESTORE); 4082 scr_cursor (RESTORE);
3568 else if (mode == 1) 4083 else if (mode == 1)
3569 scr_cursor (SAVE); 4084 scr_cursor (SAVE);
3570 break; 4085 break;
… …
3581 * within VT52 mode 4096 * within VT52 mode
3582 */ 4097 */
3583 PrivMode (1, PrivMode_vt52); 4098 PrivMode (1, PrivMode_vt52);
3584 break; 4099 break;
3585 case 3: /* 80/132 */ 4100 case 3: /* 80/132 */
3586 if (PrivateModes & PrivMode_132OK) 4101 if (priv_modes & PrivMode_132OK)
3587 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4102 set_widthheight (((state ? 132 : 80) * fwidth), height);
3588 break; 4103 break;
3589 case 4: /* smooth scrolling */ 4104 case 4: /* smooth scrolling */
3590 if (state) 4105 set_option (Opt_jumpScroll, !state);
3591 Options &= ~Opt_jumpScroll;
3592 else
3593 Options |= Opt_jumpScroll;
3594 break; 4106 break;
3595 case 5: /* reverse video */ 4107 case 5: /* reverse video */
3596 scr_rvideo_mode (state); 4108 scr_rvideo_mode (state);
3597 break; 4109 break;
3598 case 6: /* relative/absolute origins */ 4110 case 6: /* relative/absolute origins */
… …
3602 scr_autowrap (state); 4114 scr_autowrap (state);
3603 break; 4115 break;
3604 /* case 8: - auto repeat, can't do on a per window basis */ 4116 /* case 8: - auto repeat, can't do on a per window basis */
3605 case 9: /* X10 mouse reporting */ 4117 case 9: /* X10 mouse reporting */
3606 if (state) /* orthogonal */ 4118 if (state) /* orthogonal */
3607 PrivateModes &= ~PrivMode_MouseX11; 4119 priv_modes &= ~PrivMode_MouseX11;
3608 break; 4120 break;
3609#ifdef menuBar_esc
3610 case menuBar_esc:
3611#ifdef MENUBAR
3612 map_menuBar (state);
3613#endif
3614 break;
3615#endif
3616#ifdef scrollBar_esc 4121#ifdef scrollBar_esc
3617 case scrollBar_esc: 4122 case scrollBar_esc:
3618 if (scrollbar_mapping (state)) 4123 if (scrollbar_mapping (state))
3619 { 4124 {
3620 resize_all_windows (0, 0, 0); 4125 resize_all_windows (0, 0, 0);
… …
3632 break; 4137 break;
3633 /* case 66: - application key pad */ 4138 /* case 66: - application key pad */
3634 /* case 67: - backspace key */ 4139 /* case 67: - backspace key */
3635 case 1000: /* X11 mouse reporting */ 4140 case 1000: /* X11 mouse reporting */
3636 if (state) /* orthogonal */ 4141 if (state) /* orthogonal */
3637 PrivateModes &= ~PrivMode_MouseX10; 4142 priv_modes &= ~PrivMode_MouseX10;
3638 break; 4143 break;
3639#if 0 4144#if 0
3640 case 1001: 4145 case 1001:
3641 break; /* X11 mouse highlighting */ 4146 break; /* X11 mouse highlighting */
3642#endif 4147#endif
3643 case 1010: /* scroll to bottom on TTY output inhibit */ 4148 case 1010: /* scroll to bottom on TTY output inhibit */
3644 if (state)
3645 Options &= ~Opt_scrollTtyOutput;
3646 else
3647 Options |= Opt_scrollTtyOutput; 4149 set_option (Opt_scrollTtyOutput, !state);
3648 break; 4150 break;
3649 case 1011: /* scroll to bottom on key press */ 4151 case 1011: /* scroll to bottom on key press */
3650 if (state)
3651 Options |= Opt_scrollTtyKeypress; 4152 set_option (Opt_scrollTtyKeypress, state);
3652 else
3653 Options &= ~Opt_scrollTtyKeypress;
3654 break; 4153 break;
3655 case 1047: /* secondary screen w/ clearing last */ 4154 case 1047: /* secondary screen w/ clearing last */
3656 if (Options & Opt_secondaryScreen) 4155 if (OPTION (Opt_secondaryScreen))
3657 if (current_screen != PRIMARY) 4156 if (current_screen != PRIMARY)
3658 scr_erase_screen (2); 4157 scr_erase_screen (2);
3659 scr_change_screen (state); 4158 scr_change_screen (state);
3660 break; 4159 break;
3661 case 1049: /* secondary screen w/ clearing first */ 4160 case 1049: /* secondary screen w/ clearing first */
3662 scr_change_screen (state); 4161 scr_change_screen (state);
3663 if (Options & Opt_secondaryScreen) 4162 if (OPTION (Opt_secondaryScreen))
3664 if (current_screen != PRIMARY) 4163 if (current_screen != PRIMARY)
3665 scr_erase_screen (2); 4164 scr_erase_screen (2);
3666 break; 4165 break;
3667 default: 4166 default:
3668 break; 4167 break;
… …
3694 rendset = 0, rendstyle = ~RS_None; 4193 rendset = 0, rendstyle = ~RS_None;
3695 break; 4194 break;
3696 case 1: 4195 case 1:
3697 rendset = 1, rendstyle = RS_Bold; 4196 rendset = 1, rendstyle = RS_Bold;
3698 break; 4197 break;
4198 //case 2: // low intensity
4199 case 3:
4200 rendset = 1, rendstyle = RS_Italic;
4201 break;
3699 case 4: 4202 case 4:
3700 rendset = 1, rendstyle = RS_Uline; 4203 rendset = 1, rendstyle = RS_Uline;
3701 break; 4204 break;
3702 case 5: 4205 case 5: // slowly blinking
4206 case 6: // rapidly blinking
3703 rendset = 1, rendstyle = RS_Blink; 4207 rendset = 1, rendstyle = RS_Blink;
3704 break; 4208 break;
4209 //case 6: // scoansi light background
3705 case 7: 4210 case 7:
3706 rendset = 1, rendstyle = RS_RVid; 4211 rendset = 1, rendstyle = RS_RVid;
3707 break; 4212 break;
3708 case 8: 4213 case 8:
3709 // invisible. NYI 4214 // invisible. NYI
3710 break; 4215 break;
3711 case 22: 4216 //case 9: // crossed out
4217 //case 10: // scoansi acs off, primary font
4218 //case 11: // scoansi acs on, first alt font
4219 //case 12: // scoansi acs on, |0x80, second alt font
4220 //...
4221 //case 19: // ninth alt font
4222 //case 20: // gothic
4223 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3712 rendset = 0, rendstyle = RS_Bold; 4224 rendset = 0, rendstyle = RS_Bold;
4225 break;
4226 case 22: // normal intensity
4227 rendset = 0, rendstyle = RS_Bold;
4228 break;
4229 case 23: // disable italic
4230 rendset = 0, rendstyle = RS_Italic;
3713 break; 4231 break;
3714 case 24: 4232 case 24:
3715 rendset = 0, rendstyle = RS_Uline; 4233 rendset = 0, rendstyle = RS_Uline;
3716 break; 4234 break;
3717 case 25: 4235 case 25:
3718 rendset = 0, rendstyle = RS_Blink; 4236 rendset = 0, rendstyle = RS_Blink;
3719 break; 4237 break;
4238 case 26: // variable spacing (iso 8613)
4239 rendset = 0, rendstyle = RS_Blink;
4240 break;
3720 case 27: 4241 case 27:
3721 rendset = 0, rendstyle = RS_RVid; 4242 rendset = 0, rendstyle = RS_RVid;
3722 break; 4243 break;
3723 case 28:
3724 // visible. NYI 4244 //case 28: // visible. NYI
3725 break; 4245 //case 29: // not crossed-out
3726 } 4246 }
3727 4247
3728 if (rendset != -1) 4248 if (rendset != -1)
3729 { 4249 {
3730 scr_rendition (rendset, rendstyle); 4250 scr_rendition (rendset, rendstyle);
… …
3741 case 35: 4261 case 35:
3742 case 36: 4262 case 36:
3743 case 37: 4263 case 37:
3744 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4264 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3745 break; 4265 break;
3746#ifdef TTY_256COLOR 4266 case 38: // set fg color, ISO 8613-6
3747 case 38:
3748 if (nargs > i + 2 && arg[i + 1] == 5) 4267 if (nargs > i + 2 && arg[i + 1] == 5)
3749 { 4268 {
3750 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4269 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3751 i += 2; 4270 i += 2;
3752 } 4271 }
3753 break; 4272 break;
3754#endif
3755 case 39: /* default fg */ 4273 case 39: /* default fg */
3756 scr_color (Color_fg, Color_fg); 4274 scr_color (Color_fg, Color_fg);
3757 break; 4275 break;
3758 4276
3759 case 40: 4277 case 40:
… …
3764 case 45: 4282 case 45:
3765 case 46: 4283 case 46:
3766 case 47: 4284 case 47:
3767 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4285 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3768 break; 4286 break;
3769#ifdef TTY_256COLOR 4287 case 48: // set bg color, ISO 8613-6
3770 case 48:
3771 if (nargs > i + 2 && arg[i + 1] == 5) 4288 if (nargs > i + 2 && arg[i + 1] == 5)
3772 { 4289 {
3773 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4290 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3774 i += 2; 4291 i += 2;
3775 } 4292 }
3776 break; 4293 break;
3777#endif
3778 case 49: /* default bg */ 4294 case 49: /* default bg */
3779 scr_color (Color_bg, Color_bg); 4295 scr_color (Color_bg, Color_bg);
3780 break; 4296 break;
3781 4297
3782#ifndef NO_BRIGHTCOLOR 4298 //case 50: // not variable spacing
4299
4300#if !ENABLE_MINIMAL
3783 case 90: 4301 case 90:
3784 case 91: /* set bright fg color */ 4302 case 91: /* set bright fg color */
3785 case 92: 4303 case 92:
3786 case 93: 4304 case 93:
3787 case 94: 4305 case 94:
3788 case 95: 4306 case 95:
3789 case 96: 4307 case 96:
3790 case 97: 4308 case 97:
3791 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4309 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3792 Color_fg);
3793 break; 4310 break;
3794 case 100: 4311 case 100:
3795 case 101: /* set bright bg color */ 4312 case 101: /* set bright bg color */
3796 case 102: 4313 case 102:
3797 case 103: 4314 case 103:
3798 case 104: 4315 case 104:
3799 case 105: 4316 case 105:
3800 case 106: 4317 case 106:
3801 case 107: 4318 case 107:
3802 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4319 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3803 Color_bg);
3804 break; 4320 break;
3805#endif 4321#endif
3806
3807 } 4322 }
3808 } 4323 }
3809} 4324}
3810/*}}} */ 4325/*}}} */
3811 4326
3812/*{{{ process Rob Nation's own graphics mode sequences */ 4327/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3813void 4328void
3814rxvt_term::process_graphics () 4329rxvt_term::process_graphics ()
3815{ 4330{
3816 unicode_t ch, cmd = cmd_getc (); 4331 unicode_t ch, cmd = cmd_getc ();
3817 4332
3818 if (cmd == 'Q') 4333 if (cmd == 'Q')
3819 { /* query graphics */ 4334 { /* query graphics */
3820 tt_printf ("\033G0\n"); /* no graphics */ 4335 tt_printf ("\033G0\012"); /* no graphics */
3821 return; 4336 return;
3822 } 4337 }
3823 /* swallow other graphics sequences until terminating ':' */ 4338 /* swallow other graphics sequences until terminating ':' */
3824 do 4339 do
3825 ch = cmd_getc (); 4340 ch = cmd_getc ();
… …
3835 */ 4350 */
3836void 4351void
3837rxvt_term::tt_printf (const char *fmt,...) 4352rxvt_term::tt_printf (const char *fmt,...)
3838{ 4353{
3839 va_list arg_ptr; 4354 va_list arg_ptr;
3840 unsigned char buf[256]; 4355 char buf[256];
3841 4356
3842 va_start (arg_ptr, fmt); 4357 va_start (arg_ptr, fmt);
3843 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4358 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3844 va_end (arg_ptr); 4359 va_end (arg_ptr);
3845 tt_write (buf, STRLEN (buf)); 4360 tt_write (buf, strlen (buf));
3846} 4361}
3847 4362
3848/* ---------------------------------------------------------------------- */ 4363/* ---------------------------------------------------------------------- */
3849/* Write data to the pty as typed by the user, pasted with the mouse, 4364/* Write data to the pty as typed by the user, pasted with the mouse,
3850 * or generated by us in response to a query ESC sequence. 4365 * or generated by us in response to a query ESC sequence.
3851 */ 4366 */
4367const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4368
3852void 4369void
3853rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4370rxvt_term::tt_write (const char *data, unsigned int len)
3854{ 4371{
3855 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4372 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4373 return;
3856 4374
3857 if (len) 4375 if (pty->pty < 0)
4376 return;
4377
4378 if (v_buflen == 0)
4379 {
4380 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4381
4382 if ((unsigned int)written == len)
4383 return;
4384
4385 data += written;
4386 len -= written;
3858 { 4387 }
4388
4389 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4390
4391 memcpy (v_buffer + v_buflen, data, len);
4392 v_buflen += len;
4393
4394 pty_ev.set (EVENT_READ | EVENT_WRITE);
4395}
4396
4397void rxvt_term::pty_write ()
4398{
4399 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4400
4401 if (written > 0)
4402 {
4403 v_buflen -= written;
4404
3859 if (v_buflen == 0) 4405 if (v_buflen == 0)
3860 { 4406 {
3861 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3862
3863 if ((unsigned int)written == len)
3864 return;
3865
3866 data += written;
3867 len -= written;
3868 }
3869
3870
3871 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3872
3873 memcpy (v_buffer + v_buflen, data, len);
3874 v_buflen += len;
3875 }
3876
3877 for (;;)
3878 {
3879 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3880
3881 if (written > 0)
3882 {
3883 v_buflen -= written;
3884
3885 if (v_buflen == 0)
3886 {
3887 free (v_buffer); 4407 free (v_buffer);
3888 v_buffer = 0; 4408 v_buffer = 0;
3889 v_buflen = 0; 4409 v_buflen = 0;
3890 4410
3891 pty_ev.set (EVENT_READ); 4411 pty_ev.set (EVENT_READ);
3892 return;
3893 }
3894
3895 memmove (v_buffer, v_buffer + written, v_buflen);
3896 }
3897 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3898 // original code just ignores this...
3899 destroy ();
3900 else
3901 {
3902 pty_ev.set (EVENT_READ | EVENT_WRITE);
3903 return; 4412 return;
3904 } 4413 }
4414
4415 memmove (v_buffer, v_buffer + written, v_buflen);
3905 } 4416 }
4417 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4418 pty_ev.set (EVENT_READ);
3906} 4419}
3907 4420
3908/*----------------------- end-of-file (C source) -----------------------*/ 4421/*----------------------- end-of-file (C source) -----------------------*/
3909 4422

Diff Legend

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