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

Diff Legend

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