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

Diff Legend

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