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.27 by pcg, Tue Dec 30 01:35:58 2003 UTC vs.
Revision 1.52 by pcg, Sun Feb 22 10:37:54 2004 UTC

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

Diff Legend

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