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.198 by root, Sat Feb 19 01:07:58 2005 UTC vs.
Revision 1.475 by sf-exg, Tue Feb 1 00:41:01 2011 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 (bg_flags & BG_NEEDS_REFRESH)
931 { 981 {
932 want_full_refresh = 0; 982 bg_flags &= ~BG_NEEDS_REFRESH;
933 scr_clear ();
934 scr_touch (false); 983 scr_touch (false);
935 } 984 }
936#endif 985#endif
937 986
938 if (want_refresh) 987 if (want_refresh)
939 { 988 {
989 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
990 {
991 int row = view_start;
992 int end_row = row + nrow;
993
994 while (row > top_row && ROW (row - 1).is_longer ())
995 --row;
996
997 do
998 {
999 int start_row = row;
1000 line_t *l;
1001
1002 do
1003 {
1004 l = &ROW (row++);
1005
1006 if (!(l->f & LINE_FILTERED))
1007 {
1008 // line not filtered, mark it as filtered
1009 l->f |= LINE_FILTERED;
1010 while (l->is_longer ())
1011 {
1012 l = &ROW (row++);
1013 l->f |= LINE_FILTERED;
1014 }
1015
1016 // and filter it
1017 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1018
1019 break;
1020 }
1021 }
1022 while (l->is_longer () && row < end_row);
1023 }
1024 while (row < end_row);
1025 }
1026
940 scr_refresh (refresh_type); 1027 scr_refresh ();
941 scrollbar_show (1); 1028 scrollBar.show (1);
942#ifdef USE_XIM 1029#ifdef USE_XIM
943 IMSendSpot (); 1030 IMSendSpot ();
944#endif 1031#endif
945 } 1032 }
946 1033
947 display->flush (); 1034 display->flush ();
948} 1035}
949 1036
1037/* checks whether a refresh is requested and starts the refresh timer */
950void 1038void
951rxvt_term::check_cb (check_watcher &w) 1039rxvt_term::refresh_check ()
952{ 1040{
953 SET_R (this); 1041 if (want_refresh && !flush_ev.is_active ())
954 SET_LOCALE (locale); 1042 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
955 1043
956 display->flush (); 1044 display->flush ();
957
958 if (want_refresh && !flush_ev.active)
959 flush_ev.start (NOW + 0.01);
960} 1045}
961 1046
962void 1047void
963rxvt_term::flush_cb (time_watcher &w) 1048rxvt_term::flush_cb (ev::timer &w, int revents)
964{ 1049{
965 SET_R (this); 1050 make_current ();
966 SET_LOCALE (locale);
967 1051
968 refresh_limit = 1;
969 refresh_count = 0; 1052 refresh_count = 0;
970 flush (); 1053 flush ();
971} 1054}
972 1055
973#ifdef CURSOR_BLINK 1056#ifdef CURSOR_BLINK
974void 1057void
975rxvt_term::cursor_blink_cb (time_watcher &w) 1058rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
976{ 1059{
977 hidden_cursor = !hidden_cursor; 1060 hidden_cursor = !hidden_cursor;
978 want_refresh = 1; 1061 want_refresh = 1;
979 1062 refresh_check ();
980 w.start (w.at + BLINK_INTERVAL);
981} 1063}
982#endif 1064#endif
983 1065
984#ifdef TEXT_BLINK 1066#ifdef TEXT_BLINK
985void 1067void
986rxvt_term::text_blink_cb (time_watcher &w) 1068rxvt_term::text_blink_cb (ev::timer &w, int revents)
987{ 1069{
988 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1070 if (scr_refresh_rend (RS_Blink, RS_Blink))
989 { 1071 {
990 hidden_text = !hidden_text; 1072 hidden_text = !hidden_text;
991 want_refresh = 1; 1073 want_refresh = 1;
992 w.start (w.at + TEXT_BLINK_INTERVAL); 1074 refresh_check ();
993 } 1075 }
1076 else
1077 w.stop ();
994} 1078}
995#endif 1079#endif
996 1080
997#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1081#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
998void 1082void
999rxvt_term::cont_scroll_cb (time_watcher &w) 1083rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1000{ 1084{
1001 if ((scrollbar_isUp() || scrollbar_isDn()) && 1085 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1002 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1086 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1003 { 1087 {
1004 refresh_type |= SMOOTH_REFRESH;
1005 want_refresh = 1; 1088 want_refresh = 1;
1006 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1089 refresh_check ();
1007 } 1090 }
1091 else
1092 w.stop ();
1008} 1093}
1009#endif 1094#endif
1010 1095
1011#ifdef SELECTION_SCROLLING 1096#ifdef SELECTION_SCROLLING
1012void 1097void
1013rxvt_term::sel_scroll_cb (time_watcher &w) 1098rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1014{ 1099{
1015 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1100 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1016 { 1101 {
1017 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1102 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1018 refresh_type |= SMOOTH_REFRESH;
1019 want_refresh = 1; 1103 want_refresh = 1;
1020 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1104 refresh_check ();
1021 } 1105 }
1106 else
1107 w.stop ();
1022} 1108}
1023#endif 1109#endif
1024 1110
1025#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1111#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1026void 1112void
1027rxvt_term::slip_wheel_cb (time_watcher &w) 1113rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1028{ 1114{
1029 if (mouse_slip_wheel_speed == 0 1115 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 { 1116 {
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; 1117 want_refresh = 1;
1039 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1118 refresh_check ();
1119 }
1120
1121 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1040 } 1122 {
1123 mouse_slip_wheel_speed = 0;
1124 w.stop ();
1125 }
1041} 1126}
1127#endif
1128
1129#if LINUX_YIELD_HACK
1130static struct event_handler
1131{
1132 ev::prepare yield_ev;
1133
1134 void yield_cb (ev::prepare &w, int revents)
1135 {
1136 // this should really be sched_yield(), but the linux guys thought
1137 // that giving a process calling sched_yield () less cpu time than
1138 // ones with high nice levels is a useful thing to do. It surely is is
1139 // allowed by the sus... as is returning ENOSYS.
1140 // since the linux guys additionally thought that breaking the only
1141 // known workaround against their unusable sched_yield hack is cool,
1142 // we just nanosleep a bit and hope for the best.
1143
1144 struct timespec ts = { 0, 1000 };
1145 nanosleep (&ts, 0);
1146
1147 w.stop ();
1148 }
1149
1150 event_handler ()
1151 : yield_ev (this, &event_handler::yield_cb)
1152 {
1153 }
1154} event_handler;
1042#endif 1155#endif
1043 1156
1044bool 1157bool
1045rxvt_term::pty_fill () 1158rxvt_term::pty_fill ()
1046{ 1159{
1047 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1160 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1048 1161
1049 if (CBUFSIZ == n) 1162 if (CBUFSIZ == n)
1050 { 1163 {
1051 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1164 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1052 n = 0; 1165 n = 0;
1053 } 1166 }
1054 1167
1055 memmove (cmdbuf_base, cmdbuf_ptr, n); 1168 memmove (cmdbuf_base, cmdbuf_ptr, n);
1056 cmdbuf_ptr = cmdbuf_base; 1169 cmdbuf_ptr = cmdbuf_base;
1057 cmdbuf_endp = cmdbuf_ptr + n; 1170 cmdbuf_endp = cmdbuf_ptr + n;
1058 1171
1059 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1172 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1060 1173
1061 if (n > 0) 1174 if (r > 0)
1062 { 1175 {
1063 cmdbuf_endp += n; 1176 cmdbuf_endp += r;
1064 return true; 1177 return true;
1065 } 1178 }
1066 else if (n < 0 && errno != EAGAIN) 1179 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1180 {
1181#if LINUX_YIELD_HACK
1182 if (display->is_local)
1183 event_handler.yield_ev.start ();
1184#endif
1185 }
1186 else
1187 {
1188 pty_ev.stop ();
1189
1190 if (!option (Opt_hold))
1067 destroy (); 1191 destroy ();
1068 1192 }
1193
1069 return false; 1194 return false;
1070} 1195}
1071 1196
1072void 1197void
1073rxvt_term::pty_cb (io_watcher &w, short revents) 1198rxvt_term::pty_cb (ev::io &w, int revents)
1074{ 1199{
1075 SET_R (this); 1200 make_current ();
1076 SET_LOCALE (locale);
1077 1201
1078 if (revents & EVENT_READ) 1202 if (revents & ev::READ)
1079 // loop, but don't allow a single term to monopolize us 1203 // loop, but don't allow a single term to monopolize us
1080 while (pty_fill ()) 1204 for (int i = CBUFCNT; i-- && pty_fill (); )
1081 if (cmd_parse ()) 1205 cmd_parse ();
1082 break;
1083 1206
1084 if (revents & EVENT_WRITE) 1207 if (revents & ev::WRITE)
1085 pty_write (); 1208 pty_write ();
1209
1210 refresh_check ();
1086} 1211}
1087 1212
1088void 1213void
1089rxvt_term::pointer_unblank () 1214rxvt_term::pointer_unblank ()
1090{ 1215{
1091 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1216 XDefineCursor (dpy, vt, TermWin_cursor);
1092 recolour_cursor (); 1217 recolour_cursor ();
1093 1218
1094#ifdef POINTER_BLANK 1219#ifdef POINTER_BLANK
1095 hidden_pointer = 0; 1220 hidden_pointer = 0;
1096 1221
1097 if (options & Opt_pointerBlank) 1222 if (option (Opt_pointerBlank))
1098 pointer_ev.start (NOW + pointerBlankDelay); 1223 pointer_ev.start (pointerBlankDelay);
1099#endif 1224#endif
1100} 1225}
1101 1226
1102#ifdef POINTER_BLANK 1227#ifdef POINTER_BLANK
1103void 1228void
1104rxvt_term::pointer_blank () 1229rxvt_term::pointer_blank ()
1105{ 1230{
1106 if (! (options & Opt_pointerBlank)) 1231 if (!option (Opt_pointerBlank))
1107 return; 1232 return;
1108 1233
1109 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1234 XDefineCursor (dpy, vt, display->blank_cursor);
1110 XFlush (display->display); 1235 XFlush (dpy);
1111 1236
1112 hidden_pointer = 1; 1237 hidden_pointer = 1;
1113} 1238}
1114 1239
1115void 1240void
1116rxvt_term::pointer_cb (time_watcher &w) 1241rxvt_term::pointer_cb (ev::timer &w, int revents)
1117{ 1242{
1118 SET_R (this); 1243 make_current ();
1119 SET_LOCALE (locale);
1120 1244
1121 pointer_blank (); 1245 pointer_blank ();
1122} 1246}
1123#endif 1247#endif
1124 1248
1125void 1249void
1126rxvt_term::mouse_report (XButtonEvent &ev) 1250rxvt_term::mouse_report (XButtonEvent &ev)
1127{ 1251{
1128 int button_number, key_state = 0; 1252 int button_number, key_state = 0;
1129 int x, y; 1253 int x, y;
1254 int code = 32;
1130 1255
1131 x = ev.x; 1256 x = Pixel2Col (ev.x) + 1;
1132 y = ev.y; 1257 y = Pixel2Row (ev.y) + 1;
1133 pixel_position (&x, &y); 1258
1259 if (ev.type == MotionNotify)
1260 {
1261 if (x == mouse_row && y == mouse_col)
1262 return;
1263
1264 mouse_row = x;
1265 mouse_col = y;
1266 code += 32;
1267 }
1134 1268
1135 if (MEvent.button == AnyButton) 1269 if (MEvent.button == AnyButton)
1136 button_number = 3; 1270 button_number = 3;
1137 else 1271 else
1138 { 1272 {
1139 button_number = MEvent.button - Button1; 1273 button_number = MEvent.button - Button1;
1140 /* add 0x3D for wheel events, like xterm does */ 1274 /* add 0x3D for wheel events, like xterm does */
1141 if (button_number >= 3) 1275 if (button_number >= 3)
1142 button_number += (64 - 3); 1276 button_number += 64 - 3;
1143 } 1277 }
1144 1278
1145 if (priv_modes & PrivMode_MouseX10) 1279 if (priv_modes & PrivMode_MouseX10)
1146 { 1280 {
1147 /* 1281 /*
… …
1179 fputc ('A', stderr); 1313 fputc ('A', stderr);
1180 if (key_state & 32) 1314 if (key_state & 32)
1181 fputc ('2', stderr); 1315 fputc ('2', stderr);
1182 fprintf (stderr, "]: <%d>, %d/%d\n", 1316 fprintf (stderr, "]: <%d>, %d/%d\n",
1183 button_number, 1317 button_number,
1184 x + 1, 1318 x,
1185 y + 1); 1319 y);
1186#endif 1320#endif
1187 1321
1322#if ENABLE_FRILLS
1323 if (priv_modes & PrivMode_ExtMouseRight)
1324 tt_printf ("\033[%d;%d;%dM",
1325 code + button_number + key_state,
1326 x,
1327 y);
1328 else if (priv_modes & PrivMode_ExtModeMouse)
1329 tt_printf ("\033[M%c%lc%lc",
1330 code + button_number + key_state,
1331 wint_t (32 + x),
1332 wint_t (32 + y));
1333 else
1334#endif
1188 tt_printf ("\033[M%c%c%c", 1335 tt_printf ("\033[M%c%c%c",
1189 (32 + button_number + key_state), 1336 code + button_number + key_state,
1190 (32 + x + 1), 1337 32 + x,
1191 (32 + y + 1)); 1338 32 + y);
1192} 1339}
1193
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 1340
1204/*{{{ process an X event */ 1341/*{{{ process an X event */
1205void 1342void
1206rxvt_term::x_cb (XEvent &ev) 1343rxvt_term::x_cb (XEvent &ev)
1207{ 1344{
1208 dDisp; 1345 make_current ();
1209 1346
1210 SET_R (this); 1347 dLocal (Display *, dpy);
1211 SET_LOCALE (locale);
1212 1348
1213#if defined(CURSOR_BLINK) 1349 if (ev.xany.window == vt
1214 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1350 && SHOULD_INVOKE (HOOK_X_EVENT)
1215 { 1351 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1216 if (hidden_cursor) 1352 return;
1217 {
1218 hidden_cursor = 0;
1219 want_refresh = 1;
1220 }
1221 1353
1222 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1354 // 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; 1355 Window unused_root, unused_child;
1241 int unused_root_x, unused_root_y; 1356 int unused_root_x, unused_root_y;
1242 unsigned int unused_mask; 1357 unsigned int unused_mask;
1243 1358
1244 switch (ev.type) 1359 switch (ev.type)
1245 { 1360 {
1246 case KeyPress: 1361 case KeyPress:
1247#if ISO_14755 1362 key_press (ev.xkey);
1248 if (!(iso14755buf & ISO_14755_52))
1249#endif
1250 lookup_key (ev.xkey);
1251
1252 break; 1363 break;
1253 1364
1254 case KeyRelease: 1365 case KeyRelease:
1255 { 1366 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; 1367 break;
1323 }
1324 1368
1325 case ButtonPress: 1369 case ButtonPress:
1326 button_press (ev.xbutton); 1370 button_press (ev.xbutton);
1327 break; 1371 break;
1328 1372
… …
1330 button_release (ev.xbutton); 1374 button_release (ev.xbutton);
1331 break; 1375 break;
1332 1376
1333 case ClientMessage: 1377 case ClientMessage:
1334 if (ev.xclient.format == 32 1378 if (ev.xclient.format == 32
1379 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1380 {
1335 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS] 1381 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1382 {
1383 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1384 {
1336 && ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1385 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1337 destroy (); 1386 {
1387 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1388 destroy ();
1389 }
1390#if ENABLE_EWMH
1391 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1392 XSendEvent (dpy, ev.xclient.window = display->root,
1393 False, SubstructureRedirectMask | SubstructureNotifyMask,
1394 &ev);
1395#endif
1396 }
1397 }
1338#if ENABLE_XEMBED 1398#if ENABLE_XEMBED
1339 else if (ev.xclient.format == 32
1340 && ev.xclient.message_type == xa[XA_XEMBED]) 1399 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1341 { 1400 {
1342 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN) 1401 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1343 focus_in (); 1402 focus_in ();
1344 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1403 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1345 focus_out (); 1404 focus_out ();
1405 }
1406#endif
1346 } 1407 }
1347#endif
1348#ifdef OFFIX_DND
1349 /* OffiX Dnd (drag 'n' drop) protocol */
1350 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1351 && (ev.xclient.data.l[0] == DndFile
1352 || ev.xclient.data.l[0] == DndDir
1353 || ev.xclient.data.l[0] == DndLink))
1354 {
1355 /* Get Dnd data */
1356 Atom ActualType;
1357 int ActualFormat;
1358 unsigned char *data;
1359 unsigned long Size, RemainingBytes;
1360
1361 XGetWindowProperty (disp, display->root,
1362 xa[XA_DNDSELECTION],
1363 0L, 1000000L,
1364 False, AnyPropertyType,
1365 &ActualType, &ActualFormat,
1366 &Size, &RemainingBytes,
1367 &data);
1368 set_string_property (XA_CUT_BUFFER0, data);
1369 XFree (data);
1370 selection_paste (display->root, XA_CUT_BUFFER0, true);
1371 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1372 }
1373#endif /* OFFIX_DND */
1374 break;
1375
1376 case MappingNotify:
1377 XRefreshKeyboardMapping (&ev.xmapping);
1378 break; 1408 break;
1379 1409
1380 /* 1410 /*
1381 * XXX: this is not the _current_ arrangement 1411 * XXX: this is not the _current_ arrangement
1382 * Here's my conclusion: 1412 * Here's my conclusion:
… …
1401 break; 1431 break;
1402 } 1432 }
1403 break; 1433 break;
1404 1434
1405 case FocusIn: 1435 case FocusIn:
1436 if (ev.xfocus.detail != NotifyInferior
1437 && ev.xfocus.detail != NotifyPointer
1438 && ev.xfocus.mode != NotifyGrab)
1406 focus_in (); 1439 focus_in ();
1407 break; 1440 break;
1408 1441
1409 case FocusOut: 1442 case FocusOut:
1443 if (ev.xfocus.detail != NotifyInferior
1444 && ev.xfocus.detail != NotifyPointer
1445 && ev.xfocus.mode != NotifyGrab)
1410 focus_out (); 1446 focus_out ();
1411 break; 1447 break;
1412 1448
1413 case ConfigureNotify: 1449 case ConfigureNotify:
1414 if (ev.xconfigure.window == TermWin.parent[0]) 1450 if (ev.xconfigure.window == parent[0])
1415 { 1451 {
1416 int height, width; 1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1417
1418 do 1453 ;
1419 { /* Wrap lots of configures into one */ 1454
1455#ifdef HAVE_BG_PIXMAP
1456 bool moved = false;
1457 if (bg_window_position_sensitive ())
1458 {
1459 int x, y;
1460 if (ev.xconfigure.send_event)
1461 {
1420 width = ev.xconfigure.width; 1462 x = ev.xconfigure.x;
1421 height = ev.xconfigure.height; 1463 y = ev.xconfigure.y;
1422 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1464 }
1465 else
1466 get_window_origin (x, y);
1467
1468 if (bg_set_position (x, y)
1469 || !(bg_flags & BG_IS_VALID))
1470 moved = true;
1423 } 1471 }
1424 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1472#endif
1425 1473
1426 if (szHint.width != width || szHint.height != height) 1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1427 { 1475 {
1428 seen_resize = 1; 1476 seen_resize = 1;
1429 resize_all_windows (width, height, 1); 1477 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1430 } 1478 }
1431 1479 else
1432#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1480 {
1433 if (options & Opt_transparent) 1481#ifdef HAVE_BG_PIXMAP
1434 check_our_parents (); 1482 if (moved)
1483 {
1484 if (mapped)
1485 update_background ();
1486 else
1487 bg_invalidate ();
1488 }
1435#endif 1489#endif
1490 }
1491
1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1436 } 1493 }
1437 break; 1494 break;
1438 1495
1439 case PropertyNotify: 1496 case PropertyNotify:
1497 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1440 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1498 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1441 && ev.xproperty.state == PropertyNewValue) 1499 && ev.xproperty.state == PropertyNewValue)
1442 selection_property (ev.xproperty.window, ev.xproperty.atom); 1500 selection_property (ev.xproperty.window, ev.xproperty.atom);
1443 1501
1444 break; 1502 break;
1445 1503
1446 case SelectionClear: 1504 case SelectionClear:
1447 selection_clear (); 1505 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1448 break; 1506 break;
1449 1507
1450 case SelectionNotify: 1508 case SelectionNotify:
1451 if (selection_wait == Sel_normal) 1509 if (selection_wait == Sel_normal)
1452 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1510 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1454 1512
1455 case SelectionRequest: 1513 case SelectionRequest:
1456 selection_send (ev.xselectionrequest); 1514 selection_send (ev.xselectionrequest);
1457 break; 1515 break;
1458 1516
1517 case MapNotify:
1518#ifdef HAVE_BG_PIXMAP
1519 /* This is needed specifically to fix the case of no window manager or a
1520 * non-reparenting window manager. In those cases we never get first
1521 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1522 * care of multiplicity of ConfigureNotify events arriving while WM does
1523 * reparenting.
1524 * We should not render background immediately, as there could be several
1525 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1526 * by scheduling background redraw as soon as we can, but giving a short
1527 * bit of time for ConfigureNotifies to arrive.
1528 * We should render background PRIOR to drawing any text, but AFTER all
1529 * of ConfigureNotifys for the best results.
1530 */
1531 if (!(bg_flags & BG_IS_VALID))
1532 update_background_ev.start (0.025);
1533#endif
1534 mapped = 1;
1535#ifdef TEXT_BLINK
1536 text_blink_ev.start ();
1537#endif
1538 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1539 break;
1540
1459 case UnmapNotify: 1541 case UnmapNotify:
1460 TermWin.mapped = 0; 1542 mapped = 0;
1461#ifdef TEXT_BLINK 1543#ifdef TEXT_BLINK
1462 text_blink_ev.stop (); 1544 text_blink_ev.stop ();
1463#endif 1545#endif
1546 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1464 break; 1547 break;
1465
1466 case MapNotify:
1467 TermWin.mapped = 1;
1468#ifdef TEXT_BLINK
1469 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1470#endif
1471 break;
1472
1473#ifdef TRANSPARENT
1474 case ReparentNotify:
1475 rootwin_cb (ev);
1476 break;
1477#endif /* TRANSPARENT */
1478 1548
1479 case GraphicsExpose: 1549 case GraphicsExpose:
1480 case Expose: 1550 case Expose:
1481 if (ev.xany.window == TermWin.vt) 1551 if (ev.xany.window == vt)
1482 { 1552 {
1483 do 1553 do
1554 {
1484 scr_expose (ev.xexpose.x, ev.xexpose.y, 1555 scr_expose (ev.xexpose.x, ev.xexpose.y,
1485 ev.xexpose.width, ev.xexpose.height, False); 1556 ev.xexpose.width, ev.xexpose.height, false);
1557 }
1486 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1487 1559
1488 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1560 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1489 1561
1490 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1563 {
1491 scr_expose (ev.xexpose.x, ev.xexpose.y, 1564 scr_expose (ev.xexpose.x, ev.xexpose.y,
1492 ev.xexpose.width, ev.xexpose.height, False); 1565 ev.xexpose.width, ev.xexpose.height, false);
1566 }
1493 1567
1494 scr_refresh (refresh_type); 1568 want_refresh = 1;
1495 } 1569 }
1496 else 1570 else
1497 { 1571 {
1498 XEvent unused_event; 1572 XEvent unused_event;
1499 1573
1500 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1574 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1501 ; 1575 ;
1502 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1503 ; 1577 ;
1504 1578
1505 if (isScrollbarWindow (ev.xany.window)) 1579 if (scrollBar.state && ev.xany.window == scrollBar.win)
1506 { 1580 {
1507 scrollBar.setIdle (); 1581 scrollBar.state = STATE_IDLE;
1508 scrollbar_show (0); 1582 scrollBar.show (0);
1509 } 1583 }
1510#ifdef MENUBAR
1511 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1512 menubar_expose ();
1513#endif
1514
1515#ifdef TRANSPARENT
1516 if (am_transparent && ev.xany.window == TermWin.parent[0])
1517 XClearWindow (disp, ev.xany.window);
1518#endif
1519 } 1584 }
1520 break; 1585 break;
1521 1586
1522 case MotionNotify: 1587 case MotionNotify:
1523#ifdef POINTER_BLANK 1588#ifdef POINTER_BLANK
1524 if (hidden_pointer) 1589 if (hidden_pointer)
1525 pointer_unblank (); 1590 pointer_unblank ();
1526#endif 1591#endif
1527#if MENUBAR 1592 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1528 if (isMenuBarWindow (ev.xany.window)) 1593 || priv_modes & PrivMode_MouseAnyEvent)
1529 {
1530 menubar_control (ev.xbutton); 1594 mouse_report (ev.xbutton);
1531 break;
1532 }
1533#endif
1534 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1595 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1535 break; 1596 break;
1536 1597
1537 if (ev.xany.window == TermWin.vt) 1598 if (ev.xany.window == vt)
1538 { 1599 {
1600 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1601 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1602 ; // nop
1539 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1603 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1540 { 1604 {
1541 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1605 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1542 ; 1606 ;
1543 1607
1544 XQueryPointer (disp, TermWin.vt, 1608 XQueryPointer (dpy, vt,
1545 &unused_root, &unused_child, 1609 &unused_root, &unused_child,
1546 &unused_root_x, &unused_root_y, 1610 &unused_root_x, &unused_root_y,
1547 &ev.xbutton.x, &ev.xbutton.y, 1611 &ev.xbutton.x, &ev.xbutton.y,
1548 &ev.xbutton.state); 1612 &ev.xbutton.state);
1549#ifdef MOUSE_THRESHOLD 1613#ifdef MOUSE_THRESHOLD
… …
1561#endif 1625#endif
1562 selection_extend (ev.xbutton.x, ev.xbutton.y, 1626 selection_extend (ev.xbutton.x, ev.xbutton.y,
1563 ev.xbutton.state & Button3Mask ? 2 : 0); 1627 ev.xbutton.state & Button3Mask ? 2 : 0);
1564 1628
1565#ifdef SELECTION_SCROLLING 1629#ifdef SELECTION_SCROLLING
1566 if (ev.xbutton.y < TermWin.int_bwidth 1630 if (ev.xbutton.y < int_bwidth
1567 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1631 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1568 { 1632 {
1569 int dist; 1633 int dist;
1570 1634
1571 /* don't clobber the current delay if we are 1635 /* don't clobber the current delay if we are
1572 * already in the middle of scrolling. 1636 * already in the middle of scrolling.
1573 */ 1637 */
1574 if (!sel_scroll_ev.active) 1638 if (!sel_scroll_ev.is_active ())
1575 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1639 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1576 1640
1577 /* save the event params so we can highlight 1641 /* save the event params so we can highlight
1578 * the selection in the pending-scroll loop 1642 * the selection in the pending-scroll loop
1579 */ 1643 */
1580 selection_save_x = ev.xbutton.x; 1644 selection_save_x = ev.xbutton.x;
1581 selection_save_y = ev.xbutton.y; 1645 selection_save_y = ev.xbutton.y;
1582 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1646 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1583 1647
1584 /* calc number of lines to scroll */ 1648 /* calc number of lines to scroll */
1585 if (ev.xbutton.y < TermWin.int_bwidth) 1649 if (ev.xbutton.y < int_bwidth)
1586 { 1650 {
1587 scroll_selection_dir = UP; 1651 scroll_selection_dir = UP;
1588 dist = TermWin.int_bwidth - ev.xbutton.y; 1652 dist = int_bwidth - ev.xbutton.y;
1589 } 1653 }
1590 else 1654 else
1591 { 1655 {
1592 scroll_selection_dir = DN; 1656 scroll_selection_dir = DN;
1593 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1657 dist = ev.xbutton.y - (int_bwidth + height);
1594 } 1658 }
1595 1659
1596 scroll_selection_lines = Pixel2Height (dist) 1660 scroll_selection_lines = Pixel2Height (dist)
1597 / SELECTION_SCROLL_LINE_SPEEDUP 1661 / SELECTION_SCROLL_LINE_SPEEDUP
1598 + 1; 1662 + 1;
1599 MIN_IT (scroll_selection_lines, 1663 min_it (scroll_selection_lines,
1600 SELECTION_SCROLL_MAX_LINES); 1664 SELECTION_SCROLL_MAX_LINES);
1601 } 1665 }
1602 else 1666 else
1603 { 1667 {
1604 /* we are within the text window, so we 1668 /* we are within the text window, so we
1605 * shouldn't be scrolling 1669 * shouldn't be scrolling
1606 */ 1670 */
1607 if (sel_scroll_ev.active)
1608 sel_scroll_ev.stop(); 1671 sel_scroll_ev.stop();
1609 } 1672 }
1610#endif 1673#endif
1611#ifdef MOUSE_THRESHOLD 1674#ifdef MOUSE_THRESHOLD
1612 } 1675 }
1613#endif 1676#endif
1614 } 1677 }
1615 } 1678 }
1616 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1679 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1617 { 1680 {
1618 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1681 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1619 MotionNotify, &ev)) 1682 MotionNotify, &ev))
1620 ; 1683 ;
1621 1684
1622 XQueryPointer (disp, scrollBar.win, 1685 XQueryPointer (dpy, scrollBar.win,
1623 &unused_root, &unused_child, 1686 &unused_root, &unused_child,
1624 &unused_root_x, &unused_root_y, 1687 &unused_root_x, &unused_root_y,
1625 &ev.xbutton.x, &ev.xbutton.y, 1688 &ev.xbutton.x, &ev.xbutton.y,
1626 &unused_mask); 1689 &unused_mask);
1627 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1690 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1628 scrollbar_size ()); 1691 scrollBar.size ());
1629 scr_refresh (refresh_type);
1630 refresh_limit = 0; 1692 want_refresh = 1;
1631 scrollbar_show (1); 1693 scrollBar.show (1);
1632 } 1694 }
1633 break; 1695 break;
1634 } 1696 }
1697
1698#if defined(CURSOR_BLINK)
1699 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1700 {
1701 if (hidden_cursor)
1702 {
1703 hidden_cursor = 0;
1704 want_refresh = 1;
1705 }
1706
1707 cursor_blink_ev.again ();
1708 }
1709#endif
1710
1711#if defined(POINTER_BLANK)
1712 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1713 {
1714 if (ev.type == MotionNotify
1715 || ev.type == ButtonPress
1716 || ev.type == ButtonRelease)
1717 if (hidden_pointer)
1718 pointer_unblank ();
1719
1720 if (ev.type == KeyPress && hidden_pointer == 0)
1721 pointer_blank ();
1722 }
1723#endif
1724
1725 refresh_check ();
1635} 1726}
1727
1728#if ENABLE_FRILLS
1729void
1730rxvt_term::set_urgency (bool enable)
1731{
1732 if (enable == urgency_hint)
1733 return;
1734
1735 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1736 {
1737 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1738 XSetWMHints (dpy, parent[0], h);
1739 urgency_hint = enable;
1740 }
1741}
1742#endif
1636 1743
1637void 1744void
1638rxvt_term::focus_in () 1745rxvt_term::focus_in ()
1639{ 1746{
1640 if (!TermWin.focus) 1747 if (!focus)
1641 { 1748 {
1642 TermWin.focus = 1; 1749 focus = 1;
1643 want_refresh = 1; 1750 want_refresh = 1;
1751
1644#ifdef USE_XIM 1752#if USE_XIM
1645 if (Input_Context != NULL) 1753 if (Input_Context != NULL)
1646 { 1754 {
1647 IMSetStatusPosition (); 1755 IMSetPosition ();
1648 XSetICFocus (Input_Context); 1756 XSetICFocus (Input_Context);
1649 } 1757 }
1650#endif 1758#endif
1651#ifdef CURSOR_BLINK 1759#if CURSOR_BLINK
1652 if (options & Opt_cursorBlink) 1760 if (option (Opt_cursorBlink))
1653 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1761 cursor_blink_ev.again ();
1654#endif 1762#endif
1655#ifdef OFF_FOCUS_FADING 1763#if OFF_FOCUS_FADING
1656 if (rs[Rs_fade]) 1764 if (rs[Rs_fade])
1657 { 1765 {
1658 pix_colors = pix_colors_focused; 1766 pix_colors = pix_colors_focused;
1659 scr_recolour (); 1767 scr_recolour ();
1660 } 1768 }
1661#endif 1769#endif
1770#if ENABLE_FRILLS
1771 if (option (Opt_urgentOnBell))
1772 set_urgency (0);
1773#endif
1774
1775 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1662 } 1776 }
1663} 1777}
1664 1778
1665void 1779void
1666rxvt_term::focus_out () 1780rxvt_term::focus_out ()
1667{ 1781{
1668 if (TermWin.focus) 1782 if (focus)
1669 { 1783 {
1670 TermWin.focus = 0; 1784 focus = 0;
1671 want_refresh = 1; 1785 want_refresh = 1;
1672 1786
1787#if ENABLE_FRILLS
1788 if (option (Opt_urgentOnBell))
1789 set_urgency (0);
1790#endif
1673#if ENABLE_FRILLS || ISO_14755 1791#if ENABLE_FRILLS || ISO_14755
1792 if (iso14755buf)
1793 {
1674 iso14755buf = 0; 1794 iso14755buf = 0;
1675#endif 1795# if ISO_14755
1676#if ENABLE_OVERLAY
1677 scr_overlay_off (); 1796 scr_overlay_off ();
1678#endif 1797# endif
1798 }
1799#endif
1679#ifdef USE_XIM 1800#if USE_XIM
1680 if (Input_Context != NULL) 1801 if (Input_Context != NULL)
1681 XUnsetICFocus (Input_Context); 1802 XUnsetICFocus (Input_Context);
1682#endif 1803#endif
1683#ifdef CURSOR_BLINK 1804#if CURSOR_BLINK
1684 if (options & Opt_cursorBlink) 1805 if (option (Opt_cursorBlink))
1685 cursor_blink_ev.stop (); 1806 cursor_blink_ev.stop ();
1807
1686 hidden_cursor = 0; 1808 hidden_cursor = 0;
1687#endif 1809#endif
1688#ifdef OFF_FOCUS_FADING 1810#if OFF_FOCUS_FADING
1689 if (rs[Rs_fade]) 1811 if (rs[Rs_fade])
1690 { 1812 {
1691 pix_colors = pix_colors_unfocused; 1813 pix_colors = pix_colors_unfocused;
1692 scr_recolour (); 1814 scr_recolour ();
1693 } 1815 }
1694#endif 1816#endif
1817
1818 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1819 }
1820}
1821
1822void
1823rxvt_term::update_fade_color (unsigned int idx)
1824{
1825#if OFF_FOCUS_FADING
1826 if (rs[Rs_fade])
1695 } 1827 {
1828 rgba c;
1829 pix_colors [Color_fade].get (c);
1830 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1831 }
1832#endif
1696} 1833}
1697 1834
1698#if TRANSPARENT 1835#if ENABLE_TRANSPARENCY || ENABLE_PERL
1699void 1836void
1700rxvt_term::rootwin_cb (XEvent &ev) 1837rxvt_term::rootwin_cb (XEvent &ev)
1701{ 1838{
1702 SET_R (this); 1839 make_current ();
1703 SET_LOCALE (locale);
1704 1840
1841 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1842 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1843 return;
1844
1845# if ENABLE_TRANSPARENCY
1705 switch (ev.type) 1846 switch (ev.type)
1706 { 1847 {
1707 case PropertyNotify: 1848 case PropertyNotify:
1708 /* 1849 /*
1709 * if user used some Esetroot compatible prog to set the root bg, 1850 * if user used some Esetroot compatible prog to set the root bg,
1710 * use the property to determine the pixmap. We use it later on. 1851 * use the property to determine the pixmap. We use it later on.
1711 */ 1852 */
1712 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1853 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1713 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1854 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1714 return; 1855 {
1856 bg_set_root_pixmap ();
1857 update_background ();
1858 }
1715 1859
1716 /* FALLTHROUGH */
1717 case ReparentNotify:
1718 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1719 want_refresh = want_full_refresh = 1;
1720 break; 1860 break;
1721 } 1861 }
1862# endif
1863
1864 refresh_check ();
1722} 1865}
1723#endif 1866#endif
1724 1867
1725void 1868void
1726rxvt_term::button_press (XButtonEvent &ev) 1869rxvt_term::button_press (XButtonEvent &ev)
1727{ 1870{
1728 int reportmode = 0, clickintime; 1871 int reportmode = 0, clickintime;
1729 1872
1730 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1873 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1874
1731 if (!bypass_keystate) 1875 if (!bypass_keystate)
1732 reportmode = !! (priv_modes & PrivMode_mouse_report); 1876 reportmode = !! (priv_modes & PrivMode_mouse_report);
1733 1877
1734 /* 1878 /*
1735 * VT window processing of button press 1879 * VT window processing of button press
1736 */ 1880 */
1737 if (ev.window == TermWin.vt) 1881 if (ev.window == vt)
1738 { 1882 {
1883 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1884 return;
1885
1739#if ISO_14755 1886#if ISO_14755
1740 // 5.4 1887 // 5.4
1741 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1888 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1742 { 1889 {
1743 iso14755_54 (ev.x, ev.y); 1890 iso14755_54 (ev.x, ev.y);
… …
1753 /* save the xbutton state (for ButtonRelease) */ 1900 /* save the xbutton state (for ButtonRelease) */
1754 MEvent.state = ev.state; 1901 MEvent.state = ev.state;
1755#ifdef MOUSE_REPORT_DOUBLECLICK 1902#ifdef MOUSE_REPORT_DOUBLECLICK
1756 if (ev.button == MEvent.button && clickintime) 1903 if (ev.button == MEvent.button && clickintime)
1757 { 1904 {
1758 /* same button, within alloted time */ 1905 /* same button, within allowed time */
1759 MEvent.clicks++; 1906 MEvent.clicks++;
1907
1760 if (MEvent.clicks > 1) 1908 if (MEvent.clicks > 1)
1761 { 1909 {
1762 /* only report double clicks */ 1910 /* only report double clicks */
1763 MEvent.clicks = 2; 1911 MEvent.clicks = 2;
1764 mouse_report (ev); 1912 mouse_report (ev);
… …
1776 mouse_report (ev); 1924 mouse_report (ev);
1777 } 1925 }
1778#else 1926#else
1779 MEvent.button = ev.button; 1927 MEvent.button = ev.button;
1780 mouse_report (ev); 1928 mouse_report (ev);
1781#endif /* MOUSE_REPORT_DOUBLECLICK */ 1929#endif /* MOUSE_REPORT_DOUBLECLICK */
1782 1930
1783 } 1931 }
1784 else 1932 else
1785 { 1933 {
1786 if (ev.button != MEvent.button) 1934 if (ev.button != MEvent.button)
… …
1796#else 1944#else
1797 selection.rect = false; 1945 selection.rect = false;
1798#endif 1946#endif
1799 1947
1800 /* allow shift+left click to extend selection */ 1948 /* allow shift+left click to extend selection */
1801 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1949 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1802 { 1950 {
1803 if (MEvent.button == Button1 && clickintime) 1951 if (MEvent.button == Button1 && clickintime)
1804 selection_rotate (ev.x, ev.y); 1952 selection_rotate (ev.x, ev.y);
1805 else 1953 else
1806 selection_extend (ev.x, ev.y, 1); 1954 selection_extend (ev.x, ev.y, 1);
… …
1834 } 1982 }
1835 1983
1836 /* 1984 /*
1837 * Scrollbar window processing of button press 1985 * Scrollbar window processing of button press
1838 */ 1986 */
1839 if (isScrollbarWindow (ev.window)) 1987 if (scrollBar.state && ev.window == scrollBar.win)
1840 { 1988 {
1841 scrollBar.setIdle (); 1989 page_dirn direction = NO_DIR;
1990
1991 if (scrollBar.upButton (ev.y))
1992 direction = UP; /* up */
1993 else if (scrollBar.dnButton (ev.y))
1994 direction = DN; /* down */
1995
1996 scrollBar.state = STATE_IDLE;
1842 /* 1997 /*
1843 * Rxvt-style scrollbar: 1998 * Rxvt-style scrollbar:
1844 * move up if mouse is above slider 1999 * move up if mouse is above slider
1845 * move dn if mouse is below slider 2000 * move dn if mouse is below slider
1846 * 2001 *
… …
1855 /* 2010 /*
1856 * Mouse report disabled scrollbar: 2011 * Mouse report disabled scrollbar:
1857 * arrow buttons - send up/down 2012 * arrow buttons - send up/down
1858 * click on scrollbar - send pageup/down 2013 * click on scrollbar - send pageup/down
1859 */ 2014 */
1860 if ((scrollBar.style == R_SB_NEXT 2015 if (direction == UP)
1861 && scrollbarnext_upButton (ev.y))
1862 || (scrollBar.style == R_SB_RXVT
1863 && scrollbarrxvt_upButton (ev.y)))
1864 tt_printf ("\033[A"); 2016 tt_printf ("\033[A");
1865 else if ((scrollBar.style == R_SB_NEXT 2017 else if (direction == DN)
1866 && scrollbarnext_dnButton (ev.y))
1867 || (scrollBar.style == R_SB_RXVT
1868 && scrollbarrxvt_dnButton (ev.y)))
1869 tt_printf ("\033[B"); 2018 tt_printf ("\033[B");
1870 else 2019 else
1871 switch (ev.button) 2020 switch (ev.button)
1872 { 2021 {
1873 case Button2: 2022 case Button2:
… …
1880 tt_printf ("\033[5~"); 2029 tt_printf ("\033[5~");
1881 break; 2030 break;
1882 } 2031 }
1883 } 2032 }
1884 else 2033 else
1885#endif /* NO_SCROLLBAR_REPORT */ 2034#endif /* NO_SCROLLBAR_REPORT */
1886
1887 {
1888 char upordown = 0;
1889
1890 if (scrollBar.style == R_SB_NEXT)
1891 { 2035 {
1892 if (scrollbarnext_upButton (ev.y)) 2036 if (direction != NO_DIR)
1893 upordown = -1; /* up */
1894 else if (scrollbarnext_dnButton (ev.y))
1895 upordown = 1; /* down */
1896 }
1897 else if (scrollBar.style == R_SB_RXVT)
1898 {
1899 if (scrollbarrxvt_upButton (ev.y))
1900 upordown = -1; /* up */
1901 else if (scrollbarrxvt_dnButton (ev.y))
1902 upordown = 1; /* down */
1903 }
1904 if (upordown)
1905 { 2037 {
1906#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2038#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2039 if (!cont_scroll_ev.is_active ())
1907 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2040 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1908#endif 2041#endif
1909 if (scr_page (upordown < 0 ? UP : DN, 1)) 2042 if (scr_page (direction, 1))
1910 { 2043 {
1911 if (upordown < 0) 2044 if (direction == UP)
1912 scrollBar.setUp (); 2045 scrollBar.state = STATE_UP;
1913 else 2046 else
1914 scrollBar.setDn (); 2047 scrollBar.state = STATE_DOWN;
1915 } 2048 }
1916 } 2049 }
1917 else 2050 else
1918 switch (ev.button) 2051 switch (ev.button)
1919 { 2052 {
1920 case Button2: 2053 case Button2:
1921 switch (scrollbar_align) 2054 switch (scrollBar.align)
1922 { 2055 {
1923 case R_SB_ALIGN_TOP: 2056 case R_SB_ALIGN_TOP:
1924 csrO = 0; 2057 csrO = 0;
1925 break; 2058 break;
1926 case R_SB_ALIGN_CENTRE: 2059 case R_SB_ALIGN_CENTRE:
… …
1932 } 2065 }
1933 2066
1934 if (scrollBar.style == R_SB_XTERM 2067 if (scrollBar.style == R_SB_XTERM
1935 || scrollbar_above_slider (ev.y) 2068 || scrollbar_above_slider (ev.y)
1936 || scrollbar_below_slider (ev.y)) 2069 || scrollbar_below_slider (ev.y))
1937 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2070 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
1938 2071
1939 scrollBar.setMotion (); 2072 scrollBar.state = STATE_MOTION;
1940 break; 2073 break;
1941 2074
1942 case Button1: 2075 case Button1:
1943 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2076 if (scrollBar.align == R_SB_ALIGN_CENTRE)
1944 csrO = ev.y - scrollBar.top; 2077 csrO = ev.y - scrollBar.top;
1945 /* FALLTHROUGH */ 2078 /* FALLTHROUGH */
1946 2079
1947 case Button3: 2080 case Button3:
1948 if (scrollBar.style != R_SB_XTERM) 2081 if (scrollBar.style != R_SB_XTERM)
1949 { 2082 {
1950 if (scrollbar_above_slider (ev.y)) 2083 if (scrollbar_above_slider (ev.y))
1951# ifdef RXVT_SCROLL_FULL 2084# ifdef RXVT_SCROLL_FULL
1952 scr_page (UP, TermWin.nrow - 1); 2085 scr_page (UP, nrow - 1);
1953# else 2086# else
1954 scr_page (UP, TermWin.nrow / 4); 2087 scr_page (UP, nrow / 4);
1955# endif 2088# endif
1956 else if (scrollbar_below_slider (ev.y)) 2089 else if (scrollbar_below_slider (ev.y))
1957# ifdef RXVT_SCROLL_FULL 2090# ifdef RXVT_SCROLL_FULL
1958 scr_page (DN, TermWin.nrow - 1); 2091 scr_page (DN, nrow - 1);
1959# else 2092# else
1960 scr_page (DN, TermWin.nrow / 4); 2093 scr_page (DN, nrow / 4);
1961# endif 2094# endif
1962 else 2095 else
1963 scrollBar.setMotion (); 2096 scrollBar.state = STATE_MOTION;
1964 } 2097 }
1965 else 2098 else
1966 { 2099 {
1967 scr_page ((ev.button == Button1 ? DN : UP), 2100 scr_page ((ev.button == Button1 ? DN : UP),
1968 (TermWin.nrow 2101 (nrow
1969 * scrollbar_position (ev.y) 2102 * scrollbar_position (ev.y)
1970 / scrollbar_size ())); 2103 / scrollBar.size ()));
1971 } 2104 }
1972 2105
1973 break; 2106 break;
1974 } 2107 }
1975 } 2108 }
2109
1976 return; 2110 return;
1977 } 2111 }
1978#if MENUBAR
1979 /*
1980 * Menubar window processing of button press
1981 */
1982 if (isMenuBarWindow (ev.window))
1983 menubar_control (ev);
1984#endif
1985} 2112}
1986 2113
1987void 2114void
1988rxvt_term::button_release (XButtonEvent &ev) 2115rxvt_term::button_release (XButtonEvent &ev)
1989{ 2116{
… …
1991 2118
1992 csrO = 0; /* reset csr Offset */ 2119 csrO = 0; /* reset csr Offset */
1993 if (!bypass_keystate) 2120 if (!bypass_keystate)
1994 reportmode = !! (priv_modes & PrivMode_mouse_report); 2121 reportmode = !! (priv_modes & PrivMode_mouse_report);
1995 2122
1996 if (scrollbar_isUpDn ()) 2123 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1997 { 2124 {
1998 scrollBar.setIdle (); 2125 scrollBar.state = STATE_IDLE;
1999 scrollbar_show (0); 2126 scrollBar.show (0);
2000#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2001 refresh_type &= ~SMOOTH_REFRESH;
2002#endif
2003 } 2127 }
2004 2128
2005#ifdef SELECTION_SCROLLING 2129#ifdef SELECTION_SCROLLING
2006 if (sel_scroll_ev.active)
2007 sel_scroll_ev.stop(); 2130 sel_scroll_ev.stop();
2008#endif 2131#endif
2009 2132
2010 if (ev.window == TermWin.vt) 2133 if (ev.window == vt)
2011 { 2134 {
2135 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2136 return;
2137
2012#if ISO_14755 2138#if ISO_14755
2013 // 5.4 2139 // 5.4
2014 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2140 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2015 return; 2141 return;
2016#endif 2142#endif
2143
2017 if (reportmode) 2144 if (reportmode)
2018 { 2145 {
2019 /* mouse report from vt window */ 2146 /* mouse report from vt window */
2020 /* don't report release of wheel "buttons" */ 2147 /* don't report release of wheel "buttons" */
2021 if (ev.button >= 4) 2148 if (ev.button >= 4)
… …
2032 mouse_report (ev); 2159 mouse_report (ev);
2033 } 2160 }
2034#else /* MOUSE_REPORT_DOUBLECLICK */ 2161#else /* MOUSE_REPORT_DOUBLECLICK */
2035 MEvent.button = AnyButton; 2162 MEvent.button = AnyButton;
2036 mouse_report (ev); 2163 mouse_report (ev);
2037#endif /* MOUSE_REPORT_DOUBLECLICK */ 2164#endif /* MOUSE_REPORT_DOUBLECLICK */
2038 return; 2165 return;
2039 } 2166 }
2040 2167
2041 /* 2168 /*
2042 * dumb hack to compensate for the failure of click-and-drag 2169 * dumb hack to compensate for the failure of click-and-drag
… …
2051 { 2178 {
2052 case Button1: 2179 case Button1:
2053 case Button3: 2180 case Button3:
2054 selection_make (ev.time); 2181 selection_make (ev.time);
2055 break; 2182 break;
2183
2056 case Button2: 2184 case Button2:
2057 selection_request (ev.time, ev.x, ev.y); 2185 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2186 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2058 break; 2187 break;
2188
2059#ifdef MOUSE_WHEEL 2189#ifdef MOUSE_WHEEL
2060 case Button4: 2190 case Button4:
2061 case Button5: 2191 case Button5:
2062 { 2192 {
2063 int i; 2193 int i;
… …
2065 2195
2066 v = ev.button == Button4 ? UP : DN; 2196 v = ev.button == Button4 ? UP : DN;
2067 2197
2068 if (ev.state & ShiftMask) 2198 if (ev.state & ShiftMask)
2069 i = 1; 2199 i = 1;
2070 else if (options & Opt_mouseWheelScrollPage) 2200 else if (option (Opt_mouseWheelScrollPage))
2071 i = TermWin.nrow - 1; 2201 i = nrow - 1;
2072 else 2202 else
2073 i = 5; 2203 i = 5;
2074 2204
2075# ifdef MOUSE_SLIP_WHEELING 2205# ifdef MOUSE_SLIP_WHEELING
2076 if (ev.state & ControlMask) 2206 if (ev.state & ControlMask)
2077 { 2207 {
2078 mouse_slip_wheel_speed += v ? -1 : 1; 2208 mouse_slip_wheel_speed += v ? -1 : 1;
2079 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2209 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2080 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2210 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2081 2211
2082 if (slip_wheel_ev.at < NOW) 2212 if (!slip_wheel_ev.is_active ())
2083 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2213 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2084
2085 slip_wheel_ev.start ();
2086 } 2214 }
2087 else 2215 else
2216# endif
2088 { 2217 {
2089# endif
2090# ifdef JUMP_MOUSE_WHEEL
2091 scr_page (v, i); 2218 scr_page (v, i);
2092 scr_refresh (SMOOTH_REFRESH);
2093 scrollbar_show (1); 2219 scrollBar.show (1);
2094# else
2095 while (i--)
2096 {
2097 scr_page (v, 1);
2098 scr_refresh (SMOOTH_REFRESH);
2099 scrollbar_show (1);
2100 }
2101# endif
2102# ifdef MOUSE_SLIP_WHEELING
2103 } 2220 }
2104#endif
2105 } 2221 }
2106 break; 2222 break;
2107#endif 2223#endif
2108 } 2224 }
2109 } 2225 }
2110#ifdef MENUBAR
2111 else if (isMenuBarWindow (ev.window))
2112 menubar_control (ev);
2113#endif
2114} 2226}
2115
2116#ifdef TRANSPARENT
2117#if TINTING
2118/* taken from aterm-0.4.2 */
2119
2120typedef uint32_t RUINT32T;
2121
2122void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2123{
2124 int sh_r, sh_g, sh_b;
2125 RUINT32T mask_r, mask_g, mask_b;
2126 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2127 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2128 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2129 int i;
2130
2131 Visual *visual = display->visual;
2132
2133 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2134
2135 /* for convenience */
2136 mask_r = visual->red_mask;
2137 mask_g = visual->green_mask;
2138 mask_b = visual->blue_mask;
2139
2140 /* boring lookup table pre-initialization */
2141 switch (srcImage->bits_per_pixel) {
2142 case 15:
2143 if ((mask_r != 0x7c00) ||
2144 (mask_g != 0x03e0) ||
2145 (mask_b != 0x001f))
2146 return;
2147 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2148 lookup_r = lookup;
2149 lookup_g = lookup+32;
2150 lookup_b = lookup+32+32;
2151 sh_r = 10;
2152 sh_g = 5;
2153 sh_b = 0;
2154 break;
2155 case 16:
2156 if ((mask_r != 0xf800) ||
2157 (mask_g != 0x07e0) ||
2158 (mask_b != 0x001f))
2159 return;
2160 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2161 lookup_r = lookup;
2162 lookup_g = lookup+32;
2163 lookup_b = lookup+32+64;
2164 sh_r = 11;
2165 sh_g = 5;
2166 sh_b = 0;
2167 break;
2168 case 24:
2169 if ((mask_r != 0xff0000) ||
2170 (mask_g != 0x00ff00) ||
2171 (mask_b != 0x0000ff))
2172 return;
2173 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2174 lookup_r = lookup;
2175 lookup_g = lookup+256;
2176 lookup_b = lookup+256+256;
2177 sh_r = 16;
2178 sh_g = 8;
2179 sh_b = 0;
2180 break;
2181 case 32:
2182 if ((mask_r != 0xff0000) ||
2183 (mask_g != 0x00ff00) ||
2184 (mask_b != 0x0000ff))
2185 return;
2186 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2187 lookup_r = lookup;
2188 lookup_g = lookup+256;
2189 lookup_b = lookup+256+256;
2190 sh_r = 16;
2191 sh_g = 8;
2192 sh_b = 0;
2193 break;
2194 default:
2195 return; /* we do not support this color depth */
2196 }
2197
2198 /* prepare limits for color transformation (each channel is handled separately) */
2199 if (shade < 0) {
2200 shade = -shade;
2201 if (shade < 0) shade = 0;
2202 if (shade > 100) shade = 100;
2203
2204 lower_lim_r = 65535-rm;
2205 lower_lim_g = 65535-gm;
2206 lower_lim_b = 65535-bm;
2207
2208 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2209 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2210 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2211
2212 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2213 } else {
2214 if (shade < 0) shade = 0;
2215 if (shade > 100) shade = 100;
2216
2217 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2218
2219 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2220 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2221 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2222 }
2223
2224 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2225 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2226 {
2227 unsigned int tmp;
2228
2229 tmp = lower_lim_r;
2230 lower_lim_r = lower_lim_b;
2231 lower_lim_b = tmp;
2232
2233 tmp = upper_lim_r;
2234 upper_lim_r = upper_lim_b;
2235 upper_lim_b = tmp;
2236 }
2237
2238 /* fill our lookup tables */
2239 for (i = 0; i <= mask_r>>sh_r; i++)
2240 {
2241 RUINT32T tmp;
2242 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2243 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2244 lookup_r[i] = (tmp/65535)<<sh_r;
2245 }
2246 for (i = 0; i <= mask_g>>sh_g; i++)
2247 {
2248 RUINT32T tmp;
2249 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2250 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2251 lookup_g[i] = (tmp/65535)<<sh_g;
2252 }
2253 for (i = 0; i <= mask_b>>sh_b; i++)
2254 {
2255 RUINT32T tmp;
2256 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2257 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2258 lookup_b[i] = (tmp/65535)<<sh_b;
2259 }
2260
2261 /* apply table to input image (replacing colors by newly calculated ones) */
2262 switch (srcImage->bits_per_pixel)
2263 {
2264 case 15:
2265 {
2266 unsigned short *p1, *pf, *p, *pl;
2267 p1 = (unsigned short *) srcImage->data;
2268 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2269 while (p1 < pf)
2270 {
2271 p = p1;
2272 pl = p1 + srcImage->width;
2273 for (; p < pl; p++)
2274 {
2275 *p = lookup_r[(*p & 0x7c00)>>10] |
2276 lookup_g[(*p & 0x03e0)>> 5] |
2277 lookup_b[(*p & 0x001f)];
2278 }
2279 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2280 }
2281 break;
2282 }
2283 case 16:
2284 {
2285 unsigned short *p1, *pf, *p, *pl;
2286 p1 = (unsigned short *) srcImage->data;
2287 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2288 while (p1 < pf)
2289 {
2290 p = p1;
2291 pl = p1 + srcImage->width;
2292 for (; p < pl; p++)
2293 {
2294 *p = lookup_r[(*p & 0xf800)>>11] |
2295 lookup_g[(*p & 0x07e0)>> 5] |
2296 lookup_b[(*p & 0x001f)];
2297 }
2298 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2299 }
2300 break;
2301 }
2302 case 24:
2303 {
2304 unsigned char *p1, *pf, *p, *pl;
2305 p1 = (unsigned char *) srcImage->data;
2306 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2307 while (p1 < pf)
2308 {
2309 p = p1;
2310 pl = p1 + srcImage->width * 3;
2311 for (; p < pl; p += 3)
2312 {
2313 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2314 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2315 p[2] = lookup_r[(p[2] & 0x0000ff)];
2316 }
2317 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2318 }
2319 break;
2320 }
2321 case 32:
2322 {
2323 RUINT32T *p1, *pf, *p, *pl;
2324 p1 = (RUINT32T *) srcImage->data;
2325 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2326
2327 while (p1 < pf)
2328 {
2329 p = p1;
2330 pl = p1 + srcImage->width;
2331 for (; p < pl; p++)
2332 {
2333 *p = lookup_r[(*p & 0xff0000)>>16] |
2334 lookup_g[(*p & 0x00ff00)>> 8] |
2335 lookup_b[(*p & 0x0000ff)] |
2336 (*p & ~0xffffff);
2337 }
2338 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2339 }
2340 break;
2341 }
2342 }
2343
2344 free (lookup);
2345}
2346#endif
2347
2348/*
2349 * Check our parents are still who we think they are.
2350 * Do transparency updates if required
2351 */
2352int
2353rxvt_term::check_our_parents ()
2354{
2355 int i, pchanged, aformat, have_pixmap, rootdepth;
2356 unsigned long nitems, bytes_after;
2357 Atom atype;
2358 unsigned char *prop = NULL;
2359 Window root, oldp, *list;
2360 Pixmap rootpixmap = None;
2361 XWindowAttributes wattr, wrootattr;
2362 dDisp;
2363
2364 pchanged = 0;
2365
2366 if (!(options & Opt_transparent))
2367 return pchanged; /* Don't try any more */
2368
2369 XGetWindowAttributes (disp, display->root, &wrootattr);
2370 rootdepth = wrootattr.depth;
2371
2372 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2373
2374 if (rootdepth != wattr.depth)
2375 {
2376 if (am_transparent)
2377 {
2378 pchanged = 1;
2379 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2380 am_transparent = am_pixmap_trans = 0;
2381 }
2382
2383 return pchanged; /* Don't try any more */
2384 }
2385
2386 /* Get all X ops out of the queue so that our information is up-to-date. */
2387 XSync (disp, False);
2388
2389 /*
2390 * Make the frame window set by the window manager have
2391 * the root background. Some window managers put multiple nested frame
2392 * windows for each client, so we have to take care about that.
2393 */
2394 i = (xa[XA_XROOTPMAP_ID]
2395 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2396 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2397 &nitems, &bytes_after, &prop) == Success);
2398
2399 if (!i || prop == NULL)
2400 i = (xa[XA_ESETROOT_PMAP_ID]
2401 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2402 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2403 &nitems, &bytes_after, &prop) == Success);
2404
2405 if (!i || prop == NULL
2406#if TINTING
2407 || !rs[Rs_color + Color_tint]
2408#endif
2409 )
2410 have_pixmap = 0;
2411 else
2412 {
2413 have_pixmap = 1;
2414 rootpixmap = *(Pixmap *)prop;
2415 XFree (prop);
2416 }
2417
2418 if (have_pixmap)
2419 {
2420 /*
2421 * Copy display->root pixmap transparency
2422 */
2423 int sx, sy, nx, ny;
2424 unsigned int nw, nh;
2425 Window cr;
2426 XImage *image;
2427 GC gc;
2428 XGCValues gcvalue;
2429
2430 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2431 0, 0, &sx, &sy, &cr);
2432 nw = (unsigned int)szHint.width;
2433 nh = (unsigned int)szHint.height;
2434 nx = ny = 0;
2435
2436 if (sx < 0)
2437 {
2438 nw += sx;
2439 nx = -sx;
2440 sx = 0;
2441 }
2442
2443 if (sy < 0)
2444 {
2445 nh += sy;
2446 ny = -sy;
2447 sy = 0;
2448 }
2449
2450 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2451 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2452
2453 XSync (disp, False);
2454 allowedxerror = -1;
2455 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2456
2457 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2458 /* XXX: may need a delay here? */
2459 allowedxerror = 0;
2460
2461 if (image == NULL)
2462 {
2463 if (am_transparent && am_pixmap_trans)
2464 {
2465 pchanged = 1;
2466 if (TermWin.pixmap != None)
2467 {
2468 XFreePixmap (disp, TermWin.pixmap);
2469 TermWin.pixmap = None;
2470 }
2471 }
2472
2473 am_pixmap_trans = 0;
2474 }
2475 else
2476 {
2477 if (TermWin.pixmap != None)
2478 XFreePixmap (disp, TermWin.pixmap);
2479
2480#if TINTING
2481 if (ISSET_PIXCOLOR (Color_tint))
2482 {
2483 unsigned short rm, gm, bm;
2484 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2485
2486 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2487
2488 ShadeXImage (display, image, shade, rm, gm, bm);
2489 }
2490#endif
2491
2492 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2493 szHint.width, szHint.height, image->depth);
2494 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2495 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2496 nx, ny, image->width, image->height);
2497 XFreeGC (disp, gc);
2498 XDestroyImage (image);
2499 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2500 XClearWindow (disp, TermWin.parent[0]);
2501
2502 if (!am_transparent || !am_pixmap_trans)
2503 pchanged = 1;
2504
2505 am_transparent = am_pixmap_trans = 1;
2506 }
2507 }
2508
2509 if (am_pixmap_trans)
2510 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2511 else
2512 {
2513 unsigned int n;
2514 /*
2515 * InheritPixmap transparency
2516 */
2517 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2518 {
2519 oldp = TermWin.parent[i];
2520 XQueryTree (disp, TermWin.parent[i - 1], &root,
2521 &TermWin.parent[i], &list, &n);
2522 XFree (list);
2523
2524 if (TermWin.parent[i] == display->root)
2525 {
2526 if (oldp != None)
2527 pchanged = 1;
2528
2529 break;
2530 }
2531
2532 if (oldp != TermWin.parent[i])
2533 pchanged = 1;
2534 }
2535
2536 n = 0;
2537
2538 if (pchanged)
2539 {
2540 for (; n < (unsigned int)i; n++)
2541 {
2542 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2543 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2544 {
2545 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2546 break;
2547 }
2548 }
2549 }
2550
2551 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2552 {
2553 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2554 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2555 am_transparent = 0;
2556 /* XXX: also turn off Opt_transparent? */
2557 }
2558 else
2559 {
2560#if WAIT_FOR_WM
2561 /* wait (an arbitrary period) for the WM to do its thing
2562 * needed for fvwm2.2.2 (and before?) */
2563 sleep (1);
2564#endif
2565 for (n = 0; n < (unsigned int)i; n++)
2566 {
2567 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2568 XClearWindow (disp, TermWin.parent[n]);
2569 }
2570
2571 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2572 am_transparent = 1;
2573 }
2574
2575 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2576 TermWin.parent[i] = None;
2577 }
2578
2579 if (scrollBar.win)
2580 {
2581 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2582 scrollBar.setIdle ();
2583 scrollbar_show (0);
2584 }
2585
2586 if (am_transparent)
2587 {
2588 want_refresh = want_full_refresh = 1;
2589 if (am_pixmap_trans)
2590 flush ();
2591 }
2592
2593 return pchanged;
2594}
2595#endif
2596 2227
2597/*}}} */ 2228/*}}} */
2598 2229
2599bool 2230void
2600rxvt_term::cmd_parse () 2231rxvt_term::cmd_parse ()
2601{ 2232{
2602 bool flag = false;
2603 unicode_t ch = NOCHAR; 2233 wchar_t ch = NOCHAR;
2604 unsigned char *seq_begin; // remember start of esc-sequence here 2234 char *seq_begin; // remember start of esc-sequence here
2605 2235
2606 for (;;) 2236 for (;;)
2607 { 2237 {
2608 if (ch == NOCHAR) 2238 if (expect_false (ch == NOCHAR))
2609 { 2239 {
2610 seq_begin = cmdbuf_ptr; 2240 seq_begin = cmdbuf_ptr;
2611 ch = next_char (); 2241 ch = next_char ();
2612 }
2613 2242
2614 if (ch == NOCHAR) // TODO: improve 2243 if (ch == NOCHAR)
2615 break; 2244 break;
2245 }
2616 2246
2617 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2247 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2618 { 2248 {
2619 if (!seen_input) 2249 if (expect_false (!seen_input))
2620 { 2250 {
2621 seen_input = 1; 2251 seen_input = 1;
2622 // many badly-written programs (e.g. jed) contain a race condition: 2252 // many badly-written programs (e.g. jed) contain a race condition:
2623 // they first read the screensize and then install a SIGWINCH handler. 2253 // they first read the screensize and then install a SIGWINCH handler.
2624 // some window managers resize the window early, and these programs 2254 // some window managers resize the window early, and these programs
… …
2629 if (seen_resize && cmd_pid) 2259 if (seen_resize && cmd_pid)
2630 kill (-cmd_pid, SIGWINCH); 2260 kill (-cmd_pid, SIGWINCH);
2631 } 2261 }
2632 2262
2633 /* Read a text string from the input buffer */ 2263 /* Read a text string from the input buffer */
2634 unicode_t buf[UBUFSIZ]; 2264 wchar_t buf[UBUFSIZ];
2635 bool refreshnow = false; 2265 bool refreshnow = false;
2636 int nlines = 0; 2266 int nlines = 0;
2637 unicode_t *str = buf; 2267 wchar_t *str = buf;
2268 wchar_t *eol = str + min (ncol, UBUFSIZ);
2638 2269
2639 for (;;) 2270 for (;;)
2640 { 2271 {
2641 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2272 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2642 break; 2273 break;
2643 2274
2644 *str++ = ch; 2275 *str++ = ch;
2645 2276
2646 if (ch == C0_LF) 2277 if (expect_false (ch == C0_LF || str >= eol))
2647 { 2278 {
2279 if (ch == C0_LF)
2648 nlines++; 2280 nlines++;
2281
2649 refresh_count++; 2282 refresh_count++;
2650 2283
2651 if (!(options & Opt_jumpScroll) 2284 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2652 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2653 { 2285 {
2286 refresh_count = 0;
2287
2288 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2289 {
2654 refreshnow = true; 2290 refreshnow = true;
2655 ch = NOCHAR; 2291 ch = NOCHAR;
2656 break; 2292 break;
2293 }
2657 } 2294 }
2658 2295
2659 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2296 // scr_add_lines only works for nlines <= nrow - 1.
2660 if (nlines >= TermWin.nrow - 1) 2297 if (nlines >= nrow - 1)
2661 { 2298 {
2299 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2300 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2662 scr_add_lines (buf, nlines, str - buf); 2301 scr_add_lines (buf, str - buf, nlines);
2302
2663 nlines = 0; 2303 nlines = 0;
2664 str = buf; 2304 str = buf;
2305 eol = str + min (ncol, UBUFSIZ);
2665 } 2306 }
2666 }
2667 2307
2668 if (str >= buf + UBUFSIZ) 2308 if (str >= eol)
2669 { 2309 {
2310 if (eol >= buf + UBUFSIZ)
2311 {
2670 ch = NOCHAR; 2312 ch = NOCHAR;
2671 break; 2313 break;
2314 }
2315 else
2316 eol = min (eol + ncol, buf + UBUFSIZ);
2317 }
2318
2672 } 2319 }
2673 2320
2674 seq_begin = cmdbuf_ptr; 2321 seq_begin = cmdbuf_ptr;
2675 ch = next_char (); 2322 ch = next_char ();
2676 } 2323 }
2677 2324
2325 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2326 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2678 scr_add_lines (buf, nlines, str - buf); 2327 scr_add_lines (buf, str - buf, nlines);
2679 2328
2680 /* 2329 /*
2681 * If there have been a lot of new lines, then update the screen 2330 * If there have been a lot of new lines, then update the screen
2682 * What the heck I'll cheat and only refresh less than every page-full. 2331 * What the heck we'll cheat and only refresh less than every page-full.
2683 * the number of pages between refreshes is refresh_limit, which 2332 * if skipScroll is enabled.
2684 * is incremented here because we must be doing flat-out scrolling.
2685 */ 2333 */
2686 if (refreshnow) 2334 if (refreshnow)
2687 { 2335 {
2688 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2689 refresh_limit++;
2690 else
2691 {
2692 flag = true;
2693 scr_refresh (refresh_type); 2336 scr_refresh ();
2694 } 2337 want_refresh = 1;
2695 } 2338 }
2696
2697 } 2339 }
2698 else 2340 else
2699 { 2341 {
2700 try 2342 try
2701 { 2343 {
… …
2709 } 2351 }
2710 2352
2711 ch = NOCHAR; 2353 ch = NOCHAR;
2712 } 2354 }
2713 } 2355 }
2714
2715 return flag;
2716}
2717
2718// read the next octet
2719unicode_t
2720rxvt_term::next_octet ()
2721{
2722 return cmdbuf_ptr < cmdbuf_endp
2723 ? *cmdbuf_ptr++
2724 : NOCHAR;
2725} 2356}
2726 2357
2727// read the next character 2358// read the next character
2728unicode_t 2359wchar_t
2729rxvt_term::next_char () 2360rxvt_term::next_char () NOTHROW
2730{ 2361{
2731 while (cmdbuf_ptr < cmdbuf_endp) 2362 while (cmdbuf_ptr < cmdbuf_endp)
2732 { 2363 {
2733 // assume 7-bit to be ascii ALWAYS 2364 // assume 7-bit to be ascii ALWAYS
2734 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2365 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2735 return *cmdbuf_ptr++; 2366 return *cmdbuf_ptr++;
2736 2367
2737 wchar_t wc; 2368 wchar_t wc;
2738 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2369 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2739 2370
2740 if (len == (size_t)-2) 2371 if (len == (size_t)-2)
2741 { 2372 {
2742 // the mbstate stores incomplete sequences. didn't know this :/ 2373 // the mbstate stores incomplete sequences. didn't know this :/
2743 cmdbuf_ptr = cmdbuf_endp; 2374 cmdbuf_ptr = cmdbuf_endp;
2744 break; 2375 break;
2745 } 2376 }
2746 2377
2747 if (len == (size_t)-1) 2378 if (len == (size_t)-1)
2379 {
2380 mbstate.reset (); // reset now undefined conversion state
2748 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2381 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2382 }
2749 2383
2750 // assume wchar == unicode 2384 // assume wchar == unicode
2751 cmdbuf_ptr += len; 2385 cmdbuf_ptr += len;
2752 return wc & UNICODE_MASK; 2386 return wc & UNICODE_MASK;
2753 } 2387 }
2754 2388
2755 return NOCHAR; 2389 return NOCHAR;
2756} 2390}
2391
2392// read the next octet
2393uint32_t
2394rxvt_term::next_octet () NOTHROW
2395{
2396 return cmdbuf_ptr < cmdbuf_endp
2397 ? (unsigned char)*cmdbuf_ptr++
2398 : NOCHAR;
2399}
2400
2401static class out_of_input out_of_input;
2757 2402
2758/* rxvt_cmd_getc () - Return next input character */ 2403/* rxvt_cmd_getc () - Return next input character */
2759/* 2404/*
2760 * Return the next input character after first passing any keyboard input 2405 * Return the next input character after first passing any keyboard input
2761 * to the command. 2406 * to the command.
2762 */ 2407 */
2763unicode_t 2408wchar_t
2764rxvt_term::cmd_getc () 2409rxvt_term::cmd_getc () THROW ((class out_of_input))
2765{ 2410{
2766 unicode_t c = next_char (); 2411 wchar_t c = next_char ();
2767 2412
2768 if (c == NOCHAR) 2413 if (c == NOCHAR)
2769 throw out_of_input; 2414 throw out_of_input;
2770 2415
2771 return c; 2416 return c;
2772} 2417}
2773 2418
2774unicode_t 2419uint32_t
2775rxvt_term::cmd_get8 () 2420rxvt_term::cmd_get8 () THROW ((class out_of_input))
2776{ 2421{
2777 unicode_t c = next_octet (); 2422 uint32_t c = next_octet ();
2778 2423
2779 if (c == NOCHAR) 2424 if (c == NOCHAR)
2780 throw out_of_input; 2425 throw out_of_input;
2781 2426
2782 return c; 2427 return c;
… …
2786/*----------------------------------------------------------------------*/ 2431/*----------------------------------------------------------------------*/
2787#ifdef PRINTPIPE 2432#ifdef PRINTPIPE
2788FILE * 2433FILE *
2789rxvt_term::popen_printer () 2434rxvt_term::popen_printer ()
2790{ 2435{
2791 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2436 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2792 2437
2793 if (stream == NULL) 2438 if (stream == NULL)
2794 rxvt_warn ("can't open printer pipe, not printing.\n"); 2439 rxvt_warn ("can't open printer pipe, not printing.\n");
2795 2440
2796 return stream; 2441 return stream;
… …
2807 * simulate attached vt100 printer 2452 * simulate attached vt100 printer
2808 */ 2453 */
2809void 2454void
2810rxvt_term::process_print_pipe () 2455rxvt_term::process_print_pipe ()
2811{ 2456{
2812 int done; 2457 FILE *fd = popen_printer ();
2813 FILE *fd;
2814 2458
2815 if ((fd = popen_printer ()) == NULL) 2459 if (!fd)
2816 return; 2460 return;
2817 2461
2818 /* 2462 /*
2819 * Send all input to the printer until either ESC[4i or ESC[?4i 2463 * Send all input to the printer until either ESC[4i or ESC[?4i
2820 * is received. 2464 * is received.
2821 */ 2465 */
2822 for (done = 0; !done;) 2466 for (int done = 0; !done; )
2823 { 2467 {
2824 unsigned char buf[8]; 2468 unsigned char buf[8];
2825 unicode_t ch; 2469 unicode_t ch;
2826 unsigned int i, len; 2470 unsigned int i, len;
2827 2471
… …
2846 { 2490 {
2847 if ((buf[len++] = cmd_getc ()) == 'i') 2491 if ((buf[len++] = cmd_getc ()) == 'i')
2848 break; /* done = 1 */ 2492 break; /* done = 1 */
2849 } 2493 }
2850 } 2494 }
2851 2495
2852 for (i = 0; i < len; i++) 2496 for (i = 0; i < len; i++)
2853 if (putc (buf[i], fd) == EOF) 2497 if (putc (buf[i], fd) == EOF)
2854 { 2498 {
2855 done = 1; 2499 done = 1;
2856 break; 2500 break;
… …
2858 } 2502 }
2859 } 2503 }
2860 2504
2861 pclose_printer (fd); 2505 pclose_printer (fd);
2862} 2506}
2863#endif /* PRINTPIPE */ 2507#endif /* PRINTPIPE */
2864/*}}} */ 2508/*}}} */
2865 2509
2866/* *INDENT-OFF* */ 2510/* *INDENT-OFF* */
2867enum { 2511enum {
2868 C1_40 = 0x40, 2512 C1_40 = 0x40,
… …
2882 case C0_ESC: 2526 case C0_ESC:
2883 process_escape_seq (); 2527 process_escape_seq ();
2884 break; 2528 break;
2885 case C0_ENQ: /* terminal Status */ 2529 case C0_ENQ: /* terminal Status */
2886 if (rs[Rs_answerbackstring]) 2530 if (rs[Rs_answerbackstring])
2887 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2531 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2888 (unsigned int)strlen (rs[Rs_answerbackstring]));
2889 else 2532 else
2890 tt_write ((unsigned char *)VT100_ANS, 2533 tt_write (VT100_ANS, strlen (VT100_ANS));
2891 (unsigned int)strlen (VT100_ANS));
2892 break; 2534 break;
2893 case C0_BEL: /* bell */ 2535 case C0_BEL: /* bell */
2894 scr_bell (); 2536 scr_bell ();
2895 break; 2537 break;
2896 case C0_BS: /* backspace */ 2538 case C0_BS: /* backspace */
… …
2920 process_dcs_seq (); 2562 process_dcs_seq ();
2921 break; 2563 break;
2922 case 0x9b: /* CSI */ 2564 case 0x9b: /* CSI */
2923 process_csi_seq (); 2565 process_csi_seq ();
2924 break; 2566 break;
2925 case 0x9d: /* CSI */ 2567 case 0x9d: /* OSC */
2926 process_osc_seq (); 2568 process_osc_seq ();
2927 break; 2569 break;
2928#endif 2570#endif
2929 } 2571 }
2930} 2572}
… …
2974 break; 2616 break;
2975 case 'Z': /* identify the terminal type */ 2617 case 'Z': /* identify the terminal type */
2976 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2618 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2977 break; 2619 break;
2978 case '<': /* turn off VT52 mode */ 2620 case '<': /* turn off VT52 mode */
2979 PrivMode (0, PrivMode_vt52); 2621 set_privmode (PrivMode_vt52, 0);
2980 break; 2622 break;
2981 case 'F': /* use special graphics character set */ 2623 case 'F': /* use special graphics character set */
2982 case 'G': /* use regular character set */ 2624 case 'G': /* use regular character set */
2983 /* unimplemented */ 2625 /* unimplemented */
2984 break; 2626 break;
… …
3020 scr_charset_set (2, (unsigned int)cmd_getc ()); 2662 scr_charset_set (2, (unsigned int)cmd_getc ());
3021 break; 2663 break;
3022 case '+': 2664 case '+':
3023 scr_charset_set (3, (unsigned int)cmd_getc ()); 2665 scr_charset_set (3, (unsigned int)cmd_getc ());
3024 break; 2666 break;
3025#if ENABLE_FRILLS 2667#if !ENABLE_MINIMAL
3026 case '6': 2668 case '6':
3027 scr_backindex (); 2669 scr_backindex ();
3028 break; 2670 break;
3029#endif 2671#endif
3030 case '7': 2672 case '7':
3031 scr_cursor (SAVE); 2673 scr_cursor (SAVE);
3032 break; 2674 break;
3033 case '8': 2675 case '8':
3034 scr_cursor (RESTORE); 2676 scr_cursor (RESTORE);
3035 break; 2677 break;
3036#if ENABLE_FRILLS 2678#if !ENABLE_MINIMAL
3037 case '9': 2679 case '9':
3038 scr_forwardindex (); 2680 scr_forwardindex ();
3039 break; 2681 break;
3040#endif 2682#endif
3041 case '=': 2683 case '=':
3042 case '>': 2684 case '>':
3043 PrivMode ((ch == '='), PrivMode_aplKP); 2685 set_privmode (PrivMode_aplKP, ch == '=');
3044 break; 2686 break;
3045 2687
3046 case C1_40: 2688 case C1_40:
3047 cmd_getc (); 2689 cmd_getc ();
3048 break; 2690 break;
… …
3051 break; 2693 break;
3052 2694
3053 /* 8.3.87: NEXT LINE */ 2695 /* 8.3.87: NEXT LINE */
3054 case C1_NEL: /* ESC E */ 2696 case C1_NEL: /* ESC E */
3055 { 2697 {
3056 unicode_t nlcr[] = { C0_LF, C0_CR }; 2698 wchar_t nlcr[] = { C0_LF, C0_CR };
3057 scr_add_lines (nlcr, 1, 2); 2699 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
3058 } 2700 }
3059 break; 2701 break;
3060 2702
3061 /* kidnapped escape sequence: Should be 8.3.48 */ 2703 /* kidnapped escape sequence: Should be 8.3.48 */
3062 case C1_ESA: /* ESC G */ 2704 case C1_ESA: /* ESC G */
… …
3084 process_dcs_seq (); 2726 process_dcs_seq ();
3085 break; 2727 break;
3086 2728
3087 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2729 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3088 case C1_SCI: /* ESC Z */ 2730 case C1_SCI: /* ESC Z */
3089 tt_write ((const unsigned char *)ESCZ_ANSWER, 2731 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3090 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3091 break; /* steal obsolete ESC [ c */ 2732 break; /* steal obsolete ESC [ c */
3092 2733
3093 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2734 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3094 case C1_CSI: /* ESC [ */ 2735 case C1_CSI: /* ESC [ */
3095 process_csi_seq (); 2736 process_csi_seq ();
3096 break; 2737 break;
3097 2738
3098 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2739 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3099 case C1_OSC: /* ESC ] */ 2740 case C1_OSC: /* ESC ] */
3100 process_osc_seq (); 2741 process_osc_seq ();
3101 break; 2742 break;
3102 2743
3103 /* 8.3.106: RESET TO INITIAL STATE */ 2744 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3104 case 'c': 2745 case 'c':
3105 mbstate.reset (); 2746 mbstate.reset ();
3106 scr_poweron (); 2747 scr_poweron ();
3107 scrollbar_show (1); 2748 scrollBar.show (1);
3108 break; 2749 break;
3109 2750
3110 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2751 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3111 case 'n': 2752 case 'n':
3112 scr_charset_choose (2); 2753 scr_charset_choose (2);
… …
3132 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2773 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
3133 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2774 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
3134 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2775 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
3135}; 2776};
3136 2777
3137#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2778#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
3138 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2779 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3139 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2780 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3140#define get_byte_array_bit(array, bit) \ 2781#define get_byte_array_bit(array, bit) \
3141 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2782 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
3142 2783
3143const unsigned char csi_defaults[] = 2784static const unsigned char csi_defaults[] =
3144 { 2785 {
3145 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2786 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
3146 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2787 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
3147 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2788 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
3148 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2789 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
3157rxvt_term::process_csi_seq () 2798rxvt_term::process_csi_seq ()
3158{ 2799{
3159 unicode_t ch, priv, i; 2800 unicode_t ch, priv, i;
3160 unsigned int nargs, p; 2801 unsigned int nargs, p;
3161 int n, ndef; 2802 int n, ndef;
3162 int arg[ESC_ARGS]; 2803 int arg[ESC_ARGS] = { };
3163 2804
3164 for (nargs = ESC_ARGS; nargs > 0;) 2805 nargs = 0;
3165 arg[--nargs] = 0;
3166 2806
3167 priv = 0; 2807 priv = 0;
3168 ch = cmd_getc (); 2808 ch = cmd_getc ();
3169 if (ch >= '<' && ch <= '?') 2809 if ((ch >= '<' && ch <= '?') || ch == '!')
2810 {
3170 { /* '<' '=' '>' '?' */ 2811 /* '<' '=' '>' '?' '!' */
3171 priv = ch; 2812 priv = ch;
3172 ch = cmd_getc (); 2813 ch = cmd_getc ();
3173 } 2814 }
3174 2815
3175 /* read any numerical arguments */ 2816 /* read any numerical arguments */
… …
3204 ndef = get_byte_array_bit (csi_defaults, i); 2845 ndef = get_byte_array_bit (csi_defaults, i);
3205 for (p = 0; p < nargs; p++) 2846 for (p = 0; p < nargs; p++)
3206 if (arg[p] == -1) 2847 if (arg[p] == -1)
3207 arg[p] = ndef; 2848 arg[p] = ndef;
3208 2849
3209#ifdef DEBUG_CMD
3210 fprintf (stderr, "CSI ");
3211 for (p = 0; p < nargs; p++)
3212 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3213 fprintf (stderr, "%c\n", ch);
3214#endif
3215
3216 /* 2850 /*
3217 * private mode handling 2851 * private mode handling
3218 */ 2852 */
3219 if (priv) 2853 if (priv)
3220 { 2854 {
3221 switch (priv) 2855 switch (priv)
3222 { 2856 {
3223 case '>': 2857 case '>':
3224 if (ch == CSI_DA) /* secondary device attributes */ 2858 if (ch == CSI_DA) /* secondary device attributes */
3225 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2859 {
2860 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2861 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2862 //
2863 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2864 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2865 // versions.
2866 //
2867 tt_printf ("\033[>%d;95;0c", 'U');
2868 }
3226 break; 2869 break;
2870
3227 case '?': 2871 case '?':
3228 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2872 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3229 process_terminal_mode (ch, priv, nargs, arg); 2873 process_terminal_mode (ch, priv, nargs, arg);
3230 break; 2874 break;
2875
2876 case '!':
2877 if (ch == CSI_70)
2878 {
2879 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2880 scr_soft_reset ();
2881
2882 static const int pm_h[] = { 7, 25 };
2883 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2884
2885 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2886 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
3231 } 2887 }
2888 break;
2889 }
2890
3232 return; 2891 return;
3233 } 2892 }
3234 2893
3235 switch (ch) 2894 switch (ch)
3236 { 2895 {
… …
3335 2994
3336 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2995 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3337 arg[0] = -arg[0]; 2996 arg[0] = -arg[0];
3338 /* FALLTHROUGH */ 2997 /* FALLTHROUGH */
3339 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2998 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3340 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2999 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3341 break; 3000 break;
3342 3001
3343 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3002 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3344 tt_write ((const unsigned char *)VT100_ANS, 3003 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3345 (unsigned int) (sizeof (VT100_ANS) - 1));
3346 break; 3004 break;
3347 3005
3348 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3006 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3349 process_sgr_mode (nargs, arg); 3007 process_sgr_mode (nargs, arg);
3350 break; 3008 break;
… …
3357 break; 3015 break;
3358 case 6: /* CPR requested */ 3016 case 6: /* CPR requested */
3359 scr_report_position (); 3017 scr_report_position ();
3360 break; 3018 break;
3361 case 7: /* unofficial extension */ 3019 case 7: /* unofficial extension */
3362 if (options & Opt_insecure) 3020 if (option (Opt_insecure))
3363 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3021 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3364 break; 3022 break;
3365 case 8: /* unofficial extension */ 3023 case 8: /* unofficial extension */
3366 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3024 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3367 break; 3025 break;
… …
3434 break; 3092 break;
3435 case CSI_75: 3093 case CSI_75:
3436 scr_cursor (RESTORE); 3094 scr_cursor (RESTORE);
3437 break; 3095 break;
3438 3096
3439#if ENABLE_FRILLS 3097#if !ENABLE_MINIMAL
3440 case CSI_74: 3098 case CSI_74:
3441 process_window_ops (arg, nargs); 3099 process_window_ops (arg, nargs);
3442 break; 3100 break;
3443#endif 3101#endif
3444 3102
… …
3451 break; 3109 break;
3452 } 3110 }
3453} 3111}
3454/*}}} */ 3112/*}}} */
3455 3113
3456#if ENABLE_FRILLS 3114#if !ENABLE_MINIMAL
3457/* ARGSUSED */ 3115/* ARGSUSED */
3458void 3116void
3459rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3117rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3460{ 3118{
3461 int x, y; 3119 int x, y;
3462 XWindowAttributes wattr; 3120 XWindowAttributes wattr;
3463 Window wdummy; 3121 Window wdummy;
3464 dDisp; 3122
3123 dLocal (Display *, dpy);
3465 3124
3466 if (nargs == 0) 3125 if (nargs == 0)
3467 return; 3126 return;
3468 3127
3469 switch (args[0]) 3128 switch (args[0])
3470 { 3129 {
3471 /* 3130 /*
3472 * commands 3131 * commands
3473 */ 3132 */
3474 case 1: /* deiconify window */ 3133 case 1: /* deiconify window */
3475 XMapWindow (disp, TermWin.parent[0]); 3134 XMapWindow (dpy, parent[0]);
3476 break; 3135 break;
3477 case 2: /* iconify window */ 3136 case 2: /* iconify window */
3478 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3137 XIconifyWindow (dpy, parent[0], display->screen);
3479 break; 3138 break;
3480 case 3: /* set position (pixels) */ 3139 case 3: /* set position (pixels) */
3481 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3140 XMoveWindow (dpy, parent[0], args[1], args[2]);
3482 break; 3141 break;
3483 case 4: /* set size (pixels) */ 3142 case 4: /* set size (pixels) */
3484 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3143 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3485 break; 3144 break;
3486 case 5: /* raise window */ 3145 case 5: /* raise window */
3487 XRaiseWindow (disp, TermWin.parent[0]); 3146 XRaiseWindow (dpy, parent[0]);
3488 break; 3147 break;
3489 case 6: /* lower window */ 3148 case 6: /* lower window */
3490 XLowerWindow (disp, TermWin.parent[0]); 3149 XLowerWindow (dpy, parent[0]);
3491 break; 3150 break;
3492 case 7: /* refresh window */ 3151 case 7: /* refresh window */
3493 scr_touch (true); 3152 scr_touch (true);
3494 break; 3153 break;
3495 case 8: /* set size (chars) */ 3154 case 8: /* set size (chars) */
3496 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3155 set_widthheight ((unsigned int) (args[2] * fwidth),
3497 (unsigned int) (args[1] * TermWin.fheight)); 3156 (unsigned int) (args[1] * fheight));
3498 break; 3157 break;
3499 3158
3500 //case 9: NYI, TODO, restore maximized window or maximize window 3159 //case 9: NYI, TODO, restore maximized window or maximize window
3501 default: 3160 default:
3502 if (args[0] >= 24) /* set height (chars) */ 3161 if (args[0] >= 24) /* set height (chars) */
3503 set_widthheight ((unsigned int)TermWin.width, 3162 set_widthheight ((unsigned int)width,
3504 (unsigned int) (args[1] * TermWin.fheight)); 3163 (unsigned int) (args[1] * fheight));
3505 break; 3164 break;
3506
3507 3165
3508 /* 3166 /*
3509 * reports - some output format copied from XTerm 3167 * reports - some output format copied from XTerm
3510 */ 3168 */
3511 case 11: /* report window state */ 3169 case 11: /* report window state */
3512 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3170 XGetWindowAttributes (dpy, parent[0], &wattr);
3513 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3171 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3514 break; 3172 break;
3515 case 13: /* report window position */ 3173 case 13: /* report window position */
3516 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3174 XGetWindowAttributes (dpy, parent[0], &wattr);
3517 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3175 XTranslateCoordinates (dpy, parent[0], wattr.root,
3518 -wattr.border_width, -wattr.border_width, 3176 -wattr.border_width, -wattr.border_width,
3519 &x, &y, &wdummy); 3177 &x, &y, &wdummy);
3520 tt_printf ("\033[3;%d;%dt", x, y); 3178 tt_printf ("\033[3;%d;%dt", x, y);
3521 break; 3179 break;
3522 case 14: /* report window size (pixels) */ 3180 case 14: /* report window size (pixels) */
3523 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3181 XGetWindowAttributes (dpy, parent[0], &wattr);
3524 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3182 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3525 break; 3183 break;
3526 case 18: /* report text area size (chars) */ 3184 case 18: /* report text area size (chars) */
3527 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3185 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3528 break; 3186 break;
3529 case 19: /* report window size (chars) */ 3187 case 19: /* report window size (chars) */
3530 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3188 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3531 break; 3189 break;
3532 case 20: /* report icon label */ 3190 case 20: /* report icon label */
3533 { 3191 {
3534 char *s; 3192 char *s;
3535 XGetIconName (disp, TermWin.parent[0], &s); 3193 XGetIconName (dpy, parent[0], &s);
3536 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3194 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3537 XFree (s); 3195 XFree (s);
3538 } 3196 }
3539 break; 3197 break;
3540 case 21: /* report window title */ 3198 case 21: /* report window title */
3541 { 3199 {
3542 char *s; 3200 char *s;
3543 XFetchName (disp, TermWin.parent[0], &s); 3201 XFetchName (dpy, parent[0], &s);
3544 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3202 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3545 XFree (s); 3203 XFree (s);
3546 } 3204 }
3547 break; 3205 break;
3548 } 3206 }
3549} 3207}
… …
3552/*----------------------------------------------------------------------*/ 3210/*----------------------------------------------------------------------*/
3553/* 3211/*
3554 * get input up until STRING TERMINATOR (or BEL) 3212 * get input up until STRING TERMINATOR (or BEL)
3555 * ends_how is terminator used. returned input must be free()'d 3213 * ends_how is terminator used. returned input must be free()'d
3556 */ 3214 */
3557unsigned char * 3215char *
3558rxvt_term::get_to_st (unicode_t &ends_how) 3216rxvt_term::get_to_st (unicode_t &ends_how)
3559{ 3217{
3560 unicode_t ch; 3218 unicode_t ch;
3561 bool seen_esc = false; 3219 bool seen_esc = false;
3562 unsigned int n = 0; 3220 unsigned int n = 0;
… …
3576 seen_esc = true; 3234 seen_esc = true;
3577 continue; 3235 continue;
3578 } 3236 }
3579 else if (ch == C0_BEL || ch == CHAR_ST) 3237 else if (ch == C0_BEL || ch == CHAR_ST)
3580 break; 3238 break;
3239 else if (ch == C0_SYN)
3240 ch = cmd_get8 ();
3581 else if (ch < 0x20) 3241 else if (ch < 0x20)
3582 return NULL; /* other control character - exit */ 3242 return NULL; /* other control character - exit */
3583 3243
3584 seen_esc = false; 3244 seen_esc = false;
3585 3245
3586 if (n >= sizeof (string) - 1) 3246 if (n >= STRING_MAX - 1)
3587 // stop at some sane length 3247 // stop at some sane length
3588 return NULL; 3248 return NULL;
3589 3249
3590 if (ch == C0_SYN)
3591 string[n++] = cmd_get8 ();
3592 else
3593 string[n++] = ch; 3250 string[n++] = ch;
3594 } 3251 }
3595 3252
3596 string[n++] = '\0'; 3253 string[n++] = '\0';
3597 3254
3598 ends_how = (ch == 0x5c ? C0_ESC : ch); 3255 ends_how = (ch == 0x5c ? C0_ESC : ch);
3599 3256
3600 return (unsigned char *)rxvt_wcstombs (string); 3257 return rxvt_wcstombs (string);
3601} 3258}
3602 3259
3603/*----------------------------------------------------------------------*/ 3260/*----------------------------------------------------------------------*/
3604/* 3261/*
3605 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3262 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3606 */ 3263 */
3607void 3264void
3608rxvt_term::process_dcs_seq () 3265rxvt_term::process_dcs_seq ()
3609{ 3266{
3610 unsigned char *s;
3611 unicode_t eh;
3612
3613 /* 3267 /*
3614 * Not handled yet 3268 * Not handled yet
3615 */ 3269 */
3270
3271 unicode_t eh;
3616 s = get_to_st (eh); 3272 char *s = get_to_st (eh);
3617 if (s) 3273 if (s)
3618 free (s); 3274 free (s);
3619 3275
3620 return; 3276 return;
3621} 3277}
… …
3625 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3281 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3626 */ 3282 */
3627void 3283void
3628rxvt_term::process_osc_seq () 3284rxvt_term::process_osc_seq ()
3629{ 3285{
3630 unicode_t ch, eh;
3631 int arg; 3286 int arg;
3632 3287
3633 ch = cmd_getc (); 3288 unicode_t ch = cmd_getc ();
3634 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3289 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3635 arg = arg * 10 + (ch - '0'); 3290 arg = arg * 10 + (ch - '0');
3636 3291
3637 if (ch == ';') 3292 if (ch == ';')
3638 { 3293 {
3294 unicode_t eh;
3639 unsigned char *s = get_to_st (eh); 3295 char *s = get_to_st (eh);
3640 3296
3641 if (s) 3297 if (s)
3642 { 3298 {
3643 process_xterm_seq (arg, (char *)s, eh); 3299 process_xterm_seq (arg, s, eh);
3644 free (s); 3300 free (s);
3645 } 3301 }
3646 } 3302 }
3647} 3303}
3648 3304
3649void 3305void
3650rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3306rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3651{ 3307{
3652 if (str[0] == '?' && !str[1]) 3308 if (str[0] == '?' && !str[1])
3653 { 3309 {
3654 unsigned short r, g, b; 3310 rgba c;
3655 pix_colors_focused[color].get (display, r, g, b); 3311 pix_colors_focused[color].get (c);
3312
3313#if XFT
3314 if (c.a != rgba::MAX_CC)
3315 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3316 else
3317#endif
3656 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3318 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3657 } 3319 }
3658 else 3320 else
3659 set_window_color (color, str); 3321 set_window_color (color, str);
3660} 3322}
3661 3323
3662/* 3324/*
3663 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3325 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3664 * 0 = change iconName/title
3665 * 1 = change iconName
3666 * 2 = change title
3667 * 4 = change color
3668 * 10 = change fg color
3669 * 11 = change bg color
3670 * 12 = change text color
3671 * 13 = change mouse foreground color
3672 * 17 = change highlight character colour
3673 * 18 = change bold character color
3674 * 19 = change underlined character color
3675 * 46 = change logfile (not implemented)
3676 * 50 = change font
3677 *
3678 * rxvt extensions:
3679 * 20 = bg pixmap
3680 * 39 = change default fg color
3681 * 49 = change default bg color
3682 * 55 = dump scrollback buffer and all of screen
3683 * 701 = change locale
3684 * 702 = find font
3685 * 703 = menu
3686 */ 3326 */
3687void 3327void
3688rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3328rxvt_term::process_xterm_seq (int op, char *str, char resp)
3689{ 3329{
3690 int changed = 0;
3691 int color; 3330 int color;
3692 char *buf, *name; 3331 char *buf, *name;
3693 bool query = str[0] == '?' && !str[1]; 3332 bool query = str[0] == '?' && !str[1];
3694 int saveop = op; 3333 int saveop = op;
3695 dDisp; 3334
3335 dLocal (Display *, dpy);
3696 3336
3697 assert (str != NULL); 3337 assert (str != NULL);
3338
3339 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3340 return;
3341
3698 switch (op) 3342 switch (op)
3699 { 3343 {
3700 case XTerm_name: 3344 case XTerm_name:
3701 set_title (str); 3345 set_title (str);
3702 /* FALLTHROUGH */ 3346 /* FALLTHROUGH */
… …
3716 unsigned long bytes_after; 3360 unsigned long bytes_after;
3717 unsigned char *value = 0; 3361 unsigned char *value = 0;
3718 const char *str = ""; 3362 const char *str = "";
3719 3363
3720 if (prop 3364 if (prop
3721 && XGetWindowProperty (disp, TermWin.parent[0], 3365 && XGetWindowProperty (dpy, parent[0],
3722 prop, 0, 1<<16, 0, AnyPropertyType, 3366 prop, 0, 1<<16, 0, AnyPropertyType,
3723 &actual_type, &actual_format, 3367 &actual_type, &actual_format,
3724 &nitems, &bytes_after, &value) == Success 3368 &nitems, &bytes_after, &value) == Success
3725 && actual_type != None 3369 && actual_type != None
3726 && actual_format == 8) 3370 && actual_format == 8)
3727 str = (const char *)(value); 3371 str = (const char *)(value);
3728 3372
3729 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3373 tt_printf ("\033]%d;%s%c", op, str, resp);
3730 3374
3731 XFree (value); 3375 XFree (value);
3732 } 3376 }
3733 else 3377 else
3734 { 3378 {
3735 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3379 char *eq = strchr (str, '=');
3736 3380
3737 if (eq) 3381 if (eq)
3738 { 3382 {
3739 *eq = 0; 3383 *eq = 0;
3740 set_utf8_property (display->atom (str), eq + 1); 3384 set_utf8_property (display->atom (str), eq + 1);
3741 } 3385 }
3742 else 3386 else
3743 XDeleteProperty (disp, TermWin.parent[0], 3387 XDeleteProperty (dpy, parent[0],
3744 display->atom (str)); 3388 display->atom (str));
3745 } 3389 }
3746 break; 3390 break;
3747 3391
3748 case XTerm_Color: 3392 case XTerm_Color:
… …
3750 { 3394 {
3751 if ((name = strchr (buf, ';')) == NULL) 3395 if ((name = strchr (buf, ';')) == NULL)
3752 break; 3396 break;
3753 3397
3754 *name++ = '\0'; 3398 *name++ = '\0';
3755 color = atoi (buf); 3399 color = atoi (buf) + minCOLOR;
3756 3400
3757 if (color < 0 || color >= TOTAL_COLORS) 3401 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3758 break; 3402 break;
3759 3403
3760 if ((buf = strchr (name, ';')) != NULL) 3404 if ((buf = strchr (name, ';')) != NULL)
3761 *buf++ = '\0'; 3405 *buf++ = '\0';
3762 3406
3763 if (name[0] == '?' && !name[1]) 3407 process_color_seq (op, color, name, resp);
3408 }
3409 break;
3410 case Rxvt_restoreFG:
3411 case XTerm_Color00:
3412 process_color_seq (op, Color_fg, str, resp);
3413 break;
3414 case Rxvt_restoreBG:
3415 case XTerm_Color01:
3416 process_color_seq (op, Color_bg, str, resp);
3417 break;
3418#ifndef NO_CURSORCOLOR
3419 case XTerm_Color_cursor:
3420 process_color_seq (op, Color_cursor, str, resp);
3421 break;
3422#endif
3423 case XTerm_Color_pointer_fg:
3424 process_color_seq (op, Color_pointer_fg, str, resp);
3425 break;
3426 case XTerm_Color_pointer_bg:
3427 process_color_seq (op, Color_pointer_bg, str, resp);
3428 break;
3429#ifdef OPTION_HC
3430 case XTerm_Color_HC:
3431 process_color_seq (op, Color_HC, str, resp);
3432 break;
3433 case XTerm_Color_HTC:
3434 process_color_seq (op, Color_HTC, str, resp);
3435 break;
3436#endif
3437#ifndef NO_BOLD_UNDERLINE_REVERSE
3438 case URxvt_Color_BD:
3439 process_color_seq (op, Color_BD, str, resp);
3440 break;
3441 case URxvt_Color_UL:
3442 process_color_seq (op, Color_UL, str, resp);
3443 break;
3444 case URxvt_Color_IT:
3445 process_color_seq (op, Color_IT, str, resp);
3446 break;
3447#endif
3448 case URxvt_Color_border:
3449 process_color_seq (op, Color_border, str, resp);
3450 break;
3451#if ENABLE_TRANSPARENCY
3452 case URxvt_Color_tint:
3453 process_color_seq (op, Color_tint, str, resp);
3454 {
3455 bool changed = false;
3456
3457 if (ISSET_PIXCOLOR (Color_tint))
3458 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3459
3460 if (changed)
3461 update_background ();
3462 }
3463
3464 break;
3465#endif
3466
3467#if BG_IMAGE_FROM_FILE
3468 case Rxvt_Pixmap:
3469 if (!strcmp (str, "?"))
3470 {
3471 char str[256];
3472
3473 sprintf (str, "[%dx%d+%d+%d]",
3474 min (h_scale, 32767), min (v_scale, 32767),
3475 min (h_align, 32767), min (v_align, 32767));
3476 process_xterm_seq (XTerm_title, str, CHAR_ST);
3477 }
3478 else
3479 {
3480 int changed = 0;
3481
3482 if (*str != ';')
3764 { 3483 {
3765 unsigned short r, g, b; 3484 if (bg_set_file (str)) /* change pixmap */
3766 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3485 {
3767 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3486 changed++;
3487 str = strchr (str, ';');
3488 if (str == NULL)
3489 bg_set_default_geometry ();
3490 else
3491 bg_set_geometry (str+1);
3492 }
3768 } 3493 }
3769 else 3494 else
3770 set_window_color (color + minCOLOR, name); 3495 {
3496 str++;
3497 if (bg_set_geometry (str, true))
3498 changed++;
3499 }
3500
3501 if (changed)
3502 {
3503 if (bg_window_position_sensitive ())
3504 {
3505 int x, y;
3506 get_window_origin (x, y);
3507 bg_set_position (x, y);
3508 }
3509 update_background ();
3510 }
3771 } 3511 }
3772 break; 3512 break;
3773 case XTerm_Color00:
3774 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3775 break;
3776 case XTerm_Color01:
3777 process_color_seq (XTerm_Color00, Color_bg, str, resp);
3778 break;
3779#ifndef NO_CURSORCOLOR
3780 case XTerm_Color_cursor:
3781 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3782 break;
3783#endif 3513#endif
3784 case XTerm_Color_pointer_fg:
3785 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3786 break;
3787 case XTerm_Color_pointer_bg:
3788 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3789 break;
3790#ifndef NO_BOLD_UNDERLINE_REVERSE
3791 case XTerm_Color_BD:
3792 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3793 break;
3794 case XTerm_Color_IT:
3795 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3796 break;
3797 case XTerm_Color_UL:
3798 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3799 break;
3800 case XTerm_Color_RV:
3801 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3802 break;
3803#endif
3804#if TRANSPARENT && TINTING
3805 case XTerm_Color_tint:
3806 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3807 check_our_parents ();
3808 if (am_transparent)
3809 want_full_refresh = want_refresh = 1;
3810 break;
3811#endif
3812
3813 case XTerm_Pixmap:
3814 if (*str != ';')
3815 {
3816#if XPM_BACKGROUND
3817 scale_pixmap (""); /* reset to default scaling */
3818 set_bgPixmap (str); /* change pixmap */
3819#endif
3820 scr_touch (true);
3821 }
3822 while ((str = strchr (str, ';')) != NULL)
3823 {
3824 str++;
3825#if XPM_BACKGROUND
3826 changed += scale_pixmap (str);
3827#endif
3828 }
3829
3830 if (changed)
3831 {
3832#ifdef XPM_BACKGROUND
3833 resize_pixmap ();
3834#endif
3835 scr_touch (true);
3836 }
3837 break;
3838
3839 case XTerm_restoreFG:
3840 set_window_color (Color_fg, str);
3841 break;
3842 case XTerm_restoreBG:
3843 set_window_color (Color_bg, str);
3844 break;
3845 3514
3846 case XTerm_logfile: 3515 case XTerm_logfile:
3847 // TODO, when secure mode? 3516 // TODO, when secure mode?
3848 break; 3517 break;
3849 3518
3519#if 0
3520 case Rxvt_dumpscreen: /* no error notices */
3521 {
3522 int fd;
3523 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3524 {
3525 scr_dump (fd);
3526 close (fd);
3527 }
3528 }
3529 break;
3530#endif
3850 case XTerm_font: 3531 case XTerm_font:
3851 op = URxvt_font; 3532 op = URxvt_font;
3852 case URxvt_font: 3533 case URxvt_font:
3853#if ENABLE_STYLES 3534#if ENABLE_STYLES
3854 case URxvt_boldFont: 3535 case URxvt_boldFont:
3855 case URxvt_italicFont: 3536 case URxvt_italicFont:
3856 case URxvt_boldItalicFont: 3537 case URxvt_boldItalicFont:
3857#endif 3538#endif
3858 if (query) 3539 if (query)
3859 tt_printf ("\33]%d;%-.250s%c", saveop, 3540 tt_printf ("\33]%d;%-.250s%c", saveop,
3860 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3541 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3861 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3542 ? fontset[op - URxvt_font]->fontdesc : "",
3862 resp); 3543 resp);
3863 else 3544 else
3864 { 3545 {
3865 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3546 const char *&res = rs[Rs_font + (op - URxvt_font)];
3866 3547
… …
3868 allocated.push_back ((void *)res); 3549 allocated.push_back ((void *)res);
3869 set_fonts (); 3550 set_fonts ();
3870 } 3551 }
3871 break; 3552 break;
3872 3553
3873#if ENABLE_FRILLS 3554 case URxvt_version:
3874 case XTerm_locale:
3875 if (query) 3555 if (query)
3556 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3557 op,
3558 rs[Rs_name], VERSION[0], VERSION[2],
3559 resp);
3560 break;
3561
3562#if !ENABLE_MINIMAL
3563 case URxvt_locale:
3564 if (query)
3876 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3565 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3877 else 3566 else
3878 { 3567 {
3879 set_locale (str); 3568 set_locale (str);
3880 pty.set_utf8_mode (enc_utf8); 3569 pty->set_utf8_mode (enc_utf8);
3881# ifdef USE_XIM
3882 im_cb (); 3570 init_xlocale ();
3883# endif
3884 } 3571 }
3885 break; 3572 break;
3886#endif
3887 3573
3888#ifdef MENUBAR 3574 case URxvt_view_up:
3889 case XTerm_Menu: 3575 case URxvt_view_down:
3890 if (options & Opt_insecure) 3576 {
3891 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3577 int lines = atoi (str);
3578
3579 if (lines)
3580 scr_page (op == URxvt_view_up ? UP : DN, lines);
3581 else
3582 scr_erase_savelines ();
3583 }
3584
3892 break; 3585 break;
3893#endif 3586#endif
3894#if 0 3587
3895 case XTerm_dumpscreen: /* no error notices */ 3588#if ENABLE_PERL
3896 { 3589 case URxvt_perl:
3897 int fd; 3590 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3898 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3899 {
3900 scr_dump (fd);
3901 close (fd);
3902 }
3903 }
3904 break; 3591 break;
3905#endif 3592#endif
3906 } 3593 }
3907} 3594}
3908/*----------------------------------------------------------------------*/ 3595/*----------------------------------------------------------------------*/
… …
3931 { 3618 {
3932 if (mode == 'r') 3619 if (mode == 'r')
3933 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3620 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3934 else 3621 else
3935 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3622 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3936 PrivMode (state, bit); 3623
3624 set_privmode (bit, state);
3937 } 3625 }
3938 3626
3939 return state; 3627 return state;
3940} 3628}
3941 3629
3942/* we're not using priv _yet_ */ 3630/* we're not using priv _yet_ */
3943void 3631void
3944rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3632rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3945{ 3633{
3946 unsigned int i, j; 3634 unsigned int i, j;
3947 int state; 3635 int state;
3948 3636
3949 static const struct 3637 static const struct
3950 { 3638 {
3951 const int argval; 3639 const int argval;
3952 const unsigned long bit; 3640 const unsigned long bit;
3953 }
3954
3955 argtopriv[] = { 3641 } argtopriv[] = {
3956 { 1, PrivMode_aplCUR }, 3642 { 1, PrivMode_aplCUR }, // DECCKM
3957 { 2, PrivMode_vt52 }, 3643 { 2, PrivMode_vt52 },
3958 { 3, PrivMode_132 }, 3644 { 3, PrivMode_132 }, // DECCOLM
3959 { 4, PrivMode_smoothScroll }, 3645 { 4, PrivMode_smoothScroll }, // DECSCLM
3960 { 5, PrivMode_rVideo }, 3646 { 5, PrivMode_rVideo }, // DECSCNM
3961 { 6, PrivMode_relOrigin }, 3647 { 6, PrivMode_relOrigin }, // DECOM
3962 { 7, PrivMode_Autowrap }, 3648 { 7, PrivMode_Autowrap }, // DECAWM
3963 // 8, bi-directional support mode 3649 // 8, auto-repeat keys // DECARM
3964 { 9, PrivMode_MouseX10 }, 3650 { 9, PrivMode_MouseX10 },
3965#ifdef menuBar_esc 3651 // 18 end FF to printer after print screen
3966 { menuBar_esc, PrivMode_menuBar }, 3652 // 19 Print screen prints full screen/scroll region
3967#endif
3968 // 18, 19 printing-related
3969 { 25, PrivMode_VisibleCursor }, 3653 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3970#ifdef scrollBar_esc 3654#ifdef scrollBar_esc
3971 { scrollBar_esc, PrivMode_scrollBar }, 3655 { scrollBar_esc, PrivMode_scrollBar },
3972#endif 3656#endif
3973 { 35, PrivMode_ShiftKeys }, // rxvt extension 3657 { 35, PrivMode_ShiftKeys }, // rxvt extension
3658 // 38, tektronix mode // DECTEK
3974 { 40, PrivMode_132OK }, 3659 { 40, PrivMode_132OK },
3975 // 41 xterm more fixes NYI 3660 // 41 xterm more fixes NYI
3976 // 45 margin bell NYI 3661 // 45 margin bell NYI
3977 // 46 start logging 3662 // 46 start logging
3978 { 47, PrivMode_Screen }, 3663 { 47, PrivMode_Screen },
3979 { 66, PrivMode_aplKP }, 3664 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3980#ifndef NO_BACKSPACE_KEY 3665#ifndef NO_BACKSPACE_KEY
3981 { 67, PrivMode_BackSpace }, 3666 { 67, PrivMode_BackSpace }, // DECBKM
3982#endif 3667#endif
3983 { 1000, PrivMode_MouseX11 }, 3668 { 1000, PrivMode_MouseX11 },
3984 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3669 { 1002, PrivMode_MouseBtnEvent },
3985 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3670 { 1003, PrivMode_MouseAnyEvent },
3986 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3671#if ENABLE_FRILLS
3672 { 1005, PrivMode_ExtModeMouse },
3673#endif
3987 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3674 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3988 { 1011, PrivMode_Keypress }, // rxvt extension 3675 { 1011, PrivMode_Keypress }, // rxvt extension
3676#if ENABLE_FRILLS
3677 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3678#endif
3989 // 1035 enable modifiers for alt, numlock NYI 3679 // 1035 enable modifiers for alt, numlock NYI
3990 // 1036 send ESC for meta keys NYI 3680 // 1036 send ESC for meta keys NYI
3991 // 1037 send DEL for keypad delete NYI 3681 // 1037 send DEL for keypad delete NYI
3992 { 1047, PrivMode_Screen }, 3682 { 1047, PrivMode_Screen },
3993 // 1048 save and restore cursor 3683 // 1048 save and restore cursor, implemented in code
3994 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3684 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3995 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3685 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3686 { 2004, PrivMode_BracketPaste },
3996 }; 3687 };
3997 3688
3998 if (nargs == 0) 3689 if (nargs == 0)
3999 return; 3690 return;
4000 3691
… …
4007 for (i = 0; i < nargs; i++) 3698 for (i = 0; i < nargs; i++)
4008 { 3699 {
4009 state = -1; 3700 state = -1;
4010 3701
4011 /* basic handling */ 3702 /* basic handling */
4012 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3703 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
4013 if (argtopriv[j].argval == arg[i]) 3704 if (argtopriv[j].argval == arg[i])
4014 { 3705 {
4015 state = privcases (mode, argtopriv[j].bit); 3706 state = privcases (mode, argtopriv[j].bit);
4016 break; 3707 break;
4017 } 3708 }
4018 3709
4019 /* extra handling for values with state unkept */ 3710 /* extra handling for values with state unkept */
4020 switch (arg[i]) 3711 switch (arg[i])
4021 { 3712 {
3713#if ENABLE_STYLES
3714 case 1021:
3715 set_option (Opt_intensityStyles, mode);
3716
3717 scr_touch (true);
3718 break;
3719#endif
4022 case 1048: /* alternative cursor save */ 3720 case 1048: /* alternative cursor save */
4023 case 1049:
4024 if (options & Opt_secondaryScreen) 3721 if (option (Opt_secondaryScreen))
4025 if (mode == 0) 3722 if (mode == 0)
4026 scr_cursor (RESTORE); 3723 scr_cursor (RESTORE);
4027 else if (mode == 1) 3724 else if (mode == 1)
4028 scr_cursor (SAVE); 3725 scr_cursor (SAVE);
4029 break; 3726 break;
… …
4037 case 2: /* VT52 mode */ 3734 case 2: /* VT52 mode */
4038 /* oddball mode. should be set regardless of set/reset 3735 /* oddball mode. should be set regardless of set/reset
4039 * parameter. Return from VT52 mode with an ESC < from 3736 * parameter. Return from VT52 mode with an ESC < from
4040 * within VT52 mode 3737 * within VT52 mode
4041 */ 3738 */
4042 PrivMode (1, PrivMode_vt52); 3739 set_privmode (PrivMode_vt52, 1);
4043 break; 3740 break;
4044 case 3: /* 80/132 */ 3741 case 3: /* 80/132 */
4045 if (priv_modes & PrivMode_132OK) 3742 if (priv_modes & PrivMode_132OK)
4046 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3743 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4047 break; 3744 break;
4048 case 4: /* smooth scrolling */ 3745 case 4: /* smooth scrolling */
4049 if (state)
4050 options &= ~Opt_jumpScroll;
4051 else
4052 options |= Opt_jumpScroll; 3746 set_option (Opt_jumpScroll, !state);
4053 break; 3747 break;
4054 case 5: /* reverse video */ 3748 case 5: /* reverse video */
4055 scr_rvideo_mode (state); 3749 scr_rvideo_mode (state);
4056 break; 3750 break;
4057 case 6: /* relative/absolute origins */ 3751 case 6: /* relative/absolute origins */
… …
4061 scr_autowrap (state); 3755 scr_autowrap (state);
4062 break; 3756 break;
4063 /* case 8: - auto repeat, can't do on a per window basis */ 3757 /* case 8: - auto repeat, can't do on a per window basis */
4064 case 9: /* X10 mouse reporting */ 3758 case 9: /* X10 mouse reporting */
4065 if (state) /* orthogonal */ 3759 if (state) /* orthogonal */
4066 priv_modes &= ~PrivMode_MouseX11; 3760 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4067 break; 3761 break;
4068#ifdef menuBar_esc
4069 case menuBar_esc:
4070#ifdef MENUBAR
4071 map_menuBar (state);
4072#endif
4073 break;
4074#endif
4075#ifdef scrollBar_esc 3762#ifdef scrollBar_esc
4076 case scrollBar_esc: 3763 case scrollBar_esc:
4077 if (scrollbar_mapping (state)) 3764 if (scrollBar.map (state))
4078 { 3765 {
4079 resize_all_windows (0, 0, 0); 3766 resize_all_windows (0, 0, 0);
4080 scr_touch (true); 3767 scr_touch (true);
4081 } 3768 }
4082 break; 3769 break;
… …
4091 break; 3778 break;
4092 /* case 66: - application key pad */ 3779 /* case 66: - application key pad */
4093 /* case 67: - backspace key */ 3780 /* case 67: - backspace key */
4094 case 1000: /* X11 mouse reporting */ 3781 case 1000: /* X11 mouse reporting */
4095 if (state) /* orthogonal */ 3782 if (state) /* orthogonal */
4096 priv_modes &= ~PrivMode_MouseX10; 3783 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4097 break; 3784 break;
4098#if 0
4099 case 1001: 3785 case 1002:
4100 break; /* X11 mouse highlighting */ 3786 case 1003:
4101#endif 3787 if (state)
3788 {
3789 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3790 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3791 mouse_row = mouse_col = 0;
3792 vt_emask_mouse = PointerMotionMask;
3793 }
3794 else
3795 vt_emask_mouse = NoEventMask;
3796
3797 vt_select_input ();
3798 break;
4102 case 1010: /* scroll to bottom on TTY output inhibit */ 3799 case 1010: /* scroll to bottom on TTY output inhibit */
4103 if (state)
4104 options &= ~Opt_scrollTtyOutput;
4105 else
4106 options |= Opt_scrollTtyOutput; 3800 set_option (Opt_scrollTtyOutput, !state);
4107 break; 3801 break;
4108 case 1011: /* scroll to bottom on key press */ 3802 case 1011: /* scroll to bottom on key press */
4109 if (state)
4110 options |= Opt_scrollTtyKeypress; 3803 set_option (Opt_scrollTtyKeypress, state);
4111 else
4112 options &= ~Opt_scrollTtyKeypress;
4113 break; 3804 break;
4114 case 1047: /* secondary screen w/ clearing last */ 3805 case 1047: /* secondary screen w/ clearing last */
4115 if (options & Opt_secondaryScreen) 3806 if (option (Opt_secondaryScreen))
4116 if (current_screen != PRIMARY) 3807 if (!state)
4117 scr_erase_screen (2); 3808 scr_erase_screen (2);
3809
4118 scr_change_screen (state); 3810 scr_change_screen (state);
4119 break; 3811 break;
4120 case 1049: /* secondary screen w/ clearing first */ 3812 case 1049: /* secondary screen w/ clearing first */
3813 if (option (Opt_secondaryScreen))
3814 if (state)
3815 scr_cursor (SAVE);
3816
4121 scr_change_screen (state); 3817 scr_change_screen (state);
3818
4122 if (options & Opt_secondaryScreen) 3819 if (option (Opt_secondaryScreen))
4123 if (current_screen != PRIMARY) 3820 if (state)
4124 scr_erase_screen (2); 3821 scr_erase_screen (2);
3822 else
3823 scr_cursor (RESTORE);
4125 break; 3824 break;
4126 default: 3825 default:
4127 break; 3826 break;
4128 } 3827 }
4129 } 3828 }
… …
4255 scr_color (Color_bg, Color_bg); 3954 scr_color (Color_bg, Color_bg);
4256 break; 3955 break;
4257 3956
4258 //case 50: // not variable spacing 3957 //case 50: // not variable spacing
4259 3958
4260#ifndef NO_BRIGHTCOLOR 3959#if !ENABLE_MINIMAL
4261 case 90: 3960 case 90:
4262 case 91: /* set bright fg color */ 3961 case 91: /* set bright fg color */
4263 case 92: 3962 case 92:
4264 case 93: 3963 case 93:
4265 case 94: 3964 case 94:
… …
4277 case 106: 3976 case 106:
4278 case 107: 3977 case 107:
4279 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 3978 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4280 break; 3979 break;
4281#endif 3980#endif
4282
4283 } 3981 }
4284 } 3982 }
4285} 3983}
4286/*}}} */ 3984/*}}} */
4287 3985
… …
4290rxvt_term::process_graphics () 3988rxvt_term::process_graphics ()
4291{ 3989{
4292 unicode_t ch, cmd = cmd_getc (); 3990 unicode_t ch, cmd = cmd_getc ();
4293 3991
4294 if (cmd == 'Q') 3992 if (cmd == 'Q')
3993 {
4295 { /* query graphics */ 3994 /* query graphics */
4296 tt_printf ("\033G0\012"); /* no graphics */ 3995 tt_printf ("\033G0\012"); /* no graphics */
4297 return; 3996 return;
4298 } 3997 }
4299 /* swallow other graphics sequences until terminating ':' */ 3998 /* swallow other graphics sequences until terminating ':' */
4300 do 3999 do
… …
4311 */ 4010 */
4312void 4011void
4313rxvt_term::tt_printf (const char *fmt,...) 4012rxvt_term::tt_printf (const char *fmt,...)
4314{ 4013{
4315 va_list arg_ptr; 4014 va_list arg_ptr;
4316 unsigned char buf[256]; 4015 char buf[256];
4317 4016
4318 va_start (arg_ptr, fmt); 4017 va_start (arg_ptr, fmt);
4319 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4018 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4320 va_end (arg_ptr); 4019 va_end (arg_ptr);
4321 tt_write (buf, strlen (buf)); 4020 tt_write (buf, strlen (buf));
… …
4323 4022
4324/* ---------------------------------------------------------------------- */ 4023/* ---------------------------------------------------------------------- */
4325/* Write data to the pty as typed by the user, pasted with the mouse, 4024/* Write data to the pty as typed by the user, pasted with the mouse,
4326 * or generated by us in response to a query ESC sequence. 4025 * or generated by us in response to a query ESC sequence.
4327 */ 4026 */
4328const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4027static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4329 4028
4330void 4029void
4331rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4030rxvt_term::tt_write (const char *data, unsigned int len)
4332{ 4031{
4032 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4033 return;
4034
4035 if (pty->pty < 0)
4036 return;
4037
4333 if (v_buflen == 0) 4038 if (v_buflen == 0)
4334 { 4039 {
4335 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4040 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4336 4041
4337 if ((unsigned int)written == len) 4042 if ((unsigned int)written == len)
4338 return; 4043 return;
4339 4044
4340 data += written; 4045 data += written;
4341 len -= written; 4046 len -= written;
4342 } 4047 }
4343 4048
4344 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4049 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4345 4050
4346 memcpy (v_buffer + v_buflen, data, len); 4051 memcpy (v_buffer + v_buflen, data, len);
4347 v_buflen += len; 4052 v_buflen += len;
4348 4053
4349 pty_ev.set (EVENT_READ | EVENT_WRITE); 4054 pty_ev.set (ev::READ | ev::WRITE);
4350} 4055}
4351 4056
4352void rxvt_term::pty_write () 4057void rxvt_term::pty_write ()
4353{ 4058{
4354 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4059 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4355 4060
4356 if (written > 0) 4061 if (written > 0)
4357 { 4062 {
4358 v_buflen -= written; 4063 v_buflen -= written;
4359 4064
4360 if (v_buflen == 0) 4065 if (v_buflen == 0)
4361 { 4066 {
4362 free (v_buffer); 4067 free (v_buffer);
4363 v_buffer = 0; 4068 v_buffer = 0;
4364 v_buflen = 0;
4365 4069
4366 pty_ev.set (EVENT_READ); 4070 pty_ev.set (ev::READ);
4367 return; 4071 return;
4368 } 4072 }
4369 4073
4370 memmove (v_buffer, v_buffer + written, v_buflen); 4074 memmove (v_buffer, v_buffer + written, v_buflen);
4371 } 4075 }
4372 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4076 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4373 // original code just ignores this... 4077 pty_ev.set (ev::READ);
4374 destroy ();
4375} 4078}
4376 4079
4377/*----------------------- end-of-file (C source) -----------------------*/ 4080/*----------------------- end-of-file (C source) -----------------------*/
4378 4081

Diff Legend

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