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

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

Diff Legend

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