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.381 by root, Fri Dec 14 05:25:23 2007 UTC vs.
Revision 1.544 by sf-exg, Sat Apr 26 14:55:58 2014 UTC

… …
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-2007 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.
… …
53 54
54#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
55# include "keyboard.h" 56# include "keyboard.h"
56#endif 57#endif
57 58
58#include <csignal> 59#include <signal.h>
59 60
60#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
61# include <ctime> 62# include <time.h>
62#endif 63#endif
63 64
64/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
65 66
66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
130 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
131#endif 132#endif
132 0, 133 0,
133}; 134};
134 135
135void 136void ecb_cold
136rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
137{ 138{
138 x = Pixel2Col (x); 139 x = Pixel2Col (x);
139 y = Pixel2Row (y); 140 y = Pixel2Row (y);
140 141
… …
148 149
149 text_t t = l.t[x]; 150 text_t t = l.t[x];
150 151
151 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
152 { 153 {
153 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
154 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
155 break; 156 break;
156 } 157 }
157 158
158 x--; 159 x--;
159 } 160 }
160} 161}
161 162
162void 163void ecb_cold
163rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
164{ 165{
165 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
166 rxvt_font *f = (*fs)[fs->find_font (ch)];
167 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169
170 fname = rxvt_utf8towcs (f->name);
171 169
172# if ENABLE_COMBINING 170# if ENABLE_COMBINING
173 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
174 { 172 {
175 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
183 181
184 alloc = 0; 182 alloc = 0;
185 chr = &ch2; 183 chr = &ch2;
186 len = 1; 184 len = 1;
187 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
188 189
189 char attr[80]; // plenty 190 char attr[80]; // plenty
190 191
191 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
192 (int)r, 193 (int)r,
… …
196 r & RS_Blink ? " blink" : "", 197 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "", 198 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
200 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);
201 int width = wcswidth (fname, wcslen (fname)); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
209 }
202 210
203 max_it (width, 8+5); // for char + hey
204 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
205 212
206 if (y >= 0) 213 if (y >= 0)
207 { 214 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
209 x = 0; 216 x = 0;
210 } 217 }
211 218
212 scr_overlay_new (x, y, width, len + 2); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
213 222
214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
215 224
216 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
217 { 226 {
218 char buf[9]; 227 char buf[9];
219 228
220 ch = *chr++; 229 ch = *chr++;
221 230
222 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
224 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
225# if !UNICODE3 234# if !UNICODE_3
226 if (ch >= 0x10000) 235 if (ch >= 0x10000)
227 ch = 0xfffd; 236 ch = 0xfffd;
228# endif 237# endif
229 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
230 239
231 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
233 } 242 }
234 243
235// { 244// {
236// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
239// } 248// }
240 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
250 for (int i = 0; i < len; i++)
251 {
241 scr_overlay_set (0, len + 1, fname); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
242
243 free (fname); 253 free (fname[i]);
254 }
244 255
245# if ENABLE_COMBINING 256# if ENABLE_COMBINING
246 if (alloc) 257 if (alloc)
247 delete [] alloc; 258 delete [] alloc;
248# endif 259# endif
249} 260}
250#endif 261#endif
251 262
252void 263void ecb_cold
253rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
254{ 265{
255 wchar_t ch[2];
256
257 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
258 ch[1] = 0;
259 267
260 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
261 { 269 {
262 char mb[16]; 270 char mb[MB_LEN_MAX];
263 int len; 271 int len;
264 272
265 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
266 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
267 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
268 else 276 else
269 { 277 {
270 mb[0] = ch[0]; 278 mb[0] = ch;
271 len = 1; 279 len = 1;
272 } 280 }
273 281
274 if (len > 0) 282 if (len > 0)
275 tt_write (mb, len); 283 tt_write (mb, len);
… …
278 } 286 }
279 287
280 iso14755buf = 0; 288 iso14755buf = 0;
281} 289}
282 290
283int 291static int ecb_cold
284rxvt_term::hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
285{ 293{
286 // check wether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
287 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
289 { 297 {
290 KeySym k = XLookupKeysym (&ev, index); 298 KeySym k = XLookupKeysym (&ev, index);
291 299
… …
297 305
298 return -1; 306 return -1;
299} 307}
300#endif 308#endif
301 309
302void 310static inline KeySym ecb_cold
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
303rxvt_term::key_press (XKeyEvent &ev) 415rxvt_term::key_press (XKeyEvent &ev)
304{ 416{
305 int ctrl, meta, shft, len; 417 int ctrl, meta, shft, len;
306 unsigned int newlen;
307 KeySym keysym; 418 KeySym keysym;
308 int valid_keysym; 419 int valid_keysym;
309 char kbuf[KBUFSZ]; 420 char rkbuf[KBUFSZ];
421 char *kbuf = rkbuf + 1;
310 422
311#if ISO_14755 423#if ISO_14755
312 if (iso14755buf & ISO_14755_52) 424 if (iso14755buf & ISO_14755_52)
313 return; 425 return;
314#endif 426#endif
… …
321 */ 433 */
322 shft = ev.state & ShiftMask; 434 shft = ev.state & ShiftMask;
323 ctrl = ev.state & ControlMask; 435 ctrl = ev.state & ControlMask;
324 meta = ev.state & ModMetaMask; 436 meta = ev.state & ModMetaMask;
325 437
326 if (numlock_state || (ev.state & ModNumLockMask))
327 {
328 numlock_state = (ev.state & ModNumLockMask);
329 PrivMode ((!numlock_state), PrivMode_aplKP);
330 }
331
332 kbuf[0] = 0; 438 kbuf[0] = 0;
333 439
334#ifdef USE_XIM 440#if USE_XIM
335 if (Input_Context) 441 if (Input_Context)
336 { 442 {
337 Status status_return; 443 Status status_return;
338 444
339#if 0 445#if 0
… …
410#ifdef PAGING_CONTEXT_LINES 516#ifdef PAGING_CONTEXT_LINES
411 lnsppg = nrow - PAGING_CONTEXT_LINES; 517 lnsppg = nrow - PAGING_CONTEXT_LINES;
412#else 518#else
413 lnsppg = nrow * 4 / 5; 519 lnsppg = nrow * 4 / 5;
414#endif 520#endif
521 max_it (lnsppg, 1);
522
415 if (keysym == XK_Prior) 523 if (keysym == XK_Prior)
416 { 524 {
417 scr_page (UP, lnsppg); 525 scr_page (lnsppg);
418 return; 526 return;
419 } 527 }
420 else if (keysym == XK_Next) 528 else if (keysym == XK_Next)
421 { 529 {
422 scr_page (DN, lnsppg); 530 scr_page (-lnsppg);
423 return; 531 return;
424 } 532 }
425 } 533 }
426#ifdef SCROLL_ON_UPDOWN_KEYS 534#ifdef SCROLL_ON_UPDOWN_KEYS
427 if (IS_SCROLL_MOD) 535 if (IS_SCROLL_MOD)
428 { 536 {
429 if (keysym == XK_Up) 537 if (keysym == XK_Up)
430 { 538 {
431 scr_page (UP, 1); 539 scr_page (1);
432 return; 540 return;
433 } 541 }
434 else if (keysym == XK_Down) 542 else if (keysym == XK_Down)
435 { 543 {
436 scr_page (DN, 1); 544 scr_page (-1);
437 return; 545 return;
438 } 546 }
439 } 547 }
440#endif 548#endif
441#ifdef SCROLL_ON_HOMEEND_KEYS 549#ifdef SCROLL_ON_HOMEEND_KEYS
442 if (IS_SCROLL_MOD) 550 if (IS_SCROLL_MOD)
443 { 551 {
444 if (keysym == XK_Home) 552 if (keysym == XK_Home)
445 { 553 {
446 scr_move_to (0, 1); 554 scr_changeview (top_row);
447 return; 555 return;
448 } 556 }
449 else if (keysym == XK_End) 557 else if (keysym == XK_End)
450 { 558 {
451 scr_move_to (1, 1); 559 scr_changeview (0);
452 return; 560 return;
453 } 561 }
454 } 562 }
455#endif 563#endif
456 } 564 }
… …
472 selection_request (ev.time); 580 selection_request (ev.time);
473 return; 581 return;
474#if TODO 582#if TODO
475 /* rxvt extras */ 583 /* rxvt extras */
476 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 584 case XK_KP_Add: /* Shift+KP_Add = bigger font */
477 change_font (FONT_UP);
478 return; 585 return;
479 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 586 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
480 change_font (FONT_DN);
481 return; 587 return;
482#endif 588#endif
483 } 589 }
484 } 590 }
485 } 591 }
486 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
487#if ENABLE_FRILLS || ISO_14755 608#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 609 // ISO 14755 support
489 if (shft && ctrl) 610 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 611 {
491 int hv; 612 int hv;
492 613
493 if (iso14755buf & ISO_14755_51 614 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 615 && (keysym == XK_space || keysym == XK_KP_Space
… …
524 scr_overlay_off (); 645 scr_overlay_off ();
525# endif 646# endif
526 iso14755buf = 0; 647 iso14755buf = 0;
527 } 648 }
528 } 649 }
650 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 651 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 652 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 653 if (!(iso14755buf & ISO_14755_STARTED))
532 { 654 {
533 iso14755buf |= ISO_14755_STARTED; 655 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 656# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 657 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
546 } 668 }
547#endif 669#endif
548 670
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 671 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 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)
551 { 682 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 683#ifndef NO_BACKSPACE_KEY
553 newlen = 1; 684 case XK_BackSpace:
554#ifdef XK_KP_Home 685 if (priv_modes & PrivMode_HaveBackSpace)
555 static const KeySym keypadtrans[] = { 686 {
556 XK_KP_7, // XK_KP_Home 687 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
557 XK_KP_4, // XK_KP_Left 688 ^ !!ctrl) ? '\b' : '\177';
558 XK_KP_8, // XK_KP_Up 689 kbuf[1] = '\0';
559 XK_KP_6, // XK_KP_Right
560 XK_KP_2, // XK_KP_Down
561#ifndef UNSHIFTED_SCROLLKEYS
562 XK_KP_9, // XK_KP_Prior
563 XK_KP_3, // XK_KP_Next
564#else
565 XK_Prior,
566 XK_Next,
567#endif
568 XK_KP_1, // XK_KP_End
569 XK_KP_5, // XK_KP_Begin
570 }; 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
713 newlen = 0;
714 }
715 break;
571 716
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 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:
573 { 797 {
574 unsigned int index = keysym - XK_KP_Home; 798 int param = map_function_key (keysym);
575 keysym = kp ? keypadtrans[index] : XK_Home + index; 799 if (param > 0)
800 sprintf (kbuf,"\033[%d~", param);
801 else
802 newlen = 0;
576 } 803 }
577 else if (keysym == XK_KP_Insert)
578 keysym = kp ? XK_KP_0 : XK_Insert;
579#ifndef NO_DELETE_KEY
580 else if (keysym == XK_KP_Delete)
581 keysym = kp ? XK_KP_Decimal : XK_Delete;
582#endif
583#endif
584 switch (keysym)
585 {
586#ifndef NO_BACKSPACE_KEY
587 case XK_BackSpace:
588 if (priv_modes & PrivMode_HaveBackSpace)
589 {
590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
591 ^ !!ctrl) ? '\b' : '\177';
592 kbuf[1] = '\0';
593 }
594 else
595 strcpy (kbuf, rs[Rs_backspace_key]);
596 break; 804 break;
597#endif
598#ifndef NO_DELETE_KEY
599 case XK_Delete:
600 strcpy (kbuf, rs[Rs_delete_key]);
601 break;
602#endif
603 case XK_Tab:
604 if (shft)
605 strcpy (kbuf, "\033[Z");
606 else
607 {
608#ifdef CTRL_TAB_MAKES_META
609 if (ctrl)
610 meta = 1;
611#endif
612#ifdef MOD4_TAB_MAKES_META
613 if (ev.state & Mod4Mask)
614 meta = 1;
615#endif
616 newlen = 0;
617 }
618 break;
619
620 case XK_Up: /* "\033[A" */
621 case XK_Down: /* "\033[B" */
622 case XK_Right: /* "\033[C" */
623 case XK_Left: /* "\033[D" */
624 strcpy (kbuf, "\033[Z");
625 kbuf[2] = "DACB"[keysym - XK_Left];
626 /* do Shift first */
627 if (shft)
628 kbuf[2] = "dacb"[keysym - XK_Left];
629 else if (ctrl)
630 {
631 kbuf[1] = 'O';
632 kbuf[2] = "dacb"[keysym - XK_Left];
633 }
634 else if (priv_modes & PrivMode_aplCUR)
635 kbuf[1] = 'O';
636 break;
637
638#ifndef UNSHIFTED_SCROLLKEYS
639 case XK_Prior:
640 strcpy (kbuf, "\033[5~");
641 break;
642 case XK_Next:
643 strcpy (kbuf, "\033[6~");
644 break;
645#endif
646 case XK_KP_Enter:
647 /* allow shift to override */
648 if (kp)
649 {
650 strcpy (kbuf, "\033OM");
651 break;
652 }
653
654 /* FALLTHROUGH */
655
656 case XK_Return:
657 if (priv_modes & PrivMode_LFNL)
658 {
659 kbuf[0] = '\015';
660 kbuf[1] = '\012';
661 kbuf[2] = '\0';
662 }
663 else
664 {
665 kbuf[0] = '\015';
666 kbuf[1] = '\0';
667 }
668 break;
669
670 case XK_KP_F1: /* "\033OP" */
671 case XK_KP_F2: /* "\033OQ" */
672 case XK_KP_F3: /* "\033OR" */
673 case XK_KP_F4: /* "\033OS" */
674 strcpy (kbuf, "\033OP");
675 kbuf[2] += (keysym - XK_KP_F1);
676 break;
677
678 case XK_KP_Multiply: /* "\033Oj" : "*" */
679 case XK_KP_Add: /* "\033Ok" : "+" */
680 case XK_KP_Separator: /* "\033Ol" : "," */
681 case XK_KP_Subtract: /* "\033Om" : "-" */
682 case XK_KP_Decimal: /* "\033On" : "." */
683 case XK_KP_Divide: /* "\033Oo" : "/" */
684 case XK_KP_0: /* "\033Op" : "0" */
685 case XK_KP_1: /* "\033Oq" : "1" */
686 case XK_KP_2: /* "\033Or" : "2" */
687 case XK_KP_3: /* "\033Os" : "3" */
688 case XK_KP_4: /* "\033Ot" : "4" */
689 case XK_KP_5: /* "\033Ou" : "5" */
690 case XK_KP_6: /* "\033Ov" : "6" */
691 case XK_KP_7: /* "\033Ow" : "7" */
692 case XK_KP_8: /* "\033Ox" : "8" */
693 case XK_KP_9: /* "\033Oy" : "9" */
694 /* allow shift to override */
695 if (kp)
696 {
697 strcpy (kbuf, "\033Oj");
698 kbuf[2] += (keysym - XK_KP_Multiply);
699 }
700 else
701 {
702 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
703 kbuf[1] = '\0';
704 }
705 break;
706
707 case XK_Find:
708 strcpy (kbuf, "\033[1~");
709 break;
710
711 case XK_Insert:
712 strcpy (kbuf, "\033[2~");
713 break;
714#ifdef DXK_Remove /* support for DEC remove like key */
715 case DXK_Remove:
716 /* FALLTHROUGH */
717#endif
718 case XK_Execute:
719 strcpy (kbuf, "\033[3~");
720 break;
721 case XK_Select:
722 strcpy (kbuf, "\033[4~");
723 break;
724 case XK_End:
725 strcpy (kbuf, KS_END);
726 break;
727 case XK_Home:
728 strcpy (kbuf, KS_HOME);
729 break;
730
731#define FKEY(n, fkey) \
732 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
733
734 case XK_F1: /* "\033[11~" */
735 case XK_F2: /* "\033[12~" */
736 case XK_F3: /* "\033[13~" */
737 case XK_F4: /* "\033[14~" */
738 case XK_F5: /* "\033[15~" */
739 FKEY (11, XK_F1);
740 break;
741 case XK_F6: /* "\033[17~" */
742 case XK_F7: /* "\033[18~" */
743 case XK_F8: /* "\033[19~" */
744 case XK_F9: /* "\033[20~" */
745 case XK_F10: /* "\033[21~" */
746 FKEY (17, XK_F6);
747 break;
748 case XK_F11: /* "\033[23~" */
749 case XK_F12: /* "\033[24~" */
750 case XK_F13: /* "\033[25~" */
751 case XK_F14: /* "\033[26~" */
752 FKEY (23, XK_F11);
753 break;
754 case XK_F15: /* "\033[28~" */
755 case XK_F16: /* "\033[29~" */
756 FKEY (28, XK_F15);
757 break;
758 case XK_Help: /* "\033[28~" */
759 FKEY (28, XK_Help);
760 break;
761 case XK_Menu: /* "\033[29~" */
762 FKEY (29, XK_Menu);
763 break;
764 case XK_F17: /* "\033[31~" */
765 case XK_F18: /* "\033[32~" */
766 case XK_F19: /* "\033[33~" */
767 case XK_F20: /* "\033[34~" */
768 case XK_F21: /* "\033[35~" */
769 case XK_F22: /* "\033[36~" */
770 case XK_F23: /* "\033[37~" */
771 case XK_F24: /* "\033[38~" */
772 case XK_F25: /* "\033[39~" */
773 case XK_F26: /* "\033[40~" */
774 case XK_F27: /* "\033[41~" */
775 case XK_F28: /* "\033[42~" */
776 case XK_F29: /* "\033[43~" */
777 case XK_F30: /* "\033[44~" */
778 case XK_F31: /* "\033[45~" */
779 case XK_F32: /* "\033[46~" */
780 case XK_F33: /* "\033[47~" */
781 case XK_F34: /* "\033[48~" */
782 case XK_F35: /* "\033[49~" */
783 FKEY (31, XK_F17);
784 break;
785#undef FKEY
786 default:
787 newlen = 0;
788 break;
789 }
790
791 if (newlen)
792 len = strlen (kbuf);
793 } 805 }
794 806
807 if (newlen)
808 len = strlen (kbuf);
809
810 if (len > 0)
811 {
795 /* 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 /*
796 * Pass meta for all function keys, if 'meta' option set 825 * Pass meta for all function keys, if 'meta' option set
797 */ 826 */
798#ifdef META8_OPTION 827#ifdef META8_OPTION
799 if (meta && (meta_char == 0x80) && len > 0) 828 if (meta && (meta_char == 0x80))
800 kbuf[len - 1] |= 0x80; 829 kbuf[len - 1] |= 0x80;
801#endif 830#endif
831 }
802 832
803 } 833 }
804 else if (ctrl && keysym == XK_minus) 834 else if (ctrl && keysym == XK_minus)
805 { 835 {
806 len = 1; 836 len = 1;
… …
825 meta = 0; 855 meta = 0;
826 } 856 }
827#endif 857#endif
828 /* nil */ ; 858 /* nil */ ;
829 } 859 }
860 }
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++;
830 } 871 }
831 872
832 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END))) 873 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
833 return; 874 return;
834 875
… …
840 { 881 {
841 view_start = 0; 882 view_start = 0;
842 want_refresh = 1; 883 want_refresh = 1;
843 } 884 }
844 885
845 /*
846 * these modifications only affect the static keybuffer
847 * pass Shift/Control indicators for function keys ending with `~'
848 *
849 * eg,
850 * Prior = "ESC[5~"
851 * Shift+Prior = "ESC[5$"
852 * Ctrl+Prior = "ESC[5^"
853 * Ctrl+Shift+Prior = "ESC[5@"
854 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
855 */
856 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
857 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
858
859 /* escape prefix */
860 if (meta
861#ifdef META8_OPTION
862 && meta_char == C0_ESC
863#endif
864 )
865 {
866 const char ch = C0_ESC;
867 tt_write (&ch, 1);
868 }
869
870 tt_write (kbuf, (unsigned int)len); 886 tt_write (kbuf, (unsigned int)len);
871} 887}
872 888
873void 889void ecb_cold
874rxvt_term::key_release (XKeyEvent &ev) 890rxvt_term::key_release (XKeyEvent &ev)
875{ 891{
876#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 892#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
877 KeySym keysym; 893 KeySym keysym;
878 894
… …
898 commit_iso14755 (); 914 commit_iso14755 ();
899 915
900 return; 916 return;
901 } 917 }
902 918
903 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 919 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
904 if (i[0] == keysym) 920 if (i[0] == keysym)
905 { 921 {
906 iso14755buf = ISO_14755_51 | i[1]; 922 iso14755buf = ISO_14755_51 | i[1];
907 commit_iso14755 (); 923 commit_iso14755 ();
908 924
… …
945 else if (keysym == XK_Control_L || keysym == XK_Control_R) 961 else if (keysym == XK_Control_L || keysym == XK_Control_R)
946 mouse_slip_wheel_speed = 0; 962 mouse_slip_wheel_speed = 0;
947#endif 963#endif
948} 964}
949 965
950#if defined (KEYSYM_RESOURCE)
951unsigned int
952rxvt_term::cmd_write (const char *str, unsigned int count)
953{
954 unsigned int n, s;
955
956 n = cmdbuf_ptr - cmdbuf_base;
957 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
958
959 if (n > 0 && s < count)
960 {
961 memmove (cmdbuf_base, cmdbuf_ptr,
962 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
963 cmdbuf_ptr = cmdbuf_base;
964 cmdbuf_endp -= n;
965 s += n;
966 }
967
968 if (count > s)
969 {
970 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
971 count = s;
972 }
973
974 for (; count--;)
975 *cmdbuf_endp++ = *str++;
976
977 cmd_parse ();
978
979 return 0;
980}
981#endif
982
983void 966void
984rxvt_term::flush () 967rxvt_term::flush ()
985{ 968{
986 flush_ev.stop (); 969 flush_ev.stop ();
987 970
988#ifdef HAVE_BG_PIXMAP 971#ifdef HAVE_IMG
989 if (bgPixmap.check_clearChanged ()) 972 if (bg_flags & BG_NEEDS_REFRESH)
990 { 973 {
991// scr_clear (true); This needs to be researched further! 974 bg_flags &= ~BG_NEEDS_REFRESH;
992 scr_touch (false); 975 scr_touch (false);
993 } 976 }
994#endif 977#endif
995 978
996 if (want_refresh) 979 if (want_refresh)
… …
1032 } 1015 }
1033 while (row < end_row); 1016 while (row < end_row);
1034 } 1017 }
1035 1018
1036 scr_refresh (); 1019 scr_refresh ();
1037 scrollbar_show (1); 1020 scrollBar.show (1);
1038#ifdef USE_XIM 1021#if USE_XIM
1039 IMSendSpot (); 1022 im_send_spot ();
1040#endif 1023#endif
1041 } 1024 }
1042 1025
1043 display->flush (); 1026 display->flush ();
1044} 1027}
1045 1028
1046/* checks wether a refresh is requested and starts the refresh timer */ 1029/* checks whether a refresh is requested and starts the refresh timer */
1047void 1030void
1048rxvt_term::refresh_check () 1031rxvt_term::refresh_check ()
1049{ 1032{
1050 if (want_refresh && !flush_ev.is_active ()) 1033 if (want_refresh && !flush_ev.is_active ())
1051 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1035
1036 display->flush ();
1052} 1037}
1053 1038
1054void 1039void
1055rxvt_term::flush_cb (ev::timer &w, int revents) 1040rxvt_term::flush_cb (ev::timer &w, int revents)
1056{ 1041{
… …
1059 refresh_count = 0; 1044 refresh_count = 0;
1060 flush (); 1045 flush ();
1061} 1046}
1062 1047
1063#ifdef CURSOR_BLINK 1048#ifdef CURSOR_BLINK
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 1064void
1065rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1065rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1066{ 1066{
1067 hidden_cursor = !hidden_cursor; 1067 hidden_cursor = !hidden_cursor;
1068 want_refresh = 1; 1068 want_refresh = 1;
… …
1076{ 1076{
1077 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1077 if (scr_refresh_rend (RS_Blink, RS_Blink))
1078 { 1078 {
1079 hidden_text = !hidden_text; 1079 hidden_text = !hidden_text;
1080 want_refresh = 1; 1080 want_refresh = 1;
1081 refresh_check (); 1081 refresh_check ();
1082 } 1082 }
1083 else 1083 else
1084 w.stop (); 1084 w.stop ();
1085} 1085}
1086#endif 1086#endif
1087 1087
1088#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1088#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1089void 1089void
1090rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1090rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1091{ 1091{
1092 if ((scrollbar_isUp () || scrollbar_isDn ()) 1092 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1093 && scr_page (scrollbar_isUp () ? UP : DN, 1)) 1093 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1094 { 1094 {
1095 want_refresh = 1; 1095 want_refresh = 1;
1096 refresh_check (); 1096 refresh_check ();
1097 } 1097 }
1098 else 1098 else
… …
1102 1102
1103#ifdef SELECTION_SCROLLING 1103#ifdef SELECTION_SCROLLING
1104void 1104void
1105rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1105rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1106{ 1106{
1107 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1107 if (scr_page (scroll_selection_lines))
1108 { 1108 {
1109 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1109 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1110 want_refresh = 1; 1110 want_refresh = 1;
1111 refresh_check (); 1111 refresh_check ();
1112 } 1112 }
… …
1117 1117
1118#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1118#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1119void 1119void
1120rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1120rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1121{ 1121{
1122 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1122 if (scr_page (mouse_slip_wheel_speed))
1123 { 1123 {
1124 want_refresh = 1; 1124 want_refresh = 1;
1125 refresh_check (); 1125 refresh_check ();
1126 } 1126 }
1127 1127
… …
1142 { 1142 {
1143 // this should really be sched_yield(), but the linux guys thought 1143 // this should really be sched_yield(), but the linux guys thought
1144 // that giving a process calling sched_yield () less cpu time than 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 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. 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.
1147 1150
1148 struct timespec ts = { 0, 0 }; 1151 struct timespec ts = { 0, 1000 };
1149 nanosleep (&ts, 0); 1152 nanosleep (&ts, 0);
1150 1153
1151 w.stop (); 1154 w.stop ();
1152 } 1155 }
1153 1156
… …
1156 { 1159 {
1157 } 1160 }
1158} event_handler; 1161} event_handler;
1159#endif 1162#endif
1160 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 ();
1194}
1195#endif
1196
1161bool 1197bool
1162rxvt_term::pty_fill () 1198rxvt_term::pty_fill ()
1163{ 1199{
1164 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1200 cmdbuf_reify ();
1165 1201
1166 if (CBUFSIZ == n) 1202 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1167 { 1203
1168 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1204 if (!avail)
1169 n = 0;
1170 } 1205 {
1171 1206 // normally this indicates a "too long" command sequence - just drop the data we have
1172 memmove (cmdbuf_base, cmdbuf_ptr, n);
1173 cmdbuf_ptr = cmdbuf_base; 1207 cmdbuf_ptr = cmdbuf_base;
1174 cmdbuf_endp = cmdbuf_ptr + n; 1208 cmdbuf_endp = cmdbuf_ptr;
1209 avail = CBUFSIZ;
1210 }
1175 1211
1176 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1212 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1177 1213
1178 if (r > 0) 1214 if (r > 0)
1179 { 1215 {
1180 cmdbuf_endp += r; 1216 cmdbuf_endp += r;
1181 return true; 1217 return true;
… …
1203{ 1239{
1204 make_current (); 1240 make_current ();
1205 1241
1206 if (revents & ev::READ) 1242 if (revents & ev::READ)
1207 // loop, but don't allow a single term to monopolize us 1243 // loop, but don't allow a single term to monopolize us
1208 while (pty_fill ()) 1244 for (int i = CBUFCNT; i-- && pty_fill (); )
1209 if (cmd_parse ()) 1245 cmd_parse ();
1210 break;
1211 1246
1212 if (revents & ev::WRITE) 1247 if (revents & ev::WRITE)
1213 pty_write (); 1248 pty_write ();
1214}
1215 1249
1216void 1250 refresh_check ();
1251}
1252
1253void ecb_cold
1217rxvt_term::pointer_unblank () 1254rxvt_term::pointer_unblank ()
1218{ 1255{
1219 XDefineCursor (dpy, vt, TermWin_cursor); 1256 XDefineCursor (dpy, vt, TermWin_cursor);
1220 recolour_cursor (); 1257 recolour_cursor ();
1221 1258
… …
1226 pointer_ev.start (pointerBlankDelay); 1263 pointer_ev.start (pointerBlankDelay);
1227#endif 1264#endif
1228} 1265}
1229 1266
1230#ifdef POINTER_BLANK 1267#ifdef POINTER_BLANK
1231void 1268void ecb_cold
1232rxvt_term::pointer_blank () 1269rxvt_term::pointer_blank ()
1233{ 1270{
1234 if (!option (Opt_pointerBlank)) 1271 if (!option (Opt_pointerBlank))
1235 return; 1272 return;
1236 1273
… …
1238 XFlush (dpy); 1275 XFlush (dpy);
1239 1276
1240 hidden_pointer = 1; 1277 hidden_pointer = 1;
1241} 1278}
1242 1279
1243void 1280void ecb_cold
1244rxvt_term::pointer_cb (ev::timer &w, int revents) 1281rxvt_term::pointer_cb (ev::timer &w, int revents)
1245{ 1282{
1246 make_current (); 1283 make_current ();
1247 1284
1248 pointer_blank (); 1285 pointer_blank ();
… …
1254{ 1291{
1255 int button_number, key_state = 0; 1292 int button_number, key_state = 0;
1256 int x, y; 1293 int x, y;
1257 int code = 32; 1294 int code = 32;
1258 1295
1259 x = Pixel2Col (ev.x); 1296 x = Pixel2Col (ev.x) + 1;
1260 y = Pixel2Row (ev.y); 1297 y = Pixel2Row (ev.y) + 1;
1298
1261 if (ev.type == MotionNotify) 1299 if (ev.type == MotionNotify)
1262 { 1300 {
1263 if (x == mouse_row && y == mouse_col) 1301 if (x == mouse_row && y == mouse_col)
1264 return; 1302 return;
1303
1265 mouse_row = x; 1304 mouse_row = x;
1266 mouse_col = y; 1305 mouse_col = y;
1267 code += 32; 1306 code += 32;
1268 } 1307 }
1269 1308
… …
1272 else 1311 else
1273 { 1312 {
1274 button_number = MEvent.button - Button1; 1313 button_number = MEvent.button - Button1;
1275 /* add 0x3D for wheel events, like xterm does */ 1314 /* add 0x3D for wheel events, like xterm does */
1276 if (button_number >= 3) 1315 if (button_number >= 3)
1277 button_number += (64 - 3); 1316 button_number += 64 - 3;
1278 } 1317 }
1279 1318
1280 if (priv_modes & PrivMode_MouseX10) 1319 if (priv_modes & PrivMode_MouseX10)
1281 { 1320 {
1282 /* 1321 /*
… …
1314 fputc ('A', stderr); 1353 fputc ('A', stderr);
1315 if (key_state & 32) 1354 if (key_state & 32)
1316 fputc ('2', stderr); 1355 fputc ('2', stderr);
1317 fprintf (stderr, "]: <%d>, %d/%d\n", 1356 fprintf (stderr, "]: <%d>, %d/%d\n",
1318 button_number, 1357 button_number,
1319 x + 1, 1358 x,
1320 y + 1); 1359 y);
1321#endif 1360#endif
1322 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
1323 tt_printf ("\033[M%c%c%c", 1375 tt_printf ("\033[M%c%c%c",
1324 (code + button_number + key_state), 1376 code + button_number + key_state,
1325 (32 + x + 1), 1377 32 + x,
1326 (32 + y + 1)); 1378 32 + y);
1327} 1379}
1328 1380
1329/*{{{ process an X event */ 1381/*{{{ process an X event */
1330void 1382void ecb_hot
1331rxvt_term::x_cb (XEvent &ev) 1383rxvt_term::x_cb (XEvent &ev)
1332{ 1384{
1333 make_current (); 1385 make_current ();
1334 1386
1335 dLocal (Display *, dpy); 1387 dLocal (Display *, dpy);
… …
1433 && ev.xfocus.mode != NotifyGrab) 1485 && ev.xfocus.mode != NotifyGrab)
1434 focus_out (); 1486 focus_out ();
1435 break; 1487 break;
1436 1488
1437 case ConfigureNotify: 1489 case ConfigureNotify:
1438 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1439 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1440 szHint.width, szHint.height); */
1441 if (ev.xconfigure.window == parent[0]) 1490 if (ev.xconfigure.window == parent)
1442 { 1491 {
1443 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1492 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1444 ; 1493 ;
1494
1495 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1496
1497 bool moved = false;
1498#ifdef HAVE_BG_PIXMAP
1499 if (bg_window_position_sensitive ())
1500 {
1501 want_position_change = true;
1502 if (bg_img == 0)
1503 moved = true;
1504 }
1505#endif
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 }
1445 1527
1446 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1528 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1447 { 1529 {
1448 seen_resize = 1; 1530 seen_resize = 1;
1449 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1531 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1450 } 1532 }
1451 else 1533 else
1452 { 1534 {
1453#ifdef HAVE_BG_PIXMAP 1535#ifdef HAVE_BG_PIXMAP
1454 if (bgPixmap.window_position_sensitive ()) 1536 if (moved)
1455 update_background (); 1537 update_background ();
1456#endif 1538#endif
1457 } 1539 }
1540
1458 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1541 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1459 } 1542 }
1460 break; 1543 break;
1461 1544
1462 case PropertyNotify: 1545 case PropertyNotify:
1463 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1546 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1464 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1465 && ev.xproperty.state == PropertyNewValue)
1466 selection_property (ev.xproperty.window, ev.xproperty.atom);
1467
1468 break; 1547 break;
1469 1548
1470 case SelectionClear: 1549 case SelectionClear:
1471 selection_clear (); 1550 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1472 break;
1473
1474 case SelectionNotify:
1475 if (selection_wait == Sel_normal)
1476 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1477 break; 1551 break;
1478 1552
1479 case SelectionRequest: 1553 case SelectionRequest:
1480 selection_send (ev.xselectionrequest); 1554 selection_send (ev.xselectionrequest);
1481 break; 1555 break;
1482 1556
1483 case MapNotify: 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
1484 mapped = 1; 1569 mapped = 1;
1485#ifdef TEXT_BLINK 1570#ifdef TEXT_BLINK
1486 text_blink_ev.start (); 1571 text_blink_ev.start ();
1487#endif 1572#endif
1488 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1573 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1501 if (ev.xany.window == vt) 1586 if (ev.xany.window == vt)
1502 { 1587 {
1503 do 1588 do
1504 { 1589 {
1505 scr_expose (ev.xexpose.x, ev.xexpose.y, 1590 scr_expose (ev.xexpose.x, ev.xexpose.y,
1506 ev.xexpose.width, ev.xexpose.height, False); 1591 ev.xexpose.width, ev.xexpose.height, false);
1507 } 1592 }
1508 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1593 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1509 1594
1510 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1595 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1511 1596
1512 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1597 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1513 { 1598 {
1514 scr_expose (ev.xexpose.x, ev.xexpose.y, 1599 scr_expose (ev.xexpose.x, ev.xexpose.y,
1515 ev.xexpose.width, ev.xexpose.height, False); 1600 ev.xexpose.width, ev.xexpose.height, false);
1516 } 1601 }
1517 1602
1518 want_refresh = 1; 1603 want_refresh = 1;
1519 } 1604 }
1520 else 1605 else
… …
1524 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1609 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1525 ; 1610 ;
1526 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1611 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1527 ; 1612 ;
1528 1613
1529 if (isScrollbarWindow (ev.xany.window)) 1614 if (scrollBar.state && ev.xany.window == scrollBar.win)
1530 { 1615 {
1531 scrollBar.setIdle (); 1616 scrollBar.state = SB_STATE_IDLE;
1532 scrollbar_show (0); 1617 scrollBar.show (0);
1533 } 1618 }
1534 } 1619 }
1535 break; 1620 break;
1536 1621
1537 case MotionNotify: 1622 case MotionNotify:
… …
1578 1663
1579#ifdef SELECTION_SCROLLING 1664#ifdef SELECTION_SCROLLING
1580 if (ev.xbutton.y < int_bwidth 1665 if (ev.xbutton.y < int_bwidth
1581 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1666 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1582 { 1667 {
1668 page_dirn scroll_selection_dir;
1583 int dist; 1669 int dist;
1584 1670
1585 /* don't clobber the current delay if we are 1671 /* don't clobber the current delay if we are
1586 * already in the middle of scrolling. 1672 * already in the middle of scrolling.
1587 */ 1673 */
… …
1602 dist = int_bwidth - ev.xbutton.y; 1688 dist = int_bwidth - ev.xbutton.y;
1603 } 1689 }
1604 else 1690 else
1605 { 1691 {
1606 scroll_selection_dir = DN; 1692 scroll_selection_dir = DN;
1607 dist = ev.xbutton.y - (int_bwidth + height); 1693 dist = ev.xbutton.y - (int_bwidth + vt_height);
1608 } 1694 }
1609 1695
1610 scroll_selection_lines = Pixel2Height (dist) 1696 scroll_selection_lines = Pixel2Height (dist)
1611 / SELECTION_SCROLL_LINE_SPEEDUP 1697 / SELECTION_SCROLL_LINE_SPEEDUP
1612 + 1; 1698 + 1;
1613 min_it (scroll_selection_lines, 1699 min_it (scroll_selection_lines,
1614 SELECTION_SCROLL_MAX_LINES); 1700 SELECTION_SCROLL_MAX_LINES);
1701 scroll_selection_lines *= scroll_selection_dir;
1615 } 1702 }
1616 else 1703 else
1617 { 1704 {
1618 /* we are within the text window, so we 1705 /* we are within the text window, so we
1619 * shouldn't be scrolling 1706 * shouldn't be scrolling
… …
1624#ifdef MOUSE_THRESHOLD 1711#ifdef MOUSE_THRESHOLD
1625 } 1712 }
1626#endif 1713#endif
1627 } 1714 }
1628 } 1715 }
1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1716 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1630 { 1717 {
1631 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1718 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1632 MotionNotify, &ev)) 1719 MotionNotify, &ev))
1633 ; 1720 ;
1634 1721
1635 XQueryPointer (dpy, scrollBar.win, 1722 XQueryPointer (dpy, scrollBar.win,
1636 &unused_root, &unused_child, 1723 &unused_root, &unused_child,
1637 &unused_root_x, &unused_root_y, 1724 &unused_root_x, &unused_root_y,
1638 &ev.xbutton.x, &ev.xbutton.y, 1725 &ev.xbutton.x, &ev.xbutton.y,
1639 &unused_mask); 1726 &unused_mask);
1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1727 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1641 scrollbar_size ()); 1728 scrollBar.size ());
1642 want_refresh = 1; 1729 want_refresh = 1;
1643 scrollbar_show (1); 1730 scrollBar.show (1);
1644 } 1731 }
1645 break; 1732 break;
1646 } 1733 }
1647 1734
1648#if defined(CURSOR_BLINK) 1735#if defined(CURSOR_BLINK)
1649 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1736 if (ev.type == KeyPress)
1650 {
1651 if (hidden_cursor)
1652 {
1653 hidden_cursor = 0;
1654 want_refresh = 1;
1655 }
1656
1657 cursor_blink_ev.again (); 1737 cursor_blink_reset ();
1658 }
1659#endif 1738#endif
1660 1739
1661#if defined(POINTER_BLANK) 1740#if defined(POINTER_BLANK)
1662 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1741 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1663 { 1742 {
… …
1673#endif 1752#endif
1674 1753
1675 refresh_check (); 1754 refresh_check ();
1676} 1755}
1677 1756
1678void 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
1679rxvt_term::focus_in () 1775rxvt_term::focus_in ()
1680{ 1776{
1681 if (!focus) 1777 if (!focus)
1682 { 1778 {
1683 focus = 1; 1779 focus = 1;
1684 want_refresh = 1; 1780 want_refresh = 1;
1685 1781
1686 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1687
1688#if USE_XIM 1782#if USE_XIM
1689 if (Input_Context != NULL) 1783 if (Input_Context != NULL)
1690 { 1784 {
1691 IMSetPosition (); 1785 im_set_position ();
1692 XSetICFocus (Input_Context); 1786 XSetICFocus (Input_Context);
1693 } 1787 }
1694#endif 1788#endif
1695#if CURSOR_BLINK 1789#if CURSOR_BLINK
1696 if (option (Opt_cursorBlink)) 1790 if (option (Opt_cursorBlink))
… …
1703 scr_recolour (); 1797 scr_recolour ();
1704 } 1798 }
1705#endif 1799#endif
1706#if ENABLE_FRILLS 1800#if ENABLE_FRILLS
1707 if (option (Opt_urgentOnBell)) 1801 if (option (Opt_urgentOnBell))
1708 { 1802 set_urgency (0);
1709 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1710 {
1711 h->flags &= ~XUrgencyHint;
1712 XSetWMHints (dpy, parent[0], h);
1713 }
1714 }
1715#endif 1803#endif
1716 }
1717}
1718 1804
1719void 1805 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1806 }
1807}
1808
1809void ecb_cold
1720rxvt_term::focus_out () 1810rxvt_term::focus_out ()
1721{ 1811{
1722 if (focus) 1812 if (focus)
1723 { 1813 {
1724 focus = 0; 1814 focus = 0;
1725 want_refresh = 1; 1815 want_refresh = 1;
1726 1816
1727 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1817#if ENABLE_FRILLS
1728 1818 if (option (Opt_urgentOnBell))
1819 set_urgency (0);
1820#endif
1729#if ENABLE_FRILLS || ISO_14755 1821#if ENABLE_FRILLS || ISO_14755
1730 if (iso14755buf) 1822 if (iso14755buf)
1731 { 1823 {
1732 iso14755buf = 0; 1824 iso14755buf = 0;
1733# if ISO_14755 1825# if ISO_14755
… …
1750 { 1842 {
1751 pix_colors = pix_colors_unfocused; 1843 pix_colors = pix_colors_unfocused;
1752 scr_recolour (); 1844 scr_recolour ();
1753 } 1845 }
1754#endif 1846#endif
1755 }
1756}
1757 1847
1758void 1848 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1849 }
1850}
1851
1852void ecb_cold
1759rxvt_term::update_fade_color (unsigned int idx) 1853rxvt_term::update_fade_color (unsigned int idx)
1760{ 1854{
1761#if OFF_FOCUS_FADING 1855#if OFF_FOCUS_FADING
1762 if (rs[Rs_fade]) 1856 if (rs[Rs_fade])
1763 { 1857 {
… …
1766 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1860 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1767 } 1861 }
1768#endif 1862#endif
1769} 1863}
1770 1864
1771#if ENABLE_TRANSPARENCY || ENABLE_PERL 1865#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1772void 1866void ecb_hot
1773rxvt_term::rootwin_cb (XEvent &ev) 1867rxvt_term::rootwin_cb (XEvent &ev)
1774{ 1868{
1775 make_current (); 1869 make_current ();
1776 1870
1777 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1871 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1778 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1872 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1779 return; 1873 return;
1780 1874
1781# if ENABLE_TRANSPARENCY
1782 switch (ev.type) 1875 switch (ev.type)
1783 { 1876 {
1784 case PropertyNotify: 1877 case PropertyNotify:
1785 /* 1878 /*
1786 * 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,
1787 * 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.
1788 */ 1881 */
1789 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1882 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1790 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1883 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1791 { 1884 {
1792 bgPixmap.set_root_pixmap (); 1885#if BG_IMAGE_FROM_ROOT
1886 if (option (Opt_transparent))
1887 {
1888 rxvt_img::new_from_root (this)->replace (root_img);
1793 update_background (); 1889 update_background ();
1890 }
1891#endif
1892 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1794 } 1893 }
1894
1795 break; 1895 break;
1796 } 1896 }
1797# endif
1798 1897
1799 refresh_check (); 1898 refresh_check ();
1800} 1899}
1801#endif 1900#endif
1802 1901
… …
1835 /* save the xbutton state (for ButtonRelease) */ 1934 /* save the xbutton state (for ButtonRelease) */
1836 MEvent.state = ev.state; 1935 MEvent.state = ev.state;
1837#ifdef MOUSE_REPORT_DOUBLECLICK 1936#ifdef MOUSE_REPORT_DOUBLECLICK
1838 if (ev.button == MEvent.button && clickintime) 1937 if (ev.button == MEvent.button && clickintime)
1839 { 1938 {
1840 /* same button, within alloted time */ 1939 /* same button, within allowed time */
1841 MEvent.clicks++; 1940 MEvent.clicks++;
1842 1941
1843 if (MEvent.clicks > 1) 1942 if (MEvent.clicks > 1)
1844 { 1943 {
1845 /* only report double clicks */ 1944 /* only report double clicks */
… …
1917 } 2016 }
1918 2017
1919 /* 2018 /*
1920 * Scrollbar window processing of button press 2019 * Scrollbar window processing of button press
1921 */ 2020 */
1922 if (isScrollbarWindow (ev.window)) 2021 if (scrollBar.state && ev.window == scrollBar.win)
1923 { 2022 {
1924 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;
1925 /* 2031 /*
1926 * Rxvt-style scrollbar: 2032 * Rxvt-style scrollbar:
1927 * move up if mouse is above slider 2033 * move up if mouse is above slider
1928 * move dn if mouse is below slider 2034 * move dn if mouse is below slider
1929 * 2035 *
… …
1938 /* 2044 /*
1939 * Mouse report disabled scrollbar: 2045 * Mouse report disabled scrollbar:
1940 * arrow buttons - send up/down 2046 * arrow buttons - send up/down
1941 * click on scrollbar - send pageup/down 2047 * click on scrollbar - send pageup/down
1942 */ 2048 */
1943 if ((scrollBar.style == R_SB_NEXT 2049 if (direction == UP)
1944 && scrollbarnext_upButton (ev.y))
1945 || (scrollBar.style == R_SB_RXVT
1946 && scrollbarrxvt_upButton (ev.y)))
1947 tt_printf ("\033[A"); 2050 tt_printf ("\033[A");
1948 else if ((scrollBar.style == R_SB_NEXT 2051 else if (direction == DN)
1949 && scrollbarnext_dnButton (ev.y))
1950 || (scrollBar.style == R_SB_RXVT
1951 && scrollbarrxvt_dnButton (ev.y)))
1952 tt_printf ("\033[B"); 2052 tt_printf ("\033[B");
1953 else 2053 else
1954 switch (ev.button) 2054 switch (ev.button)
1955 { 2055 {
1956 case Button2: 2056 case Button2:
… …
1964 break; 2064 break;
1965 } 2065 }
1966 } 2066 }
1967 else 2067 else
1968#endif /* NO_SCROLLBAR_REPORT */ 2068#endif /* NO_SCROLLBAR_REPORT */
1969
1970 {
1971 char upordown = 0;
1972
1973 if (scrollBar.style == R_SB_NEXT)
1974 { 2069 {
1975 if (scrollbarnext_upButton (ev.y)) 2070 if (direction != NO_DIR)
1976 upordown = -1; /* up */
1977 else if (scrollbarnext_dnButton (ev.y))
1978 upordown = 1; /* down */
1979 }
1980 else if (scrollBar.style == R_SB_RXVT)
1981 {
1982 if (scrollbarrxvt_upButton (ev.y))
1983 upordown = -1; /* up */
1984 else if (scrollbarrxvt_dnButton (ev.y))
1985 upordown = 1; /* down */
1986 }
1987
1988 if (upordown)
1989 { 2071 {
1990#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2072#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1991 if (!cont_scroll_ev.is_active ()) 2073 if (!cont_scroll_ev.is_active ())
1992 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2074 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1993#endif 2075#endif
1994 if (scr_page (upordown < 0 ? UP : DN, 1)) 2076 if (scr_page (direction, 1))
1995 { 2077 {
1996 if (upordown < 0) 2078 if (direction == UP)
1997 scrollBar.setUp (); 2079 scrollBar.state = SB_STATE_UP;
1998 else 2080 else
1999 scrollBar.setDn (); 2081 scrollBar.state = SB_STATE_DOWN;
2000 } 2082 }
2001 } 2083 }
2002 else 2084 else
2003 switch (ev.button) 2085 switch (ev.button)
2004 { 2086 {
2005 case Button2: 2087 case Button2:
2006 switch (scrollbar_align) 2088 switch (scrollBar.align)
2007 { 2089 {
2008 case R_SB_ALIGN_TOP: 2090 case SB_ALIGN_TOP:
2009 csrO = 0; 2091 csrO = 0;
2010 break; 2092 break;
2011 case R_SB_ALIGN_CENTRE: 2093 case SB_ALIGN_CENTRE:
2012 csrO = (scrollBar.bot - scrollBar.top) / 2; 2094 csrO = (scrollBar.bot - scrollBar.top) / 2;
2013 break; 2095 break;
2014 case R_SB_ALIGN_BOTTOM: 2096 case SB_ALIGN_BOTTOM:
2015 csrO = scrollBar.bot - scrollBar.top; 2097 csrO = scrollBar.bot - scrollBar.top;
2016 break; 2098 break;
2017 } 2099 }
2018 2100
2019 if (scrollBar.style == R_SB_XTERM 2101 if (scrollBar.style == SB_STYLE_XTERM
2020 || scrollbar_above_slider (ev.y) 2102 || scrollBar.above_slider (ev.y)
2021 || scrollbar_below_slider (ev.y)) 2103 || scrollBar.below_slider (ev.y))
2022 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2104 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2023 2105
2024 scrollBar.setMotion (); 2106 scrollBar.state = SB_STATE_MOTION;
2025 break; 2107 break;
2026 2108
2027 case Button1: 2109 case Button1:
2028 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2110 if (scrollBar.align == SB_ALIGN_CENTRE)
2029 csrO = ev.y - scrollBar.top; 2111 csrO = ev.y - scrollBar.top;
2030 /* FALLTHROUGH */ 2112 /* FALLTHROUGH */
2031 2113
2032 case Button3: 2114 case Button3:
2033 if (scrollBar.style != R_SB_XTERM) 2115 if (scrollBar.style != SB_STYLE_XTERM)
2034 { 2116 {
2035 if (scrollbar_above_slider (ev.y)) 2117 if (scrollBar.above_slider (ev.y))
2036# ifdef RXVT_SCROLL_FULL 2118# ifdef RXVT_SCROLL_FULL
2037 scr_page (UP, nrow - 1); 2119 scr_page (UP, nrow - 1);
2038# else 2120# else
2039 scr_page (UP, nrow / 4); 2121 scr_page (UP, nrow / 4);
2040# endif 2122# endif
2041 else if (scrollbar_below_slider (ev.y)) 2123 else if (scrollBar.below_slider (ev.y))
2042# ifdef RXVT_SCROLL_FULL 2124# ifdef RXVT_SCROLL_FULL
2043 scr_page (DN, nrow - 1); 2125 scr_page (DN, nrow - 1);
2044# else 2126# else
2045 scr_page (DN, nrow / 4); 2127 scr_page (DN, nrow / 4);
2046# endif 2128# endif
2047 else 2129 else
2048 scrollBar.setMotion (); 2130 scrollBar.state = SB_STATE_MOTION;
2049 } 2131 }
2050 else 2132 else
2051 { 2133 {
2052 scr_page ((ev.button == Button1 ? DN : UP), 2134 scr_page ((ev.button == Button1 ? DN : UP),
2053 (nrow 2135 (nrow
2054 * scrollbar_position (ev.y) 2136 * scrollBar.position (ev.y)
2055 / scrollbar_size ())); 2137 / scrollBar.size ()));
2056 } 2138 }
2057 2139
2058 break; 2140 break;
2059 } 2141 }
2060 } 2142 }
… …
2070 2152
2071 csrO = 0; /* reset csr Offset */ 2153 csrO = 0; /* reset csr Offset */
2072 if (!bypass_keystate) 2154 if (!bypass_keystate)
2073 reportmode = !! (priv_modes & PrivMode_mouse_report); 2155 reportmode = !! (priv_modes & PrivMode_mouse_report);
2074 2156
2075 if (scrollbar_isUpDn ()) 2157 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2076 { 2158 {
2077 scrollBar.setIdle (); 2159 scrollBar.state = SB_STATE_IDLE;
2078 scrollbar_show (0); 2160 scrollBar.show (0);
2079 } 2161 }
2080 2162
2081#ifdef SELECTION_SCROLLING 2163#ifdef SELECTION_SCROLLING
2082 sel_scroll_ev.stop(); 2164 sel_scroll_ev.stop();
2083#endif 2165#endif
… …
2132 case Button3: 2214 case Button3:
2133 selection_make (ev.time); 2215 selection_make (ev.time);
2134 break; 2216 break;
2135 2217
2136 case Button2: 2218 case Button2:
2137 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2219 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2138 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2220 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2139 break; 2221 break;
2140 2222
2141#ifdef MOUSE_WHEEL 2223#ifdef MOUSE_WHEEL
2142 case Button4: 2224 case Button4:
2143 case Button5: 2225 case Button5:
2144 { 2226 {
2145 int i; 2227 int lines;
2146 page_dirn v; 2228 page_dirn dirn;
2147 2229
2148 v = ev.button == Button4 ? UP : DN; 2230 dirn = ev.button == Button4 ? UP : DN;
2149 2231
2150 if (ev.state & ShiftMask) 2232 if (ev.state & ShiftMask)
2151 i = 1; 2233 lines = 1;
2152 else if (option (Opt_mouseWheelScrollPage)) 2234 else if (option (Opt_mouseWheelScrollPage))
2153 i = nrow - 1; 2235 lines = nrow - 1;
2154 else 2236 else
2155 i = 5; 2237 lines = 5;
2156 2238
2157# ifdef MOUSE_SLIP_WHEELING 2239# ifdef MOUSE_SLIP_WHEELING
2158 if (ev.state & ControlMask) 2240 if (ev.state & ControlMask)
2159 { 2241 {
2160 mouse_slip_wheel_speed += v ? -1 : 1; 2242 mouse_slip_wheel_speed += dirn;
2161 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2243 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2162 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2163 2244
2164 if (!slip_wheel_ev.is_active ()) 2245 if (!slip_wheel_ev.is_active ())
2165 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2246 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2166 } 2247 }
2167 else 2248 else
2249# endif
2168 { 2250 {
2169# endif
2170 scr_page (v, i); 2251 scr_page (dirn, lines);
2171 scrollbar_show (1); 2252 scrollBar.show (1);
2172# ifdef MOUSE_SLIP_WHEELING
2173 } 2253 }
2174# endif
2175 } 2254 }
2176 break; 2255 break;
2177#endif 2256#endif
2178 } 2257 }
2179 } 2258 }
2180} 2259}
2181 2260
2182/*}}} */ 2261/*}}} */
2183 2262
2184bool 2263void ecb_hot
2185rxvt_term::cmd_parse () 2264rxvt_term::cmd_parse ()
2186{ 2265{
2187 bool flag = false;
2188 wchar_t ch = NOCHAR; 2266 wchar_t ch = NOCHAR;
2189 char *seq_begin; // remember start of esc-sequence here 2267 char *seq_begin; // remember start of esc-sequence here
2190 2268
2191 for (;;) 2269 for (;;)
2192 { 2270 {
2193 if (ch == NOCHAR) 2271 if (ecb_unlikely (ch == NOCHAR))
2194 { 2272 {
2195 seq_begin = cmdbuf_ptr; 2273 seq_begin = cmdbuf_ptr;
2196 ch = next_char (); 2274 ch = next_char ();
2197 2275
2198 if (ch == NOCHAR) 2276 if (ch == NOCHAR)
2199 break; 2277 break;
2200 } 2278 }
2201 2279
2202 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))
2203 { 2281 {
2204 if (!seen_input) 2282 if (ecb_unlikely (!seen_input))
2205 { 2283 {
2206 seen_input = 1; 2284 seen_input = 1;
2207 // many badly-written programs (e.g. jed) contain a race condition: 2285 // many badly-written programs (e.g. jed) contain a race condition:
2208 // they first read the screensize and then install a SIGWINCH handler. 2286 // they first read the screensize and then install a SIGWINCH handler.
2209 // some window managers resize the window early, and these programs 2287 // some window managers resize the window early, and these programs
… …
2222 wchar_t *str = buf; 2300 wchar_t *str = buf;
2223 wchar_t *eol = str + min (ncol, UBUFSIZ); 2301 wchar_t *eol = str + min (ncol, UBUFSIZ);
2224 2302
2225 for (;;) 2303 for (;;)
2226 { 2304 {
2227 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)))
2228 break; 2306 break;
2229 2307
2230 *str++ = ch; 2308 *str++ = ch;
2231 2309
2232 if (ch == C0_LF || str >= eol) 2310 if (ecb_unlikely (ch == C0_LF || str >= eol))
2233 { 2311 {
2234 if (ch == C0_LF) 2312 if (ch == C0_LF)
2235 nlines++; 2313 nlines++;
2236 2314
2237 refresh_count++; 2315 refresh_count++;
… …
2286 * What the heck we'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.
2287 * if skipScroll is enabled. 2365 * if skipScroll is enabled.
2288 */ 2366 */
2289 if (refreshnow) 2367 if (refreshnow)
2290 { 2368 {
2291 flag = true;
2292 scr_refresh (); 2369 scr_refresh ();
2293 want_refresh = 1; 2370 want_refresh = 1;
2294 } 2371 }
2295
2296 } 2372 }
2297 else 2373 else
2298 { 2374 {
2299 try 2375 try
2300 { 2376 {
… …
2308 } 2384 }
2309 2385
2310 ch = NOCHAR; 2386 ch = NOCHAR;
2311 } 2387 }
2312 } 2388 }
2313
2314 refresh_check ();
2315
2316 return flag;
2317} 2389}
2318 2390
2319// read the next character 2391// read the next character
2320wchar_t 2392wchar_t ecb_hot
2321rxvt_term::next_char () NOTHROW 2393rxvt_term::next_char () NOTHROW
2322{ 2394{
2323 while (cmdbuf_ptr < cmdbuf_endp) 2395 while (cmdbuf_ptr < cmdbuf_endp)
2324 { 2396 {
2325 // assume 7-bit to be ascii ALWAYS 2397 // assume 7-bit to be ascii ALWAYS
2326 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2398 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2327 return *cmdbuf_ptr++; 2399 return *cmdbuf_ptr++;
2328 2400
2329 wchar_t wc; 2401 wchar_t wc;
2330 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2402 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2331 2403
… …
2335 cmdbuf_ptr = cmdbuf_endp; 2407 cmdbuf_ptr = cmdbuf_endp;
2336 break; 2408 break;
2337 } 2409 }
2338 2410
2339 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.
2340 return (unsigned char)*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 }
2341 2418
2342 // assume wchar == unicode 2419 // assume wchar == unicode
2343 cmdbuf_ptr += len; 2420 cmdbuf_ptr += len;
2344 return wc & UNICODE_MASK; 2421 return wc & UNICODE_MASK;
2345 } 2422 }
2346 2423
2347 return NOCHAR; 2424 return NOCHAR;
2348} 2425}
2349 2426
2350// read the next octet 2427// read the next octet
2351uint32_t 2428uint32_t ecb_hot
2352rxvt_term::next_octet () NOTHROW 2429rxvt_term::next_octet () NOTHROW
2353{ 2430{
2354 return cmdbuf_ptr < cmdbuf_endp 2431 return cmdbuf_ptr < cmdbuf_endp
2355 ? (unsigned char)*cmdbuf_ptr++ 2432 ? (unsigned char)*cmdbuf_ptr++
2356 : NOCHAR; 2433 : NOCHAR;
2357} 2434}
2358 2435
2359static class out_of_input out_of_input; 2436static class out_of_input out_of_input;
2360 2437
2361/* rxvt_cmd_getc () - Return next input character */ 2438wchar_t ecb_hot
2362/*
2363 * Return the next input character after first passing any keyboard input
2364 * to the command.
2365 */
2366wchar_t
2367rxvt_term::cmd_getc () THROW ((class out_of_input)) 2439rxvt_term::cmd_getc () THROW ((class out_of_input))
2368{ 2440{
2369 wchar_t c = next_char (); 2441 wchar_t c = next_char ();
2370 2442
2371 if (c == NOCHAR) 2443 if (c == NOCHAR)
2372 throw out_of_input; 2444 throw out_of_input;
2373 2445
2374 return c; 2446 return c;
2375} 2447}
2376 2448
2377uint32_t 2449uint32_t ecb_hot
2378rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2450rxvt_term::cmd_get8 () THROW ((class out_of_input))
2379{ 2451{
2380 uint32_t c = next_octet (); 2452 uint32_t c = next_octet ();
2381 2453
2382 if (c == NOCHAR) 2454 if (c == NOCHAR)
… …
2386} 2458}
2387 2459
2388/*{{{ print pipe */ 2460/*{{{ print pipe */
2389/*----------------------------------------------------------------------*/ 2461/*----------------------------------------------------------------------*/
2390#ifdef PRINTPIPE 2462#ifdef PRINTPIPE
2391FILE * 2463FILE * ecb_cold
2392rxvt_term::popen_printer () 2464rxvt_term::popen_printer ()
2393{ 2465{
2394 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2466 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2395 2467
2396 if (stream == NULL) 2468 if (stream == NULL)
2397 rxvt_warn ("can't open printer pipe, not printing.\n"); 2469 rxvt_warn ("can't open printer pipe, not printing.\n");
2398 2470
2399 return stream; 2471 return stream;
2400} 2472}
2401 2473
2402int 2474int ecb_cold
2403rxvt_term::pclose_printer (FILE *stream) 2475rxvt_term::pclose_printer (FILE *stream)
2404{ 2476{
2405 fflush (stream); 2477 fflush (stream);
2406 return pclose (stream); 2478 return pclose (stream);
2407} 2479}
2408 2480
2409/* 2481/*
2410 * simulate attached vt100 printer 2482 * simulate attached vt100 printer
2411 */ 2483 */
2412void 2484void ecb_cold
2413rxvt_term::process_print_pipe () 2485rxvt_term::process_print_pipe ()
2414{ 2486{
2415 int done; 2487 FILE *fd = popen_printer ();
2416 FILE *fd;
2417 2488
2418 if ((fd = popen_printer ()) == NULL) 2489 if (!fd)
2419 return; 2490 return;
2420 2491
2421 /* 2492 /*
2422 * 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
2423 * is received. 2494 * is received.
2424 */ 2495 */
2425 for (done = 0; !done;) 2496 for (int done = 0; !done; )
2426 { 2497 {
2427 unsigned char buf[8]; 2498 unsigned char buf[8];
2428 unicode_t ch; 2499 unicode_t ch;
2429 unsigned int i, len; 2500 unsigned int i, len;
2430 2501
… …
2464 pclose_printer (fd); 2535 pclose_printer (fd);
2465} 2536}
2466#endif /* PRINTPIPE */ 2537#endif /* PRINTPIPE */
2467/*}}} */ 2538/*}}} */
2468 2539
2469/* *INDENT-OFF* */
2470enum { 2540enum {
2471 C1_40 = 0x40, 2541 C1_40 = 0x40,
2472 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,
2473 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,
2474 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,
2475 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,
2476}; 2546};
2477/* *INDENT-ON* */
2478 2547
2479/*{{{ process non-printing single characters */ 2548/*{{{ process non-printing single characters */
2480void 2549void ecb_hot
2481rxvt_term::process_nonprinting (unicode_t ch) 2550rxvt_term::process_nonprinting (unicode_t ch)
2482{ 2551{
2483 switch (ch) 2552 switch (ch)
2484 { 2553 {
2485 case C0_ESC: 2554 case C0_ESC:
… …
2531} 2600}
2532/*}}} */ 2601/*}}} */
2533 2602
2534 2603
2535/*{{{ process VT52 escape sequences */ 2604/*{{{ process VT52 escape sequences */
2536void 2605void ecb_cold
2537rxvt_term::process_escape_vt52 (unicode_t ch) 2606rxvt_term::process_escape_vt52 (unicode_t ch)
2538{ 2607{
2539 int row, col; 2608 int row, col;
2540 2609
2541 switch (ch) 2610 switch (ch)
… …
2575 break; 2644 break;
2576 case 'Z': /* identify the terminal type */ 2645 case 'Z': /* identify the terminal type */
2577 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2646 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2578 break; 2647 break;
2579 case '<': /* turn off VT52 mode */ 2648 case '<': /* turn off VT52 mode */
2580 PrivMode (0, PrivMode_vt52); 2649 priv_modes &= ~PrivMode_vt52;
2581 break; 2650 break;
2582 case 'F': /* use special graphics character set */ 2651 case 'F': /* use special graphics character set */
2583 case 'G': /* use regular character set */ 2652 case 'G': /* use regular character set */
2584 /* unimplemented */ 2653 /* unimplemented */
2585 break; 2654 break;
… …
2591} 2660}
2592/*}}} */ 2661/*}}} */
2593 2662
2594 2663
2595/*{{{ process escape sequences */ 2664/*{{{ process escape sequences */
2596void 2665void ecb_hot
2597rxvt_term::process_escape_seq () 2666rxvt_term::process_escape_seq ()
2598{ 2667{
2599 unicode_t ch = cmd_getc (); 2668 unicode_t ch = cmd_getc ();
2600 2669
2601 if (priv_modes & PrivMode_vt52) 2670 if (priv_modes & PrivMode_vt52)
… …
2604 return; 2673 return;
2605 } 2674 }
2606 2675
2607 switch (ch) 2676 switch (ch)
2608 { 2677 {
2609 /* case 1: do_tek_mode (); break; */
2610 case '#': 2678 case '#':
2611 if (cmd_getc () == '8') 2679 if (cmd_getc () == '8')
2612 scr_E (); 2680 scr_E ();
2613 break; 2681 break;
2614 case '(': 2682 case '(':
… …
2637#if !ENABLE_MINIMAL 2705#if !ENABLE_MINIMAL
2638 case '9': 2706 case '9':
2639 scr_forwardindex (); 2707 scr_forwardindex ();
2640 break; 2708 break;
2641#endif 2709#endif
2710 // DECPAM/DECPNM
2642 case '=': 2711 case '=':
2712 priv_modes |= PrivMode_aplKP;
2713 break;
2643 case '>': 2714 case '>':
2644 PrivMode ((ch == '='), PrivMode_aplKP); 2715 priv_modes &= ~PrivMode_aplKP;
2645 break; 2716 break;
2646 2717
2647 case C1_40: 2718 case C1_40:
2648 cmd_getc (); 2719 cmd_getc ();
2649 break; 2720 break;
… …
2653 2724
2654 /* 8.3.87: NEXT LINE */ 2725 /* 8.3.87: NEXT LINE */
2655 case C1_NEL: /* ESC E */ 2726 case C1_NEL: /* ESC E */
2656 { 2727 {
2657 wchar_t nlcr[] = { C0_LF, C0_CR }; 2728 wchar_t nlcr[] = { C0_LF, C0_CR };
2658 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2729 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2659 } 2730 }
2660 break; 2731 break;
2661 2732
2662 /* kidnapped escape sequence: Should be 8.3.48 */ 2733 /* kidnapped escape sequence: Should be 8.3.48 */
2663 case C1_ESA: /* ESC G */ 2734 case C1_ESA: /* ESC G */
2664 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 */
2665 break; 2738 break;
2666 2739
2667 /* 8.3.63: CHARACTER TABULATION SET */ 2740 /* 8.3.63: CHARACTER TABULATION SET */
2668 case C1_HTS: /* ESC H */ 2741 case C1_HTS: /* ESC H */
2669 scr_set_tab (1); 2742 scr_set_tab (1);
… …
2673 case C1_RI: /* ESC M */ 2746 case C1_RI: /* ESC M */
2674 scr_index (DN); 2747 scr_index (DN);
2675 break; 2748 break;
2676 2749
2677 /* 8.3.142: SINGLE-SHIFT TWO */ 2750 /* 8.3.142: SINGLE-SHIFT TWO */
2678 /*case C1_SS2: scr_single_shift (2); break; */ 2751 /* case C1_SS2: break; */
2679 2752
2680 /* 8.3.143: SINGLE-SHIFT THREE */ 2753 /* 8.3.143: SINGLE-SHIFT THREE */
2681 /*case C1_SS3: scr_single_shift (3); break; */ 2754 /* case C1_SS3: break; */
2682 2755
2683 /* 8.3.27: DEVICE CONTROL STRING */ 2756 /* 8.3.27: DEVICE CONTROL STRING */
2684 case C1_DCS: /* ESC P */ 2757 case C1_DCS: /* ESC P */
2685 process_dcs_seq (); 2758 process_dcs_seq ();
2686 break; 2759 break;
… …
2688 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2761 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2689 case C1_SCI: /* ESC Z */ 2762 case C1_SCI: /* ESC Z */
2690 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2763 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2691 break; /* steal obsolete ESC [ c */ 2764 break; /* steal obsolete ESC [ c */
2692 2765
2693 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2766 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2694 case C1_CSI: /* ESC [ */ 2767 case C1_CSI: /* ESC [ */
2695 process_csi_seq (); 2768 process_csi_seq ();
2696 break; 2769 break;
2697 2770
2698 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2771 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2699 case C1_OSC: /* ESC ] */ 2772 case C1_OSC: /* ESC ] */
2700 process_osc_seq (); 2773 process_osc_seq ();
2701 break; 2774 break;
2702 2775
2703 /* 8.3.106: RESET TO INITIAL STATE */ 2776 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2704 case 'c': 2777 case 'c':
2705 mbstate.reset (); 2778 mbstate.reset ();
2706 scr_poweron (); 2779 scr_poweron ();
2707 scrollbar_show (1); 2780 scrollBar.show (1);
2708 break; 2781 break;
2709 2782
2710 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2783 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2711 case 'n': 2784 case 'n':
2712 scr_charset_choose (2); 2785 scr_charset_choose (2);
… …
2719 } 2792 }
2720} 2793}
2721/*}}} */ 2794/*}}} */
2722 2795
2723/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2796/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2724/* *INDENT-OFF* */
2725enum { 2797enum {
2726 CSI_ICH = 0x40, 2798 CSI_ICH = 0x40,
2727 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,
2728 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 ,
2729 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,
… …
2732 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,
2733 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 ,
2734 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
2735}; 2807};
2736 2808
2737#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2809#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2738 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2810 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2739 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2811 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2740#define get_byte_array_bit(array, bit) \ 2812#define get_byte_array_bit(array, bit) \
2741 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2813 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2742 2814
2743const unsigned char csi_defaults[] = 2815static const unsigned char csi_defaults[] =
2744 { 2816 {
2745 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, */
2746 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, */
2747 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, */
2748 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, [, \, ], ^, _, */
2749 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, */
2750 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, */
2751 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, */
2752 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, {, |, }, ~, */
2753 }; 2825 };
2754/* *INDENT-ON* */
2755 2826
2756void 2827void ecb_hot
2757rxvt_term::process_csi_seq () 2828rxvt_term::process_csi_seq ()
2758{ 2829{
2759 unicode_t ch, priv, i; 2830 unicode_t ch, priv, prev_ch, i;
2760 unsigned int nargs, p; 2831 unsigned int nargs, p;
2761 int n, ndef; 2832 int n, ndef;
2762 int arg[ESC_ARGS] = { }; 2833 int arg[ESC_ARGS] = { };
2763 2834
2764 nargs = 0; 2835 nargs = 0;
2765 2836
2766 priv = 0; 2837 priv = 0;
2767 ch = cmd_getc (); 2838 ch = cmd_getc ();
2768 if (ch >= '<' && ch <= '?') 2839 if ((ch >= '<' && ch <= '?') || ch == '!')
2769 { 2840 {
2770 /* '<' '=' '>' '?' */ 2841 /* '<' '=' '>' '?' '!' */
2771 priv = ch; 2842 priv = ch;
2772 ch = cmd_getc (); 2843 ch = cmd_getc ();
2773 } 2844 }
2774 2845
2846 prev_ch = 0;
2775 /* read any numerical arguments */ 2847 /* read any numerical arguments */
2776 for (n = -1; ch < CSI_ICH; ) 2848 for (n = -1; ch < CSI_ICH; )
2777 { 2849 {
2778 if (isdigit (ch)) 2850 if (isdigit (ch))
2779 { 2851 {
… …
2789 n = -1; 2861 n = -1;
2790 } 2862 }
2791 else if (IS_CONTROL (ch)) 2863 else if (IS_CONTROL (ch))
2792 process_nonprinting (ch); 2864 process_nonprinting (ch);
2793 2865
2866 prev_ch = ch;
2794 ch = cmd_getc (); 2867 ch = cmd_getc ();
2795 } 2868 }
2796 2869
2797 if (ch > CSI_7F) 2870 if (ch > CSI_7F)
2798 return; 2871 return;
… …
2824 // versions. 2897 // versions.
2825 // 2898 //
2826 tt_printf ("\033[>%d;95;0c", 'U'); 2899 tt_printf ("\033[>%d;95;0c", 'U');
2827 } 2900 }
2828 break; 2901 break;
2902
2829 case '?': 2903 case '?':
2830 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2904 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2831 process_terminal_mode (ch, priv, nargs, arg); 2905 process_terminal_mode (ch, priv, nargs, arg);
2832 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);
2833 } 2919 }
2920 break;
2921 }
2922
2834 return; 2923 return;
2835 } 2924 }
2836 2925
2837 switch (ch) 2926 switch (ch)
2838 { 2927 {
… …
2852 } 2941 }
2853 break; 2942 break;
2854#endif 2943#endif
2855 2944
2856 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2945 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2857 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2946 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2858 arg[0] = -arg[0]; 2947 arg[0] = -arg[0];
2859 /* FALLTHROUGH */ 2948 /* FALLTHROUGH */
2860 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2949 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2861 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2950 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2862 scr_gotorc (arg[0], 0, RELATIVE); 2951 scr_gotorc (arg[0], 0, RELATIVE);
2863 break; 2952 break;
2864 2953
2865 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2954 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2866 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2955 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3016 scr_insert_mode (1); 3105 scr_insert_mode (1);
3017 else if (arg[0] == 20) 3106 else if (arg[0] == 20)
3018 priv_modes |= PrivMode_LFNL; 3107 priv_modes |= PrivMode_LFNL;
3019 break; 3108 break;
3020 3109
3110 case CSI_71: // DESCUSR: set cursor style
3111 if (prev_ch == ' ')
3112 set_cursor_style (arg[0]);
3113 break;
3114
3021 /* 3115 /*
3022 * PRIVATE USE beyond this point. All CSI_7? sequences here 3116 * PRIVATE USE beyond this point. All CSI_7? sequences here
3023 */ 3117 */
3024 case CSI_72: /* DECSTBM: set top and bottom margins */ 3118 case CSI_72: /* DECSTBM: set top and bottom margins */
3025 if (nargs == 1) 3119 if (nargs == 1)
… …
3053 } 3147 }
3054} 3148}
3055/*}}} */ 3149/*}}} */
3056 3150
3057#if !ENABLE_MINIMAL 3151#if !ENABLE_MINIMAL
3058/* ARGSUSED */
3059void 3152void
3060rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3153rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3061{ 3154{
3062 int x, y; 3155 int x, y;
3063 XWindowAttributes wattr; 3156 XWindowAttributes wattr;
… …
3072 { 3165 {
3073 /* 3166 /*
3074 * commands 3167 * commands
3075 */ 3168 */
3076 case 1: /* deiconify window */ 3169 case 1: /* deiconify window */
3077 XMapWindow (dpy, parent[0]); 3170 XMapWindow (dpy, parent);
3078 break; 3171 break;
3079 case 2: /* iconify window */ 3172 case 2: /* iconify window */
3080 XIconifyWindow (dpy, parent[0], display->screen); 3173 XIconifyWindow (dpy, parent, display->screen);
3081 break; 3174 break;
3082 case 3: /* set position (pixels) */ 3175 case 3: /* set position (pixels) */
3083 XMoveWindow (dpy, parent[0], args[1], args[2]); 3176 XMoveWindow (dpy, parent, args[1], args[2]);
3084 break; 3177 break;
3085 case 4: /* set size (pixels) */ 3178 case 4: /* set size (pixels) */
3086 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3179 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3087 break; 3180 break;
3088 case 5: /* raise window */ 3181 case 5: /* raise window */
3089 XRaiseWindow (dpy, parent[0]); 3182 XRaiseWindow (dpy, parent);
3090 break; 3183 break;
3091 case 6: /* lower window */ 3184 case 6: /* lower window */
3092 XLowerWindow (dpy, parent[0]); 3185 XLowerWindow (dpy, parent);
3093 break; 3186 break;
3094 case 7: /* refresh window */ 3187 case 7: /* refresh window */
3095 scr_touch (true); 3188 scr_touch (true);
3096 break; 3189 break;
3097 case 8: /* set size (chars) */ 3190 case 8: /* set size (chars) */
… …
3100 break; 3193 break;
3101 3194
3102 //case 9: NYI, TODO, restore maximized window or maximize window 3195 //case 9: NYI, TODO, restore maximized window or maximize window
3103 default: 3196 default:
3104 if (args[0] >= 24) /* set height (chars) */ 3197 if (args[0] >= 24) /* set height (chars) */
3105 set_widthheight ((unsigned int)width, 3198 set_widthheight ((unsigned int)vt_width,
3106 (unsigned int) (args[1] * fheight)); 3199 (unsigned int) (args[1] * fheight));
3107 break; 3200 break;
3108 3201
3109 /* 3202 /*
3110 * reports - some output format copied from XTerm 3203 * reports - some output format copied from XTerm
3111 */ 3204 */
3112 case 11: /* report window state */ 3205 case 11: /* report window state */
3113 XGetWindowAttributes (dpy, parent[0], &wattr); 3206 XGetWindowAttributes (dpy, parent, &wattr);
3114 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3207 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3115 break; 3208 break;
3116 case 13: /* report window position */ 3209 case 13: /* report window position */
3117 XGetWindowAttributes (dpy, parent[0], &wattr); 3210 XGetWindowAttributes (dpy, parent, &wattr);
3118 XTranslateCoordinates (dpy, parent[0], wattr.root, 3211 XTranslateCoordinates (dpy, parent, wattr.root,
3119 -wattr.border_width, -wattr.border_width, 3212 -wattr.border_width, -wattr.border_width,
3120 &x, &y, &wdummy); 3213 &x, &y, &wdummy);
3121 tt_printf ("\033[3;%d;%dt", x, y); 3214 tt_printf ("\033[3;%d;%dt", x, y);
3122 break; 3215 break;
3123 case 14: /* report window size (pixels) */ 3216 case 14: /* report window size (pixels) */
3124 XGetWindowAttributes (dpy, parent[0], &wattr); 3217 XGetWindowAttributes (dpy, parent, &wattr);
3125 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3218 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3126 break; 3219 break;
3127 case 18: /* report text area size (chars) */ 3220 case 18: /* report text area size (chars) */
3128 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3221 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3129 break; 3222 break;
… …
3131 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3224 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3132 break; 3225 break;
3133 case 20: /* report icon label */ 3226 case 20: /* report icon label */
3134 { 3227 {
3135 char *s; 3228 char *s;
3136 XGetIconName (dpy, parent[0], &s); 3229 XGetIconName (dpy, parent, &s);
3137 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3230 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3138 XFree (s); 3231 XFree (s);
3139 } 3232 }
3140 break; 3233 break;
3141 case 21: /* report window title */ 3234 case 21: /* report window title */
3142 { 3235 {
3143 char *s; 3236 char *s;
3144 XFetchName (dpy, parent[0], &s); 3237 XFetchName (dpy, parent, &s);
3145 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3238 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3146 XFree (s); 3239 XFree (s);
3147 } 3240 }
3148 break; 3241 break;
3149 } 3242 }
… …
3159rxvt_term::get_to_st (unicode_t &ends_how) 3252rxvt_term::get_to_st (unicode_t &ends_how)
3160{ 3253{
3161 unicode_t ch; 3254 unicode_t ch;
3162 bool seen_esc = false; 3255 bool seen_esc = false;
3163 unsigned int n = 0; 3256 unsigned int n = 0;
3164 wchar_t string[STRING_MAX]; 3257 wchar_t string[CBUFSIZ];
3165 3258
3166 while ((ch = cmd_getc ()) != NOCHAR) 3259 while ((ch = cmd_getc ()) != NOCHAR)
3167 { 3260 {
3168 if (seen_esc) 3261 if (seen_esc)
3169 { 3262 {
… …
3184 else if (ch < 0x20) 3277 else if (ch < 0x20)
3185 return NULL; /* other control character - exit */ 3278 return NULL; /* other control character - exit */
3186 3279
3187 seen_esc = false; 3280 seen_esc = false;
3188 3281
3189 if (n >= STRING_MAX - 1) 3282 if (n >= sizeof (string) - 1)
3190 // stop at some sane length 3283 // stop at some sane length
3191 return NULL; 3284 return NULL;
3192 3285
3193 string[n++] = ch; 3286 string[n++] = ch;
3194 } 3287 }
… …
3205 * 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)'
3206 */ 3299 */
3207void 3300void
3208rxvt_term::process_dcs_seq () 3301rxvt_term::process_dcs_seq ()
3209{ 3302{
3210 char *s;
3211 unicode_t eh;
3212
3213 /* 3303 /*
3214 * Not handled yet 3304 * Not handled yet
3215 */ 3305 */
3306
3307 unicode_t eh;
3216 s = get_to_st (eh); 3308 char *s = get_to_st (eh);
3217 if (s) 3309 if (s)
3218 free (s); 3310 free (s);
3219 3311
3220 return; 3312 return;
3221} 3313}
… …
3225 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3317 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3226 */ 3318 */
3227void 3319void
3228rxvt_term::process_osc_seq () 3320rxvt_term::process_osc_seq ()
3229{ 3321{
3230 unicode_t ch, eh;
3231 int arg; 3322 int arg;
3232 3323
3233 ch = cmd_getc (); 3324 unicode_t ch = cmd_getc ();
3234 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3325 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3235 arg = arg * 10 + (ch - '0'); 3326 arg = arg * 10 + (ch - '0');
3236 3327
3237 if (ch == ';') 3328 if (ch == ';')
3238 { 3329 {
3330 unicode_t eh;
3239 char *s = get_to_st (eh); 3331 char *s = get_to_st (eh);
3240 3332
3241 if (s) 3333 if (s)
3242 { 3334 {
3243 process_xterm_seq (arg, s, eh); 3335 process_xterm_seq (arg, s, eh);
… …
3267 3359
3268/* 3360/*
3269 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3361 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3270 */ 3362 */
3271void 3363void
3272rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3364rxvt_term::process_xterm_seq (int op, char *str, char resp)
3273{ 3365{
3274 int color; 3366 int color;
3275 char *buf, *name; 3367 char *buf, *name;
3276 bool query = str[0] == '?' && !str[1]; 3368 bool query = str[0] == '?' && !str[1];
3277 int saveop = op; 3369 int saveop = op;
… …
3304 unsigned long bytes_after; 3396 unsigned long bytes_after;
3305 unsigned char *value = 0; 3397 unsigned char *value = 0;
3306 const char *str = ""; 3398 const char *str = "";
3307 3399
3308 if (prop 3400 if (prop
3309 && XGetWindowProperty (dpy, parent[0], 3401 && XGetWindowProperty (dpy, parent,
3310 prop, 0, 1<<16, 0, AnyPropertyType, 3402 prop, 0, 1<<16, 0, AnyPropertyType,
3311 &actual_type, &actual_format, 3403 &actual_type, &actual_format,
3312 &nitems, &bytes_after, &value) == Success 3404 &nitems, &bytes_after, &value) == Success
3313 && actual_type != None 3405 && actual_type != None
3314 && actual_format == 8) 3406 && actual_format == 8)
3315 str = (const char *)(value); 3407 str = (const char *)(value);
3316 3408
3317 tt_printf ("\033]%d;%s%c", op, str, resp); 3409 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3318 3410
3319 XFree (value); 3411 XFree (value);
3320 } 3412 }
3321 else 3413 else
3322 { 3414 {
3323 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3415 char *eq = strchr (str, '=');
3324 3416
3325 if (eq) 3417 if (eq)
3326 { 3418 {
3327 *eq = 0; 3419 *eq = 0;
3328 set_utf8_property (display->atom (str), eq + 1); 3420 set_utf8_property (display->atom (str), eq + 1);
3329 } 3421 }
3330 else 3422 else
3331 XDeleteProperty (dpy, parent[0], 3423 XDeleteProperty (dpy, parent,
3332 display->atom (str)); 3424 display->atom (str));
3333 } 3425 }
3334 break; 3426 break;
3335 3427
3336 case XTerm_Color: 3428 case XTerm_Color:
… …
3349 *buf++ = '\0'; 3441 *buf++ = '\0';
3350 3442
3351 process_color_seq (op, color, name, resp); 3443 process_color_seq (op, color, name, resp);
3352 } 3444 }
3353 break; 3445 break;
3446 case Rxvt_restoreFG:
3354 case XTerm_Color00: 3447 case XTerm_Color00:
3355 process_color_seq (op, Color_fg, str, resp); 3448 process_color_seq (op, Color_fg, str, resp);
3356 break; 3449 break;
3450 case Rxvt_restoreBG:
3357 case XTerm_Color01: 3451 case XTerm_Color01:
3358 process_color_seq (op, Color_bg, str, resp); 3452 process_color_seq (op, Color_bg, str, resp);
3359 break; 3453 break;
3360#ifndef NO_CURSORCOLOR 3454#ifndef NO_CURSORCOLOR
3361 case XTerm_Color_cursor: 3455 case XTerm_Color_cursor:
… …
3366 process_color_seq (op, Color_pointer_fg, str, resp); 3460 process_color_seq (op, Color_pointer_fg, str, resp);
3367 break; 3461 break;
3368 case XTerm_Color_pointer_bg: 3462 case XTerm_Color_pointer_bg:
3369 process_color_seq (op, Color_pointer_bg, str, resp); 3463 process_color_seq (op, Color_pointer_bg, str, resp);
3370 break; 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
3371#ifndef NO_BOLD_UNDERLINE_REVERSE 3473#ifndef NO_BOLD_UNDERLINE_REVERSE
3372 case XTerm_Color_RV:
3373 process_color_seq (op, Color_RV, str, resp);
3374 break;
3375 case Rxvt_Color_BD:
3376 case URxvt_Color_BD: 3474 case URxvt_Color_BD:
3377 process_color_seq (op, Color_BD, str, resp); 3475 process_color_seq (op, Color_BD, str, resp);
3378 break; 3476 break;
3379 case Rxvt_Color_UL:
3380 case URxvt_Color_UL: 3477 case URxvt_Color_UL:
3381 process_color_seq (op, Color_UL, str, resp); 3478 process_color_seq (op, Color_UL, str, resp);
3382 break; 3479 break;
3383 case URxvt_Color_IT: 3480 case URxvt_Color_IT:
3384 process_color_seq (op, Color_IT, str, resp); 3481 process_color_seq (op, Color_IT, str, resp);
3385 break; 3482 break;
3386#endif 3483#endif
3387#if ENABLE_TRANSPARENCY 3484 case URxvt_Color_border:
3485 process_color_seq (op, Color_border, str, resp);
3486 break;
3487
3488#if BG_IMAGE_FROM_ROOT
3388 case URxvt_Color_tint: 3489 case URxvt_Color_tint:
3389 process_color_seq (op, Color_tint, str, resp); 3490 process_color_seq (op, Color_tint, str, resp);
3390 { 3491 {
3391 bool changed = false; 3492 bool changed = false;
3493
3392 if (ISSET_PIXCOLOR (Color_tint)) 3494 if (ISSET_PIXCOLOR (Color_tint))
3393 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3495 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3394 else 3496
3395 changed = bgPixmap.unset_tint ();
3396 if (changed) 3497 if (changed)
3397 update_background (); 3498 update_background ();
3398 } 3499 }
3399 3500
3400 break; 3501 break;
… …
3403#if BG_IMAGE_FROM_FILE 3504#if BG_IMAGE_FROM_FILE
3404 case Rxvt_Pixmap: 3505 case Rxvt_Pixmap:
3405 if (!strcmp (str, "?")) 3506 if (!strcmp (str, "?"))
3406 { 3507 {
3407 char str[256]; 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;
3408 3513
3409 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3514 sprintf (str, "[%dx%d+%d+%d]",
3410 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3515 h_scale, v_scale,
3411 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3516 h_align, v_align);
3412 process_xterm_seq (XTerm_title, str, CHAR_ST); 3517 process_xterm_seq (XTerm_title, str, CHAR_ST);
3413 } 3518 }
3414 else 3519 else
3415 { 3520 {
3416 int changed = 0; 3521 bool changed = false;
3417 3522
3418 if (*str != ';') 3523 if (*str != ';')
3419 { 3524 {
3420 /* reset to default scaling :*/ 3525 try
3421 bgPixmap.unset_geometry (); 3526 {
3422 if (bgPixmap.set_file (str)) /* change pixmap */ 3527 fimage.set_file_geometry (this, str);
3423 changed++; 3528 changed = true;
3424 str = strchr (str, ';'); 3529 }
3425 if (str == NULL) 3530 catch (const class rxvt_failure_exception &e)
3426 bgPixmap.set_defaultGeometry (); 3531 {
3532 }
3427 } 3533 }
3428 while (str) 3534 else
3429 { 3535 {
3430 str++; 3536 str++;
3431 if (bgPixmap.set_geometry (str)) 3537 if (fimage.set_geometry (str, true))
3432 changed++; 3538 changed = true;
3433 str = strchr (str, ';');
3434 } 3539 }
3540
3435 if (changed) 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 }
3436 update_background (); 3550 update_background ();
3551 }
3437 } 3552 }
3438 break; 3553 break;
3439#endif 3554#endif
3440
3441 case Rxvt_restoreFG:
3442 set_window_color (Color_fg, str);
3443 break;
3444 case Rxvt_restoreBG:
3445 set_window_color (Color_bg, str);
3446 break;
3447 3555
3448 case XTerm_logfile: 3556 case XTerm_logfile:
3449 // TODO, when secure mode? 3557 // TODO, when secure mode?
3450 break; 3558 break;
3451 3559
… …
3518 break; 3626 break;
3519#endif 3627#endif
3520 3628
3521#if ENABLE_PERL 3629#if ENABLE_PERL
3522 case URxvt_perl: 3630 case URxvt_perl:
3523 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3631 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3524 ; // no responses yet
3525 break; 3632 break;
3526#endif 3633#endif
3527 } 3634 }
3528} 3635}
3529/*----------------------------------------------------------------------*/ 3636/*----------------------------------------------------------------------*/
… …
3536 * 's' = save 3643 * 's' = save
3537 * 'r' = restore 3644 * 'r' = restore
3538 * 't' = toggle 3645 * 't' = toggle
3539 * so no need for fancy checking 3646 * so no need for fancy checking
3540 */ 3647 */
3541int 3648int ecb_cold
3542rxvt_term::privcases (int mode, unsigned long bit) 3649rxvt_term::privcases (int mode, unsigned long bit)
3543{ 3650{
3544 int state; 3651 int state;
3545 3652
3546 if (mode == 's') 3653 if (mode == 's')
3547 { 3654 {
3548 SavedModes |= (priv_modes & bit); 3655 if (priv_modes & bit)
3656 SavedModes |= bit;
3657 else
3658 SavedModes &= ~bit;
3549 return -1; 3659 return -1;
3550 } 3660 }
3551 else 3661 else
3552 { 3662 {
3553 if (mode == 'r') 3663 if (mode == 'r')
3554 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3664 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3555 else 3665 else
3556 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3666 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3557 PrivMode (state, bit); 3667
3668 if (state)
3669 priv_modes |= bit;
3670 else
3671 priv_modes &= ~bit;
3558 } 3672 }
3559 3673
3560 return state; 3674 return state;
3561} 3675}
3562 3676
3563/* we're not using priv _yet_ */ 3677/* we're not using priv _yet_ */
3564void 3678void
3565rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3679rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3566{ 3680{
3567 unsigned int i, j; 3681 unsigned int i, j;
3568 int state; 3682 int state;
3569 3683
3570 static const struct 3684 static const struct
3571 { 3685 {
3572 const int argval; 3686 const int argval;
3573 const unsigned long bit; 3687 const unsigned long bit;
3574 } argtopriv[] = { 3688 } argtopriv[] = {
3575 { 1, PrivMode_aplCUR }, 3689 { 1, PrivMode_aplCUR }, // DECCKM
3576 { 2, PrivMode_vt52 }, 3690 { 2, PrivMode_vt52 }, // DECANM
3577 { 3, PrivMode_132 }, 3691 { 3, PrivMode_132 }, // DECCOLM
3578 { 4, PrivMode_smoothScroll }, 3692 { 4, PrivMode_smoothScroll }, // DECSCLM
3579 { 5, PrivMode_rVideo }, 3693 { 5, PrivMode_rVideo }, // DECSCNM
3580 { 6, PrivMode_relOrigin }, 3694 { 6, PrivMode_relOrigin }, // DECOM
3581 { 7, PrivMode_Autowrap }, 3695 { 7, PrivMode_Autowrap }, // DECAWM
3582 // 8, bi-directional support mode 3696 // 8, auto-repeat keys // DECARM
3583 { 9, PrivMode_MouseX10 }, 3697 { 9, PrivMode_MouseX10 },
3584 // 18, 19 printing-related 3698 // 18 end FF to printer after print screen
3699 // 19 Print screen prints full screen/scroll region
3585 { 25, PrivMode_VisibleCursor }, 3700 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3586#ifdef scrollBar_esc 3701#ifdef scrollBar_esc
3587 { scrollBar_esc, PrivMode_scrollBar }, 3702 { scrollBar_esc, PrivMode_scrollBar },
3588#endif 3703#endif
3589 { 35, PrivMode_ShiftKeys }, // rxvt extension 3704 { 35, PrivMode_ShiftKeys }, // rxvt extension
3705 // 38, tektronix mode // DECTEK
3590 { 40, PrivMode_132OK }, 3706 { 40, PrivMode_132OK },
3591 // 41 xterm more fixes NYI 3707 // 41 xterm more fixes NYI
3592 // 45 margin bell NYI 3708 // 45 margin bell NYI
3593 // 46 start logging 3709 // 46 start logging
3594 { 47, PrivMode_Screen }, 3710 { 47, PrivMode_Screen },
3595 { 66, PrivMode_aplKP }, 3711 { 66, PrivMode_aplKP }, // DECNKM
3596#ifndef NO_BACKSPACE_KEY 3712#ifndef NO_BACKSPACE_KEY
3597 { 67, PrivMode_BackSpace }, 3713 { 67, PrivMode_BackSpace }, // DECBKM
3598#endif 3714#endif
3599 { 1000, PrivMode_MouseX11 }, 3715 { 1000, PrivMode_MouseX11 },
3600 { 1002, PrivMode_MouseBtnEvent }, 3716 { 1002, PrivMode_MouseBtnEvent },
3601 { 1003, PrivMode_MouseAnyEvent }, 3717 { 1003, PrivMode_MouseAnyEvent },
3718#if ENABLE_FRILLS
3719 { 1005, PrivMode_ExtModeMouse },
3720#endif
3602 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3721 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3603 { 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
3604 // 1035 enable modifiers for alt, numlock NYI 3726 // 1035 enable modifiers for alt, numlock NYI
3605 // 1036 send ESC for meta keys NYI 3727 // 1036 send ESC for meta keys NYI
3606 // 1037 send DEL for keypad delete NYI 3728 // 1037 send DEL for keypad delete NYI
3607 { 1047, PrivMode_Screen }, 3729 { 1047, PrivMode_Screen },
3608 // 1048 save and restore cursor 3730 // 1048 save and restore cursor, implemented in code
3609 { 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 */
3610 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3732 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3733 { 2004, PrivMode_BracketPaste },
3611 }; 3734 };
3612 3735
3613 if (nargs == 0) 3736 if (nargs == 0)
3614 return; 3737 return;
3615 3738
… …
3622 for (i = 0; i < nargs; i++) 3745 for (i = 0; i < nargs; i++)
3623 { 3746 {
3624 state = -1; 3747 state = -1;
3625 3748
3626 /* basic handling */ 3749 /* basic handling */
3627 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3750 for (j = 0; j < ecb_array_length (argtopriv); j++)
3628 if (argtopriv[j].argval == arg[i]) 3751 if (argtopriv[j].argval == arg[i])
3629 { 3752 {
3630 state = privcases (mode, argtopriv[j].bit); 3753 state = privcases (mode, argtopriv[j].bit);
3631 break; 3754 break;
3632 } 3755 }
… …
3640 3763
3641 scr_touch (true); 3764 scr_touch (true);
3642 break; 3765 break;
3643#endif 3766#endif
3644 case 1048: /* alternative cursor save */ 3767 case 1048: /* alternative cursor save */
3645 case 1049:
3646 if (option (Opt_secondaryScreen)) 3768 if (option (Opt_secondaryScreen))
3647 if (mode == 0) 3769 if (mode == 0)
3648 scr_cursor (RESTORE); 3770 scr_cursor (RESTORE);
3649 else if (mode == 1) 3771 else if (mode == 1)
3650 scr_cursor (SAVE); 3772 scr_cursor (SAVE);
… …
3659 case 2: /* VT52 mode */ 3781 case 2: /* VT52 mode */
3660 /* oddball mode. should be set regardless of set/reset 3782 /* oddball mode. should be set regardless of set/reset
3661 * parameter. Return from VT52 mode with an ESC < from 3783 * parameter. Return from VT52 mode with an ESC < from
3662 * within VT52 mode 3784 * within VT52 mode
3663 */ 3785 */
3664 PrivMode (1, PrivMode_vt52); 3786 priv_modes |= PrivMode_vt52;
3665 break; 3787 break;
3666 case 3: /* 80/132 */ 3788 case 3: /* 80/132 */
3667 if (priv_modes & PrivMode_132OK) 3789 if (priv_modes & PrivMode_132OK)
3668 set_widthheight (((state ? 132 : 80) * fwidth), height); 3790 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3669 break; 3791 break;
3670 case 4: /* smooth scrolling */ 3792 case 4: /* smooth scrolling */
3671 set_option (Opt_jumpScroll, !state); 3793 set_option (Opt_jumpScroll, !state);
3672 break; 3794 break;
3673 case 5: /* reverse video */ 3795 case 5: /* reverse video */
… …
3684 if (state) /* orthogonal */ 3806 if (state) /* orthogonal */
3685 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3807 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3686 break; 3808 break;
3687#ifdef scrollBar_esc 3809#ifdef scrollBar_esc
3688 case scrollBar_esc: 3810 case scrollBar_esc:
3689 if (scrollbar_mapping (state)) 3811 scrollBar.map (state);
3690 {
3691 resize_all_windows (0, 0, 0); 3812 resize_all_windows (0, 0, 0);
3692 scr_touch (true); 3813 scr_touch (true);
3693 }
3694 break; 3814 break;
3695#endif 3815#endif
3696 case 25: /* visible/invisible cursor */ 3816 case 25: /* visible/invisible cursor */
3697 scr_cursor_visible (state); 3817 scr_cursor_visible (state);
3698 break; 3818 break;
… …
3711 case 1003: 3831 case 1003:
3712 if (state) 3832 if (state)
3713 { 3833 {
3714 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3834 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3715 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3835 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3836 mouse_row = mouse_col = 0;
3716 vt_emask_mouse = PointerMotionMask; 3837 vt_emask_mouse = PointerMotionMask;
3717 } 3838 }
3718 else 3839 else
3719 vt_emask_mouse = NoEventMask; 3840 vt_emask_mouse = NoEventMask;
3841
3720 vt_select_input (); 3842 vt_select_input ();
3721 break; 3843 break;
3722 case 1010: /* scroll to bottom on TTY output inhibit */ 3844 case 1010: /* scroll to bottom on TTY output inhibit */
3723 set_option (Opt_scrollTtyOutput, !state); 3845 set_option (Opt_scrollTtyOutput, !state);
3724 break; 3846 break;
3725 case 1011: /* scroll to bottom on key press */ 3847 case 1011: /* scroll to bottom on key press */
3726 set_option (Opt_scrollTtyKeypress, state); 3848 set_option (Opt_scrollTtyKeypress, state);
3727 break; 3849 break;
3728 case 1047: /* secondary screen w/ clearing last */ 3850 case 1047: /* secondary screen w/ clearing last */
3729 if (option (Opt_secondaryScreen)) 3851 if (option (Opt_secondaryScreen))
3730 if (current_screen != PRIMARY) 3852 if (!state)
3731 scr_erase_screen (2); 3853 scr_erase_screen (2);
3854
3732 scr_change_screen (state); 3855 scr_change_screen (state);
3733 break; 3856 break;
3734 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
3735 scr_change_screen (state); 3862 scr_change_screen (state);
3863
3736 if (option (Opt_secondaryScreen)) 3864 if (option (Opt_secondaryScreen))
3737 if (current_screen != PRIMARY) 3865 if (state)
3738 scr_erase_screen (2); 3866 scr_erase_screen (2);
3867 else
3868 scr_cursor (RESTORE);
3739 break; 3869 break;
3740 default: 3870 default:
3741 break; 3871 break;
3742 } 3872 }
3743 } 3873 }
3744} 3874}
3745/*}}} */ 3875/*}}} */
3746 3876
3747/*{{{ process sgr sequences */ 3877/*{{{ process sgr sequences */
3748void 3878void ecb_hot
3749rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3879rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3750{ 3880{
3751 unsigned int i; 3881 unsigned int i;
3752 short rendset; 3882 short rendset;
3753 int rendstyle; 3883 int rendstyle;
… …
3894 break; 4024 break;
3895#endif 4025#endif
3896 } 4026 }
3897 } 4027 }
3898} 4028}
3899/*}}} */
3900 4029
3901/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3902void 4030void
3903rxvt_term::process_graphics () 4031rxvt_term::set_cursor_style (int style)
3904{ 4032{
3905 unicode_t ch, cmd = cmd_getc (); 4033 if (!IN_RANGE_INC (style, 0, 4))
3906
3907 if (cmd == 'Q')
3908 {
3909 /* query graphics */
3910 tt_printf ("\033G0\012"); /* no graphics */
3911 return; 4034 return;
3912 } 4035
3913 /* swallow other graphics sequences until terminating ':' */ 4036 set_option (Opt_cursorUnderline, style >= 3);
3914 do 4037
3915 ch = cmd_getc (); 4038#ifdef CURSOR_BLINK
3916 while (ch != ':'); 4039 set_option (Opt_cursorBlink, !style || (style & 1));
4040 cursor_blink_reset ();
4041#endif
4042
4043 want_refresh = 1;
3917} 4044}
3918/*}}} */ 4045/*}}} */
3919 4046
3920/* ------------------------------------------------------------------------- */ 4047/* ------------------------------------------------------------------------- */
3921 4048
… …
3937 4064
3938/* ---------------------------------------------------------------------- */ 4065/* ---------------------------------------------------------------------- */
3939/* 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,
3940 * or generated by us in response to a query ESC sequence. 4067 * or generated by us in response to a query ESC sequence.
3941 */ 4068 */
3942const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4069static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3943 4070
3944void 4071void
3945rxvt_term::tt_write (const char *data, unsigned int len) 4072rxvt_term::tt_write (const char *data, unsigned int len)
3946{ 4073{
3947 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4074 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3952 4079
3953 if (v_buflen == 0) 4080 if (v_buflen == 0)
3954 { 4081 {
3955 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));
3956 4083
4084 max_it (written, 0);
4085
3957 if ((unsigned int)written == len) 4086 if (written == len)
3958 return; 4087 return;
3959 4088
3960 data += written; 4089 data += written;
3961 len -= written; 4090 len -= written;
3962 } 4091 }
3963 4092
3964 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4093 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3965 4094
3966 memcpy (v_buffer + v_buflen, data, len); 4095 memcpy (v_buffer + v_buflen, data, len);
3967 v_buflen += len; 4096 v_buflen += len;
3968 4097
3969 pty_ev.set (ev::READ | ev::WRITE); 4098 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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