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

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

Diff Legend

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