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.145 by root, Mon Aug 16 12:04:57 2004 UTC vs.
Revision 1.409 by ayin, Sat Feb 16 15:39:20 2008 UTC

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

Diff Legend

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