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.15 by pcg, Tue Dec 16 23:04:13 2003 UTC vs.
Revision 1.58 by pcg, Wed Feb 25 15:06:03 2004 UTC

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

Diff Legend

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