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

Diff Legend

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