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.107 by root, Sat Jul 31 00:01:12 2004 UTC vs.
Revision 1.304 by root, Tue Jan 31 22:01:25 2006 UTC

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

Diff Legend

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