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.59 by pcg, Wed Feb 25 15:39:48 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;
699 877
700 if (n > 0 && s < count) 878 if (n > 0 && s < count)
701 { 879 {
702 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 880 memmove (cmdbuf_base, cmdbuf_ptr,
703 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 881 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
704 cmdbuf_ptr = cmdbuf_base; 882 cmdbuf_ptr = cmdbuf_base;
705 cmdbuf_endp -= n; 883 cmdbuf_endp -= n;
706 s += n; 884 s += n;
707 } 885 }
708 886
709 if (count > s) 887 if (count > s)
710 { 888 {
711 rxvt_print_error ("data loss: cmd_write too large"); 889 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
712 count = s; 890 count = s;
713 } 891 }
714 892
715 for (; count--;) 893 for (; count--;)
716 *cmdbuf_endp++ = *str++; 894 *cmdbuf_endp++ = *str++;
717 895
718 cmd_parse (); 896 cmd_parse ();
719 897
720 return 0; 898 return 0;
721} 899}
722#endif /* MENUBAR_MAX */ 900#endif
723 901
724void 902void
725rxvt_term::flush () 903rxvt_term::flush ()
726{ 904{
905 flush_ev.stop ();
906
727#ifdef TRANSPARENT 907#ifdef TRANSPARENT
728 if (want_full_refresh) 908 if (want_full_refresh)
729 { 909 {
730 want_full_refresh = 0; 910 want_full_refresh = 0;
731 scr_clear (); 911 scr_clear ();
732 scr_touch (false); 912 scr_touch (false);
733 want_refresh = 1;
734 } 913 }
735#endif 914#endif
736 915
737 if (want_refresh) 916 if (want_refresh)
738 { 917 {
739 scr_refresh (refresh_type); 918 scr_refresh (refresh_type);
740 scrollbar_show (1); 919 scrollbar_show (1);
741#ifdef USE_XIM 920#ifdef USE_XIM
742 IMSendSpot (); 921 IMSendSpot ();
743#endif 922#endif
744
745 } 923 }
746 924
747 display->flush (); 925 display->flush ();
748} 926}
749 927
… …
751rxvt_term::check_cb (check_watcher &w) 929rxvt_term::check_cb (check_watcher &w)
752{ 930{
753 SET_R (this); 931 SET_R (this);
754 SET_LOCALE (locale); 932 SET_LOCALE (locale);
755 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;
756 flush (); 948 flush ();
757} 949}
758 950
759#ifdef CURSOR_BLINK 951#ifdef CURSOR_BLINK
760void 952void
… …
778 w.start (w.at + TEXT_BLINK_INTERVAL); 970 w.start (w.at + TEXT_BLINK_INTERVAL);
779 } 971 }
780} 972}
781#endif 973#endif
782 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
783bool 1022bool
784rxvt_term::pty_fill () 1023rxvt_term::pty_fill ()
785{ 1024{
786 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 }
787 1032
788 memmove (cmdbuf_base, cmdbuf_ptr, n); 1033 memmove (cmdbuf_base, cmdbuf_ptr, n);
789 cmdbuf_ptr = cmdbuf_base; 1034 cmdbuf_ptr = cmdbuf_base;
790 cmdbuf_endp = cmdbuf_ptr + n; 1035 cmdbuf_endp = cmdbuf_ptr + n;
791 1036
792 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 1037 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
793 1038
794 if (n > 0) 1039 if (n > 0)
795 { 1040 {
796 cmdbuf_endp += n; 1041 cmdbuf_endp += n;
797 return true; 1042 return true;
… …
806rxvt_term::pty_cb (io_watcher &w, short revents) 1051rxvt_term::pty_cb (io_watcher &w, short revents)
807{ 1052{
808 SET_R (this); 1053 SET_R (this);
809 SET_LOCALE (locale); 1054 SET_LOCALE (locale);
810 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
811 if (revents & EVENT_WRITE) 1062 if (revents & EVENT_WRITE)
812 tt_write (0, 0); 1063 pty_write ();
813 else if (revents & EVENT_READ)
814 {
815 bool flag = true;
816
817 // loop, but don't allow a single term to monopolize us
818 // the number of loops is fully arbitrary, and thus wrong
819 while (flag && pty_fill ())
820 {
821 if (!seen_input)
822 {
823 seen_input = 1;
824 /* once we know the shell is running, send the screen size. Again! */
825 tt_winch ();
826 }
827
828 if (cmd_parse ())
829 break;
830 }
831 }
832} 1064}
833 1065
834bool 1066void
835rxvt_term::cmd_parse () 1067rxvt_term::pointer_unblank ()
836{ 1068{
837 bool flag = false; 1069 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
838 uint32_t ch = NOCHAR; 1070 recolour_cursor ();
839 1071
840 for (;;) 1072#ifdef POINTER_BLANK
841 { 1073 hidden_pointer = 0;
842 if (ch == NOCHAR)
843 ch = next_char ();
844 1074
845 if (ch == NOCHAR) // TODO: improve 1075 if (options & Opt_pointerBlank)
846 break; 1076 pointer_ev.start (NOW + pointerBlankDelay);
847 1077#endif
848 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
849 {
850 /* Read a text string from the input buffer */
851 uint32_t buf[BUFSIZ];
852 bool refreshnow = false;
853 int nlines = 0;
854 uint32_t *str = buf;
855
856 *str++ = ch;
857
858 for (;;)
859 {
860 ch = next_char ();
861
862 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
863 break;
864 else
865 {
866 *str++ = ch;
867
868 if (ch == '\n')
869 {
870 nlines++;
871 refresh_count++;
872
873 if (! (Options & Opt_jumpScroll)
874 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
875 {
876 refreshnow = true;
877 flag = false;
878 ch = NOCHAR;
879 break;
880 }
881
882 // scr_add_lines only works for nlines < TermWin.nrow - 1.
883 if (nlines >= TermWin.nrow - 1)
884 {
885 scr_add_lines (buf, nlines, str - buf);
886 nlines = 0;
887 str = buf;
888 }
889 }
890
891 if (str >= buf + BUFSIZ)
892 {
893 ch = NOCHAR;
894 break;
895 }
896 }
897 }
898
899 scr_add_lines (buf, nlines, str - buf);
900
901 /*
902 * If there have been a lot of new lines, then update the screen
903 * What the heck I'll cheat and only refresh less than every page-full.
904 * the number of pages between refreshes is refresh_limit, which
905 * is incremented here because we must be doing flat-out scrolling.
906 *
907 * refreshing should be correct for small scrolls, because of the
908 * time-out
909 */
910 if (refreshnow)
911 {
912 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
913 refresh_limit++;
914
915 scr_refresh (refresh_type);
916 }
917
918 }
919 else
920 {
921 switch (ch)
922 {
923 default:
924 process_nonprinting (ch);
925 break;
926 case C0_ESC: /* escape char */
927 process_escape_seq ();
928 break;
929 /*case 0x9b: */ /* CSI */
930 /* process_csi_seq (); */
931 }
932
933 ch = NOCHAR;
934 }
935 }
936
937 return flag;
938}
939
940// read the next character, currently handles UTF-8
941// will probably handle all sorts of other stuff in the future
942uint32_t
943rxvt_term::next_char ()
944{
945 while (cmdbuf_ptr < cmdbuf_endp)
946 {
947 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
948 return *cmdbuf_ptr++;
949
950 wchar_t wc;
951 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
952
953 if (len == (size_t)-2)
954 return NOCHAR;
955
956 if (len == (size_t)-1)
957 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
958
959 // assume wchar == unicode
960 cmdbuf_ptr += len;
961 return wc;
962 }
963
964 return NOCHAR;
965}
966
967/* rxvt_cmd_getc () - Return next input character */
968/*
969 * Return the next input character after first passing any keyboard input
970 * to the command.
971 */
972uint32_t
973rxvt_term::cmd_getc ()
974{
975 for (;;)
976 {
977 uint32_t c = next_char ();
978 if (c != NOCHAR)
979 return c;
980
981 // incomplete sequences should occur rarely, still, a better solution
982 // would be preferred. either setjmp/longjmp or better design.
983 fcntl (cmd_fd, F_SETFL, 0);
984 pty_fill ();
985 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
986 }
987} 1078}
988 1079
989#ifdef POINTER_BLANK 1080#ifdef POINTER_BLANK
990void 1081void
991rxvt_term::pointer_unblank ()
992{
993 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
994 recolour_cursor ();
995
996 hidden_pointer = 0;
997
998 if (Options & Opt_pointerBlank)
999 pointer_ev.start (NOW + pointerBlankDelay);
1000}
1001
1002void
1003rxvt_term::pointer_blank () 1082rxvt_term::pointer_blank ()
1004{ 1083{
1005 if (! (Options & Opt_pointerBlank)) 1084 if (! (options & Opt_pointerBlank))
1006 return; 1085 return;
1007 1086
1008 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1087 XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
1009 XFlush (display->display); 1088 XFlush (display->display);
1010 1089
1011 hidden_pointer = 1; 1090 hidden_pointer = 1;
1012} 1091}
1013 1092
… …
1030 x = ev.x; 1109 x = ev.x;
1031 y = ev.y; 1110 y = ev.y;
1032 pixel_position (&x, &y); 1111 pixel_position (&x, &y);
1033 1112
1034 if (MEvent.button == AnyButton) 1113 if (MEvent.button == AnyButton)
1035 {
1036 button_number = 3; 1114 button_number = 3;
1037 }
1038 else 1115 else
1039 { 1116 {
1040 button_number = MEvent.button - Button1; 1117 button_number = MEvent.button - Button1;
1041 /* add 0x3D for wheel events, like xterm does */ 1118 /* add 0x3D for wheel events, like xterm does */
1042 if (button_number >= 3) 1119 if (button_number >= 3)
1043 button_number += (64 - 3); 1120 button_number += (64 - 3);
1044 } 1121 }
1045 1122
1046 if (PrivateModes & PrivMode_MouseX10) 1123 if (priv_modes & PrivMode_MouseX10)
1047 { 1124 {
1048 /* 1125 /*
1049 * do not report ButtonRelease 1126 * do not report ButtonRelease
1050 * no state info allowed 1127 * no state info allowed
1051 */ 1128 */
… …
1066 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1143 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1067 + ((MEvent.state & ControlMask) ? 16 : 0); 1144 + ((MEvent.state & ControlMask) ? 16 : 0);
1068#ifdef MOUSE_REPORT_DOUBLECLICK 1145#ifdef MOUSE_REPORT_DOUBLECLICK
1069 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1146 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1070#endif 1147#endif
1071
1072 } 1148 }
1073 1149
1074#ifdef DEBUG_MOUSEREPORT 1150#if DEBUG_MOUSEREPORT
1075 fprintf (stderr, "Mouse ["); 1151 fprintf (stderr, "Mouse [");
1076 if (key_state & 16) 1152 if (key_state & 16)
1077 fputc ('C', stderr); 1153 fputc ('C', stderr);
1078 if (key_state & 4) 1154 if (key_state & 4)
1079 fputc ('S', stderr); 1155 fputc ('S', stderr);
… …
1083 fputc ('2', stderr); 1159 fputc ('2', stderr);
1084 fprintf (stderr, "]: <%d>, %d/%d\n", 1160 fprintf (stderr, "]: <%d>, %d/%d\n",
1085 button_number, 1161 button_number,
1086 x + 1, 1162 x + 1,
1087 y + 1); 1163 y + 1);
1088#else 1164#endif
1165
1089 tt_printf ("\033[M%c%c%c", 1166 tt_printf ("\033[M%c%c%c",
1090 (32 + button_number + key_state), 1167 (32 + button_number + key_state),
1091 (32 + x + 1), 1168 (32 + x + 1),
1092 (32 + y + 1)); 1169 (32 + y + 1));
1093#endif
1094} 1170}
1095 1171
1096#ifdef USING_W11LIB 1172#ifdef USING_W11LIB
1097void 1173void
1098rxvt_W11_process_x_event (XEvent *ev) 1174rxvt_W11_process_x_event (XEvent *ev)
… …
1105 1181
1106/*{{{ process an X event */ 1182/*{{{ process an X event */
1107void 1183void
1108rxvt_term::x_cb (XEvent &ev) 1184rxvt_term::x_cb (XEvent &ev)
1109{ 1185{
1186 dDisp;
1187
1110 SET_R (this); 1188 SET_R (this);
1111 SET_LOCALE (locale); 1189 SET_LOCALE (locale);
1112 1190
1113#if defined(CURSOR_BLINK) 1191#if defined(CURSOR_BLINK)
1114 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1192 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1115 { 1193 {
1116 if (hidden_cursor) 1194 if (hidden_cursor)
1117 { 1195 {
1118 hidden_cursor = 0; 1196 hidden_cursor = 0;
1119 want_refresh = 1; 1197 want_refresh = 1;
… …
1122 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1200 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1123 } 1201 }
1124#endif 1202#endif
1125 1203
1126#if defined(POINTER_BLANK) 1204#if defined(POINTER_BLANK)
1127 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1205 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1128 { 1206 {
1129 if (ev.type == MotionNotify 1207 if (ev.type == MotionNotify
1130 || ev.type == ButtonPress 1208 || ev.type == ButtonPress
1131 || ev.type == ButtonRelease) 1209 || ev.type == ButtonRelease)
1132 if (hidden_pointer) 1210 if (hidden_pointer)
… …
1135 if (ev.type == KeyPress && hidden_pointer == 0) 1213 if (ev.type == KeyPress && hidden_pointer == 0)
1136 pointer_blank (); 1214 pointer_blank ();
1137 } 1215 }
1138#endif 1216#endif
1139 1217
1140#ifdef USE_XIM
1141 if (XFilterEvent (&ev, None))
1142 return;
1143#endif
1144
1145 Window unused_root, unused_child; 1218 Window unused_root, unused_child;
1146 int unused_root_x, unused_root_y; 1219 int unused_root_x, unused_root_y;
1147 unsigned int unused_mask; 1220 unsigned int unused_mask;
1148
1149#ifdef DEBUG_X
1150 const char *const eventnames[] =
1151 { /* mason - this matches my system */
1152 "",
1153 "",
1154 "KeyPress",
1155 "KeyRelease",
1156 "ButtonPress",
1157 "ButtonRelease",
1158 "MotionNotify",
1159 "EnterNotify",
1160 "LeaveNotify",
1161 "FocusIn",
1162 "FocusOut",
1163 "KeymapNotify",
1164 "Expose",
1165 "GraphicsExpose",
1166 "NoExpose",
1167 "VisibilityNotify",
1168 "CreateNotify",
1169 "DestroyNotify",
1170 "UnmapNotify",
1171 "MapNotify",
1172 "MapRequest",
1173 "ReparentNotify",
1174 "ConfigureNotify",
1175 "ConfigureRequest",
1176 "GravityNotify",
1177 "ResizeRequest",
1178 "CirculateNotify",
1179 "CirculateRequest",
1180 "PropertyNotify",
1181 "SelectionClear",
1182 "SelectionRequest",
1183 "SelectionNotify",
1184 "ColormapNotify",
1185 "ClientMessage",
1186 "MappingNotify"
1187 };
1188#endif
1189
1190#ifdef DEBUG_X
1191 struct timeval tp;
1192 struct tm *ltt;
1193 (void)gettimeofday (&tp, NULL);
1194 ltt = localtime (& (tp.tv_sec));
1195 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));
1196#endif
1197 1221
1198 switch (ev.type) 1222 switch (ev.type)
1199 { 1223 {
1200 case KeyPress: 1224 case KeyPress:
1225#if ISO_14755
1226 if (!(iso14755buf & ISO_14755_52))
1227#endif
1201 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;
1202 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
1203 1293
1204#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1294#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1205 case KeyRelease:
1206 {
1207 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)
1208 mouse_slip_wheel_speed = 0; 1298 mouse_slip_wheel_speed = 0;
1209 else 1299#endif
1210 {
1211 KeySym ks;
1212
1213 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1214 if (ks == XK_Control_L || ks == XK_Control_R)
1215 mouse_slip_wheel_speed = 0;
1216 }
1217 break; 1300 break;
1218 } 1301 }
1219#endif
1220 1302
1221 case ButtonPress: 1303 case ButtonPress:
1222 button_press (ev.xbutton); 1304 button_press (ev.xbutton);
1223 break; 1305 break;
1224 1306
… …
1236 && (ev.xclient.data.l[0] == DndFile 1318 && (ev.xclient.data.l[0] == DndFile
1237 || ev.xclient.data.l[0] == DndDir 1319 || ev.xclient.data.l[0] == DndDir
1238 || ev.xclient.data.l[0] == DndLink)) 1320 || ev.xclient.data.l[0] == DndLink))
1239 { 1321 {
1240 /* Get Dnd data */ 1322 /* Get Dnd data */
1241 Atom ActualType; 1323 Atom ActualType;
1242 int ActualFormat; 1324 int ActualFormat;
1243 unsigned char *data; 1325 unsigned char *data;
1244 unsigned long Size, RemainingBytes; 1326 unsigned long Size, RemainingBytes;
1245 1327
1246 XGetWindowProperty (display->display, display->root, 1328 XGetWindowProperty (disp, display->root,
1247 xa[XA_DNDSELECTION], 1329 xa[XA_DNDSELECTION],
1248 0L, 1000000L, 1330 0L, 1000000L,
1249 False, AnyPropertyType, 1331 False, AnyPropertyType,
1250 &ActualType, &ActualFormat, 1332 &ActualType, &ActualFormat,
1251 &Size, &RemainingBytes, 1333 &Size, &RemainingBytes,
1252 &data); 1334 &data);
1253 XChangeProperty (display->display, display->root, 1335 set_string_property (XA_CUT_BUFFER0, data);
1254 XA_CUT_BUFFER0, XA_STRING, 1336 XFree (data);
1255 8, PropModeReplace,
1256 data, STRLEN (data));
1257 selection_paste (display->root, XA_CUT_BUFFER0, True); 1337 selection_paste (display->root, XA_CUT_BUFFER0, true);
1258 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1338 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1259 } 1339 }
1260#endif /* OFFIX_DND */ 1340#endif /* OFFIX_DND */
1261 break; 1341 break;
1262 1342
1263 case MappingNotify: 1343 case MappingNotify:
1264 XRefreshKeyboardMapping (& (ev.xmapping)); 1344 XRefreshKeyboardMapping (&ev.xmapping);
1265 break; 1345 break;
1266 1346
1267 /* 1347 /*
1268 * XXX: this is not the _current_ arrangement 1348 * XXX: this is not the _current_ arrangement
1269 * Here's my conclusion: 1349 * Here's my conclusion:
… …
1294 { 1374 {
1295 TermWin.focus = 1; 1375 TermWin.focus = 1;
1296 want_refresh = 1; 1376 want_refresh = 1;
1297#ifdef USE_XIM 1377#ifdef USE_XIM
1298 if (Input_Context != NULL) 1378 if (Input_Context != NULL)
1379 {
1380 IMSetStatusPosition ();
1299 XSetICFocus (Input_Context); 1381 XSetICFocus (Input_Context);
1382 }
1300#endif 1383#endif
1301#ifdef CURSOR_BLINK 1384#ifdef CURSOR_BLINK
1302 if (Options & Opt_cursorBlink) 1385 if (options & Opt_cursorBlink)
1303 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 }
1304#endif 1394#endif
1305 1395
1306 } 1396 }
1307 break; 1397 break;
1308 1398
1309 case FocusOut: 1399 case FocusOut:
1310 if (TermWin.focus) 1400 if (TermWin.focus)
1311 { 1401 {
1312 TermWin.focus = 0; 1402 TermWin.focus = 0;
1313 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
1314#ifdef USE_XIM 1411#ifdef USE_XIM
1315 if (Input_Context != NULL) 1412 if (Input_Context != NULL)
1316 XUnsetICFocus (Input_Context); 1413 XUnsetICFocus (Input_Context);
1317#endif 1414#endif
1318#ifdef CURSOR_BLINK 1415#ifdef CURSOR_BLINK
1319 if (Options & Opt_cursorBlink) 1416 if (options & Opt_cursorBlink)
1320 cursor_blink_ev.stop (); 1417 cursor_blink_ev.stop ();
1321 hidden_cursor = 0; 1418 hidden_cursor = 0;
1322#endif 1419#endif
1323 1420#ifdef OFF_FOCUS_FADING
1421 if (rs[Rs_fade])
1422 {
1423 pix_colors = pix_colors_unfocused;
1424 scr_recolour ();
1425 }
1426#endif
1324 } 1427 }
1325 break; 1428 break;
1326 1429
1327 case ConfigureNotify: 1430 case ConfigureNotify:
1328 if (ev.xconfigure.window == TermWin.parent[0]) 1431 if (ev.xconfigure.window == TermWin.parent[0])
… …
1333 { /* Wrap lots of configures into one */ 1436 { /* Wrap lots of configures into one */
1334 width = ev.xconfigure.width; 1437 width = ev.xconfigure.width;
1335 height = ev.xconfigure.height; 1438 height = ev.xconfigure.height;
1336 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1439 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1337 } 1440 }
1338 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1441 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1339 1442
1340 if (szHint.width != width || szHint.height != height) 1443 if (szHint.width != width || szHint.height != height)
1341 { 1444 {
1342 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1445 seen_resize = 1;
1343 resize_all_windows (width, height, 1); 1446 resize_all_windows (width, height, 1);
1344 } 1447 }
1345#ifdef DEBUG_SIZE 1448
1346 else
1347 {
1348 D_SIZE ((stderr, "Size: Not resizing"));
1349 }
1350#endif
1351#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1449#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1352 if (Options & Opt_transparent) 1450 if (options & Opt_transparent)
1353 {
1354 check_our_parents (); 1451 check_our_parents ();
1355 if (am_transparent)
1356 want_full_refresh = 1;
1357 }
1358#endif 1452#endif
1359
1360 } 1453 }
1361 break; 1454 break;
1362 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
1363 case SelectionClear: 1463 case SelectionClear:
1364 display->set_selection_owner (0); 1464 selection_clear ();
1365 break; 1465 break;
1366 1466
1367 case SelectionNotify: 1467 case SelectionNotify:
1368 if (selection_wait == Sel_normal) 1468 if (selection_wait == Sel_normal)
1369 selection_paste (ev.xselection.requestor, 1469 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1370 ev.xselection.property, True);
1371 break; 1470 break;
1372 1471
1373 case SelectionRequest: 1472 case SelectionRequest:
1374 selection_send (ev.xselectionrequest); 1473 selection_send (ev.xselectionrequest);
1375 break; 1474 break;
… …
1396 1495
1397 case GraphicsExpose: 1496 case GraphicsExpose:
1398 case Expose: 1497 case Expose:
1399 if (ev.xany.window == TermWin.vt) 1498 if (ev.xany.window == TermWin.vt)
1400 { 1499 {
1401#ifdef NO_SLOW_LINK_SUPPORT 1500 do
1402 scr_expose (ev.xexpose.x, ev.xexpose.y, 1501 scr_expose (ev.xexpose.x, ev.xexpose.y,
1403 ev.xexpose.width, ev.xexpose.height, False); 1502 ev.xexpose.width, ev.xexpose.height, False);
1404#else 1503 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1405 // 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))
1406 scr_expose (ev.xexpose.x, ev.xexpose.y, 1508 scr_expose (ev.xexpose.x, ev.xexpose.y,
1407 ev.xexpose.width, ev.xexpose.height, False); 1509 ev.xexpose.width, ev.xexpose.height, False);
1408 //scr_expose (ev.xexpose.x, 0, 1510
1409 // ev.xexpose.width, TermWin.height, False); 1511 scr_refresh (refresh_type);
1410#endif
1411 want_refresh = 1;
1412 } 1512 }
1413 else 1513 else
1414 { 1514 {
1415 XEvent unused_event; 1515 XEvent unused_event;
1416 1516
1417 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1517 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1418 Expose, 1518 ;
1419 &unused_event)) ; 1519 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1420 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1520 ;
1421 GraphicsExpose, 1521
1422 &unused_event)) ;
1423 if (isScrollbarWindow (ev.xany.window)) 1522 if (isScrollbarWindow (ev.xany.window))
1424 { 1523 {
1425 scrollBar.setIdle (); 1524 scrollBar.setIdle ();
1426 scrollbar_show (0); 1525 scrollbar_show (0);
1427 } 1526 }
1428#ifdef MENUBAR 1527#ifdef MENUBAR
1429 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1528 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1430 menubar_expose (); 1529 menubar_expose ();
1431#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
1432 } 1536 }
1433 break; 1537 break;
1434 1538
1435 case MotionNotify: 1539 case MotionNotify:
1436#ifdef POINTER_BLANK 1540#ifdef POINTER_BLANK
… …
1442 { 1546 {
1443 menubar_control (ev.xbutton); 1547 menubar_control (ev.xbutton);
1444 break; 1548 break;
1445 } 1549 }
1446#endif 1550#endif
1447 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1551 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1448 break; 1552 break;
1449 1553
1450 if (ev.xany.window == TermWin.vt) 1554 if (ev.xany.window == TermWin.vt)
1451 { 1555 {
1452 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1556 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1453 { 1557 {
1454 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1558 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1455 ; 1559 ;
1456 1560
1457 XQueryPointer (display->display, TermWin.vt, 1561 XQueryPointer (disp, TermWin.vt,
1458 &unused_root, &unused_child, 1562 &unused_root, &unused_child,
1459 &unused_root_x, &unused_root_y, 1563 &unused_root_x, &unused_root_y,
1460 & (ev.xbutton.x), & (ev.xbutton.y), 1564 &ev.xbutton.x, &ev.xbutton.y,
1461 &unused_mask); 1565 &ev.xbutton.state);
1462#ifdef MOUSE_THRESHOLD 1566#ifdef MOUSE_THRESHOLD
1463 /* deal with a `jumpy' mouse */ 1567 /* deal with a `jumpy' mouse */
1464 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1568 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1465 { 1569 {
1466#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
1467 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1579 selection_extend (ev.xbutton.x, ev.xbutton.y,
1468 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1580 ev.xbutton.state & Button3Mask ? 2 : 0);
1581
1469#ifdef SELECTION_SCROLLING 1582#ifdef SELECTION_SCROLLING
1470 if (ev.xbutton.y < TermWin.int_bwidth 1583 if (ev.xbutton.y < TermWin.int_bwidth
1471 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1584 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1472 { 1585 {
1473 int dist; 1586 int dist;
1474 1587
1475 pending_scroll_selection=1;
1476
1477 /* don't clobber the current delay if we are 1588 /* don't clobber the current delay if we are
1478 * already in the middle of scrolling. 1589 * already in the middle of scrolling.
1479 */ 1590 */
1480 if (scroll_selection_delay<=0) 1591 if (!sel_scroll_ev.active)
1481 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1592 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1482 1593
1483 /* save the event params so we can highlight 1594 /* save the event params so we can highlight
1484 * the selection in the pending-scroll loop 1595 * the selection in the pending-scroll loop
1485 */ 1596 */
1486 selection_save_x=ev.xbutton.x; 1597 selection_save_x = ev.xbutton.x;
1487 selection_save_y=ev.xbutton.y; 1598 selection_save_y = ev.xbutton.y;
1488 selection_save_state=
1489 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1599 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1490 1600
1491 /* calc number of lines to scroll */ 1601 /* calc number of lines to scroll */
1492 if (ev.xbutton.y<TermWin.int_bwidth) 1602 if (ev.xbutton.y < TermWin.int_bwidth)
1493 { 1603 {
1494 scroll_selection_dir = UP; 1604 scroll_selection_dir = UP;
1495 dist = TermWin.int_bwidth - ev.xbutton.y; 1605 dist = TermWin.int_bwidth - ev.xbutton.y;
1496 } 1606 }
1497 else 1607 else
1498 { 1608 {
1499 scroll_selection_dir = DN; 1609 scroll_selection_dir = DN;
1500 dist = ev.xbutton.y -
1501 (TermWin.int_bwidth + TermWin.height); 1610 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1502 } 1611 }
1612
1503 scroll_selection_lines= (Pixel2Height (dist)/ 1613 scroll_selection_lines = Pixel2Height (dist)
1504 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1614 / SELECTION_SCROLL_LINE_SPEEDUP
1615 + 1;
1505 MIN_IT (scroll_selection_lines, 1616 MIN_IT (scroll_selection_lines,
1506 SELECTION_SCROLL_MAX_LINES); 1617 SELECTION_SCROLL_MAX_LINES);
1507 } 1618 }
1508 else 1619 else
1509 { 1620 {
1510 /* we are within the text window, so we 1621 /* we are within the text window, so we
1511 * shouldn't be scrolling 1622 * shouldn't be scrolling
1512 */ 1623 */
1513 pending_scroll_selection = 0; 1624 if (sel_scroll_ev.active)
1625 sel_scroll_ev.stop();
1514 } 1626 }
1515#endif 1627#endif
1516#ifdef MOUSE_THRESHOLD 1628#ifdef MOUSE_THRESHOLD
1517
1518 } 1629 }
1519#endif 1630#endif
1520
1521 } 1631 }
1522 } 1632 }
1523 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1633 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1524 { 1634 {
1525 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1635 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1526 MotionNotify, &ev)) ; 1636 MotionNotify, &ev))
1637 ;
1638
1527 XQueryPointer (display->display, scrollBar.win, 1639 XQueryPointer (disp, scrollBar.win,
1528 &unused_root, &unused_child, 1640 &unused_root, &unused_child,
1529 &unused_root_x, &unused_root_y, 1641 &unused_root_x, &unused_root_y,
1530 & (ev.xbutton.x), & (ev.xbutton.y), 1642 &ev.xbutton.x, &ev.xbutton.y,
1531 &unused_mask); 1643 &unused_mask);
1532 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1644 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1533 scrollbar_size ()); 1645 scrollbar_size ());
1534 scr_refresh (refresh_type); 1646 scr_refresh (refresh_type);
1535 refresh_limit = 0; 1647 refresh_limit = 0;
… …
1537 } 1649 }
1538 break; 1650 break;
1539 } 1651 }
1540} 1652}
1541 1653
1654#if TRANSPARENT
1542void 1655void
1543rxvt_term::rootwin_cb (XEvent &ev) 1656rxvt_term::rootwin_cb (XEvent &ev)
1544{ 1657{
1545 SET_R (this); 1658 SET_R (this);
1546 SET_LOCALE (locale); 1659 SET_LOCALE (locale);
1547 1660
1548 switch (ev.type) 1661 switch (ev.type)
1549 { 1662 {
1550 case PropertyNotify: 1663 case PropertyNotify:
1551 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1552 {
1553 if (ev.xproperty.state == PropertyNewValue)
1554 selection_property (ev.xproperty.window, ev.xproperty.atom);
1555 break;
1556 }
1557#ifdef TRANSPARENT
1558 else
1559 {
1560 /* 1664 /*
1561 * 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,
1562 * 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.
1563 */ 1667 */
1564 if (xa[XA_XROOTPMAPID] == 0)
1565 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1566
1567 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])
1568 return; 1670 return;
1569 }
1570 1671
1571 /* FALLTHROUGH */ 1672 /* FALLTHROUGH */
1572 case ReparentNotify: 1673 case ReparentNotify:
1573 if ((Options & Opt_transparent) && check_our_parents ()) 1674 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1574 if (am_transparent)
1575 want_full_refresh = 1; 1675 want_refresh = want_full_refresh = 1;
1576 break; 1676 break;
1577#endif
1578 } 1677 }
1579} 1678}
1679#endif
1580 1680
1581void 1681void
1582rxvt_term::button_press (XButtonEvent &ev) 1682rxvt_term::button_press (XButtonEvent &ev)
1583{ 1683{
1584 int reportmode = 0, clickintime; 1684 int reportmode = 0, clickintime;
1585 1685
1586 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1686 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1587 if (!bypass_keystate) 1687 if (!bypass_keystate)
1588 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1688 reportmode = !! (priv_modes & PrivMode_mouse_report);
1689
1589 /* 1690 /*
1590 * VT window processing of button press 1691 * VT window processing of button press
1591 */ 1692 */
1592 if (ev.window == TermWin.vt) 1693 if (ev.window == TermWin.vt)
1593 { 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
1594 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1704 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1705
1595 if (reportmode) 1706 if (reportmode)
1596 { 1707 {
1597 /* mouse report from vt window */ 1708 /* mouse report from vt window */
1598 /* save the xbutton state (for ButtonRelease) */ 1709 /* save the xbutton state (for ButtonRelease) */
1599 MEvent.state = ev.state; 1710 MEvent.state = ev.state;
… …
1628 } 1739 }
1629 else 1740 else
1630 { 1741 {
1631 if (ev.button != MEvent.button) 1742 if (ev.button != MEvent.button)
1632 MEvent.clicks = 0; 1743 MEvent.clicks = 0;
1744
1633 switch (ev.button) 1745 switch (ev.button)
1634 { 1746 {
1635 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
1636 /* allow shift+left click to extend selection */ 1756 /* allow shift+left click to extend selection */
1637 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1757 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1638 { 1758 {
1639 if (MEvent.button == Button1 && clickintime) 1759 if (MEvent.button == Button1 && clickintime)
1640 selection_rotate (ev.x, ev.y); 1760 selection_rotate (ev.x, ev.y);
1641 else 1761 else
1642 selection_extend (ev.x, ev.y, 1); 1762 selection_extend (ev.x, ev.y, 1);
… …
1657 case Button3: 1777 case Button3:
1658 if (MEvent.button == Button3 && clickintime) 1778 if (MEvent.button == Button3 && clickintime)
1659 selection_rotate (ev.x, ev.y); 1779 selection_rotate (ev.x, ev.y);
1660 else 1780 else
1661 selection_extend (ev.x, ev.y, 1); 1781 selection_extend (ev.x, ev.y, 1);
1782
1662 MEvent.button = Button3; 1783 MEvent.button = Button3;
1663 break; 1784 break;
1664 } 1785 }
1665 } 1786 }
1787
1666 MEvent.time = ev.time; 1788 MEvent.time = ev.time;
1667 return; 1789 return;
1668 } 1790 }
1669 1791
1670 /* 1792 /*
… …
1736 upordown = 1; /* down */ 1858 upordown = 1; /* down */
1737 } 1859 }
1738 if (upordown) 1860 if (upordown)
1739 { 1861 {
1740#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1862#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1741 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1863 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1742#endif 1864#endif
1743 if (scr_page (upordown < 0 ? UP : DN, 1)) 1865 if (scr_page (upordown < 0 ? UP : DN, 1))
1744 { 1866 {
1745 if (upordown < 0) 1867 if (upordown < 0)
1746 scrollBar.setUp (); 1868 scrollBar.setUp ();
… …
1762 break; 1884 break;
1763 case R_SB_ALIGN_BOTTOM: 1885 case R_SB_ALIGN_BOTTOM:
1764 csrO = scrollBar.bot - scrollBar.top; 1886 csrO = scrollBar.bot - scrollBar.top;
1765 break; 1887 break;
1766 } 1888 }
1889
1767 if (scrollBar.style == R_SB_XTERM 1890 if (scrollBar.style == R_SB_XTERM
1768 || scrollbar_above_slider (ev.y) 1891 || scrollbar_above_slider (ev.y)
1769 || scrollbar_below_slider (ev.y)) 1892 || scrollbar_below_slider (ev.y))
1770 scr_move_to ( scrollbar_position (ev.y) - csrO, 1893 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1771 scrollbar_size ()); 1894
1772 scrollBar.setMotion (); 1895 scrollBar.setMotion ();
1773 break; 1896 break;
1774 1897
1775 case Button1: 1898 case Button1:
1776 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1899 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1800 scr_page ((ev.button == Button1 ? DN : UP), 1923 scr_page ((ev.button == Button1 ? DN : UP),
1801 (TermWin.nrow 1924 (TermWin.nrow
1802 * scrollbar_position (ev.y) 1925 * scrollbar_position (ev.y)
1803 / scrollbar_size ())); 1926 / scrollbar_size ()));
1804 } 1927 }
1928
1805 break; 1929 break;
1806 } 1930 }
1807 } 1931 }
1808 return; 1932 return;
1809 } 1933 }
… …
1821{ 1945{
1822 int reportmode = 0; 1946 int reportmode = 0;
1823 1947
1824 csrO = 0; /* reset csr Offset */ 1948 csrO = 0; /* reset csr Offset */
1825 if (!bypass_keystate) 1949 if (!bypass_keystate)
1826 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1950 reportmode = !! (priv_modes & PrivMode_mouse_report);
1827 1951
1828 if (scrollbar_isUpDn ()) 1952 if (scrollbar_isUpDn ())
1829 { 1953 {
1830 scrollBar.setIdle (); 1954 scrollBar.setIdle ();
1831 scrollbar_show (0); 1955 scrollbar_show (0);
1832#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1956#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1833 refresh_type &= ~SMOOTH_REFRESH; 1957 refresh_type &= ~SMOOTH_REFRESH;
1834#endif 1958#endif
1835
1836 } 1959 }
1960
1837#ifdef SELECTION_SCROLLING 1961#ifdef SELECTION_SCROLLING
1838 pending_scroll_selection=0; 1962 if (sel_scroll_ev.active)
1963 sel_scroll_ev.stop();
1839#endif 1964#endif
1965
1840 if (ev.window == TermWin.vt) 1966 if (ev.window == TermWin.vt)
1841 { 1967 {
1968#if ISO_14755
1969 // 5.4
1970 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1971 return;
1972#endif
1842 if (reportmode) 1973 if (reportmode)
1843 { 1974 {
1844 /* mouse report from vt window */ 1975 /* mouse report from vt window */
1845 /* don't report release of wheel "buttons" */ 1976 /* don't report release of wheel "buttons" */
1846 if (ev.button >= 4) 1977 if (ev.button >= 4)
… …
1860 MEvent.button = AnyButton; 1991 MEvent.button = AnyButton;
1861 mouse_report (ev); 1992 mouse_report (ev);
1862#endif /* MOUSE_REPORT_DOUBLECLICK */ 1993#endif /* MOUSE_REPORT_DOUBLECLICK */
1863 return; 1994 return;
1864 } 1995 }
1996
1865 /* 1997 /*
1866 * dumb hack to compensate for the failure of click-and-drag 1998 * dumb hack to compensate for the failure of click-and-drag
1867 * when overriding mouse reporting 1999 * when overriding mouse reporting
1868 */ 2000 */
1869 if (PrivateModes & PrivMode_mouse_report 2001 if (priv_modes & PrivMode_mouse_report
1870 && bypass_keystate 2002 && bypass_keystate
1871 && ev.button == Button1 && MEvent.clicks <= 1) 2003 && ev.button == Button1 && MEvent.clicks <= 1)
1872 selection_extend (ev.x, ev.y, 0); 2004 selection_extend (ev.x, ev.y, 0);
1873 2005
1874 switch (ev.button) 2006 switch (ev.button)
… …
1885 case Button5: 2017 case Button5:
1886 { 2018 {
1887 int i; 2019 int i;
1888 page_dirn v; 2020 page_dirn v;
1889 2021
1890 v = (ev.button == Button4) ? UP : DN; 2022 v = ev.button == Button4 ? UP : DN;
2023
1891 if (ev.state & ShiftMask) 2024 if (ev.state & ShiftMask)
1892 i = 1; 2025 i = 1;
1893 else if ((Options & Opt_mouseWheelScrollPage)) 2026 else if (options & Opt_mouseWheelScrollPage)
1894 i = TermWin.nrow - 1; 2027 i = TermWin.nrow - 1;
1895 else 2028 else
1896 i = 5; 2029 i = 5;
2030
1897# ifdef MOUSE_SLIP_WHEELING 2031# ifdef MOUSE_SLIP_WHEELING
1898 if (ev.state & ControlMask) 2032 if (ev.state & ControlMask)
1899 { 2033 {
1900 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)
1901 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2039 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2040
2041 slip_wheel_ev.start ();
1902 } 2042 }
2043 else
2044 {
1903# endif 2045# endif
1904# ifdef JUMP_MOUSE_WHEEL 2046# ifdef JUMP_MOUSE_WHEEL
1905 scr_page (v, i);
1906 scr_refresh (SMOOTH_REFRESH);
1907 scrollbar_show (1);
1908# else
1909 while (i--)
1910 {
1911 scr_page (v, 1); 2047 scr_page (v, i);
1912 scr_refresh (SMOOTH_REFRESH); 2048 scr_refresh (SMOOTH_REFRESH);
1913 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
1914 } 2059 }
1915# endif 2060#endif
1916
1917 } 2061 }
1918 break; 2062 break;
1919#endif 2063#endif
1920
1921 } 2064 }
1922 } 2065 }
1923#ifdef MENUBAR 2066#ifdef MENUBAR
1924 else if (isMenuBarWindow (ev.window)) 2067 else if (isMenuBarWindow (ev.window))
1925 menubar_control (ev); 2068 menubar_control (ev);
1926#endif 2069#endif
1927} 2070}
1928 2071
1929
1930#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
1931/* 2304/*
1932 * Check our parents are still who we think they are. 2305 * Check our parents are still who we think they are.
1933 * Do transparency updates if required 2306 * Do transparency updates if required
1934 */ 2307 */
1935int 2308int
1936rxvt_term::check_our_parents () 2309rxvt_term::check_our_parents ()
1937{ 2310{
1938 int i, pchanged, aformat, have_pixmap, rootdepth; 2311 int i, pchanged, aformat, have_pixmap, rootdepth;
1939 unsigned long nitems, bytes_after; 2312 unsigned long nitems, bytes_after;
1940 Atom atype; 2313 Atom atype;
1941 unsigned char *prop = NULL; 2314 unsigned char *prop = NULL;
1942 Window root, oldp, *list; 2315 Window root, oldp, *list;
1943 Pixmap rootpixmap = None; 2316 Pixmap rootpixmap = None;
1944 XWindowAttributes wattr, wrootattr; 2317 XWindowAttributes wattr, wrootattr;
2318 dDisp;
1945 2319
1946 pchanged = 0; 2320 pchanged = 0;
1947 2321
1948 if (! (Options & Opt_transparent)) 2322 if (!(options & Opt_transparent))
1949 return pchanged; /* Don't try any more */ 2323 return pchanged; /* Don't try any more */
1950 2324
1951 XGetWindowAttributes (display->display, display->root, &wrootattr); 2325 XGetWindowAttributes (disp, display->root, &wrootattr);
1952 rootdepth = wrootattr.depth; 2326 rootdepth = wrootattr.depth;
1953 2327
1954 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2328 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2329
1955 if (rootdepth != wattr.depth) 2330 if (rootdepth != wattr.depth)
1956 { 2331 {
1957 if (am_transparent) 2332 if (am_transparent)
1958 { 2333 {
1959 pchanged = 1; 2334 pchanged = 1;
1960 XSetWindowBackground (display->display, TermWin.vt, 2335 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
1961 PixColors[Color_bg]);
1962 am_transparent = am_pixmap_trans = 0; 2336 am_transparent = am_pixmap_trans = 0;
1963 } 2337 }
2338
1964 return pchanged; /* Don't try any more */ 2339 return pchanged; /* Don't try any more */
1965 } 2340 }
1966 2341
1967 /* 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. */
1968 XSync (display->display, False); 2343 XSync (disp, False);
1969 2344
1970 /* 2345 /*
1971 * Make the frame window set by the window manager have 2346 * Make the frame window set by the window manager have
1972 * the root background. Some window managers put multiple nested frame 2347 * the root background. Some window managers put multiple nested frame
1973 * 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.
1974 */ 2349 */
1975 i = (xa[XA_XROOTPMAPID] != 0 2350 i = (xa[XA_XROOTPMAP_ID]
1976 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2351 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1977 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2352 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1978 &nitems, &bytes_after, &prop) == Success)); 2353 &nitems, &bytes_after, &prop) == Success);
2354
1979 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 )
1980 have_pixmap = 0; 2366 have_pixmap = 0;
1981 else 2367 else
1982 { 2368 {
1983 have_pixmap = 1; 2369 have_pixmap = 1;
1984 rootpixmap = * ((Pixmap *)prop); 2370 rootpixmap = *(Pixmap *)prop;
1985 XFree (prop); 2371 XFree (prop);
1986 } 2372 }
2373
1987 if (have_pixmap) 2374 if (have_pixmap)
1988 { 2375 {
1989 /* 2376 /*
1990 * Copy display->root pixmap transparency 2377 * Copy display->root pixmap transparency
1991 */ 2378 */
1992 int sx, sy, nx, ny; 2379 int sx, sy, nx, ny;
1993 unsigned int nw, nh; 2380 unsigned int nw, nh;
1994 Window cr; 2381 Window cr;
1995 XImage *image; 2382 XImage *image;
1996 GC gc; 2383 GC gc;
1997 XGCValues gcvalue; 2384 XGCValues gcvalue;
1998 2385
1999 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2386 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2000 0, 0, &sx, &sy, &cr); 2387 0, 0, &sx, &sy, &cr);
2001 nw = (unsigned int)szHint.width; 2388 nw = (unsigned int)szHint.width;
2002 nh = (unsigned int)szHint.height; 2389 nh = (unsigned int)szHint.height;
2003 nx = ny = 0; 2390 nx = ny = 0;
2391
2004 if (sx < 0) 2392 if (sx < 0)
2005 { 2393 {
2006 nw += sx; 2394 nw += sx;
2007 nx = -sx; 2395 nx = -sx;
2008 sx = 0; 2396 sx = 0;
2009 } 2397 }
2398
2010 if (sy < 0) 2399 if (sy < 0)
2011 { 2400 {
2012 nh += sy; 2401 nh += sy;
2013 ny = -sy; 2402 ny = -sy;
2014 sy = 0; 2403 sy = 0;
2015 } 2404 }
2405
2016 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2406 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2017 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2407 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2408
2409 XSync (disp, False);
2018 allowedxerror = -1; 2410 allowedxerror = -1;
2019 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2411 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2020 ZPixmap); 2412
2021 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2413 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2022 /* XXX: may need a delay here? */ 2414 /* XXX: may need a delay here? */
2023 allowedxerror = 0; 2415 allowedxerror = 0;
2416
2024 if (image == NULL) 2417 if (image == NULL)
2025 { 2418 {
2026 if (am_transparent && am_pixmap_trans) 2419 if (am_transparent && am_pixmap_trans)
2027 { 2420 {
2028 pchanged = 1; 2421 pchanged = 1;
2029 if (TermWin.pixmap != None) 2422 if (TermWin.pixmap != None)
2030 { 2423 {
2031 XFreePixmap (display->display, TermWin.pixmap); 2424 XFreePixmap (disp, TermWin.pixmap);
2032 TermWin.pixmap = None; 2425 TermWin.pixmap = None;
2033 } 2426 }
2034 } 2427 }
2428
2035 am_pixmap_trans = 0; 2429 am_pixmap_trans = 0;
2036 } 2430 }
2037 else 2431 else
2038 { 2432 {
2039 if (TermWin.pixmap != None) 2433 if (TermWin.pixmap != None)
2040 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
2041 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2448 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2042 (unsigned int)szHint.width,
2043 (unsigned int)szHint.height, 2449 szHint.width, szHint.height, image->depth);
2044 (unsigned int)image->depth);
2045 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2450 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2046 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2451 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2047 nx, ny, (unsigned int)image->width,
2048 (unsigned int)image->height); 2452 nx, ny, image->width, image->height);
2049 XFreeGC (display->display, gc); 2453 XFreeGC (disp, gc);
2050 XDestroyImage (image); 2454 XDestroyImage (image);
2051 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2455 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2052 TermWin.pixmap); 2456 XClearWindow (disp, TermWin.parent[0]);
2457
2053 if (!am_transparent || !am_pixmap_trans) 2458 if (!am_transparent || !am_pixmap_trans)
2054 pchanged = 1; 2459 pchanged = 1;
2460
2055 am_transparent = am_pixmap_trans = 1; 2461 am_transparent = am_pixmap_trans = 1;
2056 } 2462 }
2057 } 2463 }
2464
2058 if (!am_pixmap_trans) 2465 if (am_pixmap_trans)
2466 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2467 else
2059 { 2468 {
2060 unsigned int n; 2469 unsigned int n;
2061 /* 2470 /*
2062 * InheritPixmap transparency 2471 * InheritPixmap transparency
2063 */ 2472 */
2064 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2065 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2473 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2066 i++)
2067 { 2474 {
2068 oldp = TermWin.parent[i]; 2475 oldp = TermWin.parent[i];
2069 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2476 XQueryTree (disp, TermWin.parent[i - 1], &root,
2070 &TermWin.parent[i], &list, &n); 2477 &TermWin.parent[i], &list, &n);
2071 XFree (list); 2478 XFree (list);
2072 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2479
2073 if (TermWin.parent[i] == display->root) 2480 if (TermWin.parent[i] == display->root)
2074 { 2481 {
2075 if (oldp != None) 2482 if (oldp != None)
2076 pchanged = 1; 2483 pchanged = 1;
2484
2077 break; 2485 break;
2078 } 2486 }
2487
2079 if (oldp != TermWin.parent[i]) 2488 if (oldp != TermWin.parent[i])
2080 pchanged = 1; 2489 pchanged = 1;
2081 } 2490 }
2491
2082 n = 0; 2492 n = 0;
2493
2083 if (pchanged) 2494 if (pchanged)
2084 { 2495 {
2085 for (; n < (unsigned int)i; n++) 2496 for (; n < (unsigned int)i; n++)
2086 { 2497 {
2087 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2498 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2088 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2089 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2499 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2090 { 2500 {
2091 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2501 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2092 break; 2502 break;
2093 } 2503 }
2094 } 2504 }
2095 } 2505 }
2096 if (n > (int) (sizeof (TermWin.parent) 2506
2097 / sizeof (TermWin.parent[0]))) 2507 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2098 { 2508 {
2099 D_X ((stderr, "InheritPixmap Turning off")); 2509 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2100 XSetWindowBackground (display->display, TermWin.parent[0], 2510 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2101 PixColors[Color_fg]);
2102 XSetWindowBackground (display->display, TermWin.vt,
2103 PixColors[Color_bg]);
2104 am_transparent = 0; 2511 am_transparent = 0;
2105 /* XXX: also turn off Opt_transparent? */ 2512 /* XXX: also turn off Opt_transparent? */
2106 } 2513 }
2107 else 2514 else
2108 { 2515 {
2516#if WAIT_FOR_WM
2109 /* wait (an arbitrary period) for the WM to do its thing 2517 /* wait (an arbitrary period) for the WM to do its thing
2110 * needed for fvwm2.2.2 (and before?) */ 2518 * needed for fvwm2.2.2 (and before?) */
2111# ifdef HAVE_NANOSLEEP
2112 struct timespec rqt;
2113
2114 rqt.tv_sec = 1;
2115 rqt.tv_nsec = 0;
2116 nanosleep (&rqt, NULL);
2117# else
2118 sleep (1); 2519 sleep (1);
2119# endif 2520#endif
2120 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2121 for (n = 0; n < (unsigned int)i; n++) 2521 for (n = 0; n < (unsigned int)i; n++)
2522 {
2122 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2523 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2123 ParentRelative); 2524 XClearWindow (disp, TermWin.parent[n]);
2525 }
2526
2124 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2527 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2125 ParentRelative);
2126 am_transparent = 1; 2528 am_transparent = 1;
2127 } 2529 }
2530
2128 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2531 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2129 TermWin.parent[i] = None; 2532 TermWin.parent[i] = None;
2130 } 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
2131 return pchanged; 2549 return pchanged;
2132} 2550}
2133#endif 2551#endif
2134 2552
2135/*}}} */ 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}
2136 2740
2137/*{{{ print pipe */ 2741/*{{{ print pipe */
2138/*----------------------------------------------------------------------*/ 2742/*----------------------------------------------------------------------*/
2139#ifdef PRINTPIPE 2743#ifdef PRINTPIPE
2140FILE * 2744FILE *
2141rxvt_term::popen_printer () 2745rxvt_term::popen_printer ()
2142{ 2746{
2143 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2747 FILE *stream = popen (rs[Rs_print_pipe], "w");
2144 2748
2145 if (stream == NULL) 2749 if (stream == NULL)
2146 rxvt_print_error ("can't open printer pipe"); 2750 rxvt_warn ("can't open printer pipe, not printing.\n");
2751
2147 return stream; 2752 return stream;
2148} 2753}
2149 2754
2150int 2755int
2151rxvt_term::pclose_printer (FILE *stream) 2756rxvt_term::pclose_printer (FILE *stream)
2152{ 2757{
2153 fflush (stream); 2758 fflush (stream);
2154 /* pclose () reported not to work on SunOS 4.1.3 */
2155# if defined (__sun__) /* TODO: RESOLVE THIS */
2156 /* pclose works provided SIGCHLD handler uses waitpid */
2157 return pclose (stream); /* return fclose (stream); */
2158# else
2159 return pclose (stream); 2759 return pclose (stream);
2160# endif
2161} 2760}
2162 2761
2163/* 2762/*
2164 * simulate attached vt100 printer 2763 * simulate attached vt100 printer
2165 */ 2764 */
2166void 2765void
2167rxvt_term::process_print_pipe () 2766rxvt_term::process_print_pipe ()
2168{ 2767{
2169 int done; 2768 int done;
2170 FILE *fd; 2769 FILE *fd;
2171 2770
2172 if ((fd = popen_printer ()) == NULL) 2771 if ((fd = popen_printer ()) == NULL)
2173 return; 2772 return;
2174 2773
2175 /* 2774 /*
2176 * 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
2177 * is received. 2776 * is received.
2178 */ 2777 */
2179 for (done = 0; !done;) 2778 for (done = 0; !done;)
2180 { 2779 {
2181 unsigned char buf[8]; 2780 unsigned char buf[8];
2182 unsigned char ch; 2781 unicode_t ch;
2183 unsigned int i, len; 2782 unsigned int i, len;
2184 2783
2185 if ((ch = cmd_getc ()) != C0_ESC) 2784 if ((ch = cmd_getc ()) != C0_ESC)
2186 { 2785 {
2187 if (putc (ch, fd) == EOF) 2786 if (putc (ch, fd) == EOF)
2188 break; /* done = 1 */ 2787 break; /* done = 1 */
… …
2203 { 2802 {
2204 if ((buf[len++] = cmd_getc ()) == 'i') 2803 if ((buf[len++] = cmd_getc ()) == 'i')
2205 break; /* done = 1 */ 2804 break; /* done = 1 */
2206 } 2805 }
2207 } 2806 }
2807
2208 for (i = 0; i < len; i++) 2808 for (i = 0; i < len; i++)
2209 if (putc (buf[i], fd) == EOF) 2809 if (putc (buf[i], fd) == EOF)
2210 { 2810 {
2211 done = 1; 2811 done = 1;
2212 break; 2812 break;
2213 } 2813 }
2214 } 2814 }
2215 } 2815 }
2816
2216 pclose_printer (fd); 2817 pclose_printer (fd);
2217} 2818}
2218#endif /* PRINTPIPE */ 2819#endif /* PRINTPIPE */
2219/*}}} */ 2820/*}}} */
2220 2821
2221/* *INDENT-OFF* */ 2822/* *INDENT-OFF* */
2222enum { 2823enum {
2223 C1_40 = 0x40, 2824 C1_40 = 0x40,
2224 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,
2225 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,
2226 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,
2227 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,
2228}; 2829};
2229/* *INDENT-ON* */ 2830/* *INDENT-ON* */
2230 2831
2231/*{{{ process non-printing single characters */ 2832/*{{{ process non-printing single characters */
2232void 2833void
2233rxvt_term::process_nonprinting (unsigned char ch) 2834rxvt_term::process_nonprinting (unicode_t ch)
2234{ 2835{
2235 switch (ch) 2836 switch (ch)
2236 { 2837 {
2838 case C0_ESC:
2839 process_escape_seq ();
2840 break;
2237 case C0_ENQ: /* terminal Status */ 2841 case C0_ENQ: /* terminal Status */
2238 if (rs[Rs_answerbackstring]) 2842 if (rs[Rs_answerbackstring])
2239 tt_write (
2240 (const unsigned char *)rs[Rs_answerbackstring], 2843 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2241 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2844 (unsigned int)strlen (rs[Rs_answerbackstring]));
2242 else 2845 else
2243 tt_write ((unsigned char *)VT100_ANS, 2846 tt_write ((unsigned char *)VT100_ANS,
2244 (unsigned int)STRLEN (VT100_ANS)); 2847 (unsigned int)strlen (VT100_ANS));
2245 break; 2848 break;
2246 case C0_BEL: /* bell */ 2849 case C0_BEL: /* bell */
2247 scr_bell (); 2850 scr_bell ();
2248 break; 2851 break;
2249 case C0_BS: /* backspace */ 2852 case C0_BS: /* backspace */
… …
2264 scr_charset_choose (1); 2867 scr_charset_choose (1);
2265 break; 2868 break;
2266 case C0_SI: /* shift in - acs */ 2869 case C0_SI: /* shift in - acs */
2267 scr_charset_choose (0); 2870 scr_charset_choose (0);
2268 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
2269 } 2885 }
2270} 2886}
2271/*}}} */ 2887/*}}} */
2272 2888
2273 2889
2274/*{{{ process VT52 escape sequences */ 2890/*{{{ process VT52 escape sequences */
2275void 2891void
2276rxvt_term::process_escape_vt52 (unsigned char ch) 2892rxvt_term::process_escape_vt52 (unicode_t ch)
2277{ 2893{
2278 int row, col; 2894 int row, col;
2279 2895
2280 switch (ch) 2896 switch (ch)
2281 { 2897 {
… …
2333 2949
2334/*{{{ process escape sequences */ 2950/*{{{ process escape sequences */
2335void 2951void
2336rxvt_term::process_escape_seq () 2952rxvt_term::process_escape_seq ()
2337{ 2953{
2338 unsigned char ch = cmd_getc (); 2954 unicode_t ch = cmd_getc ();
2339 2955
2340 if (PrivateModes & PrivMode_vt52) 2956 if (priv_modes & PrivMode_vt52)
2341 { 2957 {
2342 process_escape_vt52 (ch); 2958 process_escape_vt52 (ch);
2343 return; 2959 return;
2344 } 2960 }
2345 2961
… …
2360 scr_charset_set (2, (unsigned int)cmd_getc ()); 2976 scr_charset_set (2, (unsigned int)cmd_getc ());
2361 break; 2977 break;
2362 case '+': 2978 case '+':
2363 scr_charset_set (3, (unsigned int)cmd_getc ()); 2979 scr_charset_set (3, (unsigned int)cmd_getc ());
2364 break; 2980 break;
2365#ifdef MULTICHAR_SET 2981#if ENABLE_FRILLS
2366 case '$':
2367 scr_charset_set (-2, (unsigned int)cmd_getc ());
2368 break;
2369#endif
2370#ifndef NO_FRILLS
2371 case '6': 2982 case '6':
2372 scr_backindex (); 2983 scr_backindex ();
2373 break; 2984 break;
2374#endif 2985#endif
2375 case '7': 2986 case '7':
2376 scr_cursor (SAVE); 2987 scr_cursor (SAVE);
2377 break; 2988 break;
2378 case '8': 2989 case '8':
2379 scr_cursor (RESTORE); 2990 scr_cursor (RESTORE);
2380 break; 2991 break;
2381#ifndef NO_FRILLS 2992#if ENABLE_FRILLS
2382 case '9': 2993 case '9':
2383 scr_forwardindex (); 2994 scr_forwardindex ();
2384 break; 2995 break;
2385#endif 2996#endif
2386 case '=': 2997 case '=':
… …
2396 break; 3007 break;
2397 3008
2398 /* 8.3.87: NEXT LINE */ 3009 /* 8.3.87: NEXT LINE */
2399 case C1_NEL: /* ESC E */ 3010 case C1_NEL: /* ESC E */
2400 { 3011 {
2401 uint32_t nlcr[] = { '\n', '\r' }; 3012 unicode_t nlcr[] = { C0_LF, C0_CR };
2402 scr_add_lines (nlcr, 1, 2); 3013 scr_add_lines (nlcr, 1, 2);
2403 } 3014 }
2404 break; 3015 break;
2405 3016
2406 /* kidnapped escape sequence: Should be 8.3.48 */ 3017 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2417 case C1_RI: /* ESC M */ 3028 case C1_RI: /* ESC M */
2418 scr_index (DN); 3029 scr_index (DN);
2419 break; 3030 break;
2420 3031
2421 /* 8.3.142: SINGLE-SHIFT TWO */ 3032 /* 8.3.142: SINGLE-SHIFT TWO */
2422 /*case C1_SS2: scr_single_shift (2); break; */ 3033 /*case C1_SS2: scr_single_shift (2); break; */
2423 3034
2424 /* 8.3.143: SINGLE-SHIFT THREE */ 3035 /* 8.3.143: SINGLE-SHIFT THREE */
2425 /*case C1_SS3: scr_single_shift (3); break; */ 3036 /*case C1_SS3: scr_single_shift (3); break; */
2426 3037
2427 /* 8.3.27: DEVICE CONTROL STRING */ 3038 /* 8.3.27: DEVICE CONTROL STRING */
2428 case C1_DCS: /* ESC P */ 3039 case C1_DCS: /* ESC P */
2429 process_dcs_seq (); 3040 process_dcs_seq ();
2430 break; 3041 break;
… …
2445 process_osc_seq (); 3056 process_osc_seq ();
2446 break; 3057 break;
2447 3058
2448 /* 8.3.106: RESET TO INITIAL STATE */ 3059 /* 8.3.106: RESET TO INITIAL STATE */
2449 case 'c': 3060 case 'c':
3061 mbstate.reset ();
2450 scr_poweron (); 3062 scr_poweron ();
2451 scrollbar_show (1); 3063 scrollbar_show (1);
2452 break; 3064 break;
2453 3065
2454 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3066 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2466 3078
2467/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3079/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2468/* *INDENT-OFF* */ 3080/* *INDENT-OFF* */
2469enum { 3081enum {
2470 CSI_ICH = 0x40, 3082 CSI_ICH = 0x40,
2471 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,
2472 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 ,
2473 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,
2474 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,
2475 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,
2476 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,
… …
2491 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, */
2492 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, [, \, ], ^, _, */
2493 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, */
2494 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, */
2495 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, */
2496 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, {, |, }, ~, */
2497 }; 3109 };
2498/* *INDENT-ON* */ 3110/* *INDENT-ON* */
2499 3111
2500void 3112void
2501rxvt_term::process_csi_seq () 3113rxvt_term::process_csi_seq ()
2502{ 3114{
2503 unsigned char ch, priv, i; 3115 unicode_t ch, priv, i;
2504 unsigned int nargs, p; 3116 unsigned int nargs, p;
2505 int n, ndef; 3117 int n, ndef;
2506 int arg[ESC_ARGS]; 3118 int arg[ESC_ARGS];
2507 3119
2508 for (nargs = ESC_ARGS; nargs > 0;) 3120 for (nargs = ESC_ARGS; nargs > 0;)
2509 arg[--nargs] = 0; 3121 arg[--nargs] = 0;
2510 3122
2511 priv = 0; 3123 priv = 0;
… …
2513 if (ch >= '<' && ch <= '?') 3125 if (ch >= '<' && ch <= '?')
2514 { /* '<' '=' '>' '?' */ 3126 { /* '<' '=' '>' '?' */
2515 priv = ch; 3127 priv = ch;
2516 ch = cmd_getc (); 3128 ch = cmd_getc ();
2517 } 3129 }
3130
2518 /* read any numerical arguments */ 3131 /* read any numerical arguments */
2519 for (n = -1; ch < CSI_ICH; ) 3132 for (n = -1; ch < CSI_ICH; )
2520 { 3133 {
2521 if (isdigit (ch)) 3134 if (isdigit (ch))
2522 { 3135 {
… …
2529 { 3142 {
2530 if (nargs < ESC_ARGS) 3143 if (nargs < ESC_ARGS)
2531 arg[nargs++] = n; 3144 arg[nargs++] = n;
2532 n = -1; 3145 n = -1;
2533 } 3146 }
2534 else if (ch == '\b') 3147 else if (IS_CONTROL (ch))
2535 {
2536 scr_backspace ();
2537 }
2538 else if (ch == C0_ESC)
2539 {
2540 process_escape_seq ();
2541 return;
2542 }
2543 else if (ch < ' ')
2544 {
2545 process_nonprinting (ch); 3148 process_nonprinting (ch);
2546 } 3149
2547 ch = cmd_getc (); 3150 ch = cmd_getc ();
2548 } 3151 }
2549 3152
2550 if (ch > CSI_7F) 3153 if (ch > CSI_7F)
2551 return; 3154 return;
… …
2573 { 3176 {
2574 switch (priv) 3177 switch (priv)
2575 { 3178 {
2576 case '>': 3179 case '>':
2577 if (ch == CSI_DA) /* secondary device attributes */ 3180 if (ch == CSI_DA) /* secondary device attributes */
2578 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3181 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2579 break; 3182 break;
2580 case '?': 3183 case '?':
2581 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3184 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2582 process_terminal_mode (ch, priv, nargs, arg); 3185 process_terminal_mode (ch, priv, nargs, arg);
2583 break; 3186 break;
… …
2693 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3296 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2694 break; 3297 break;
2695 3298
2696 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3299 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2697 tt_write ((const unsigned char *)VT100_ANS, 3300 tt_write ((const unsigned char *)VT100_ANS,
2698 (unsigned int) (sizeof (VT100_ANS) - 1)); 3301 (unsigned int) (sizeof (VT100_ANS) - 1));
2699 break; 3302 break;
2700 3303
2701 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3304 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2702 process_sgr_mode (nargs, arg); 3305 process_sgr_mode (nargs, arg);
2703 break; 3306 break;
… …
2709 tt_printf ("\033[0n"); 3312 tt_printf ("\033[0n");
2710 break; 3313 break;
2711 case 6: /* CPR requested */ 3314 case 6: /* CPR requested */
2712 scr_report_position (); 3315 scr_report_position ();
2713 break; 3316 break;
2714#if defined (ENABLE_DISPLAY_ANSWER)
2715 case 7: /* unofficial extension */ 3317 case 7: /* unofficial extension */
3318 if (options & Opt_insecure)
2716 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3319 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2717 break; 3320 break;
2718#endif
2719 case 8: /* unofficial extension */ 3321 case 8: /* unofficial extension */
2720 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 3322 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2721 break; 3323 break;
2722 } 3324 }
2723 break; 3325 break;
2724 3326
2725 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3327 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2758 break; 3360 break;
2759 3361
2760 case CSI_RM: /* 8.3.107: RESET MODE */ 3362 case CSI_RM: /* 8.3.107: RESET MODE */
2761 if (arg[0] == 4) 3363 if (arg[0] == 4)
2762 scr_insert_mode (0); 3364 scr_insert_mode (0);
3365 else if (arg[0] == 20)
3366 priv_modes &= ~PrivMode_LFNL;
2763 break; 3367 break;
2764 3368
2765 case CSI_SM: /* 8.3.126: SET MODE */ 3369 case CSI_SM: /* 8.3.126: SET MODE */
2766 if (arg[0] == 4) 3370 if (arg[0] == 4)
2767 scr_insert_mode (1); 3371 scr_insert_mode (1);
3372 else if (arg[0] == 20)
3373 priv_modes |= PrivMode_LFNL;
2768 break; 3374 break;
2769 3375
2770 /* 3376 /*
2771 * PRIVATE USE beyond this point. All CSI_7? sequences here 3377 * PRIVATE USE beyond this point. All CSI_7? sequences here
2772 */ 3378 */
… …
2784 break; 3390 break;
2785 case CSI_75: 3391 case CSI_75:
2786 scr_cursor (RESTORE); 3392 scr_cursor (RESTORE);
2787 break; 3393 break;
2788 3394
2789#ifndef NO_FRILLS 3395#if ENABLE_FRILLS
2790 case CSI_74: 3396 case CSI_74:
2791 process_window_ops (arg, nargs); 3397 process_window_ops (arg, nargs);
2792 break; 3398 break;
2793#endif 3399#endif
2794 3400
2795 case CSI_78: /* DECREQTPARM */ 3401 case CSI_78: /* DECREQTPARM */
2796 if (arg[0] == 0 || arg[0] == 1) 3402 if (arg[0] == 0 || arg[0] == 1)
2797 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);
2798 /* FALLTHROUGH */ 3404 break;
2799 3405
2800 default: 3406 default:
2801 break; 3407 break;
2802 } 3408 }
2803} 3409}
2804/*}}} */ 3410/*}}} */
2805 3411
2806#ifndef NO_FRILLS 3412#if ENABLE_FRILLS
2807/* ARGSUSED */ 3413/* ARGSUSED */
2808void 3414void
2809rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3415rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2810{ 3416{
2811 int x, y; 3417 int x, y;
2812#if 0
2813 char *s;
2814#endif
2815 XWindowAttributes wattr; 3418 XWindowAttributes wattr;
2816 Window wdummy; 3419 Window wdummy;
3420 dDisp;
2817 3421
2818 if (nargs == 0) 3422 if (nargs == 0)
2819 return; 3423 return;
3424
2820 switch (args[0]) 3425 switch (args[0])
2821 { 3426 {
2822 /* 3427 /*
2823 * commands 3428 * commands
2824 */ 3429 */
2825 case 1: /* deiconify window */ 3430 case 1: /* deiconify window */
2826 XMapWindow (display->display, TermWin.parent[0]); 3431 XMapWindow (disp, TermWin.parent[0]);
2827 break; 3432 break;
2828 case 2: /* iconify window */ 3433 case 2: /* iconify window */
2829 XIconifyWindow (display->display, TermWin.parent[0], 3434 XIconifyWindow (disp, TermWin.parent[0], display->screen);
2830 DefaultScreen (display->display));
2831 break; 3435 break;
2832 case 3: /* set position (pixels) */ 3436 case 3: /* set position (pixels) */
2833 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3437 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
2834 break; 3438 break;
2835 case 4: /* set size (pixels) */ 3439 case 4: /* set size (pixels) */
2836 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3440 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2837 break; 3441 break;
2838 case 5: /* raise window */ 3442 case 5: /* raise window */
2839 XRaiseWindow (display->display, TermWin.parent[0]); 3443 XRaiseWindow (disp, TermWin.parent[0]);
2840 break; 3444 break;
2841 case 6: /* lower window */ 3445 case 6: /* lower window */
2842 XLowerWindow (display->display, TermWin.parent[0]); 3446 XLowerWindow (disp, TermWin.parent[0]);
2843 break; 3447 break;
2844 case 7: /* refresh window */ 3448 case 7: /* refresh window */
2845 scr_touch (true); 3449 scr_touch (true);
2846 break; 3450 break;
2847 case 8: /* set size (chars) */ 3451 case 8: /* set size (chars) */
2848 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3452 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2849 (unsigned int) (args[1] * TermWin.fheight)); 3453 (unsigned int) (args[1] * TermWin.fheight));
2850 break; 3454 break;
3455
3456 //case 9: NYI, TODO, restore maximized window or maximize window
2851 default: 3457 default:
2852 if (args[0] >= 24) /* set height (chars) */ 3458 if (args[0] >= 24) /* set height (chars) */
2853 set_widthheight ((unsigned int)TermWin.width, 3459 set_widthheight ((unsigned int)TermWin.width,
2854 (unsigned int) (args[1] * TermWin.fheight)); 3460 (unsigned int) (args[1] * TermWin.fheight));
2855 break; 3461 break;
3462
3463
2856 /* 3464 /*
2857 * reports - some output format copied from XTerm 3465 * reports - some output format copied from XTerm
2858 */ 3466 */
2859 case 11: /* report window state */ 3467 case 11: /* report window state */
2860 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3468 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2861 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3469 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2862 break; 3470 break;
2863 case 13: /* report window position */ 3471 case 13: /* report window position */
2864 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3472 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2865 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3473 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
2866 -wattr.border_width, -wattr.border_width, 3474 -wattr.border_width, -wattr.border_width,
2867 &x, &y, &wdummy); 3475 &x, &y, &wdummy);
2868 tt_printf ("\033[3;%d;%dt", x, y); 3476 tt_printf ("\033[3;%d;%dt", x, y);
2869 break; 3477 break;
2870 case 14: /* report window size (pixels) */ 3478 case 14: /* report window size (pixels) */
2871 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3479 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2872 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3480 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2873 break; 3481 break;
2874 case 18: /* report window size (chars) */ 3482 case 18: /* report text area size (chars) */
2875 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3483 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2876 break; 3484 break;
2877#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;
2878 case 20: /* report icon label */ 3488 case 20: /* report icon label */
3489 {
3490 char *s;
2879 XGetIconName (display->display, TermWin.parent[0], &s); 3491 XGetIconName (disp, TermWin.parent[0], &s);
2880 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 }
2881 break; 3495 break;
2882 case 21: /* report window title */ 3496 case 21: /* report window title */
3497 {
3498 char *s;
2883 XFetchName (display->display, TermWin.parent[0], &s); 3499 XFetchName (disp, TermWin.parent[0], &s);
2884 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 }
2885 break; 3503 break;
2886#endif
2887
2888 } 3504 }
2889} 3505}
2890#endif 3506#endif
2891 3507
2892/*----------------------------------------------------------------------*/ 3508/*----------------------------------------------------------------------*/
2893/* 3509/*
2894 * get input up until STRING TERMINATOR (or BEL) 3510 * get input up until STRING TERMINATOR (or BEL)
2895 * ends_how is terminator used. returned input must be free ()d 3511 * ends_how is terminator used. returned input must be free()'d
2896 */ 3512 */
2897unsigned char * 3513unsigned char *
2898rxvt_term::get_to_st (unsigned char *ends_how) 3514rxvt_term::get_to_st (unicode_t &ends_how)
2899{ 3515{
2900 int seen_esc = 0; /* seen escape? */ 3516 unicode_t ch;
3517 bool seen_esc = false;
2901 unsigned int n = 0; 3518 unsigned int n = 0;
2902 unsigned char *s; 3519 wchar_t string[STRING_MAX];
2903 unsigned char ch, string[STRING_MAX];
2904 3520
2905 for (; (ch = cmd_getc ());) 3521 while ((ch = cmd_getc ()) != NOCHAR)
2906 { 3522 {
2907 if (ch == C0_BEL 3523 if (seen_esc)
2908 || ch == CHAR_ST 3524 {
2909 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3525 if (ch == 0x5c) /* 7bit ST */
2910 break; 3526 break;
3527 else
3528 return NULL;
3529 }
2911 if (ch == C0_ESC) 3530 else if (ch == C0_ESC)
2912 { 3531 {
2913 seen_esc = 1; 3532 seen_esc = true;
2914 continue; 3533 continue;
2915 } 3534 }
2916 else if (ch == '\t') 3535 else if (ch == C0_BEL || ch == CHAR_ST)
2917 ch = ' '; /* translate '\t' to space */ 3536 break;
2918 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3537 else if (ch < 0x20)
2919 return NULL; /* other control character - exit */ 3538 return NULL; /* other control character - exit */
3539
3540 seen_esc = false;
3541
2920 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
2921 string[n++] = ch; 3549 string[n++] = ch;
2922 seen_esc = 0;
2923 } 3550 }
3551
2924 string[n++] = '\0'; 3552 string[n++] = '\0';
2925 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3553
2926 return NULL;
2927 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3554 ends_how = (ch == 0x5c ? C0_ESC : ch);
2928 STRNCPY (s, string, n); 3555
2929 return s; 3556 return (unsigned char *)rxvt_wcstombs (string);
2930} 3557}
2931 3558
2932/*----------------------------------------------------------------------*/ 3559/*----------------------------------------------------------------------*/
2933/* 3560/*
2934 * 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)'
2935 */ 3562 */
2936void 3563void
2937rxvt_term::process_dcs_seq () 3564rxvt_term::process_dcs_seq ()
2938{ 3565{
2939 unsigned char eh, *s; 3566 unsigned char *s;
3567 unicode_t eh;
3568
2940 /* 3569 /*
2941 * Not handled yet 3570 * Not handled yet
2942 */ 3571 */
2943 s = get_to_st (&eh); 3572 s = get_to_st (eh);
2944 if (s) 3573 if (s)
2945 free (s); 3574 free (s);
3575
2946 return; 3576 return;
2947} 3577}
2948 3578
2949/*----------------------------------------------------------------------*/ 3579/*----------------------------------------------------------------------*/
2950/* 3580/*
2951 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3581 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2952 */ 3582 */
2953void 3583void
2954rxvt_term::process_osc_seq () 3584rxvt_term::process_osc_seq ()
2955{ 3585{
2956 unsigned char ch, eh, *s; 3586 unicode_t ch, eh;
2957 int arg; 3587 int arg;
2958 3588
2959 ch = cmd_getc (); 3589 ch = cmd_getc ();
2960 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3590 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2961 arg = arg * 10 + (ch - '0'); 3591 arg = arg * 10 + (ch - '0');
2962 3592
2963 if (ch == ';') 3593 if (ch == ';')
2964 { 3594 {
2965 s = get_to_st (&eh); 3595 unsigned char *s = get_to_st (eh);
3596
2966 if (s) 3597 if (s)
2967 { 3598 {
2968 /*
2969 * rxvt_menubar_dispatch () violates the constness of the string,
2970 * so do it here
2971 */
2972 if (arg == XTerm_Menu)
2973#if 0 /* XXX: currently disabled due to security concerns */
2974 menubar_dispatch ((char *)s);
2975#else
2976 (void)0;
2977#endif
2978 else
2979 xterm_seq (arg, (char *)s, eh); 3599 process_xterm_seq (arg, (char *)s, eh);
2980 free (s); 3600 free (s);
2981 } 3601 }
2982 } 3602 }
2983} 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
2984/* 3618/*
2985 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3619 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2986 * 0 = change iconName/title 3620 * 0 = change iconName/title
2987 * 1 = change iconName 3621 * 1 = change iconName
2988 * 2 = change title 3622 * 2 = change title
2989 * 4 = change color 3623 * 4 = change color
3624 * 10 = change fg color
3625 * 11 = change bg color
2990 * 12 = change text color 3626 * 12 = change text color
2991 * 13 = change mouse foreground color 3627 * 13 = change mouse foreground color
2992 * 17 = change highlight character colour 3628 * 17 = change highlight character colour
2993 * 18 = change bold character color 3629 * 18 = change bold character color
2994 * 19 = change underlined character color 3630 * 19 = change underlined character color
2995 * 46 = change logfile (not implemented) 3631 * 46 = change logfile (not implemented)
2996 * 50 = change font 3632 * 50 = change font
2997 * 3633 *
2998 * rxvt extensions: 3634 * rxvt extensions:
2999 * 9 = change locale (NYI)
3000 * 10 = menu (may change in future)
3001 * 20 = bg pixmap 3635 * 20 = bg pixmap
3002 * 39 = change default fg color 3636 * 39 = change default fg color
3003 * 49 = change default bg color 3637 * 49 = change default bg color
3004 * 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
3005 */ 3642 */
3006void 3643void
3007rxvt_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)
3008{ 3645{
3009 int changed = 0; 3646 int changed = 0;
3010 int color; 3647 int color;
3011 char *buf, *name; 3648 char *buf, *name;
3649 bool query = str[0] == '?' && !str[1];
3650 int saveop = op;
3651 dDisp;
3012 3652
3013 assert (str != NULL); 3653 assert (str != NULL);
3014 switch (op) 3654 switch (op)
3015 { 3655 {
3016 case XTerm_name: 3656 case XTerm_name:
3017 set_title (str); 3657 set_title (str);
3018 /* FALLTHROUGH */ 3658 /* FALLTHROUGH */
3019 case XTerm_iconName: 3659 case XTerm_iconName:
3020 set_iconName (str); 3660 set_icon_name (str);
3021 break; 3661 break;
3022 case XTerm_title: 3662 case XTerm_title:
3023 set_title (str); 3663 set_title (str);
3024 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
3025 case XTerm_Color: 3704 case XTerm_Color:
3026 for (buf = (char *)str; buf && *buf;) 3705 for (buf = (char *)str; buf && *buf;)
3027 { 3706 {
3028 if ((name = STRCHR (buf, ';')) == NULL) 3707 if ((name = strchr (buf, ';')) == NULL)
3029 break; 3708 break;
3709
3030 *name++ = '\0'; 3710 *name++ = '\0';
3031 color = atoi (buf); 3711 color = atoi (buf);
3712
3032 if (color < 0 || color >= TOTAL_COLORS) 3713 if (color < 0 || color >= TOTAL_COLORS)
3033 break; 3714 break;
3715
3034 if ((buf = STRCHR (name, ';')) != NULL) 3716 if ((buf = strchr (name, ';')) != NULL)
3035 *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
3036 set_window_color (color + minCOLOR, name); 3726 set_window_color (color + minCOLOR, name);
3037 } 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);
3038 break; 3734 break;
3039#ifndef NO_CURSORCOLOR 3735#ifndef NO_CURSORCOLOR
3040 case XTerm_Color_cursor: 3736 case XTerm_Color_cursor:
3041 set_window_color (Color_cursor, str); 3737 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3042 break; 3738 break;
3043#endif 3739#endif
3044 case XTerm_Color_pointer: 3740 case XTerm_Color_pointer_fg:
3045 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);
3046 break; 3745 break;
3047#ifndef NO_BOLD_UNDERLINE_REVERSE 3746#ifndef NO_BOLD_UNDERLINE_REVERSE
3048 case XTerm_Color_BD: 3747 case XTerm_Color_BD:
3049 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);
3050 break; 3752 break;
3051 case XTerm_Color_UL: 3753 case XTerm_Color_UL:
3052 set_window_color (Color_UL, str); 3754 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3053 break; 3755 break;
3054 case XTerm_Color_RV: 3756 case XTerm_Color_RV:
3055 set_window_color (Color_RV, str); 3757 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3056 break; 3758 break;
3057#endif 3759#endif
3058 3760#if TRANSPARENT && TINTING
3059 case XTerm_Menu: 3761 case XTerm_Color_tint:
3060 /* 3762 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3061 * rxvt_menubar_dispatch () violates the constness of the string, 3763 check_our_parents ();
3062 * so DON'T do it here 3764 if (am_transparent)
3063 */ 3765 want_full_refresh = want_refresh = 1;
3064 break; 3766 break;
3767#endif
3768
3065 case XTerm_Pixmap: 3769 case XTerm_Pixmap:
3066 if (*str != ';') 3770 if (*str != ';')
3067 { 3771 {
3068#if XPM_BACKGROUND 3772#if XPM_BACKGROUND
3069 scale_pixmap (""); /* reset to default scaling */ 3773 scale_pixmap (""); /* reset to default scaling */
3070 set_bgPixmap (str); /* change pixmap */ 3774 set_bgPixmap (str); /* change pixmap */
3071#endif 3775#endif
3072 scr_touch (true); 3776 scr_touch (true);
3073 } 3777 }
3074 while ((str = STRCHR (str, ';')) != NULL) 3778 while ((str = strchr (str, ';')) != NULL)
3075 { 3779 {
3076 str++; 3780 str++;
3077#if XPM_BACKGROUND 3781#if XPM_BACKGROUND
3078 changed += scale_pixmap (str); 3782 changed += scale_pixmap (str);
3079#endif 3783#endif
3080
3081 } 3784 }
3785
3082 if (changed) 3786 if (changed)
3083 { 3787 {
3084#ifdef XPM_BACKGROUND 3788#ifdef XPM_BACKGROUND
3085 resize_pixmap (); 3789 resize_pixmap ();
3086#endif 3790#endif
… …
3092 set_window_color (Color_fg, str); 3796 set_window_color (Color_fg, str);
3093 break; 3797 break;
3094 case XTerm_restoreBG: 3798 case XTerm_restoreBG:
3095 set_window_color (Color_bg, str); 3799 set_window_color (Color_bg, str);
3096 break; 3800 break;
3801
3097 case XTerm_logfile: 3802 case XTerm_logfile:
3803 // TODO, when secure mode?
3098 break; 3804 break;
3805
3099 case XTerm_font: 3806 case XTerm_font:
3100 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 }
3101 break; 3827 break;
3828
3829#if ENABLE_FRILLS
3102 case XTerm_locale: 3830 case XTerm_locale:
3103 if (str[0] == '?' && !str[1]) 3831 if (query)
3104 tt_printf ("%-.250s\n", locale); 3832 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3105 else 3833 else
3106 { 3834 {
3107 set_locale (str); 3835 set_locale (str);
3836 pty.set_utf8_mode (enc_utf8);
3837# ifdef USE_XIM
3108 im_cb (); 3838 im_cb ();
3109 3839# endif
3110 // TODO: call selection_make with the right values set
3111 // to re-fresh the selection.
3112 if (display->selection_owner == this)
3113 display->set_selection_owner (0);
3114 } 3840 }
3115 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
3116#if 0 3850#if 0
3117 case XTerm_dumpscreen: /* no error notices */ 3851 case XTerm_dumpscreen: /* no error notices */
3118 { 3852 {
3119 int fd; 3853 int fd;
3120 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)
3121 { 3855 {
3122 scr_dump (fd); 3856 scr_dump (fd);
3123 close (fd); 3857 close (fd);
3124 } 3858 }
3125 } 3859 }
3126 break; 3860 break;
3127#endif 3861#endif
3128
3129 } 3862 }
3130} 3863}
3131/*----------------------------------------------------------------------*/ 3864/*----------------------------------------------------------------------*/
3132 3865
3133/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3866/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3141 * so no need for fancy checking 3874 * so no need for fancy checking
3142 */ 3875 */
3143int 3876int
3144rxvt_term::privcases (int mode, unsigned long bit) 3877rxvt_term::privcases (int mode, unsigned long bit)
3145{ 3878{
3146 int state; 3879 int state;
3147 3880
3148 if (mode == 's') 3881 if (mode == 's')
3149 { 3882 {
3150 SavedModes |= (PrivateModes & bit); 3883 SavedModes |= (priv_modes & bit);
3151 return -1; 3884 return -1;
3152 } 3885 }
3153 else 3886 else
3154 { 3887 {
3155 if (mode == 'r') 3888 if (mode == 'r')
3156 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3889 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3157 else 3890 else
3158 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3891 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3159 PrivMode (state, bit); 3892 PrivMode (state, bit);
3160 } 3893 }
3894
3161 return state; 3895 return state;
3162} 3896}
3163 3897
3164/* we're not using priv _yet_ */ 3898/* we're not using priv _yet_ */
3165void 3899void
3166rxvt_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)
3167{ 3901{
3168 unsigned int i, j; 3902 unsigned int i, j;
3169 int state; 3903 int state;
3904
3170 static const struct 3905 static const struct
3171 { 3906 {
3172 const int argval; 3907 const int argval;
3173 const unsigned long bit; 3908 const unsigned long bit;
3174 } 3909 }
3910
3175 argtopriv[] = { 3911 argtopriv[] = {
3176 { 1, PrivMode_aplCUR }, 3912 { 1, PrivMode_aplCUR },
3177 { 2, PrivMode_vt52 }, 3913 { 2, PrivMode_vt52 },
3178 { 3, PrivMode_132 }, 3914 { 3, PrivMode_132 },
3179 { 4, PrivMode_smoothScroll }, 3915 { 4, PrivMode_smoothScroll },
3180 { 5, PrivMode_rVideo }, 3916 { 5, PrivMode_rVideo },
3181 { 6, PrivMode_relOrigin }, 3917 { 6, PrivMode_relOrigin },
3182 { 7, PrivMode_Autowrap }, 3918 { 7, PrivMode_Autowrap },
3919 // 8, bi-directional support mode
3183 { 9, PrivMode_MouseX10 }, 3920 { 9, PrivMode_MouseX10 },
3184#ifdef menuBar_esc 3921#ifdef menuBar_esc
3185 { menuBar_esc, PrivMode_menuBar }, 3922 { menuBar_esc, PrivMode_menuBar },
3186#endif 3923#endif
3924 // 18, 19 printing-related
3925 { 25, PrivMode_VisibleCursor },
3187#ifdef scrollBar_esc 3926#ifdef scrollBar_esc
3188 { scrollBar_esc, PrivMode_scrollBar }, 3927 { scrollBar_esc, PrivMode_scrollBar },
3189#endif 3928#endif
3190 { 25, PrivMode_VisibleCursor },
3191 { 35, PrivMode_ShiftKeys }, 3929 { 35, PrivMode_ShiftKeys }, // rxvt extension
3192 { 40, PrivMode_132OK }, 3930 { 40, PrivMode_132OK },
3931 // 41 xterm more fixes NYI
3932 // 45 margin bell NYI
3933 // 46 start logging
3193 { 47, PrivMode_Screen }, 3934 { 47, PrivMode_Screen },
3194 { 66, PrivMode_aplKP }, 3935 { 66, PrivMode_aplKP },
3195#ifndef NO_BACKSPACE_KEY 3936#ifndef NO_BACKSPACE_KEY
3196 { 67, PrivMode_BackSpace }, 3937 { 67, PrivMode_BackSpace },
3197#endif 3938#endif
3198 { 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
3199 { 1010, PrivMode_TtyOutputInh }, 3943 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3200 { 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
3201 { 1047, PrivMode_Screen }, 3948 { 1047, PrivMode_Screen },
3949 // 1048 save and restore cursor
3202 { 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
3203 }; 3952 };
3204 3953
3205 if (nargs == 0) 3954 if (nargs == 0)
3206 return; 3955 return;
3207 3956
… …
3222 state = privcases (mode, argtopriv[j].bit); 3971 state = privcases (mode, argtopriv[j].bit);
3223 break; 3972 break;
3224 } 3973 }
3225 3974
3226 /* extra handling for values with state unkept */ 3975 /* extra handling for values with state unkept */
3227 if (state == -1)
3228 switch (arg[i]) 3976 switch (arg[i])
3229 { 3977 {
3230 case 1048: /* alternative cursor save */ 3978 case 1048: /* alternative cursor save */
3979 case 1049:
3980 if (options & Opt_secondaryScreen)
3231 if (mode == 0) 3981 if (mode == 0)
3232 scr_cursor (RESTORE); 3982 scr_cursor (RESTORE);
3233 else if (mode == 1) 3983 else if (mode == 1)
3234 scr_cursor (SAVE); 3984 scr_cursor (SAVE);
3235 /* FALLTHROUGH */
3236 default:
3237 continue; /* for (;i;) */
3238 }
3239
3240 /* extra handling for values with valid 0 or 1 state */
3241 switch (arg[i])
3242 {
3243 /* case 1: - application cursor keys */
3244 case 2: /* VT52 mode */
3245 /* oddball mode. should be set regardless of set/reset
3246 * parameter. Return from VT52 mode with an ESC < from
3247 * within VT52 mode
3248 */
3249 PrivMode (1, PrivMode_vt52);
3250 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;
3251 case 3: /* 80/132 */ 4000 case 3: /* 80/132 */
3252 if (PrivateModes & PrivMode_132OK) 4001 if (priv_modes & PrivMode_132OK)
3253 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 4002 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3254 (unsigned int)TermWin.height);
3255 break; 4003 break;
3256 case 4: /* smooth scrolling */ 4004 case 4: /* smooth scrolling */
3257 if (state) 4005 if (state)
3258 Options &= ~Opt_jumpScroll; 4006 options &= ~Opt_jumpScroll;
3259 else 4007 else
3260 Options |= Opt_jumpScroll; 4008 options |= Opt_jumpScroll;
3261 break; 4009 break;
3262 case 5: /* reverse video */ 4010 case 5: /* reverse video */
3263 scr_rvideo_mode (state); 4011 scr_rvideo_mode (state);
3264 break; 4012 break;
3265 case 6: /* relative/absolute origins */ 4013 case 6: /* relative/absolute origins */
3266 scr_relative_origin (state); 4014 scr_relative_origin (state);
3267 break; 4015 break;
3268 case 7: /* autowrap */ 4016 case 7: /* autowrap */
3269 scr_autowrap (state); 4017 scr_autowrap (state);
3270 break; 4018 break;
3271 /* 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 */
3272 case 9: /* X10 mouse reporting */ 4020 case 9: /* X10 mouse reporting */
3273 if (state) /* orthogonal */ 4021 if (state) /* orthogonal */
3274 PrivateModes &= ~ (PrivMode_MouseX11); 4022 priv_modes &= ~PrivMode_MouseX11;
3275 break; 4023 break;
3276#ifdef menuBar_esc 4024#ifdef menuBar_esc
3277 case menuBar_esc: 4025 case menuBar_esc:
3278#ifdef MENUBAR 4026#ifdef MENUBAR
3279 map_menuBar (state); 4027 map_menuBar (state);
3280#endif 4028#endif
3281 break; 4029 break;
3282#endif 4030#endif
3283#ifdef scrollBar_esc 4031#ifdef scrollBar_esc
3284 case scrollBar_esc: 4032 case scrollBar_esc:
3285 if (scrollbar_mapping (state)) 4033 if (scrollbar_mapping (state))
3286 { 4034 {
3287 resize_all_windows (0, 0, 0); 4035 resize_all_windows (0, 0, 0);
3288 scr_touch (true); 4036 scr_touch (true);
3289 } 4037 }
3290 break; 4038 break;
3291#endif 4039#endif
3292 case 25: /* visible/invisible cursor */ 4040 case 25: /* visible/invisible cursor */
3293 scr_cursor_visible (state); 4041 scr_cursor_visible (state);
3294 break; 4042 break;
3295 /* case 35: - shift keys */ 4043 /* case 35: - shift keys */
3296 /* case 40: - 80 <--> 132 mode */ 4044 /* case 40: - 80 <--> 132 mode */
3297 case 47: /* secondary screen */ 4045 case 47: /* secondary screen */
3298 scr_change_screen (state); 4046 scr_change_screen (state);
3299 break; 4047 break;
3300 /* case 66: - application key pad */ 4048 /* case 66: - application key pad */
3301 /* case 67: - backspace key */ 4049 /* case 67: - backspace key */
3302 case 1000: /* X11 mouse reporting */ 4050 case 1000: /* X11 mouse reporting */
3303 if (state) /* orthogonal */ 4051 if (state) /* orthogonal */
3304 PrivateModes &= ~ (PrivMode_MouseX10); 4052 priv_modes &= ~PrivMode_MouseX10;
3305 break; 4053 break;
3306#if 0 4054#if 0
3307 case 1001: 4055 case 1001:
3308 break; /* X11 mouse highlighting */ 4056 break; /* X11 mouse highlighting */
3309#endif 4057#endif
3310 case 1010: /* scroll to bottom on TTY output inhibit */ 4058 case 1010: /* scroll to bottom on TTY output inhibit */
3311 if (state) 4059 if (state)
3312 Options &= ~Opt_scrollTtyOutput; 4060 options &= ~Opt_scrollTtyOutput;
3313 else 4061 else
3314 Options |= Opt_scrollTtyOutput; 4062 options |= Opt_scrollTtyOutput;
3315 break; 4063 break;
3316 case 1011: /* scroll to bottom on key press */ 4064 case 1011: /* scroll to bottom on key press */
3317 if (state) 4065 if (state)
3318 Options |= Opt_scrollTtyKeypress; 4066 options |= Opt_scrollTtyKeypress;
3319 else 4067 else
3320 Options &= ~Opt_scrollTtyKeypress; 4068 options &= ~Opt_scrollTtyKeypress;
3321 break; 4069 break;
3322 case 1047: /* secondary screen w/ clearing */ 4070 case 1047: /* secondary screen w/ clearing last */
3323 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4071 if (options & Opt_secondaryScreen)
3324 if (current_screen != PRIMARY) 4072 if (current_screen != PRIMARY)
3325 scr_erase_screen (2); 4073 scr_erase_screen (2);
3326 scr_change_screen (state); 4074 scr_change_screen (state);
3327 /* FALLTHROUGH */
3328 default:
3329 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;
3330 } 4084 }
3331 } 4085 }
3332} 4086}
3333/*}}} */ 4087/*}}} */
3334 4088
3335/*{{{ process sgr sequences */ 4089/*{{{ process sgr sequences */
3336void 4090void
3337rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4091rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3338{ 4092{
3339 unsigned int i; 4093 unsigned int i;
3340 short rendset; 4094 short rendset;
3341 int rendstyle; 4095 int rendstyle;
3342 4096
3343 if (nargs == 0) 4097 if (nargs == 0)
3344 { 4098 {
3345 scr_rendition (0, ~RS_None); 4099 scr_rendition (0, ~RS_None);
3346 return; 4100 return;
3347 } 4101 }
4102
3348 for (i = 0; i < nargs; i++) 4103 for (i = 0; i < nargs; i++)
3349 { 4104 {
3350 rendset = -1; 4105 rendset = -1;
3351 switch (arg[i]) 4106 switch (arg[i])
3352 { 4107 {
… …
3354 rendset = 0, rendstyle = ~RS_None; 4109 rendset = 0, rendstyle = ~RS_None;
3355 break; 4110 break;
3356 case 1: 4111 case 1:
3357 rendset = 1, rendstyle = RS_Bold; 4112 rendset = 1, rendstyle = RS_Bold;
3358 break; 4113 break;
4114 //case 2: // low intensity
4115 case 3:
4116 rendset = 1, rendstyle = RS_Italic;
4117 break;
3359 case 4: 4118 case 4:
3360 rendset = 1, rendstyle = RS_Uline; 4119 rendset = 1, rendstyle = RS_Uline;
3361 break; 4120 break;
3362 case 5: 4121 case 5: // slowly blinking
4122 case 6: // rapidly blinking
3363 rendset = 1, rendstyle = RS_Blink; 4123 rendset = 1, rendstyle = RS_Blink;
3364 break; 4124 break;
4125 //case 6: // scoansi light background
3365 case 7: 4126 case 7:
3366 rendset = 1, rendstyle = RS_RVid; 4127 rendset = 1, rendstyle = RS_RVid;
3367 break; 4128 break;
3368 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)
3369 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;
3370 break; 4147 break;
3371 case 24: 4148 case 24:
3372 rendset = 0, rendstyle = RS_Uline; 4149 rendset = 0, rendstyle = RS_Uline;
3373 break; 4150 break;
3374 case 25: 4151 case 25:
3375 rendset = 0, rendstyle = RS_Blink; 4152 rendset = 0, rendstyle = RS_Blink;
3376 break; 4153 break;
4154 case 26: // variable spacing (iso 8613)
4155 rendset = 0, rendstyle = RS_Blink;
4156 break;
3377 case 27: 4157 case 27:
3378 rendset = 0, rendstyle = RS_RVid; 4158 rendset = 0, rendstyle = RS_RVid;
3379 break; 4159 break;
4160 //case 28: // visible. NYI
4161 //case 29: // not crossed-out
3380 } 4162 }
4163
3381 if (rendset != -1) 4164 if (rendset != -1)
3382 { 4165 {
3383 scr_rendition (rendset, rendstyle); 4166 scr_rendition (rendset, rendstyle);
3384 continue; /* for (;i;) */ 4167 continue; /* for (;i;) */
3385 } 4168 }
… …
3392 case 33: 4175 case 33:
3393 case 34: 4176 case 34:
3394 case 35: 4177 case 35:
3395 case 36: 4178 case 36:
3396 case 37: 4179 case 37:
3397 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 4180 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3398 Color_fg);
3399 break; 4181 break;
3400#ifdef TTY_256COLOR 4182 case 38: // set fg color, ISO 8613-6
3401 case 38:
3402 if (nargs > i + 2 && arg[i + 1] == 5) 4183 if (nargs > i + 2 && arg[i + 1] == 5)
3403 { 4184 {
3404 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4185 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3405 Color_fg);
3406 i += 2; 4186 i += 2;
3407 } 4187 }
3408 break; 4188 break;
3409#endif
3410 case 39: /* default fg */ 4189 case 39: /* default fg */
3411 scr_color (Color_fg, Color_fg); 4190 scr_color (Color_fg, Color_fg);
3412 break; 4191 break;
3413 4192
3414 case 40: 4193 case 40:
… …
3417 case 43: 4196 case 43:
3418 case 44: 4197 case 44:
3419 case 45: 4198 case 45:
3420 case 46: 4199 case 46:
3421 case 47: 4200 case 47:
3422 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 4201 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3423 Color_bg);
3424 break; 4202 break;
3425#ifdef TTY_256COLOR 4203 case 48: // set bg color, ISO 8613-6
3426 case 48:
3427 if (nargs > i + 2 && arg[i + 1] == 5) 4204 if (nargs > i + 2 && arg[i + 1] == 5)
3428 { 4205 {
3429 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4206 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3430 Color_bg);
3431 i += 2; 4207 i += 2;
3432 } 4208 }
3433 break; 4209 break;
3434#endif
3435 case 49: /* default bg */ 4210 case 49: /* default bg */
3436 scr_color (Color_bg, Color_bg); 4211 scr_color (Color_bg, Color_bg);
3437 break; 4212 break;
4213
4214 //case 50: // not variable spacing
3438 4215
3439#ifndef NO_BRIGHTCOLOR 4216#ifndef NO_BRIGHTCOLOR
3440 case 90: 4217 case 90:
3441 case 91: /* set bright fg color */ 4218 case 91: /* set bright fg color */
3442 case 92: 4219 case 92:
3443 case 93: 4220 case 93:
3444 case 94: 4221 case 94:
3445 case 95: 4222 case 95:
3446 case 96: 4223 case 96:
3447 case 97: 4224 case 97:
3448 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4225 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3449 Color_fg);
3450 break; 4226 break;
3451 case 100: 4227 case 100:
3452 case 101: /* set bright bg color */ 4228 case 101: /* set bright bg color */
3453 case 102: 4229 case 102:
3454 case 103: 4230 case 103:
3455 case 104: 4231 case 104:
3456 case 105: 4232 case 105:
3457 case 106: 4233 case 106:
3458 case 107: 4234 case 107:
3459 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4235 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3460 Color_bg);
3461 break; 4236 break;
3462#endif 4237#endif
3463 4238
3464 } 4239 }
3465 } 4240 }
3466} 4241}
3467/*}}} */ 4242/*}}} */
3468 4243
3469/*{{{ process Rob Nation's own graphics mode sequences */ 4244/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3470void 4245void
3471rxvt_term::process_graphics () 4246rxvt_term::process_graphics ()
3472{ 4247{
3473 unsigned char ch, cmd = cmd_getc (); 4248 unicode_t ch, cmd = cmd_getc ();
3474 4249
3475 if (cmd == 'Q') 4250 if (cmd == 'Q')
3476 { /* query graphics */ 4251 { /* query graphics */
3477 tt_printf ("\033G0\n"); /* no graphics */ 4252 tt_printf ("\033G0\012"); /* no graphics */
3478 return; 4253 return;
3479 } 4254 }
3480 /* swallow other graphics sequences until terminating ':' */ 4255 /* swallow other graphics sequences until terminating ':' */
3481 do 4256 do
3482 ch = cmd_getc (); 4257 ch = cmd_getc ();
… …
3497 unsigned char buf[256]; 4272 unsigned char buf[256];
3498 4273
3499 va_start (arg_ptr, fmt); 4274 va_start (arg_ptr, fmt);
3500 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4275 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3501 va_end (arg_ptr); 4276 va_end (arg_ptr);
3502 tt_write (buf, STRLEN (buf)); 4277 tt_write (buf, strlen (buf));
3503} 4278}
3504 4279
3505/* ---------------------------------------------------------------------- */ 4280/* ---------------------------------------------------------------------- */
3506/* 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,
3507 * or generated by us in response to a query ESC sequence. 4282 * or generated by us in response to a query ESC sequence.
3508 */ 4283 */
4284const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4285
3509void 4286void
3510rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4287rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3511{ 4288{
3512 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));
3513 4292
3514 if (len) 4293 if ((unsigned int)written == len)
4294 return;
4295
4296 data += written;
4297 len -= written;
3515 { 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
3516 if (v_buflen == 0) 4316 if (v_buflen == 0)
3517 { 4317 {
3518 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3519
3520 if ((unsigned int)written == len)
3521 return;
3522
3523 data += written;
3524 len -= written;
3525 }
3526
3527
3528 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3529
3530 memcpy (v_buffer + v_buflen, data, len);
3531 v_buflen += len;
3532 }
3533
3534 for (;;)
3535 {
3536 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3537
3538 if (written > 0)
3539 {
3540 v_buflen -= written;
3541
3542 if (v_buflen == 0)
3543 {
3544 free (v_buffer); 4318 free (v_buffer);
3545 v_buffer = 0; 4319 v_buffer = 0;
3546 v_buflen = 0; 4320 v_buflen = 0;
3547 4321
3548 pty_ev.set (EVENT_READ); 4322 pty_ev.set (EVENT_READ);
3549 return;
3550 }
3551
3552 memmove (v_buffer, v_buffer + written, v_buflen);
3553 }
3554 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3555 // original code just ignores this...
3556 destroy ();
3557 else
3558 {
3559 pty_ev.set (EVENT_READ | EVENT_WRITE);
3560 return; 4323 return;
3561 } 4324 }
4325
4326 memmove (v_buffer, v_buffer + written, v_buflen);
3562 } 4327 }
4328 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4329 // original code just ignores this...
4330 destroy ();
3563} 4331}
3564 4332
3565/*----------------------- end-of-file (C source) -----------------------*/ 4333/*----------------------- end-of-file (C source) -----------------------*/
3566 4334

Diff Legend

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