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.93 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.278 by root, Fri Jan 20 18:50:49 2006 UTC

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

Diff Legend

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