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

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

Diff Legend

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