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

Diff Legend

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