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.303 by root, Tue Jan 31 21:47:56 2006 UTC

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

Diff Legend

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