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

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

Diff Legend

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