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

Diff Legend

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