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

Diff Legend

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