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

Diff Legend

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