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.199 by root, Sun Feb 20 02:00:43 2005 UTC vs.
Revision 1.485 by sf-exg, Fri Apr 29 13:08:24 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-2011 Marc Lehmann <schmorp@schmorp.de>
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);
443 return; 574 return;
444 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 575 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
445 change_font (FONT_DN);
446 return; 576 return;
447#endif 577#endif
448 } 578 }
449 } 579 }
450 } 580 }
451 581
452#if ENABLE_FRILLS || ISO_14755 582#if ENABLE_FRILLS || ISO_14755
453 // ISO 14755 support 583 // ISO 14755 support
454 if (shft && ctrl) 584 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
455 { 585 {
456 int hv; 586 int hv;
457 587
458 if (iso14755buf & ISO_14755_51 588 if (iso14755buf & ISO_14755_51
459 && (keysym == XK_space || keysym == XK_KP_Space 589 && (keysym == XK_space || keysym == XK_KP_Space
… …
461 { 591 {
462 commit_iso14755 (); 592 commit_iso14755 ();
463 iso14755buf = ISO_14755_51; 593 iso14755buf = ISO_14755_51;
464# if ISO_14755 594# if ISO_14755
465 iso14755_51 (0); 595 iso14755_51 (0);
596# endif
597 return;
598 }
599 else if (keysym == XK_BackSpace)
600 {
601 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
602# if ISO_14755
603 iso14755_51 (iso14755buf & ISO_14755_MASK);
466# endif 604# endif
467 return; 605 return;
468 } 606 }
469 else if ((hv = hex_keyval (ev)) >= 0) 607 else if ((hv = hex_keyval (ev)) >= 0)
470 { 608 {
… …
475# endif 613# endif
476 return; 614 return;
477 } 615 }
478 else 616 else
479 { 617 {
480# if ENABLE_OVERLAY 618# if ISO_14755
481 scr_overlay_off (); 619 scr_overlay_off ();
482# endif 620# endif
483 iso14755buf = 0; 621 iso14755buf = 0;
484 } 622 }
485 } 623 }
624 else if (option (Opt_iso14755) &&
486 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 625 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
487 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 626 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
488 if (!(iso14755buf & ISO_14755_STARTED)) 627 if (!(iso14755buf & ISO_14755_STARTED))
489 { 628 {
490 iso14755buf |= ISO_14755_STARTED; 629 iso14755buf |= ISO_14755_STARTED;
491# if ENABLE_OVERLAY 630# if ISO_14755
492 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 631 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
493 scr_overlay_set (0, 0, "ISO 14755 mode"); 632 scr_overlay_set (0, 0, "ISO 14755 mode");
494# endif 633# endif
495 } 634 }
496#endif 635#endif
497 636
498#ifdef PRINTPIPE 637#ifdef PRINTPIPE
499 if (keysym == XK_Print) 638 if (keysym == XK_Print)
500 { 639 {
501 scr_printscreen (ctrl | shft); 640 scr_printscreen (ctrl | shft);
502 return; 641 return;
503 } 642 }
504#endif 643#endif
505 644
506 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 645 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
507 { 646 {
647 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
648 unsigned int newlen = 1;
649
650 if (ev.state & ModNumLockMask)
651 kp = false;
652
653 keysym = translate_keypad (keysym, kp);
654
655 switch (keysym)
508 { 656 {
657#ifndef NO_BACKSPACE_KEY
658 case XK_BackSpace:
659 if (priv_modes & PrivMode_HaveBackSpace)
660 {
661 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
662 ^ !!ctrl) ? '\b' : '\177';
663 kbuf[1] = '\0';
664 }
665 else
666 strcpy (kbuf, rs[Rs_backspace_key]);
667 break;
668#endif
669#ifndef NO_DELETE_KEY
670 case XK_Delete:
671 strcpy (kbuf, rs[Rs_delete_key]);
672 break;
673#endif
674 case XK_Tab:
675 if (shft)
676 strcpy (kbuf, "\033[Z");
677 else
678 {
679#ifdef CTRL_TAB_MAKES_META
680 if (ctrl)
681 meta = 1;
682#endif
683#ifdef MOD4_TAB_MAKES_META
684 if (ev.state & Mod4Mask)
685 meta = 1;
686#endif
509 newlen = 1; 687 newlen = 0;
510 switch (keysym) 688 }
689 break;
690
691 case XK_Up: /* "\033[A" */
692 case XK_Down: /* "\033[B" */
693 case XK_Right: /* "\033[C" */
694 case XK_Left: /* "\033[D" */
695 strcpy (kbuf, "\033[Z");
696 kbuf[2] = "DACB"[keysym - XK_Left];
697 /* do Shift first */
698 if (shft)
699 kbuf[2] = "dacb"[keysym - XK_Left];
700 else if (ctrl)
701 {
702 kbuf[1] = 'O';
703 kbuf[2] = "dacb"[keysym - XK_Left];
704 }
705 else if (priv_modes & PrivMode_aplCUR)
706 kbuf[1] = 'O';
707 break;
708
709 case XK_KP_Enter:
710 /* allow shift to override */
711 if (kp)
712 {
713 strcpy (kbuf, "\033OM");
714 break;
715 }
716
717 /* FALLTHROUGH */
718
719 case XK_Return:
720 if (priv_modes & PrivMode_LFNL)
721 {
722 kbuf[0] = '\015';
723 kbuf[1] = '\012';
724 kbuf[2] = '\0';
725 }
726 else
727 {
728 kbuf[0] = '\015';
729 kbuf[1] = '\0';
730 }
731 break;
732
733 case XK_KP_F1: /* "\033OP" */
734 case XK_KP_F2: /* "\033OQ" */
735 case XK_KP_F3: /* "\033OR" */
736 case XK_KP_F4: /* "\033OS" */
737 strcpy (kbuf, "\033OP");
738 kbuf[2] += (keysym - XK_KP_F1);
739 break;
740
741 case XK_KP_Multiply: /* "\033Oj" : "*" */
742 case XK_KP_Add: /* "\033Ok" : "+" */
743 case XK_KP_Separator: /* "\033Ol" : "," */
744 case XK_KP_Subtract: /* "\033Om" : "-" */
745 case XK_KP_Decimal: /* "\033On" : "." */
746 case XK_KP_Divide: /* "\033Oo" : "/" */
747 case XK_KP_0: /* "\033Op" : "0" */
748 case XK_KP_1: /* "\033Oq" : "1" */
749 case XK_KP_2: /* "\033Or" : "2" */
750 case XK_KP_3: /* "\033Os" : "3" */
751 case XK_KP_4: /* "\033Ot" : "4" */
752 case XK_KP_5: /* "\033Ou" : "5" */
753 case XK_KP_6: /* "\033Ov" : "6" */
754 case XK_KP_7: /* "\033Ow" : "7" */
755 case XK_KP_8: /* "\033Ox" : "8" */
756 case XK_KP_9: /* "\033Oy" : "9" */
757 /* allow shift to override */
758 if (kp)
759 {
760 strcpy (kbuf, "\033Oj");
761 kbuf[2] += (keysym - XK_KP_Multiply);
762 }
763 else
764 {
765 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
766 kbuf[1] = '\0';
767 }
768 break;
769
770 default:
511 { 771 {
512#ifndef NO_BACKSPACE_KEY 772 int param = map_function_key (keysym);
513 case XK_BackSpace: 773 if (param > 0)
514 if (priv_modes & PrivMode_HaveBackSpace) 774 sprintf (kbuf,"\033[%d~", param);
515 {
516 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
517 ^ !!ctrl) ? '\b' : '\177';
518 kbuf[1] = '\0';
519 }
520 else 775 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; 776 newlen = 0;
796 break;
797 } 777 }
798 778 break;
799 if (newlen)
800 len = strlen (kbuf);
801 } 779 }
780
781 if (newlen)
782 len = strlen (kbuf);
802 783
803 /* 784 /*
804 * Pass meta for all function keys, if 'meta' option set 785 * Pass meta for all function keys, if 'meta' option set
805 */ 786 */
806#ifdef META8_OPTION 787#ifdef META8_OPTION
… …
823 { 804 {
824#ifdef META8_OPTION 805#ifdef META8_OPTION
825 /* set 8-bit on */ 806 /* set 8-bit on */
826 if (meta && (meta_char == 0x80)) 807 if (meta && (meta_char == 0x80))
827 { 808 {
828 unsigned char *ch; 809 char *ch;
829 810
830 for (ch = kbuf; ch < kbuf + len; ch++) 811 for (ch = kbuf; ch < kbuf + len; ch++)
831 *ch |= 0x80; 812 *ch |= 0x80;
832 813
833 meta = 0; 814 meta = 0;
… …
835#endif 816#endif
836 /* nil */ ; 817 /* nil */ ;
837 } 818 }
838 } 819 }
839 820
821 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
822 return;
823
840 if (len <= 0) 824 if (len <= 0)
841 return; /* not mapped */ 825 return; /* not mapped */
842 826
843 if (options & Opt_scrollTtyKeypress) 827 if (option (Opt_scrollTtyKeypress))
844 if (TermWin.view_start) 828 if (view_start)
845 { 829 {
846 TermWin.view_start = 0; 830 view_start = 0;
847 want_refresh = 1; 831 want_refresh = 1;
848 } 832 }
849 833
850 /* 834 /*
851 * these modifications only affect the static keybuffer 835 * these modifications only affect the static keybuffer
… …
866#ifdef META8_OPTION 850#ifdef META8_OPTION
867 && meta_char == C0_ESC 851 && meta_char == C0_ESC
868#endif 852#endif
869 ) 853 )
870 { 854 {
871 const unsigned char ch = C0_ESC; 855 const char ch = C0_ESC;
872 tt_write (&ch, 1); 856 tt_write (&ch, 1);
873 } 857 }
874 858
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); 859 tt_write (kbuf, (unsigned int)len);
886} 860}
887/*}}} */
888 861
889#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 862void
890/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 863rxvt_term::key_release (XKeyEvent &ev)
891/* attempt to `write' count to the input buffer */
892unsigned int
893rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
894{ 864{
895 unsigned int n, s; 865#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
866 KeySym keysym;
896 867
897 n = cmdbuf_ptr - cmdbuf_base; 868 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
898 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 869#endif
899 870
900 if (n > 0 && s < count) 871#if ENABLE_FRILLS || ISO_14755
872 // ISO 14755 support
873 if (iso14755buf)
874 if (iso14755buf & ISO_14755_52)
901 { 875 {
902 memmove (cmdbuf_base, cmdbuf_ptr, 876# if ISO_14755
903 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 877 scr_overlay_off ();
904 cmdbuf_ptr = cmdbuf_base;
905 cmdbuf_endp -= n;
906 s += n;
907 }
908
909 if (count > s)
910 {
911 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
912 count = s;
913 }
914
915 for (; count--;)
916 *cmdbuf_endp++ = *str++;
917
918 cmd_parse ();
919
920 return 0;
921}
922#endif 878# endif
879# if ISO_14755
880 // iso14755 part 5.2 handling: release time
881 // first: controls
882 if ((ev.state & ControlMask)
883 && ((keysym >= 0x40 && keysym <= 0x5f)
884 || (keysym >= 0x61 && keysym <= 0x7f)))
885 {
886 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
887 commit_iso14755 ();
888
889 return;
890 }
891
892 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
893 if (i[0] == keysym)
894 {
895 iso14755buf = ISO_14755_51 | i[1];
896 commit_iso14755 ();
897
898 return;
899 }
900
901 scr_bell ();
902# endif
903 iso14755buf = 0;
904
905 return;
906 }
907 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
908 {
909# if ISO_14755
910 scr_overlay_off ();
911# endif
912 if (iso14755buf & ISO_14755_51)
913 commit_iso14755 ();
914#if ISO_14755
915 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
916 {
917 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
918
919 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
920 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
921 }
922# endif
923 else
924 iso14755buf = 0;
925 }
926#endif
927
928 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
929 return;
930
931#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
932 if (!(ev.state & ControlMask))
933 slip_wheel_ev.stop ();
934 else if (keysym == XK_Control_L || keysym == XK_Control_R)
935 mouse_slip_wheel_speed = 0;
936#endif
937}
923 938
924void 939void
925rxvt_term::flush () 940rxvt_term::flush ()
926{ 941{
927 flush_ev.stop (); 942 flush_ev.stop ();
928 943
929#ifdef TRANSPARENT 944#ifdef HAVE_BG_PIXMAP
930 if (want_full_refresh) 945 if (bg_flags & BG_NEEDS_REFRESH)
931 { 946 {
932 want_full_refresh = 0; 947 bg_flags &= ~BG_NEEDS_REFRESH;
933 scr_clear ();
934 scr_touch (false); 948 scr_touch (false);
935 } 949 }
936#endif 950#endif
937 951
938 if (want_refresh) 952 if (want_refresh)
939 { 953 {
954 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
955 {
956 int row = view_start;
957 int end_row = row + nrow;
958
959 while (row > top_row && ROW (row - 1).is_longer ())
960 --row;
961
962 do
963 {
964 int start_row = row;
965 line_t *l;
966
967 do
968 {
969 l = &ROW (row++);
970
971 if (!(l->f & LINE_FILTERED))
972 {
973 // line not filtered, mark it as filtered
974 l->f |= LINE_FILTERED;
975 while (l->is_longer ())
976 {
977 l = &ROW (row++);
978 l->f |= LINE_FILTERED;
979 }
980
981 // and filter it
982 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
983
984 break;
985 }
986 }
987 while (l->is_longer () && row < end_row);
988 }
989 while (row < end_row);
990 }
991
940 scr_refresh (refresh_type); 992 scr_refresh ();
941 scrollbar_show (1); 993 scrollBar.show (1);
942#ifdef USE_XIM 994#ifdef USE_XIM
943 IMSendSpot (); 995 IMSendSpot ();
944#endif 996#endif
945 } 997 }
946 998
947 display->flush (); 999 display->flush ();
948} 1000}
949 1001
1002/* checks whether a refresh is requested and starts the refresh timer */
950void 1003void
951rxvt_term::check_cb (check_watcher &w) 1004rxvt_term::refresh_check ()
952{ 1005{
953 SET_R (this); 1006 if (want_refresh && !flush_ev.is_active ())
954 SET_LOCALE (locale); 1007 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
955 1008
956 display->flush (); 1009 display->flush ();
957
958 if (want_refresh && !flush_ev.active)
959 flush_ev.start (NOW + 0.01);
960} 1010}
961 1011
962void 1012void
963rxvt_term::flush_cb (time_watcher &w) 1013rxvt_term::flush_cb (ev::timer &w, int revents)
964{ 1014{
965 SET_R (this); 1015 make_current ();
966 SET_LOCALE (locale);
967 1016
968 refresh_limit = 1;
969 refresh_count = 0; 1017 refresh_count = 0;
970 flush (); 1018 flush ();
971} 1019}
972 1020
973#ifdef CURSOR_BLINK 1021#ifdef CURSOR_BLINK
974void 1022void
975rxvt_term::cursor_blink_cb (time_watcher &w) 1023rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
976{ 1024{
977 hidden_cursor = !hidden_cursor; 1025 hidden_cursor = !hidden_cursor;
978 want_refresh = 1; 1026 want_refresh = 1;
979 1027 refresh_check ();
980 w.start (w.at + BLINK_INTERVAL);
981} 1028}
982#endif 1029#endif
983 1030
984#ifdef TEXT_BLINK 1031#ifdef TEXT_BLINK
985void 1032void
986rxvt_term::text_blink_cb (time_watcher &w) 1033rxvt_term::text_blink_cb (ev::timer &w, int revents)
987{ 1034{
988 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1035 if (scr_refresh_rend (RS_Blink, RS_Blink))
989 { 1036 {
990 hidden_text = !hidden_text; 1037 hidden_text = !hidden_text;
991 want_refresh = 1; 1038 want_refresh = 1;
992 w.start (w.at + TEXT_BLINK_INTERVAL); 1039 refresh_check ();
993 } 1040 }
1041 else
1042 w.stop ();
994} 1043}
995#endif 1044#endif
996 1045
997#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1046#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
998void 1047void
999rxvt_term::cont_scroll_cb (time_watcher &w) 1048rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1000{ 1049{
1001 if ((scrollbar_isUp() || scrollbar_isDn()) && 1050 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1002 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1051 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1003 { 1052 {
1004 refresh_type |= SMOOTH_REFRESH;
1005 want_refresh = 1; 1053 want_refresh = 1;
1006 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1054 refresh_check ();
1007 } 1055 }
1056 else
1057 w.stop ();
1008} 1058}
1009#endif 1059#endif
1010 1060
1011#ifdef SELECTION_SCROLLING 1061#ifdef SELECTION_SCROLLING
1012void 1062void
1013rxvt_term::sel_scroll_cb (time_watcher &w) 1063rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1014{ 1064{
1015 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1065 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1016 { 1066 {
1017 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1067 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1018 refresh_type |= SMOOTH_REFRESH;
1019 want_refresh = 1; 1068 want_refresh = 1;
1020 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1069 refresh_check ();
1021 } 1070 }
1071 else
1072 w.stop ();
1022} 1073}
1023#endif 1074#endif
1024 1075
1025#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1076#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1026void 1077void
1027rxvt_term::slip_wheel_cb (time_watcher &w) 1078rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1028{ 1079{
1029 if (mouse_slip_wheel_speed == 0 1080 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 { 1081 {
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; 1082 want_refresh = 1;
1039 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1083 refresh_check ();
1084 }
1085
1086 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1040 } 1087 {
1088 mouse_slip_wheel_speed = 0;
1089 w.stop ();
1090 }
1091}
1092#endif
1093
1094#if LINUX_YIELD_HACK
1095static struct event_handler
1096{
1097 ev::prepare yield_ev;
1098
1099 void yield_cb (ev::prepare &w, int revents)
1100 {
1101 // this should really be sched_yield(), but the linux guys thought
1102 // that giving a process calling sched_yield () less cpu time than
1103 // ones with high nice levels is a useful thing to do. It surely is is
1104 // allowed by the sus... as is returning ENOSYS.
1105 // since the linux guys additionally thought that breaking the only
1106 // known workaround against their unusable sched_yield hack is cool,
1107 // we just nanosleep a bit and hope for the best.
1108
1109 struct timespec ts = { 0, 1000 };
1110 nanosleep (&ts, 0);
1111
1112 w.stop ();
1113 }
1114
1115 event_handler ()
1116 : yield_ev (this, &event_handler::yield_cb)
1117 {
1118 }
1119} event_handler;
1120#endif
1121
1122/* make sure all the cmd data is at beginning of cmdbuf */
1123void
1124rxvt_term::cmdbuf_reify ()
1125{
1126 if (cmdbuf_ptr == cmdbuf_base)
1127 return;
1128
1129 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1130
1131 memmove (cmdbuf_base, cmdbuf_ptr, used);
1132 cmdbuf_ptr = cmdbuf_base;
1133 cmdbuf_endp = cmdbuf_ptr + used;
1134
1135}
1136
1137#if defined (KEYSYM_RESOURCE)
1138void
1139rxvt_term::cmdbuf_append (const char *str, size_t count)
1140{
1141 cmdbuf_reify ();
1142
1143 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1144
1145 if (count > avail)
1146 return;
1147
1148 memcpy (cmdbuf_endp, str, count);
1149 cmdbuf_endp += count;
1150
1151 cmd_parse ();
1041} 1152}
1042#endif 1153#endif
1043 1154
1044bool 1155bool
1045rxvt_term::pty_fill () 1156rxvt_term::pty_fill ()
1046{ 1157{
1047 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1158 cmdbuf_reify ();
1048 1159
1049 if (CBUFSIZ == n) 1160 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1050 { 1161
1051 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1162 if (!avail)
1052 n = 0;
1053 } 1163 {
1054 1164 // normally this indicates a "too long" command sequence - just drop the data we have
1055 memmove (cmdbuf_base, cmdbuf_ptr, n);
1056 cmdbuf_ptr = cmdbuf_base; 1165 cmdbuf_ptr = cmdbuf_base;
1057 cmdbuf_endp = cmdbuf_ptr + n; 1166 cmdbuf_endp = cmdbuf_ptr;
1167 avail = CBUFSIZ;
1168 }
1058 1169
1059 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1170 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1060 1171
1061 if (n > 0) 1172 if (r > 0)
1062 { 1173 {
1063 cmdbuf_endp += n; 1174 cmdbuf_endp += r;
1064 return true; 1175 return true;
1065 } 1176 }
1066 else if (n < 0 && errno != EAGAIN) 1177 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1178 {
1179#if LINUX_YIELD_HACK
1180 if (display->is_local)
1181 event_handler.yield_ev.start ();
1182#endif
1183 }
1184 else
1185 {
1186 pty_ev.stop ();
1187
1188 if (!option (Opt_hold))
1067 destroy (); 1189 destroy ();
1068 1190 }
1191
1069 return false; 1192 return false;
1070} 1193}
1071 1194
1072void 1195void
1073rxvt_term::pty_cb (io_watcher &w, short revents) 1196rxvt_term::pty_cb (ev::io &w, int revents)
1074{ 1197{
1075 SET_R (this); 1198 make_current ();
1076 SET_LOCALE (locale);
1077 1199
1078 if (revents & EVENT_READ) 1200 if (revents & ev::READ)
1079 // loop, but don't allow a single term to monopolize us 1201 // loop, but don't allow a single term to monopolize us
1080 while (pty_fill ()) 1202 for (int i = CBUFCNT; i-- && pty_fill (); )
1081 if (cmd_parse ()) 1203 cmd_parse ();
1082 break;
1083 1204
1084 if (revents & EVENT_WRITE) 1205 if (revents & ev::WRITE)
1085 pty_write (); 1206 pty_write ();
1207
1208 refresh_check ();
1086} 1209}
1087 1210
1088void 1211void
1089rxvt_term::pointer_unblank () 1212rxvt_term::pointer_unblank ()
1090{ 1213{
1091 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1214 XDefineCursor (dpy, vt, TermWin_cursor);
1092 recolour_cursor (); 1215 recolour_cursor ();
1093 1216
1094#ifdef POINTER_BLANK 1217#ifdef POINTER_BLANK
1095 hidden_pointer = 0; 1218 hidden_pointer = 0;
1096 1219
1097 if (options & Opt_pointerBlank) 1220 if (option (Opt_pointerBlank))
1098 pointer_ev.start (NOW + pointerBlankDelay); 1221 pointer_ev.start (pointerBlankDelay);
1099#endif 1222#endif
1100} 1223}
1101 1224
1102#ifdef POINTER_BLANK 1225#ifdef POINTER_BLANK
1103void 1226void
1104rxvt_term::pointer_blank () 1227rxvt_term::pointer_blank ()
1105{ 1228{
1106 if (! (options & Opt_pointerBlank)) 1229 if (!option (Opt_pointerBlank))
1107 return; 1230 return;
1108 1231
1109 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1232 XDefineCursor (dpy, vt, display->blank_cursor);
1110 XFlush (display->display); 1233 XFlush (dpy);
1111 1234
1112 hidden_pointer = 1; 1235 hidden_pointer = 1;
1113} 1236}
1114 1237
1115void 1238void
1116rxvt_term::pointer_cb (time_watcher &w) 1239rxvt_term::pointer_cb (ev::timer &w, int revents)
1117{ 1240{
1118 SET_R (this); 1241 make_current ();
1119 SET_LOCALE (locale);
1120 1242
1121 pointer_blank (); 1243 pointer_blank ();
1122} 1244}
1123#endif 1245#endif
1124 1246
1125void 1247void
1126rxvt_term::mouse_report (XButtonEvent &ev) 1248rxvt_term::mouse_report (XButtonEvent &ev)
1127{ 1249{
1128 int button_number, key_state = 0; 1250 int button_number, key_state = 0;
1129 int x, y; 1251 int x, y;
1252 int code = 32;
1130 1253
1131 x = ev.x; 1254 x = Pixel2Col (ev.x) + 1;
1132 y = ev.y; 1255 y = Pixel2Row (ev.y) + 1;
1133 pixel_position (&x, &y); 1256
1257 if (ev.type == MotionNotify)
1258 {
1259 if (x == mouse_row && y == mouse_col)
1260 return;
1261
1262 mouse_row = x;
1263 mouse_col = y;
1264 code += 32;
1265 }
1134 1266
1135 if (MEvent.button == AnyButton) 1267 if (MEvent.button == AnyButton)
1136 button_number = 3; 1268 button_number = 3;
1137 else 1269 else
1138 { 1270 {
1139 button_number = MEvent.button - Button1; 1271 button_number = MEvent.button - Button1;
1140 /* add 0x3D for wheel events, like xterm does */ 1272 /* add 0x3D for wheel events, like xterm does */
1141 if (button_number >= 3) 1273 if (button_number >= 3)
1142 button_number += (64 - 3); 1274 button_number += 64 - 3;
1143 } 1275 }
1144 1276
1145 if (priv_modes & PrivMode_MouseX10) 1277 if (priv_modes & PrivMode_MouseX10)
1146 { 1278 {
1147 /* 1279 /*
… …
1179 fputc ('A', stderr); 1311 fputc ('A', stderr);
1180 if (key_state & 32) 1312 if (key_state & 32)
1181 fputc ('2', stderr); 1313 fputc ('2', stderr);
1182 fprintf (stderr, "]: <%d>, %d/%d\n", 1314 fprintf (stderr, "]: <%d>, %d/%d\n",
1183 button_number, 1315 button_number,
1184 x + 1, 1316 x,
1185 y + 1); 1317 y);
1186#endif 1318#endif
1187 1319
1320#if ENABLE_FRILLS
1321 if (priv_modes & PrivMode_ExtMouseRight)
1322 tt_printf ("\033[%d;%d;%dM",
1323 code + button_number + key_state,
1324 x,
1325 y);
1326 else if (priv_modes & PrivMode_ExtModeMouse)
1327 tt_printf ("\033[M%c%lc%lc",
1328 code + button_number + key_state,
1329 wint_t (32 + x),
1330 wint_t (32 + y));
1331 else
1332#endif
1188 tt_printf ("\033[M%c%c%c", 1333 tt_printf ("\033[M%c%c%c",
1189 (32 + button_number + key_state), 1334 code + button_number + key_state,
1190 (32 + x + 1), 1335 32 + x,
1191 (32 + y + 1)); 1336 32 + y);
1192} 1337}
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 1338
1204/*{{{ process an X event */ 1339/*{{{ process an X event */
1205void 1340void
1206rxvt_term::x_cb (XEvent &ev) 1341rxvt_term::x_cb (XEvent &ev)
1207{ 1342{
1208 dDisp; 1343 make_current ();
1209 1344
1210 SET_R (this); 1345 dLocal (Display *, dpy);
1211 SET_LOCALE (locale);
1212 1346
1213#if defined(CURSOR_BLINK) 1347 if (ev.xany.window == vt
1214 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1348 && SHOULD_INVOKE (HOOK_X_EVENT)
1215 { 1349 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1216 if (hidden_cursor) 1350 return;
1217 {
1218 hidden_cursor = 0;
1219 want_refresh = 1;
1220 }
1221 1351
1222 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1352 // 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; 1353 Window unused_root, unused_child;
1241 int unused_root_x, unused_root_y; 1354 int unused_root_x, unused_root_y;
1242 unsigned int unused_mask; 1355 unsigned int unused_mask;
1243 1356
1244 switch (ev.type) 1357 switch (ev.type)
1245 { 1358 {
1246 case KeyPress: 1359 case KeyPress:
1247#if ISO_14755 1360 key_press (ev.xkey);
1248 if (!(iso14755buf & ISO_14755_52))
1249#endif
1250 lookup_key (ev.xkey);
1251
1252 break; 1361 break;
1253 1362
1254 case KeyRelease: 1363 case KeyRelease:
1255 { 1364 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; 1365 break;
1323 }
1324 1366
1325 case ButtonPress: 1367 case ButtonPress:
1326 button_press (ev.xbutton); 1368 button_press (ev.xbutton);
1327 break; 1369 break;
1328 1370
… …
1330 button_release (ev.xbutton); 1372 button_release (ev.xbutton);
1331 break; 1373 break;
1332 1374
1333 case ClientMessage: 1375 case ClientMessage:
1334 if (ev.xclient.format == 32 1376 if (ev.xclient.format == 32
1377 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1378 {
1335 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS] 1379 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1380 {
1381 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1382 {
1336 && ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1383 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1337 destroy (); 1384 {
1385 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1386 destroy ();
1387 }
1388#if ENABLE_EWMH
1389 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1390 XSendEvent (dpy, ev.xclient.window = display->root,
1391 False, SubstructureRedirectMask | SubstructureNotifyMask,
1392 &ev);
1393#endif
1394 }
1395 }
1338#if ENABLE_XEMBED 1396#if ENABLE_XEMBED
1339 else if (ev.xclient.format == 32
1340 && ev.xclient.message_type == xa[XA_XEMBED]) 1397 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1341 { 1398 {
1342 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN) 1399 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1343 focus_in (); 1400 focus_in ();
1344 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1401 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1345 focus_out (); 1402 focus_out ();
1403 }
1404#endif
1346 } 1405 }
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; 1406 break;
1379 1407
1380 /* 1408 /*
1381 * XXX: this is not the _current_ arrangement 1409 * XXX: this is not the _current_ arrangement
1382 * Here's my conclusion: 1410 * Here's my conclusion:
… …
1401 break; 1429 break;
1402 } 1430 }
1403 break; 1431 break;
1404 1432
1405 case FocusIn: 1433 case FocusIn:
1434 if (ev.xfocus.detail != NotifyInferior
1435 && ev.xfocus.detail != NotifyPointer
1436 && ev.xfocus.mode != NotifyGrab)
1406 focus_in (); 1437 focus_in ();
1407 break; 1438 break;
1408 1439
1409 case FocusOut: 1440 case FocusOut:
1441 if (ev.xfocus.detail != NotifyInferior
1442 && ev.xfocus.detail != NotifyPointer
1443 && ev.xfocus.mode != NotifyGrab)
1410 focus_out (); 1444 focus_out ();
1411 break; 1445 break;
1412 1446
1413 case ConfigureNotify: 1447 case ConfigureNotify:
1414 if (ev.xconfigure.window == TermWin.parent[0]) 1448 if (ev.xconfigure.window == parent)
1415 { 1449 {
1416 int height, width; 1450 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1417
1418 do 1451 ;
1419 { /* Wrap lots of configures into one */ 1452
1453#ifdef HAVE_BG_PIXMAP
1454 bool moved = false;
1455 if (bg_window_position_sensitive ())
1456 {
1457 int x, y;
1458 if (ev.xconfigure.send_event)
1459 {
1420 width = ev.xconfigure.width; 1460 x = ev.xconfigure.x;
1421 height = ev.xconfigure.height; 1461 y = ev.xconfigure.y;
1422 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1462 }
1463 else
1464 get_window_origin (x, y);
1465
1466 if (bg_set_position (x, y)
1467 || !(bg_flags & BG_IS_VALID))
1468 moved = true;
1423 } 1469 }
1424 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1470#endif
1425 1471
1426 if (szHint.width != width || szHint.height != height) 1472 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1427 { 1473 {
1428 seen_resize = 1; 1474 seen_resize = 1;
1429 resize_all_windows (width, height, 1); 1475 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1430 } 1476 }
1431 1477 else
1432#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1478 {
1433 if (options & Opt_transparent) 1479#ifdef HAVE_BG_PIXMAP
1434 check_our_parents (); 1480 if (moved)
1481 {
1482 if (mapped)
1483 update_background ();
1484 else
1485 bg_invalidate ();
1486 }
1435#endif 1487#endif
1488 }
1489
1490 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1436 } 1491 }
1437 break; 1492 break;
1438 1493
1439 case PropertyNotify: 1494 case PropertyNotify:
1440 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1495 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1441 && ev.xproperty.state == PropertyNewValue)
1442 selection_property (ev.xproperty.window, ev.xproperty.atom);
1443
1444 break; 1496 break;
1445 1497
1446 case SelectionClear: 1498 case SelectionClear:
1447 selection_clear (); 1499 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1448 break;
1449
1450 case SelectionNotify:
1451 if (selection_wait == Sel_normal)
1452 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1453 break; 1500 break;
1454 1501
1455 case SelectionRequest: 1502 case SelectionRequest:
1456 selection_send (ev.xselectionrequest); 1503 selection_send (ev.xselectionrequest);
1457 break; 1504 break;
1458 1505
1506 case MapNotify:
1507#ifdef HAVE_BG_PIXMAP
1508 /* This is needed specifically to fix the case of no window manager or a
1509 * non-reparenting window manager. In those cases we never get first
1510 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1511 * care of multiplicity of ConfigureNotify events arriving while WM does
1512 * reparenting.
1513 * We should not render background immediately, as there could be several
1514 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1515 * by scheduling background redraw as soon as we can, but giving a short
1516 * bit of time for ConfigureNotifies to arrive.
1517 * We should render background PRIOR to drawing any text, but AFTER all
1518 * of ConfigureNotifys for the best results.
1519 */
1520 if (!(bg_flags & BG_IS_VALID))
1521 update_background_ev.start (0.025);
1522#endif
1523 mapped = 1;
1524#ifdef TEXT_BLINK
1525 text_blink_ev.start ();
1526#endif
1527 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1528 break;
1529
1459 case UnmapNotify: 1530 case UnmapNotify:
1460 TermWin.mapped = 0; 1531 mapped = 0;
1461#ifdef TEXT_BLINK 1532#ifdef TEXT_BLINK
1462 text_blink_ev.stop (); 1533 text_blink_ev.stop ();
1463#endif 1534#endif
1535 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1464 break; 1536 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 1537
1479 case GraphicsExpose: 1538 case GraphicsExpose:
1480 case Expose: 1539 case Expose:
1481 if (ev.xany.window == TermWin.vt) 1540 if (ev.xany.window == vt)
1482 { 1541 {
1483 do 1542 do
1543 {
1484 scr_expose (ev.xexpose.x, ev.xexpose.y, 1544 scr_expose (ev.xexpose.x, ev.xexpose.y,
1485 ev.xexpose.width, ev.xexpose.height, False); 1545 ev.xexpose.width, ev.xexpose.height, false);
1546 }
1486 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1487 1548
1488 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1489 1550
1490 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1552 {
1491 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1492 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, false);
1555 }
1493 1556
1494 scr_refresh (refresh_type); 1557 want_refresh = 1;
1495 } 1558 }
1496 else 1559 else
1497 { 1560 {
1498 XEvent unused_event; 1561 XEvent unused_event;
1499 1562
1500 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1563 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1501 ; 1564 ;
1502 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1565 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1503 ; 1566 ;
1504 1567
1505 if (isScrollbarWindow (ev.xany.window)) 1568 if (scrollBar.state && ev.xany.window == scrollBar.win)
1506 { 1569 {
1507 scrollBar.setIdle (); 1570 scrollBar.state = STATE_IDLE;
1508 scrollbar_show (0); 1571 scrollBar.show (0);
1509 } 1572 }
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 } 1573 }
1520 break; 1574 break;
1521 1575
1522 case MotionNotify: 1576 case MotionNotify:
1523#ifdef POINTER_BLANK 1577#ifdef POINTER_BLANK
1524 if (hidden_pointer) 1578 if (hidden_pointer)
1525 pointer_unblank (); 1579 pointer_unblank ();
1526#endif 1580#endif
1527#if MENUBAR 1581 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1528 if (isMenuBarWindow (ev.xany.window)) 1582 || priv_modes & PrivMode_MouseAnyEvent)
1529 {
1530 menubar_control (ev.xbutton); 1583 mouse_report (ev.xbutton);
1531 break;
1532 }
1533#endif
1534 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1584 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1535 break; 1585 break;
1536 1586
1537 if (ev.xany.window == TermWin.vt) 1587 if (ev.xany.window == vt)
1538 { 1588 {
1589 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1590 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1591 ; // nop
1539 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1592 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1540 { 1593 {
1541 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1594 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1542 ; 1595 ;
1543 1596
1544 XQueryPointer (disp, TermWin.vt, 1597 XQueryPointer (dpy, vt,
1545 &unused_root, &unused_child, 1598 &unused_root, &unused_child,
1546 &unused_root_x, &unused_root_y, 1599 &unused_root_x, &unused_root_y,
1547 &ev.xbutton.x, &ev.xbutton.y, 1600 &ev.xbutton.x, &ev.xbutton.y,
1548 &ev.xbutton.state); 1601 &ev.xbutton.state);
1549#ifdef MOUSE_THRESHOLD 1602#ifdef MOUSE_THRESHOLD
… …
1561#endif 1614#endif
1562 selection_extend (ev.xbutton.x, ev.xbutton.y, 1615 selection_extend (ev.xbutton.x, ev.xbutton.y,
1563 ev.xbutton.state & Button3Mask ? 2 : 0); 1616 ev.xbutton.state & Button3Mask ? 2 : 0);
1564 1617
1565#ifdef SELECTION_SCROLLING 1618#ifdef SELECTION_SCROLLING
1566 if (ev.xbutton.y < TermWin.int_bwidth 1619 if (ev.xbutton.y < int_bwidth
1567 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1620 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1568 { 1621 {
1569 int dist; 1622 int dist;
1570 1623
1571 /* don't clobber the current delay if we are 1624 /* don't clobber the current delay if we are
1572 * already in the middle of scrolling. 1625 * already in the middle of scrolling.
1573 */ 1626 */
1574 if (!sel_scroll_ev.active) 1627 if (!sel_scroll_ev.is_active ())
1575 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1628 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1576 1629
1577 /* save the event params so we can highlight 1630 /* save the event params so we can highlight
1578 * the selection in the pending-scroll loop 1631 * the selection in the pending-scroll loop
1579 */ 1632 */
1580 selection_save_x = ev.xbutton.x; 1633 selection_save_x = ev.xbutton.x;
1581 selection_save_y = ev.xbutton.y; 1634 selection_save_y = ev.xbutton.y;
1582 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1635 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1583 1636
1584 /* calc number of lines to scroll */ 1637 /* calc number of lines to scroll */
1585 if (ev.xbutton.y < TermWin.int_bwidth) 1638 if (ev.xbutton.y < int_bwidth)
1586 { 1639 {
1587 scroll_selection_dir = UP; 1640 scroll_selection_dir = UP;
1588 dist = TermWin.int_bwidth - ev.xbutton.y; 1641 dist = int_bwidth - ev.xbutton.y;
1589 } 1642 }
1590 else 1643 else
1591 { 1644 {
1592 scroll_selection_dir = DN; 1645 scroll_selection_dir = DN;
1593 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1646 dist = ev.xbutton.y - (int_bwidth + height);
1594 } 1647 }
1595 1648
1596 scroll_selection_lines = Pixel2Height (dist) 1649 scroll_selection_lines = Pixel2Height (dist)
1597 / SELECTION_SCROLL_LINE_SPEEDUP 1650 / SELECTION_SCROLL_LINE_SPEEDUP
1598 + 1; 1651 + 1;
1599 MIN_IT (scroll_selection_lines, 1652 min_it (scroll_selection_lines,
1600 SELECTION_SCROLL_MAX_LINES); 1653 SELECTION_SCROLL_MAX_LINES);
1601 } 1654 }
1602 else 1655 else
1603 { 1656 {
1604 /* we are within the text window, so we 1657 /* we are within the text window, so we
1605 * shouldn't be scrolling 1658 * shouldn't be scrolling
1606 */ 1659 */
1607 if (sel_scroll_ev.active)
1608 sel_scroll_ev.stop(); 1660 sel_scroll_ev.stop();
1609 } 1661 }
1610#endif 1662#endif
1611#ifdef MOUSE_THRESHOLD 1663#ifdef MOUSE_THRESHOLD
1612 } 1664 }
1613#endif 1665#endif
1614 } 1666 }
1615 } 1667 }
1616 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1668 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1617 { 1669 {
1618 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1670 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1619 MotionNotify, &ev)) 1671 MotionNotify, &ev))
1620 ; 1672 ;
1621 1673
1622 XQueryPointer (disp, scrollBar.win, 1674 XQueryPointer (dpy, scrollBar.win,
1623 &unused_root, &unused_child, 1675 &unused_root, &unused_child,
1624 &unused_root_x, &unused_root_y, 1676 &unused_root_x, &unused_root_y,
1625 &ev.xbutton.x, &ev.xbutton.y, 1677 &ev.xbutton.x, &ev.xbutton.y,
1626 &unused_mask); 1678 &unused_mask);
1627 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1628 scrollbar_size ()); 1680 scrollBar.size ());
1629 scr_refresh (refresh_type);
1630 refresh_limit = 0; 1681 want_refresh = 1;
1631 scrollbar_show (1); 1682 scrollBar.show (1);
1632 } 1683 }
1633 break; 1684 break;
1634 } 1685 }
1686
1687#if defined(CURSOR_BLINK)
1688 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1689 {
1690 if (hidden_cursor)
1691 {
1692 hidden_cursor = 0;
1693 want_refresh = 1;
1694 }
1695
1696 cursor_blink_ev.again ();
1697 }
1698#endif
1699
1700#if defined(POINTER_BLANK)
1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1702 {
1703 if (ev.type == MotionNotify
1704 || ev.type == ButtonPress
1705 || ev.type == ButtonRelease)
1706 if (hidden_pointer)
1707 pointer_unblank ();
1708
1709 if (ev.type == KeyPress && hidden_pointer == 0)
1710 pointer_blank ();
1711 }
1712#endif
1713
1714 refresh_check ();
1635} 1715}
1716
1717#if ENABLE_FRILLS
1718void
1719rxvt_term::set_urgency (bool enable)
1720{
1721 if (enable == urgency_hint)
1722 return;
1723
1724 if (XWMHints *h = XGetWMHints (dpy, parent))
1725 {
1726 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1727 XSetWMHints (dpy, parent, h);
1728 urgency_hint = enable;
1729 }
1730}
1731#endif
1636 1732
1637void 1733void
1638rxvt_term::focus_in () 1734rxvt_term::focus_in ()
1639{ 1735{
1640 if (!TermWin.focus) 1736 if (!focus)
1641 { 1737 {
1642 TermWin.focus = 1; 1738 focus = 1;
1643 want_refresh = 1; 1739 want_refresh = 1;
1740
1644#ifdef USE_XIM 1741#if USE_XIM
1645 if (Input_Context != NULL) 1742 if (Input_Context != NULL)
1646 { 1743 {
1647 IMSetStatusPosition (); 1744 IMSetPosition ();
1648 XSetICFocus (Input_Context); 1745 XSetICFocus (Input_Context);
1649 } 1746 }
1650#endif 1747#endif
1651#ifdef CURSOR_BLINK 1748#if CURSOR_BLINK
1652 if (options & Opt_cursorBlink) 1749 if (option (Opt_cursorBlink))
1653 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1750 cursor_blink_ev.again ();
1654#endif 1751#endif
1655#ifdef OFF_FOCUS_FADING 1752#if OFF_FOCUS_FADING
1656 if (rs[Rs_fade]) 1753 if (rs[Rs_fade])
1657 { 1754 {
1658 pix_colors = pix_colors_focused; 1755 pix_colors = pix_colors_focused;
1659 scr_recolour (); 1756 scr_recolour ();
1660 } 1757 }
1661#endif 1758#endif
1759#if ENABLE_FRILLS
1760 if (option (Opt_urgentOnBell))
1761 set_urgency (0);
1762#endif
1763
1764 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1662 } 1765 }
1663} 1766}
1664 1767
1665void 1768void
1666rxvt_term::focus_out () 1769rxvt_term::focus_out ()
1667{ 1770{
1668 if (TermWin.focus) 1771 if (focus)
1669 { 1772 {
1670 TermWin.focus = 0; 1773 focus = 0;
1671 want_refresh = 1; 1774 want_refresh = 1;
1672 1775
1776#if ENABLE_FRILLS
1777 if (option (Opt_urgentOnBell))
1778 set_urgency (0);
1779#endif
1673#if ENABLE_FRILLS || ISO_14755 1780#if ENABLE_FRILLS || ISO_14755
1781 if (iso14755buf)
1782 {
1674 iso14755buf = 0; 1783 iso14755buf = 0;
1675#endif 1784# if ISO_14755
1676#if ENABLE_OVERLAY
1677 scr_overlay_off (); 1785 scr_overlay_off ();
1678#endif 1786# endif
1787 }
1788#endif
1679#ifdef USE_XIM 1789#if USE_XIM
1680 if (Input_Context != NULL) 1790 if (Input_Context != NULL)
1681 XUnsetICFocus (Input_Context); 1791 XUnsetICFocus (Input_Context);
1682#endif 1792#endif
1683#ifdef CURSOR_BLINK 1793#if CURSOR_BLINK
1684 if (options & Opt_cursorBlink) 1794 if (option (Opt_cursorBlink))
1685 cursor_blink_ev.stop (); 1795 cursor_blink_ev.stop ();
1796
1686 hidden_cursor = 0; 1797 hidden_cursor = 0;
1687#endif 1798#endif
1688#ifdef OFF_FOCUS_FADING 1799#if OFF_FOCUS_FADING
1689 if (rs[Rs_fade]) 1800 if (rs[Rs_fade])
1690 { 1801 {
1691 pix_colors = pix_colors_unfocused; 1802 pix_colors = pix_colors_unfocused;
1692 scr_recolour (); 1803 scr_recolour ();
1693 } 1804 }
1694#endif 1805#endif
1806
1807 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1808 }
1809}
1810
1811void
1812rxvt_term::update_fade_color (unsigned int idx)
1813{
1814#if OFF_FOCUS_FADING
1815 if (rs[Rs_fade])
1695 } 1816 {
1817 rgba c;
1818 pix_colors [Color_fade].get (c);
1819 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1820 }
1821#endif
1696} 1822}
1697 1823
1698#if TRANSPARENT 1824#if ENABLE_TRANSPARENCY || ENABLE_PERL
1699void 1825void
1700rxvt_term::rootwin_cb (XEvent &ev) 1826rxvt_term::rootwin_cb (XEvent &ev)
1701{ 1827{
1702 SET_R (this); 1828 make_current ();
1703 SET_LOCALE (locale);
1704 1829
1830 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1831 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1832 return;
1833
1834# if ENABLE_TRANSPARENCY
1705 switch (ev.type) 1835 switch (ev.type)
1706 { 1836 {
1707 case PropertyNotify: 1837 case PropertyNotify:
1708 /* 1838 /*
1709 * if user used some Esetroot compatible prog to set the root bg, 1839 * 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. 1840 * use the property to determine the pixmap. We use it later on.
1711 */ 1841 */
1712 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1842 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1713 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1843 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1714 return; 1844 {
1845 bg_set_root_pixmap ();
1846 update_background ();
1847 }
1715 1848
1716 /* FALLTHROUGH */
1717 case ReparentNotify:
1718 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1719 want_refresh = want_full_refresh = 1;
1720 break; 1849 break;
1721 } 1850 }
1851# endif
1852
1853 refresh_check ();
1722} 1854}
1723#endif 1855#endif
1724 1856
1725void 1857void
1726rxvt_term::button_press (XButtonEvent &ev) 1858rxvt_term::button_press (XButtonEvent &ev)
1727{ 1859{
1728 int reportmode = 0, clickintime; 1860 int reportmode = 0, clickintime;
1729 1861
1730 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1862 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1863
1731 if (!bypass_keystate) 1864 if (!bypass_keystate)
1732 reportmode = !! (priv_modes & PrivMode_mouse_report); 1865 reportmode = !! (priv_modes & PrivMode_mouse_report);
1733 1866
1734 /* 1867 /*
1735 * VT window processing of button press 1868 * VT window processing of button press
1736 */ 1869 */
1737 if (ev.window == TermWin.vt) 1870 if (ev.window == vt)
1738 { 1871 {
1872 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1873 return;
1874
1739#if ISO_14755 1875#if ISO_14755
1740 // 5.4 1876 // 5.4
1741 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1877 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1742 { 1878 {
1743 iso14755_54 (ev.x, ev.y); 1879 iso14755_54 (ev.x, ev.y);
… …
1753 /* save the xbutton state (for ButtonRelease) */ 1889 /* save the xbutton state (for ButtonRelease) */
1754 MEvent.state = ev.state; 1890 MEvent.state = ev.state;
1755#ifdef MOUSE_REPORT_DOUBLECLICK 1891#ifdef MOUSE_REPORT_DOUBLECLICK
1756 if (ev.button == MEvent.button && clickintime) 1892 if (ev.button == MEvent.button && clickintime)
1757 { 1893 {
1758 /* same button, within alloted time */ 1894 /* same button, within allowed time */
1759 MEvent.clicks++; 1895 MEvent.clicks++;
1896
1760 if (MEvent.clicks > 1) 1897 if (MEvent.clicks > 1)
1761 { 1898 {
1762 /* only report double clicks */ 1899 /* only report double clicks */
1763 MEvent.clicks = 2; 1900 MEvent.clicks = 2;
1764 mouse_report (ev); 1901 mouse_report (ev);
… …
1776 mouse_report (ev); 1913 mouse_report (ev);
1777 } 1914 }
1778#else 1915#else
1779 MEvent.button = ev.button; 1916 MEvent.button = ev.button;
1780 mouse_report (ev); 1917 mouse_report (ev);
1781#endif /* MOUSE_REPORT_DOUBLECLICK */ 1918#endif /* MOUSE_REPORT_DOUBLECLICK */
1782 1919
1783 } 1920 }
1784 else 1921 else
1785 { 1922 {
1786 if (ev.button != MEvent.button) 1923 if (ev.button != MEvent.button)
… …
1796#else 1933#else
1797 selection.rect = false; 1934 selection.rect = false;
1798#endif 1935#endif
1799 1936
1800 /* allow shift+left click to extend selection */ 1937 /* allow shift+left click to extend selection */
1801 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1938 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1802 { 1939 {
1803 if (MEvent.button == Button1 && clickintime) 1940 if (MEvent.button == Button1 && clickintime)
1804 selection_rotate (ev.x, ev.y); 1941 selection_rotate (ev.x, ev.y);
1805 else 1942 else
1806 selection_extend (ev.x, ev.y, 1); 1943 selection_extend (ev.x, ev.y, 1);
… …
1834 } 1971 }
1835 1972
1836 /* 1973 /*
1837 * Scrollbar window processing of button press 1974 * Scrollbar window processing of button press
1838 */ 1975 */
1839 if (isScrollbarWindow (ev.window)) 1976 if (scrollBar.state && ev.window == scrollBar.win)
1840 { 1977 {
1841 scrollBar.setIdle (); 1978 page_dirn direction = NO_DIR;
1979
1980 if (scrollBar.upButton (ev.y))
1981 direction = UP; /* up */
1982 else if (scrollBar.dnButton (ev.y))
1983 direction = DN; /* down */
1984
1985 scrollBar.state = STATE_IDLE;
1842 /* 1986 /*
1843 * Rxvt-style scrollbar: 1987 * Rxvt-style scrollbar:
1844 * move up if mouse is above slider 1988 * move up if mouse is above slider
1845 * move dn if mouse is below slider 1989 * move dn if mouse is below slider
1846 * 1990 *
… …
1855 /* 1999 /*
1856 * Mouse report disabled scrollbar: 2000 * Mouse report disabled scrollbar:
1857 * arrow buttons - send up/down 2001 * arrow buttons - send up/down
1858 * click on scrollbar - send pageup/down 2002 * click on scrollbar - send pageup/down
1859 */ 2003 */
1860 if ((scrollBar.style == R_SB_NEXT 2004 if (direction == UP)
1861 && scrollbarnext_upButton (ev.y))
1862 || (scrollBar.style == R_SB_RXVT
1863 && scrollbarrxvt_upButton (ev.y)))
1864 tt_printf ("\033[A"); 2005 tt_printf ("\033[A");
1865 else if ((scrollBar.style == R_SB_NEXT 2006 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"); 2007 tt_printf ("\033[B");
1870 else 2008 else
1871 switch (ev.button) 2009 switch (ev.button)
1872 { 2010 {
1873 case Button2: 2011 case Button2:
… …
1880 tt_printf ("\033[5~"); 2018 tt_printf ("\033[5~");
1881 break; 2019 break;
1882 } 2020 }
1883 } 2021 }
1884 else 2022 else
1885#endif /* NO_SCROLLBAR_REPORT */ 2023#endif /* NO_SCROLLBAR_REPORT */
1886
1887 {
1888 char upordown = 0;
1889
1890 if (scrollBar.style == R_SB_NEXT)
1891 { 2024 {
1892 if (scrollbarnext_upButton (ev.y)) 2025 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 { 2026 {
1906#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2027#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2028 if (!cont_scroll_ev.is_active ())
1907 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2029 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1908#endif 2030#endif
1909 if (scr_page (upordown < 0 ? UP : DN, 1)) 2031 if (scr_page (direction, 1))
1910 { 2032 {
1911 if (upordown < 0) 2033 if (direction == UP)
1912 scrollBar.setUp (); 2034 scrollBar.state = STATE_UP;
1913 else 2035 else
1914 scrollBar.setDn (); 2036 scrollBar.state = STATE_DOWN;
1915 } 2037 }
1916 } 2038 }
1917 else 2039 else
1918 switch (ev.button) 2040 switch (ev.button)
1919 { 2041 {
1920 case Button2: 2042 case Button2:
1921 switch (scrollbar_align) 2043 switch (scrollBar.align)
1922 { 2044 {
1923 case R_SB_ALIGN_TOP: 2045 case R_SB_ALIGN_TOP:
1924 csrO = 0; 2046 csrO = 0;
1925 break; 2047 break;
1926 case R_SB_ALIGN_CENTRE: 2048 case R_SB_ALIGN_CENTRE:
… …
1932 } 2054 }
1933 2055
1934 if (scrollBar.style == R_SB_XTERM 2056 if (scrollBar.style == R_SB_XTERM
1935 || scrollbar_above_slider (ev.y) 2057 || scrollbar_above_slider (ev.y)
1936 || scrollbar_below_slider (ev.y)) 2058 || scrollbar_below_slider (ev.y))
1937 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2059 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
1938 2060
1939 scrollBar.setMotion (); 2061 scrollBar.state = STATE_MOTION;
1940 break; 2062 break;
1941 2063
1942 case Button1: 2064 case Button1:
1943 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2065 if (scrollBar.align == R_SB_ALIGN_CENTRE)
1944 csrO = ev.y - scrollBar.top; 2066 csrO = ev.y - scrollBar.top;
1945 /* FALLTHROUGH */ 2067 /* FALLTHROUGH */
1946 2068
1947 case Button3: 2069 case Button3:
1948 if (scrollBar.style != R_SB_XTERM) 2070 if (scrollBar.style != R_SB_XTERM)
1949 { 2071 {
1950 if (scrollbar_above_slider (ev.y)) 2072 if (scrollbar_above_slider (ev.y))
1951# ifdef RXVT_SCROLL_FULL 2073# ifdef RXVT_SCROLL_FULL
1952 scr_page (UP, TermWin.nrow - 1); 2074 scr_page (UP, nrow - 1);
1953# else 2075# else
1954 scr_page (UP, TermWin.nrow / 4); 2076 scr_page (UP, nrow / 4);
1955# endif 2077# endif
1956 else if (scrollbar_below_slider (ev.y)) 2078 else if (scrollbar_below_slider (ev.y))
1957# ifdef RXVT_SCROLL_FULL 2079# ifdef RXVT_SCROLL_FULL
1958 scr_page (DN, TermWin.nrow - 1); 2080 scr_page (DN, nrow - 1);
1959# else 2081# else
1960 scr_page (DN, TermWin.nrow / 4); 2082 scr_page (DN, nrow / 4);
1961# endif 2083# endif
1962 else 2084 else
1963 scrollBar.setMotion (); 2085 scrollBar.state = STATE_MOTION;
1964 } 2086 }
1965 else 2087 else
1966 { 2088 {
1967 scr_page ((ev.button == Button1 ? DN : UP), 2089 scr_page ((ev.button == Button1 ? DN : UP),
1968 (TermWin.nrow 2090 (nrow
1969 * scrollbar_position (ev.y) 2091 * scrollbar_position (ev.y)
1970 / scrollbar_size ())); 2092 / scrollBar.size ()));
1971 } 2093 }
1972 2094
1973 break; 2095 break;
1974 } 2096 }
1975 } 2097 }
2098
1976 return; 2099 return;
1977 } 2100 }
1978#if MENUBAR
1979 /*
1980 * Menubar window processing of button press
1981 */
1982 if (isMenuBarWindow (ev.window))
1983 menubar_control (ev);
1984#endif
1985} 2101}
1986 2102
1987void 2103void
1988rxvt_term::button_release (XButtonEvent &ev) 2104rxvt_term::button_release (XButtonEvent &ev)
1989{ 2105{
… …
1991 2107
1992 csrO = 0; /* reset csr Offset */ 2108 csrO = 0; /* reset csr Offset */
1993 if (!bypass_keystate) 2109 if (!bypass_keystate)
1994 reportmode = !! (priv_modes & PrivMode_mouse_report); 2110 reportmode = !! (priv_modes & PrivMode_mouse_report);
1995 2111
1996 if (scrollbar_isUpDn ()) 2112 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1997 { 2113 {
1998 scrollBar.setIdle (); 2114 scrollBar.state = STATE_IDLE;
1999 scrollbar_show (0); 2115 scrollBar.show (0);
2000#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2001 refresh_type &= ~SMOOTH_REFRESH;
2002#endif
2003 } 2116 }
2004 2117
2005#ifdef SELECTION_SCROLLING 2118#ifdef SELECTION_SCROLLING
2006 if (sel_scroll_ev.active)
2007 sel_scroll_ev.stop(); 2119 sel_scroll_ev.stop();
2008#endif 2120#endif
2009 2121
2010 if (ev.window == TermWin.vt) 2122 if (ev.window == vt)
2011 { 2123 {
2124 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2125 return;
2126
2012#if ISO_14755 2127#if ISO_14755
2013 // 5.4 2128 // 5.4
2014 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2129 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2015 return; 2130 return;
2016#endif 2131#endif
2132
2017 if (reportmode) 2133 if (reportmode)
2018 { 2134 {
2019 /* mouse report from vt window */ 2135 /* mouse report from vt window */
2020 /* don't report release of wheel "buttons" */ 2136 /* don't report release of wheel "buttons" */
2021 if (ev.button >= 4) 2137 if (ev.button >= 4)
… …
2032 mouse_report (ev); 2148 mouse_report (ev);
2033 } 2149 }
2034#else /* MOUSE_REPORT_DOUBLECLICK */ 2150#else /* MOUSE_REPORT_DOUBLECLICK */
2035 MEvent.button = AnyButton; 2151 MEvent.button = AnyButton;
2036 mouse_report (ev); 2152 mouse_report (ev);
2037#endif /* MOUSE_REPORT_DOUBLECLICK */ 2153#endif /* MOUSE_REPORT_DOUBLECLICK */
2038 return; 2154 return;
2039 } 2155 }
2040 2156
2041 /* 2157 /*
2042 * dumb hack to compensate for the failure of click-and-drag 2158 * dumb hack to compensate for the failure of click-and-drag
… …
2051 { 2167 {
2052 case Button1: 2168 case Button1:
2053 case Button3: 2169 case Button3:
2054 selection_make (ev.time); 2170 selection_make (ev.time);
2055 break; 2171 break;
2172
2056 case Button2: 2173 case Button2:
2057 selection_request (ev.time, ev.x, ev.y); 2174 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2175 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2058 break; 2176 break;
2177
2059#ifdef MOUSE_WHEEL 2178#ifdef MOUSE_WHEEL
2060 case Button4: 2179 case Button4:
2061 case Button5: 2180 case Button5:
2062 { 2181 {
2063 int i; 2182 int i;
… …
2065 2184
2066 v = ev.button == Button4 ? UP : DN; 2185 v = ev.button == Button4 ? UP : DN;
2067 2186
2068 if (ev.state & ShiftMask) 2187 if (ev.state & ShiftMask)
2069 i = 1; 2188 i = 1;
2070 else if (options & Opt_mouseWheelScrollPage) 2189 else if (option (Opt_mouseWheelScrollPage))
2071 i = TermWin.nrow - 1; 2190 i = nrow - 1;
2072 else 2191 else
2073 i = 5; 2192 i = 5;
2074 2193
2075# ifdef MOUSE_SLIP_WHEELING 2194# ifdef MOUSE_SLIP_WHEELING
2076 if (ev.state & ControlMask) 2195 if (ev.state & ControlMask)
2077 { 2196 {
2078 mouse_slip_wheel_speed += v ? -1 : 1; 2197 mouse_slip_wheel_speed += v ? -1 : 1;
2079 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2198 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; 2199 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2081 2200
2082 if (slip_wheel_ev.at < NOW) 2201 if (!slip_wheel_ev.is_active ())
2083 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2202 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2084
2085 slip_wheel_ev.start ();
2086 } 2203 }
2087 else 2204 else
2205# endif
2088 { 2206 {
2089# endif
2090# ifdef JUMP_MOUSE_WHEEL
2091 scr_page (v, i); 2207 scr_page (v, i);
2092 scr_refresh (SMOOTH_REFRESH);
2093 scrollbar_show (1); 2208 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 } 2209 }
2104#endif
2105 } 2210 }
2106 break; 2211 break;
2107#endif 2212#endif
2108 } 2213 }
2109 } 2214 }
2110#ifdef MENUBAR
2111 else if (isMenuBarWindow (ev.window))
2112 menubar_control (ev);
2113#endif
2114} 2215}
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 2216
2597/*}}} */ 2217/*}}} */
2598 2218
2599bool 2219void
2600rxvt_term::cmd_parse () 2220rxvt_term::cmd_parse ()
2601{ 2221{
2602 bool flag = false;
2603 unicode_t ch = NOCHAR; 2222 wchar_t ch = NOCHAR;
2604 unsigned char *seq_begin; // remember start of esc-sequence here 2223 char *seq_begin; // remember start of esc-sequence here
2605 2224
2606 for (;;) 2225 for (;;)
2607 { 2226 {
2608 if (ch == NOCHAR) 2227 if (expect_false (ch == NOCHAR))
2609 { 2228 {
2610 seq_begin = cmdbuf_ptr; 2229 seq_begin = cmdbuf_ptr;
2611 ch = next_char (); 2230 ch = next_char ();
2612 }
2613 2231
2614 if (ch == NOCHAR) // TODO: improve 2232 if (ch == NOCHAR)
2615 break; 2233 break;
2234 }
2616 2235
2617 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2236 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2618 { 2237 {
2619 if (!seen_input) 2238 if (expect_false (!seen_input))
2620 { 2239 {
2621 seen_input = 1; 2240 seen_input = 1;
2622 // many badly-written programs (e.g. jed) contain a race condition: 2241 // many badly-written programs (e.g. jed) contain a race condition:
2623 // they first read the screensize and then install a SIGWINCH handler. 2242 // they first read the screensize and then install a SIGWINCH handler.
2624 // some window managers resize the window early, and these programs 2243 // some window managers resize the window early, and these programs
… …
2629 if (seen_resize && cmd_pid) 2248 if (seen_resize && cmd_pid)
2630 kill (-cmd_pid, SIGWINCH); 2249 kill (-cmd_pid, SIGWINCH);
2631 } 2250 }
2632 2251
2633 /* Read a text string from the input buffer */ 2252 /* Read a text string from the input buffer */
2634 unicode_t buf[UBUFSIZ]; 2253 wchar_t buf[UBUFSIZ];
2635 bool refreshnow = false; 2254 bool refreshnow = false;
2636 int nlines = 0; 2255 int nlines = 0;
2637 unicode_t *str = buf; 2256 wchar_t *str = buf;
2257 wchar_t *eol = str + min (ncol, UBUFSIZ);
2638 2258
2639 for (;;) 2259 for (;;)
2640 { 2260 {
2641 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2261 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2642 break; 2262 break;
2643 2263
2644 *str++ = ch; 2264 *str++ = ch;
2645 2265
2646 if (ch == C0_LF) 2266 if (expect_false (ch == C0_LF || str >= eol))
2647 { 2267 {
2268 if (ch == C0_LF)
2648 nlines++; 2269 nlines++;
2270
2649 refresh_count++; 2271 refresh_count++;
2650 2272
2651 if (!(options & Opt_jumpScroll) 2273 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2652 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2653 { 2274 {
2275 refresh_count = 0;
2276
2277 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2278 {
2654 refreshnow = true; 2279 refreshnow = true;
2655 ch = NOCHAR; 2280 ch = NOCHAR;
2656 break; 2281 break;
2282 }
2657 } 2283 }
2658 2284
2659 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2285 // scr_add_lines only works for nlines <= nrow - 1.
2660 if (nlines >= TermWin.nrow - 1) 2286 if (nlines >= nrow - 1)
2661 { 2287 {
2288 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2289 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2662 scr_add_lines (buf, nlines, str - buf); 2290 scr_add_lines (buf, str - buf, nlines);
2291
2663 nlines = 0; 2292 nlines = 0;
2664 str = buf; 2293 str = buf;
2294 eol = str + min (ncol, UBUFSIZ);
2665 } 2295 }
2666 }
2667 2296
2668 if (str >= buf + UBUFSIZ) 2297 if (str >= eol)
2669 { 2298 {
2299 if (eol >= buf + UBUFSIZ)
2300 {
2670 ch = NOCHAR; 2301 ch = NOCHAR;
2671 break; 2302 break;
2303 }
2304 else
2305 eol = min (eol + ncol, buf + UBUFSIZ);
2306 }
2307
2672 } 2308 }
2673 2309
2674 seq_begin = cmdbuf_ptr; 2310 seq_begin = cmdbuf_ptr;
2675 ch = next_char (); 2311 ch = next_char ();
2676 } 2312 }
2677 2313
2314 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2315 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2678 scr_add_lines (buf, nlines, str - buf); 2316 scr_add_lines (buf, str - buf, nlines);
2679 2317
2680 /* 2318 /*
2681 * If there have been a lot of new lines, then update the screen 2319 * 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. 2320 * 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 2321 * if skipScroll is enabled.
2684 * is incremented here because we must be doing flat-out scrolling.
2685 */ 2322 */
2686 if (refreshnow) 2323 if (refreshnow)
2687 { 2324 {
2688 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2689 refresh_limit++;
2690 else
2691 {
2692 flag = true;
2693 scr_refresh (refresh_type); 2325 scr_refresh ();
2694 } 2326 want_refresh = 1;
2695 } 2327 }
2696
2697 } 2328 }
2698 else 2329 else
2699 { 2330 {
2700 try 2331 try
2701 { 2332 {
… …
2709 } 2340 }
2710 2341
2711 ch = NOCHAR; 2342 ch = NOCHAR;
2712 } 2343 }
2713 } 2344 }
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} 2345}
2726 2346
2727// read the next character 2347// read the next character
2728unicode_t 2348wchar_t
2729rxvt_term::next_char () 2349rxvt_term::next_char () NOTHROW
2730{ 2350{
2731 while (cmdbuf_ptr < cmdbuf_endp) 2351 while (cmdbuf_ptr < cmdbuf_endp)
2732 { 2352 {
2733 // assume 7-bit to be ascii ALWAYS 2353 // assume 7-bit to be ascii ALWAYS
2734 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2354 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2735 return *cmdbuf_ptr++; 2355 return *cmdbuf_ptr++;
2736 2356
2737 wchar_t wc; 2357 wchar_t wc;
2738 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2358 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2739 2359
2740 if (len == (size_t)-2) 2360 if (len == (size_t)-2)
2741 { 2361 {
2742 // the mbstate stores incomplete sequences. didn't know this :/ 2362 // the mbstate stores incomplete sequences. didn't know this :/
2743 cmdbuf_ptr = cmdbuf_endp; 2363 cmdbuf_ptr = cmdbuf_endp;
2744 break; 2364 break;
2745 } 2365 }
2746 2366
2747 if (len == (size_t)-1) 2367 if (len == (size_t)-1)
2368 {
2369 mbstate.reset (); // reset now undefined conversion state
2748 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2370 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2371 }
2749 2372
2750 // assume wchar == unicode 2373 // assume wchar == unicode
2751 cmdbuf_ptr += len; 2374 cmdbuf_ptr += len;
2752 return wc & UNICODE_MASK; 2375 return wc & UNICODE_MASK;
2753 } 2376 }
2754 2377
2755 return NOCHAR; 2378 return NOCHAR;
2756} 2379}
2757 2380
2758/* rxvt_cmd_getc () - Return next input character */ 2381// read the next octet
2759/* 2382uint32_t
2760 * Return the next input character after first passing any keyboard input 2383rxvt_term::next_octet () NOTHROW
2761 * to the command.
2762 */
2763unicode_t
2764rxvt_term::cmd_getc ()
2765{ 2384{
2385 return cmdbuf_ptr < cmdbuf_endp
2386 ? (unsigned char)*cmdbuf_ptr++
2387 : NOCHAR;
2388}
2389
2390static class out_of_input out_of_input;
2391
2392wchar_t
2393rxvt_term::cmd_getc () THROW ((class out_of_input))
2394{
2766 unicode_t c = next_char (); 2395 wchar_t c = next_char ();
2767 2396
2768 if (c == NOCHAR) 2397 if (c == NOCHAR)
2769 throw out_of_input; 2398 throw out_of_input;
2770 2399
2771 return c; 2400 return c;
2772} 2401}
2773 2402
2774unicode_t 2403uint32_t
2775rxvt_term::cmd_get8 () 2404rxvt_term::cmd_get8 () THROW ((class out_of_input))
2776{ 2405{
2777 unicode_t c = next_octet (); 2406 uint32_t c = next_octet ();
2778 2407
2779 if (c == NOCHAR) 2408 if (c == NOCHAR)
2780 throw out_of_input; 2409 throw out_of_input;
2781 2410
2782 return c; 2411 return c;
… …
2786/*----------------------------------------------------------------------*/ 2415/*----------------------------------------------------------------------*/
2787#ifdef PRINTPIPE 2416#ifdef PRINTPIPE
2788FILE * 2417FILE *
2789rxvt_term::popen_printer () 2418rxvt_term::popen_printer ()
2790{ 2419{
2791 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2420 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2792 2421
2793 if (stream == NULL) 2422 if (stream == NULL)
2794 rxvt_warn ("can't open printer pipe, not printing.\n"); 2423 rxvt_warn ("can't open printer pipe, not printing.\n");
2795 2424
2796 return stream; 2425 return stream;
… …
2807 * simulate attached vt100 printer 2436 * simulate attached vt100 printer
2808 */ 2437 */
2809void 2438void
2810rxvt_term::process_print_pipe () 2439rxvt_term::process_print_pipe ()
2811{ 2440{
2812 int done; 2441 FILE *fd = popen_printer ();
2813 FILE *fd;
2814 2442
2815 if ((fd = popen_printer ()) == NULL) 2443 if (!fd)
2816 return; 2444 return;
2817 2445
2818 /* 2446 /*
2819 * Send all input to the printer until either ESC[4i or ESC[?4i 2447 * Send all input to the printer until either ESC[4i or ESC[?4i
2820 * is received. 2448 * is received.
2821 */ 2449 */
2822 for (done = 0; !done;) 2450 for (int done = 0; !done; )
2823 { 2451 {
2824 unsigned char buf[8]; 2452 unsigned char buf[8];
2825 unicode_t ch; 2453 unicode_t ch;
2826 unsigned int i, len; 2454 unsigned int i, len;
2827 2455
… …
2846 { 2474 {
2847 if ((buf[len++] = cmd_getc ()) == 'i') 2475 if ((buf[len++] = cmd_getc ()) == 'i')
2848 break; /* done = 1 */ 2476 break; /* done = 1 */
2849 } 2477 }
2850 } 2478 }
2851 2479
2852 for (i = 0; i < len; i++) 2480 for (i = 0; i < len; i++)
2853 if (putc (buf[i], fd) == EOF) 2481 if (putc (buf[i], fd) == EOF)
2854 { 2482 {
2855 done = 1; 2483 done = 1;
2856 break; 2484 break;
… …
2858 } 2486 }
2859 } 2487 }
2860 2488
2861 pclose_printer (fd); 2489 pclose_printer (fd);
2862} 2490}
2863#endif /* PRINTPIPE */ 2491#endif /* PRINTPIPE */
2864/*}}} */ 2492/*}}} */
2865 2493
2866/* *INDENT-OFF* */
2867enum { 2494enum {
2868 C1_40 = 0x40, 2495 C1_40 = 0x40,
2869 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2496 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2870 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2497 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2871 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2498 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2872 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2499 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2873}; 2500};
2874/* *INDENT-ON* */
2875 2501
2876/*{{{ process non-printing single characters */ 2502/*{{{ process non-printing single characters */
2877void 2503void
2878rxvt_term::process_nonprinting (unicode_t ch) 2504rxvt_term::process_nonprinting (unicode_t ch)
2879{ 2505{
… …
2882 case C0_ESC: 2508 case C0_ESC:
2883 process_escape_seq (); 2509 process_escape_seq ();
2884 break; 2510 break;
2885 case C0_ENQ: /* terminal Status */ 2511 case C0_ENQ: /* terminal Status */
2886 if (rs[Rs_answerbackstring]) 2512 if (rs[Rs_answerbackstring])
2887 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2513 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2888 (unsigned int)strlen (rs[Rs_answerbackstring]));
2889 else 2514 else
2890 tt_write ((unsigned char *)VT100_ANS, 2515 tt_write (VT100_ANS, strlen (VT100_ANS));
2891 (unsigned int)strlen (VT100_ANS));
2892 break; 2516 break;
2893 case C0_BEL: /* bell */ 2517 case C0_BEL: /* bell */
2894 scr_bell (); 2518 scr_bell ();
2895 break; 2519 break;
2896 case C0_BS: /* backspace */ 2520 case C0_BS: /* backspace */
… …
2920 process_dcs_seq (); 2544 process_dcs_seq ();
2921 break; 2545 break;
2922 case 0x9b: /* CSI */ 2546 case 0x9b: /* CSI */
2923 process_csi_seq (); 2547 process_csi_seq ();
2924 break; 2548 break;
2925 case 0x9d: /* CSI */ 2549 case 0x9d: /* OSC */
2926 process_osc_seq (); 2550 process_osc_seq ();
2927 break; 2551 break;
2928#endif 2552#endif
2929 } 2553 }
2930} 2554}
… …
2974 break; 2598 break;
2975 case 'Z': /* identify the terminal type */ 2599 case 'Z': /* identify the terminal type */
2976 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2600 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2977 break; 2601 break;
2978 case '<': /* turn off VT52 mode */ 2602 case '<': /* turn off VT52 mode */
2979 PrivMode (0, PrivMode_vt52); 2603 set_privmode (PrivMode_vt52, 0);
2980 break; 2604 break;
2981 case 'F': /* use special graphics character set */ 2605 case 'F': /* use special graphics character set */
2982 case 'G': /* use regular character set */ 2606 case 'G': /* use regular character set */
2983 /* unimplemented */ 2607 /* unimplemented */
2984 break; 2608 break;
… …
3020 scr_charset_set (2, (unsigned int)cmd_getc ()); 2644 scr_charset_set (2, (unsigned int)cmd_getc ());
3021 break; 2645 break;
3022 case '+': 2646 case '+':
3023 scr_charset_set (3, (unsigned int)cmd_getc ()); 2647 scr_charset_set (3, (unsigned int)cmd_getc ());
3024 break; 2648 break;
3025#if ENABLE_FRILLS 2649#if !ENABLE_MINIMAL
3026 case '6': 2650 case '6':
3027 scr_backindex (); 2651 scr_backindex ();
3028 break; 2652 break;
3029#endif 2653#endif
3030 case '7': 2654 case '7':
3031 scr_cursor (SAVE); 2655 scr_cursor (SAVE);
3032 break; 2656 break;
3033 case '8': 2657 case '8':
3034 scr_cursor (RESTORE); 2658 scr_cursor (RESTORE);
3035 break; 2659 break;
3036#if ENABLE_FRILLS 2660#if !ENABLE_MINIMAL
3037 case '9': 2661 case '9':
3038 scr_forwardindex (); 2662 scr_forwardindex ();
3039 break; 2663 break;
3040#endif 2664#endif
3041 case '=': 2665 case '=':
3042 case '>': 2666 case '>':
3043 PrivMode ((ch == '='), PrivMode_aplKP); 2667 set_privmode (PrivMode_aplKP, ch == '=');
3044 break; 2668 break;
3045 2669
3046 case C1_40: 2670 case C1_40:
3047 cmd_getc (); 2671 cmd_getc ();
3048 break; 2672 break;
… …
3051 break; 2675 break;
3052 2676
3053 /* 8.3.87: NEXT LINE */ 2677 /* 8.3.87: NEXT LINE */
3054 case C1_NEL: /* ESC E */ 2678 case C1_NEL: /* ESC E */
3055 { 2679 {
3056 unicode_t nlcr[] = { C0_LF, C0_CR }; 2680 wchar_t nlcr[] = { C0_LF, C0_CR };
3057 scr_add_lines (nlcr, 1, 2); 2681 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
3058 } 2682 }
3059 break; 2683 break;
3060 2684
3061 /* kidnapped escape sequence: Should be 8.3.48 */ 2685 /* kidnapped escape sequence: Should be 8.3.48 */
3062 case C1_ESA: /* ESC G */ 2686 case C1_ESA: /* ESC G */
3063 process_graphics (); 2687 // used by original rxvt for rob nations own graphics mode
2688 if (cmd_getc () == 'Q')
2689 tt_printf ("\033G0\012"); /* query graphics - no graphics */
3064 break; 2690 break;
3065 2691
3066 /* 8.3.63: CHARACTER TABULATION SET */ 2692 /* 8.3.63: CHARACTER TABULATION SET */
3067 case C1_HTS: /* ESC H */ 2693 case C1_HTS: /* ESC H */
3068 scr_set_tab (1); 2694 scr_set_tab (1);
… …
3084 process_dcs_seq (); 2710 process_dcs_seq ();
3085 break; 2711 break;
3086 2712
3087 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2713 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3088 case C1_SCI: /* ESC Z */ 2714 case C1_SCI: /* ESC Z */
3089 tt_write ((const unsigned char *)ESCZ_ANSWER, 2715 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3090 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3091 break; /* steal obsolete ESC [ c */ 2716 break; /* steal obsolete ESC [ c */
3092 2717
3093 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2718 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3094 case C1_CSI: /* ESC [ */ 2719 case C1_CSI: /* ESC [ */
3095 process_csi_seq (); 2720 process_csi_seq ();
3096 break; 2721 break;
3097 2722
3098 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2723 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3099 case C1_OSC: /* ESC ] */ 2724 case C1_OSC: /* ESC ] */
3100 process_osc_seq (); 2725 process_osc_seq ();
3101 break; 2726 break;
3102 2727
3103 /* 8.3.106: RESET TO INITIAL STATE */ 2728 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3104 case 'c': 2729 case 'c':
3105 mbstate.reset (); 2730 mbstate.reset ();
3106 scr_poweron (); 2731 scr_poweron ();
3107 scrollbar_show (1); 2732 scrollBar.show (1);
3108 break; 2733 break;
3109 2734
3110 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2735 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3111 case 'n': 2736 case 'n':
3112 scr_charset_choose (2); 2737 scr_charset_choose (2);
… …
3119 } 2744 }
3120} 2745}
3121/*}}} */ 2746/*}}} */
3122 2747
3123/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2748/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
3124/* *INDENT-OFF* */
3125enum { 2749enum {
3126 CSI_ICH = 0x40, 2750 CSI_ICH = 0x40,
3127 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2751 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
3128 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2752 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
3129 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2753 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
3132 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2756 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 , 2757 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 2758 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
3135}; 2759};
3136 2760
3137#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2761#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
3138 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2762 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3139 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2763 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3140#define get_byte_array_bit(array, bit) \ 2764#define get_byte_array_bit(array, bit) \
3141 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2765 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
3142 2766
3143const unsigned char csi_defaults[] = 2767static const unsigned char csi_defaults[] =
3144 { 2768 {
3145 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2769 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, */ 2770 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, */ 2771 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, [, \, ], ^, _, */ 2772 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
3149 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2773 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
3150 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2774 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
3151 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2775 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
3152 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2776 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
3153 }; 2777 };
3154/* *INDENT-ON* */
3155 2778
3156void 2779void
3157rxvt_term::process_csi_seq () 2780rxvt_term::process_csi_seq ()
3158{ 2781{
3159 unicode_t ch, priv, i; 2782 unicode_t ch, priv, i;
3160 unsigned int nargs, p; 2783 unsigned int nargs, p;
3161 int n, ndef; 2784 int n, ndef;
3162 int arg[ESC_ARGS]; 2785 int arg[ESC_ARGS] = { };
3163 2786
3164 for (nargs = ESC_ARGS; nargs > 0;) 2787 nargs = 0;
3165 arg[--nargs] = 0;
3166 2788
3167 priv = 0; 2789 priv = 0;
3168 ch = cmd_getc (); 2790 ch = cmd_getc ();
3169 if (ch >= '<' && ch <= '?') 2791 if ((ch >= '<' && ch <= '?') || ch == '!')
2792 {
3170 { /* '<' '=' '>' '?' */ 2793 /* '<' '=' '>' '?' '!' */
3171 priv = ch; 2794 priv = ch;
3172 ch = cmd_getc (); 2795 ch = cmd_getc ();
3173 } 2796 }
3174 2797
3175 /* read any numerical arguments */ 2798 /* read any numerical arguments */
… …
3204 ndef = get_byte_array_bit (csi_defaults, i); 2827 ndef = get_byte_array_bit (csi_defaults, i);
3205 for (p = 0; p < nargs; p++) 2828 for (p = 0; p < nargs; p++)
3206 if (arg[p] == -1) 2829 if (arg[p] == -1)
3207 arg[p] = ndef; 2830 arg[p] = ndef;
3208 2831
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 /* 2832 /*
3217 * private mode handling 2833 * private mode handling
3218 */ 2834 */
3219 if (priv) 2835 if (priv)
3220 { 2836 {
3221 switch (priv) 2837 switch (priv)
3222 { 2838 {
3223 case '>': 2839 case '>':
3224 if (ch == CSI_DA) /* secondary device attributes */ 2840 if (ch == CSI_DA) /* secondary device attributes */
3225 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2841 {
2842 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2843 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2844 //
2845 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2846 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2847 // versions.
2848 //
2849 tt_printf ("\033[>%d;95;0c", 'U');
2850 }
3226 break; 2851 break;
2852
3227 case '?': 2853 case '?':
3228 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2854 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3229 process_terminal_mode (ch, priv, nargs, arg); 2855 process_terminal_mode (ch, priv, nargs, arg);
3230 break; 2856 break;
2857
2858 case '!':
2859 if (ch == CSI_70)
2860 {
2861 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2862 scr_soft_reset ();
2863
2864 static const int pm_h[] = { 7, 25 };
2865 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2866
2867 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2868 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
3231 } 2869 }
2870 break;
2871 }
2872
3232 return; 2873 return;
3233 } 2874 }
3234 2875
3235 switch (ch) 2876 switch (ch)
3236 { 2877 {
… …
3335 2976
3336 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2977 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3337 arg[0] = -arg[0]; 2978 arg[0] = -arg[0];
3338 /* FALLTHROUGH */ 2979 /* FALLTHROUGH */
3339 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2980 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3340 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2981 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3341 break; 2982 break;
3342 2983
3343 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2984 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3344 tt_write ((const unsigned char *)VT100_ANS, 2985 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3345 (unsigned int) (sizeof (VT100_ANS) - 1));
3346 break; 2986 break;
3347 2987
3348 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2988 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3349 process_sgr_mode (nargs, arg); 2989 process_sgr_mode (nargs, arg);
3350 break; 2990 break;
… …
3357 break; 2997 break;
3358 case 6: /* CPR requested */ 2998 case 6: /* CPR requested */
3359 scr_report_position (); 2999 scr_report_position ();
3360 break; 3000 break;
3361 case 7: /* unofficial extension */ 3001 case 7: /* unofficial extension */
3362 if (options & Opt_insecure) 3002 if (option (Opt_insecure))
3363 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3003 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3364 break; 3004 break;
3365 case 8: /* unofficial extension */ 3005 case 8: /* unofficial extension */
3366 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3006 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3367 break; 3007 break;
… …
3434 break; 3074 break;
3435 case CSI_75: 3075 case CSI_75:
3436 scr_cursor (RESTORE); 3076 scr_cursor (RESTORE);
3437 break; 3077 break;
3438 3078
3439#if ENABLE_FRILLS 3079#if !ENABLE_MINIMAL
3440 case CSI_74: 3080 case CSI_74:
3441 process_window_ops (arg, nargs); 3081 process_window_ops (arg, nargs);
3442 break; 3082 break;
3443#endif 3083#endif
3444 3084
… …
3451 break; 3091 break;
3452 } 3092 }
3453} 3093}
3454/*}}} */ 3094/*}}} */
3455 3095
3456#if ENABLE_FRILLS 3096#if !ENABLE_MINIMAL
3457/* ARGSUSED */
3458void 3097void
3459rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3098rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3460{ 3099{
3461 int x, y; 3100 int x, y;
3462 XWindowAttributes wattr; 3101 XWindowAttributes wattr;
3463 Window wdummy; 3102 Window wdummy;
3464 dDisp; 3103
3104 dLocal (Display *, dpy);
3465 3105
3466 if (nargs == 0) 3106 if (nargs == 0)
3467 return; 3107 return;
3468 3108
3469 switch (args[0]) 3109 switch (args[0])
3470 { 3110 {
3471 /* 3111 /*
3472 * commands 3112 * commands
3473 */ 3113 */
3474 case 1: /* deiconify window */ 3114 case 1: /* deiconify window */
3475 XMapWindow (disp, TermWin.parent[0]); 3115 XMapWindow (dpy, parent);
3476 break; 3116 break;
3477 case 2: /* iconify window */ 3117 case 2: /* iconify window */
3478 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3118 XIconifyWindow (dpy, parent, display->screen);
3479 break; 3119 break;
3480 case 3: /* set position (pixels) */ 3120 case 3: /* set position (pixels) */
3481 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3121 XMoveWindow (dpy, parent, args[1], args[2]);
3482 break; 3122 break;
3483 case 4: /* set size (pixels) */ 3123 case 4: /* set size (pixels) */
3484 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3124 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3485 break; 3125 break;
3486 case 5: /* raise window */ 3126 case 5: /* raise window */
3487 XRaiseWindow (disp, TermWin.parent[0]); 3127 XRaiseWindow (dpy, parent);
3488 break; 3128 break;
3489 case 6: /* lower window */ 3129 case 6: /* lower window */
3490 XLowerWindow (disp, TermWin.parent[0]); 3130 XLowerWindow (dpy, parent);
3491 break; 3131 break;
3492 case 7: /* refresh window */ 3132 case 7: /* refresh window */
3493 scr_touch (true); 3133 scr_touch (true);
3494 break; 3134 break;
3495 case 8: /* set size (chars) */ 3135 case 8: /* set size (chars) */
3496 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3136 set_widthheight ((unsigned int) (args[2] * fwidth),
3497 (unsigned int) (args[1] * TermWin.fheight)); 3137 (unsigned int) (args[1] * fheight));
3498 break; 3138 break;
3499 3139
3500 //case 9: NYI, TODO, restore maximized window or maximize window 3140 //case 9: NYI, TODO, restore maximized window or maximize window
3501 default: 3141 default:
3502 if (args[0] >= 24) /* set height (chars) */ 3142 if (args[0] >= 24) /* set height (chars) */
3503 set_widthheight ((unsigned int)TermWin.width, 3143 set_widthheight ((unsigned int)width,
3504 (unsigned int) (args[1] * TermWin.fheight)); 3144 (unsigned int) (args[1] * fheight));
3505 break; 3145 break;
3506
3507 3146
3508 /* 3147 /*
3509 * reports - some output format copied from XTerm 3148 * reports - some output format copied from XTerm
3510 */ 3149 */
3511 case 11: /* report window state */ 3150 case 11: /* report window state */
3512 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3151 XGetWindowAttributes (dpy, parent, &wattr);
3513 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3152 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3514 break; 3153 break;
3515 case 13: /* report window position */ 3154 case 13: /* report window position */
3516 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3155 XGetWindowAttributes (dpy, parent, &wattr);
3517 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3156 XTranslateCoordinates (dpy, parent, wattr.root,
3518 -wattr.border_width, -wattr.border_width, 3157 -wattr.border_width, -wattr.border_width,
3519 &x, &y, &wdummy); 3158 &x, &y, &wdummy);
3520 tt_printf ("\033[3;%d;%dt", x, y); 3159 tt_printf ("\033[3;%d;%dt", x, y);
3521 break; 3160 break;
3522 case 14: /* report window size (pixels) */ 3161 case 14: /* report window size (pixels) */
3523 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3162 XGetWindowAttributes (dpy, parent, &wattr);
3524 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3163 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3525 break; 3164 break;
3526 case 18: /* report text area size (chars) */ 3165 case 18: /* report text area size (chars) */
3527 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3166 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3528 break; 3167 break;
3529 case 19: /* report window size (chars) */ 3168 case 19: /* report window size (chars) */
3530 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3169 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3531 break; 3170 break;
3532 case 20: /* report icon label */ 3171 case 20: /* report icon label */
3533 { 3172 {
3534 char *s; 3173 char *s;
3535 XGetIconName (disp, TermWin.parent[0], &s); 3174 XGetIconName (dpy, parent, &s);
3536 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3175 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3537 XFree (s); 3176 XFree (s);
3538 } 3177 }
3539 break; 3178 break;
3540 case 21: /* report window title */ 3179 case 21: /* report window title */
3541 { 3180 {
3542 char *s; 3181 char *s;
3543 XFetchName (disp, TermWin.parent[0], &s); 3182 XFetchName (dpy, parent, &s);
3544 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3183 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3545 XFree (s); 3184 XFree (s);
3546 } 3185 }
3547 break; 3186 break;
3548 } 3187 }
3549} 3188}
… …
3552/*----------------------------------------------------------------------*/ 3191/*----------------------------------------------------------------------*/
3553/* 3192/*
3554 * get input up until STRING TERMINATOR (or BEL) 3193 * get input up until STRING TERMINATOR (or BEL)
3555 * ends_how is terminator used. returned input must be free()'d 3194 * ends_how is terminator used. returned input must be free()'d
3556 */ 3195 */
3557unsigned char * 3196char *
3558rxvt_term::get_to_st (unicode_t &ends_how) 3197rxvt_term::get_to_st (unicode_t &ends_how)
3559{ 3198{
3560 unicode_t ch; 3199 unicode_t ch;
3561 bool seen_esc = false; 3200 bool seen_esc = false;
3562 unsigned int n = 0; 3201 unsigned int n = 0;
… …
3576 seen_esc = true; 3215 seen_esc = true;
3577 continue; 3216 continue;
3578 } 3217 }
3579 else if (ch == C0_BEL || ch == CHAR_ST) 3218 else if (ch == C0_BEL || ch == CHAR_ST)
3580 break; 3219 break;
3220 else if (ch == C0_SYN)
3221 ch = cmd_get8 ();
3581 else if (ch < 0x20) 3222 else if (ch < 0x20)
3582 return NULL; /* other control character - exit */ 3223 return NULL; /* other control character - exit */
3583 3224
3584 seen_esc = false; 3225 seen_esc = false;
3585 3226
3586 if (n >= sizeof (string) - 1) 3227 if (n >= STRING_MAX - 1)
3587 // stop at some sane length 3228 // stop at some sane length
3588 return NULL; 3229 return NULL;
3589 3230
3590 if (ch == C0_SYN)
3591 string[n++] = cmd_get8 ();
3592 else
3593 string[n++] = ch; 3231 string[n++] = ch;
3594 } 3232 }
3595 3233
3596 string[n++] = '\0'; 3234 string[n++] = '\0';
3597 3235
3598 ends_how = (ch == 0x5c ? C0_ESC : ch); 3236 ends_how = (ch == 0x5c ? C0_ESC : ch);
3599 3237
3600 return (unsigned char *)rxvt_wcstombs (string); 3238 return rxvt_wcstombs (string);
3601} 3239}
3602 3240
3603/*----------------------------------------------------------------------*/ 3241/*----------------------------------------------------------------------*/
3604/* 3242/*
3605 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3243 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3606 */ 3244 */
3607void 3245void
3608rxvt_term::process_dcs_seq () 3246rxvt_term::process_dcs_seq ()
3609{ 3247{
3610 unsigned char *s;
3611 unicode_t eh;
3612
3613 /* 3248 /*
3614 * Not handled yet 3249 * Not handled yet
3615 */ 3250 */
3251
3252 unicode_t eh;
3616 s = get_to_st (eh); 3253 char *s = get_to_st (eh);
3617 if (s) 3254 if (s)
3618 free (s); 3255 free (s);
3619 3256
3620 return; 3257 return;
3621} 3258}
… …
3625 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3262 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3626 */ 3263 */
3627void 3264void
3628rxvt_term::process_osc_seq () 3265rxvt_term::process_osc_seq ()
3629{ 3266{
3630 unicode_t ch, eh;
3631 int arg; 3267 int arg;
3632 3268
3633 ch = cmd_getc (); 3269 unicode_t ch = cmd_getc ();
3634 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3270 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3635 arg = arg * 10 + (ch - '0'); 3271 arg = arg * 10 + (ch - '0');
3636 3272
3637 if (ch == ';') 3273 if (ch == ';')
3638 { 3274 {
3275 unicode_t eh;
3639 unsigned char *s = get_to_st (eh); 3276 char *s = get_to_st (eh);
3640 3277
3641 if (s) 3278 if (s)
3642 { 3279 {
3643 process_xterm_seq (arg, (char *)s, eh); 3280 process_xterm_seq (arg, s, eh);
3644 free (s); 3281 free (s);
3645 } 3282 }
3646 } 3283 }
3647} 3284}
3648 3285
3649void 3286void
3650rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3287rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3651{ 3288{
3652 if (str[0] == '?' && !str[1]) 3289 if (str[0] == '?' && !str[1])
3653 { 3290 {
3654 unsigned short r, g, b; 3291 rgba c;
3655 pix_colors_focused[color].get (display, r, g, b); 3292 pix_colors_focused[color].get (c);
3293
3294#if XFT
3295 if (c.a != rgba::MAX_CC)
3296 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3297 else
3298#endif
3656 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3299 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3657 } 3300 }
3658 else 3301 else
3659 set_window_color (color, str); 3302 set_window_color (color, str);
3660} 3303}
3661 3304
3662/* 3305/*
3663 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3306 * 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 */ 3307 */
3687void 3308void
3688rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3309rxvt_term::process_xterm_seq (int op, char *str, char resp)
3689{ 3310{
3690 int changed = 0;
3691 int color; 3311 int color;
3692 char *buf, *name; 3312 char *buf, *name;
3693 bool query = str[0] == '?' && !str[1]; 3313 bool query = str[0] == '?' && !str[1];
3694 int saveop = op; 3314 int saveop = op;
3695 dDisp; 3315
3316 dLocal (Display *, dpy);
3696 3317
3697 assert (str != NULL); 3318 assert (str != NULL);
3319
3320 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3321 return;
3322
3698 switch (op) 3323 switch (op)
3699 { 3324 {
3700 case XTerm_name: 3325 case XTerm_name:
3701 set_title (str); 3326 set_title (str);
3702 /* FALLTHROUGH */ 3327 /* FALLTHROUGH */
… …
3716 unsigned long bytes_after; 3341 unsigned long bytes_after;
3717 unsigned char *value = 0; 3342 unsigned char *value = 0;
3718 const char *str = ""; 3343 const char *str = "";
3719 3344
3720 if (prop 3345 if (prop
3721 && XGetWindowProperty (disp, TermWin.parent[0], 3346 && XGetWindowProperty (dpy, parent,
3722 prop, 0, 1<<16, 0, AnyPropertyType, 3347 prop, 0, 1<<16, 0, AnyPropertyType,
3723 &actual_type, &actual_format, 3348 &actual_type, &actual_format,
3724 &nitems, &bytes_after, &value) == Success 3349 &nitems, &bytes_after, &value) == Success
3725 && actual_type != None 3350 && actual_type != None
3726 && actual_format == 8) 3351 && actual_format == 8)
3727 str = (const char *)(value); 3352 str = (const char *)(value);
3728 3353
3729 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3354 tt_printf ("\033]%d;%s%c", op, str, resp);
3730 3355
3731 XFree (value); 3356 XFree (value);
3732 } 3357 }
3733 else 3358 else
3734 { 3359 {
3735 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3360 char *eq = strchr (str, '=');
3736 3361
3737 if (eq) 3362 if (eq)
3738 { 3363 {
3739 *eq = 0; 3364 *eq = 0;
3740 set_utf8_property (display->atom (str), eq + 1); 3365 set_utf8_property (display->atom (str), eq + 1);
3741 } 3366 }
3742 else 3367 else
3743 XDeleteProperty (disp, TermWin.parent[0], 3368 XDeleteProperty (dpy, parent,
3744 display->atom (str)); 3369 display->atom (str));
3745 } 3370 }
3746 break; 3371 break;
3747 3372
3748 case XTerm_Color: 3373 case XTerm_Color:
… …
3750 { 3375 {
3751 if ((name = strchr (buf, ';')) == NULL) 3376 if ((name = strchr (buf, ';')) == NULL)
3752 break; 3377 break;
3753 3378
3754 *name++ = '\0'; 3379 *name++ = '\0';
3755 color = atoi (buf); 3380 color = atoi (buf) + minCOLOR;
3756 3381
3757 if (color < 0 || color >= TOTAL_COLORS) 3382 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3758 break; 3383 break;
3759 3384
3760 if ((buf = strchr (name, ';')) != NULL) 3385 if ((buf = strchr (name, ';')) != NULL)
3761 *buf++ = '\0'; 3386 *buf++ = '\0';
3762 3387
3763 if (name[0] == '?' && !name[1]) 3388 process_color_seq (op, color, name, resp);
3389 }
3390 break;
3391 case Rxvt_restoreFG:
3392 case XTerm_Color00:
3393 process_color_seq (op, Color_fg, str, resp);
3394 break;
3395 case Rxvt_restoreBG:
3396 case XTerm_Color01:
3397 process_color_seq (op, Color_bg, str, resp);
3398 break;
3399#ifndef NO_CURSORCOLOR
3400 case XTerm_Color_cursor:
3401 process_color_seq (op, Color_cursor, str, resp);
3402 break;
3403#endif
3404 case XTerm_Color_pointer_fg:
3405 process_color_seq (op, Color_pointer_fg, str, resp);
3406 break;
3407 case XTerm_Color_pointer_bg:
3408 process_color_seq (op, Color_pointer_bg, str, resp);
3409 break;
3410#ifdef OPTION_HC
3411 case XTerm_Color_HC:
3412 process_color_seq (op, Color_HC, str, resp);
3413 break;
3414 case XTerm_Color_HTC:
3415 process_color_seq (op, Color_HTC, str, resp);
3416 break;
3417#endif
3418#ifndef NO_BOLD_UNDERLINE_REVERSE
3419 case URxvt_Color_BD:
3420 process_color_seq (op, Color_BD, str, resp);
3421 break;
3422 case URxvt_Color_UL:
3423 process_color_seq (op, Color_UL, str, resp);
3424 break;
3425 case URxvt_Color_IT:
3426 process_color_seq (op, Color_IT, str, resp);
3427 break;
3428#endif
3429 case URxvt_Color_border:
3430 process_color_seq (op, Color_border, str, resp);
3431 break;
3432#if ENABLE_TRANSPARENCY
3433 case URxvt_Color_tint:
3434 process_color_seq (op, Color_tint, str, resp);
3435 {
3436 bool changed = false;
3437
3438 if (ISSET_PIXCOLOR (Color_tint))
3439 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3440
3441 if (changed)
3442 update_background ();
3443 }
3444
3445 break;
3446#endif
3447
3448#if BG_IMAGE_FROM_FILE
3449 case Rxvt_Pixmap:
3450 if (!strcmp (str, "?"))
3451 {
3452 char str[256];
3453
3454 sprintf (str, "[%dx%d+%d+%d]",
3455 min (h_scale, 32767), min (v_scale, 32767),
3456 min (h_align, 32767), min (v_align, 32767));
3457 process_xterm_seq (XTerm_title, str, CHAR_ST);
3458 }
3459 else
3460 {
3461 int changed = 0;
3462
3463 if (*str != ';')
3764 { 3464 {
3765 unsigned short r, g, b; 3465 if (bg_set_file (str)) /* change pixmap */
3766 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3466 {
3767 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3467 changed++;
3468 str = strchr (str, ';');
3469 if (str == NULL)
3470 bg_set_default_geometry ();
3471 else
3472 bg_set_geometry (str+1);
3473 }
3768 } 3474 }
3769 else 3475 else
3770 set_window_color (color + minCOLOR, name); 3476 {
3477 str++;
3478 if (bg_set_geometry (str, true))
3479 changed++;
3480 }
3481
3482 if (changed)
3483 {
3484 if (bg_window_position_sensitive ())
3485 {
3486 int x, y;
3487 get_window_origin (x, y);
3488 bg_set_position (x, y);
3489 }
3490 update_background ();
3491 }
3771 } 3492 }
3772 break; 3493 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 3494#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 3495
3846 case XTerm_logfile: 3496 case XTerm_logfile:
3847 // TODO, when secure mode? 3497 // TODO, when secure mode?
3848 break; 3498 break;
3849 3499
3500#if 0
3501 case Rxvt_dumpscreen: /* no error notices */
3502 {
3503 int fd;
3504 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3505 {
3506 scr_dump (fd);
3507 close (fd);
3508 }
3509 }
3510 break;
3511#endif
3850 case XTerm_font: 3512 case XTerm_font:
3851 op = URxvt_font; 3513 op = URxvt_font;
3852 case URxvt_font: 3514 case URxvt_font:
3853#if ENABLE_STYLES 3515#if ENABLE_STYLES
3854 case URxvt_boldFont: 3516 case URxvt_boldFont:
3855 case URxvt_italicFont: 3517 case URxvt_italicFont:
3856 case URxvt_boldItalicFont: 3518 case URxvt_boldItalicFont:
3857#endif 3519#endif
3858 if (query) 3520 if (query)
3859 tt_printf ("\33]%d;%-.250s%c", saveop, 3521 tt_printf ("\33]%d;%-.250s%c", saveop,
3860 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3522 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3861 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3523 ? fontset[op - URxvt_font]->fontdesc : "",
3862 resp); 3524 resp);
3863 else 3525 else
3864 { 3526 {
3865 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3527 const char *&res = rs[Rs_font + (op - URxvt_font)];
3866 3528
… …
3868 allocated.push_back ((void *)res); 3530 allocated.push_back ((void *)res);
3869 set_fonts (); 3531 set_fonts ();
3870 } 3532 }
3871 break; 3533 break;
3872 3534
3873#if ENABLE_FRILLS 3535 case URxvt_version:
3874 case XTerm_locale:
3875 if (query) 3536 if (query)
3537 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3538 op,
3539 rs[Rs_name], VERSION[0], VERSION[2],
3540 resp);
3541 break;
3542
3543#if !ENABLE_MINIMAL
3544 case URxvt_locale:
3545 if (query)
3876 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3546 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3877 else 3547 else
3878 { 3548 {
3879 set_locale (str); 3549 set_locale (str);
3880 pty.set_utf8_mode (enc_utf8); 3550 pty->set_utf8_mode (enc_utf8);
3881 init_xlocale (); 3551 init_xlocale ();
3882 } 3552 }
3883 break; 3553 break;
3884#endif
3885 3554
3886#ifdef MENUBAR 3555 case URxvt_view_up:
3887 case XTerm_Menu: 3556 case URxvt_view_down:
3888 if (options & Opt_insecure) 3557 {
3889 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3558 int lines = atoi (str);
3559
3560 if (lines)
3561 scr_page (op == URxvt_view_up ? UP : DN, lines);
3562 else
3563 scr_erase_savelines ();
3564 }
3565
3890 break; 3566 break;
3891#endif 3567#endif
3892#if 0 3568
3893 case XTerm_dumpscreen: /* no error notices */ 3569#if ENABLE_PERL
3894 { 3570 case URxvt_perl:
3895 int fd; 3571 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3896 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3897 {
3898 scr_dump (fd);
3899 close (fd);
3900 }
3901 }
3902 break; 3572 break;
3903#endif 3573#endif
3904 } 3574 }
3905} 3575}
3906/*----------------------------------------------------------------------*/ 3576/*----------------------------------------------------------------------*/
… …
3929 { 3599 {
3930 if (mode == 'r') 3600 if (mode == 'r')
3931 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3601 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3932 else 3602 else
3933 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3603 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3934 PrivMode (state, bit); 3604
3605 set_privmode (bit, state);
3935 } 3606 }
3936 3607
3937 return state; 3608 return state;
3938} 3609}
3939 3610
3940/* we're not using priv _yet_ */ 3611/* we're not using priv _yet_ */
3941void 3612void
3942rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3613rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3943{ 3614{
3944 unsigned int i, j; 3615 unsigned int i, j;
3945 int state; 3616 int state;
3946 3617
3947 static const struct 3618 static const struct
3948 { 3619 {
3949 const int argval; 3620 const int argval;
3950 const unsigned long bit; 3621 const unsigned long bit;
3951 }
3952
3953 argtopriv[] = { 3622 } argtopriv[] = {
3954 { 1, PrivMode_aplCUR }, 3623 { 1, PrivMode_aplCUR }, // DECCKM
3955 { 2, PrivMode_vt52 }, 3624 { 2, PrivMode_vt52 },
3956 { 3, PrivMode_132 }, 3625 { 3, PrivMode_132 }, // DECCOLM
3957 { 4, PrivMode_smoothScroll }, 3626 { 4, PrivMode_smoothScroll }, // DECSCLM
3958 { 5, PrivMode_rVideo }, 3627 { 5, PrivMode_rVideo }, // DECSCNM
3959 { 6, PrivMode_relOrigin }, 3628 { 6, PrivMode_relOrigin }, // DECOM
3960 { 7, PrivMode_Autowrap }, 3629 { 7, PrivMode_Autowrap }, // DECAWM
3961 // 8, bi-directional support mode 3630 // 8, auto-repeat keys // DECARM
3962 { 9, PrivMode_MouseX10 }, 3631 { 9, PrivMode_MouseX10 },
3963#ifdef menuBar_esc 3632 // 18 end FF to printer after print screen
3964 { menuBar_esc, PrivMode_menuBar }, 3633 // 19 Print screen prints full screen/scroll region
3965#endif
3966 // 18, 19 printing-related
3967 { 25, PrivMode_VisibleCursor }, 3634 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3968#ifdef scrollBar_esc 3635#ifdef scrollBar_esc
3969 { scrollBar_esc, PrivMode_scrollBar }, 3636 { scrollBar_esc, PrivMode_scrollBar },
3970#endif 3637#endif
3971 { 35, PrivMode_ShiftKeys }, // rxvt extension 3638 { 35, PrivMode_ShiftKeys }, // rxvt extension
3639 // 38, tektronix mode // DECTEK
3972 { 40, PrivMode_132OK }, 3640 { 40, PrivMode_132OK },
3973 // 41 xterm more fixes NYI 3641 // 41 xterm more fixes NYI
3974 // 45 margin bell NYI 3642 // 45 margin bell NYI
3975 // 46 start logging 3643 // 46 start logging
3976 { 47, PrivMode_Screen }, 3644 { 47, PrivMode_Screen },
3977 { 66, PrivMode_aplKP }, 3645 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3978#ifndef NO_BACKSPACE_KEY 3646#ifndef NO_BACKSPACE_KEY
3979 { 67, PrivMode_BackSpace }, 3647 { 67, PrivMode_BackSpace }, // DECBKM
3980#endif 3648#endif
3981 { 1000, PrivMode_MouseX11 }, 3649 { 1000, PrivMode_MouseX11 },
3982 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3650 { 1002, PrivMode_MouseBtnEvent },
3983 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3651 { 1003, PrivMode_MouseAnyEvent },
3984 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3652#if ENABLE_FRILLS
3653 { 1005, PrivMode_ExtModeMouse },
3654#endif
3985 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3655 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3986 { 1011, PrivMode_Keypress }, // rxvt extension 3656 { 1011, PrivMode_Keypress }, // rxvt extension
3657#if ENABLE_FRILLS
3658 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3659#endif
3987 // 1035 enable modifiers for alt, numlock NYI 3660 // 1035 enable modifiers for alt, numlock NYI
3988 // 1036 send ESC for meta keys NYI 3661 // 1036 send ESC for meta keys NYI
3989 // 1037 send DEL for keypad delete NYI 3662 // 1037 send DEL for keypad delete NYI
3990 { 1047, PrivMode_Screen }, 3663 { 1047, PrivMode_Screen },
3991 // 1048 save and restore cursor 3664 // 1048 save and restore cursor, implemented in code
3992 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3665 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3993 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3666 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3667 { 2004, PrivMode_BracketPaste },
3994 }; 3668 };
3995 3669
3996 if (nargs == 0) 3670 if (nargs == 0)
3997 return; 3671 return;
3998 3672
… …
4005 for (i = 0; i < nargs; i++) 3679 for (i = 0; i < nargs; i++)
4006 { 3680 {
4007 state = -1; 3681 state = -1;
4008 3682
4009 /* basic handling */ 3683 /* basic handling */
4010 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3684 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
4011 if (argtopriv[j].argval == arg[i]) 3685 if (argtopriv[j].argval == arg[i])
4012 { 3686 {
4013 state = privcases (mode, argtopriv[j].bit); 3687 state = privcases (mode, argtopriv[j].bit);
4014 break; 3688 break;
4015 } 3689 }
4016 3690
4017 /* extra handling for values with state unkept */ 3691 /* extra handling for values with state unkept */
4018 switch (arg[i]) 3692 switch (arg[i])
4019 { 3693 {
3694#if ENABLE_STYLES
3695 case 1021:
3696 set_option (Opt_intensityStyles, mode);
3697
3698 scr_touch (true);
3699 break;
3700#endif
4020 case 1048: /* alternative cursor save */ 3701 case 1048: /* alternative cursor save */
4021 case 1049:
4022 if (options & Opt_secondaryScreen) 3702 if (option (Opt_secondaryScreen))
4023 if (mode == 0) 3703 if (mode == 0)
4024 scr_cursor (RESTORE); 3704 scr_cursor (RESTORE);
4025 else if (mode == 1) 3705 else if (mode == 1)
4026 scr_cursor (SAVE); 3706 scr_cursor (SAVE);
4027 break; 3707 break;
… …
4035 case 2: /* VT52 mode */ 3715 case 2: /* VT52 mode */
4036 /* oddball mode. should be set regardless of set/reset 3716 /* oddball mode. should be set regardless of set/reset
4037 * parameter. Return from VT52 mode with an ESC < from 3717 * parameter. Return from VT52 mode with an ESC < from
4038 * within VT52 mode 3718 * within VT52 mode
4039 */ 3719 */
4040 PrivMode (1, PrivMode_vt52); 3720 set_privmode (PrivMode_vt52, 1);
4041 break; 3721 break;
4042 case 3: /* 80/132 */ 3722 case 3: /* 80/132 */
4043 if (priv_modes & PrivMode_132OK) 3723 if (priv_modes & PrivMode_132OK)
4044 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3724 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4045 break; 3725 break;
4046 case 4: /* smooth scrolling */ 3726 case 4: /* smooth scrolling */
4047 if (state)
4048 options &= ~Opt_jumpScroll;
4049 else
4050 options |= Opt_jumpScroll; 3727 set_option (Opt_jumpScroll, !state);
4051 break; 3728 break;
4052 case 5: /* reverse video */ 3729 case 5: /* reverse video */
4053 scr_rvideo_mode (state); 3730 scr_rvideo_mode (state);
4054 break; 3731 break;
4055 case 6: /* relative/absolute origins */ 3732 case 6: /* relative/absolute origins */
… …
4059 scr_autowrap (state); 3736 scr_autowrap (state);
4060 break; 3737 break;
4061 /* case 8: - auto repeat, can't do on a per window basis */ 3738 /* case 8: - auto repeat, can't do on a per window basis */
4062 case 9: /* X10 mouse reporting */ 3739 case 9: /* X10 mouse reporting */
4063 if (state) /* orthogonal */ 3740 if (state) /* orthogonal */
4064 priv_modes &= ~PrivMode_MouseX11; 3741 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4065 break; 3742 break;
4066#ifdef menuBar_esc
4067 case menuBar_esc:
4068#ifdef MENUBAR
4069 map_menuBar (state);
4070#endif
4071 break;
4072#endif
4073#ifdef scrollBar_esc 3743#ifdef scrollBar_esc
4074 case scrollBar_esc: 3744 case scrollBar_esc:
4075 if (scrollbar_mapping (state)) 3745 if (scrollBar.map (state))
4076 { 3746 {
4077 resize_all_windows (0, 0, 0); 3747 resize_all_windows (0, 0, 0);
4078 scr_touch (true); 3748 scr_touch (true);
4079 } 3749 }
4080 break; 3750 break;
… …
4089 break; 3759 break;
4090 /* case 66: - application key pad */ 3760 /* case 66: - application key pad */
4091 /* case 67: - backspace key */ 3761 /* case 67: - backspace key */
4092 case 1000: /* X11 mouse reporting */ 3762 case 1000: /* X11 mouse reporting */
4093 if (state) /* orthogonal */ 3763 if (state) /* orthogonal */
4094 priv_modes &= ~PrivMode_MouseX10; 3764 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4095 break; 3765 break;
4096#if 0
4097 case 1001: 3766 case 1002:
4098 break; /* X11 mouse highlighting */ 3767 case 1003:
4099#endif 3768 if (state)
3769 {
3770 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3771 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3772 mouse_row = mouse_col = 0;
3773 vt_emask_mouse = PointerMotionMask;
3774 }
3775 else
3776 vt_emask_mouse = NoEventMask;
3777
3778 vt_select_input ();
3779 break;
4100 case 1010: /* scroll to bottom on TTY output inhibit */ 3780 case 1010: /* scroll to bottom on TTY output inhibit */
4101 if (state)
4102 options &= ~Opt_scrollTtyOutput;
4103 else
4104 options |= Opt_scrollTtyOutput; 3781 set_option (Opt_scrollTtyOutput, !state);
4105 break; 3782 break;
4106 case 1011: /* scroll to bottom on key press */ 3783 case 1011: /* scroll to bottom on key press */
4107 if (state)
4108 options |= Opt_scrollTtyKeypress; 3784 set_option (Opt_scrollTtyKeypress, state);
4109 else
4110 options &= ~Opt_scrollTtyKeypress;
4111 break; 3785 break;
4112 case 1047: /* secondary screen w/ clearing last */ 3786 case 1047: /* secondary screen w/ clearing last */
4113 if (options & Opt_secondaryScreen) 3787 if (option (Opt_secondaryScreen))
4114 if (current_screen != PRIMARY) 3788 if (!state)
4115 scr_erase_screen (2); 3789 scr_erase_screen (2);
3790
4116 scr_change_screen (state); 3791 scr_change_screen (state);
4117 break; 3792 break;
4118 case 1049: /* secondary screen w/ clearing first */ 3793 case 1049: /* secondary screen w/ clearing first */
3794 if (option (Opt_secondaryScreen))
3795 if (state)
3796 scr_cursor (SAVE);
3797
4119 scr_change_screen (state); 3798 scr_change_screen (state);
3799
4120 if (options & Opt_secondaryScreen) 3800 if (option (Opt_secondaryScreen))
4121 if (current_screen != PRIMARY) 3801 if (state)
4122 scr_erase_screen (2); 3802 scr_erase_screen (2);
3803 else
3804 scr_cursor (RESTORE);
4123 break; 3805 break;
4124 default: 3806 default:
4125 break; 3807 break;
4126 } 3808 }
4127 } 3809 }
… …
4253 scr_color (Color_bg, Color_bg); 3935 scr_color (Color_bg, Color_bg);
4254 break; 3936 break;
4255 3937
4256 //case 50: // not variable spacing 3938 //case 50: // not variable spacing
4257 3939
4258#ifndef NO_BRIGHTCOLOR 3940#if !ENABLE_MINIMAL
4259 case 90: 3941 case 90:
4260 case 91: /* set bright fg color */ 3942 case 91: /* set bright fg color */
4261 case 92: 3943 case 92:
4262 case 93: 3944 case 93:
4263 case 94: 3945 case 94:
… …
4275 case 106: 3957 case 106:
4276 case 107: 3958 case 107:
4277 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 3959 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4278 break; 3960 break;
4279#endif 3961#endif
4280
4281 } 3962 }
4282 } 3963 }
4283}
4284/*}}} */
4285
4286/*{{{ (do not) process Rob Nation's own graphics mode sequences */
4287void
4288rxvt_term::process_graphics ()
4289{
4290 unicode_t ch, cmd = cmd_getc ();
4291
4292 if (cmd == 'Q')
4293 { /* query graphics */
4294 tt_printf ("\033G0\012"); /* no graphics */
4295 return;
4296 }
4297 /* swallow other graphics sequences until terminating ':' */
4298 do
4299 ch = cmd_getc ();
4300 while (ch != ':');
4301} 3964}
4302/*}}} */ 3965/*}}} */
4303 3966
4304/* ------------------------------------------------------------------------- */ 3967/* ------------------------------------------------------------------------- */
4305 3968
… …
4309 */ 3972 */
4310void 3973void
4311rxvt_term::tt_printf (const char *fmt,...) 3974rxvt_term::tt_printf (const char *fmt,...)
4312{ 3975{
4313 va_list arg_ptr; 3976 va_list arg_ptr;
4314 unsigned char buf[256]; 3977 char buf[256];
4315 3978
4316 va_start (arg_ptr, fmt); 3979 va_start (arg_ptr, fmt);
4317 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3980 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4318 va_end (arg_ptr); 3981 va_end (arg_ptr);
4319 tt_write (buf, strlen (buf)); 3982 tt_write (buf, strlen (buf));
… …
4321 3984
4322/* ---------------------------------------------------------------------- */ 3985/* ---------------------------------------------------------------------- */
4323/* Write data to the pty as typed by the user, pasted with the mouse, 3986/* Write data to the pty as typed by the user, pasted with the mouse,
4324 * or generated by us in response to a query ESC sequence. 3987 * or generated by us in response to a query ESC sequence.
4325 */ 3988 */
4326const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3989static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4327 3990
4328void 3991void
4329rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3992rxvt_term::tt_write (const char *data, unsigned int len)
4330{ 3993{
3994 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3995 return;
3996
3997 if (pty->pty < 0)
3998 return;
3999
4331 if (v_buflen == 0) 4000 if (v_buflen == 0)
4332 { 4001 {
4333 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4002 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4334 4003
4004 max_it (written, 0);
4005
4335 if ((unsigned int)written == len) 4006 if (written == len)
4336 return; 4007 return;
4337 4008
4338 data += written; 4009 data += written;
4339 len -= written; 4010 len -= written;
4340 } 4011 }
4341 4012
4342 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4013 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4343 4014
4344 memcpy (v_buffer + v_buflen, data, len); 4015 memcpy (v_buffer + v_buflen, data, len);
4345 v_buflen += len; 4016 v_buflen += len;
4346 4017
4347 pty_ev.set (EVENT_READ | EVENT_WRITE); 4018 pty_ev.set (ev::READ | ev::WRITE);
4348} 4019}
4349 4020
4350void rxvt_term::pty_write () 4021void rxvt_term::pty_write ()
4351{ 4022{
4352 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4023 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4353 4024
4354 if (written > 0) 4025 if (written > 0)
4355 { 4026 {
4356 v_buflen -= written; 4027 v_buflen -= written;
4357 4028
4358 if (v_buflen == 0) 4029 if (v_buflen == 0)
4359 { 4030 {
4360 free (v_buffer); 4031 free (v_buffer);
4361 v_buffer = 0; 4032 v_buffer = 0;
4362 v_buflen = 0;
4363 4033
4364 pty_ev.set (EVENT_READ); 4034 pty_ev.set (ev::READ);
4365 return; 4035 return;
4366 } 4036 }
4367 4037
4368 memmove (v_buffer, v_buffer + written, v_buflen); 4038 memmove (v_buffer, v_buffer + written, v_buflen);
4369 } 4039 }
4370 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4040 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4371 // original code just ignores this... 4041 pty_ev.set (ev::READ);
4372 destroy ();
4373} 4042}
4374 4043
4375/*----------------------- end-of-file (C source) -----------------------*/ 4044/*----------------------- end-of-file (C source) -----------------------*/
4376 4045

Diff Legend

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