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.35 by pcg, Sat Jan 31 03:27:45 2004 UTC vs.
Revision 1.49 by pcg, Sat Feb 21 22:14:00 2004 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
30 * 31 *
31 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
32 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
33 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
34 * (at your option) any later version. 35 * (at your option) any later version.
… …
53 54
54/*----------------------------------------------------------------------*/ 55/*----------------------------------------------------------------------*/
55 56
56/*{{{ Convert the keypress event into a string */ 57/*{{{ Convert the keypress event into a string */
57void 58void
58rxvt_term::lookup_key (XKeyEvent *ev) 59rxvt_term::lookup_key (XKeyEvent &ev)
59{ 60{
60 int ctrl, meta, shft, len; 61 int ctrl, meta, shft, len;
61 unsigned int newlen; 62 unsigned int newlen;
62 KeySym keysym; 63 KeySym keysym;
63#ifdef DEBUG_CMD 64#ifdef DEBUG_CMD
64 static int debug_key = 1; /* accessible by a debugger only */ 65 static int debug_key = 1; /* accessible by a debugger only */
65#endif 66#endif
66 int valid_keysym; 67 int valid_keysym;
67 unsigned char kbuf[KBUFSZ]; 68 unsigned char kbuf[KBUFSZ];
68 69
69/* 70 /*
70 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 71 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
71 * escape sequence to toggle the Keypad. 72 * escape sequence to toggle the Keypad.
72 * 73 *
73 * Always permit `shift' to override the current setting 74 * Always permit `shift' to override the current setting
74 */ 75 */
75 shft = (ev->state & ShiftMask); 76 shft = (ev.state & ShiftMask);
76 ctrl = (ev->state & ControlMask); 77 ctrl = (ev.state & ControlMask);
77 meta = (ev->state & ModMetaMask); 78 meta = (ev.state & ModMetaMask);
78 79
79 if (numlock_state || (ev->state & ModNumLockMask)) 80 if (numlock_state || (ev.state & ModNumLockMask))
80 { 81 {
81 numlock_state = (ev->state & ModNumLockMask); 82 numlock_state = (ev.state & ModNumLockMask);
82 PrivMode((!numlock_state), PrivMode_aplKP); 83 PrivMode ((!numlock_state), PrivMode_aplKP);
83 } 84 }
84 85
85 kbuf[0] = 0; 86 kbuf[0] = 0;
86 87
87#ifdef USE_XIM 88#ifdef USE_XIM
88 if (Input_Context) 89 if (Input_Context)
89 { 90 {
90 Status status_return; 91 Status status_return;
91 92
92#ifdef X_HAVE_UTF8_STRING 93#ifdef X_HAVE_UTF8_STRING
93 if (enc_utf8 && 0) 94 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
94 len = Xutf8LookupString (Input_Context, ev, (char *)kbuf, 95 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
95 KBUFSZ, &keysym, &status_return); 96 KBUFSZ, &keysym, &status_return);
96 else 97 else
97#endif 98#endif
98 { 99 {
99 wchar_t wkbuf[KBUFSZ + 1]; 100 wchar_t wkbuf[KBUFSZ + 1];
100 101
101 // the XOpenIM manpage lies about hardcoding the locale 102 // the XOpenIM manpage lies about hardcoding the locale
102 // at the point of XOpenIM, so temporarily switch locales 103 // at the point of XOpenIM, so temporarily switch locales
103 if (rs[Rs_imLocale]) 104 if (rs[Rs_imLocale])
104 SET_LOCALE (rs[Rs_imLocale]); 105 SET_LOCALE (rs[Rs_imLocale]);
105 // assume wchar_t == unicode or better 106 // assume wchar_t == unicode or better
106 len = XwcLookupString (Input_Context, ev, wkbuf, 107 len = XwcLookupString (Input_Context, &ev, wkbuf,
107 KBUFSZ, &keysym, &status_return); 108 KBUFSZ, &keysym, &status_return);
108 if (rs[Rs_imLocale]) 109 if (rs[Rs_imLocale])
109 SET_LOCALE (locale); 110 SET_LOCALE (locale);
110 111
111 if (status_return == XLookupChars 112 if (status_return == XLookupChars
112 || status_return == XLookupBoth) 113 || status_return == XLookupBoth)
113 { 114 {
114 wkbuf[len] = 0; 115 wkbuf[len] = 0;
115 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); 116 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
116 if (len < 0) 117 if (len < 0)
117 len = 0; 118 len = 0;
118 } 119 }
119 else 120 else
120 len = 0; 121 len = 0;
121 } 122 }
122 123
123 valid_keysym = status_return == XLookupKeySym 124 valid_keysym = status_return == XLookupKeySym
124 || status_return == XLookupBoth; 125 || status_return == XLookupBoth;
125 } 126 }
126 else 127 else
127#endif 128#endif
128 { 129 {
129 len = XLookupString (ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 130 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose);
130 valid_keysym = !len; 131 valid_keysym = keysym != NoSymbol;
131 } 132 }
132 133
133 if (valid_keysym) 134 if (valid_keysym)
134 { 135 {
135/* for some backwards compatibility */ 136 /* for some backwards compatibility */
136#if defined(HOTKEY_CTRL) || defined(HOTKEY_META) 137#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
137# ifdef HOTKEY_CTRL 138# ifdef HOTKEY_CTRL
138 if (ctrl) 139 if (ctrl)
139# else 140# else
140 if (meta) 141 if (meta)
141# endif 142# endif
142 { 143 {
143 if (keysym == ks_bigfont) 144 if (keysym == ks_bigfont)
144 { 145 {
145 change_font (0, FONT_UP); 146 change_font (0, FONT_UP);
146 return; 147 return;
147 } 148 }
148 else if (keysym == ks_smallfont) 149 else if (keysym == ks_smallfont)
149 { 150 {
150 change_font (0, FONT_DN); 151 change_font (0, FONT_DN);
151 return; 152 return;
153 }
152 } 154 }
153 }
154#endif 155#endif
155 156
156 if (TermWin.saveLines) { 157 if (TermWin.saveLines)
158 {
157#ifdef UNSHIFTED_SCROLLKEYS 159#ifdef UNSHIFTED_SCROLLKEYS
158 if (!ctrl && !meta) { 160 if (!ctrl && !meta)
161 {
159#else 162#else
160 if (IS_SCROLL_MOD) { 163 if (IS_SCROLL_MOD)
164 {
161#endif 165#endif
162 int lnsppg; 166 int lnsppg;
163 167
164#ifdef PAGING_CONTEXT_LINES 168#ifdef PAGING_CONTEXT_LINES
165 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 169 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
166#else 170#else
167 lnsppg = TermWin.nrow * 4 / 5; 171 lnsppg = TermWin.nrow * 4 / 5;
168#endif 172#endif
169 if (keysym == XK_Prior) { 173 if (keysym == XK_Prior)
174 {
170 scr_page (UP, lnsppg); 175 scr_page (UP, lnsppg);
171 return; 176 return;
177 }
172 } else if (keysym == XK_Next) { 178 else if (keysym == XK_Next)
179 {
173 scr_page (DN, lnsppg); 180 scr_page (DN, lnsppg);
174 return; 181 return;
175 } 182 }
176 } 183 }
177#ifdef SCROLL_ON_UPDOWN_KEYS 184#ifdef SCROLL_ON_UPDOWN_KEYS
178 if (IS_SCROLL_MOD) { 185 if (IS_SCROLL_MOD)
179 if (keysym == XK_Up) { 186 {
180 scr_page (UP, 1); 187 if (keysym == XK_Up)
181 return; 188 {
189 scr_page (UP, 1);
190 return;
191 }
182 } else if (keysym == XK_Down) { 192 else if (keysym == XK_Down)
183 scr_page (DN, 1); 193 {
184 return; 194 scr_page (DN, 1);
185 } 195 return;
186 } 196 }
197 }
187#endif 198#endif
188#ifdef SCROLL_ON_HOMEEND_KEYS 199#ifdef SCROLL_ON_HOMEEND_KEYS
189 if (IS_SCROLL_MOD) { 200 if (IS_SCROLL_MOD)
190 if (keysym == XK_Home) { 201 {
191 scr_move_to (0, 1); 202 if (keysym == XK_Home)
192 return; 203 {
204 scr_move_to (0, 1);
205 return;
206 }
193 } else if (keysym == XK_End) { 207 else if (keysym == XK_End)
194 scr_move_to (1, 0); 208 {
195 return; 209 scr_move_to (1, 0);
196 } 210 return;
197 } 211 }
212 }
198#endif 213#endif
199 } 214 }
200 215
201 if (shft) { 216 if (shft)
217 {
202 /* Shift + F1 - F10 generates F11 - F20 */ 218 /* Shift + F1 - F10 generates F11 - F20 */
203 if (keysym >= XK_F1 && keysym <= XK_F10) { 219 if (keysym >= XK_F1 && keysym <= XK_F10)
220 {
204 keysym += (XK_F11 - XK_F1); 221 keysym += (XK_F11 - XK_F1);
205 shft = 0; /* turn off Shift */ 222 shft = 0; /* turn off Shift */
223 }
206 } else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) { 224 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys))
207 switch (keysym) { 225 {
208 /* normal XTerm key bindings */ 226 switch (keysym)
227 {
228 /* normal XTerm key bindings */
209 case XK_Insert: /* Shift+Insert = paste mouse selection */ 229 case XK_Insert: /* Shift+Insert = paste mouse selection */
210 selection_request (ev->time, 0, 0); 230 selection_request (ev.time, 0, 0);
211 return; 231 return;
212 /* rxvt extras */ 232 /* rxvt extras */
213 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 233 case XK_KP_Add: /* Shift+KP_Add = bigger font */
214 change_font (0, FONT_UP); 234 change_font (0, FONT_UP);
215 return; 235 return;
216 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 236 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
217 change_font (0, FONT_DN); 237 change_font (0, FONT_DN);
218 return; 238 return;
219 } 239 }
220 } 240 }
221 } 241 }
222#ifdef PRINTPIPE 242#ifdef PRINTPIPE
223 if (keysym == XK_Print) { 243 if (keysym == XK_Print)
244 {
224 scr_printscreen (ctrl | shft); 245 scr_printscreen (ctrl | shft);
225 return; 246 return;
226 } 247 }
227#endif 248#endif
228#ifdef GREEK_SUPPORT 249#ifdef GREEK_SUPPORT
229 if (keysym == ks_greekmodeswith) { 250 if (keysym == ks_greekmodeswith)
251 {
230 greek_mode = !greek_mode; 252 greek_mode = !greek_mode;
231 if (greek_mode) { 253 if (greek_mode)
232 xterm_seq (XTerm_title, 254 {
255 xterm_seq (XTerm_title,
233 (greek_getmode() == GREEK_ELOT928 256 (greek_getmode () == GREEK_ELOT928
234 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST); 257 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST);
235 greek_reset(); 258 greek_reset ();
236 } else 259 }
260 else
237 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 261 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
238 return; 262 return;
239 } 263 }
240#endif 264#endif
241 265
242 if (keysym >= 0xFF00 && keysym <= 0xFFFF) { 266 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
267 {
243#ifdef KEYSYM_RESOURCE 268#ifdef KEYSYM_RESOURCE
244 if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) { 269 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
245 unsigned int l; 270 {
271 unsigned int l;
246 const unsigned char *kbuf0; 272 const unsigned char *kbuf0;
247 const unsigned char ch = C0_ESC; 273 const unsigned char ch = C0_ESC;
248 274
249 kbuf0 = (Keysym_map[keysym & 0xFF]); 275 kbuf0 = (Keysym_map[keysym & 0xFF]);
250 l = (unsigned int)*kbuf0++; 276 l = (unsigned int)*kbuf0++;
251 277
252 /* escape prefix */ 278 /* escape prefix */
253 if (meta) 279 if (meta)
254# ifdef META8_OPTION 280# ifdef META8_OPTION
255 if (meta_char == C0_ESC) 281 if (meta_char == C0_ESC)
256# endif 282# endif
257 tt_write (&ch, 1); 283 tt_write (&ch, 1);
258 tt_write (kbuf0, l); 284 tt_write (kbuf0, l);
259 return; 285 return;
260 } else 286 }
287 else
261#endif 288#endif
262 { 289 {
263 newlen = 1; 290 newlen = 1;
264 switch (keysym) { 291 switch (keysym)
292 {
265#ifndef NO_BACKSPACE_KEY 293#ifndef NO_BACKSPACE_KEY
266 case XK_BackSpace: 294 case XK_BackSpace:
267 if (PrivateModes & PrivMode_HaveBackSpace) { 295 if (PrivateModes & PrivMode_HaveBackSpace)
296 {
268 kbuf[0] = (!!(PrivateModes & PrivMode_BackSpace) 297 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace)
269 ^ !!ctrl) ? '\b' : '\177'; 298 ^ !!ctrl) ? '\b' : '\177';
270 kbuf[1] = '\0'; 299 kbuf[1] = '\0';
271 } else 300 }
272 STRCPY(kbuf, key_backspace); 301 else
302 STRCPY (kbuf, key_backspace);
273# ifdef MULTICHAR_SET 303# ifdef MULTICHAR_SET
274 if ((Options & Opt_mc_hack) && screen.cur.col > 0) { 304 if ((Options & Opt_mc_hack) && screen.cur.col > 0)
275 int col, row; 305 {
306 int col, row;
276 307
277 newlen = STRLEN(kbuf); 308 newlen = STRLEN (kbuf);
278 col = screen.cur.col - 1; 309 col = screen.cur.col - 1;
279 row = screen.cur.row + TermWin.saveLines; 310 row = screen.cur.row + TermWin.saveLines;
280 if (IS_MULTI2(screen.rend[row][col])) 311 if (IS_MULTI2 (screen.rend[row][col]))
281 MEMMOVE(kbuf + newlen, kbuf, newlen + 1); 312 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
282 } 313 }
283# endif 314# endif
284 break; 315 break;
285#endif 316#endif
286#ifndef NO_DELETE_KEY 317#ifndef NO_DELETE_KEY
287 case XK_Delete: 318 case XK_Delete:
288 STRCPY(kbuf, key_delete); 319 STRCPY (kbuf, key_delete);
289# ifdef MULTICHAR_SET 320# ifdef MULTICHAR_SET
290 if (Options & Opt_mc_hack) { 321 if (Options & Opt_mc_hack)
291 int col, row; 322 {
292 323 int col, row;
293 newlen = STRLEN(kbuf); 324
294 col = screen.cur.col; 325 newlen = STRLEN (kbuf);
326 col = screen.cur.col;
295 row = screen.cur.row + TermWin.saveLines; 327 row = screen.cur.row + TermWin.saveLines;
296 if (IS_MULTI1(screen.rend[row][col])) 328 if (IS_MULTI1 (screen.rend[row][col]))
297 MEMMOVE(kbuf + newlen, kbuf, newlen + 1); 329 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
298 } 330 }
299# endif 331# endif
300 break; 332 break;
301#endif 333#endif
302 case XK_Tab: 334 case XK_Tab:
303 if (shft) 335 if (shft)
304 STRCPY(kbuf, "\033[Z"); 336 STRCPY (kbuf, "\033[Z");
305 else { 337 else
338 {
306#ifdef CTRL_TAB_MAKES_META 339#ifdef CTRL_TAB_MAKES_META
307 if (ctrl) 340 if (ctrl)
308 meta = 1; 341 meta = 1;
309#endif 342#endif
310#ifdef MOD4_TAB_MAKES_META 343#ifdef MOD4_TAB_MAKES_META
311 if (ev->state & Mod4Mask) 344 if (ev.state & Mod4Mask)
312 meta = 1; 345 meta = 1;
313#endif 346#endif
314 newlen = 0; 347 newlen = 0;
315 } 348 }
316 break; 349 break;
317
318 350
319#ifdef XK_KP_Left 351#ifdef XK_KP_Left
320 case XK_KP_Up: /* \033Ox or standard */ 352 case XK_KP_Up: /* \033Ox or standard */
321 case XK_KP_Down: /* \033Or or standard */ 353 case XK_KP_Down: /* \033Or or standard */
322 case XK_KP_Right: /* \033Ov or standard */ 354 case XK_KP_Right: /* \033Ov or standard */
323 case XK_KP_Left: /* \033Ot or standard */ 355 case XK_KP_Left: /* \033Ot or standard */
324 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 356 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
325 STRCPY(kbuf, "\033OZ"); 357 {
326 kbuf[2] = ("txvr"[keysym - XK_KP_Left]); 358 STRCPY (kbuf, "\033OZ");
327 break; 359 kbuf[2] = "txvr"[keysym - XK_KP_Left];
328 } else 360 break;
361 }
362 else
329 /* translate to std. cursor key */ 363 /* translate to std. cursor key */
330 keysym = XK_Left + (keysym - XK_KP_Left); 364 keysym = XK_Left + (keysym - XK_KP_Left);
331 /* FALLTHROUGH */ 365 /* FALLTHROUGH */
332#endif 366#endif
333 case XK_Up: /* "\033[A" */ 367 case XK_Up: /* "\033[A" */
334 case XK_Down: /* "\033[B" */ 368 case XK_Down: /* "\033[B" */
335 case XK_Right: /* "\033[C" */ 369 case XK_Right: /* "\033[C" */
336 case XK_Left: /* "\033[D" */ 370 case XK_Left: /* "\033[D" */
337 STRCPY(kbuf, "\033[Z"); 371 STRCPY (kbuf, "\033[Z");
338 kbuf[2] = ("DACB"[keysym - XK_Left]); 372 kbuf[2] = "DACB"[keysym - XK_Left];
339 /* do Shift first */ 373 /* do Shift first */
340 if (shft) 374 if (shft)
341 kbuf[2] = ("dacb"[keysym - XK_Left]); 375 kbuf[2] = "dacb"[keysym - XK_Left];
342 else if (ctrl) { 376 else if (ctrl)
343 kbuf[1] = 'O'; 377 {
344 kbuf[2] = ("dacb"[keysym - XK_Left]); 378 kbuf[1] = 'O';
379 kbuf[2] = "dacb"[keysym - XK_Left];
380 }
345 } else if (PrivateModes & PrivMode_aplCUR) 381 else if (PrivateModes & PrivMode_aplCUR)
346 kbuf[1] = 'O'; 382 kbuf[1] = 'O';
347#ifdef MULTICHAR_SET 383#ifdef MULTICHAR_SET
348 //TODO: ?? 384 //TODO: ??
349 if (Options & Opt_mc_hack) { 385 if (Options & Opt_mc_hack)
350 int col, row, m; 386 {
387 int col, row, m;
351 388
352 col = screen.cur.col; 389 col = screen.cur.col;
353 row = screen.cur.row + TermWin.saveLines; 390 row = screen.cur.row + TermWin.saveLines;
354 m = 0; 391 m = 0;
355 if (keysym == XK_Right 392 if (keysym == XK_Right
356 && IS_MULTI1(screen.rend[row][col])) 393 && IS_MULTI1 (screen.rend[row][col]))
357 m = 1; 394 m = 1;
358 else if (keysym == XK_Left) { 395 else if (keysym == XK_Left)
359 if (col > 0) { 396 {
360 if (IS_MULTI2(screen.rend[row][col - 1])) 397 if (col > 0)
361 m = 1; 398 {
362 } else if (screen.cur.row > 0) { 399 if (IS_MULTI2 (screen.rend[row][col - 1]))
363 col = screen.tlen[--row]; 400 m = 1;
364 if (col == -1) 401 }
365 col = TermWin.ncol - 1; 402 else if (screen.cur.row > 0)
366 else 403 {
367 col--; 404 col = screen.tlen[--row];
368 if (col > 0 405 if (col == -1)
369 && IS_MULTI2(screen.rend[row][col])) 406 col = TermWin.ncol - 1;
370 m = 1; 407 else
371 } 408 col--;
372 } 409 if (col > 0
373 if (m) 410 && IS_MULTI2 (screen.rend[row][col]))
374 MEMMOVE(kbuf + 3, kbuf, 3 + 1); 411 m = 1;
375 } 412 }
413 }
414 if (m)
415 MEMMOVE (kbuf + 3, kbuf, 3 + 1);
416 }
376#endif 417#endif
377 break; 418 break;
378 419
379#ifndef UNSHIFTED_SCROLLKEYS 420#ifndef UNSHIFTED_SCROLLKEYS
380# ifdef XK_KP_Prior 421# ifdef XK_KP_Prior
381 case XK_KP_Prior: 422 case XK_KP_Prior:
382 /* allow shift to override */ 423 /* allow shift to override */
383 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 424 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
384 STRCPY(kbuf, "\033Oy"); 425 {
385 break; 426 STRCPY (kbuf, "\033Oy");
386 } 427 break;
387 /* FALLTHROUGH */ 428 }
429 /* FALLTHROUGH */
388# endif 430# endif
389 case XK_Prior: 431 case XK_Prior:
390 STRCPY(kbuf, "\033[5~"); 432 STRCPY (kbuf, "\033[5~");
391 break; 433 break;
392# ifdef XK_KP_Next 434# ifdef XK_KP_Next
393 case XK_KP_Next: 435 case XK_KP_Next:
394 /* allow shift to override */ 436 /* allow shift to override */
395 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 437 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
396 STRCPY(kbuf, "\033Os"); 438 {
397 break; 439 STRCPY (kbuf, "\033Os");
398 } 440 break;
399 /* FALLTHROUGH */ 441 }
442 /* FALLTHROUGH */
400# endif 443# endif
401 case XK_Next: 444 case XK_Next:
402 STRCPY(kbuf, "\033[6~"); 445 STRCPY (kbuf, "\033[6~");
403 break; 446 break;
404#endif 447#endif
405 case XK_KP_Enter: 448 case XK_KP_Enter:
406 /* allow shift to override */ 449 /* allow shift to override */
407 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 450 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
408 STRCPY(kbuf, "\033OM"); 451 {
409 } else { 452 STRCPY (kbuf, "\033OM");
410 kbuf[0] = '\r'; 453 }
411 kbuf[1] = '\0'; 454 else
412 } 455 {
413 break; 456 kbuf[0] = '\r';
457 kbuf[1] = '\0';
458 }
459 break;
414 460
415#ifdef XK_KP_Begin 461#ifdef XK_KP_Begin
416 case XK_KP_Begin: 462 case XK_KP_Begin:
417 STRCPY(kbuf, "\033Ou"); 463 STRCPY (kbuf, "\033Ou");
418 break; 464 break;
419 465
420 case XK_KP_Insert: 466 case XK_KP_Insert:
421 STRCPY(kbuf, "\033Op"); 467 STRCPY (kbuf, "\033Op");
422 break; 468 break;
423 469
424 case XK_KP_Delete: 470 case XK_KP_Delete:
425 STRCPY(kbuf, "\033On"); 471 STRCPY (kbuf, "\033On");
426 break; 472 break;
427#endif 473#endif
428 case XK_KP_F1: /* "\033OP" */ 474 case XK_KP_F1: /* "\033OP" */
429 case XK_KP_F2: /* "\033OQ" */ 475 case XK_KP_F2: /* "\033OQ" */
430 case XK_KP_F3: /* "\033OR" */ 476 case XK_KP_F3: /* "\033OR" */
431 case XK_KP_F4: /* "\033OS" */ 477 case XK_KP_F4: /* "\033OS" */
432 STRCPY(kbuf, "\033OP"); 478 STRCPY (kbuf, "\033OP");
433 kbuf[2] += (keysym - XK_KP_F1); 479 kbuf[2] += (keysym - XK_KP_F1);
434 break; 480 break;
435 481
436 case XK_KP_Multiply: /* "\033Oj" : "*" */ 482 case XK_KP_Multiply: /* "\033Oj" : "*" */
437 case XK_KP_Add: /* "\033Ok" : "+" */ 483 case XK_KP_Add: /* "\033Ok" : "+" */
438 case XK_KP_Separator: /* "\033Ol" : "," */ 484 case XK_KP_Separator: /* "\033Ol" : "," */
439 case XK_KP_Subtract: /* "\033Om" : "-" */ 485 case XK_KP_Subtract: /* "\033Om" : "-" */
440 case XK_KP_Decimal: /* "\033On" : "." */ 486 case XK_KP_Decimal: /* "\033On" : "." */
441 case XK_KP_Divide: /* "\033Oo" : "/" */ 487 case XK_KP_Divide: /* "\033Oo" : "/" */
442 case XK_KP_0: /* "\033Op" : "0" */ 488 case XK_KP_0: /* "\033Op" : "0" */
443 case XK_KP_1: /* "\033Oq" : "1" */ 489 case XK_KP_1: /* "\033Oq" : "1" */
444 case XK_KP_2: /* "\033Or" : "2" */ 490 case XK_KP_2: /* "\033Or" : "2" */
445 case XK_KP_3: /* "\033Os" : "3" */ 491 case XK_KP_3: /* "\033Os" : "3" */
446 case XK_KP_4: /* "\033Ot" : "4" */ 492 case XK_KP_4: /* "\033Ot" : "4" */
447 case XK_KP_5: /* "\033Ou" : "5" */ 493 case XK_KP_5: /* "\033Ou" : "5" */
448 case XK_KP_6: /* "\033Ov" : "6" */ 494 case XK_KP_6: /* "\033Ov" : "6" */
449 case XK_KP_7: /* "\033Ow" : "7" */ 495 case XK_KP_7: /* "\033Ow" : "7" */
450 case XK_KP_8: /* "\033Ox" : "8" */ 496 case XK_KP_8: /* "\033Ox" : "8" */
451 case XK_KP_9: /* "\033Oy" : "9" */ 497 case XK_KP_9: /* "\033Oy" : "9" */
452 /* allow shift to override */ 498 /* allow shift to override */
453 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 499 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
454 STRCPY(kbuf, "\033Oj"); 500 {
455 kbuf[2] += (keysym - XK_KP_Multiply); 501 STRCPY (kbuf, "\033Oj");
456 } else { 502 kbuf[2] += (keysym - XK_KP_Multiply);
503 }
504 else
505 {
457 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 506 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
458 kbuf[1] = '\0'; 507 kbuf[1] = '\0';
459 } 508 }
460 break; 509 break;
461 510
462 case XK_Find: 511 case XK_Find:
463 STRCPY(kbuf, "\033[1~"); 512 STRCPY (kbuf, "\033[1~");
464 break; 513 break;
465 case XK_Insert: 514 case XK_Insert:
466 STRCPY(kbuf, "\033[2~"); 515 STRCPY (kbuf, "\033[2~");
467 break; 516 break;
468#ifdef DXK_Remove /* support for DEC remove like key */ 517#ifdef DXK_Remove /* support for DEC remove like key */
469 case DXK_Remove: 518 case DXK_Remove:
470 /* FALLTHROUGH */ 519 /* FALLTHROUGH */
471#endif 520#endif
472 case XK_Execute: 521 case XK_Execute:
473 STRCPY(kbuf, "\033[3~"); 522 STRCPY (kbuf, "\033[3~");
474 break; 523 break;
475 case XK_Select: 524 case XK_Select:
476 STRCPY(kbuf, "\033[4~"); 525 STRCPY (kbuf, "\033[4~");
477 break; 526 break;
478#ifdef XK_KP_End 527#ifdef XK_KP_End
479 case XK_KP_End: 528 case XK_KP_End:
480 /* allow shift to override */ 529 /* allow shift to override */
481 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 530 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
482 STRCPY(kbuf, "\033Oq"); 531 {
483 break; 532 STRCPY (kbuf, "\033Oq");
484 } 533 break;
485 /* FALLTHROUGH */ 534 }
535 /* FALLTHROUGH */
486#endif 536#endif
487 case XK_End: 537 case XK_End:
488 STRCPY(kbuf, KS_END); 538 STRCPY (kbuf, KS_END);
489 break; 539 break;
490#ifdef XK_KP_Home 540#ifdef XK_KP_Home
491 case XK_KP_Home: 541 case XK_KP_Home:
492 /* allow shift to override */ 542 /* allow shift to override */
493 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) { 543 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
494 STRCPY(kbuf, "\033Ow"); 544 {
495 break; 545 STRCPY (kbuf, "\033Ow");
496 } 546 break;
497 /* FALLTHROUGH */ 547 }
548 /* FALLTHROUGH */
498#endif 549#endif
499 case XK_Home: 550 case XK_Home:
500 STRCPY(kbuf, KS_HOME); 551 STRCPY (kbuf, KS_HOME);
501 break; 552 break;
502 553
503#define FKEY(n, fkey) \ 554#define FKEY(n, fkey) \
504 sprintf((char *)kbuf,"\033[%2d~", (int)((n) + (keysym - fkey))) 555 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
505 556
506 case XK_F1: /* "\033[11~" */ 557 case XK_F1: /* "\033[11~" */
507 case XK_F2: /* "\033[12~" */ 558 case XK_F2: /* "\033[12~" */
508 case XK_F3: /* "\033[13~" */ 559 case XK_F3: /* "\033[13~" */
509 case XK_F4: /* "\033[14~" */ 560 case XK_F4: /* "\033[14~" */
510 case XK_F5: /* "\033[15~" */ 561 case XK_F5: /* "\033[15~" */
511 FKEY(11, XK_F1); 562 FKEY (11, XK_F1);
512 break; 563 break;
513 case XK_F6: /* "\033[17~" */ 564 case XK_F6: /* "\033[17~" */
514 case XK_F7: /* "\033[18~" */ 565 case XK_F7: /* "\033[18~" */
515 case XK_F8: /* "\033[19~" */ 566 case XK_F8: /* "\033[19~" */
516 case XK_F9: /* "\033[20~" */ 567 case XK_F9: /* "\033[20~" */
517 case XK_F10: /* "\033[21~" */ 568 case XK_F10: /* "\033[21~" */
518 FKEY(17, XK_F6); 569 FKEY (17, XK_F6);
519 break; 570 break;
520 case XK_F11: /* "\033[23~" */ 571 case XK_F11: /* "\033[23~" */
521 case XK_F12: /* "\033[24~" */ 572 case XK_F12: /* "\033[24~" */
522 case XK_F13: /* "\033[25~" */ 573 case XK_F13: /* "\033[25~" */
523 case XK_F14: /* "\033[26~" */ 574 case XK_F14: /* "\033[26~" */
524 FKEY(23, XK_F11); 575 FKEY (23, XK_F11);
525 break; 576 break;
526 case XK_F15: /* "\033[28~" */ 577 case XK_F15: /* "\033[28~" */
527 case XK_F16: /* "\033[29~" */ 578 case XK_F16: /* "\033[29~" */
528 FKEY(28, XK_F15); 579 FKEY (28, XK_F15);
529 break; 580 break;
530 case XK_Help: /* "\033[28~" */ 581 case XK_Help: /* "\033[28~" */
531 FKEY(28, XK_Help); 582 FKEY (28, XK_Help);
532 break; 583 break;
533 case XK_Menu: /* "\033[29~" */ 584 case XK_Menu: /* "\033[29~" */
534 FKEY(29, XK_Menu); 585 FKEY (29, XK_Menu);
535 break; 586 break;
536 case XK_F17: /* "\033[31~" */ 587 case XK_F17: /* "\033[31~" */
537 case XK_F18: /* "\033[32~" */ 588 case XK_F18: /* "\033[32~" */
538 case XK_F19: /* "\033[33~" */ 589 case XK_F19: /* "\033[33~" */
539 case XK_F20: /* "\033[34~" */ 590 case XK_F20: /* "\033[34~" */
540 case XK_F21: /* "\033[35~" */ 591 case XK_F21: /* "\033[35~" */
541 case XK_F22: /* "\033[36~" */ 592 case XK_F22: /* "\033[36~" */
542 case XK_F23: /* "\033[37~" */ 593 case XK_F23: /* "\033[37~" */
543 case XK_F24: /* "\033[38~" */ 594 case XK_F24: /* "\033[38~" */
544 case XK_F25: /* "\033[39~" */ 595 case XK_F25: /* "\033[39~" */
545 case XK_F26: /* "\033[40~" */ 596 case XK_F26: /* "\033[40~" */
546 case XK_F27: /* "\033[41~" */ 597 case XK_F27: /* "\033[41~" */
547 case XK_F28: /* "\033[42~" */ 598 case XK_F28: /* "\033[42~" */
548 case XK_F29: /* "\033[43~" */ 599 case XK_F29: /* "\033[43~" */
549 case XK_F30: /* "\033[44~" */ 600 case XK_F30: /* "\033[44~" */
550 case XK_F31: /* "\033[45~" */ 601 case XK_F31: /* "\033[45~" */
551 case XK_F32: /* "\033[46~" */ 602 case XK_F32: /* "\033[46~" */
552 case XK_F33: /* "\033[47~" */ 603 case XK_F33: /* "\033[47~" */
553 case XK_F34: /* "\033[48~" */ 604 case XK_F34: /* "\033[48~" */
554 case XK_F35: /* "\033[49~" */ 605 case XK_F35: /* "\033[49~" */
555 FKEY(31, XK_F17); 606 FKEY (31, XK_F17);
556 break; 607 break;
557#undef FKEY 608#undef FKEY
558 default: 609 default:
559 newlen = 0; 610 newlen = 0;
560 break; 611 break;
561 } 612 }
562 if (newlen) 613 if (newlen)
563 len = STRLEN(kbuf); 614 len = STRLEN (kbuf);
564 } 615 }
565 /* 616 /*
566 * Pass meta for all function keys, if 'meta' option set 617 * Pass meta for all function keys, if 'meta' option set
567 */ 618 */
568#ifdef META8_OPTION 619#ifdef META8_OPTION
569 if (meta && (meta_char == 0x80) && len > 0) 620 if (meta && (meta_char == 0x80) && len > 0)
570 kbuf[len - 1] |= 0x80; 621 kbuf[len - 1] |= 0x80;
571#endif 622#endif
623
624 }
572 } else if (ctrl && keysym == XK_minus) { 625 else if (ctrl && keysym == XK_minus)
626 {
573 len = 1; 627 len = 1;
574 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 628 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
575 } else { 629 }
630 else
631 {
576#ifdef META8_OPTION 632#ifdef META8_OPTION
577 /* set 8-bit on */ 633 /* set 8-bit on */
578 if (meta && (meta_char == 0x80)) { 634 if (meta && (meta_char == 0x80))
579 unsigned char *ch; 635 {
636 unsigned char *ch;
580 637
581 for (ch = kbuf; ch < kbuf + len; ch++) 638 for (ch = kbuf; ch < kbuf + len; ch++)
582 *ch |= 0x80; 639 *ch |= 0x80;
583 meta = 0; 640 meta = 0;
584 } 641 }
585#endif 642#endif
586#ifdef GREEK_SUPPORT 643#ifdef GREEK_SUPPORT
587 if (greek_mode) 644 if (greek_mode)
588 len = greek_xlat(kbuf, len); 645 len = greek_xlat (kbuf, len);
589#endif 646#endif
590 /* nil */ ; 647 /* nil */ ;
591 } 648 }
649 }
650
651 if (len <= 0)
652 return; /* not mapped */
653
654 if (Options & Opt_scrollTtyKeypress)
655 if (TermWin.view_start)
656 {
657 TermWin.view_start = 0;
658 want_refresh = 1;
592 } 659 }
593 660
594 if (len <= 0) 661 /*
595 return; /* not mapped */
596
597 if (Options & Opt_scrollTtyKeypress)
598 if (TermWin.view_start) {
599 TermWin.view_start = 0;
600 want_refresh = 1;
601 }
602
603/*
604 * these modifications only affect the static keybuffer 662 * these modifications only affect the static keybuffer
605 * pass Shift/Control indicators for function keys ending with `~' 663 * pass Shift/Control indicators for function keys ending with `~'
606 * 664 *
607 * eg, 665 * eg,
608 * Prior = "ESC[5~" 666 * Prior = "ESC[5~"
609 * Shift+Prior = "ESC[5$" 667 * Shift+Prior = "ESC[5$"
610 * Ctrl+Prior = "ESC[5^" 668 * Ctrl+Prior = "ESC[5^"
611 * Ctrl+Shift+Prior = "ESC[5@" 669 * Ctrl+Shift+Prior = "ESC[5@"
612 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>). 670 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
613 */ 671 */
614 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~') 672 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
615 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 673 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
616 674
617/* escape prefix */ 675 /* escape prefix */
618 if (meta 676 if (meta
619#ifdef META8_OPTION 677#ifdef META8_OPTION
620 && (meta_char == C0_ESC) 678 && (meta_char == C0_ESC)
621#endif 679#endif
622 ) { 680 )
681 {
623 const unsigned char ch = C0_ESC; 682 const unsigned char ch = C0_ESC;
624 683
625 tt_write(&ch, 1); 684 tt_write (&ch, 1);
626 } 685 }
627#ifdef DEBUG_CMD 686#ifdef DEBUG_CMD
687 if (debug_key)
628 if (debug_key) { /* Display keyboard buffer contents */ 688 { /* Display keyboard buffer contents */
629 char *p; 689 char *p;
630 int i; 690 int i;
631 691
632 fprintf(stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 692 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
633 for (i = 0, p = kbuf; i < len; i++, p++) 693 for (i = 0, p = kbuf; i < len; i++, p++)
634 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 694 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
635 fprintf(stderr, "'\n"); 695 fprintf (stderr, "'\n");
636 } 696 }
637#endif /* DEBUG_CMD */ 697#endif /* DEBUG_CMD */
638 tt_write (kbuf, (unsigned int)len); 698 tt_write (kbuf, (unsigned int)len);
639} 699}
640/*}}} */ 700/*}}} */
641 701
642#if (MENUBAR_MAX) 702#if (MENUBAR_MAX)
643/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 703/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
644/* attempt to `write' count to the input buffer */ 704/* attempt to `write' count to the input buffer */
645unsigned int 705unsigned int
646rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 706rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
647{ 707{
648 unsigned int n, s; 708 unsigned int n, s;
649 709
650 n = cmdbuf_ptr - cmdbuf_base; 710 n = cmdbuf_ptr - cmdbuf_base;
651 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 711 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp;
652 if (n > 0 && s < count) { 712 if (n > 0 && s < count)
713 {
653 MEMMOVE(cmdbuf_base, cmdbuf_ptr, 714 MEMMOVE (cmdbuf_base, cmdbuf_ptr,
654 (unsigned int)(cmdbuf_endp - cmdbuf_ptr)); 715 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
655 cmdbuf_ptr = cmdbuf_base; 716 cmdbuf_ptr = cmdbuf_base;
656 cmdbuf_endp -= n; 717 cmdbuf_endp -= n;
657 s += n; 718 s += n;
658 } 719 }
659 if (count > s) { 720 if (count > s)
721 {
660 rxvt_print_error("data loss: cmd_write too large"); 722 rxvt_print_error ("data loss: cmd_write too large");
661 count = s; 723 count = s;
662 } 724 }
663 for (; count--;) 725 for (; count--;)
664 *cmdbuf_endp++ = *str++; 726 *cmdbuf_endp++ = *str++;
665 return 0; 727 return 0;
666} 728}
667#endif /* MENUBAR_MAX */ 729#endif /* MENUBAR_MAX */
668 730
669void 731void
670rxvt_term::flush () 732rxvt_term::flush ()
… …
684 scr_refresh (refresh_type); 746 scr_refresh (refresh_type);
685 scrollbar_show (1); 747 scrollbar_show (1);
686#ifdef USE_XIM 748#ifdef USE_XIM
687 IMSendSpot (); 749 IMSendSpot ();
688#endif 750#endif
689 }
690 751
691 XFlush (Xdisplay); 752 }
753
754 display->flush ();
692} 755}
693 756
694void 757void
695rxvt_term::check_cb (check_watcher &w) 758rxvt_term::check_cb (check_watcher &w)
696{ 759{
697 SET_R (this); 760 SET_R (this);
698 SET_LOCALE (locale); 761 SET_LOCALE (locale);
699 762
700 flush (); 763 flush ();
701}
702
703void
704rxvt_term::process_x_events ()
705{
706 do
707 {
708 XEvent xev;
709
710 XNextEvent (Xdisplay, &xev);
711
712#if defined(CURSOR_BLINK)
713 if ((Options & Opt_cursorBlink) && xev.type == KeyPress)
714 {
715 if (hidden_cursor)
716 {
717 hidden_cursor = 0;
718 want_refresh = 1;
719 }
720
721 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
722 }
723#endif
724
725#if defined(POINTER_BLANK)
726 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
727 {
728 if (xev.type == MotionNotify
729 || xev.type == ButtonPress
730 || xev.type == ButtonRelease)
731 if (hidden_pointer)
732 pointer_unblank ();
733
734 if (xev.type == KeyPress && hidden_pointer == 0)
735 pointer_blank ();
736 }
737#endif
738
739#ifdef USE_XIM
740 if (!XFilterEvent (&xev, xev.xany.window))
741#endif
742 process_x_event (&xev);
743 }
744 while (XPending (Xdisplay));
745} 764}
746 765
747#ifdef CURSOR_BLINK 766#ifdef CURSOR_BLINK
748void 767void
749rxvt_term::cursor_blink_cb (time_watcher &w) 768rxvt_term::cursor_blink_cb (time_watcher &w)
… …
766 w.start (w.at + TEXT_BLINK_INTERVAL); 785 w.start (w.at + TEXT_BLINK_INTERVAL);
767 } 786 }
768} 787}
769#endif 788#endif
770 789
771void
772rxvt_term::x_cb (io_watcher &w, short revents)
773{
774 SET_R (this);
775 SET_LOCALE (locale);
776
777 process_x_events ();
778}
779
780bool 790bool
781rxvt_term::pty_fill () 791rxvt_term::pty_fill ()
782{ 792{
783 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 793 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
784 794
785 memmove (cmdbuf_base, cmdbuf_ptr, n); 795 memmove (cmdbuf_base, cmdbuf_ptr, n);
786 cmdbuf_ptr = cmdbuf_base; 796 cmdbuf_ptr = cmdbuf_base;
787 cmdbuf_endp = cmdbuf_ptr + n; 797 cmdbuf_endp = cmdbuf_ptr + n;
788 798
789 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 799 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n);
790 800
791 if (n > 0) 801 if (n > 0)
792 { 802 {
793 cmdbuf_endp += n; 803 cmdbuf_endp += n;
… …
855 if (ch == '\n') 865 if (ch == '\n')
856 { 866 {
857 nlines++; 867 nlines++;
858 refresh_count++; 868 refresh_count++;
859 869
860 if (!(Options & Opt_jumpScroll) 870 if (! (Options & Opt_jumpScroll)
861 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 871 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
862 { 872 {
863 refreshnow = true; 873 refreshnow = true;
864 flag = false; 874 flag = false;
865 ch = NOCHAR; 875 ch = NOCHAR;
866 break; 876 break;
877 }
878
879 // scr_add_lines only works for nlines < TermWin.nrow - 1.
880 if (nlines >= TermWin.nrow - 1)
881 {
882 scr_add_lines (buf, nlines, str - buf);
883 nlines = 0;
884 str = buf;
867 } 885 }
868 } 886 }
869 887
870 if (str >= buf + BUFSIZ) 888 if (str >= buf + BUFSIZ)
871 { 889 {
… …
903 process_nonprinting (ch); 921 process_nonprinting (ch);
904 break; 922 break;
905 case C0_ESC: /* escape char */ 923 case C0_ESC: /* escape char */
906 process_escape_seq (); 924 process_escape_seq ();
907 break; 925 break;
908 /*case 0x9b: */ /* CSI */ 926 /*case 0x9b: */ /* CSI */
909 /* process_csi_seq (); */ 927 /* process_csi_seq (); */
910 } 928 }
911 929
912 ch = NOCHAR; 930 ch = NOCHAR;
913 } 931 }
914 } 932 }
… …
925 { 943 {
926 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh 944 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
927 return *cmdbuf_ptr++; 945 return *cmdbuf_ptr++;
928 946
929 wchar_t wc; 947 wchar_t wc;
930 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs); 948 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
931 949
932 if (len == (size_t)-2) 950 if (len == (size_t)-2)
933 return NOCHAR; 951 return NOCHAR;
934 952
935 if (len == (size_t)-1) 953 if (len == (size_t)-1)
… …
941 } 959 }
942 960
943 return NOCHAR; 961 return NOCHAR;
944} 962}
945 963
946/* rxvt_cmd_getc() - Return next input character */ 964/* rxvt_cmd_getc () - Return next input character */
947/* 965/*
948 * Return the next input character after first passing any keyboard input 966 * Return the next input character after first passing any keyboard input
949 * to the command. 967 * to the command.
950 */ 968 */
951uint32_t 969uint32_t
… …
961 // would be preferred. either setjmp/longjmp or better design. 979 // would be preferred. either setjmp/longjmp or better design.
962 fcntl (cmd_fd, F_SETFL, 0); 980 fcntl (cmd_fd, F_SETFL, 0);
963 pty_fill (); 981 pty_fill ();
964 fcntl (cmd_fd, F_SETFL, O_NONBLOCK); 982 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
965 } 983 }
966
967#if 0
968#define TIMEOUT_USEC 5000
969 fd_set readfds;
970 int quick_timeout, select_res;
971 int want_motion_time, want_keypress_time;
972 struct timeval value;
973#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
974 struct timeval tp;
975#endif
976
977 for (;;) {
978 /* loop until we can return something */
979
980 if (v_bufstr < v_bufptr) /* output any pending chars */
981 tt_write(NULL, 0);
982
983#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
984 if (mouse_slip_wheel_speed) {
985 quick_timeout = 1;
986 if (!mouse_slip_wheel_delay--
987 && scr_page (mouse_slip_wheel_speed > 0 ? UP : DN,
988 abs(mouse_slip_wheel_speed))) {
989 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
990 refresh_type |= SMOOTH_REFRESH;
991 want_refresh = 1;
992 }
993 }
994#endif /* MOUSE_WHEEL && MOUSE_SLIP_WHEELING */
995#ifdef SELECTION_SCROLLING
996 if (pending_scroll_selection) {
997 quick_timeout = 1;
998 if (!scroll_selection_delay--
999 && scr_page (scroll_selection_dir,
1000 scroll_selection_lines)) {
1001 selection_extend (selection_save_x,
1002 selection_save_y, selection_save_state);
1003 scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1004 refresh_type |= SMOOTH_REFRESH;
1005 want_refresh = 1;
1006 }
1007 }
1008#endif
1009#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1010 if (scrollbar_isUp() || scrollbar_isDn()) {
1011 quick_timeout = 1;
1012 if (!scroll_arrow_delay--
1013 && scr_page (scrollbar_isUp() ? UP : DN, 1)) {
1014 scroll_arrow_delay = SCROLLBAR_CONTINUOUS_DELAY;
1015 refresh_type |= SMOOTH_REFRESH;
1016 want_refresh = 1;
1017 }
1018 }
1019#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
1020
1021#ifdef TRANSPARENT
1022 quick_timeout |= want_full_refresh;
1023#endif
1024#endif
1025} 984}
1026 985
1027#ifdef POINTER_BLANK 986#ifdef POINTER_BLANK
1028void 987void
1029rxvt_term::pointer_unblank () 988rxvt_term::pointer_unblank ()
1030{ 989{
1031 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 990 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1032 recolour_cursor (); 991 recolour_cursor ();
1033 992
1034 hidden_pointer = 0; 993 hidden_pointer = 0;
1035 994
1036 if (Options & Opt_pointerBlank) 995 if (Options & Opt_pointerBlank)
… …
1038} 997}
1039 998
1040void 999void
1041rxvt_term::pointer_blank () 1000rxvt_term::pointer_blank ()
1042{ 1001{
1043 if (!(Options & Opt_pointerBlank)) 1002 if (! (Options & Opt_pointerBlank))
1044 return; 1003 return;
1045 1004
1046 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 1005 XDefineCursor (display->display, TermWin.vt, blank_cursor);
1047 XFlush (Xdisplay); 1006 XFlush (display->display);
1048 1007
1049 hidden_pointer = 1; 1008 hidden_pointer = 1;
1050} 1009}
1051 1010
1052void 1011void
… …
1058 pointer_blank (); 1017 pointer_blank ();
1059} 1018}
1060#endif 1019#endif
1061 1020
1062void 1021void
1063rxvt_term::mouse_report (const XButtonEvent *ev) 1022rxvt_term::mouse_report (const XButtonEvent &ev)
1064{ 1023{
1065 int button_number, key_state = 0; 1024 int button_number, key_state = 0;
1066 int x, y; 1025 int x, y;
1067 1026
1068 x = ev->x; 1027 x = ev.x;
1069 y = ev->y; 1028 y = ev.y;
1070 pixel_position (&x, &y); 1029 pixel_position (&x, &y);
1071 1030
1072 if (MEvent.button == AnyButton) { 1031 if (MEvent.button == AnyButton)
1032 {
1073 button_number = 3; 1033 button_number = 3;
1074 } else { 1034 }
1035 else
1036 {
1075 button_number = MEvent.button - Button1; 1037 button_number = MEvent.button - Button1;
1076 /* add 0x3D for wheel events, like xterm does */ 1038 /* add 0x3D for wheel events, like xterm does */
1077 if (button_number >= 3) 1039 if (button_number >= 3)
1078 button_number += (64 - 3); 1040 button_number += (64 - 3);
1079 } 1041 }
1080 1042
1081 if (PrivateModes & PrivMode_MouseX10) { 1043 if (PrivateModes & PrivMode_MouseX10)
1044 {
1082 /* 1045 /*
1083 * do not report ButtonRelease 1046 * do not report ButtonRelease
1084 * no state info allowed 1047 * no state info allowed
1085 */ 1048 */
1086 key_state = 0; 1049 key_state = 0;
1087 if (button_number == 3) 1050 if (button_number == 3)
1088 return; 1051 return;
1089 } else { 1052 }
1053 else
1054 {
1090 /* XTerm mouse reporting needs these values: 1055 /* XTerm mouse reporting needs these values:
1091 * 4 = Shift 1056 * 4 = Shift
1092 * 8 = Meta 1057 * 8 = Meta
1093 * 16 = Control 1058 * 16 = Control
1094 * plus will add in our own Double-Click reporting 1059 * plus will add in our own Double-Click reporting
1095 * 32 = Double Click 1060 * 32 = Double Click
1096 */ 1061 */
1097 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1062 key_state = ((MEvent.state & ShiftMask) ? 4 : 0)
1098 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1063 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1099 + ((MEvent.state & ControlMask) ? 16 : 0); 1064 + ((MEvent.state & ControlMask) ? 16 : 0);
1100#ifdef MOUSE_REPORT_DOUBLECLICK 1065#ifdef MOUSE_REPORT_DOUBLECLICK
1101 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1066 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1102#endif 1067#endif
1068
1103 } 1069 }
1104 1070
1105#ifdef DEBUG_MOUSEREPORT 1071#ifdef DEBUG_MOUSEREPORT
1106 fprintf(stderr, "Mouse ["); 1072 fprintf (stderr, "Mouse [");
1107 if (key_state & 16) 1073 if (key_state & 16)
1108 fputc('C', stderr); 1074 fputc ('C', stderr);
1109 if (key_state & 4) 1075 if (key_state & 4)
1110 fputc('S', stderr); 1076 fputc ('S', stderr);
1111 if (key_state & 8) 1077 if (key_state & 8)
1112 fputc('A', stderr); 1078 fputc ('A', stderr);
1113 if (key_state & 32) 1079 if (key_state & 32)
1114 fputc('2', stderr); 1080 fputc ('2', stderr);
1115 fprintf(stderr, "]: <%d>, %d/%d\n", 1081 fprintf (stderr, "]: <%d>, %d/%d\n",
1116 button_number, 1082 button_number,
1117 x + 1, 1083 x + 1,
1118 y + 1); 1084 y + 1);
1119#else 1085#else
1120 tt_printf("\033[M%c%c%c", 1086 tt_printf ("\033[M%c%c%c",
1121 (32 + button_number + key_state), 1087 (32 + button_number + key_state),
1122 (32 + x + 1), 1088 (32 + x + 1),
1123 (32 + y + 1)); 1089 (32 + y + 1));
1124#endif 1090#endif
1125} 1091}
1126 1092
1127#ifdef USING_W11LIB 1093#ifdef USING_W11LIB
1128void 1094void
1129rxvt_W11_process_x_event(XEvent *ev) 1095rxvt_W11_process_x_event (XEvent *ev)
1130{ 1096{
1131 rxvt_t *r = rxvt_get_r(); 1097 rxvt_t *r = rxvt_get_r ();
1132 1098
1133 process_x_event (ev); 1099 x_cb (*ev);
1134} 1100}
1135#endif 1101#endif
1136 1102
1137/*{{{ process an X event */ 1103/*{{{ process an X event */
1138void 1104void
1139rxvt_term::process_x_event (XEvent *ev) 1105rxvt_term::x_cb (XEvent &ev)
1140{ 1106{
1107 SET_R (this);
1108 SET_LOCALE (locale);
1109
1110#if defined(CURSOR_BLINK)
1111 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
1112 {
1113 if (hidden_cursor)
1114 {
1115 hidden_cursor = 0;
1116 want_refresh = 1;
1117 }
1118
1119 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1120 }
1121#endif
1122
1123#if defined(POINTER_BLANK)
1124 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
1125 {
1126 if (ev.type == MotionNotify
1127 || ev.type == ButtonPress
1128 || ev.type == ButtonRelease)
1129 if (hidden_pointer)
1130 pointer_unblank ();
1131
1132 if (ev.type == KeyPress && hidden_pointer == 0)
1133 pointer_blank ();
1134 }
1135#endif
1136
1137#ifdef USE_XIM
1138 if (XFilterEvent (&ev, None))
1139 return;
1140#endif
1141
1141 Window unused_root, unused_child; 1142 Window unused_root, unused_child;
1142 int unused_root_x, unused_root_y; 1143 int unused_root_x, unused_root_y;
1143 unsigned int unused_mask; 1144 unsigned int unused_mask;
1144 1145
1145#ifdef DEBUG_X 1146#ifdef DEBUG_X
1146 const char *const eventnames[] = 1147 const char *const eventnames[] =
1147 { /* mason - this matches my system */ 1148 { /* mason - this matches my system */
1148 "", 1149 "",
1149 "", 1150 "",
1150 "KeyPress", 1151 "KeyPress",
1151 "KeyRelease", 1152 "KeyRelease",
1152 "ButtonPress", 1153 "ButtonPress",
1153 "ButtonRelease", 1154 "ButtonRelease",
1154 "MotionNotify", 1155 "MotionNotify",
1155 "EnterNotify", 1156 "EnterNotify",
1156 "LeaveNotify", 1157 "LeaveNotify",
1157 "FocusIn", 1158 "FocusIn",
1158 "FocusOut", 1159 "FocusOut",
1159 "KeymapNotify", 1160 "KeymapNotify",
1160 "Expose", 1161 "Expose",
1161 "GraphicsExpose", 1162 "GraphicsExpose",
1162 "NoExpose", 1163 "NoExpose",
1163 "VisibilityNotify", 1164 "VisibilityNotify",
1164 "CreateNotify", 1165 "CreateNotify",
1165 "DestroyNotify", 1166 "DestroyNotify",
1166 "UnmapNotify", 1167 "UnmapNotify",
1167 "MapNotify", 1168 "MapNotify",
1168 "MapRequest", 1169 "MapRequest",
1169 "ReparentNotify", 1170 "ReparentNotify",
1170 "ConfigureNotify", 1171 "ConfigureNotify",
1171 "ConfigureRequest", 1172 "ConfigureRequest",
1172 "GravityNotify", 1173 "GravityNotify",
1173 "ResizeRequest", 1174 "ResizeRequest",
1174 "CirculateNotify", 1175 "CirculateNotify",
1175 "CirculateRequest", 1176 "CirculateRequest",
1176 "PropertyNotify", 1177 "PropertyNotify",
1177 "SelectionClear", 1178 "SelectionClear",
1178 "SelectionRequest", 1179 "SelectionRequest",
1179 "SelectionNotify", 1180 "SelectionNotify",
1180 "ColormapNotify", 1181 "ColormapNotify",
1181 "ClientMessage", 1182 "ClientMessage",
1182 "MappingNotify" 1183 "MappingNotify"
1183 }; 1184 };
1184#endif 1185#endif
1185 1186
1186#ifdef DEBUG_X 1187#ifdef DEBUG_X
1187 struct timeval tp; 1188 struct timeval tp;
1188 struct tm *ltt; 1189 struct tm *ltt;
1189 (void)gettimeofday(&tp, NULL); 1190 (void)gettimeofday (&tp, NULL);
1190 ltt = localtime(&(tp.tv_sec)); 1191 ltt = localtime (& (tp.tv_sec));
1191 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)); 1192 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));
1192#endif 1193#endif
1193 1194
1194 switch (ev->type) { 1195 switch (ev.type)
1196 {
1195 case KeyPress: 1197 case KeyPress:
1196 lookup_key ((XKeyEvent *)ev); 1198 lookup_key (ev.xkey);
1197 break; 1199 break;
1198 1200
1199#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1201#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1200 case KeyRelease: 1202 case KeyRelease:
1201 { 1203 {
1202 if (!(ev->xkey.state & ControlMask)) 1204 if (! (ev.xkey.state & ControlMask))
1203 mouse_slip_wheel_speed = 0;
1204 else {
1205 KeySym ks;
1206
1207 ks = XKeycodeToKeysym(Xdisplay, ev->xkey.keycode, 0);
1208 if (ks == XK_Control_L || ks == XK_Control_R)
1209 mouse_slip_wheel_speed = 0; 1205 mouse_slip_wheel_speed = 0;
1210 } 1206 else
1211 break; 1207 {
1212 } 1208 KeySym ks;
1213#endif
1214 1209
1210 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1211 if (ks == XK_Control_L || ks == XK_Control_R)
1212 mouse_slip_wheel_speed = 0;
1213 }
1214 break;
1215 }
1216#endif
1217
1215 case ButtonPress: 1218 case ButtonPress:
1216 button_press ((XButtonEvent *)ev); 1219 button_press (ev.xbutton);
1217 break; 1220 break;
1218 1221
1219 case ButtonRelease: 1222 case ButtonRelease:
1220 button_release ((XButtonEvent *)ev); 1223 button_release (ev.xbutton);
1221 break; 1224 break;
1222 1225
1223 case ClientMessage: 1226 case ClientMessage:
1224 if (ev->xclient.format == 32 1227 if (ev.xclient.format == 32
1225 && (Atom)ev->xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1228 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])
1226 destroy (); 1229 destroy ();
1227#ifdef OFFIX_DND 1230#ifdef OFFIX_DND
1228 /* OffiX Dnd (drag 'n' drop) protocol */ 1231 /* OffiX Dnd (drag 'n' drop) protocol */
1229 else if (ev->xclient.message_type == xa[XA_DNDPROTOCOL] 1232 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1230 && (ev->xclient.data.l[0] == DndFile 1233 && (ev.xclient.data.l[0] == DndFile
1231 || ev->xclient.data.l[0] == DndDir 1234 || ev.xclient.data.l[0] == DndDir
1232 || ev->xclient.data.l[0] == DndLink)) { 1235 || ev.xclient.data.l[0] == DndLink))
1233 /* Get Dnd data */ 1236 {
1237 /* Get Dnd data */
1234 Atom ActualType; 1238 Atom ActualType;
1235 int ActualFormat; 1239 int ActualFormat;
1236 unsigned char *data; 1240 unsigned char *data;
1237 unsigned long Size, RemainingBytes; 1241 unsigned long Size, RemainingBytes;
1238 1242
1239 XGetWindowProperty(Xdisplay, Xroot, 1243 XGetWindowProperty (display->display, display->root,
1240 xa[XA_DNDSELECTION], 1244 xa[XA_DNDSELECTION],
1241 0L, 1000000L, 1245 0L, 1000000L,
1242 False, AnyPropertyType, 1246 False, AnyPropertyType,
1243 &ActualType, &ActualFormat, 1247 &ActualType, &ActualFormat,
1244 &Size, &RemainingBytes, 1248 &Size, &RemainingBytes,
1245 &data); 1249 &data);
1246 XChangeProperty(Xdisplay, Xroot, 1250 XChangeProperty (display->display, display->root,
1247 XA_CUT_BUFFER0, XA_STRING, 1251 XA_CUT_BUFFER0, XA_STRING,
1248 8, PropModeReplace, 1252 8, PropModeReplace,
1249 data, STRLEN(data)); 1253 data, STRLEN (data));
1250 selection_paste (Xroot, XA_CUT_BUFFER0, True); 1254 selection_paste (display->root, XA_CUT_BUFFER0, True);
1251 XSetInputFocus(Xdisplay, Xroot, RevertToNone, CurrentTime); 1255 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1252 } 1256 }
1253#endif /* OFFIX_DND */ 1257#endif /* OFFIX_DND */
1254 break; 1258 break;
1255 1259
1256 case MappingNotify: 1260 case MappingNotify:
1257 XRefreshKeyboardMapping(&(ev->xmapping)); 1261 XRefreshKeyboardMapping (& (ev.xmapping));
1258 break; 1262 break;
1259 1263
1260 /* 1264 /*
1261 * XXX: this is not the _current_ arrangement 1265 * XXX: this is not the _current_ arrangement
1262 * Here's my conclusion: 1266 * Here's my conclusion:
1263 * If the window is completely unobscured, use bitblt's 1267 * If the window is completely unobscured, use bitblt's
1264 * to scroll. Even then, they're only used when doing partial 1268 * to scroll. Even then, they're only used when doing partial
1265 * screen scrolling. When partially obscured, we have to fill 1269 * screen scrolling. When partially obscured, we have to fill
1266 * in the GraphicsExpose parts, which means that after each refresh, 1270 * in the GraphicsExpose parts, which means that after each refresh,
1267 * we need to wait for the graphics expose or Noexpose events, 1271 * we need to wait for the graphics expose or Noexpose events,
1268 * which ought to make things real slow! 1272 * which ought to make things real slow!
1269 */ 1273 */
1270 case VisibilityNotify: 1274 case VisibilityNotify:
1271 switch (ev->xvisibility.state) 1275 switch (ev.xvisibility.state)
1272 { 1276 {
1273 case VisibilityUnobscured: 1277 case VisibilityUnobscured:
1274 refresh_type = FAST_REFRESH; 1278 refresh_type = FAST_REFRESH;
1275 break; 1279 break;
1276 case VisibilityPartiallyObscured: 1280 case VisibilityPartiallyObscured:
… …
1278 break; 1282 break;
1279 default: 1283 default:
1280 refresh_type = NO_REFRESH; 1284 refresh_type = NO_REFRESH;
1281 break; 1285 break;
1282 } 1286 }
1283 break; 1287 break;
1284 1288
1285 case FocusIn: 1289 case FocusIn:
1286 if (!TermWin.focus) { 1290 if (!TermWin.focus)
1291 {
1287 TermWin.focus = 1; 1292 TermWin.focus = 1;
1288 want_refresh = 1; 1293 want_refresh = 1;
1289#ifdef USE_XIM 1294#ifdef USE_XIM
1290 if (Input_Context != NULL) 1295 if (Input_Context != NULL)
1291 XSetICFocus(Input_Context); 1296 XSetICFocus (Input_Context);
1292#endif 1297#endif
1293#ifdef CURSOR_BLINK 1298#ifdef CURSOR_BLINK
1294 if (Options & Opt_cursorBlink) 1299 if (Options & Opt_cursorBlink)
1295 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1300 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1296#endif 1301#endif
1297 }
1298 break;
1299 1302
1303 }
1304 break;
1305
1300 case FocusOut: 1306 case FocusOut:
1301 if (TermWin.focus) { 1307 if (TermWin.focus)
1308 {
1302 TermWin.focus = 0; 1309 TermWin.focus = 0;
1303 want_refresh = 1; 1310 want_refresh = 1;
1304#ifdef USE_XIM 1311#ifdef USE_XIM
1305 if (Input_Context != NULL) 1312 if (Input_Context != NULL)
1306 XUnsetICFocus(Input_Context); 1313 XUnsetICFocus (Input_Context);
1307#endif 1314#endif
1308#ifdef CURSOR_BLINK 1315#ifdef CURSOR_BLINK
1309 if (Options & Opt_cursorBlink) 1316 if (Options & Opt_cursorBlink)
1310 cursor_blink_ev.stop (); 1317 cursor_blink_ev.stop ();
1311 hidden_cursor = 0; 1318 hidden_cursor = 0;
1312#endif 1319#endif
1313 }
1314 break;
1315 1320
1321 }
1322 break;
1323
1316 case ConfigureNotify: 1324 case ConfigureNotify:
1317 if (ev->xconfigure.window == TermWin.parent[0]) { 1325 if (ev.xconfigure.window == TermWin.parent[0])
1318 int height, width; 1326 {
1327 int height, width;
1319 1328
1329 do
1320 do { /* Wrap lots of configures into one */ 1330 { /* Wrap lots of configures into one */
1321 width = ev->xconfigure.width; 1331 width = ev.xconfigure.width;
1322 height = ev->xconfigure.height; 1332 height = ev.xconfigure.height;
1323 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1333 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1324 } while (XCheckTypedWindowEvent(Xdisplay, ev->xconfigure.window, 1334 }
1325 ConfigureNotify, ev)); 1335 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1336
1326 if (szHint.width != width || szHint.height != height) { 1337 if (szHint.width != width || szHint.height != height)
1338 {
1327 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1339 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1328 resize_all_windows (width, height, 1); 1340 resize_all_windows (width, height, 1);
1329 } 1341 }
1330#ifdef DEBUG_SIZE 1342#ifdef DEBUG_SIZE
1331 else { 1343 else
1344 {
1332 D_SIZE((stderr, "Size: Not resizing")); 1345 D_SIZE ((stderr, "Size: Not resizing"));
1333 } 1346 }
1334#endif 1347#endif
1335#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1348#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1336 if (Options & Opt_transparent) { 1349 if (Options & Opt_transparent)
1337 check_our_parents (); 1350 {
1338 if (am_transparent) 1351 check_our_parents ();
1352 if (am_transparent)
1339 want_full_refresh = 1; 1353 want_full_refresh = 1;
1340 } 1354 }
1341#endif 1355#endif
1342 }
1343 break;
1344 1356
1357 }
1358 break;
1359
1345 case SelectionClear: 1360 case SelectionClear:
1346 selection_clear (); 1361 display->set_selection_owner (0);
1347 break; 1362 break;
1348 1363
1349 case SelectionNotify: 1364 case SelectionNotify:
1350 if (selection_wait == Sel_normal) 1365 if (selection_wait == Sel_normal)
1351 selection_paste (ev->xselection.requestor, 1366 selection_paste (ev.xselection.requestor,
1352 ev->xselection.property, True); 1367 ev.xselection.property, True);
1353 break; 1368 break;
1354 1369
1355 case SelectionRequest: 1370 case SelectionRequest:
1356 selection_send (&(ev->xselectionrequest)); 1371 selection_send (ev.xselectionrequest);
1357 break; 1372 break;
1358 1373
1359 case UnmapNotify: 1374 case UnmapNotify:
1360 TermWin.mapped = 0; 1375 TermWin.mapped = 0;
1361#ifdef TEXT_BLINK 1376#ifdef TEXT_BLINK
1362 text_blink_ev.stop (); 1377 text_blink_ev.stop ();
1363#endif 1378#endif
1364 break; 1379 break;
1365 1380
1366 case MapNotify: 1381 case MapNotify:
1367 TermWin.mapped = 1; 1382 TermWin.mapped = 1;
1368#ifdef TEXT_BLINK 1383#ifdef TEXT_BLINK
1369 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1384 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1370#endif 1385#endif
1371 break;
1372
1373 case PropertyNotify:
1374 if (ev->xproperty.atom == xa[XA_VT_SELECTION]) {
1375 if (ev->xproperty.state == PropertyNewValue)
1376 selection_property (ev->xproperty.window,
1377 ev->xproperty.atom);
1378 break; 1386 break;
1379 } 1387
1380#ifdef TRANSPARENT 1388#ifdef TRANSPARENT
1381 /*
1382 * if user used some Esetroot compatible prog to set the root bg,
1383 * use the property to determine the pixmap. We use it later on.
1384 */
1385 if (xa[XA_XROOTPMAPID] == 0)
1386 xa[XA_XROOTPMAPID] = XInternAtom(Xdisplay,
1387 "_XROOTPMAP_ID", False);
1388 if (ev->xproperty.atom != xa[XA_XROOTPMAPID])
1389 break;
1390 /* FALLTHROUGH */
1391 case ReparentNotify: 1389 case ReparentNotify:
1392 if ((Options & Opt_transparent) && check_our_parents ()) { 1390 rootwin_cb (ev);
1393 if (am_transparent) 1391 break;
1394 want_full_refresh = 1;
1395 }
1396#endif /* TRANSPARENT */ 1392#endif /* TRANSPARENT */
1397 break;
1398 1393
1399 case GraphicsExpose: 1394 case GraphicsExpose:
1400 case Expose: 1395 case Expose:
1401 if (ev->xany.window == TermWin.vt) { 1396 if (ev.xany.window == TermWin.vt)
1397 {
1402#ifdef NO_SLOW_LINK_SUPPORT 1398#ifdef NO_SLOW_LINK_SUPPORT
1403 scr_expose (ev->xexpose.x, ev->xexpose.y, 1399 scr_expose (ev.xexpose.x, ev.xexpose.y,
1404 ev->xexpose.width, ev->xexpose.height, False); 1400 ev.xexpose.width, ev.xexpose.height, False);
1405#else 1401#else
1406 // don't understand this, so commented it out 1402 // don't understand this, so commented it out
1407 scr_expose (ev->xexpose.x, ev->xexpose.y, 1403 scr_expose (ev.xexpose.x, ev.xexpose.y,
1408 ev->xexpose.width, ev->xexpose.height, False); 1404 ev.xexpose.width, ev.xexpose.height, False);
1409 //scr_expose (ev->xexpose.x, 0, 1405 //scr_expose (ev.xexpose.x, 0,
1410 // ev->xexpose.width, TermWin.height, False); 1406 // ev.xexpose.width, TermWin.height, False);
1411#endif 1407#endif
1412 want_refresh = 1; 1408 want_refresh = 1;
1413 } else { 1409 }
1414 XEvent unused_xevent; 1410 else
1411 {
1412 XEvent unused_event;
1415 1413
1416 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, 1414 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1417 Expose, 1415 Expose,
1418 &unused_xevent)) ; 1416 &unused_event)) ;
1419 while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, 1417 while (XCheckTypedWindowEvent (display->display, ev.xany.window,
1420 GraphicsExpose, 1418 GraphicsExpose,
1421 &unused_xevent)) ; 1419 &unused_event)) ;
1422 if (isScrollbarWindow(ev->xany.window)) { 1420 if (isScrollbarWindow (ev.xany.window))
1423 scrollBar.setIdle(); 1421 {
1424 scrollbar_show (0); 1422 scrollBar.setIdle ();
1425 } 1423 scrollbar_show (0);
1424 }
1426#ifdef MENUBAR 1425#ifdef MENUBAR
1427 if (menubar_visible () && isMenuBarWindow(ev->xany.window)) 1426 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1428 menubar_expose (); 1427 menubar_expose ();
1429#endif 1428#endif
1430#ifdef RXVT_GRAPHICS 1429#ifdef RXVT_GRAPHICS
1431 Gr_expose (ev->xany.window); 1430 Gr_expose (ev.xany.window);
1432#endif 1431#endif
1433 }
1434 break;
1435 1432
1433 }
1434 break;
1435
1436 case MotionNotify: 1436 case MotionNotify:
1437#ifdef POINTER_BLANK 1437#ifdef POINTER_BLANK
1438 if (hidden_pointer) 1438 if (hidden_pointer)
1439 pointer_unblank (); 1439 pointer_unblank ();
1440#endif 1440#endif
1441#if MENUBAR 1441#if MENUBAR
1442 if (isMenuBarWindow(ev->xany.window)) { 1442 if (isMenuBarWindow (ev.xany.window))
1443 {
1443 menubar_control (&(ev->xbutton)); 1444 menubar_control (& (ev.xbutton));
1444 break; 1445 break;
1445 } 1446 }
1446#endif 1447#endif
1447 if ((PrivateModes & PrivMode_mouse_report) && !(bypass_keystate)) 1448 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1448 break; 1449 break;
1449 1450
1450 if (ev->xany.window == TermWin.vt) { 1451 if (ev.xany.window == TermWin.vt)
1452 {
1451 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) { 1453 if ((ev.xbutton.state & (Button1Mask | Button3Mask)))
1452 while (XCheckTypedWindowEvent(Xdisplay, TermWin.vt, 1454 {
1453 MotionNotify, ev)) ; 1455 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1454 XQueryPointer(Xdisplay, TermWin.vt, 1456 ;
1455 &unused_root, &unused_child, 1457
1456 &unused_root_x, &unused_root_y, 1458 XQueryPointer (display->display, TermWin.vt,
1457 &(ev->xbutton.x), &(ev->xbutton.y), 1459 &unused_root, &unused_child,
1458 &unused_mask); 1460 &unused_root_x, &unused_root_y,
1461 & (ev.xbutton.x), & (ev.xbutton.y),
1462 &unused_mask);
1459#ifdef MOUSE_THRESHOLD 1463#ifdef MOUSE_THRESHOLD
1460 /* deal with a `jumpy' mouse */ 1464 /* deal with a `jumpy' mouse */
1461 if ((ev->xmotion.time - MEvent.time) > MOUSE_THRESHOLD) { 1465 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1466 {
1462#endif 1467#endif
1463 selection_extend ((ev->xbutton.x), (ev->xbutton.y), 1468 selection_extend ((ev.xbutton.x), (ev.xbutton.y),
1464 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1469 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1465#ifdef SELECTION_SCROLLING 1470#ifdef SELECTION_SCROLLING
1466 if (ev->xbutton.y < TermWin.int_bwidth 1471 if (ev.xbutton.y < TermWin.int_bwidth
1467 || Pixel2Row(ev->xbutton.y) > (TermWin.nrow-1)) { 1472 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1468 int dist;
1469
1470 pending_scroll_selection=1;
1471
1472 /* don't clobber the current delay if we are
1473 * already in the middle of scrolling.
1474 */
1475 if (scroll_selection_delay<=0)
1476 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1477
1478 /* save the event params so we can highlight
1479 * the selection in the pending-scroll loop
1480 */
1481 selection_save_x=ev->xbutton.x;
1482 selection_save_y=ev->xbutton.y;
1483 selection_save_state=
1484 (ev->xbutton.state & Button3Mask) ? 2 : 0;
1485
1486 /* calc number of lines to scroll */
1487 if (ev->xbutton.y<TermWin.int_bwidth) {
1488 scroll_selection_dir = UP;
1489 dist = TermWin.int_bwidth - ev->xbutton.y;
1490 }
1491 else {
1492 scroll_selection_dir = DN;
1493 dist = ev->xbutton.y -
1494 (TermWin.int_bwidth + TermWin.height);
1495 }
1496 scroll_selection_lines=(Pixel2Height(dist)/
1497 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1498 MIN_IT(scroll_selection_lines,
1499 SELECTION_SCROLL_MAX_LINES);
1500 }
1501 else {
1502 /* we are within the text window, so we
1503 * shouldn't be scrolling
1504 */
1505 pending_scroll_selection = 0;
1506 }
1507#endif
1508#ifdef MOUSE_THRESHOLD
1509 }
1510#endif
1511 }
1512 } else if (isScrollbarWindow(ev->xany.window) && scrollbar_isMotion()) {
1513 while (XCheckTypedWindowEvent(Xdisplay, scrollBar.win,
1514 MotionNotify, ev)) ;
1515 XQueryPointer(Xdisplay, scrollBar.win,
1516 &unused_root, &unused_child,
1517 &unused_root_x, &unused_root_y,
1518 &(ev->xbutton.x), &(ev->xbutton.y),
1519 &unused_mask);
1520 scr_move_to (scrollbar_position(ev->xbutton.y) - csrO,
1521 scrollbar_size());
1522 scr_refresh (refresh_type);
1523 refresh_limit = 0;
1524 scrollbar_show (1);
1525 }
1526 break;
1527 }
1528}
1529
1530void
1531rxvt_term::button_press (XButtonEvent *ev)
1532{
1533 int reportmode = 0, clickintime;
1534
1535 bypass_keystate = ev->state & (ModMetaMask | ShiftMask);
1536 if (!bypass_keystate)
1537 reportmode = !!(PrivateModes & PrivMode_mouse_report);
1538/*
1539 * VT window processing of button press
1540 */
1541 if (ev->window == TermWin.vt)
1542 {
1543#if RXVT_GRAPHICS
1544 if (ev->subwindow != None)
1545 rxvt_Gr_ButtonPress (ev->x, ev->y);
1546 else
1547#endif
1548 {
1549 clickintime = ev->time - MEvent.time < MULTICLICK_TIME;
1550 if (reportmode)
1551 {
1552 /* mouse report from vt window */
1553 /* save the xbutton state (for ButtonRelease) */
1554 MEvent.state = ev->state;
1555#ifdef MOUSE_REPORT_DOUBLECLICK
1556 if (ev->button == MEvent.button && clickintime)
1557 {
1558 /* same button, within alloted time */
1559 MEvent.clicks++;
1560 if (MEvent.clicks > 1)
1561 { 1473 {
1562 /* only report double clicks */ 1474 int dist;
1563 MEvent.clicks = 2;
1564 mouse_report (ev);
1565 1475
1566 /* don't report the release */ 1476 pending_scroll_selection=1;
1567 MEvent.clicks = 0; 1477
1568 MEvent.button = AnyButton; 1478 /* don't clobber the current delay if we are
1569 } 1479 * already in the middle of scrolling.
1570 }
1571 else
1572 { 1480 */
1573 /* different button, or time expired */ 1481 if (scroll_selection_delay<=0)
1574 MEvent.clicks = 1; 1482 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1575 MEvent.button = ev->button; 1483
1576 mouse_report (ev); 1484 /* save the event params so we can highlight
1577 } 1485 * the selection in the pending-scroll loop
1578#else
1579 MEvent.button = ev->button;
1580 mouse_report (ev);
1581#endif /* MOUSE_REPORT_DOUBLECLICK */
1582 }
1583 else
1584 {
1585 if (ev->button != MEvent.button)
1586 MEvent.clicks = 0;
1587 switch (ev->button)
1588 { 1486 */
1589 case Button1: 1487 selection_save_x=ev.xbutton.x;
1590 /* allow shift+left click to extend selection */ 1488 selection_save_y=ev.xbutton.y;
1591 if (ev->state & ShiftMask && !(PrivateModes & PrivMode_mouse_report)) 1489 selection_save_state=
1490 (ev.xbutton.state & Button3Mask) ? 2 : 0;
1491
1492 /* calc number of lines to scroll */
1493 if (ev.xbutton.y<TermWin.int_bwidth)
1592 { 1494 {
1593 if (MEvent.button == Button1 && clickintime) 1495 scroll_selection_dir = UP;
1594 selection_rotate (ev->x, ev->y); 1496 dist = TermWin.int_bwidth - ev.xbutton.y;
1595 else
1596 selection_extend (ev->x, ev->y, 1);
1597 } 1497 }
1598 else 1498 else
1599 { 1499 {
1600 if (MEvent.button == Button1 && clickintime) 1500 scroll_selection_dir = DN;
1601 MEvent.clicks++; 1501 dist = ev.xbutton.y -
1602 else 1502 (TermWin.int_bwidth + TermWin.height);
1603 MEvent.clicks = 1;
1604
1605 selection_click (MEvent.clicks, ev->x, ev->y);
1606 } 1503 }
1504 scroll_selection_lines= (Pixel2Height (dist)/
1505 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1506 MIN_IT (scroll_selection_lines,
1507 SELECTION_SCROLL_MAX_LINES);
1508 }
1509 else
1510 {
1511 /* we are within the text window, so we
1512 * shouldn't be scrolling
1513 */
1514 pending_scroll_selection = 0;
1515 }
1516#endif
1517#ifdef MOUSE_THRESHOLD
1607 1518
1519 }
1520#endif
1521
1522 }
1523 }
1524 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1525 {
1526 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1527 MotionNotify, &ev)) ;
1528 XQueryPointer (display->display, scrollBar.win,
1529 &unused_root, &unused_child,
1530 &unused_root_x, &unused_root_y,
1531 & (ev.xbutton.x), & (ev.xbutton.y),
1532 &unused_mask);
1533 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1534 scrollbar_size ());
1535 scr_refresh (refresh_type);
1536 refresh_limit = 0;
1537 scrollbar_show (1);
1538 }
1539 break;
1540 }
1541}
1542
1543void
1544rxvt_term::rootwin_cb (XEvent &ev)
1545{
1546 SET_R (this);
1547 SET_LOCALE (locale);
1548
1549 switch (ev.type)
1550 {
1551 case PropertyNotify:
1552 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1553 {
1554 if (ev.xproperty.state == PropertyNewValue)
1555 selection_property (ev.xproperty.window, ev.xproperty.atom);
1556 break;
1557 }
1558#ifdef TRANSPARENT
1559 else
1560 {
1561 /*
1562 * if user used some Esetroot compatible prog to set the root bg,
1563 * use the property to determine the pixmap. We use it later on.
1564 */
1565 if (xa[XA_XROOTPMAPID] == 0)
1566 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1567
1568 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1569 return;
1570 }
1571
1572 /* FALLTHROUGH */
1573 case ReparentNotify:
1574 if ((Options & Opt_transparent) && check_our_parents ())
1575 if (am_transparent)
1576 want_full_refresh = 1;
1577 break;
1578#endif
1579 }
1580}
1581
1582void
1583rxvt_term::button_press (const XButtonEvent &ev)
1584{
1585 int reportmode = 0, clickintime;
1586
1587 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1588 if (!bypass_keystate)
1589 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1590 /*
1591 * VT window processing of button press
1592 */
1593 if (ev.window == TermWin.vt)
1594 {
1595#if RXVT_GRAPHICS
1596 if (ev.subwindow != None)
1597 rxvt_Gr_ButtonPress (ev.x, ev.y);
1598 else
1599#endif
1600
1601 {
1602 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1603 if (reportmode)
1604 {
1605 /* mouse report from vt window */
1606 /* save the xbutton state (for ButtonRelease) */
1607 MEvent.state = ev.state;
1608#ifdef MOUSE_REPORT_DOUBLECLICK
1609 if (ev.button == MEvent.button && clickintime)
1610 {
1611 /* same button, within alloted time */
1612 MEvent.clicks++;
1613 if (MEvent.clicks > 1)
1614 {
1615 /* only report double clicks */
1616 MEvent.clicks = 2;
1617 mouse_report (ev);
1618
1619 /* don't report the release */
1620 MEvent.clicks = 0;
1621 MEvent.button = AnyButton;
1622 }
1623 }
1624 else
1625 {
1626 /* different button, or time expired */
1627 MEvent.clicks = 1;
1628 MEvent.button = ev.button;
1629 mouse_report (ev);
1630 }
1631#else
1632 MEvent.button = ev.button;
1633 mouse_report (ev);
1634#endif /* MOUSE_REPORT_DOUBLECLICK */
1635
1636 }
1637 else
1638 {
1639 if (ev.button != MEvent.button)
1640 MEvent.clicks = 0;
1641 switch (ev.button)
1642 {
1643 case Button1:
1644 /* allow shift+left click to extend selection */
1645 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report))
1646 {
1647 if (MEvent.button == Button1 && clickintime)
1648 selection_rotate (ev.x, ev.y);
1649 else
1650 selection_extend (ev.x, ev.y, 1);
1651 }
1652 else
1653 {
1654 if (MEvent.button == Button1 && clickintime)
1655 MEvent.clicks++;
1656 else
1657 MEvent.clicks = 1;
1658
1659 selection_click (MEvent.clicks, ev.x, ev.y);
1660 }
1661
1608 MEvent.button = Button1; 1662 MEvent.button = Button1;
1663 break;
1664
1665 case Button3:
1666 if (MEvent.button == Button3 && clickintime)
1667 selection_rotate (ev.x, ev.y);
1668 else
1669 selection_extend (ev.x, ev.y, 1);
1670 MEvent.button = Button3;
1671 break;
1672 }
1673 }
1674 MEvent.time = ev.time;
1675 return;
1676 }
1677 }
1678
1679 /*
1680 * Scrollbar window processing of button press
1681 */
1682 if (isScrollbarWindow (ev.window))
1683 {
1684 scrollBar.setIdle ();
1685 /*
1686 * Rxvt-style scrollbar:
1687 * move up if mouse is above slider
1688 * move dn if mouse is below slider
1689 *
1690 * XTerm-style scrollbar:
1691 * Move display proportional to pointer location
1692 * pointer near top -> scroll one line
1693 * pointer near bot -> scroll full page
1694 */
1695#ifndef NO_SCROLLBAR_REPORT
1696 if (reportmode)
1697 {
1698 /*
1699 * Mouse report disabled scrollbar:
1700 * arrow buttons - send up/down
1701 * click on scrollbar - send pageup/down
1702 */
1703 if ((scrollBar.style == R_SB_NEXT
1704 && scrollbarnext_upButton (ev.y))
1705 || (scrollBar.style == R_SB_RXVT
1706 && scrollbarrxvt_upButton (ev.y)))
1707 tt_printf ("\033[A");
1708 else if ((scrollBar.style == R_SB_NEXT
1709 && scrollbarnext_dnButton (ev.y))
1710 || (scrollBar.style == R_SB_RXVT
1711 && scrollbarrxvt_dnButton (ev.y)))
1712 tt_printf ("\033[B");
1713 else
1714 switch (ev.button)
1715 {
1716 case Button2:
1717 tt_printf ("\014");
1718 break;
1719 case Button1:
1720 tt_printf ("\033[6~");
1721 break;
1722 case Button3:
1723 tt_printf ("\033[5~");
1724 break;
1725 }
1726 }
1727 else
1728#endif /* NO_SCROLLBAR_REPORT */
1729
1730 {
1731 char upordown = 0;
1732
1733 if (scrollBar.style == R_SB_NEXT)
1734 {
1735 if (scrollbarnext_upButton (ev.y))
1736 upordown = -1; /* up */
1737 else if (scrollbarnext_dnButton (ev.y))
1738 upordown = 1; /* down */
1739 }
1740 else if (scrollBar.style == R_SB_RXVT)
1741 {
1742 if (scrollbarrxvt_upButton (ev.y))
1743 upordown = -1; /* up */
1744 else if (scrollbarrxvt_dnButton (ev.y))
1745 upordown = 1; /* down */
1746 }
1747 if (upordown)
1748 {
1749#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1750 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1751#endif
1752 if (scr_page (upordown < 0 ? UP : DN, 1))
1753 {
1754 if (upordown < 0)
1755 scrollBar.setUp ();
1756 else
1757 scrollBar.setDn ();
1758 }
1759 }
1760 else
1761 switch (ev.button)
1762 {
1763 case Button2:
1764 switch (scrollbar_align)
1765 {
1766 case R_SB_ALIGN_TOP:
1767 csrO = 0;
1609 break; 1768 break;
1610 1769 case R_SB_ALIGN_CENTRE:
1611 case Button3: 1770 csrO = (scrollBar.bot - scrollBar.top) / 2;
1612 if (MEvent.button == Button3 && clickintime)
1613 selection_rotate (ev->x, ev->y);
1614 else
1615 selection_extend (ev->x, ev->y, 1);
1616 MEvent.button = Button3;
1617 break; 1771 break;
1772 case R_SB_ALIGN_BOTTOM:
1773 csrO = scrollBar.bot - scrollBar.top;
1774 break;
1775 }
1776 if (scrollBar.style == R_SB_XTERM
1777 || scrollbar_above_slider (ev.y)
1778 || scrollbar_below_slider (ev.y))
1779 scr_move_to ( scrollbar_position (ev.y) - csrO,
1780 scrollbar_size ());
1781 scrollBar.setMotion ();
1782 break;
1783
1784 case Button1:
1785 if (scrollbar_align == R_SB_ALIGN_CENTRE)
1786 csrO = ev.y - scrollBar.top;
1787 /* FALLTHROUGH */
1788
1789 case Button3:
1790 if (scrollBar.style != R_SB_XTERM)
1791 {
1792 if (scrollbar_above_slider (ev.y))
1793# ifdef RXVT_SCROLL_FULL
1794 scr_page (UP, TermWin.nrow - 1);
1795# else
1796 scr_page (UP, TermWin.nrow / 4);
1797# endif
1798 else if (scrollbar_below_slider (ev.y))
1799# ifdef RXVT_SCROLL_FULL
1800 scr_page (DN, TermWin.nrow - 1);
1801# else
1802 scr_page (DN, TermWin.nrow / 4);
1803# endif
1804 else
1805 scrollBar.setMotion ();
1806 }
1807 else
1808 {
1809 scr_page ((ev.button == Button1 ? DN : UP),
1810 (TermWin.nrow
1811 * scrollbar_position (ev.y)
1812 / scrollbar_size ()));
1813 }
1814 break;
1815 }
1618 } 1816 }
1619 }
1620 MEvent.time = ev->time;
1621 return; 1817 return;
1622 }
1623 }
1624
1625/*
1626 * Scrollbar window processing of button press
1627 */
1628 if (isScrollbarWindow(ev->window))
1629 {
1630 scrollBar.setIdle ();
1631 /*
1632 * Rxvt-style scrollbar:
1633 * move up if mouse is above slider
1634 * move dn if mouse is below slider
1635 *
1636 * XTerm-style scrollbar:
1637 * Move display proportional to pointer location
1638 * pointer near top -> scroll one line
1639 * pointer near bot -> scroll full page
1640 */
1641#ifndef NO_SCROLLBAR_REPORT
1642 if (reportmode) {
1643 /*
1644 * Mouse report disabled scrollbar:
1645 * arrow buttons - send up/down
1646 * click on scrollbar - send pageup/down
1647 */
1648 if ((scrollBar.style == R_SB_NEXT
1649 && scrollbarnext_upButton(ev->y))
1650 || (scrollBar.style == R_SB_RXVT
1651 && scrollbarrxvt_upButton(ev->y)))
1652 tt_printf("\033[A");
1653 else if ((scrollBar.style == R_SB_NEXT
1654 && scrollbarnext_dnButton(ev->y))
1655 || (scrollBar.style == R_SB_RXVT
1656 && scrollbarrxvt_dnButton(ev->y)))
1657 tt_printf("\033[B");
1658 else
1659 switch (ev->button) {
1660 case Button2:
1661 tt_printf("\014");
1662 break;
1663 case Button1:
1664 tt_printf("\033[6~");
1665 break;
1666 case Button3:
1667 tt_printf("\033[5~");
1668 break;
1669 }
1670 }
1671 else
1672#endif /* NO_SCROLLBAR_REPORT */
1673 {
1674 char upordown = 0;
1675
1676 if (scrollBar.style == R_SB_NEXT) {
1677 if (scrollbarnext_upButton(ev->y))
1678 upordown = -1; /* up */
1679 else if (scrollbarnext_dnButton(ev->y))
1680 upordown = 1; /* down */
1681 } else if (scrollBar.style == R_SB_RXVT) {
1682 if (scrollbarrxvt_upButton(ev->y))
1683 upordown = -1; /* up */
1684 else if (scrollbarrxvt_dnButton(ev->y))
1685 upordown = 1; /* down */
1686 } 1818 }
1687 if (upordown) { 1819#if MENUBAR
1820 /*
1821 * Menubar window processing of button press
1822 */
1823 if (isMenuBarWindow (ev.window))
1824 menubar_control (ev);
1825#endif
1826}
1827
1828void
1829rxvt_term::button_release (const XButtonEvent &ev)
1830{
1831 int reportmode = 0;
1832
1833 csrO = 0; /* reset csr Offset */
1834 if (!bypass_keystate)
1835 reportmode = !! (PrivateModes & PrivMode_mouse_report);
1836
1837 if (scrollbar_isUpDn ())
1838 {
1839 scrollBar.setIdle ();
1840 scrollbar_show (0);
1688#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1841#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1689 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1842 refresh_type &= ~SMOOTH_REFRESH;
1690#endif
1691 if (scr_page (upordown < 0 ? UP : DN, 1)) {
1692 if (upordown < 0)
1693 scrollBar.setUp ();
1694 else
1695 scrollBar.setDn ();
1696 }
1697 } else
1698 switch (ev->button) {
1699 case Button2:
1700 switch (scrollbar_align) {
1701 case R_SB_ALIGN_TOP:
1702 csrO = 0;
1703 break;
1704 case R_SB_ALIGN_CENTRE:
1705 csrO = (scrollBar.bot - scrollBar.top) / 2;
1706 break;
1707 case R_SB_ALIGN_BOTTOM:
1708 csrO = scrollBar.bot - scrollBar.top;
1709 break;
1710 }
1711 if (scrollBar.style == R_SB_XTERM
1712 || scrollbar_above_slider(ev->y)
1713 || scrollbar_below_slider(ev->y))
1714 scr_move_to ( scrollbar_position(ev->y) - csrO,
1715 scrollbar_size());
1716 scrollBar.setMotion ();
1717 break;
1718
1719 case Button1:
1720 if (scrollbar_align == R_SB_ALIGN_CENTRE)
1721 csrO = ev->y - scrollBar.top;
1722 /* FALLTHROUGH */
1723
1724 case Button3:
1725 if (scrollBar.style != R_SB_XTERM) {
1726 if (scrollbar_above_slider(ev->y))
1727# ifdef RXVT_SCROLL_FULL
1728 scr_page (UP, TermWin.nrow - 1);
1729# else
1730 scr_page (UP, TermWin.nrow / 4);
1731# endif 1843#endif
1732 else if (scrollbar_below_slider(ev->y))
1733# ifdef RXVT_SCROLL_FULL
1734 scr_page (DN, TermWin.nrow - 1);
1735# else
1736 scr_page (DN, TermWin.nrow / 4);
1737# endif
1738 else
1739 scrollBar.setMotion ();
1740 } else {
1741 scr_page ((ev->button == Button1 ? DN : UP),
1742 (TermWin.nrow
1743 * scrollbar_position(ev->y)
1744 / scrollbar_size()));
1745 }
1746 break;
1747 }
1748 }
1749 return;
1750 }
1751#if MENUBAR
1752 /*
1753 * Menubar window processing of button press
1754 */
1755 if (isMenuBarWindow(ev->window))
1756 menubar_control (ev);
1757#endif
1758}
1759 1844
1760void
1761rxvt_term::button_release (XButtonEvent *ev)
1762{
1763 int reportmode = 0;
1764
1765 csrO = 0; /* reset csr Offset */
1766 if (!bypass_keystate)
1767 reportmode = !!(PrivateModes & PrivMode_mouse_report);
1768
1769 if (scrollbar_isUpDn()) {
1770 scrollBar.setIdle ();
1771 scrollbar_show (0);
1772#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1773 refresh_type &= ~SMOOTH_REFRESH;
1774#endif
1775 } 1845 }
1776#ifdef SELECTION_SCROLLING 1846#ifdef SELECTION_SCROLLING
1777 pending_scroll_selection=0; 1847 pending_scroll_selection=0;
1778#endif 1848#endif
1779 if (ev->window == TermWin.vt) 1849 if (ev.window == TermWin.vt)
1780 { 1850 {
1781#ifdef RXVT_GRAPHICS 1851#ifdef RXVT_GRAPHICS
1782 if (ev->subwindow != None) 1852 if (ev.subwindow != None)
1783 rxvt_Gr_ButtonRelease(ev->x, ev->y); 1853 rxvt_Gr_ButtonRelease (ev.x, ev.y);
1784 else 1854 else
1785#endif 1855#endif
1856
1786 { 1857 {
1787 if (reportmode) 1858 if (reportmode)
1788 { 1859 {
1789 /* mouse report from vt window */ 1860 /* mouse report from vt window */
1790 /* don't report release of wheel "buttons" */ 1861 /* don't report release of wheel "buttons" */
1791 if (ev->button >= 4) 1862 if (ev.button >= 4)
1792 return; 1863 return;
1793#ifdef MOUSE_REPORT_DOUBLECLICK 1864#ifdef MOUSE_REPORT_DOUBLECLICK
1794 /* only report the release of 'slow' single clicks */ 1865 /* only report the release of 'slow' single clicks */
1795 if (MEvent.button != AnyButton 1866 if (MEvent.button != AnyButton
1796 && (ev->button != MEvent.button 1867 && (ev.button != MEvent.button
1797 || (ev->time - MEvent.time 1868 || (ev.time - MEvent.time
1798 > MULTICLICK_TIME / 2))) 1869 > MULTICLICK_TIME / 2)))
1799 { 1870 {
1800 MEvent.clicks = 0; 1871 MEvent.clicks = 0;
1801 MEvent.button = AnyButton; 1872 MEvent.button = AnyButton;
1802 mouse_report (ev); 1873 mouse_report (ev);
1803 } 1874 }
1804#else /* MOUSE_REPORT_DOUBLECLICK */ 1875#else /* MOUSE_REPORT_DOUBLECLICK */
1805 MEvent.button = AnyButton; 1876 MEvent.button = AnyButton;
1806 mouse_report (ev); 1877 mouse_report (ev);
1807#endif /* MOUSE_REPORT_DOUBLECLICK */ 1878#endif /* MOUSE_REPORT_DOUBLECLICK */
1808 return; 1879 return;
1809 } 1880 }
1810 /* 1881 /*
1811 * dumb hack to compensate for the failure of click-and-drag 1882 * dumb hack to compensate for the failure of click-and-drag
1812 * when overriding mouse reporting 1883 * when overriding mouse reporting
1813 */ 1884 */
1814 if (PrivateModes & PrivMode_mouse_report 1885 if (PrivateModes & PrivMode_mouse_report
1815 && bypass_keystate 1886 && bypass_keystate
1816 && ev->button == Button1 && MEvent.clicks <= 1) 1887 && ev.button == Button1 && MEvent.clicks <= 1)
1817 selection_extend (ev->x, ev->y, 0); 1888 selection_extend (ev.x, ev.y, 0);
1818 1889
1819 switch (ev->button) { 1890 switch (ev.button)
1891 {
1820 case Button1: 1892 case Button1:
1821 case Button3: 1893 case Button3:
1822 selection_make (ev->time); 1894 selection_make (ev.time);
1823 break; 1895 break;
1824 case Button2: 1896 case Button2:
1825 selection_request (ev->time, ev->x, ev->y); 1897 selection_request (ev.time, ev.x, ev.y);
1826 break; 1898 break;
1827#ifdef MOUSE_WHEEL 1899#ifdef MOUSE_WHEEL
1828 case Button4: 1900 case Button4:
1829 case Button5: 1901 case Button5:
1830 { 1902 {
1831 int i; 1903 int i;
1832 page_dirn v; 1904 page_dirn v;
1833 1905
1834 v = (ev->button == Button4) ? UP : DN; 1906 v = (ev.button == Button4) ? UP : DN;
1835 if (ev->state & ShiftMask) 1907 if (ev.state & ShiftMask)
1836 i = 1; 1908 i = 1;
1837 else if ((Options & Opt_mouseWheelScrollPage)) 1909 else if ((Options & Opt_mouseWheelScrollPage))
1838 i = TermWin.nrow - 1; 1910 i = TermWin.nrow - 1;
1839 else 1911 else
1840 i = 5; 1912 i = 5;
1841# ifdef MOUSE_SLIP_WHEELING 1913# ifdef MOUSE_SLIP_WHEELING
1842 if (ev->state & ControlMask) 1914 if (ev.state & ControlMask)
1843 { 1915 {
1844 mouse_slip_wheel_speed += (v ? -1 : 1); 1916 mouse_slip_wheel_speed += (v ? -1 : 1);
1845 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1917 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1846 } 1918 }
1847# endif 1919# endif
1848# ifdef JUMP_MOUSE_WHEEL 1920# ifdef JUMP_MOUSE_WHEEL
1849 scr_page (v, i); 1921 scr_page (v, i);
1850 scr_refresh (SMOOTH_REFRESH); 1922 scr_refresh (SMOOTH_REFRESH);
1851 scrollbar_show (1); 1923 scrollbar_show (1);
1852# else 1924# else
1853 while (i--) 1925 while (i--)
1854 { 1926 {
1855 scr_page (v, 1); 1927 scr_page (v, 1);
1856 scr_refresh (SMOOTH_REFRESH); 1928 scr_refresh (SMOOTH_REFRESH);
1857 scrollbar_show (1); 1929 scrollbar_show (1);
1858 } 1930 }
1859# endif 1931# endif
1860 } 1932
1861 break; 1933 }
1934 break;
1862#endif 1935#endif
1863 } 1936
1864 } 1937 }
1865 } 1938 }
1939 }
1866#ifdef MENUBAR 1940#ifdef MENUBAR
1867 else if (isMenuBarWindow(ev->window)) 1941 else if (isMenuBarWindow (ev.window))
1868 menubar_control (ev); 1942 menubar_control (ev);
1869#endif 1943#endif
1870} 1944}
1871 1945
1872 1946
1873#ifdef TRANSPARENT 1947#ifdef TRANSPARENT
… …
1876 * Do transparency updates if required 1950 * Do transparency updates if required
1877 */ 1951 */
1878int 1952int
1879rxvt_term::check_our_parents () 1953rxvt_term::check_our_parents ()
1880{ 1954{
1881 int i, pchanged, aformat, have_pixmap, rootdepth; 1955 int i, pchanged, aformat, have_pixmap, rootdepth;
1882 unsigned long nitems, bytes_after; 1956 unsigned long nitems, bytes_after;
1883 Atom atype; 1957 Atom atype;
1884 unsigned char *prop = NULL; 1958 unsigned char *prop = NULL;
1885 Window root, oldp, *list; 1959 Window root, oldp, *list;
1886 Pixmap rootpixmap = None; 1960 Pixmap rootpixmap = None;
1887 XWindowAttributes wattr, wrootattr; 1961 XWindowAttributes wattr, wrootattr;
1888 1962
1889 pchanged = 0; 1963 pchanged = 0;
1890 1964
1891 if (!(Options & Opt_transparent)) 1965 if (! (Options & Opt_transparent))
1892 return pchanged; /* Don't try any more */ 1966 return pchanged; /* Don't try any more */
1893 1967
1894 XGetWindowAttributes(Xdisplay, Xroot, &wrootattr); 1968 XGetWindowAttributes (display->display, display->root, &wrootattr);
1895 rootdepth = wrootattr.depth; 1969 rootdepth = wrootattr.depth;
1896 1970
1897 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 1971 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1898 if (rootdepth != wattr.depth) { 1972 if (rootdepth != wattr.depth)
1973 {
1899 if (am_transparent) { 1974 if (am_transparent)
1975 {
1900 pchanged = 1; 1976 pchanged = 1;
1901 XSetWindowBackground(Xdisplay, TermWin.vt, 1977 XSetWindowBackground (display->display, TermWin.vt,
1902 PixColors[Color_bg]); 1978 PixColors[Color_bg]);
1903 am_transparent = am_pixmap_trans = 0; 1979 am_transparent = am_pixmap_trans = 0;
1904 } 1980 }
1905 return pchanged; /* Don't try any more */ 1981 return pchanged; /* Don't try any more */
1906 } 1982 }
1907 1983
1908/* Get all X ops out of the queue so that our information is up-to-date. */ 1984 /* Get all X ops out of the queue so that our information is up-to-date. */
1909 XSync(Xdisplay, False); 1985 XSync (display->display, False);
1910 1986
1911/* 1987 /*
1912 * Make the frame window set by the window manager have 1988 * Make the frame window set by the window manager have
1913 * the root background. Some window managers put multiple nested frame 1989 * the root background. Some window managers put multiple nested frame
1914 * windows for each client, so we have to take care about that. 1990 * windows for each client, so we have to take care about that.
1915 */ 1991 */
1916 i = (xa[XA_XROOTPMAPID] != 0 1992 i = (xa[XA_XROOTPMAPID] != 0
1917 && (XGetWindowProperty(Xdisplay, Xroot, xa[XA_XROOTPMAPID], 1993 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1918 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1994 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1919 &nitems, &bytes_after, &prop) == Success)); 1995 &nitems, &bytes_after, &prop) == Success));
1920 if (!i || prop == NULL) 1996 if (!i || prop == NULL)
1921 have_pixmap = 0; 1997 have_pixmap = 0;
1922 else { 1998 else
1999 {
1923 have_pixmap = 1; 2000 have_pixmap = 1;
1924 rootpixmap = *((Pixmap *)prop); 2001 rootpixmap = * ((Pixmap *)prop);
1925 XFree(prop); 2002 XFree (prop);
1926 } 2003 }
1927 if (have_pixmap) { 2004 if (have_pixmap)
1928/* 2005 {
2006 /*
1929 * Copy Xroot pixmap transparency 2007 * Copy display->root pixmap transparency
1930 */ 2008 */
1931 int sx, sy, nx, ny; 2009 int sx, sy, nx, ny;
1932 unsigned int nw, nh; 2010 unsigned int nw, nh;
1933 Window cr; 2011 Window cr;
1934 XImage *image; 2012 XImage *image;
1935 GC gc; 2013 GC gc;
1936 XGCValues gcvalue; 2014 XGCValues gcvalue;
1937 2015
1938 XTranslateCoordinates(Xdisplay, TermWin.parent[0], Xroot, 2016 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1939 0, 0, &sx, &sy, &cr); 2017 0, 0, &sx, &sy, &cr);
1940 nw = (unsigned int)szHint.width; 2018 nw = (unsigned int)szHint.width;
1941 nh = (unsigned int)szHint.height; 2019 nh = (unsigned int)szHint.height;
1942 nx = ny = 0; 2020 nx = ny = 0;
1943 if (sx < 0) { 2021 if (sx < 0)
2022 {
1944 nw += sx; 2023 nw += sx;
1945 nx = -sx; 2024 nx = -sx;
1946 sx = 0; 2025 sx = 0;
1947 } 2026 }
1948 if (sy < 0) { 2027 if (sy < 0)
2028 {
1949 nh += sy; 2029 nh += sy;
1950 ny = -sy; 2030 ny = -sy;
1951 sy = 0; 2031 sy = 0;
1952 } 2032 }
1953 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 2033 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1954 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 2034 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
1955 allowedxerror = -1; 2035 allowedxerror = -1;
1956 image = XGetImage(Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes, 2036 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes,
1957 ZPixmap); 2037 ZPixmap);
1958 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2038 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1959 /* XXX: may need a delay here? */ 2039 /* XXX: may need a delay here? */
1960 allowedxerror = 0; 2040 allowedxerror = 0;
1961 if (image == NULL) { 2041 if (image == NULL)
2042 {
1962 if (am_transparent && am_pixmap_trans) { 2043 if (am_transparent && am_pixmap_trans)
1963 pchanged = 1; 2044 {
2045 pchanged = 1;
1964 if (TermWin.pixmap != None) { 2046 if (TermWin.pixmap != None)
2047 {
1965 XFreePixmap(Xdisplay, TermWin.pixmap); 2048 XFreePixmap (display->display, TermWin.pixmap);
1966 TermWin.pixmap = None; 2049 TermWin.pixmap = None;
1967 } 2050 }
1968 } 2051 }
1969 am_pixmap_trans = 0; 2052 am_pixmap_trans = 0;
1970 } else { 2053 }
2054 else
2055 {
1971 if (TermWin.pixmap != None) 2056 if (TermWin.pixmap != None)
1972 XFreePixmap(Xdisplay, TermWin.pixmap); 2057 XFreePixmap (display->display, TermWin.pixmap);
1973 TermWin.pixmap = XCreatePixmap(Xdisplay, TermWin.vt, 2058 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
1974 (unsigned int)szHint.width, 2059 (unsigned int)szHint.width,
1975 (unsigned int)szHint.height, 2060 (unsigned int)szHint.height,
1976 (unsigned int)image->depth); 2061 (unsigned int)image->depth);
1977 gc = XCreateGC(Xdisplay, TermWin.vt, 0UL, &gcvalue); 2062 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
1978 XPutImage(Xdisplay, TermWin.pixmap, gc, image, 0, 0, 2063 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
1979 nx, ny, (unsigned int)image->width, 2064 nx, ny, (unsigned int)image->width,
1980 (unsigned int)image->height); 2065 (unsigned int)image->height);
1981 XFreeGC(Xdisplay, gc); 2066 XFreeGC (display->display, gc);
1982 XDestroyImage(image); 2067 XDestroyImage (image);
1983 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt, 2068 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
1984 TermWin.pixmap); 2069 TermWin.pixmap);
1985 if (!am_transparent || !am_pixmap_trans) 2070 if (!am_transparent || !am_pixmap_trans)
1986 pchanged = 1; 2071 pchanged = 1;
1987 am_transparent = am_pixmap_trans = 1; 2072 am_transparent = am_pixmap_trans = 1;
1988 } 2073 }
1989 } 2074 }
1990 if (!am_pixmap_trans) { 2075 if (!am_pixmap_trans)
2076 {
1991 unsigned int n; 2077 unsigned int n;
1992/* 2078 /*
1993 * InheritPixmap transparency 2079 * InheritPixmap transparency
1994 */ 2080 */
1995 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot)); 2081 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
1996 for (i = 1; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); 2082 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window));
1997 i++) { 2083 i++)
2084 {
1998 oldp = TermWin.parent[i]; 2085 oldp = TermWin.parent[i];
1999 XQueryTree(Xdisplay, TermWin.parent[i - 1], &root, 2086 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2000 &TermWin.parent[i], &list, &n); 2087 &TermWin.parent[i], &list, &n);
2001 XFree(list); 2088 XFree (list);
2002 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2089 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2003 if (TermWin.parent[i] == Xroot) { 2090 if (TermWin.parent[i] == display->root)
2004 if (oldp != None) 2091 {
2005 pchanged = 1; 2092 if (oldp != None)
2006 break; 2093 pchanged = 1;
2007 } 2094 break;
2095 }
2008 if (oldp != TermWin.parent[i]) 2096 if (oldp != TermWin.parent[i])
2009 pchanged = 1; 2097 pchanged = 1;
2010 } 2098 }
2011 n = 0; 2099 n = 0;
2012 if (pchanged) { 2100 if (pchanged)
2101 {
2013 for (; n < (unsigned int)i; n++) { 2102 for (; n < (unsigned int)i; n++)
2103 {
2014 XGetWindowAttributes(Xdisplay, TermWin.parent[n], &wattr); 2104 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2015 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2105 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2016 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) { 2106 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2107 {
2017 n = (int)(sizeof(TermWin.parent) / sizeof(Window)) + 1; 2108 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2018 break; 2109 break;
2019 } 2110 }
2020 } 2111 }
2021 } 2112 }
2022 if (n > (int)(sizeof(TermWin.parent) 2113 if (n > (int) (sizeof (TermWin.parent)
2023 / sizeof(TermWin.parent[0]))) { 2114 / sizeof (TermWin.parent[0])))
2115 {
2024 D_X((stderr, "InheritPixmap Turning off")); 2116 D_X ((stderr, "InheritPixmap Turning off"));
2025 XSetWindowBackground(Xdisplay, TermWin.parent[0], 2117 XSetWindowBackground (display->display, TermWin.parent[0],
2026 PixColors[Color_fg]); 2118 PixColors[Color_fg]);
2027 XSetWindowBackground(Xdisplay, TermWin.vt, 2119 XSetWindowBackground (display->display, TermWin.vt,
2028 PixColors[Color_bg]); 2120 PixColors[Color_bg]);
2029 am_transparent = 0; 2121 am_transparent = 0;
2030 /* XXX: also turn off Opt_transparent? */ 2122 /* XXX: also turn off Opt_transparent? */
2031 } else { 2123 }
2124 else
2125 {
2032 /* wait (an arbitrary period) for the WM to do its thing 2126 /* wait (an arbitrary period) for the WM to do its thing
2033 * needed for fvwm2.2.2 (and before?) */ 2127 * needed for fvwm2.2.2 (and before?) */
2034# ifdef HAVE_NANOSLEEP 2128# ifdef HAVE_NANOSLEEP
2035 struct timespec rqt; 2129 struct timespec rqt;
2036 2130
2037 rqt.tv_sec = 1; 2131 rqt.tv_sec = 1;
2038 rqt.tv_nsec = 0; 2132 rqt.tv_nsec = 0;
2039 nanosleep(&rqt, NULL); 2133 nanosleep (&rqt, NULL);
2040# else 2134# else
2041 sleep(1); 2135 sleep (1);
2042# endif 2136# endif
2043 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2137 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2044 for (n = 0; n < (unsigned int)i; n++) 2138 for (n = 0; n < (unsigned int)i; n++)
2045 XSetWindowBackgroundPixmap(Xdisplay, TermWin.parent[n], 2139 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n],
2046 ParentRelative); 2140 ParentRelative);
2047 XSetWindowBackgroundPixmap(Xdisplay, TermWin.vt, 2141 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2048 ParentRelative); 2142 ParentRelative);
2049 am_transparent = 1; 2143 am_transparent = 1;
2050 } 2144 }
2051 for (; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); i++) 2145 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2052 TermWin.parent[i] = None; 2146 TermWin.parent[i] = None;
2053 } 2147 }
2054 return pchanged; 2148 return pchanged;
2055} 2149}
2056#endif 2150#endif
2057 2151
2058/*}}} */ 2152/*}}} */
2059 2153
… …
2061/*----------------------------------------------------------------------*/ 2155/*----------------------------------------------------------------------*/
2062#ifdef PRINTPIPE 2156#ifdef PRINTPIPE
2063FILE * 2157FILE *
2064rxvt_term::popen_printer () 2158rxvt_term::popen_printer ()
2065{ 2159{
2066 FILE *stream = popen(rs[Rs_print_pipe], "w"); 2160 FILE *stream = popen (rs[Rs_print_pipe], "w");
2067 2161
2068 if (stream == NULL) 2162 if (stream == NULL)
2069 rxvt_print_error("can't open printer pipe"); 2163 rxvt_print_error ("can't open printer pipe");
2070 return stream; 2164 return stream;
2071} 2165}
2072 2166
2073int 2167int
2074rxvt_term::pclose_printer (FILE *stream) 2168rxvt_term::pclose_printer (FILE *stream)
2075{ 2169{
2076 fflush (stream); 2170 fflush (stream);
2077/* pclose() reported not to work on SunOS 4.1.3 */ 2171 /* pclose () reported not to work on SunOS 4.1.3 */
2078# if defined (__sun__) /* TODO: RESOLVE THIS */ 2172# if defined (__sun__) /* TODO: RESOLVE THIS */
2079/* pclose works provided SIGCHLD handler uses waitpid */ 2173 /* pclose works provided SIGCHLD handler uses waitpid */
2080 return pclose (stream); /* return fclose (stream); */ 2174 return pclose (stream); /* return fclose (stream); */
2081# else 2175# else
2082 return pclose (stream); 2176 return pclose (stream);
2083# endif 2177# endif
2084} 2178}
… …
2087 * simulate attached vt100 printer 2181 * simulate attached vt100 printer
2088 */ 2182 */
2089void 2183void
2090rxvt_term::process_print_pipe () 2184rxvt_term::process_print_pipe ()
2091{ 2185{
2092 int done; 2186 int done;
2093 FILE *fd; 2187 FILE *fd;
2094 2188
2095 if ((fd = popen_printer ()) == NULL) 2189 if ((fd = popen_printer ()) == NULL)
2096 return; 2190 return;
2097 2191
2098/* 2192 /*
2099 * Send all input to the printer until either ESC[4i or ESC[?4i 2193 * Send all input to the printer until either ESC[4i or ESC[?4i
2100 * is received. 2194 * is received.
2101 */ 2195 */
2102 for (done = 0; !done;) { 2196 for (done = 0; !done;)
2197 {
2103 unsigned char buf[8]; 2198 unsigned char buf[8];
2104 unsigned char ch; 2199 unsigned char ch;
2105 unsigned int i, len; 2200 unsigned int i, len;
2106 2201
2107 if ((ch = cmd_getc ()) != C0_ESC) { 2202 if ((ch = cmd_getc ()) != C0_ESC)
2203 {
2108 if (putc(ch, fd) == EOF) 2204 if (putc (ch, fd) == EOF)
2109 break; /* done = 1 */ 2205 break; /* done = 1 */
2110 } else { 2206 }
2207 else
2208 {
2111 len = 0; 2209 len = 0;
2112 buf[len++] = ch; 2210 buf[len++] = ch;
2113 2211
2114 if ((buf[len++] = cmd_getc ()) == '[') { 2212 if ((buf[len++] = cmd_getc ()) == '[')
2213 {
2115 if ((ch = cmd_getc ()) == '?') { 2214 if ((ch = cmd_getc ()) == '?')
2116 buf[len++] = '?'; 2215 {
2117 ch = cmd_getc (); 2216 buf[len++] = '?';
2118 } 2217 ch = cmd_getc ();
2218 }
2119 if ((buf[len++] = ch) == '4') { 2219 if ((buf[len++] = ch) == '4')
2220 {
2120 if ((buf[len++] = cmd_getc ()) == 'i') 2221 if ((buf[len++] = cmd_getc ()) == 'i')
2121 break; /* done = 1 */ 2222 break; /* done = 1 */
2122 } 2223 }
2224 }
2225 for (i = 0; i < len; i++)
2226 if (putc (buf[i], fd) == EOF)
2227 {
2228 done = 1;
2229 break;
2230 }
2231 }
2123 } 2232 }
2124 for (i = 0; i < len; i++)
2125 if (putc(buf[i], fd) == EOF) {
2126 done = 1;
2127 break;
2128 }
2129 }
2130 }
2131 pclose_printer (fd); 2233 pclose_printer (fd);
2132} 2234}
2133#endif /* PRINTPIPE */ 2235#endif /* PRINTPIPE */
2134/*}}} */ 2236/*}}} */
2135 2237
2136/* *INDENT-OFF* */ 2238/* *INDENT-OFF* */
2137enum { 2239enum {
2138 C1_40 = 0x40, 2240 C1_40 = 0x40,
2139 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2241 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2140 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2242 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2141 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2243 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2142 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2244 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC
2143}; 2245};
2144/* *INDENT-ON* */ 2246/* *INDENT-ON* */
2145 2247
2146/*{{{ process non-printing single characters */ 2248/*{{{ process non-printing single characters */
2147void 2249void
2148rxvt_term::process_nonprinting (unsigned char ch) 2250rxvt_term::process_nonprinting (unsigned char ch)
2149{ 2251{
2150 switch (ch) { 2252 switch (ch)
2253 {
2151 case C0_ENQ: /* terminal Status */ 2254 case C0_ENQ: /* terminal Status */
2152 if (rs[Rs_answerbackstring]) 2255 if (rs[Rs_answerbackstring])
2153 tt_write( 2256 tt_write (
2154 (const unsigned char *)rs[Rs_answerbackstring], 2257 (const unsigned char *)rs[Rs_answerbackstring],
2155 (unsigned int)STRLEN(rs[Rs_answerbackstring])); 2258 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2156 else 2259 else
2157 tt_write((unsigned char *)VT100_ANS, 2260 tt_write ((unsigned char *)VT100_ANS,
2158 (unsigned int)STRLEN(VT100_ANS)); 2261 (unsigned int)STRLEN (VT100_ANS));
2159 break; 2262 break;
2160 case C0_BEL: /* bell */ 2263 case C0_BEL: /* bell */
2161 scr_bell (); 2264 scr_bell ();
2162 break; 2265 break;
2163 case C0_BS: /* backspace */ 2266 case C0_BS: /* backspace */
2164 scr_backspace (); 2267 scr_backspace ();
2165 break; 2268 break;
2166 case C0_HT: /* tab */ 2269 case C0_HT: /* tab */
2167 scr_tab (1); 2270 scr_tab (1);
2168 break; 2271 break;
2169 case C0_CR: /* carriage return */ 2272 case C0_CR: /* carriage return */
2170 scr_gotorc (0, 0, R_RELATIVE); 2273 scr_gotorc (0, 0, R_RELATIVE);
2171 break; 2274 break;
2172 case C0_VT: /* vertical tab, form feed */ 2275 case C0_VT: /* vertical tab, form feed */
2173 case C0_FF: 2276 case C0_FF:
2174 case C0_LF: /* line feed */ 2277 case C0_LF: /* line feed */
2175 scr_index (UP); 2278 scr_index (UP);
2176 break; 2279 break;
2177 case C0_SO: /* shift out - acs */ 2280 case C0_SO: /* shift out - acs */
2178 scr_charset_choose (1); 2281 scr_charset_choose (1);
2179 break; 2282 break;
2180 case C0_SI: /* shift in - acs */ 2283 case C0_SI: /* shift in - acs */
2181 scr_charset_choose (0); 2284 scr_charset_choose (0);
2182 break; 2285 break;
2183 } 2286 }
2184} 2287}
2185/*}}} */ 2288/*}}} */
2186 2289
2187 2290
2188/*{{{ process VT52 escape sequences */ 2291/*{{{ process VT52 escape sequences */
2189void 2292void
2190rxvt_term::process_escape_vt52 (unsigned char ch) 2293rxvt_term::process_escape_vt52 (unsigned char ch)
2191{ 2294{
2192 int row, col; 2295 int row, col;
2296
2297 switch (ch)
2193 2298 {
2194 switch (ch) {
2195 case 'A': /* cursor up */ 2299 case 'A': /* cursor up */
2196 scr_gotorc (-1, 0, R_RELATIVE | C_RELATIVE); 2300 scr_gotorc (-1, 0, R_RELATIVE | C_RELATIVE);
2197 break; 2301 break;
2198 case 'B': /* cursor down */ 2302 case 'B': /* cursor down */
2199 scr_gotorc (1, 0, R_RELATIVE | C_RELATIVE); 2303 scr_gotorc (1, 0, R_RELATIVE | C_RELATIVE);
2200 break; 2304 break;
2201 case 'C': /* cursor right */ 2305 case 'C': /* cursor right */
2202 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 2306 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
2203 break; 2307 break;
2204 case 'D': /* cursor left */ 2308 case 'D': /* cursor left */
2205 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 2309 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
2206 break; 2310 break;
2207 case 'H': /* cursor home */ 2311 case 'H': /* cursor home */
2208 scr_gotorc (0, 0, 0); 2312 scr_gotorc (0, 0, 0);
2209 break; 2313 break;
2210 case 'I': /* cursor up and scroll down if needed */ 2314 case 'I': /* cursor up and scroll down if needed */
2211 scr_index (DN); 2315 scr_index (DN);
2212 break; 2316 break;
2213 case 'J': /* erase to end of screen */ 2317 case 'J': /* erase to end of screen */
2214 scr_erase_screen (0); 2318 scr_erase_screen (0);
2215 break; 2319 break;
2216 case 'K': /* erase to end of line */ 2320 case 'K': /* erase to end of line */
2217 scr_erase_line (0); 2321 scr_erase_line (0);
2218 break; 2322 break;
2219 case 'Y': /* move to specified row and col */ 2323 case 'Y': /* move to specified row and col */
2220 /* full command is 'ESC Y row col' where row and col 2324 /* full command is 'ESC Y row col' where row and col
2221 * are encoded by adding 32 and sending the ascii 2325 * are encoded by adding 32 and sending the ascii
2222 * character. eg. SPACE = 0, '+' = 13, '0' = 18, 2326 * character. eg. SPACE = 0, '+' = 13, '0' = 18,
2223 * etc. */ 2327 * etc. */
2224 row = cmd_getc () - ' '; 2328 row = cmd_getc () - ' ';
2225 col = cmd_getc () - ' '; 2329 col = cmd_getc () - ' ';
2226 scr_gotorc (row, col, 0); 2330 scr_gotorc (row, col, 0);
2227 break; 2331 break;
2228 case 'Z': /* identify the terminal type */ 2332 case 'Z': /* identify the terminal type */
2229 tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2333 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2230 break; 2334 break;
2231 case '<': /* turn off VT52 mode */ 2335 case '<': /* turn off VT52 mode */
2232 PrivMode(0, PrivMode_vt52); 2336 PrivMode (0, PrivMode_vt52);
2233 break; 2337 break;
2234 case 'F': /* use special graphics character set */ 2338 case 'F': /* use special graphics character set */
2235 case 'G': /* use regular character set */ 2339 case 'G': /* use regular character set */
2236 /* unimplemented */ 2340 /* unimplemented */
2237 break; 2341 break;
2238 case '=': /* use alternate keypad mode */ 2342 case '=': /* use alternate keypad mode */
2239 case '>': /* use regular keypad mode */ 2343 case '>': /* use regular keypad mode */
2240 /* unimplemented */ 2344 /* unimplemented */
2241 break; 2345 break;
2242 } 2346 }
2243} 2347}
2244/*}}} */ 2348/*}}} */
2245 2349
2246 2350
2247/*{{{ process escape sequences */ 2351/*{{{ process escape sequences */
2248void 2352void
2249rxvt_term::process_escape_seq () 2353rxvt_term::process_escape_seq ()
2250{ 2354{
2251 unsigned char ch = cmd_getc (); 2355 unsigned char ch = cmd_getc ();
2252 2356
2253 if (PrivateModes & PrivMode_vt52) { 2357 if (PrivateModes & PrivMode_vt52)
2254 process_escape_vt52 (ch);
2255 return;
2256 }
2257 2358 {
2359 process_escape_vt52 (ch);
2360 return;
2361 }
2362
2258 switch (ch) { 2363 switch (ch)
2364 {
2259 /* case 1: do_tek_mode (); break; */ 2365 /* case 1: do_tek_mode (); break; */
2260 case '#': 2366 case '#':
2261 if (cmd_getc () == '8') 2367 if (cmd_getc () == '8')
2262 scr_E (); 2368 scr_E ();
2263 break; 2369 break;
2264 case '(': 2370 case '(':
2265 scr_charset_set (0, (unsigned int)cmd_getc ()); 2371 scr_charset_set (0, (unsigned int)cmd_getc ());
2266 break; 2372 break;
2267 case ')': 2373 case ')':
2268 scr_charset_set (1, (unsigned int)cmd_getc ()); 2374 scr_charset_set (1, (unsigned int)cmd_getc ());
2269 break; 2375 break;
2270 case '*': 2376 case '*':
2271 scr_charset_set (2, (unsigned int)cmd_getc ()); 2377 scr_charset_set (2, (unsigned int)cmd_getc ());
2272 break; 2378 break;
2273 case '+': 2379 case '+':
2274 scr_charset_set (3, (unsigned int)cmd_getc ()); 2380 scr_charset_set (3, (unsigned int)cmd_getc ());
2275 break; 2381 break;
2276#ifdef MULTICHAR_SET 2382#ifdef MULTICHAR_SET
2277 case '$': 2383 case '$':
2278 scr_charset_set (-2, (unsigned int)cmd_getc ()); 2384 scr_charset_set (-2, (unsigned int)cmd_getc ());
2279 break; 2385 break;
2280#endif 2386#endif
2281#ifndef NO_FRILLS 2387#ifndef NO_FRILLS
2282 case '6': 2388 case '6':
2283 scr_backindex (); 2389 scr_backindex ();
2284 break; 2390 break;
2285#endif 2391#endif
2286 case '7': 2392 case '7':
2287 scr_cursor (SAVE); 2393 scr_cursor (SAVE);
2288 break; 2394 break;
2289 case '8': 2395 case '8':
2290 scr_cursor (RESTORE); 2396 scr_cursor (RESTORE);
2291 break; 2397 break;
2292#ifndef NO_FRILLS 2398#ifndef NO_FRILLS
2293 case '9': 2399 case '9':
2294 scr_forwardindex (); 2400 scr_forwardindex ();
2295 break; 2401 break;
2296#endif 2402#endif
2297 case '=': 2403 case '=':
2298 case '>': 2404 case '>':
2299 PrivMode((ch == '='), PrivMode_aplKP); 2405 PrivMode ((ch == '='), PrivMode_aplKP);
2300 break; 2406 break;
2301 2407
2302 case C1_40: 2408 case C1_40:
2303 cmd_getc (); 2409 cmd_getc ();
2304 break; 2410 break;
2305 case C1_44: 2411 case C1_44:
2306 scr_index (UP); 2412 scr_index (UP);
2307 break; 2413 break;
2308 2414
2309 /* 8.3.87: NEXT LINE */ 2415 /* 8.3.87: NEXT LINE */
2310 case C1_NEL: /* ESC E */ 2416 case C1_NEL: /* ESC E */
2311 { 2417 {
2312 uint32_t nlcr[] = { '\n', '\r' }; 2418 uint32_t nlcr[] = { '\n', '\r' };
2313 scr_add_lines (nlcr, 1, 2); 2419 scr_add_lines (nlcr, 1, 2);
2314 } 2420 }
2315 break; 2421 break;
2316 2422
2317 /* kidnapped escape sequence: Should be 8.3.48 */ 2423 /* kidnapped escape sequence: Should be 8.3.48 */
2318 case C1_ESA: /* ESC G */ 2424 case C1_ESA: /* ESC G */
2319 process_graphics (); 2425 process_graphics ();
2320 break; 2426 break;
2321 2427
2322 /* 8.3.63: CHARACTER TABULATION SET */ 2428 /* 8.3.63: CHARACTER TABULATION SET */
2323 case C1_HTS: /* ESC H */ 2429 case C1_HTS: /* ESC H */
2324 scr_set_tab (1); 2430 scr_set_tab (1);
2325 break; 2431 break;
2326 2432
2327 /* 8.3.105: REVERSE LINE FEED */ 2433 /* 8.3.105: REVERSE LINE FEED */
2328 case C1_RI: /* ESC M */ 2434 case C1_RI: /* ESC M */
2329 scr_index (DN); 2435 scr_index (DN);
2330 break; 2436 break;
2331 2437
2332 /* 8.3.142: SINGLE-SHIFT TWO */ 2438 /* 8.3.142: SINGLE-SHIFT TWO */
2333 /*case C1_SS2: scr_single_shift (2); break; */ 2439 /*case C1_SS2: scr_single_shift (2); break; */
2334 2440
2335 /* 8.3.143: SINGLE-SHIFT THREE */ 2441 /* 8.3.143: SINGLE-SHIFT THREE */
2336 /*case C1_SS3: scr_single_shift (3); break; */ 2442 /*case C1_SS3: scr_single_shift (3); break; */
2337 2443
2338 /* 8.3.27: DEVICE CONTROL STRING */ 2444 /* 8.3.27: DEVICE CONTROL STRING */
2339 case C1_DCS: /* ESC P */ 2445 case C1_DCS: /* ESC P */
2340 process_dcs_seq (); 2446 process_dcs_seq ();
2341 break; 2447 break;
2342 2448
2343 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2449 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2344 case C1_SCI: /* ESC Z */ 2450 case C1_SCI: /* ESC Z */
2345 tt_write((const unsigned char *)ESCZ_ANSWER, 2451 tt_write ((const unsigned char *)ESCZ_ANSWER,
2346 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2452 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2347 break; /* steal obsolete ESC [ c */ 2453 break; /* steal obsolete ESC [ c */
2348 2454
2349 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2455 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2350 case C1_CSI: /* ESC [ */ 2456 case C1_CSI: /* ESC [ */
2351 process_csi_seq (); 2457 process_csi_seq ();
2352 break; 2458 break;
2353 2459
2354 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2460 /* 8.3.90: OPERATING SYSTEM COMMAND */
2355 case C1_OSC: /* ESC ] */ 2461 case C1_OSC: /* ESC ] */
2356 process_osc_seq (); 2462 process_osc_seq ();
2357 break; 2463 break;
2358 2464
2359 /* 8.3.106: RESET TO INITIAL STATE */ 2465 /* 8.3.106: RESET TO INITIAL STATE */
2360 case 'c': 2466 case 'c':
2361 scr_poweron (); 2467 scr_poweron ();
2362 scrollbar_show (1); 2468 scrollbar_show (1);
2363 break; 2469 break;
2364 2470
2365 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2471 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2366 case 'n': 2472 case 'n':
2367 scr_charset_choose (2); 2473 scr_charset_choose (2);
2368 break; 2474 break;
2369 2475
2370 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */ 2476 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */
2371 case 'o': 2477 case 'o':
2372 scr_charset_choose (3); 2478 scr_charset_choose (3);
2373 break; 2479 break;
2374 } 2480 }
2375} 2481}
2376/*}}} */ 2482/*}}} */
2377 2483
2378/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2484/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2379/* *INDENT-OFF* */ 2485/* *INDENT-OFF* */
2380enum { 2486enum {
2381 CSI_ICH = 0x40, 2487 CSI_ICH = 0x40,
2382 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2488 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2383 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2489 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2384 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2490 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2385 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 2491 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2386 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 2492 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2387 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2493 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2388 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2494 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2389 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2495 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2390}; 2496};
2391 2497
2392#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2498#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2393 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2499 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2394 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2500 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2395#define get_byte_array_bit(array, bit) \ 2501#define get_byte_array_bit(array, bit) \
2396 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 2502 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7))))
2397 2503
2398const unsigned char csi_defaults[] = { 2504const unsigned char csi_defaults[] =
2505 {
2399 make_byte(1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2506 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2400 make_byte(1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2507 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2401 make_byte(1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2508 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2402 make_byte(1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2509 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2403 make_byte(1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2510 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2404 make_byte(0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2511 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2405 make_byte(0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2512 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2406 make_byte(0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2513 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */
2407}; 2514 };
2408/* *INDENT-ON* */ 2515/* *INDENT-ON* */
2409 2516
2410void 2517void
2411rxvt_term::process_csi_seq () 2518rxvt_term::process_csi_seq ()
2412{ 2519{
2413 unsigned char ch, priv, i; 2520 unsigned char ch, priv, i;
2414 unsigned int nargs, p; 2521 unsigned int nargs, p;
2415 int n, ndef; 2522 int n, ndef;
2416 int arg[ESC_ARGS]; 2523 int arg[ESC_ARGS];
2417 2524
2418 for (nargs = ESC_ARGS; nargs > 0;) 2525 for (nargs = ESC_ARGS; nargs > 0;)
2419 arg[--nargs] = 0; 2526 arg[--nargs] = 0;
2420 2527
2421 priv = 0; 2528 priv = 0;
2529 ch = cmd_getc ();
2530 if (ch >= '<' && ch <= '?')
2531 { /* '<' '=' '>' '?' */
2532 priv = ch;
2422 ch = cmd_getc (); 2533 ch = cmd_getc ();
2423 if (ch >= '<' && ch <= '?') { /* '<' '=' '>' '?' */
2424 priv = ch;
2425 ch = cmd_getc ();
2426 } 2534 }
2427/* read any numerical arguments */ 2535 /* read any numerical arguments */
2428 for (n = -1; ch < CSI_ICH; ) { 2536 for (n = -1; ch < CSI_ICH; )
2537 {
2429 if (isdigit(ch)) { 2538 if (isdigit (ch))
2539 {
2430 if (n < 0) 2540 if (n < 0)
2431 n = ch - '0'; 2541 n = ch - '0';
2432 else 2542 else
2433 n = n * 10 + ch - '0'; 2543 n = n * 10 + ch - '0';
2544 }
2434 } else if (ch == ';') { 2545 else if (ch == ';')
2546 {
2435 if (nargs < ESC_ARGS) 2547 if (nargs < ESC_ARGS)
2436 arg[nargs++] = n; 2548 arg[nargs++] = n;
2437 n = -1; 2549 n = -1;
2550 }
2438 } else if (ch == '\b') { 2551 else if (ch == '\b')
2552 {
2439 scr_backspace (); 2553 scr_backspace ();
2554 }
2440 } else if (ch == C0_ESC) { 2555 else if (ch == C0_ESC)
2556 {
2441 process_escape_seq (); 2557 process_escape_seq ();
2558 return;
2559 }
2560 else if (ch < ' ')
2561 {
2562 process_nonprinting (ch);
2563 }
2564 ch = cmd_getc ();
2565 }
2566
2567 if (ch > CSI_7F)
2442 return; 2568 return;
2443 } else if (ch < ' ') {
2444 process_nonprinting (ch);
2445 }
2446 ch = cmd_getc ();
2447 }
2448 2569
2449 if (ch > CSI_7F)
2450 return;
2451
2452 if (nargs < ESC_ARGS) 2570 if (nargs < ESC_ARGS)
2453 arg[nargs++] = n; 2571 arg[nargs++] = n;
2454 2572
2455 i = ch - CSI_ICH; 2573 i = ch - CSI_ICH;
2456 ndef = get_byte_array_bit(csi_defaults, i); 2574 ndef = get_byte_array_bit (csi_defaults, i);
2457 for (p = 0; p < nargs; p++) 2575 for (p = 0; p < nargs; p++)
2458 if (arg[p] == -1) 2576 if (arg[p] == -1)
2459 arg[p] = ndef; 2577 arg[p] = ndef;
2460 2578
2461#ifdef DEBUG_CMD 2579#ifdef DEBUG_CMD
2462 fprintf(stderr, "CSI "); 2580 fprintf (stderr, "CSI ");
2463 for (p = 0; p < nargs; p++) 2581 for (p = 0; p < nargs; p++)
2464 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); 2582 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2465 fprintf(stderr, "%c\n", ch); 2583 fprintf (stderr, "%c\n", ch);
2466#endif 2584#endif
2467 2585
2468/* 2586 /*
2469 * private mode handling 2587 * private mode handling
2470 */ 2588 */
2471 if (priv) { 2589 if (priv)
2472 switch (priv) { 2590 {
2473 case '>': 2591 switch (priv)
2592 {
2593 case '>':
2474 if (ch == CSI_DA) /* secondary device attributes */ 2594 if (ch == CSI_DA) /* secondary device attributes */
2475 tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 2595 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING);
2476 break; 2596 break;
2477 case '?': 2597 case '?':
2478 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2598 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2479 process_terminal_mode (ch, priv, nargs, arg); 2599 process_terminal_mode (ch, priv, nargs, arg);
2480 break; 2600 break;
2481 } 2601 }
2482 return; 2602 return;
2483 } 2603 }
2484 2604
2485 switch (ch) { 2605 switch (ch)
2486/* 2606 {
2607 /*
2487 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 2608 * ISO/IEC 6429:1992 (E) CSI sequences (defaults in parentheses)
2488 */ 2609 */
2489#ifdef PRINTPIPE 2610#ifdef PRINTPIPE
2490 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 2611 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2491 switch (arg[0]) { 2612 switch (arg[0])
2613 {
2492 case 0: /* initiate transfer to primary aux device */ 2614 case 0: /* initiate transfer to primary aux device */
2493 scr_printscreen (0); 2615 scr_printscreen (0);
2494 break; 2616 break;
2495 case 5: /* start relay to primary aux device */ 2617 case 5: /* start relay to primary aux device */
2496 process_print_pipe (); 2618 process_print_pipe ();
2619 break;
2620 }
2497 break; 2621 break;
2498 }
2499 break;
2500#endif 2622#endif
2501 2623
2502 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2624 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2503 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2625 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2504 arg[0] = -arg[0]; 2626 arg[0] = -arg[0];
2505 /* FALLTHROUGH */ 2627 /* FALLTHROUGH */
2506 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2628 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2507 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2629 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2508 scr_gotorc (arg[0], 0, RELATIVE); 2630 scr_gotorc (arg[0], 0, RELATIVE);
2509 break; 2631 break;
2510 2632
2511 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2633 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2512 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2634 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2513#ifdef ISO6429 2635#ifdef ISO6429
2514 arg[0] = -arg[0]; 2636 arg[0] = -arg[0];
2515#else /* emulate common DEC VTs */ 2637#else /* emulate common DEC VTs */
2516 arg[0] = arg[0] ? -arg[0] : -1; 2638 arg[0] = arg[0] ? -arg[0] : -1;
2517#endif 2639#endif
2518 /* FALLTHROUGH */ 2640 /* FALLTHROUGH */
2519 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */ 2641 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */
2520 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */ 2642 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */
2521#ifdef ISO6429 2643#ifdef ISO6429
2522 scr_gotorc (0, arg[0], RELATIVE); 2644 scr_gotorc (0, arg[0], RELATIVE);
2523#else /* emulate common DEC VTs */ 2645#else /* emulate common DEC VTs */
2524 scr_gotorc (0, arg[0] ? arg[0] : 1, RELATIVE); 2646 scr_gotorc (0, arg[0] ? arg[0] : 1, RELATIVE);
2525#endif 2647#endif
2526 break; 2648 break;
2527 2649
2528 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */ 2650 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */
2529 arg[0] = -arg[0]; 2651 arg[0] = -arg[0];
2530 /* FALLTHROUGH */ 2652 /* FALLTHROUGH */
2531 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */ 2653 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */
2532 scr_gotorc (arg[0], 0, R_RELATIVE); 2654 scr_gotorc (arg[0], 0, R_RELATIVE);
2533 break; 2655 break;
2534 2656
2535 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */ 2657 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */
2536 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */ 2658 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */
2537 scr_gotorc (0, arg[0] - 1, R_RELATIVE); 2659 scr_gotorc (0, arg[0] - 1, R_RELATIVE);
2538 break; 2660 break;
2539 2661
2540 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */ 2662 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */
2541 scr_gotorc (arg[0] - 1, 0, C_RELATIVE); 2663 scr_gotorc (arg[0] - 1, 0, C_RELATIVE);
2542 break; 2664 break;
2543 2665
2544 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */ 2666 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */
2545 case CSI_HVP: /* 8.3.64: (1,1) CHARACTER AND LINE POSITION */ 2667 case CSI_HVP: /* 8.3.64: (1,1) CHARACTER AND LINE POSITION */
2546 scr_gotorc (arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0); 2668 scr_gotorc (arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0);
2547 break; 2669 break;
2548 2670
2549 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */ 2671 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */
2550 arg[0] = -arg[0]; 2672 arg[0] = -arg[0];
2551 /* FALLTHROUGH */ 2673 /* FALLTHROUGH */
2552 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2674 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2553 scr_tab (arg[0]); 2675 scr_tab (arg[0]);
2554 break; 2676 break;
2555 2677
2556 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2678 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2557 scr_erase_screen (arg[0]); 2679 scr_erase_screen (arg[0]);
2558 break; 2680 break;
2559 2681
2560 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2682 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2561 scr_erase_line (arg[0]); 2683 scr_erase_line (arg[0]);
2562 break; 2684 break;
2563 2685
2564 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */ 2686 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */
2565 scr_insdel_chars (arg[0], INSERT); 2687 scr_insdel_chars (arg[0], INSERT);
2566 break; 2688 break;
2567 2689
2568 case CSI_IL: /* 8.3.68: (1) INSERT LINE */ 2690 case CSI_IL: /* 8.3.68: (1) INSERT LINE */
2569 scr_insdel_lines (arg[0], INSERT); 2691 scr_insdel_lines (arg[0], INSERT);
2570 break; 2692 break;
2571 2693
2572 case CSI_DL: /* 8.3.33: (1) DELETE LINE */ 2694 case CSI_DL: /* 8.3.33: (1) DELETE LINE */
2573 scr_insdel_lines (arg[0], DELETE); 2695 scr_insdel_lines (arg[0], DELETE);
2574 break; 2696 break;
2575 2697
2576 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */ 2698 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */
2577 scr_insdel_chars (arg[0], ERASE); 2699 scr_insdel_chars (arg[0], ERASE);
2578 break; 2700 break;
2579 2701
2580 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */ 2702 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */
2581 scr_insdel_chars (arg[0], DELETE); 2703 scr_insdel_chars (arg[0], DELETE);
2582 break; 2704 break;
2583 2705
2584 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2706 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2585 arg[0] = -arg[0]; 2707 arg[0] = -arg[0];
2586 /* FALLTHROUGH */ 2708 /* FALLTHROUGH */
2587 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2709 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2588 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2710 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2589 break; 2711 break;
2590 2712
2591 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2713 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2592 tt_write((const unsigned char *)VT100_ANS, 2714 tt_write ((const unsigned char *)VT100_ANS,
2593 (unsigned int)(sizeof(VT100_ANS) - 1)); 2715 (unsigned int) (sizeof (VT100_ANS) - 1));
2594 break; 2716 break;
2595 2717
2596 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2718 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2597 process_sgr_mode (nargs, arg); 2719 process_sgr_mode (nargs, arg);
2598 break; 2720 break;
2599 2721
2600 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2722 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2601 switch (arg[0]) { 2723 switch (arg[0])
2724 {
2602 case 5: /* DSR requested */ 2725 case 5: /* DSR requested */
2603 tt_printf("\033[0n"); 2726 tt_printf ("\033[0n");
2604 break; 2727 break;
2605 case 6: /* CPR requested */ 2728 case 6: /* CPR requested */
2606 scr_report_position (); 2729 scr_report_position ();
2607 break; 2730 break;
2608#if defined (ENABLE_DISPLAY_ANSWER) 2731#if defined (ENABLE_DISPLAY_ANSWER)
2609 case 7: /* unofficial extension */ 2732 case 7: /* unofficial extension */
2610 tt_printf("%-.250s\n", rs[Rs_display_name]); 2733 tt_printf ("%-.250s\n", rs[Rs_display_name]);
2611 break; 2734 break;
2612#endif 2735#endif
2613 case 8: /* unofficial extension */ 2736 case 8: /* unofficial extension */
2614 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2737 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2738 break;
2739 }
2615 break; 2740 break;
2616 }
2617 break;
2618 2741
2619 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2742 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
2620 switch (arg[0]) { 2743 switch (arg[0])
2744 {
2621 case 0: /* char tab stop cleared at active position */ 2745 case 0: /* char tab stop cleared at active position */
2622 scr_set_tab (0); 2746 scr_set_tab (0);
2623 break; 2747 break;
2624 /* case 1: */ /* line tab stop cleared in active line */ 2748 /* case 1: */ /* line tab stop cleared in active line */
2625 /* case 2: */ /* char tab stops cleared in active line */ 2749 /* case 2: */ /* char tab stops cleared in active line */
2626 case 3: /* all char tab stops are cleared */ 2750 case 3: /* all char tab stops are cleared */
2627 /* case 4: */ /* all line tab stops are cleared */ 2751 /* case 4: */ /* all line tab stops are cleared */
2628 case 5: /* all tab stops are cleared */ 2752 case 5: /* all tab stops are cleared */
2629 scr_set_tab (-1); 2753 scr_set_tab (-1);
2754 break;
2755 }
2630 break; 2756 break;
2631 }
2632 break;
2633 2757
2634 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */ 2758 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */
2635 switch (arg[0]) { 2759 switch (arg[0])
2760 {
2636 case 0: /* char tab stop set at active position */ 2761 case 0: /* char tab stop set at active position */
2637 scr_set_tab (1); 2762 scr_set_tab (1);
2638 break; /* = ESC H */ 2763 break; /* = ESC H */
2639 /* case 1: */ /* line tab stop set at active line */ 2764 /* case 1: */ /* line tab stop set at active line */
2640 case 2: /* char tab stop cleared at active position */ 2765 case 2: /* char tab stop cleared at active position */
2641 scr_set_tab (0); 2766 scr_set_tab (0);
2642 break; /* = ESC [ 0 g */ 2767 break; /* = ESC [ 0 g */
2643 /* case 3: */ /* line tab stop cleared at active line */ 2768 /* case 3: */ /* line tab stop cleared at active line */
2644 /* case 4: */ /* char tab stops cleared at active line */ 2769 /* case 4: */ /* char tab stops cleared at active line */
2645 case 5: /* all char tab stops are cleared */ 2770 case 5: /* all char tab stops are cleared */
2646 scr_set_tab (-1); 2771 scr_set_tab (-1);
2647 break; /* = ESC [ 3 g */ 2772 break; /* = ESC [ 3 g */
2648 /* case 6: */ /* all line tab stops are cleared */ 2773 /* case 6: */ /* all line tab stops are cleared */
2649 } 2774 }
2650 break; 2775 break;
2651 2776
2652 case CSI_RM: /* 8.3.107: RESET MODE */ 2777 case CSI_RM: /* 8.3.107: RESET MODE */
2653 if (arg[0] == 4) 2778 if (arg[0] == 4)
2654 scr_insert_mode (0); 2779 scr_insert_mode (0);
2655 break; 2780 break;
2656 2781
2657 case CSI_SM: /* 8.3.126: SET MODE */ 2782 case CSI_SM: /* 8.3.126: SET MODE */
2658 if (arg[0] == 4) 2783 if (arg[0] == 4)
2659 scr_insert_mode (1); 2784 scr_insert_mode (1);
2660 break; 2785 break;
2661 2786
2662/* 2787 /*
2663 * PRIVATE USE beyond this point. All CSI_7? sequences here 2788 * PRIVATE USE beyond this point. All CSI_7? sequences here
2664 */ 2789 */
2665 case CSI_72: /* DECSTBM: set top and bottom margins */ 2790 case CSI_72: /* DECSTBM: set top and bottom margins */
2666 if (nargs == 1) 2791 if (nargs == 1)
2667 scr_scroll_region (arg[0] - 1, MAX_ROWS - 1); 2792 scr_scroll_region (arg[0] - 1, MAX_ROWS - 1);
2668 else if (nargs == 0 || arg[0] >= arg[1]) 2793 else if (nargs == 0 || arg[0] >= arg[1])
2669 scr_scroll_region (0, MAX_ROWS - 1); 2794 scr_scroll_region (0, MAX_ROWS - 1);
2670 else 2795 else
2671 scr_scroll_region (arg[0] - 1, arg[1] - 1); 2796 scr_scroll_region (arg[0] - 1, arg[1] - 1);
2672 break; 2797 break;
2673 2798
2674 case CSI_73: 2799 case CSI_73:
2675 scr_cursor (SAVE); 2800 scr_cursor (SAVE);
2676 break; 2801 break;
2677 case CSI_75: 2802 case CSI_75:
2678 scr_cursor (RESTORE); 2803 scr_cursor (RESTORE);
2679 break; 2804 break;
2680 2805
2681#ifndef NO_FRILLS 2806#ifndef NO_FRILLS
2682 case CSI_74: 2807 case CSI_74:
2683 process_window_ops (arg, nargs); 2808 process_window_ops (arg, nargs);
2684 break; 2809 break;
2685#endif 2810#endif
2686 2811
2687 case CSI_78: /* DECREQTPARM */ 2812 case CSI_78: /* DECREQTPARM */
2688 if (arg[0] == 0 || arg[0] == 1) 2813 if (arg[0] == 0 || arg[0] == 1)
2689 tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 2814 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2690 /* FALLTHROUGH */ 2815 /* FALLTHROUGH */
2691 2816
2692 default: 2817 default:
2693 break; 2818 break;
2694 } 2819 }
2695} 2820}
2696/*}}} */ 2821/*}}} */
2697 2822
2698#ifndef NO_FRILLS 2823#ifndef NO_FRILLS
2699/* ARGSUSED */ 2824/* ARGSUSED */
2700void 2825void
2701rxvt_term::process_window_ops (const int *args, unsigned int nargs) 2826rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2702{ 2827{
2703 int x, y; 2828 int x, y;
2704#if 0 2829#if 0
2705 char *s; 2830 char *s;
2706#endif 2831#endif
2707 XWindowAttributes wattr; 2832 XWindowAttributes wattr;
2708 Window wdummy; 2833 Window wdummy;
2709 2834
2710 if (nargs == 0) 2835 if (nargs == 0)
2711 return; 2836 return;
2712 switch (args[0]) { 2837 switch (args[0])
2838 {
2713 /* 2839 /*
2714 * commands 2840 * commands
2715 */ 2841 */
2716 case 1: /* deiconify window */ 2842 case 1: /* deiconify window */
2717 XMapWindow(Xdisplay, TermWin.parent[0]); 2843 XMapWindow (display->display, TermWin.parent[0]);
2718 break; 2844 break;
2719 case 2: /* iconify window */ 2845 case 2: /* iconify window */
2720 XIconifyWindow(Xdisplay, TermWin.parent[0], 2846 XIconifyWindow (display->display, TermWin.parent[0],
2721 DefaultScreen(Xdisplay)); 2847 DefaultScreen (display->display));
2722 break; 2848 break;
2723 case 3: /* set position (pixels) */ 2849 case 3: /* set position (pixels) */
2724 XMoveWindow(Xdisplay, TermWin.parent[0], args[1], args[2]); 2850 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]);
2725 break; 2851 break;
2726 case 4: /* set size (pixels) */ 2852 case 4: /* set size (pixels) */
2727 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 2853 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2728 break; 2854 break;
2729 case 5: /* raise window */ 2855 case 5: /* raise window */
2730 XRaiseWindow(Xdisplay, TermWin.parent[0]); 2856 XRaiseWindow (display->display, TermWin.parent[0]);
2731 break; 2857 break;
2732 case 6: /* lower window */ 2858 case 6: /* lower window */
2733 XLowerWindow(Xdisplay, TermWin.parent[0]); 2859 XLowerWindow (display->display, TermWin.parent[0]);
2734 break; 2860 break;
2735 case 7: /* refresh window */ 2861 case 7: /* refresh window */
2736 scr_touch (true); 2862 scr_touch (true);
2737 break; 2863 break;
2738 case 8: /* set size (chars) */ 2864 case 8: /* set size (chars) */
2739 set_widthheight ((unsigned int)(args[2] * TermWin.fwidth), 2865 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2740 (unsigned int)(args[1] * TermWin.fheight)); 2866 (unsigned int) (args[1] * TermWin.fheight));
2741 break; 2867 break;
2742 default: 2868 default:
2743 if (args[0] >= 24) /* set height (chars) */ 2869 if (args[0] >= 24) /* set height (chars) */
2744 set_widthheight ((unsigned int)TermWin.width, 2870 set_widthheight ((unsigned int)TermWin.width,
2745 (unsigned int)(args[1] * TermWin.fheight)); 2871 (unsigned int) (args[1] * TermWin.fheight));
2746 break; 2872 break;
2747 /* 2873 /*
2748 * reports - some output format copied from XTerm 2874 * reports - some output format copied from XTerm
2749 */ 2875 */
2750 case 11: /* report window state */ 2876 case 11: /* report window state */
2751 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2877 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2752 tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2878 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2753 break; 2879 break;
2754 case 13: /* report window position */ 2880 case 13: /* report window position */
2755 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2881 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2756 XTranslateCoordinates(Xdisplay, TermWin.parent[0], wattr.root, 2882 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2757 -wattr.border_width, -wattr.border_width, 2883 -wattr.border_width, -wattr.border_width,
2758 &x, &y, &wdummy); 2884 &x, &y, &wdummy);
2759 tt_printf("\033[3;%d;%dt", x, y); 2885 tt_printf ("\033[3;%d;%dt", x, y);
2760 break; 2886 break;
2761 case 14: /* report window size (pixels) */ 2887 case 14: /* report window size (pixels) */
2762 XGetWindowAttributes(Xdisplay, TermWin.parent[0], &wattr); 2888 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2763 tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 2889 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2764 break; 2890 break;
2765 case 18: /* report window size (chars) */ 2891 case 18: /* report window size (chars) */
2766 tt_printf("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 2892 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2767 break; 2893 break;
2768#if 0 /* XXX: currently disabled due to security concerns */ 2894#if 0 /* XXX: currently disabled due to security concerns */
2769 case 20: /* report icon label */ 2895 case 20: /* report icon label */
2770 XGetIconName(Xdisplay, TermWin.parent[0], &s); 2896 XGetIconName (display->display, TermWin.parent[0], &s);
2771 tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2897 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2772 break; 2898 break;
2773 case 21: /* report window title */ 2899 case 21: /* report window title */
2774 XFetchName(Xdisplay, TermWin.parent[0], &s); 2900 XFetchName (display->display, TermWin.parent[0], &s);
2775 tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2901 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2776 break; 2902 break;
2777#endif 2903#endif
2904
2778 } 2905 }
2779} 2906}
2780#endif 2907#endif
2781 2908
2782/*----------------------------------------------------------------------*/ 2909/*----------------------------------------------------------------------*/
2783/* 2910/*
2784 * get input up until STRING TERMINATOR (or BEL) 2911 * get input up until STRING TERMINATOR (or BEL)
2785 * ends_how is terminator used. returned input must be free()d 2912 * ends_how is terminator used. returned input must be free ()d
2786 */ 2913 */
2787unsigned char * 2914unsigned char *
2788rxvt_term::get_to_st (unsigned char *ends_how) 2915rxvt_term::get_to_st (unsigned char *ends_how)
2789{ 2916{
2790 int seen_esc = 0; /* seen escape? */ 2917 int seen_esc = 0; /* seen escape? */
2791 unsigned int n = 0; 2918 unsigned int n = 0;
2792 unsigned char *s; 2919 unsigned char *s;
2793 unsigned char ch, string[STRING_MAX]; 2920 unsigned char ch, string[STRING_MAX];
2794 2921
2795 for (; (ch = cmd_getc ());) { 2922 for (; (ch = cmd_getc ());)
2923 {
2796 if (ch == C0_BEL 2924 if (ch == C0_BEL
2797 || ch == CHAR_ST 2925 || ch == CHAR_ST
2798 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 2926 || (ch == 0x5c && seen_esc)) /* 7bit ST */
2799 break; 2927 break;
2800 if (ch == C0_ESC) { 2928 if (ch == C0_ESC)
2929 {
2801 seen_esc = 1; 2930 seen_esc = 1;
2802 continue; 2931 continue;
2932 }
2803 } else if (ch == '\t') 2933 else if (ch == '\t')
2804 ch = ' '; /* translate '\t' to space */ 2934 ch = ' '; /* translate '\t' to space */
2805 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 2935 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20))
2806 return NULL; /* other control character - exit */ 2936 return NULL; /* other control character - exit */
2807 if (n < sizeof(string) - 1) 2937 if (n < sizeof (string) - 1)
2808 string[n++] = ch; 2938 string[n++] = ch;
2809 seen_esc = 0; 2939 seen_esc = 0;
2810 } 2940 }
2811 string[n++] = '\0'; 2941 string[n++] = '\0';
2812 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 2942 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2813 return NULL; 2943 return NULL;
2814 *ends_how = (ch == 0x5c ? C0_ESC : ch); 2944 *ends_how = (ch == 0x5c ? C0_ESC : ch);
2815 STRNCPY(s, string, n); 2945 STRNCPY (s, string, n);
2816 return s; 2946 return s;
2817} 2947}
2818 2948
2819/*----------------------------------------------------------------------*/ 2949/*----------------------------------------------------------------------*/
2820/* 2950/*
2821 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 2951 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2822 */ 2952 */
2823void 2953void
2824rxvt_term::process_dcs_seq () 2954rxvt_term::process_dcs_seq ()
2825{ 2955{
2826 unsigned char eh, *s; 2956 unsigned char eh, *s;
2827/* 2957 /*
2828 * Not handled yet 2958 * Not handled yet
2829 */ 2959 */
2830 s = get_to_st (&eh); 2960 s = get_to_st (&eh);
2831 if (s) 2961 if (s)
2832 free(s); 2962 free (s);
2833 return; 2963 return;
2834} 2964}
2835 2965
2836/*----------------------------------------------------------------------*/ 2966/*----------------------------------------------------------------------*/
2837/* 2967/*
2838 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 2968 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2839 */ 2969 */
2840void 2970void
2841rxvt_term::process_osc_seq () 2971rxvt_term::process_osc_seq ()
2842{ 2972{
2843 unsigned char ch, eh, *s; 2973 unsigned char ch, eh, *s;
2844 int arg; 2974 int arg;
2845 2975
2846 ch = cmd_getc (); 2976 ch = cmd_getc ();
2847 for (arg = 0; isdigit(ch); ch = cmd_getc ()) 2977 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2848 arg = arg * 10 + (ch - '0'); 2978 arg = arg * 10 + (ch - '0');
2849 2979
2850 if (ch == ';') { 2980 if (ch == ';')
2981 {
2851 s = get_to_st (&eh); 2982 s = get_to_st (&eh);
2852 if (s) { 2983 if (s)
2853 /* 2984 {
2985 /*
2854 * rxvt_menubar_dispatch() violates the constness of the string, 2986 * rxvt_menubar_dispatch () violates the constness of the string,
2855 * so do it here 2987 * so do it here
2856 */ 2988 */
2857 if (arg == XTerm_Menu) 2989 if (arg == XTerm_Menu)
2858#if 0 /* XXX: currently disabled due to security concerns */ 2990#if 0 /* XXX: currently disabled due to security concerns */
2859 menubar_dispatch ((char *)s); 2991 menubar_dispatch ((char *)s);
2860#else 2992#else
2861 (void)0; 2993 (void)0;
2862#endif 2994#endif
2863 else 2995 else
2864 xterm_seq (arg, (char *)s, eh); 2996 xterm_seq (arg, (char *)s, eh);
2865 free(s); 2997 free (s);
2866 } 2998 }
2867 } 2999 }
2868} 3000}
2869/* 3001/*
2870 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3002 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2871 * 0 = change iconName/title 3003 * 0 = change iconName/title
… …
2886 * 39 = change default fg color 3018 * 39 = change default fg color
2887 * 49 = change default bg color 3019 * 49 = change default bg color
2888 * 55 = dump scrollback buffer and all of screen 3020 * 55 = dump scrollback buffer and all of screen
2889 */ 3021 */
2890void 3022void
2891rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused))) 3023rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused)))
2892{ 3024{
2893 int changed = 0; 3025 int changed = 0;
2894 int color; 3026 int color;
2895 char *buf, *name; 3027 char *buf, *name;
2896 3028
2897 assert(str != NULL); 3029 assert (str != NULL);
2898 switch (op) { 3030 switch (op)
3031 {
2899 case XTerm_name: 3032 case XTerm_name:
2900 set_title (str); 3033 set_title (str);
2901 /* FALLTHROUGH */ 3034 /* FALLTHROUGH */
2902 case XTerm_iconName: 3035 case XTerm_iconName:
2903 set_iconName (str); 3036 set_iconName (str);
2904 break; 3037 break;
2905 case XTerm_title: 3038 case XTerm_title:
2906 set_title (str); 3039 set_title (str);
2907 break; 3040 break;
2908 case XTerm_Color: 3041 case XTerm_Color:
2909 for (buf = (char *)str; buf && *buf;) { 3042 for (buf = (char *)str; buf && *buf;)
3043 {
2910 if ((name = STRCHR(buf, ';')) == NULL) 3044 if ((name = STRCHR (buf, ';')) == NULL)
2911 break; 3045 break;
2912 *name++ = '\0'; 3046 *name++ = '\0';
2913 color = atoi(buf); 3047 color = atoi (buf);
2914 if (color < 0 || color >= TOTAL_COLORS) 3048 if (color < 0 || color >= TOTAL_COLORS)
2915 break; 3049 break;
2916 if ((buf = STRCHR(name, ';')) != NULL) 3050 if ((buf = STRCHR (name, ';')) != NULL)
2917 *buf++ = '\0'; 3051 *buf++ = '\0';
2918 set_window_color (color + minCOLOR, name); 3052 set_window_color (color + minCOLOR, name);
2919 } 3053 }
2920 break; 3054 break;
2921#ifndef NO_CURSORCOLOR 3055#ifndef NO_CURSORCOLOR
2922 case XTerm_Color_cursor: 3056 case XTerm_Color_cursor:
2923 set_window_color (Color_cursor, str); 3057 set_window_color (Color_cursor, str);
2924 break; 3058 break;
2925#endif 3059#endif
2926 case XTerm_Color_pointer: 3060 case XTerm_Color_pointer:
2927 set_window_color (Color_pointer, str); 3061 set_window_color (Color_pointer, str);
2928 break; 3062 break;
2929#ifndef NO_BOLD_UNDERLINE_REVERSE 3063#ifndef NO_BOLD_UNDERLINE_REVERSE
2930 case XTerm_Color_BD: 3064 case XTerm_Color_BD:
2931 set_window_color (Color_BD, str); 3065 set_window_color (Color_BD, str);
2932 break; 3066 break;
2933 case XTerm_Color_UL: 3067 case XTerm_Color_UL:
2934 set_window_color (Color_UL, str); 3068 set_window_color (Color_UL, str);
2935 break; 3069 break;
2936 case XTerm_Color_RV: 3070 case XTerm_Color_RV:
2937 set_window_color (Color_RV, str); 3071 set_window_color (Color_RV, str);
2938 break; 3072 break;
2939#endif 3073#endif
2940 3074
2941 case XTerm_Menu: 3075 case XTerm_Menu:
2942 /* 3076 /*
2943 * rxvt_menubar_dispatch() violates the constness of the string, 3077 * rxvt_menubar_dispatch () violates the constness of the string,
2944 * so DON'T do it here 3078 * so DON'T do it here
2945 */ 3079 */
2946 break; 3080 break;
2947 case XTerm_Pixmap: 3081 case XTerm_Pixmap:
2948 if (*str != ';') { 3082 if (*str != ';')
3083 {
2949#if XPM_BACKGROUND 3084#if XPM_BACKGROUND
2950 scale_pixmap (""); /* reset to default scaling */ 3085 scale_pixmap (""); /* reset to default scaling */
2951 set_bgPixmap (str); /* change pixmap */ 3086 set_bgPixmap (str); /* change pixmap */
2952#endif 3087#endif
2953 scr_touch (true); 3088 scr_touch (true);
2954 } 3089 }
2955 while ((str = STRCHR(str, ';')) != NULL) { 3090 while ((str = STRCHR (str, ';')) != NULL)
2956 str++; 3091 {
3092 str++;
2957#if XPM_BACKGROUND 3093#if XPM_BACKGROUND
2958 changed += scale_pixmap (str); 3094 changed += scale_pixmap (str);
2959#endif 3095#endif
2960 } 3096
2961 if (changed) { 3097 }
3098 if (changed)
3099 {
2962#ifdef XPM_BACKGROUND 3100#ifdef XPM_BACKGROUND
2963 resize_pixmap (); 3101 resize_pixmap ();
2964#endif 3102#endif
2965 scr_touch (true); 3103 scr_touch (true);
2966 } 3104 }
2967 break; 3105 break;
2968 3106
2969 case XTerm_restoreFG: 3107 case XTerm_restoreFG:
2970 set_window_color (Color_fg, str); 3108 set_window_color (Color_fg, str);
2971 break; 3109 break;
2972 case XTerm_restoreBG: 3110 case XTerm_restoreBG:
2973 set_window_color (Color_bg, str); 3111 set_window_color (Color_bg, str);
2974 break; 3112 break;
2975 case XTerm_logfile: 3113 case XTerm_logfile:
2976 break; 3114 break;
2977 case XTerm_font: 3115 case XTerm_font:
2978 change_font (0, str); 3116 change_font (0, str);
2979 break; 3117 break;
2980#if 0 3118#if 0
2981 case XTerm_dumpscreen: /* no error notices */ 3119 case XTerm_dumpscreen: /* no error notices */
2982 { 3120 {
2983 int fd; 3121 int fd;
2984 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) { 3122 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
2985 scr_dump (fd); 3123 {
2986 close(fd); 3124 scr_dump (fd);
2987 } 3125 close (fd);
2988 } 3126 }
2989 break; 3127 }
3128 break;
2990#endif 3129#endif
3130
2991 } 3131 }
2992} 3132}
2993/*----------------------------------------------------------------------*/ 3133/*----------------------------------------------------------------------*/
2994 3134
2995/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3135/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3003 * so no need for fancy checking 3143 * so no need for fancy checking
3004 */ 3144 */
3005int 3145int
3006rxvt_term::privcases (int mode, unsigned long bit) 3146rxvt_term::privcases (int mode, unsigned long bit)
3007{ 3147{
3008 int state; 3148 int state;
3009 3149
3010 if (mode == 's') { 3150 if (mode == 's')
3151 {
3011 SavedModes |= (PrivateModes & bit); 3152 SavedModes |= (PrivateModes & bit);
3012 return -1; 3153 return -1;
3013 } else { 3154 }
3155 else
3156 {
3014 if (mode == 'r') 3157 if (mode == 'r')
3015 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3158 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3016 else 3159 else
3017 state = (mode == 't') ? !(PrivateModes & bit) : mode; 3160 state = (mode == 't') ? ! (PrivateModes & bit) : mode;
3018 PrivMode(state, bit); 3161 PrivMode (state, bit);
3019 } 3162 }
3020 return state; 3163 return state;
3021} 3164}
3022 3165
3023/* we're not using priv _yet_ */ 3166/* we're not using priv _yet_ */
3024void 3167void
3025rxvt_term::process_terminal_mode (int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg) 3168rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3026{ 3169{
3027 unsigned int i, j; 3170 unsigned int i, j;
3028 int state; 3171 int state;
3029 static const struct { 3172 static const struct
3173 {
3030 const int argval; 3174 const int argval;
3031 const unsigned long bit; 3175 const unsigned long bit;
3176 }
3032 } argtopriv[] = { 3177 argtopriv[] = {
3033 { 1, PrivMode_aplCUR }, 3178 { 1, PrivMode_aplCUR },
3034 { 2, PrivMode_vt52 }, 3179 { 2, PrivMode_vt52 },
3035 { 3, PrivMode_132 }, 3180 { 3, PrivMode_132 },
3036 { 4, PrivMode_smoothScroll }, 3181 { 4, PrivMode_smoothScroll },
3037 { 5, PrivMode_rVideo }, 3182 { 5, PrivMode_rVideo },
3038 { 6, PrivMode_relOrigin }, 3183 { 6, PrivMode_relOrigin },
3039 { 7, PrivMode_Autowrap }, 3184 { 7, PrivMode_Autowrap },
3040 { 9, PrivMode_MouseX10 }, 3185 { 9, PrivMode_MouseX10 },
3041#ifdef menuBar_esc 3186#ifdef menuBar_esc
3042 { menuBar_esc, PrivMode_menuBar }, 3187 { menuBar_esc, PrivMode_menuBar },
3043#endif 3188#endif
3044#ifdef scrollBar_esc 3189#ifdef scrollBar_esc
3045 { scrollBar_esc, PrivMode_scrollBar }, 3190 { scrollBar_esc, PrivMode_scrollBar },
3046#endif 3191#endif
3047 { 25, PrivMode_VisibleCursor }, 3192 { 25, PrivMode_VisibleCursor },
3048 { 35, PrivMode_ShiftKeys }, 3193 { 35, PrivMode_ShiftKeys },
3049 { 40, PrivMode_132OK }, 3194 { 40, PrivMode_132OK },
3050 { 47, PrivMode_Screen }, 3195 { 47, PrivMode_Screen },
3051 { 66, PrivMode_aplKP }, 3196 { 66, PrivMode_aplKP },
3052#ifndef NO_BACKSPACE_KEY 3197#ifndef NO_BACKSPACE_KEY
3053 { 67, PrivMode_BackSpace }, 3198 { 67, PrivMode_BackSpace },
3054#endif 3199#endif
3055 { 1000, PrivMode_MouseX11 }, 3200 { 1000, PrivMode_MouseX11 },
3056 { 1010, PrivMode_TtyOutputInh }, 3201 { 1010, PrivMode_TtyOutputInh },
3057 { 1011, PrivMode_Keypress }, 3202 { 1011, PrivMode_Keypress },
3058 { 1047, PrivMode_Screen }, 3203 { 1047, PrivMode_Screen },
3059 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3204 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */
3060 }; 3205 };
3061 3206
3062 if (nargs == 0) 3207 if (nargs == 0)
3063 return; 3208 return;
3064 3209
3065/* make lo/hi boolean */ 3210 /* make lo/hi boolean */
3066 if (mode == 'l') 3211 if (mode == 'l')
3067 mode = 0; /* reset */ 3212 mode = 0; /* reset */
3068 else if (mode == 'h') 3213 else if (mode == 'h')
3069 mode = 1; /* set */ 3214 mode = 1; /* set */
3070 3215
3071 for (i = 0; i < nargs; i++) { 3216 for (i = 0; i < nargs; i++)
3217 {
3072 state = -1; 3218 state = -1;
3073 3219
3074 /* basic handling */ 3220 /* basic handling */
3075 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 3221 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++)
3076 if (argtopriv[j].argval == arg[i]) { 3222 if (argtopriv[j].argval == arg[i])
3223 {
3077 state = privcases (mode, argtopriv[j].bit); 3224 state = privcases (mode, argtopriv[j].bit);
3078 break; 3225 break;
3079 } 3226 }
3080 3227
3081 /* extra handling for values with state unkept */ 3228 /* extra handling for values with state unkept */
3082 if (state == -1) 3229 if (state == -1)
3083 switch (arg[i]) { 3230 switch (arg[i])
3231 {
3084 case 1048: /* alternative cursor save */ 3232 case 1048: /* alternative cursor save */
3085 if (mode == 0) 3233 if (mode == 0)
3086 scr_cursor (RESTORE); 3234 scr_cursor (RESTORE);
3087 else if (mode == 1) 3235 else if (mode == 1)
3088 scr_cursor (SAVE); 3236 scr_cursor (SAVE);
3089 /* FALLTHROUGH */ 3237 /* FALLTHROUGH */
3090 default: 3238 default:
3091 continue; /* for(;i;) */ 3239 continue; /* for (;i;) */
3092 } 3240 }
3093 3241
3094 /* extra handling for values with valid 0 or 1 state */ 3242 /* extra handling for values with valid 0 or 1 state */
3095 switch (arg[i]) { 3243 switch (arg[i])
3244 {
3096 /* case 1: - application cursor keys */ 3245 /* case 1: - application cursor keys */
3097 case 2: /* VT52 mode */ 3246 case 2: /* VT52 mode */
3098 /* oddball mode. should be set regardless of set/reset 3247 /* oddball mode. should be set regardless of set/reset
3099 * parameter. Return from VT52 mode with an ESC < from 3248 * parameter. Return from VT52 mode with an ESC < from
3100 * within VT52 mode 3249 * within VT52 mode
3101 */ 3250 */
3102 PrivMode(1, PrivMode_vt52); 3251 PrivMode (1, PrivMode_vt52);
3103 break; 3252 break;
3104 case 3: /* 80/132 */ 3253 case 3: /* 80/132 */
3105 if (PrivateModes & PrivMode_132OK) 3254 if (PrivateModes & PrivMode_132OK)
3106 set_widthheight ( (unsigned int)((state ? 132 : 80) * TermWin.fwidth), 3255 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth),
3107 (unsigned int)TermWin.height); 3256 (unsigned int)TermWin.height);
3108 break; 3257 break;
3109 case 4: /* smooth scrolling */ 3258 case 4: /* smooth scrolling */
3110 if (state) 3259 if (state)
3111 Options &= ~Opt_jumpScroll; 3260 Options &= ~Opt_jumpScroll;
3112 else 3261 else
3113 Options |= Opt_jumpScroll; 3262 Options |= Opt_jumpScroll;
3114 break; 3263 break;
3115 case 5: /* reverse video */ 3264 case 5: /* reverse video */
3116 scr_rvideo_mode (state); 3265 scr_rvideo_mode (state);
3117 break; 3266 break;
3118 case 6: /* relative/absolute origins */ 3267 case 6: /* relative/absolute origins */
3119 scr_relative_origin (state); 3268 scr_relative_origin (state);
3120 break; 3269 break;
3121 case 7: /* autowrap */ 3270 case 7: /* autowrap */
3122 scr_autowrap (state); 3271 scr_autowrap (state);
3123 break; 3272 break;
3124 /* case 8: - auto repeat, can't do on a per window basis */ 3273 /* case 8: - auto repeat, can't do on a per window basis */
3125 case 9: /* X10 mouse reporting */ 3274 case 9: /* X10 mouse reporting */
3126 if (state) /* orthogonal */ 3275 if (state) /* orthogonal */
3127 PrivateModes &= ~(PrivMode_MouseX11); 3276 PrivateModes &= ~ (PrivMode_MouseX11);
3128 break; 3277 break;
3129#ifdef menuBar_esc 3278#ifdef menuBar_esc
3130 case menuBar_esc: 3279 case menuBar_esc:
3131#ifdef MENUBAR 3280#ifdef MENUBAR
3132 map_menuBar (state); 3281 map_menuBar (state);
3133#endif 3282#endif
3134 break; 3283 break;
3135#endif 3284#endif
3136#ifdef scrollBar_esc 3285#ifdef scrollBar_esc
3137 case scrollBar_esc: 3286 case scrollBar_esc:
3138 if (scrollbar_mapping (state)) { 3287 if (scrollbar_mapping (state))
3288 {
3139 resize_all_windows (0, 0, 0); 3289 resize_all_windows (0, 0, 0);
3140 scr_touch (true); 3290 scr_touch (true);
3141 } 3291 }
3142 break; 3292 break;
3143#endif 3293#endif
3144 case 25: /* visible/invisible cursor */ 3294 case 25: /* visible/invisible cursor */
3145 scr_cursor_visible (state); 3295 scr_cursor_visible (state);
3146 break; 3296 break;
3147 /* case 35: - shift keys */ 3297 /* case 35: - shift keys */
3148 /* case 40: - 80 <--> 132 mode */ 3298 /* case 40: - 80 <--> 132 mode */
3149 case 47: /* secondary screen */ 3299 case 47: /* secondary screen */
3150 scr_change_screen (state); 3300 scr_change_screen (state);
3151 break; 3301 break;
3152 /* case 66: - application key pad */ 3302 /* case 66: - application key pad */
3153 /* case 67: - backspace key */ 3303 /* case 67: - backspace key */
3154 case 1000: /* X11 mouse reporting */ 3304 case 1000: /* X11 mouse reporting */
3155 if (state) /* orthogonal */ 3305 if (state) /* orthogonal */
3156 PrivateModes &= ~(PrivMode_MouseX10); 3306 PrivateModes &= ~ (PrivMode_MouseX10);
3157 break; 3307 break;
3158#if 0 3308#if 0
3159 case 1001: 3309 case 1001:
3160 break; /* X11 mouse highlighting */ 3310 break; /* X11 mouse highlighting */
3161#endif 3311#endif
3162 case 1010: /* scroll to bottom on TTY output inhibit */ 3312 case 1010: /* scroll to bottom on TTY output inhibit */
3163 if (state) 3313 if (state)
3164 Options &= ~Opt_scrollTtyOutput; 3314 Options &= ~Opt_scrollTtyOutput;
3165 else 3315 else
3166 Options |= Opt_scrollTtyOutput; 3316 Options |= Opt_scrollTtyOutput;
3167 break; 3317 break;
3168 case 1011: /* scroll to bottom on key press */ 3318 case 1011: /* scroll to bottom on key press */
3169 if (state) 3319 if (state)
3170 Options |= Opt_scrollTtyKeypress; 3320 Options |= Opt_scrollTtyKeypress;
3171 else 3321 else
3172 Options &= ~Opt_scrollTtyKeypress; 3322 Options &= ~Opt_scrollTtyKeypress;
3173 break; 3323 break;
3174 case 1047: /* secondary screen w/ clearing */ 3324 case 1047: /* secondary screen w/ clearing */
3175 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3325 case 1049: /* better secondary screen w/ clearing, but not fully implemented */
3176 if (current_screen != PRIMARY) 3326 if (current_screen != PRIMARY)
3177 scr_erase_screen (2); 3327 scr_erase_screen (2);
3178 scr_change_screen (state); 3328 scr_change_screen (state);
3179 /* FALLTHROUGH */ 3329 /* FALLTHROUGH */
3180 default: 3330 default:
3181 break; 3331 break;
3182 } 3332 }
3183 } 3333 }
3184} 3334}
3185/*}}} */ 3335/*}}} */
3186 3336
3187/*{{{ process sgr sequences */ 3337/*{{{ process sgr sequences */
3188void 3338void
3189rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3339rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3190{ 3340{
3191 unsigned int i; 3341 unsigned int i;
3192 short rendset; 3342 short rendset;
3193 int rendstyle; 3343 int rendstyle;
3194 3344
3195 if (nargs == 0) { 3345 if (nargs == 0)
3346 {
3196 scr_rendition (0, ~RS_None); 3347 scr_rendition (0, ~RS_None);
3197 return; 3348 return;
3198 } 3349 }
3199 for (i = 0; i < nargs; i++) { 3350 for (i = 0; i < nargs; i++)
3351 {
3200 rendset = -1; 3352 rendset = -1;
3201 switch (arg[i]) { 3353 switch (arg[i])
3202 case 0: 3354 {
3355 case 0:
3203 rendset = 0, rendstyle = ~RS_None; 3356 rendset = 0, rendstyle = ~RS_None;
3204 break; 3357 break;
3205 case 1: 3358 case 1:
3206 rendset = 1, rendstyle = RS_Bold; 3359 rendset = 1, rendstyle = RS_Bold;
3207 break; 3360 break;
3208 case 4: 3361 case 4:
3209 rendset = 1, rendstyle = RS_Uline; 3362 rendset = 1, rendstyle = RS_Uline;
3210 break; 3363 break;
3211 case 5: 3364 case 5:
3212 rendset = 1, rendstyle = RS_Blink; 3365 rendset = 1, rendstyle = RS_Blink;
3213 break; 3366 break;
3214 case 7: 3367 case 7:
3215 rendset = 1, rendstyle = RS_RVid; 3368 rendset = 1, rendstyle = RS_RVid;
3216 break; 3369 break;
3217 case 22: 3370 case 22:
3218 rendset = 0, rendstyle = RS_Bold; 3371 rendset = 0, rendstyle = RS_Bold;
3219 break; 3372 break;
3220 case 24: 3373 case 24:
3221 rendset = 0, rendstyle = RS_Uline; 3374 rendset = 0, rendstyle = RS_Uline;
3222 break; 3375 break;
3223 case 25: 3376 case 25:
3224 rendset = 0, rendstyle = RS_Blink; 3377 rendset = 0, rendstyle = RS_Blink;
3225 break; 3378 break;
3226 case 27: 3379 case 27:
3227 rendset = 0, rendstyle = RS_RVid; 3380 rendset = 0, rendstyle = RS_RVid;
3228 break; 3381 break;
3229 } 3382 }
3230 if (rendset != -1) { 3383 if (rendset != -1)
3384 {
3231 scr_rendition (rendset, rendstyle); 3385 scr_rendition (rendset, rendstyle);
3232 continue; /* for(;i;) */ 3386 continue; /* for (;i;) */
3233 } 3387 }
3234 3388
3235 switch (arg[i]) { 3389 switch (arg[i])
3236 case 30: 3390 {
3391 case 30:
3237 case 31: /* set fg color */ 3392 case 31: /* set fg color */
3238 case 32: 3393 case 32:
3239 case 33: 3394 case 33:
3240 case 34: 3395 case 34:
3241 case 35: 3396 case 35:
3242 case 36: 3397 case 36:
3243 case 37: 3398 case 37:
3244 scr_color ((unsigned int)(minCOLOR + (arg[i] - 30)), 3399 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)),
3245 Color_fg); 3400 Color_fg);
3246 break; 3401 break;
3247#ifdef TTY_256COLOR 3402#ifdef TTY_256COLOR
3248 case 38: 3403 case 38:
3249 if (nargs > i + 2 && arg[i + 1] == 5) { 3404 if (nargs > i + 2 && arg[i + 1] == 5)
3405 {
3250 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3406 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3251 Color_fg); 3407 Color_fg);
3252 i += 2; 3408 i += 2;
3253 } 3409 }
3254 break; 3410 break;
3255#endif 3411#endif
3256 case 39: /* default fg */ 3412 case 39: /* default fg */
3257 scr_color (Color_fg, Color_fg); 3413 scr_color (Color_fg, Color_fg);
3258 break; 3414 break;
3259 3415
3260 case 40: 3416 case 40:
3261 case 41: /* set bg color */ 3417 case 41: /* set bg color */
3262 case 42: 3418 case 42:
3263 case 43: 3419 case 43:
3264 case 44: 3420 case 44:
3265 case 45: 3421 case 45:
3266 case 46: 3422 case 46:
3267 case 47: 3423 case 47:
3268 scr_color ((unsigned int)(minCOLOR + (arg[i] - 40)), 3424 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)),
3269 Color_bg); 3425 Color_bg);
3270 break; 3426 break;
3271#ifdef TTY_256COLOR 3427#ifdef TTY_256COLOR
3272 case 48: 3428 case 48:
3273 if (nargs > i + 2 && arg[i + 1] == 5) { 3429 if (nargs > i + 2 && arg[i + 1] == 5)
3430 {
3274 scr_color ((unsigned int)(minCOLOR + arg[i + 2]), 3431 scr_color ((unsigned int) (minCOLOR + arg[i + 2]),
3275 Color_bg); 3432 Color_bg);
3276 i += 2; 3433 i += 2;
3277 } 3434 }
3278 break; 3435 break;
3279#endif 3436#endif
3280 case 49: /* default bg */ 3437 case 49: /* default bg */
3281 scr_color (Color_bg, Color_bg); 3438 scr_color (Color_bg, Color_bg);
3282 break; 3439 break;
3283 3440
3284#ifndef NO_BRIGHTCOLOR 3441#ifndef NO_BRIGHTCOLOR
3285 case 90: 3442 case 90:
3286 case 91: /* set bright fg color */ 3443 case 91: /* set bright fg color */
3287 case 92: 3444 case 92:
3288 case 93: 3445 case 93:
3289 case 94: 3446 case 94:
3290 case 95: 3447 case 95:
3291 case 96: 3448 case 96:
3292 case 97: 3449 case 97:
3293 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 90)), 3450 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)),
3294 Color_fg); 3451 Color_fg);
3295 break; 3452 break;
3296 case 100: 3453 case 100:
3297 case 101: /* set bright bg color */ 3454 case 101: /* set bright bg color */
3298 case 102: 3455 case 102:
3299 case 103: 3456 case 103:
3300 case 104: 3457 case 104:
3301 case 105: 3458 case 105:
3302 case 106: 3459 case 106:
3303 case 107: 3460 case 107:
3304 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 100)), 3461 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)),
3305 Color_bg); 3462 Color_bg);
3306 break; 3463 break;
3307#endif 3464#endif
3308 } 3465
3466 }
3309 } 3467 }
3310} 3468}
3311/*}}} */ 3469/*}}} */
3312 3470
3313/*{{{ process Rob Nation's own graphics mode sequences */ 3471/*{{{ process Rob Nation's own graphics mode sequences */
3314void 3472void
3315rxvt_term::process_graphics () 3473rxvt_term::process_graphics ()
3316{ 3474{
3317 unsigned char ch, cmd = cmd_getc (); 3475 unsigned char ch, cmd = cmd_getc ();
3318 3476
3319#ifndef RXVT_GRAPHICS 3477#ifndef RXVT_GRAPHICS
3478 if (cmd == 'Q')
3320 if (cmd == 'Q') { /* query graphics */ 3479 { /* query graphics */
3321 tt_printf("\033G0\n"); /* no graphics */ 3480 tt_printf ("\033G0\n"); /* no graphics */
3322 return; 3481 return;
3323 } 3482 }
3324/* swallow other graphics sequences until terminating ':' */ 3483 /* swallow other graphics sequences until terminating ':' */
3325 do 3484 do
3326 ch = cmd_getc (); 3485 ch = cmd_getc ();
3327 while (ch != ':'); 3486 while (ch != ':');
3328#else 3487#else
3329 unsigned int nargs; 3488 unsigned int nargs;
3330 int args[NGRX_PTS]; 3489 int args[NGRX_PTS];
3331 unsigned char *text = NULL; 3490 unsigned char *text = NULL;
3332 3491
3492 if (cmd == 'Q')
3333 if (cmd == 'Q') { /* query graphics */ 3493 { /* query graphics */
3334 tt_printf("\033G1\n"); /* yes, graphics (color) */ 3494 tt_printf ("\033G1\n"); /* yes, graphics (color) */
3335 return; 3495 return;
3336 } 3496 }
3337 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) { 3497 for (nargs = 0; nargs < (sizeof (args) / sizeof (args[0])) - 1;)
3498 {
3338 int neg; 3499 int neg;
3339 3500
3340 ch = cmd_getc ();
3341 neg = (ch == '-');
3342 if (neg || ch == '+')
3343 ch = cmd_getc (); 3501 ch = cmd_getc ();
3502 neg = (ch == '-');
3503 if (neg || ch == '+')
3504 ch = cmd_getc ();
3344 3505
3345 for (args[nargs] = 0; isdigit(ch); ch = cmd_getc ()) 3506 for (args[nargs] = 0; isdigit (ch); ch = cmd_getc ())
3346 args[nargs] = args[nargs] * 10 + (ch - '0'); 3507 args[nargs] = args[nargs] * 10 + (ch - '0');
3347 if (neg) 3508 if (neg)
3348 args[nargs] = -args[nargs]; 3509 args[nargs] = -args[nargs];
3349 3510
3350 nargs++; 3511 nargs++;
3351 args[nargs] = 0; 3512 args[nargs] = 0;
3352 if (ch != ';') 3513 if (ch != ';')
3353 break; 3514 break;
3354 } 3515 }
3355 3516
3356 if ((cmd == 'T') && (nargs >= 5)) { 3517 if ((cmd == 'T') && (nargs >= 5))
3518 {
3357 int i, len = args[4]; 3519 int i, len = args[4];
3358 3520
3359 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char)); 3521 text = (unsigned char *)rxvt_malloc ((len + 1) * sizeof (char));
3360 3522
3361 if (text != NULL) { 3523 if (text != NULL)
3524 {
3362 for (i = 0; i < len; i++) 3525 for (i = 0; i < len; i++)
3363 text[i] = cmd_getc (); 3526 text[i] = cmd_getc ();
3364 text[len] = '\0'; 3527 text[len] = '\0';
3365 } 3528 }
3366 } 3529 }
3367 Gr_do_graphics (cmd, nargs, args, text); 3530 Gr_do_graphics (cmd, nargs, args, text);
3368#endif 3531#endif
3369} 3532}
3370/*}}} */ 3533/*}}} */
3371 3534
3372/* ------------------------------------------------------------------------- */ 3535/* ------------------------------------------------------------------------- */
3373 3536
3374/* 3537/*
3375 * Send printf() formatted output to the command. 3538 * Send printf () formatted output to the command.
3376 * Only use for small amounts of data. 3539 * Only use for small amounts of data.
3377 */ 3540 */
3378void 3541void
3379rxvt_term::tt_printf (const char *fmt,...) 3542rxvt_term::tt_printf (const char *fmt,...)
3380{ 3543{

Diff Legend

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