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

Diff Legend

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