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.97 by root, Mon Jul 26 18:01:19 2004 UTC vs.
Revision 1.301 by root, Tue Jan 31 21:23:13 2006 UTC

… …
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 } 1002 }
… …
680} 1005}
681 1006
682void 1007void
683rxvt_term::check_cb (check_watcher &w) 1008rxvt_term::check_cb (check_watcher &w)
684{ 1009{
685 SET_R (this); 1010 make_current ();
686 SET_LOCALE (locale);
687 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;
688 flush (); 1025 flush ();
689} 1026}
690 1027
691#ifdef CURSOR_BLINK 1028#ifdef CURSOR_BLINK
692void 1029void
693rxvt_term::cursor_blink_cb (time_watcher &w) 1030rxvt_term::cursor_blink_cb (time_watcher &w)
694{ 1031{
695 hidden_cursor = !hidden_cursor; 1032 hidden_cursor = !hidden_cursor;
696 want_refresh = 1; 1033 want_refresh = 1;
697 1034
698 w.start (w.at + BLINK_INTERVAL); 1035 w.start (w.at + CURSOR_BLINK_INTERVAL);
699} 1036}
700#endif 1037#endif
701 1038
702#ifdef TEXT_BLINK 1039#ifdef TEXT_BLINK
703void 1040void
… …
717rxvt_term::cont_scroll_cb (time_watcher &w) 1054rxvt_term::cont_scroll_cb (time_watcher &w)
718{ 1055{
719 if ((scrollbar_isUp() || scrollbar_isDn()) && 1056 if ((scrollbar_isUp() || scrollbar_isDn()) &&
720 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1057 scr_page (scrollbar_isUp() ? UP : DN, 1))
721 { 1058 {
722 refresh_type |= SMOOTH_REFRESH;
723 want_refresh = 1; 1059 want_refresh = 1;
724 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1060 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
725 } 1061 }
726} 1062}
727#endif 1063#endif
… …
731rxvt_term::sel_scroll_cb (time_watcher &w) 1067rxvt_term::sel_scroll_cb (time_watcher &w)
732{ 1068{
733 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1069 if (scr_page (scroll_selection_dir, scroll_selection_lines))
734 { 1070 {
735 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1071 selection_extend (selection_save_x, selection_save_y, selection_save_state);
736 refresh_type |= SMOOTH_REFRESH;
737 want_refresh = 1; 1072 want_refresh = 1;
738 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1073 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
739 } 1074 }
740} 1075}
741#endif 1076#endif
… …
746{ 1081{
747 if (mouse_slip_wheel_speed == 0 1082 if (mouse_slip_wheel_speed == 0
748 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1083 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
749 : scr_page (UP, mouse_slip_wheel_speed)) 1084 : scr_page (UP, mouse_slip_wheel_speed))
750 { 1085 {
751 refresh_type |= SMOOTH_REFRESH; 1086 if (view_start == top_row || view_start == 0)
1087 mouse_slip_wheel_speed = 0;
1088
752 want_refresh = 1; 1089 want_refresh = 1;
753 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1090 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
754 } 1091 }
755} 1092}
756#endif 1093#endif
… …
760{ 1097{
761 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1098 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
762 1099
763 if (CBUFSIZ == n) 1100 if (CBUFSIZ == n)
764 { 1101 {
765 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1102 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
766 n = 0; 1103 n = 0;
767 } 1104 }
768 1105
769 memmove (cmdbuf_base, cmdbuf_ptr, n); 1106 memmove (cmdbuf_base, cmdbuf_ptr, n);
770 cmdbuf_ptr = cmdbuf_base; 1107 cmdbuf_ptr = cmdbuf_base;
771 cmdbuf_endp = cmdbuf_ptr + n; 1108 cmdbuf_endp = cmdbuf_ptr + n;
772 1109
773 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1110 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
774 1111
775 if (n > 0) 1112 if (r > 0)
776 { 1113 {
777 cmdbuf_endp += n; 1114 cmdbuf_endp += r;
778 return true; 1115 return true;
779 } 1116 }
780 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))
781 destroy (); 1129 destroy ();
1130 }
782 1131
783 return false; 1132 return false;
784} 1133}
785 1134
786void 1135void
787rxvt_term::pty_cb (io_watcher &w, short revents) 1136rxvt_term::pty_cb (io_watcher &w, short revents)
788{ 1137{
789 SET_R (this); 1138 make_current ();
790 SET_LOCALE (locale);
791 1139
792 if (revents & EVENT_WRITE)
793 tt_write (0, 0);
794 else if (revents & EVENT_READ) 1140 if (revents & EVENT_READ)
795 // loop, but don't allow a single term to monopolize us 1141 // loop, but don't allow a single term to monopolize us
796 while (pty_fill ()) 1142 while (pty_fill ())
797 if (cmd_parse ()) 1143 if (cmd_parse ())
798 break; 1144 break;
1145
1146 if (revents & EVENT_WRITE)
1147 pty_write ();
1148}
1149
1150void
1151rxvt_term::pointer_unblank ()
1152{
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
799} 1162}
800 1163
801#ifdef POINTER_BLANK 1164#ifdef POINTER_BLANK
802void 1165void
803rxvt_term::pointer_unblank ()
804{
805 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
806 recolour_cursor ();
807
808 hidden_pointer = 0;
809
810 if (Options & Opt_pointerBlank)
811 pointer_ev.start (NOW + pointerBlankDelay);
812}
813
814void
815rxvt_term::pointer_blank () 1166rxvt_term::pointer_blank ()
816{ 1167{
817 if (! (Options & Opt_pointerBlank)) 1168 if (!OPTION (Opt_pointerBlank))
818 return; 1169 return;
819 1170
820 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1171 XDefineCursor (xdisp, vt, display->blank_cursor);
821 XFlush (display->display); 1172 XFlush (xdisp);
822 1173
823 hidden_pointer = 1; 1174 hidden_pointer = 1;
824} 1175}
825 1176
826void 1177void
827rxvt_term::pointer_cb (time_watcher &w) 1178rxvt_term::pointer_cb (time_watcher &w)
828{ 1179{
829 SET_R (this); 1180 make_current ();
830 SET_LOCALE (locale);
831 1181
832 pointer_blank (); 1182 pointer_blank ();
833} 1183}
834#endif 1184#endif
835 1185
… …
842 x = ev.x; 1192 x = ev.x;
843 y = ev.y; 1193 y = ev.y;
844 pixel_position (&x, &y); 1194 pixel_position (&x, &y);
845 1195
846 if (MEvent.button == AnyButton) 1196 if (MEvent.button == AnyButton)
847 {
848 button_number = 3; 1197 button_number = 3;
849 }
850 else 1198 else
851 { 1199 {
852 button_number = MEvent.button - Button1; 1200 button_number = MEvent.button - Button1;
853 /* add 0x3D for wheel events, like xterm does */ 1201 /* add 0x3D for wheel events, like xterm does */
854 if (button_number >= 3) 1202 if (button_number >= 3)
855 button_number += (64 - 3); 1203 button_number += (64 - 3);
856 } 1204 }
857 1205
858 if (PrivateModes & PrivMode_MouseX10) 1206 if (priv_modes & PrivMode_MouseX10)
859 { 1207 {
860 /* 1208 /*
861 * do not report ButtonRelease 1209 * do not report ButtonRelease
862 * no state info allowed 1210 * no state info allowed
863 */ 1211 */
… …
878 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1226 + ((MEvent.state & ModMetaMask) ? 8 : 0)
879 + ((MEvent.state & ControlMask) ? 16 : 0); 1227 + ((MEvent.state & ControlMask) ? 16 : 0);
880#ifdef MOUSE_REPORT_DOUBLECLICK 1228#ifdef MOUSE_REPORT_DOUBLECLICK
881 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1229 key_state += ((MEvent.clicks > 1) ? 32 : 0);
882#endif 1230#endif
883
884 } 1231 }
885 1232
886#ifdef DEBUG_MOUSEREPORT 1233#if DEBUG_MOUSEREPORT
887 fprintf (stderr, "Mouse ["); 1234 fprintf (stderr, "Mouse [");
888 if (key_state & 16) 1235 if (key_state & 16)
889 fputc ('C', stderr); 1236 fputc ('C', stderr);
890 if (key_state & 4) 1237 if (key_state & 4)
891 fputc ('S', stderr); 1238 fputc ('S', stderr);
… …
895 fputc ('2', stderr); 1242 fputc ('2', stderr);
896 fprintf (stderr, "]: <%d>, %d/%d\n", 1243 fprintf (stderr, "]: <%d>, %d/%d\n",
897 button_number, 1244 button_number,
898 x + 1, 1245 x + 1,
899 y + 1); 1246 y + 1);
900#else 1247#endif
1248
901 tt_printf ("\033[M%c%c%c", 1249 tt_printf ("\033[M%c%c%c",
902 (32 + button_number + key_state), 1250 (32 + button_number + key_state),
903 (32 + x + 1), 1251 (32 + x + 1),
904 (32 + y + 1)); 1252 (32 + y + 1));
905#endif
906} 1253}
907
908#ifdef USING_W11LIB
909void
910rxvt_W11_process_x_event (XEvent *ev)
911{
912 rxvt_t *r = rxvt_get_r ();
913
914 x_cb (*ev);
915}
916#endif
917 1254
918/*{{{ process an X event */ 1255/*{{{ process an X event */
919void 1256void
920rxvt_term::x_cb (XEvent &ev) 1257rxvt_term::x_cb (XEvent &ev)
921{ 1258{
922 SET_R (this); 1259 make_current ();
923 SET_LOCALE (locale);
924 1260
925#if defined(CURSOR_BLINK) 1261 dLocal (Display *, xdisp);
926 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
927 {
928 if (hidden_cursor)
929 {
930 hidden_cursor = 0;
931 want_refresh = 1;
932 }
933 1262
934 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1263 if (ev.xany.window == vt
935 } 1264 && SHOULD_INVOKE (HOOK_X_EVENT)
936#endif 1265 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
937
938#if defined(POINTER_BLANK)
939 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
940 {
941 if (ev.type == MotionNotify
942 || ev.type == ButtonPress
943 || ev.type == ButtonRelease)
944 if (hidden_pointer)
945 pointer_unblank ();
946
947 if (ev.type == KeyPress && hidden_pointer == 0)
948 pointer_blank ();
949 }
950#endif
951
952#ifdef USE_XIM
953 if (XFilterEvent (&ev, None))
954 return; 1266 return;
955#endif
956 1267
1268 // for XQueryPointer
957 Window unused_root, unused_child; 1269 Window unused_root, unused_child;
958 int unused_root_x, unused_root_y; 1270 int unused_root_x, unused_root_y;
959 unsigned int unused_mask; 1271 unsigned int unused_mask;
960
961#ifdef DEBUG_X
962 const char *const eventnames[] =
963 { /* mason - this matches my system */
964 "",
965 "",
966 "KeyPress",
967 "KeyRelease",
968 "ButtonPress",
969 "ButtonRelease",
970 "MotionNotify",
971 "EnterNotify",
972 "LeaveNotify",
973 "FocusIn",
974 "FocusOut",
975 "KeymapNotify",
976 "Expose",
977 "GraphicsExpose",
978 "NoExpose",
979 "VisibilityNotify",
980 "CreateNotify",
981 "DestroyNotify",
982 "UnmapNotify",
983 "MapNotify",
984 "MapRequest",
985 "ReparentNotify",
986 "ConfigureNotify",
987 "ConfigureRequest",
988 "GravityNotify",
989 "ResizeRequest",
990 "CirculateNotify",
991 "CirculateRequest",
992 "PropertyNotify",
993 "SelectionClear",
994 "SelectionRequest",
995 "SelectionNotify",
996 "ColormapNotify",
997 "ClientMessage",
998 "MappingNotify"
999 };
1000#endif
1001
1002#ifdef DEBUG_X
1003 struct timeval tp;
1004 struct tm *ltt;
1005 (void)gettimeofday (&tp, NULL);
1006 ltt = localtime (& (tp.tv_sec));
1007 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));
1008#endif
1009 1272
1010 switch (ev.type) 1273 switch (ev.type)
1011 { 1274 {
1012 case KeyPress: 1275 case KeyPress:
1276#if ISO_14755
1277 if (!(iso14755buf & ISO_14755_52))
1278#endif
1013 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)))
1014 break; 1347 break;
1015 1348
1016#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1349#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1017 case KeyRelease:
1018 {
1019 if (!(ev.xkey.state & ControlMask)) 1350 if (!(ev.xkey.state & ControlMask))
1020 slip_wheel_ev.stop (); 1351 slip_wheel_ev.stop ();
1021 else
1022 {
1023 KeySym ks;
1024
1025 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1026 if (ks == XK_Control_L || ks == XK_Control_R) 1352 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1027 mouse_slip_wheel_speed = 0; 1353 mouse_slip_wheel_speed = 0;
1028 } 1354#endif
1029 break; 1355 break;
1030 } 1356 }
1031#endif
1032 1357
1033 case ButtonPress: 1358 case ButtonPress:
1034 button_press (ev.xbutton); 1359 button_press (ev.xbutton);
1035 break; 1360 break;
1036 1361
… …
1038 button_release (ev.xbutton); 1363 button_release (ev.xbutton);
1039 break; 1364 break;
1040 1365
1041 case ClientMessage: 1366 case ClientMessage:
1042 if (ev.xclient.format == 32 1367 if (ev.xclient.format == 32
1043 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1368 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1044 destroy ();
1045#ifdef OFFIX_DND
1046 /* OffiX Dnd (drag 'n' drop) protocol */
1047 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1048 && (ev.xclient.data.l[0] == DndFile
1049 || ev.xclient.data.l[0] == DndDir
1050 || ev.xclient.data.l[0] == DndLink))
1051 { 1369 {
1052 /* Get Dnd data */ 1370 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1053 Atom ActualType; 1371 {
1054 int ActualFormat; 1372 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1055 unsigned char *data; 1373 {
1056 unsigned long Size, RemainingBytes; 1374 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1057 1375 {
1058 XGetWindowProperty (display->display, display->root, 1376 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1059 xa[XA_DNDSELECTION], 1377 destroy ();
1060 0L, 1000000L, 1378 }
1061 False, AnyPropertyType, 1379#if ENABLE_EWMH
1062 &ActualType, &ActualFormat, 1380 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1063 &Size, &RemainingBytes, 1381 XSendEvent (xdisp, ev.xclient.window = display->root,
1382 False, SubstructureRedirectMask | SubstructureNotifyMask,
1064 &data); 1383 &ev);
1065 XChangeProperty (display->display, display->root, 1384#endif
1066 XA_CUT_BUFFER0, XA_STRING, 1385 }
1067 8, PropModeReplace, 1386 }
1068 data, STRLEN (data)); 1387#if ENABLE_XEMBED
1069 XFree (data); 1388 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1070 selection_paste (display->root, XA_CUT_BUFFER0, True); 1389 {
1071 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 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
1072 } 1396 }
1073#endif /* OFFIX_DND */
1074 break; 1397 break;
1075 1398
1076 case MappingNotify: 1399 case MappingNotify:
1077 XRefreshKeyboardMapping (& (ev.xmapping)); 1400 XRefreshKeyboardMapping (&ev.xmapping);
1078 break; 1401 break;
1079 1402
1080 /* 1403 /*
1081 * XXX: this is not the _current_ arrangement 1404 * XXX: this is not the _current_ arrangement
1082 * Here's my conclusion: 1405 * Here's my conclusion:
… …
1101 break; 1424 break;
1102 } 1425 }
1103 break; 1426 break;
1104 1427
1105 case FocusIn: 1428 case FocusIn:
1106 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])
1107 { 1438 {
1108 TermWin.focus = 1; 1439 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1109 want_refresh = 1; 1440 ;
1110#ifdef USE_XIM
1111 if (Input_Context != NULL)
1112 XSetICFocus (Input_Context);
1113#endif
1114#ifdef CURSOR_BLINK
1115 if (Options & Opt_cursorBlink)
1116 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1117#endif
1118 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
1119 } 1454 }
1120 break; 1455 break;
1121 1456
1122 case FocusOut:
1123 if (TermWin.focus)
1124 {
1125 TermWin.focus = 0;
1126 want_refresh = 1;
1127#ifdef USE_XIM
1128 if (Input_Context != NULL)
1129 XUnsetICFocus (Input_Context);
1130#endif
1131#ifdef CURSOR_BLINK
1132 if (Options & Opt_cursorBlink)
1133 cursor_blink_ev.stop ();
1134 hidden_cursor = 0;
1135#endif
1136
1137 }
1138 break;
1139
1140 case ConfigureNotify: 1457 case PropertyNotify:
1141 if (ev.xconfigure.window == TermWin.parent[0]) 1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1142 { 1459 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1143 int height, width; 1460 && ev.xproperty.state == PropertyNewValue)
1461 selection_property (ev.xproperty.window, ev.xproperty.atom);
1144 1462
1145 do
1146 { /* Wrap lots of configures into one */
1147 width = ev.xconfigure.width;
1148 height = ev.xconfigure.height;
1149 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1150 }
1151 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1152
1153 if (szHint.width != width || szHint.height != height)
1154 {
1155 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1156 resize_all_windows (width, height, 1);
1157 }
1158#ifdef DEBUG_SIZE
1159 else
1160 {
1161 D_SIZE ((stderr, "Size: Not resizing"));
1162 }
1163#endif
1164#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1165 if (Options & Opt_transparent)
1166 {
1167 check_our_parents ();
1168 if (am_transparent)
1169 want_full_refresh = 1;
1170 }
1171#endif
1172 }
1173 break; 1463 break;
1174 1464
1175 case SelectionClear: 1465 case SelectionClear:
1176 selection_clear (); 1466 selection_clear ();
1177 break; 1467 break;
1178 1468
1179 case SelectionNotify: 1469 case SelectionNotify:
1180 if (selection_wait == Sel_normal) 1470 if (selection_wait == Sel_normal)
1181 selection_paste (ev.xselection.requestor, 1471 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1182 ev.xselection.property, True);
1183 break; 1472 break;
1184 1473
1185 case SelectionRequest: 1474 case SelectionRequest:
1186 selection_send (ev.xselectionrequest); 1475 selection_send (ev.xselectionrequest);
1187 break; 1476 break;
1188 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
1189 case UnmapNotify: 1486 case UnmapNotify:
1190 TermWin.mapped = 0; 1487 mapped = 0;
1191#ifdef TEXT_BLINK 1488#ifdef TEXT_BLINK
1192 text_blink_ev.stop (); 1489 text_blink_ev.stop ();
1193#endif 1490#endif
1194 break; 1491 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1195
1196 case MapNotify:
1197 TermWin.mapped = 1;
1198#ifdef TEXT_BLINK
1199 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1200#endif
1201 break; 1492 break;
1202 1493
1203#ifdef TRANSPARENT 1494#ifdef TRANSPARENT
1204 case ReparentNotify: 1495 case ReparentNotify:
1205 rootwin_cb (ev); 1496 rootwin_cb (ev);
1206 break; 1497 break;
1207#endif /* TRANSPARENT */ 1498#endif /* TRANSPARENT */
1208 1499
1209 case GraphicsExpose: 1500 case GraphicsExpose:
1210 case Expose: 1501 case Expose:
1211 if (ev.xany.window == TermWin.vt) 1502 if (ev.xany.window == vt)
1212 { 1503 {
1213#ifdef NO_SLOW_LINK_SUPPORT 1504 do
1214 scr_expose (ev.xexpose.x, ev.xexpose.y, 1505 scr_expose (ev.xexpose.x, ev.xexpose.y,
1215 ev.xexpose.width, ev.xexpose.height, False); 1506 ev.xexpose.width, ev.xexpose.height, False);
1216#else 1507 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1217 // I don't understand this, so I changed it :) 1508
1509 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1510
1511 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1218 scr_expose (ev.xexpose.x, ev.xexpose.y, 1512 scr_expose (ev.xexpose.x, ev.xexpose.y,
1219 ev.xexpose.width, ev.xexpose.height, False); 1513 ev.xexpose.width, ev.xexpose.height, False);
1220 //scr_expose (ev.xexpose.x, 0, 1514
1221 // ev.xexpose.width, TermWin.height, False);
1222#endif
1223 want_refresh = 1; 1515 want_refresh = 1;
1224 } 1516 }
1225 else 1517 else
1226 { 1518 {
1227 XEvent unused_event; 1519 XEvent unused_event;
1228 1520
1229 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1521 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1230 ; 1522 ;
1231 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1523 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1232 ; 1524 ;
1233 1525
1234 if (isScrollbarWindow (ev.xany.window)) 1526 if (isScrollbarWindow (ev.xany.window))
1235 { 1527 {
1236 scrollBar.setIdle (); 1528 scrollBar.setIdle ();
1237 scrollbar_show (0); 1529 scrollbar_show (0);
1238 } 1530 }
1239#ifdef MENUBAR 1531
1240 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1532#ifdef TRANSPARENT
1241 menubar_expose (); 1533 if (am_transparent && ev.xany.window == parent[0])
1534 XClearWindow (xdisp, ev.xany.window);
1242#endif 1535#endif
1243 } 1536 }
1244 break; 1537 break;
1245 1538
1246 case MotionNotify: 1539 case MotionNotify:
1247#ifdef POINTER_BLANK 1540#ifdef POINTER_BLANK
1248 if (hidden_pointer) 1541 if (hidden_pointer)
1249 pointer_unblank (); 1542 pointer_unblank ();
1250#endif 1543#endif
1251#if MENUBAR 1544 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1252 if (isMenuBarWindow (ev.xany.window)) 1545 break;
1546
1547 if (ev.xany.window == vt)
1253 { 1548 {
1254 menubar_control (ev.xbutton); 1549 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1255 break; 1550 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1256 } 1551 ; // nop
1257#endif
1258 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1259 break;
1260
1261 if (ev.xany.window == TermWin.vt)
1262 {
1263 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1552 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1264 { 1553 {
1265 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1554 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1266 ; 1555 ;
1267 1556
1268 XQueryPointer (display->display, TermWin.vt, 1557 XQueryPointer (xdisp, vt,
1269 &unused_root, &unused_child, 1558 &unused_root, &unused_child,
1270 &unused_root_x, &unused_root_y, 1559 &unused_root_x, &unused_root_y,
1271 & (ev.xbutton.x), & (ev.xbutton.y), 1560 &ev.xbutton.x, &ev.xbutton.y,
1272 &unused_mask); 1561 &ev.xbutton.state);
1273#ifdef MOUSE_THRESHOLD 1562#ifdef MOUSE_THRESHOLD
1274 /* deal with a `jumpy' mouse */ 1563 /* deal with a `jumpy' mouse */
1275 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1564 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1276 { 1565 {
1277#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
1278 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1575 selection_extend (ev.xbutton.x, ev.xbutton.y,
1279 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1576 ev.xbutton.state & Button3Mask ? 2 : 0);
1577
1280#ifdef SELECTION_SCROLLING 1578#ifdef SELECTION_SCROLLING
1281 if (ev.xbutton.y < TermWin.int_bwidth 1579 if (ev.xbutton.y < int_bwidth
1282 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1580 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1283 { 1581 {
1284 int dist; 1582 int dist;
1285 1583
1286 /* don't clobber the current delay if we are 1584 /* don't clobber the current delay if we are
1287 * already in the middle of scrolling. 1585 * already in the middle of scrolling.
… …
1290 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1588 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1291 1589
1292 /* save the event params so we can highlight 1590 /* save the event params so we can highlight
1293 * the selection in the pending-scroll loop 1591 * the selection in the pending-scroll loop
1294 */ 1592 */
1295 selection_save_x=ev.xbutton.x; 1593 selection_save_x = ev.xbutton.x;
1296 selection_save_y=ev.xbutton.y; 1594 selection_save_y = ev.xbutton.y;
1297 selection_save_state=
1298 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1595 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1299 1596
1300 /* calc number of lines to scroll */ 1597 /* calc number of lines to scroll */
1301 if (ev.xbutton.y<TermWin.int_bwidth) 1598 if (ev.xbutton.y < int_bwidth)
1302 { 1599 {
1303 scroll_selection_dir = UP; 1600 scroll_selection_dir = UP;
1304 dist = TermWin.int_bwidth - ev.xbutton.y; 1601 dist = int_bwidth - ev.xbutton.y;
1305 } 1602 }
1306 else 1603 else
1307 { 1604 {
1308 scroll_selection_dir = DN; 1605 scroll_selection_dir = DN;
1309 dist = ev.xbutton.y - 1606 dist = ev.xbutton.y - (int_bwidth + height);
1310 (TermWin.int_bwidth + TermWin.height);
1311 } 1607 }
1608
1312 scroll_selection_lines= (Pixel2Height (dist)/ 1609 scroll_selection_lines = Pixel2Height (dist)
1313 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1610 / SELECTION_SCROLL_LINE_SPEEDUP
1611 + 1;
1314 MIN_IT (scroll_selection_lines, 1612 min_it (scroll_selection_lines,
1315 SELECTION_SCROLL_MAX_LINES); 1613 SELECTION_SCROLL_MAX_LINES);
1316 } 1614 }
1317 else 1615 else
1318 { 1616 {
1319 /* we are within the text window, so we 1617 /* we are within the text window, so we
1320 * shouldn't be scrolling 1618 * shouldn't be scrolling
… …
1322 if (sel_scroll_ev.active) 1620 if (sel_scroll_ev.active)
1323 sel_scroll_ev.stop(); 1621 sel_scroll_ev.stop();
1324 } 1622 }
1325#endif 1623#endif
1326#ifdef MOUSE_THRESHOLD 1624#ifdef MOUSE_THRESHOLD
1327
1328 } 1625 }
1329#endif 1626#endif
1330
1331 } 1627 }
1332 } 1628 }
1333 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1334 { 1630 {
1335 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1631 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1336 MotionNotify, &ev)) ; 1632 MotionNotify, &ev))
1633 ;
1634
1337 XQueryPointer (display->display, scrollBar.win, 1635 XQueryPointer (xdisp, scrollBar.win,
1338 &unused_root, &unused_child, 1636 &unused_root, &unused_child,
1339 &unused_root_x, &unused_root_y, 1637 &unused_root_x, &unused_root_y,
1340 & (ev.xbutton.x), & (ev.xbutton.y), 1638 &ev.xbutton.x, &ev.xbutton.y,
1341 &unused_mask); 1639 &unused_mask);
1342 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1343 scrollbar_size ()); 1641 scrollbar_size ());
1344 scr_refresh (refresh_type); 1642 want_refresh = 1;
1345 refresh_limit = 0; 1643 refresh_limit = 0;
1346 scrollbar_show (1); 1644 scrollbar_show (1);
1347 } 1645 }
1348 break; 1646 break;
1349 } 1647 }
1350}
1351 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
1352void 1749void
1353rxvt_term::rootwin_cb (XEvent &ev) 1750rxvt_term::rootwin_cb (XEvent &ev)
1354{ 1751{
1355 SET_R (this); 1752 make_current ();
1356 SET_LOCALE (locale);
1357 1753
1358 switch (ev.type) 1754 switch (ev.type)
1359 { 1755 {
1360 case PropertyNotify: 1756 case PropertyNotify:
1361 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1362 {
1363 if (ev.xproperty.state == PropertyNewValue)
1364 selection_property (ev.xproperty.window, ev.xproperty.atom);
1365 break;
1366 }
1367#ifdef TRANSPARENT
1368 else
1369 {
1370 /* 1757 /*
1371 * 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,
1372 * 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.
1373 */ 1760 */
1374 if (xa[XA_XROOTPMAPID] == 0)
1375 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1376
1377 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])
1378 return; 1763 return;
1379 }
1380 1764
1381 /* FALLTHROUGH */ 1765 /* FALLTHROUGH */
1382 case ReparentNotify: 1766 case ReparentNotify:
1383 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1767 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1384 want_full_refresh = 1; 1768 want_refresh = want_full_refresh = 1;
1385 break; 1769 break;
1386#endif
1387 } 1770 }
1388} 1771}
1772#endif
1389 1773
1390void 1774void
1391rxvt_term::button_press (XButtonEvent &ev) 1775rxvt_term::button_press (XButtonEvent &ev)
1392{ 1776{
1393 int reportmode = 0, clickintime; 1777 int reportmode = 0, clickintime;
1394 1778
1395 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1779 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1780
1396 if (!bypass_keystate) 1781 if (!bypass_keystate)
1397 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1782 reportmode = !! (priv_modes & PrivMode_mouse_report);
1783
1398 /* 1784 /*
1399 * VT window processing of button press 1785 * VT window processing of button press
1400 */ 1786 */
1401 if (ev.window == TermWin.vt) 1787 if (ev.window == vt)
1402 { 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
1403 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1801 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1802
1404 if (reportmode) 1803 if (reportmode)
1405 { 1804 {
1406 /* mouse report from vt window */ 1805 /* mouse report from vt window */
1407 /* save the xbutton state (for ButtonRelease) */ 1806 /* save the xbutton state (for ButtonRelease) */
1408 MEvent.state = ev.state; 1807 MEvent.state = ev.state;
1409#ifdef MOUSE_REPORT_DOUBLECLICK 1808#ifdef MOUSE_REPORT_DOUBLECLICK
1410 if (ev.button == MEvent.button && clickintime) 1809 if (ev.button == MEvent.button && clickintime)
1411 { 1810 {
1412 /* same button, within alloted time */ 1811 /* same button, within alloted time */
1413 MEvent.clicks++; 1812 MEvent.clicks++;
1813
1414 if (MEvent.clicks > 1) 1814 if (MEvent.clicks > 1)
1415 { 1815 {
1416 /* only report double clicks */ 1816 /* only report double clicks */
1417 MEvent.clicks = 2; 1817 MEvent.clicks = 2;
1418 mouse_report (ev); 1818 mouse_report (ev);
… …
1437 } 1837 }
1438 else 1838 else
1439 { 1839 {
1440 if (ev.button != MEvent.button) 1840 if (ev.button != MEvent.button)
1441 MEvent.clicks = 0; 1841 MEvent.clicks = 0;
1842
1442 switch (ev.button) 1843 switch (ev.button)
1443 { 1844 {
1444 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
1445 /* allow shift+left click to extend selection */ 1854 /* allow shift+left click to extend selection */
1446 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1855 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1447 { 1856 {
1448 if (MEvent.button == Button1 && clickintime) 1857 if (MEvent.button == Button1 && clickintime)
1449 selection_rotate (ev.x, ev.y); 1858 selection_rotate (ev.x, ev.y);
1450 else 1859 else
1451 selection_extend (ev.x, ev.y, 1); 1860 selection_extend (ev.x, ev.y, 1);
… …
1466 case Button3: 1875 case Button3:
1467 if (MEvent.button == Button3 && clickintime) 1876 if (MEvent.button == Button3 && clickintime)
1468 selection_rotate (ev.x, ev.y); 1877 selection_rotate (ev.x, ev.y);
1469 else 1878 else
1470 selection_extend (ev.x, ev.y, 1); 1879 selection_extend (ev.x, ev.y, 1);
1880
1471 MEvent.button = Button3; 1881 MEvent.button = Button3;
1472 break; 1882 break;
1473 } 1883 }
1474 } 1884 }
1885
1475 MEvent.time = ev.time; 1886 MEvent.time = ev.time;
1476 return; 1887 return;
1477 } 1888 }
1478 1889
1479 /* 1890 /*
… …
1571 break; 1982 break;
1572 case R_SB_ALIGN_BOTTOM: 1983 case R_SB_ALIGN_BOTTOM:
1573 csrO = scrollBar.bot - scrollBar.top; 1984 csrO = scrollBar.bot - scrollBar.top;
1574 break; 1985 break;
1575 } 1986 }
1987
1576 if (scrollBar.style == R_SB_XTERM 1988 if (scrollBar.style == R_SB_XTERM
1577 || scrollbar_above_slider (ev.y) 1989 || scrollbar_above_slider (ev.y)
1578 || scrollbar_below_slider (ev.y)) 1990 || scrollbar_below_slider (ev.y))
1579 scr_move_to ( scrollbar_position (ev.y) - csrO, 1991 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1580 scrollbar_size ()); 1992
1581 scrollBar.setMotion (); 1993 scrollBar.setMotion ();
1582 break; 1994 break;
1583 1995
1584 case Button1: 1996 case Button1:
1585 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1997 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1589 case Button3: 2001 case Button3:
1590 if (scrollBar.style != R_SB_XTERM) 2002 if (scrollBar.style != R_SB_XTERM)
1591 { 2003 {
1592 if (scrollbar_above_slider (ev.y)) 2004 if (scrollbar_above_slider (ev.y))
1593# ifdef RXVT_SCROLL_FULL 2005# ifdef RXVT_SCROLL_FULL
1594 scr_page (UP, TermWin.nrow - 1); 2006 scr_page (UP, nrow - 1);
1595# else 2007# else
1596 scr_page (UP, TermWin.nrow / 4); 2008 scr_page (UP, nrow / 4);
1597# endif 2009# endif
1598 else if (scrollbar_below_slider (ev.y)) 2010 else if (scrollbar_below_slider (ev.y))
1599# ifdef RXVT_SCROLL_FULL 2011# ifdef RXVT_SCROLL_FULL
1600 scr_page (DN, TermWin.nrow - 1); 2012 scr_page (DN, nrow - 1);
1601# else 2013# else
1602 scr_page (DN, TermWin.nrow / 4); 2014 scr_page (DN, nrow / 4);
1603# endif 2015# endif
1604 else 2016 else
1605 scrollBar.setMotion (); 2017 scrollBar.setMotion ();
1606 } 2018 }
1607 else 2019 else
1608 { 2020 {
1609 scr_page ((ev.button == Button1 ? DN : UP), 2021 scr_page ((ev.button == Button1 ? DN : UP),
1610 (TermWin.nrow 2022 (nrow
1611 * scrollbar_position (ev.y) 2023 * scrollbar_position (ev.y)
1612 / scrollbar_size ())); 2024 / scrollbar_size ()));
1613 } 2025 }
2026
1614 break; 2027 break;
1615 } 2028 }
1616 } 2029 }
2030
1617 return; 2031 return;
1618 } 2032 }
1619#if MENUBAR
1620 /*
1621 * Menubar window processing of button press
1622 */
1623 if (isMenuBarWindow (ev.window))
1624 menubar_control (ev);
1625#endif
1626} 2033}
1627 2034
1628void 2035void
1629rxvt_term::button_release (XButtonEvent &ev) 2036rxvt_term::button_release (XButtonEvent &ev)
1630{ 2037{
1631 int reportmode = 0; 2038 int reportmode = 0;
1632 2039
1633 csrO = 0; /* reset csr Offset */ 2040 csrO = 0; /* reset csr Offset */
1634 if (!bypass_keystate) 2041 if (!bypass_keystate)
1635 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2042 reportmode = !! (priv_modes & PrivMode_mouse_report);
1636 2043
1637 if (scrollbar_isUpDn ()) 2044 if (scrollbar_isUpDn ())
1638 { 2045 {
1639 scrollBar.setIdle (); 2046 scrollBar.setIdle ();
1640 scrollbar_show (0); 2047 scrollbar_show (0);
1641#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1642 refresh_type &= ~SMOOTH_REFRESH;
1643#endif
1644
1645 } 2048 }
2049
1646#ifdef SELECTION_SCROLLING 2050#ifdef SELECTION_SCROLLING
1647 if (sel_scroll_ev.active) 2051 if (sel_scroll_ev.active)
1648 sel_scroll_ev.stop(); 2052 sel_scroll_ev.stop();
1649#endif 2053#endif
2054
1650 if (ev.window == TermWin.vt) 2055 if (ev.window == vt)
1651 { 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
1652 if (reportmode) 2066 if (reportmode)
1653 { 2067 {
1654 /* mouse report from vt window */ 2068 /* mouse report from vt window */
1655 /* don't report release of wheel "buttons" */ 2069 /* don't report release of wheel "buttons" */
1656 if (ev.button >= 4) 2070 if (ev.button >= 4)
… …
1670 MEvent.button = AnyButton; 2084 MEvent.button = AnyButton;
1671 mouse_report (ev); 2085 mouse_report (ev);
1672#endif /* MOUSE_REPORT_DOUBLECLICK */ 2086#endif /* MOUSE_REPORT_DOUBLECLICK */
1673 return; 2087 return;
1674 } 2088 }
2089
1675 /* 2090 /*
1676 * dumb hack to compensate for the failure of click-and-drag 2091 * dumb hack to compensate for the failure of click-and-drag
1677 * when overriding mouse reporting 2092 * when overriding mouse reporting
1678 */ 2093 */
1679 if (PrivateModes & PrivMode_mouse_report 2094 if (priv_modes & PrivMode_mouse_report
1680 && bypass_keystate 2095 && bypass_keystate
1681 && ev.button == Button1 && MEvent.clicks <= 1) 2096 && ev.button == Button1 && MEvent.clicks <= 1)
1682 selection_extend (ev.x, ev.y, 0); 2097 selection_extend (ev.x, ev.y, 0);
1683 2098
1684 switch (ev.button) 2099 switch (ev.button)
1685 { 2100 {
1686 case Button1: 2101 case Button1:
1687 case Button3: 2102 case Button3:
1688 selection_make (ev.time); 2103 selection_make (ev.time);
1689 break; 2104 break;
2105
1690 case Button2: 2106 case Button2:
1691 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);
1692 break; 2109 break;
2110
1693#ifdef MOUSE_WHEEL 2111#ifdef MOUSE_WHEEL
1694 case Button4: 2112 case Button4:
1695 case Button5: 2113 case Button5:
1696 { 2114 {
1697 int i; 2115 int i;
… …
1699 2117
1700 v = ev.button == Button4 ? UP : DN; 2118 v = ev.button == Button4 ? UP : DN;
1701 2119
1702 if (ev.state & ShiftMask) 2120 if (ev.state & ShiftMask)
1703 i = 1; 2121 i = 1;
1704 else if (Options & Opt_mouseWheelScrollPage) 2122 else if (OPTION (Opt_mouseWheelScrollPage))
1705 i = TermWin.nrow - 1; 2123 i = nrow - 1;
1706 else 2124 else
1707 i = 5; 2125 i = 5;
1708 2126
1709# ifdef MOUSE_SLIP_WHEELING 2127# ifdef MOUSE_SLIP_WHEELING
1710 if (ev.state & ControlMask) 2128 if (ev.state & ControlMask)
1711 { 2129 {
1712 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)
1713 slip_wheel_ev.start (NOW + 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
1714 } 2145 }
1715# endif 2146# endif
1716# ifdef JUMP_MOUSE_WHEEL
1717 scr_page (v, i);
1718 scr_refresh (SMOOTH_REFRESH);
1719 scrollbar_show (1);
1720# else
1721 while (i--)
1722 {
1723 scr_page (v, 1);
1724 scr_refresh (SMOOTH_REFRESH);
1725 scrollbar_show (1);
1726 }
1727# endif
1728
1729 } 2147 }
1730 break; 2148 break;
1731#endif 2149#endif
1732
1733 } 2150 }
1734 } 2151 }
1735#ifdef MENUBAR
1736 else if (isMenuBarWindow (ev.window))
1737 menubar_control (ev);
1738#endif
1739} 2152}
1740 2153
1741#ifdef TRANSPARENT 2154#ifdef TRANSPARENT
1742#if TINTING 2155#if TINTING
1743/* shading taken from eterm-0.9.2 */ 2156/* taken from aterm-0.4.2 */
1744/* RGB 15 */
1745 2157
1746static void 2158typedef uint32_t RUINT32T;
1747shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1748{
1749 unsigned char *ptr;
1750 int x, y;
1751 2159
1752 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2160void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
1753 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2161{
1754 /* No saturation */ 2162 int sh_r, sh_g, sh_b;
1755 for (y = h; --y >= 0;) { 2163 RUINT32T mask_r, mask_g, mask_b;
1756 for (x = -w; x < 0; x++) { 2164 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1757 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;
1758 2168
1759 b = ((uint16_t *) ptr)[x]; 2169 Visual *visual = term->visual;
1760 r = (b & 0x7c00) * rm; 2170
1761 g = (b & 0x3e0) * gm; 2171 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1762 b = (b & 0x1f) * bm; 2172
1763 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2173 /* for convenience */
1764 | ((g >> 8) & 0x3e0) 2174 mask_r = visual->red_mask;
1765 | ((b >> 8) & 0x1f); 2175 mask_g = visual->green_mask;
1766 } 2176 mask_b = visual->blue_mask;
1767 ptr += bpl; 2177
1768 } 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;
1769 } else { 2251 } else {
1770 for (y = h; --y >= 0;) { 2252 if (shade < 0) shade = 0;
1771 for (x = -w; x < 0; x++) { 2253 if (shade > 100) shade = 100;
1772 int r, g, b;
1773 2254
1774 b = ((uint16_t *) ptr)[x]; 2255 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1775 r = (b & 0x7c00) * rm; 2256
1776 g = (b & 0x3e0) * gm; 2257 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1777 b = (b & 0x1f) * bm; 2258 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1778 r |= (!(r >> 15) - 1); 2259 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1779 g |= (!(g >> 10) - 1); 2260 }
1780 b |= (!(b >> 5) - 1); 2261
1781 ((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 */
1782 | ((g >> 8) & 0x3e0) 2263 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1783 | ((b >> 8) & 0x1f); 2264 {
1784 } 2265 unsigned int tmp;
1785 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++)
1786 } 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);
1787 } 2318 }
1788} 2319 break;
1789 2320 }
1790/* RGB 16 */ 2321 case 16:
1791static void 2322 {
1792shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2323 unsigned short *p1, *pf, *p, *pl;
1793{ 2324 p1 = (unsigned short *) srcImage->data;
1794 unsigned char *ptr; 2325 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1795 int x, y; 2326 while (p1 < pf)
1796 2327 {
1797 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2328 p = p1;
1798 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2329 pl = p1 + srcImage->width;
1799 /* No saturation */ 2330 for (; p < pl; p++)
1800 for (y = h; --y >= 0;) {
1801 for (x = -w; x < 0; x++) {
1802 int r, g, b;
1803
1804 b = ((uint16_t *) ptr)[x];
1805 r = (b & 0xf800) * rm;
1806 g = (b & 0x7e0) * gm;
1807 b = (b & 0x1f) * bm;
1808 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1809 | ((g >> 8) & 0x7e0)
1810 | ((b >> 8) & 0x1f);
1811 }
1812 ptr += bpl;
1813 } 2331 {
1814 } else { 2332 *p = lookup_r[(*p & 0xf800)>>11] |
1815 for (y = h; --y >= 0;) { 2333 lookup_g[(*p & 0x07e0)>> 5] |
1816 for (x = -w; x < 0; x++) { 2334 lookup_b[(*p & 0x001f)];
1817 int r, g, b;
1818
1819 b = ((uint16_t *) ptr)[x];
1820 r = (b & 0xf800) * rm;
1821 g = (b & 0x7e0) * gm;
1822 b = (b & 0x1f) * bm;
1823 r |= (!(r >> 16) - 1);
1824 g |= (!(g >> 11) - 1);
1825 b |= (!(b >> 5) - 1);
1826 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1827 | ((g >> 8) & 0x7e0)
1828 | ((b >> 8) & 0x1f);
1829 } 2335 }
1830 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)
1831 } 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);
1832 } 2356 }
1833} 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);
1834 2364
1835/* RGB 24 */ 2365 while (p1 < pf)
1836static void 2366 {
1837shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2367 p = p1;
1838{ 2368 pl = p1 + srcImage->width;
1839 unsigned char *ptr; 2369 for (; p < pl; p++)
1840 int x, y;
1841
1842 ptr = (unsigned char *)data + (w * 3);
1843 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1844 /* No saturation */
1845 for (y = h; --y >= 0;) {
1846 for (x = -(w * 3); x < 0; x += 3) {
1847 int r, g, b;
1848
1849 if (byteorder.big_endian()) {
1850 r = (ptr[x + 0] * rm) >> 8;
1851 g = (ptr[x + 1] * gm) >> 8;
1852 b = (ptr[x + 2] * bm) >> 8;
1853 ptr[x + 0] = r;
1854 ptr[x + 1] = g;
1855 ptr[x + 2] = b;
1856 } else {
1857 r = (ptr[x + 2] * rm) >> 8;
1858 g = (ptr[x + 1] * gm) >> 8;
1859 b = (ptr[x + 0] * bm) >> 8;
1860 ptr[x + 2] = r;
1861 ptr[x + 1] = g;
1862 ptr[x + 0] = b;
1863 }
1864 }
1865 ptr += bpl;
1866 } 2370 {
1867 } else { 2371 *p = lookup_r[(*p & 0xff0000)>>16] |
1868 for (y = h; --y >= 0;) { 2372 lookup_g[(*p & 0x00ff00)>> 8] |
1869 for (x = -(w * 3); x < 0; x += 3) { 2373 lookup_b[(*p & 0x0000ff)] |
1870 int r, g, b; 2374 (*p & ~0xffffff);
1871
1872 if (byteorder.big_endian()) {
1873 r = (ptr[x + 0] * rm) >> 8;
1874 g = (ptr[x + 1] * gm) >> 8;
1875 b = (ptr[x + 2] * bm) >> 8;
1876
1877 r |= (!(r >> 8) - 1);
1878 g |= (!(g >> 8) - 1);
1879 b |= (!(b >> 8) - 1);
1880
1881 ptr[x + 0] = r;
1882 ptr[x + 1] = g;
1883 ptr[x + 2] = b;
1884 } else {
1885 r = (ptr[x + 2] * rm) >> 8;
1886 g = (ptr[x + 1] * gm) >> 8;
1887 b = (ptr[x + 0] * bm) >> 8;
1888
1889 r |= (!(r >> 8) - 1);
1890 g |= (!(g >> 8) - 1);
1891 b |= (!(b >> 8) - 1);
1892
1893 ptr[x + 2] = r;
1894 ptr[x + 1] = g;
1895 ptr[x + 0] = b;
1896 }
1897 } 2375 }
1898 ptr += bpl; 2376 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1899 } 2377 }
2378 break;
2379 }
1900 } 2380 }
1901}
1902 2381
1903/* RGB 32 */ 2382 free (lookup);
1904static void
1905shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1906{
1907 unsigned char *ptr;
1908 int x, y;
1909
1910 ptr = (unsigned char *)data + (w * 4);
1911 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1912 /* No saturation */
1913 for (y = h; --y >= 0;) {
1914 if (byteorder.big_endian()) {
1915 for (x = -(w * 4); x < 0; x += 4) {
1916 int r, g, b;
1917
1918 r = (ptr[x + 1] * rm) >> 8;
1919 g = (ptr[x + 2] * gm) >> 8;
1920 b = (ptr[x + 3] * bm) >> 8;
1921 ptr[x + 1] = r;
1922 ptr[x + 2] = g;
1923 ptr[x + 3] = b;
1924 }
1925 } else {
1926 for (x = -(w * 4); x < 0; x += 4) {
1927 int r, g, b;
1928
1929 r = (ptr[x + 2] * rm) >> 8;
1930 g = (ptr[x + 1] * gm) >> 8;
1931 b = (ptr[x + 0] * bm) >> 8;
1932 ptr[x + 2] = r;
1933 ptr[x + 1] = g;
1934 ptr[x + 0] = b;
1935 }
1936 }
1937 ptr += bpl;
1938 }
1939 } else {
1940 for (y = h; --y >= 0;) {
1941 for (x = -(w * 4); x < 0; x += 4) {
1942 int r, g, b;
1943
1944 if (byteorder.big_endian()) {
1945 r = (ptr[x + 1] * rm) >> 8;
1946 g = (ptr[x + 2] * gm) >> 8;
1947 b = (ptr[x + 3] * bm) >> 8;
1948
1949 r |= (!(r >> 8) - 1);
1950 g |= (!(g >> 8) - 1);
1951 b |= (!(b >> 8) - 1);
1952
1953 ptr[x + 1] = r;
1954 ptr[x + 2] = g;
1955 ptr[x + 3] = b;
1956 } else {
1957 r = (ptr[x + 2] * rm) >> 8;
1958 g = (ptr[x + 1] * gm) >> 8;
1959 b = (ptr[x + 0] * bm) >> 8;
1960
1961 r |= (!(r >> 8) - 1);
1962 g |= (!(g >> 8) - 1);
1963 b |= (!(b >> 8) - 1);
1964
1965 ptr[x + 2] = r;
1966 ptr[x + 1] = g;
1967 ptr[x + 0] = b;
1968 }
1969 }
1970 ptr += bpl;
1971 }
1972 }
1973} 2383}
1974
1975#endif 2384#endif
1976 2385
1977/* 2386/*
1978 * Check our parents are still who we think they are. 2387 * Check our parents are still who we think they are.
1979 * Do transparency updates if required 2388 * Do transparency updates if required
… …
1989 Pixmap rootpixmap = None; 2398 Pixmap rootpixmap = None;
1990 XWindowAttributes wattr, wrootattr; 2399 XWindowAttributes wattr, wrootattr;
1991 2400
1992 pchanged = 0; 2401 pchanged = 0;
1993 2402
1994 if (!(Options & Opt_transparent)) 2403 if (!OPTION (Opt_transparent))
1995 return pchanged; /* Don't try any more */ 2404 return pchanged; /* Don't try any more */
1996 2405
1997 XGetWindowAttributes (display->display, display->root, &wrootattr); 2406 XGetWindowAttributes (xdisp, display->root, &wrootattr);
1998 rootdepth = wrootattr.depth; 2407 rootdepth = wrootattr.depth;
1999 2408
2000 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2409 XGetWindowAttributes (xdisp, parent[0], &wattr);
2001 2410
2002 if (rootdepth != wattr.depth) 2411 if (rootdepth != wattr.depth)
2003 { 2412 {
2004 if (am_transparent) 2413 if (am_transparent)
2005 { 2414 {
2006 pchanged = 1; 2415 pchanged = 1;
2007 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2416 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2008 am_transparent = am_pixmap_trans = 0; 2417 am_transparent = am_pixmap_trans = 0;
2009 } 2418 }
2010 2419
2011 return pchanged; /* Don't try any more */ 2420 return pchanged; /* Don't try any more */
2012 } 2421 }
2013 2422
2014 /* 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. */
2015 XSync (display->display, False); 2424 XSync (xdisp, False);
2016 2425
2017 /* 2426 /*
2018 * Make the frame window set by the window manager have 2427 * Make the frame window set by the window manager have
2019 * the root background. Some window managers put multiple nested frame 2428 * the root background. Some window managers put multiple nested frame
2020 * 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.
2021 */ 2430 */
2022 i = (xa[XA_XROOTPMAPID] 2431 i = (xa[XA_XROOTPMAP_ID]
2023 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2432 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2024 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2433 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2025 &nitems, &bytes_after, &prop) == Success); 2434 &nitems, &bytes_after, &prop) == Success);
2026 2435
2027 if (!i || prop == NULL) 2436 if (!i || prop == NULL)
2028 i = (xa[XA_XSETROOTID] 2437 i = (xa[XA_ESETROOT_PMAP_ID]
2029 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2438 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2030 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2439 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2031 &nitems, &bytes_after, &prop) == Success); 2440 &nitems, &bytes_after, &prop) == Success);
2032 2441
2033 if (!i || prop == NULL) 2442 if (!i || prop == NULL
2443#if TINTING
2444 || !ISSET_PIXCOLOR (Color_tint)
2445#endif
2446 )
2034 have_pixmap = 0; 2447 have_pixmap = 0;
2035 else 2448 else
2036 { 2449 {
2037 have_pixmap = 1; 2450 have_pixmap = 1;
2038 rootpixmap = *(Pixmap *)prop; 2451 rootpixmap = *(Pixmap *)prop;
… …
2049 Window cr; 2462 Window cr;
2050 XImage *image; 2463 XImage *image;
2051 GC gc; 2464 GC gc;
2052 XGCValues gcvalue; 2465 XGCValues gcvalue;
2053 2466
2054 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2467 XTranslateCoordinates (xdisp, parent[0], display->root,
2055 0, 0, &sx, &sy, &cr); 2468 0, 0, &sx, &sy, &cr);
2056 nw = (unsigned int)szHint.width; 2469 nw = (unsigned int)szHint.width;
2057 nh = (unsigned int)szHint.height; 2470 nh = (unsigned int)szHint.height;
2058 nx = ny = 0; 2471 nx = ny = 0;
2059 2472
… …
2069 nh += sy; 2482 nh += sy;
2070 ny = -sy; 2483 ny = -sy;
2071 sy = 0; 2484 sy = 0;
2072 } 2485 }
2073 2486
2074 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2487 min_it (nw, (unsigned int) (wrootattr.width - sx));
2075 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2488 min_it (nh, (unsigned int) (wrootattr.height - sy));
2489
2490 XSync (xdisp, False);
2076 allowedxerror = -1; 2491 allowedxerror = -1;
2077 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2492 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2078 2493
2079 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2494 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2080 /* XXX: may need a delay here? */ 2495 /* XXX: may need a delay here? */
2081 allowedxerror = 0; 2496 allowedxerror = 0;
2082 2497
2083 if (image == NULL) 2498 if (image == NULL)
2084 { 2499 {
2085 if (am_transparent && am_pixmap_trans) 2500 if (am_transparent && am_pixmap_trans)
2086 { 2501 {
2087 pchanged = 1; 2502 pchanged = 1;
2088 if (TermWin.pixmap != None) 2503 if (pixmap != None)
2089 { 2504 {
2090 XFreePixmap (display->display, TermWin.pixmap); 2505 XFreePixmap (xdisp, pixmap);
2091 TermWin.pixmap = None; 2506 pixmap = None;
2092 } 2507 }
2093 } 2508 }
2094 2509
2095 am_pixmap_trans = 0; 2510 am_pixmap_trans = 0;
2096 } 2511 }
2097 else 2512 else
2098 { 2513 {
2099 if (TermWin.pixmap != None) 2514 if (pixmap != None)
2100 XFreePixmap (display->display, TermWin.pixmap); 2515 XFreePixmap (xdisp, pixmap);
2101 2516
2102#if TINTING 2517#if TINTING
2103 if (ISSET_PIXCOLOR (Color_tint)) 2518 if (ISSET_PIXCOLOR (Color_tint))
2104 { 2519 {
2105 unsigned short shade, rm, gm, bm; 2520 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2106 2521
2107 PixColors[Color_tint].get (display, rm, gm, bm); 2522 rgba c;
2523 pix_colors_focused [Color_tint].get (c);
2108 2524
2109 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2525 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2110
2111 /* Determine bitshift and bitmask values */
2112 switch (image->bits_per_pixel)
2113 {
2114 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2115 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2116 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2117 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2118 }
2119 } 2526 }
2120#endif 2527#endif
2121 2528
2122 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2529 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2123 szHint.width, szHint.height, image->depth);
2124 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2530 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2125 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2531 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2126 nx, ny, image->width, image->height); 2532 nx, ny, image->width, image->height);
2127 XFreeGC (display->display, gc); 2533 XFreeGC (xdisp, gc);
2128 XDestroyImage (image); 2534 XDestroyImage (image);
2129 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2535 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2130 TermWin.pixmap); 2536 XClearWindow (xdisp, parent[0]);
2131 2537
2132 if (!am_transparent || !am_pixmap_trans) 2538 if (!am_transparent || !am_pixmap_trans)
2133 pchanged = 1; 2539 pchanged = 1;
2134 2540
2135 am_transparent = am_pixmap_trans = 1; 2541 am_transparent = am_pixmap_trans = 1;
2136 } 2542 }
2137 } 2543 }
2138 2544
2139 if (!am_pixmap_trans) 2545 if (am_pixmap_trans)
2546 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2547 else
2140 { 2548 {
2141 unsigned int n; 2549 unsigned int n;
2142 /* 2550 /*
2143 * InheritPixmap transparency 2551 * InheritPixmap transparency
2144 */ 2552 */
2145 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2146 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2553 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2147 { 2554 {
2148 oldp = TermWin.parent[i]; 2555 oldp = parent[i];
2149 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2556 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2150 &TermWin.parent[i], &list, &n);
2151 XFree (list); 2557 XFree (list);
2152 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2153 2558
2154 if (TermWin.parent[i] == display->root) 2559 if (parent[i] == display->root)
2155 { 2560 {
2156 if (oldp != None) 2561 if (oldp != None)
2157 pchanged = 1; 2562 pchanged = 1;
2158 2563
2159 break; 2564 break;
2160 } 2565 }
2161 2566
2162 if (oldp != TermWin.parent[i]) 2567 if (oldp != parent[i])
2163 pchanged = 1; 2568 pchanged = 1;
2164 } 2569 }
2165 2570
2166 n = 0; 2571 n = 0;
2167 2572
2168 if (pchanged) 2573 if (pchanged)
2169 {
2170 for (; n < (unsigned int)i; n++) 2574 for (; n < (unsigned int)i; n++)
2171 { 2575 {
2172 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2576 XGetWindowAttributes (xdisp, parent[n], &wattr);
2173 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2577
2174 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2578 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2175 { 2579 {
2176 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2580 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2177 break; 2581 break;
2178 } 2582 }
2179 } 2583 }
2584
2585 if (n > (sizeof (parent) / sizeof (parent[0])))
2180 } 2586 {
2181
2182 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2183 {
2184 D_X ((stderr, "InheritPixmap Turning off"));
2185 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); 2587 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2186 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2588 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2187 am_transparent = 0; 2589 am_transparent = 0;
2188 /* XXX: also turn off Opt_transparent? */ 2590 /* XXX: also turn off Opt_transparent? */
2189 } 2591 }
2190 else 2592 else
2191 { 2593 {
2192#if WAIT_FOR_WM
2193 /* wait (an arbitrary period) for the WM to do its thing
2194 * needed for fvwm2.2.2 (and before?) */
2195 sleep (1);
2196#endif
2197 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2198 for (n = 0; n < (unsigned int)i; n++) 2594 for (n = 0; n < (unsigned int)i; n++)
2595 {
2199 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2596 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2597 XClearWindow (xdisp, parent[n]);
2598 }
2200 2599
2201 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2600 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2202 am_transparent = 1; 2601 am_transparent = 1;
2203 } 2602 }
2204 2603
2205 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2604 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2206 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 ();
2207 } 2620 }
2208 2621
2209 return pchanged; 2622 return pchanged;
2210} 2623}
2211#endif 2624#endif
… …
2214 2627
2215bool 2628bool
2216rxvt_term::cmd_parse () 2629rxvt_term::cmd_parse ()
2217{ 2630{
2218 bool flag = false; 2631 bool flag = false;
2219 unicode_t ch = NOCHAR; 2632 wchar_t ch = NOCHAR;
2220 unsigned char *seq_begin; // remember start of esc-sequence here 2633 char *seq_begin; // remember start of esc-sequence here
2221 2634
2222 for (;;) 2635 for (;;)
2223 { 2636 {
2224 if (ch == NOCHAR) 2637 if (ch == NOCHAR)
2225 { 2638 {
2226 seq_begin = cmdbuf_ptr; 2639 seq_begin = cmdbuf_ptr;
2227 ch = next_char (); 2640 ch = next_char ();
2228 }
2229 2641
2230 if (ch == NOCHAR) // TODO: improve 2642 if (ch == NOCHAR)
2231 break; 2643 break;
2644 }
2232 2645
2233 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2646 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2234 { 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
2235 /* Read a text string from the input buffer */ 2662 /* Read a text string from the input buffer */
2236 unicode_t buf[UBUFSIZ]; 2663 wchar_t buf[UBUFSIZ];
2237 bool refreshnow = false; 2664 bool refreshnow = false;
2238 int nlines = 0; 2665 int nlines = 0;
2239 unicode_t *str = buf; 2666 wchar_t *str = buf;
2240 2667 wchar_t *eol = str + min (ncol, UBUFSIZ);
2241 *str++ = ch;
2242 2668
2243 for (;;) 2669 for (;;)
2244 { 2670 {
2245 seq_begin = cmdbuf_ptr;
2246 ch = next_char ();
2247
2248 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2671 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2249 break; 2672 break;
2250 2673
2251 *str++ = ch; 2674 *str++ = ch;
2252 2675
2253 if (ch == C0_LF) 2676 if (ch == C0_LF || str >= eol)
2254 { 2677 {
2678 if (ch == C0_LF)
2255 nlines++; 2679 nlines++;
2680
2256 refresh_count++; 2681 refresh_count++;
2257 2682
2258 if (! (Options & Opt_jumpScroll) 2683 if (!OPTION (Opt_jumpScroll)
2259 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2684 || (refresh_count >= refresh_limit * (nrow - 1)))
2260 { 2685 {
2261 refreshnow = true; 2686 refreshnow = true;
2262 flag = true; 2687 refresh_count = 0;
2263 ch = NOCHAR; 2688 ch = NOCHAR;
2264 break; 2689 break;
2265 } 2690 }
2266 2691
2267 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2692 // scr_add_lines only works for nlines <= nrow - 1.
2268 if (nlines >= TermWin.nrow - 1) 2693 if (nlines >= nrow - 1)
2269 { 2694 {
2695 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2696 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2270 scr_add_lines (buf, nlines, str - buf); 2697 scr_add_lines (buf, str - buf, nlines);
2698
2271 nlines = 0; 2699 nlines = 0;
2272 str = buf; 2700 str = buf;
2701 eol = str + min (ncol, UBUFSIZ);
2273 } 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
2274 } 2715 }
2275 2716
2276 if (str >= buf + UBUFSIZ) 2717 seq_begin = cmdbuf_ptr;
2277 { 2718 ch = next_char ();
2278 ch = NOCHAR;
2279 break;
2280 }
2281 } 2719 }
2282 2720
2721 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2722 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2283 scr_add_lines (buf, nlines, str - buf); 2723 scr_add_lines (buf, str - buf, nlines);
2284 2724
2285 /* 2725 /*
2286 * 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
2287 * 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.
2288 * the number of pages between refreshes is refresh_limit, which 2728 * the number of pages between refreshes is refresh_limit, which
2289 * is incremented here because we must be doing flat-out scrolling. 2729 * is incremented here because we must be doing flat-out scrolling.
2290 *
2291 * refreshing should be correct for small scrolls, because of the
2292 * time-out
2293 */ 2730 */
2294 if (refreshnow) 2731 if (refreshnow)
2295 { 2732 {
2296 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2733 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2297 refresh_limit++; 2734 refresh_limit++;
2298 else 2735 else
2736 {
2737 flag = true;
2299 scr_refresh (refresh_type); 2738 scr_refresh ();
2739 want_refresh = 1;
2740 }
2300 } 2741 }
2301 2742
2302 } 2743 }
2303 else 2744 else
2304 { 2745 {
… …
2318 } 2759 }
2319 2760
2320 return flag; 2761 return flag;
2321} 2762}
2322 2763
2323// read the next octet
2324unicode_t
2325rxvt_term::next_octet ()
2326{
2327 return cmdbuf_ptr < cmdbuf_endp
2328 ? *cmdbuf_ptr++
2329 : NOCHAR;
2330}
2331
2332// read the next character 2764// read the next character
2333unicode_t 2765wchar_t
2334rxvt_term::next_char () 2766rxvt_term::next_char () NOTHROW
2335{ 2767{
2336 while (cmdbuf_ptr < cmdbuf_endp) 2768 while (cmdbuf_ptr < cmdbuf_endp)
2337 { 2769 {
2338 // assume 7-bit to be ascii ALWAYS 2770 // assume 7-bit to be ascii ALWAYS
2339 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2771 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2340 return *cmdbuf_ptr++; 2772 return *cmdbuf_ptr++;
2341 2773
2342 wchar_t wc; 2774 wchar_t wc;
2343 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);
2344 2776
2345 if (len == (size_t)-2) 2777 if (len == (size_t)-2)
2346 { 2778 {
2347 // the mbstate stores incomplete sequences. didn't know this :/ 2779 // the mbstate stores incomplete sequences. didn't know this :/
2348 cmdbuf_ptr = cmdbuf_endp; 2780 cmdbuf_ptr = cmdbuf_endp;
2349 break; 2781 break;
2350 } 2782 }
2351 2783
2352 if (len == (size_t)-1) 2784 if (len == (size_t)-1)
2353 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
2354 2786
2355 // assume wchar == unicode 2787 // assume wchar == unicode
2356 cmdbuf_ptr += len; 2788 cmdbuf_ptr += len;
2357 return wc; 2789 return wc & UNICODE_MASK;
2358 } 2790 }
2359 2791
2360 return NOCHAR; 2792 return NOCHAR;
2361} 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;
2362 2805
2363/* rxvt_cmd_getc () - Return next input character */ 2806/* rxvt_cmd_getc () - Return next input character */
2364/* 2807/*
2365 * Return the next input character after first passing any keyboard input 2808 * Return the next input character after first passing any keyboard input
2366 * to the command. 2809 * to the command.
2367 */ 2810 */
2368unicode_t 2811wchar_t
2369rxvt_term::cmd_getc () 2812rxvt_term::cmd_getc () THROW ((class out_of_input))
2370{ 2813{
2371 unicode_t c = next_char (); 2814 wchar_t c = next_char ();
2372 2815
2373 if (c == NOCHAR) 2816 if (c == NOCHAR)
2374 throw out_of_input; 2817 throw out_of_input;
2375 2818
2376 return c; 2819 return c;
2377} 2820}
2378 2821
2379unicode_t 2822uint32_t
2380rxvt_term::cmd_get8 () 2823rxvt_term::cmd_get8 () THROW ((class out_of_input))
2381{ 2824{
2382 unicode_t c = next_octet (); 2825 uint32_t c = next_octet ();
2383 2826
2384 if (c == NOCHAR) 2827 if (c == NOCHAR)
2385 throw out_of_input; 2828 throw out_of_input;
2386 2829
2387 return c; 2830 return c;
… …
2487 case C0_ESC: 2930 case C0_ESC:
2488 process_escape_seq (); 2931 process_escape_seq ();
2489 break; 2932 break;
2490 case C0_ENQ: /* terminal Status */ 2933 case C0_ENQ: /* terminal Status */
2491 if (rs[Rs_answerbackstring]) 2934 if (rs[Rs_answerbackstring])
2492 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2935 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2493 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2494 else 2936 else
2495 tt_write ((unsigned char *)VT100_ANS, 2937 tt_write (VT100_ANS, strlen (VT100_ANS));
2496 (unsigned int)STRLEN (VT100_ANS));
2497 break; 2938 break;
2498 case C0_BEL: /* bell */ 2939 case C0_BEL: /* bell */
2499 scr_bell (); 2940 scr_bell ();
2500 break; 2941 break;
2501 case C0_BS: /* backspace */ 2942 case C0_BS: /* backspace */
… …
2600void 3041void
2601rxvt_term::process_escape_seq () 3042rxvt_term::process_escape_seq ()
2602{ 3043{
2603 unicode_t ch = cmd_getc (); 3044 unicode_t ch = cmd_getc ();
2604 3045
2605 if (PrivateModes & PrivMode_vt52) 3046 if (priv_modes & PrivMode_vt52)
2606 { 3047 {
2607 process_escape_vt52 (ch); 3048 process_escape_vt52 (ch);
2608 return; 3049 return;
2609 } 3050 }
2610 3051
… …
2625 scr_charset_set (2, (unsigned int)cmd_getc ()); 3066 scr_charset_set (2, (unsigned int)cmd_getc ());
2626 break; 3067 break;
2627 case '+': 3068 case '+':
2628 scr_charset_set (3, (unsigned int)cmd_getc ()); 3069 scr_charset_set (3, (unsigned int)cmd_getc ());
2629 break; 3070 break;
2630#ifndef NO_FRILLS 3071#if !ENABLE_MINIMAL
2631 case '6': 3072 case '6':
2632 scr_backindex (); 3073 scr_backindex ();
2633 break; 3074 break;
2634#endif 3075#endif
2635 case '7': 3076 case '7':
2636 scr_cursor (SAVE); 3077 scr_cursor (SAVE);
2637 break; 3078 break;
2638 case '8': 3079 case '8':
2639 scr_cursor (RESTORE); 3080 scr_cursor (RESTORE);
2640 break; 3081 break;
2641#ifndef NO_FRILLS 3082#if !ENABLE_MINIMAL
2642 case '9': 3083 case '9':
2643 scr_forwardindex (); 3084 scr_forwardindex ();
2644 break; 3085 break;
2645#endif 3086#endif
2646 case '=': 3087 case '=':
… …
2656 break; 3097 break;
2657 3098
2658 /* 8.3.87: NEXT LINE */ 3099 /* 8.3.87: NEXT LINE */
2659 case C1_NEL: /* ESC E */ 3100 case C1_NEL: /* ESC E */
2660 { 3101 {
2661 unicode_t nlcr[] = { C0_LF, C0_CR }; 3102 wchar_t nlcr[] = { C0_LF, C0_CR };
2662 scr_add_lines (nlcr, 1, 2); 3103 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2663 } 3104 }
2664 break; 3105 break;
2665 3106
2666 /* kidnapped escape sequence: Should be 8.3.48 */ 3107 /* kidnapped escape sequence: Should be 8.3.48 */
2667 case C1_ESA: /* ESC G */ 3108 case C1_ESA: /* ESC G */
… …
2689 process_dcs_seq (); 3130 process_dcs_seq ();
2690 break; 3131 break;
2691 3132
2692 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3133 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2693 case C1_SCI: /* ESC Z */ 3134 case C1_SCI: /* ESC Z */
2694 tt_write ((const unsigned char *)ESCZ_ANSWER, 3135 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2695 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2696 break; /* steal obsolete ESC [ c */ 3136 break; /* steal obsolete ESC [ c */
2697 3137
2698 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3138 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2699 case C1_CSI: /* ESC [ */ 3139 case C1_CSI: /* ESC [ */
2700 process_csi_seq (); 3140 process_csi_seq ();
… …
2809 ndef = get_byte_array_bit (csi_defaults, i); 3249 ndef = get_byte_array_bit (csi_defaults, i);
2810 for (p = 0; p < nargs; p++) 3250 for (p = 0; p < nargs; p++)
2811 if (arg[p] == -1) 3251 if (arg[p] == -1)
2812 arg[p] = ndef; 3252 arg[p] = ndef;
2813 3253
2814#ifdef DEBUG_CMD
2815 fprintf (stderr, "CSI ");
2816 for (p = 0; p < nargs; p++)
2817 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2818 fprintf (stderr, "%c\n", ch);
2819#endif
2820
2821 /* 3254 /*
2822 * private mode handling 3255 * private mode handling
2823 */ 3256 */
2824 if (priv) 3257 if (priv)
2825 { 3258 {
2826 switch (priv) 3259 switch (priv)
2827 { 3260 {
2828 case '>': 3261 case '>':
2829 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 //
2830 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3271 tt_printf ("\033[>%d;94;0c", 'U');
3272 }
2831 break; 3273 break;
2832 case '?': 3274 case '?':
2833 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3275 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2834 process_terminal_mode (ch, priv, nargs, arg); 3276 process_terminal_mode (ch, priv, nargs, arg);
2835 break; 3277 break;
… …
2940 3382
2941 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3383 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2942 arg[0] = -arg[0]; 3384 arg[0] = -arg[0];
2943 /* FALLTHROUGH */ 3385 /* FALLTHROUGH */
2944 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3386 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2945 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3387 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2946 break; 3388 break;
2947 3389
2948 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3390 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2949 tt_write ((const unsigned char *)VT100_ANS, 3391 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2950 (unsigned int) (sizeof (VT100_ANS) - 1));
2951 break; 3392 break;
2952 3393
2953 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3394 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2954 process_sgr_mode (nargs, arg); 3395 process_sgr_mode (nargs, arg);
2955 break; 3396 break;
… …
2962 break; 3403 break;
2963 case 6: /* CPR requested */ 3404 case 6: /* CPR requested */
2964 scr_report_position (); 3405 scr_report_position ();
2965 break; 3406 break;
2966 case 7: /* unofficial extension */ 3407 case 7: /* unofficial extension */
2967 if (Options & Opt_insecure) 3408 if (OPTION (Opt_insecure))
2968 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3409 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2969 break; 3410 break;
2970 case 8: /* unofficial extension */ 3411 case 8: /* unofficial extension */
2971 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3412 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2972 break; 3413 break;
2973 } 3414 }
… …
3009 break; 3450 break;
3010 3451
3011 case CSI_RM: /* 8.3.107: RESET MODE */ 3452 case CSI_RM: /* 8.3.107: RESET MODE */
3012 if (arg[0] == 4) 3453 if (arg[0] == 4)
3013 scr_insert_mode (0); 3454 scr_insert_mode (0);
3455 else if (arg[0] == 20)
3456 priv_modes &= ~PrivMode_LFNL;
3014 break; 3457 break;
3015 3458
3016 case CSI_SM: /* 8.3.126: SET MODE */ 3459 case CSI_SM: /* 8.3.126: SET MODE */
3017 if (arg[0] == 4) 3460 if (arg[0] == 4)
3018 scr_insert_mode (1); 3461 scr_insert_mode (1);
3462 else if (arg[0] == 20)
3463 priv_modes |= PrivMode_LFNL;
3019 break; 3464 break;
3020 3465
3021 /* 3466 /*
3022 * PRIVATE USE beyond this point. All CSI_7? sequences here 3467 * PRIVATE USE beyond this point. All CSI_7? sequences here
3023 */ 3468 */
… …
3035 break; 3480 break;
3036 case CSI_75: 3481 case CSI_75:
3037 scr_cursor (RESTORE); 3482 scr_cursor (RESTORE);
3038 break; 3483 break;
3039 3484
3040#ifndef NO_FRILLS 3485#if !ENABLE_MINIMAL
3041 case CSI_74: 3486 case CSI_74:
3042 process_window_ops (arg, nargs); 3487 process_window_ops (arg, nargs);
3043 break; 3488 break;
3044#endif 3489#endif
3045 3490
… …
3052 break; 3497 break;
3053 } 3498 }
3054} 3499}
3055/*}}} */ 3500/*}}} */
3056 3501
3057#ifndef NO_FRILLS 3502#if !ENABLE_MINIMAL
3058/* ARGSUSED */ 3503/* ARGSUSED */
3059void 3504void
3060rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3505rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3061{ 3506{
3062 int x, y; 3507 int x, y;
3063 XWindowAttributes wattr; 3508 XWindowAttributes wattr;
3064 Window wdummy; 3509 Window wdummy;
3510
3511 dLocal (Display *, xdisp);
3065 3512
3066 if (nargs == 0) 3513 if (nargs == 0)
3067 return; 3514 return;
3068 3515
3069 switch (args[0]) 3516 switch (args[0])
3070 { 3517 {
3071 /* 3518 /*
3072 * commands 3519 * commands
3073 */ 3520 */
3074 case 1: /* deiconify window */ 3521 case 1: /* deiconify window */
3075 XMapWindow (display->display, TermWin.parent[0]); 3522 XMapWindow (xdisp, parent[0]);
3076 break; 3523 break;
3077 case 2: /* iconify window */ 3524 case 2: /* iconify window */
3078 XIconifyWindow (display->display, TermWin.parent[0], 3525 XIconifyWindow (xdisp, parent[0], display->screen);
3079 DefaultScreen (display->display));
3080 break; 3526 break;
3081 case 3: /* set position (pixels) */ 3527 case 3: /* set position (pixels) */
3082 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3528 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3083 break; 3529 break;
3084 case 4: /* set size (pixels) */ 3530 case 4: /* set size (pixels) */
3085 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3531 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3086 break; 3532 break;
3087 case 5: /* raise window */ 3533 case 5: /* raise window */
3088 XRaiseWindow (display->display, TermWin.parent[0]); 3534 XRaiseWindow (xdisp, parent[0]);
3089 break; 3535 break;
3090 case 6: /* lower window */ 3536 case 6: /* lower window */
3091 XLowerWindow (display->display, TermWin.parent[0]); 3537 XLowerWindow (xdisp, parent[0]);
3092 break; 3538 break;
3093 case 7: /* refresh window */ 3539 case 7: /* refresh window */
3094 scr_touch (true); 3540 scr_touch (true);
3095 break; 3541 break;
3096 case 8: /* set size (chars) */ 3542 case 8: /* set size (chars) */
3097 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3543 set_widthheight ((unsigned int) (args[2] * fwidth),
3098 (unsigned int) (args[1] * TermWin.fheight)); 3544 (unsigned int) (args[1] * fheight));
3099 break; 3545 break;
3100 3546
3101 //case 9: NYI, TODO, restore maximized window or maximize window 3547 //case 9: NYI, TODO, restore maximized window or maximize window
3102 default: 3548 default:
3103 if (args[0] >= 24) /* set height (chars) */ 3549 if (args[0] >= 24) /* set height (chars) */
3104 set_widthheight ((unsigned int)TermWin.width, 3550 set_widthheight ((unsigned int)width,
3105 (unsigned int) (args[1] * TermWin.fheight)); 3551 (unsigned int) (args[1] * fheight));
3106 break; 3552 break;
3107
3108 3553
3109 /* 3554 /*
3110 * reports - some output format copied from XTerm 3555 * reports - some output format copied from XTerm
3111 */ 3556 */
3112 case 11: /* report window state */ 3557 case 11: /* report window state */
3113 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3558 XGetWindowAttributes (xdisp, parent[0], &wattr);
3114 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3559 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3115 break; 3560 break;
3116 case 13: /* report window position */ 3561 case 13: /* report window position */
3117 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3562 XGetWindowAttributes (xdisp, parent[0], &wattr);
3118 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3563 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3119 -wattr.border_width, -wattr.border_width, 3564 -wattr.border_width, -wattr.border_width,
3120 &x, &y, &wdummy); 3565 &x, &y, &wdummy);
3121 tt_printf ("\033[3;%d;%dt", x, y); 3566 tt_printf ("\033[3;%d;%dt", x, y);
3122 break; 3567 break;
3123 case 14: /* report window size (pixels) */ 3568 case 14: /* report window size (pixels) */
3124 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3569 XGetWindowAttributes (xdisp, parent[0], &wattr);
3125 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3570 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3126 break; 3571 break;
3127 case 18: /* report text area size (chars) */ 3572 case 18: /* report text area size (chars) */
3128 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3573 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3129 break; 3574 break;
3130 case 19: /* report window size (chars) */ 3575 case 19: /* report window size (chars) */
3131 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3576 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3132 break; 3577 break;
3133 case 20: /* report icon label */ 3578 case 20: /* report icon label */
3134 if (Options & Opt_insecure)
3135 { 3579 {
3136 char *s; 3580 char *s;
3137 XGetIconName (display->display, TermWin.parent[0], &s); 3581 XGetIconName (xdisp, parent[0], &s);
3138 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);
3139 } 3584 }
3140 break; 3585 break;
3141 case 21: /* report window title */ 3586 case 21: /* report window title */
3142 if (Options & Opt_insecure)
3143 { 3587 {
3144 char *s; 3588 char *s;
3145 XFetchName (display->display, TermWin.parent[0], &s); 3589 XFetchName (xdisp, parent[0], &s);
3146 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);
3147 } 3592 }
3148 break; 3593 break;
3149 } 3594 }
3150} 3595}
3151#endif 3596#endif
3152 3597
3153/*----------------------------------------------------------------------*/ 3598/*----------------------------------------------------------------------*/
3154/* 3599/*
3155 * get input up until STRING TERMINATOR (or BEL) 3600 * get input up until STRING TERMINATOR (or BEL)
3156 * ends_how is terminator used. returned input must be free()'d 3601 * ends_how is terminator used. returned input must be free()'d
3157 */ 3602 */
3158unsigned char * 3603char *
3159rxvt_term::get_to_st (unicode_t &ends_how) 3604rxvt_term::get_to_st (unicode_t &ends_how)
3160{ 3605{
3161 unicode_t prev = 0, ch; 3606 unicode_t ch;
3607 bool seen_esc = false;
3162 unsigned int n = 0; 3608 unsigned int n = 0;
3163 unsigned char *s;
3164 unsigned char string[STRING_MAX]; 3609 wchar_t string[STRING_MAX];
3165 3610
3166 while ((ch = cmd_getc ()) != NOCHAR) 3611 while ((ch = cmd_getc ()) != NOCHAR)
3167 { 3612 {
3168 if (prev == C0_ESC) 3613 if (seen_esc)
3169 { 3614 {
3170 if (ch == 0x5c) /* 7bit ST */ 3615 if (ch == 0x5c) /* 7bit ST */
3171 break; 3616 break;
3172 else 3617 else
3173 return NULL; 3618 return NULL;
3174 } 3619 }
3620 else if (ch == C0_ESC)
3621 {
3622 seen_esc = true;
3623 continue;
3624 }
3175 else if (ch == C0_BEL || ch == CHAR_ST) 3625 else if (ch == C0_BEL || ch == CHAR_ST)
3176 break; 3626 break;
3177 else if (ch < 0x20) 3627 else if (ch < 0x20)
3178 return NULL; /* other control character - exit */ 3628 return NULL; /* other control character - exit */
3179 3629
3180 if (n >= sizeof (string) - 1) 3630 seen_esc = false;
3631
3632 if (n >= STRING_MAX - 1)
3181 // stop at some sane length 3633 // stop at some sane length
3182 return NULL; 3634 return NULL;
3183 3635
3184 if (ch == C0_SYN) 3636 if (ch == C0_SYN)
3185 {
3186 string[n++] = cmd_get8 (); 3637 string[n++] = cmd_get8 ();
3187 prev = 0;
3188 }
3189 else 3638 else
3190 string[n++] = prev = ch; 3639 string[n++] = ch;
3191 } 3640 }
3192 3641
3193 string[n++] = '\0'; 3642 string[n++] = '\0';
3194 3643
3195 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3196 return NULL;
3197
3198 ends_how = (ch == 0x5c ? C0_ESC : ch); 3644 ends_how = (ch == 0x5c ? C0_ESC : ch);
3199 STRNCPY (s, string, n); 3645
3200 return s; 3646 return rxvt_wcstombs (string);
3201} 3647}
3202 3648
3203/*----------------------------------------------------------------------*/ 3649/*----------------------------------------------------------------------*/
3204/* 3650/*
3205 * 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)'
3206 */ 3652 */
3207void 3653void
3208rxvt_term::process_dcs_seq () 3654rxvt_term::process_dcs_seq ()
3209{ 3655{
3210 unsigned char *s; 3656 char *s;
3211 unicode_t eh; 3657 unicode_t eh;
3212 3658
3213 /* 3659 /*
3214 * Not handled yet 3660 * Not handled yet
3215 */ 3661 */
… …
3234 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3680 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3235 arg = arg * 10 + (ch - '0'); 3681 arg = arg * 10 + (ch - '0');
3236 3682
3237 if (ch == ';') 3683 if (ch == ';')
3238 { 3684 {
3239 unsigned char *s = get_to_st (eh); 3685 char *s = get_to_st (eh);
3240 3686
3241 if (s) 3687 if (s)
3242 { 3688 {
3243 process_xterm_seq (arg, (char *)s, eh); 3689 process_xterm_seq (arg, s, eh);
3244 free (s); 3690 free (s);
3245 } 3691 }
3246 } 3692 }
3247} 3693}
3248 3694
3249void 3695void
3250rxvt_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)
3251{ 3697{
3252 if (str[0] == '?' && !str[1]) 3698 if (str[0] == '?' && !str[1])
3253 { 3699 {
3254 if (Options & Opt_insecure) 3700 rgba c;
3255 { 3701 pix_colors_focused[color].get (c);
3256 unsigned short r, g, b; 3702
3257 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
3258 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);
3259 }
3260 } 3709 }
3261 else 3710 else
3262 set_window_color (color, str); 3711 set_window_color (color, str);
3263} 3712}
3264 3713
3265/* 3714/*
3266 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3715 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3267 * 0 = change iconName/title
3268 * 1 = change iconName
3269 * 2 = change title
3270 * 4 = change color
3271 * 10 = change fg color
3272 * 11 = change bg color
3273 * 12 = change text color
3274 * 13 = change mouse foreground color
3275 * 17 = change highlight character colour
3276 * 18 = change bold character color
3277 * 19 = change underlined character color
3278 * 46 = change logfile (not implemented)
3279 * 50 = change font
3280 *
3281 * rxvt extensions:
3282 * 20 = bg pixmap
3283 * 39 = change default fg color
3284 * 49 = change default bg color
3285 * 55 = dump scrollback buffer and all of screen
3286 * 701 = change locale
3287 * 702 = find font
3288 * 703 = menu
3289 */ 3716 */
3290void 3717void
3291rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3718rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3292{ 3719{
3293 int changed = 0;
3294 int color; 3720 int color;
3295 char *buf, *name; 3721 char *buf, *name;
3296 bool query = str[0] == '?' && !str[1]; 3722 bool query = str[0] == '?' && !str[1];
3723 int saveop = op;
3724
3725 dLocal (Display *, xdisp);
3297 3726
3298 assert (str != NULL); 3727 assert (str != NULL);
3299 switch (op) 3728 switch (op)
3300 { 3729 {
3301 case XTerm_name: 3730 case XTerm_name:
… …
3308 set_title (str); 3737 set_title (str);
3309 break; 3738 break;
3310 case XTerm_property: 3739 case XTerm_property:
3311 if (str[0] == '?') 3740 if (str[0] == '?')
3312 { 3741 {
3313 Atom prop = XInternAtom (display->display, str + 1, True); 3742 Atom prop = display->atom (str + 1);
3314 Atom actual_type; 3743 Atom actual_type;
3315 int actual_format; 3744 int actual_format;
3316 unsigned long nitems; 3745 unsigned long nitems;
3317 unsigned long bytes_after; 3746 unsigned long bytes_after;
3318 unsigned char *value = 0; 3747 unsigned char *value = 0;
3319 const char *str = ""; 3748 const char *str = "";
3320 3749
3321 if (prop 3750 if (prop
3322 && XGetWindowProperty (display->display, TermWin.parent[0], 3751 && XGetWindowProperty (xdisp, parent[0],
3323 prop, 0, 1<<16, 0, AnyPropertyType, 3752 prop, 0, 1<<16, 0, AnyPropertyType,
3324 &actual_type, &actual_format, 3753 &actual_type, &actual_format,
3325 &nitems, &bytes_after, &value) == Success 3754 &nitems, &bytes_after, &value) == Success
3326 && actual_type != None 3755 && actual_type != None
3327 && actual_format == 8) 3756 && actual_format == 8)
3328 str = (const char *)(value); 3757 str = (const char *)(value);
3329 3758
3330 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3759 tt_printf ("\033]%d;%s%c", op, str, resp);
3331 3760
3332 XFree (value); 3761 XFree (value);
3333 } 3762 }
3334 else 3763 else
3335 { 3764 {
3336 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3765 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3337 3766
3338 if (eq) 3767 if (eq)
3339 { 3768 {
3340 *eq = 0; 3769 *eq = 0;
3341 XChangeProperty (display->display, TermWin.parent[0], 3770 set_utf8_property (display->atom (str), eq + 1);
3342 display->atom (str), XA_STRING, 8,
3343 PropModeReplace, (unsigned char *)eq + 1,
3344 strlen (eq + 1));
3345 } 3771 }
3346 else 3772 else
3347 XDeleteProperty (display->display, TermWin.parent[0], 3773 XDeleteProperty (xdisp, parent[0],
3348 display->atom (str)); 3774 display->atom (str));
3349 } 3775 }
3350 break; 3776 break;
3351 3777
3352 case XTerm_Color: 3778 case XTerm_Color:
3353 for (buf = (char *)str; buf && *buf;) 3779 for (buf = (char *)str; buf && *buf;)
3354 { 3780 {
3355 if ((name = STRCHR (buf, ';')) == NULL) 3781 if ((name = strchr (buf, ';')) == NULL)
3356 break; 3782 break;
3357 3783
3358 *name++ = '\0'; 3784 *name++ = '\0';
3359 color = atoi (buf); 3785 color = atoi (buf) + minCOLOR;
3360 3786
3361 if (color < 0 || color >= TOTAL_COLORS) 3787 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3362 break; 3788 break;
3363 3789
3364 if ((buf = STRCHR (name, ';')) != NULL) 3790 if ((buf = strchr (name, ';')) != NULL)
3365 *buf++ = '\0'; 3791 *buf++ = '\0';
3366 3792
3367 if (name[0] == '?' && !name[1]) 3793 process_color_seq (op, color, name, resp);
3368 {
3369 if (Options & Opt_insecure)
3370 {
3371 unsigned short r, g, b;
3372 PixColors[color + minCOLOR].get (display, r, g, b);
3373 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3374 }
3375 }
3376 else
3377 set_window_color (color + minCOLOR, name);
3378 } 3794 }
3379 break; 3795 break;
3380 case XTerm_Color00: 3796 case XTerm_Color00:
3381 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3797 process_color_seq (op, Color_fg, str, resp);
3382 break; 3798 break;
3383 case XTerm_Color01: 3799 case XTerm_Color01:
3384 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3800 process_color_seq (op, Color_bg, str, resp);
3385 break; 3801 break;
3386#ifndef NO_CURSORCOLOR 3802#ifndef NO_CURSORCOLOR
3387 case XTerm_Color_cursor: 3803 case XTerm_Color_cursor:
3388 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3804 process_color_seq (op, Color_cursor, str, resp);
3389 break; 3805 break;
3390#endif 3806#endif
3391 case XTerm_Color_pointer_fg: 3807 case XTerm_Color_pointer_fg:
3392 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3808 process_color_seq (op, Color_pointer_fg, str, resp);
3393 break; 3809 break;
3394 case XTerm_Color_pointer_bg: 3810 case XTerm_Color_pointer_bg:
3395 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3811 process_color_seq (op, Color_pointer_bg, str, resp);
3396 break; 3812 break;
3397#ifndef NO_BOLD_UNDERLINE_REVERSE 3813#ifndef NO_BOLD_UNDERLINE_REVERSE
3398 case XTerm_Color_BD:
3399 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3400 break;
3401 case XTerm_Color_UL:
3402 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3403 break;
3404 case XTerm_Color_RV: 3814 case XTerm_Color_RV:
3405 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3815 process_color_seq (op, Color_RV, str, resp);
3406 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;
3407#endif 3828#endif
3829#if TRANSPARENT && TINTING
3830 case URxvt_Color_tint:
3831 process_color_seq (op, Color_tint, str, resp);
3408 3832
3833 check_our_parents ();
3834
3835 if (am_transparent)
3836 want_full_refresh = want_refresh = 1;
3837
3838 break;
3839#endif
3840
3409 case XTerm_Pixmap: 3841 case Rxvt_Pixmap:
3842 {
3410 if (*str != ';') 3843 if (*str != ';')
3411 { 3844 {
3412#if XPM_BACKGROUND 3845#if XPM_BACKGROUND
3413 scale_pixmap (""); /* reset to default scaling */ 3846 scale_pixmap (""); /* reset to default scaling */
3414 set_bgPixmap (str); /* change pixmap */ 3847 set_bgPixmap (str); /* change pixmap */
3415#endif
3416 scr_touch (true); 3848 scr_touch (true);
3849#endif
3417 } 3850 }
3851
3852 int changed = 0;
3853
3418 while ((str = STRCHR (str, ';')) != NULL) 3854 while ((str = strchr (str, ';')) != NULL)
3419 { 3855 {
3420 str++; 3856 str++;
3421#if XPM_BACKGROUND 3857#if XPM_BACKGROUND
3422 changed += scale_pixmap (str); 3858 changed += scale_pixmap (str);
3423#endif 3859#endif
3424
3425 } 3860 }
3861
3426 if (changed) 3862 if (changed)
3427 { 3863 {
3428#ifdef XPM_BACKGROUND 3864#ifdef XPM_BACKGROUND
3429 resize_pixmap (); 3865 resize_pixmap ();
3430#endif
3431 scr_touch (true); 3866 scr_touch (true);
3867#endif
3432 } 3868 }
3869 }
3433 break; 3870 break;
3434 3871
3435 case XTerm_restoreFG: 3872 case Rxvt_restoreFG:
3436 set_window_color (Color_fg, str); 3873 set_window_color (Color_fg, str);
3437 break; 3874 break;
3438 case XTerm_restoreBG: 3875 case Rxvt_restoreBG:
3439 set_window_color (Color_bg, str); 3876 set_window_color (Color_bg, str);
3440 break; 3877 break;
3441 3878
3442 case XTerm_logfile: 3879 case XTerm_logfile:
3443 // TODO, when secure mode? 3880 // TODO, when secure mode?
3444 break; 3881 break;
3445 3882
3446 case XTerm_font:
3447 if (query)
3448 {
3449 if (Options & Opt_insecure)
3450 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3451 TermWin.fontset->fontdesc
3452 ? TermWin.fontset->fontdesc
3453 : "",
3454 resp);
3455 }
3456 else
3457 change_font (str);
3458 break;
3459
3460#ifndef NO_FRILLS
3461 case XTerm_locale:
3462 if (query)
3463 {
3464 if (Options & Opt_insecure)
3465 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3466 }
3467 else
3468 {
3469 set_locale (str);
3470# ifdef USE_XIM
3471 im_cb ();
3472# endif
3473 }
3474 break;
3475
3476 case XTerm_findfont:
3477 if (Options & Opt_insecure)
3478 {
3479 int fid = TermWin.fontset->find_font (atoi (str));
3480 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3481 fid, (*TermWin.fontset)[fid]->name, resp);
3482 }
3483 break;
3484#endif
3485
3486#ifdef MENUBAR
3487 case XTerm_Menu:
3488 if (Options & Opt_insecure)
3489 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3490 break;
3491#endif
3492#if 0 3883#if 0
3493 case XTerm_dumpscreen: /* no error notices */ 3884 case Rxvt_dumpscreen: /* no error notices */
3494 { 3885 {
3495 int fd; 3886 int fd;
3496 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)
3497 { 3888 {
3498 scr_dump (fd); 3889 scr_dump (fd);
3499 close (fd); 3890 close (fd);
3500 } 3891 }
3501 } 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
3502 break; 3956 break;
3503#endif 3957#endif
3504 } 3958 }
3505} 3959}
3506/*----------------------------------------------------------------------*/ 3960/*----------------------------------------------------------------------*/
… …
3520{ 3974{
3521 int state; 3975 int state;
3522 3976
3523 if (mode == 's') 3977 if (mode == 's')
3524 { 3978 {
3525 SavedModes |= (PrivateModes & bit); 3979 SavedModes |= (priv_modes & bit);
3526 return -1; 3980 return -1;
3527 } 3981 }
3528 else 3982 else
3529 { 3983 {
3530 if (mode == 'r') 3984 if (mode == 'r')
3531 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3985 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3532 else 3986 else
3533 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3987 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3534 PrivMode (state, bit); 3988 PrivMode (state, bit);
3535 } 3989 }
3536 3990
3537 return state; 3991 return state;
3538} 3992}
3539 3993
3540/* we're not using priv _yet_ */ 3994/* we're not using priv _yet_ */
3541void 3995void
3542rxvt_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)
3543{ 3997{
3544 unsigned int i, j; 3998 unsigned int i, j;
3545 int state; 3999 int state;
3546 4000
3547 static const struct 4001 static const struct
… …
3556 { 3, PrivMode_132 }, 4010 { 3, PrivMode_132 },
3557 { 4, PrivMode_smoothScroll }, 4011 { 4, PrivMode_smoothScroll },
3558 { 5, PrivMode_rVideo }, 4012 { 5, PrivMode_rVideo },
3559 { 6, PrivMode_relOrigin }, 4013 { 6, PrivMode_relOrigin },
3560 { 7, PrivMode_Autowrap }, 4014 { 7, PrivMode_Autowrap },
4015 // 8, bi-directional support mode
3561 { 9, PrivMode_MouseX10 }, 4016 { 9, PrivMode_MouseX10 },
3562#ifdef menuBar_esc 4017 // 18, 19 printing-related
3563 { menuBar_esc, PrivMode_menuBar }, 4018 { 25, PrivMode_VisibleCursor },
3564#endif
3565#ifdef scrollBar_esc 4019#ifdef scrollBar_esc
3566 { scrollBar_esc, PrivMode_scrollBar }, 4020 { scrollBar_esc, PrivMode_scrollBar },
3567#endif 4021#endif
3568 // 18, 19 printing-related
3569 { 25, PrivMode_VisibleCursor },
3570 // 30 show scrollbar rxvt. extension
3571 { 35, PrivMode_ShiftKeys }, // rxvt extension 4022 { 35, PrivMode_ShiftKeys }, // rxvt extension
3572 { 40, PrivMode_132OK }, 4023 { 40, PrivMode_132OK },
3573 // 41 xterm more fixes NYI 4024 // 41 xterm more fixes NYI
3574 // 45 margin bell NYI 4025 // 45 margin bell NYI
3575 // 46 start logging 4026 // 46 start logging
… …
3615 } 4066 }
3616 4067
3617 /* extra handling for values with state unkept */ 4068 /* extra handling for values with state unkept */
3618 switch (arg[i]) 4069 switch (arg[i])
3619 { 4070 {
4071#if ENABLE_STYLES
4072 case 1021:
4073 set_option (Opt_intensityStyles, mode);
4074
4075 scr_touch (true);
4076 break;
4077#endif
3620 case 1048: /* alternative cursor save */ 4078 case 1048: /* alternative cursor save */
4079 case 1049:
3621 if (Options & Opt_secondaryScreen) 4080 if (OPTION (Opt_secondaryScreen))
3622 if (mode == 0) 4081 if (mode == 0)
3623 scr_cursor (RESTORE); 4082 scr_cursor (RESTORE);
3624 else if (mode == 1) 4083 else if (mode == 1)
3625 scr_cursor (SAVE); 4084 scr_cursor (SAVE);
3626 break; 4085 break;
… …
3637 * within VT52 mode 4096 * within VT52 mode
3638 */ 4097 */
3639 PrivMode (1, PrivMode_vt52); 4098 PrivMode (1, PrivMode_vt52);
3640 break; 4099 break;
3641 case 3: /* 80/132 */ 4100 case 3: /* 80/132 */
3642 if (PrivateModes & PrivMode_132OK) 4101 if (priv_modes & PrivMode_132OK)
3643 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4102 set_widthheight (((state ? 132 : 80) * fwidth), height);
3644 break; 4103 break;
3645 case 4: /* smooth scrolling */ 4104 case 4: /* smooth scrolling */
3646 if (state) 4105 set_option (Opt_jumpScroll, !state);
3647 Options &= ~Opt_jumpScroll;
3648 else
3649 Options |= Opt_jumpScroll;
3650 break; 4106 break;
3651 case 5: /* reverse video */ 4107 case 5: /* reverse video */
3652 scr_rvideo_mode (state); 4108 scr_rvideo_mode (state);
3653 break; 4109 break;
3654 case 6: /* relative/absolute origins */ 4110 case 6: /* relative/absolute origins */
… …
3658 scr_autowrap (state); 4114 scr_autowrap (state);
3659 break; 4115 break;
3660 /* 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 */
3661 case 9: /* X10 mouse reporting */ 4117 case 9: /* X10 mouse reporting */
3662 if (state) /* orthogonal */ 4118 if (state) /* orthogonal */
3663 PrivateModes &= ~PrivMode_MouseX11; 4119 priv_modes &= ~PrivMode_MouseX11;
3664 break; 4120 break;
3665#ifdef menuBar_esc
3666 case menuBar_esc:
3667#ifdef MENUBAR
3668 map_menuBar (state);
3669#endif
3670 break;
3671#endif
3672#ifdef scrollBar_esc 4121#ifdef scrollBar_esc
3673 case scrollBar_esc: 4122 case scrollBar_esc:
3674 if (scrollbar_mapping (state)) 4123 if (scrollbar_mapping (state))
3675 { 4124 {
3676 resize_all_windows (0, 0, 0); 4125 resize_all_windows (0, 0, 0);
… …
3688 break; 4137 break;
3689 /* case 66: - application key pad */ 4138 /* case 66: - application key pad */
3690 /* case 67: - backspace key */ 4139 /* case 67: - backspace key */
3691 case 1000: /* X11 mouse reporting */ 4140 case 1000: /* X11 mouse reporting */
3692 if (state) /* orthogonal */ 4141 if (state) /* orthogonal */
3693 PrivateModes &= ~PrivMode_MouseX10; 4142 priv_modes &= ~PrivMode_MouseX10;
3694 break; 4143 break;
3695#if 0 4144#if 0
3696 case 1001: 4145 case 1001:
3697 break; /* X11 mouse highlighting */ 4146 break; /* X11 mouse highlighting */
3698#endif 4147#endif
3699 case 1010: /* scroll to bottom on TTY output inhibit */ 4148 case 1010: /* scroll to bottom on TTY output inhibit */
3700 if (state)
3701 Options &= ~Opt_scrollTtyOutput;
3702 else
3703 Options |= Opt_scrollTtyOutput; 4149 set_option (Opt_scrollTtyOutput, !state);
3704 break; 4150 break;
3705 case 1011: /* scroll to bottom on key press */ 4151 case 1011: /* scroll to bottom on key press */
3706 if (state)
3707 Options |= Opt_scrollTtyKeypress; 4152 set_option (Opt_scrollTtyKeypress, state);
3708 else
3709 Options &= ~Opt_scrollTtyKeypress;
3710 break; 4153 break;
3711 case 1047: /* secondary screen w/ clearing last */ 4154 case 1047: /* secondary screen w/ clearing last */
3712 if (Options & Opt_secondaryScreen) 4155 if (OPTION (Opt_secondaryScreen))
3713 if (current_screen != PRIMARY) 4156 if (current_screen != PRIMARY)
3714 scr_erase_screen (2); 4157 scr_erase_screen (2);
3715 scr_change_screen (state); 4158 scr_change_screen (state);
3716 break; 4159 break;
3717 case 1049: /* secondary screen w/ clearing first */ 4160 case 1049: /* secondary screen w/ clearing first */
3718 scr_change_screen (state); 4161 scr_change_screen (state);
3719 if (Options & Opt_secondaryScreen) 4162 if (OPTION (Opt_secondaryScreen))
3720 if (current_screen != PRIMARY) 4163 if (current_screen != PRIMARY)
3721 scr_erase_screen (2); 4164 scr_erase_screen (2);
3722 break; 4165 break;
3723 default: 4166 default:
3724 break; 4167 break;
… …
3750 rendset = 0, rendstyle = ~RS_None; 4193 rendset = 0, rendstyle = ~RS_None;
3751 break; 4194 break;
3752 case 1: 4195 case 1:
3753 rendset = 1, rendstyle = RS_Bold; 4196 rendset = 1, rendstyle = RS_Bold;
3754 break; 4197 break;
4198 //case 2: // low intensity
4199 case 3:
4200 rendset = 1, rendstyle = RS_Italic;
4201 break;
3755 case 4: 4202 case 4:
3756 rendset = 1, rendstyle = RS_Uline; 4203 rendset = 1, rendstyle = RS_Uline;
3757 break; 4204 break;
3758 case 5: 4205 case 5: // slowly blinking
4206 case 6: // rapidly blinking
3759 rendset = 1, rendstyle = RS_Blink; 4207 rendset = 1, rendstyle = RS_Blink;
3760 break; 4208 break;
3761 //case 6: // scoansi light background 4209 //case 6: // scoansi light background
3762 case 7: 4210 case 7:
3763 rendset = 1, rendstyle = RS_RVid; 4211 rendset = 1, rendstyle = RS_RVid;
3764 break; 4212 break;
3765 case 8: 4213 case 8:
3766 // invisible. NYI 4214 // invisible. NYI
3767 break; 4215 break;
4216 //case 9: // crossed out
3768 //case 10: // scoansi acs off 4217 //case 10: // scoansi acs off, primary font
3769 //case 11: // scoansi acs on 4218 //case 11: // scoansi acs on, first alt font
3770 //case 12: // scoansi acs on, |0x80 4219 //case 12: // scoansi acs on, |0x80, second alt font
3771 case 21: // disable bold, blink and invis (some terminals use this) 4220 //...
4221 //case 19: // ninth alt font
4222 //case 20: // gothic
4223 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3772 rendset = 0, rendstyle = RS_Bold | RS_Blink; 4224 rendset = 0, rendstyle = RS_Bold;
3773 break; 4225 break;
3774 case 22: 4226 case 22: // normal intensity
3775 rendset = 0, rendstyle = RS_Bold; 4227 rendset = 0, rendstyle = RS_Bold;
4228 break;
4229 case 23: // disable italic
4230 rendset = 0, rendstyle = RS_Italic;
3776 break; 4231 break;
3777 case 24: 4232 case 24:
3778 rendset = 0, rendstyle = RS_Uline; 4233 rendset = 0, rendstyle = RS_Uline;
3779 break; 4234 break;
3780 case 25: 4235 case 25:
3781 rendset = 0, rendstyle = RS_Blink; 4236 rendset = 0, rendstyle = RS_Blink;
3782 break; 4237 break;
4238 case 26: // variable spacing (iso 8613)
4239 rendset = 0, rendstyle = RS_Blink;
4240 break;
3783 case 27: 4241 case 27:
3784 rendset = 0, rendstyle = RS_RVid; 4242 rendset = 0, rendstyle = RS_RVid;
3785 break; 4243 break;
3786 case 28:
3787 // visible. NYI 4244 //case 28: // visible. NYI
3788 break; 4245 //case 29: // not crossed-out
3789 } 4246 }
3790 4247
3791 if (rendset != -1) 4248 if (rendset != -1)
3792 { 4249 {
3793 scr_rendition (rendset, rendstyle); 4250 scr_rendition (rendset, rendstyle);
… …
3804 case 35: 4261 case 35:
3805 case 36: 4262 case 36:
3806 case 37: 4263 case 37:
3807 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4264 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3808 break; 4265 break;
3809#ifdef TTY_256COLOR 4266 case 38: // set fg color, ISO 8613-6
3810 case 38:
3811 if (nargs > i + 2 && arg[i + 1] == 5) 4267 if (nargs > i + 2 && arg[i + 1] == 5)
3812 { 4268 {
3813 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4269 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3814 i += 2; 4270 i += 2;
3815 } 4271 }
3816 break; 4272 break;
3817#endif
3818 case 39: /* default fg */ 4273 case 39: /* default fg */
3819 scr_color (Color_fg, Color_fg); 4274 scr_color (Color_fg, Color_fg);
3820 break; 4275 break;
3821 4276
3822 case 40: 4277 case 40:
… …
3827 case 45: 4282 case 45:
3828 case 46: 4283 case 46:
3829 case 47: 4284 case 47:
3830 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4285 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3831 break; 4286 break;
3832#ifdef TTY_256COLOR 4287 case 48: // set bg color, ISO 8613-6
3833 case 48:
3834 if (nargs > i + 2 && arg[i + 1] == 5) 4288 if (nargs > i + 2 && arg[i + 1] == 5)
3835 { 4289 {
3836 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4290 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3837 i += 2; 4291 i += 2;
3838 } 4292 }
3839 break; 4293 break;
3840#endif
3841 case 49: /* default bg */ 4294 case 49: /* default bg */
3842 scr_color (Color_bg, Color_bg); 4295 scr_color (Color_bg, Color_bg);
3843 break; 4296 break;
3844 4297
3845#ifndef NO_BRIGHTCOLOR 4298 //case 50: // not variable spacing
4299
4300#if !ENABLE_MINIMAL
3846 case 90: 4301 case 90:
3847 case 91: /* set bright fg color */ 4302 case 91: /* set bright fg color */
3848 case 92: 4303 case 92:
3849 case 93: 4304 case 93:
3850 case 94: 4305 case 94:
3851 case 95: 4306 case 95:
3852 case 96: 4307 case 96:
3853 case 97: 4308 case 97:
3854 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4309 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3855 Color_fg);
3856 break; 4310 break;
3857 case 100: 4311 case 100:
3858 case 101: /* set bright bg color */ 4312 case 101: /* set bright bg color */
3859 case 102: 4313 case 102:
3860 case 103: 4314 case 103:
3861 case 104: 4315 case 104:
3862 case 105: 4316 case 105:
3863 case 106: 4317 case 106:
3864 case 107: 4318 case 107:
3865 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4319 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3866 Color_bg);
3867 break; 4320 break;
3868#endif 4321#endif
3869
3870 } 4322 }
3871 } 4323 }
3872} 4324}
3873/*}}} */ 4325/*}}} */
3874 4326
… …
3878{ 4330{
3879 unicode_t ch, cmd = cmd_getc (); 4331 unicode_t ch, cmd = cmd_getc ();
3880 4332
3881 if (cmd == 'Q') 4333 if (cmd == 'Q')
3882 { /* query graphics */ 4334 { /* query graphics */
3883 tt_printf ("\033G0\n"); /* no graphics */ 4335 tt_printf ("\033G0\012"); /* no graphics */
3884 return; 4336 return;
3885 } 4337 }
3886 /* swallow other graphics sequences until terminating ':' */ 4338 /* swallow other graphics sequences until terminating ':' */
3887 do 4339 do
3888 ch = cmd_getc (); 4340 ch = cmd_getc ();
… …
3898 */ 4350 */
3899void 4351void
3900rxvt_term::tt_printf (const char *fmt,...) 4352rxvt_term::tt_printf (const char *fmt,...)
3901{ 4353{
3902 va_list arg_ptr; 4354 va_list arg_ptr;
3903 unsigned char buf[256]; 4355 char buf[256];
3904 4356
3905 va_start (arg_ptr, fmt); 4357 va_start (arg_ptr, fmt);
3906 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4358 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3907 va_end (arg_ptr); 4359 va_end (arg_ptr);
3908 tt_write (buf, STRLEN (buf)); 4360 tt_write (buf, strlen (buf));
3909} 4361}
3910 4362
3911/* ---------------------------------------------------------------------- */ 4363/* ---------------------------------------------------------------------- */
3912/* 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,
3913 * or generated by us in response to a query ESC sequence. 4365 * or generated by us in response to a query ESC sequence.
3914 */ 4366 */
4367const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4368
3915void 4369void
3916rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4370rxvt_term::tt_write (const char *data, unsigned int len)
3917{ 4371{
3918 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;
3919 4374
3920 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;
3921 { 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
3922 if (v_buflen == 0) 4405 if (v_buflen == 0)
3923 { 4406 {
3924 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3925
3926 if ((unsigned int)written == len)
3927 return;
3928
3929 data += written;
3930 len -= written;
3931 }
3932
3933
3934 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3935
3936 memcpy (v_buffer + v_buflen, data, len);
3937 v_buflen += len;
3938 }
3939
3940 for (;;)
3941 {
3942 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3943
3944 if (written > 0)
3945 {
3946 v_buflen -= written;
3947
3948 if (v_buflen == 0)
3949 {
3950 free (v_buffer); 4407 free (v_buffer);
3951 v_buffer = 0; 4408 v_buffer = 0;
3952 v_buflen = 0; 4409 v_buflen = 0;
3953 4410
3954 pty_ev.set (EVENT_READ); 4411 pty_ev.set (EVENT_READ);
3955 return;
3956 }
3957
3958 memmove (v_buffer, v_buffer + written, v_buflen);
3959 }
3960 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3961 // original code just ignores this...
3962 destroy ();
3963 else
3964 {
3965 pty_ev.set (EVENT_READ | EVENT_WRITE);
3966 return; 4412 return;
3967 } 4413 }
4414
4415 memmove (v_buffer, v_buffer + written, v_buflen);
3968 } 4416 }
4417 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4418 pty_ev.set (EVENT_READ);
3969} 4419}
3970 4420
3971/*----------------------- end-of-file (C source) -----------------------*/ 4421/*----------------------- end-of-file (C source) -----------------------*/
3972 4422

Diff Legend

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