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.277 by root, Fri Jan 20 12:16:28 2006 UTC

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

Diff Legend

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