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

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

Diff Legend

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