ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

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

Diff Legend

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