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.44 by pcg, Fri Feb 13 12:17:07 2004 UTC

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

Diff Legend

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