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.304 by root, Tue Jan 31 22:01:25 2006 UTC

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

Diff Legend

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