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.21 by pcg, Thu Dec 18 08:06:46 2003 UTC vs.
Revision 1.67 by pcg, Thu Mar 11 00:53:19 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines