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

Diff Legend

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