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

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

Diff Legend

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