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

Diff Legend

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