ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

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

Diff Legend

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