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.9 by pcg, Thu Nov 27 10:12:10 2003 UTC vs.
Revision 1.49 by pcg, Sat Feb 21 22:14:00 2004 UTC

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

Diff Legend

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