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.56 by pcg, Tue Feb 24 00:02:44 2004 UTC vs.
Revision 1.194 by root, Mon Feb 14 10:44:50 2005 UTC

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

Diff Legend

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