ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.11 by pcg, Mon Dec 8 23:14:40 2003 UTC vs.
Revision 1.32 by pcg, Fri Feb 13 12:16:21 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: main.C,v 1.11 2003/12/08 23:14:40 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>
42 41
43#ifdef HAVE_TERMIOS_H 42#ifdef HAVE_TERMIOS_H
44# include <termios.h> 43# include <termios.h>
45#endif 44#endif
46 45
46#include <cstring>
47
48static char curlocale[128];
49
50void
51rxvt_set_locale (const char *locale)
52{
53 if (locale && STRNCMP (locale, curlocale, 128))
54 {
55 STRNCPY (curlocale, locale, 128);
56 setlocale (LC_CTYPE, curlocale);
57 }
58}
59
47void * 60void *
48rxvt_term::operator new (size_t s) 61rxvt_term::operator new (size_t s)
49{ 62{
50 void *p = malloc (s); 63 void *p = malloc (s);
51 64
58{ 71{
59 free (p); 72 free (p);
60} 73}
61 74
62rxvt_term::rxvt_term () 75rxvt_term::rxvt_term ()
76 :
77 rootwin_ev (this, &rxvt_term::rootwin_cb),
78 termwin_ev (this, &rxvt_term::x_cb),
63: pty_ev (this, &rxvt_term::pty_cb), 79 vt_ev (this, &rxvt_term::x_cb),
80#ifdef HAVE_SCROLLBARS
81 scrollbar_ev (this, &rxvt_term::x_cb),
82#endif
83#ifdef MENUBAR
84 menubar_ev (this, &rxvt_term::x_cb), fixme
85#endif
64#ifdef CURSOR_BLINK 86#ifdef CURSOR_BLINK
87 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
88#endif
89#ifdef TEXT_BLINK
65 blink_ev (this, &rxvt_term::blink_cb), 90 text_blink_ev (this, &rxvt_term::text_blink_cb),
66#endif 91#endif
67#ifdef POINTER_BLANK 92#ifdef POINTER_BLANK
68 pointer_ev (this, &rxvt_term::pointer_cb), 93 pointer_ev (this, &rxvt_term::pointer_cb),
69#endif 94#endif
70 x_ev (this, &rxvt_term::x_cb), 95 check_ev (this, &rxvt_term::check_cb),
71 destroy_ev (this, &rxvt_term::destroy_cb), 96 destroy_ev (this, &rxvt_term::destroy_cb),
97 pty_ev (this, &rxvt_term::pty_cb),
72 check_ev (this, &rxvt_term::check_cb) 98 incr_ev (this, &rxvt_term::incr_cb),
99#ifdef USE_XIM
100 im_ev (this, &rxvt_term::im_cb)
101#endif
73{ 102{
74 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 103 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
75} 104}
76 105
77rxvt_term::~rxvt_term () 106rxvt_term::~rxvt_term ()
78{ 107{
79 rxvt_scr_release (this);
80
81#ifndef NO_SETOWNER_TTYDEV
82 rxvt_privileged_ttydev (this, RESTORE);
83#endif
84#ifdef UTMP_SUPPORT
85 rxvt_privileged_utmp (this, RESTORE);
86#endif
87#ifdef USE_XIM
88 if (Input_Context != NULL)
89 {
90 XDestroyIC (Input_Context);
91 Input_Context = NULL;
92 }
93#endif
94
95 if (cmd_fd >= 0) 108 if (cmd_fd >= 0)
96 close (cmd_fd); 109 close (cmd_fd);
97 110
98 if (Xfd >= 0) 111 scr_release ();
99 XCloseDisplay (Xdisplay); 112
113 free (locale);
114 free (codeset);
115
116#ifndef NO_SETOWNER_TTYDEV
117 privileged_ttydev (RESTORE);
118#endif
119#ifdef UTMP_SUPPORT
120 privileged_utmp (RESTORE);
121#endif
122
123 // TODO: free pixcolours, colours should become part of rxvt_display
100 124
101 delete PixColors; 125 delete PixColors;
126 delete TermWin.fontset;
127
128 displays.put (display);
102} 129}
103 130
104void 131void
105rxvt_term::destroy () 132rxvt_term::destroy ()
106{ 133{
134 if (display)
135 {
136 if (TermWin.parent[0])
137 XDestroyWindow (display->display, TermWin.parent[0]);
138
139 rootwin_ev.stop (display);
140 termwin_ev.stop (display);
141 vt_ev.stop (display);
142
143#ifdef USE_XIM
144 im_destroy ();
145 im_ev.stop (display);
146#endif
147#ifdef HAVE_SCROLLBARS
148 scrollbar_ev.stop (display);
149#endif
150#ifdef MENUBAR
151 menubar_ev.stop (display);
152#endif
153 }
154
107 check_ev.stop (); 155 check_ev.stop ();
108 pty_ev.stop (); 156 pty_ev.stop ();
109 x_ev.stop ();
110#ifdef CURSOR_BLINK 157#ifdef CURSOR_BLINK
158 cursor_blink_ev.stop ();
159#endif
160#ifdef TEXT_BLINK
111 blink_ev.stop (); 161 text_blink_ev.stop ();
112#endif 162#endif
113#ifdef POINTER_BLANK 163#ifdef POINTER_BLANK
114 pointer_ev.stop (); 164 pointer_ev.stop ();
115#endif 165#endif
116 166
124 174
125 delete this; 175 delete this;
126} 176}
127 177
128/*----------------------------------------------------------------------*/ 178/*----------------------------------------------------------------------*/
129/* rxvt_init() */ 179/* rxvt_init () */
130/* LIBPROTO */ 180/* LIBPROTO */
131rxvt_t 181rxvt_t
132rxvt_init (int argc, const char *const *argv) 182rxvt_init (int argc, const char *const *argv)
133{ 183{
134 SET_R (new rxvt_term); 184 SET_R (new rxvt_term);
135 dR;
136 185
137 if (!R->init_vars () || !R->init (argc, argv)) 186 if (!GET_R->init_vars () || !GET_R->init (argc, argv))
138 { 187 {
139 delete R; 188 delete GET_R;
140 return NULL; 189 SET_R (0);
141 } 190 }
142 191
143 return R; 192 return GET_R;
144} 193}
145 194
146/* EXTPROTO */ 195static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
196
147void 197void
148rxvt_init_signals () 198rxvt_init_signals ()
149{ 199{
150/* install exit handler for cleanup */ 200 /* install exit handler for cleanup */
151#if 0 201#if 0
152#ifdef HAVE_ATEXIT 202#ifdef HAVE_ATEXIT
153 atexit(rxvt_clean_exit); 203 atexit (rxvt_clean_exit);
154#else 204#else
155#endif 205#endif
156#endif 206#endif
157 207
158 struct sigaction sa; 208 struct sigaction sa;
164 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0); 214 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
165 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0); 215 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
166 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0); 216 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
167 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0); 217 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
168 218
169/* need to trap SIGURG for SVR4 (Unixware) rlogin */ 219 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
170/* signal (SIGURG, SIG_DFL); */ 220 /* signal (SIGURG, SIG_DFL); */
171 221
172 XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 222 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
173 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 223 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
174} 224}
175 225
176bool 226bool
177rxvt_term::init (int argc, const char *const *argv) 227rxvt_term::init (int argc, const char *const *argv)
178{ 228{
179 dR;//TODO (scrollbar, setidle)
180
181 /* 229 /*
182 * Save and then give up any super-user privileges 230 * Save and then give up any super-user privileges
183 * If we need privileges in any area then we must specifically request it. 231 * If we need privileges in any area then we must specifically request it.
184 * We should only need to be root in these cases: 232 * We should only need to be root in these cases:
185 * 1. write utmp entries on some systems 233 * 1. write utmp entries on some systems
186 * 2. chown tty on some systems 234 * 2. chown tty on some systems
187 */ 235 */
188 rxvt_privileges (this, SAVE); 236 privileges (SAVE);
189 rxvt_privileges (this, IGNORE); 237 privileges (IGNORE);
190 238
191 rxvt_init_secondary (this); 239 init_secondary ();
192 240
193 const char **cmd_argv = rxvt_init_resources (this, argc, argv); 241 const char **cmd_argv = init_resources (argc, argv);
242
243 set_locale ("");
194 244
195#if (MENUBAR_MAX) 245#if (MENUBAR_MAX)
196 rxvt_menubar_read (this, rs[Rs_menu]); 246 menubar_read (rs[Rs_menu]);
197#endif 247#endif
198#ifdef HAVE_SCROLLBARS 248#ifdef HAVE_SCROLLBARS
199 if (Options & Opt_scrollBar) 249 if (Options & Opt_scrollBar)
200 scrollbar_setIdle (); /* set existence for size calculations */ 250 scrollBar.setIdle (); /* set existence for size calculations */
201#endif 251#endif
202 252
203 rxvt_Create_Windows (this, argc, argv); 253 create_windows (argc, argv);
204 254
205 rxvt_init_xlocale (this); 255 init_xlocale ();
206 256
207 rxvt_scr_reset (this); /* initialize screen */ 257 scr_reset (); /* initialize screen */
208#ifdef RXVT_GRAPHICS 258#ifdef RXVT_GRAPHICS
209 rxvt_Gr_reset (this); /* reset graphics */ 259 Gr_reset (); /* reset graphics */
210#endif 260#endif
211 261
212#if 0 262#if 0
213#ifdef DEBUG_X 263#ifdef DEBUG_X
214 XSynchronize(Xdisplay, True); 264 XSynchronize (display->display, True);
215#endif 265#endif
216#endif 266#endif
217 267
218#ifdef HAVE_SCROLLBARS 268#ifdef HAVE_SCROLLBARS
219 if (Options & Opt_scrollBar) 269 if (Options & Opt_scrollBar)
220 rxvt_Resize_scrollBar (this); /* create and map scrollbar */ 270 resize_scrollbar (); /* create and map scrollbar */
221#endif 271#endif
222#if (MENUBAR_MAX) 272#if (MENUBAR_MAX)
223 if (menubar_visible(r)) 273 if (menubar_visible (r))
224 XMapWindow (Xdisplay, menuBar.win); 274 XMapWindow (display->display, menuBar.win);
225#endif 275#endif
226#ifdef TRANSPARENT 276#ifdef TRANSPARENT
227 if (Options & Opt_transparent) 277 if (Options & Opt_transparent)
228 { 278 {
229 XSelectInput (Xdisplay, Xroot, PropertyChangeMask); 279 XSelectInput (display->display, display->root, PropertyChangeMask);
230 rxvt_check_our_parents (this); 280 check_our_parents ();
231 } 281 }
232#endif 282#endif
283
284 rootwin_ev.start (display, display->root);
285
233 XMapWindow (Xdisplay, TermWin.vt); 286 XMapWindow (display->display, TermWin.vt);
234 XMapWindow (Xdisplay, TermWin.parent[0]); 287 XMapWindow (display->display, TermWin.parent[0]);
235 288
236 rxvt_init_env (this); 289 init_env ();
237 rxvt_init_command (this, cmd_argv); 290 init_command (cmd_argv);
238 291
239 x_ev.start (Xfd, EVENT_READ);
240 pty_ev.start (cmd_fd, EVENT_READ); 292 pty_ev.start (cmd_fd, EVENT_READ);
241 293
242 check_ev.start (); 294 check_ev.start ();
243
244 process_x_events ();
245 295
246 return true; 296 return true;
247} 297}
248 298
249/* ------------------------------------------------------------------------- * 299/* ------------------------------------------------------------------------- *
253 * Catch a SIGCHLD signal and exit if the direct child has died 303 * Catch a SIGCHLD signal and exit if the direct child has died
254 */ 304 */
255/* ARGSUSED */ 305/* ARGSUSED */
256/* EXTPROTO */ 306/* EXTPROTO */
257RETSIGTYPE 307RETSIGTYPE
258rxvt_Child_signal(int sig __attribute__ ((unused))) 308rxvt_Child_signal (int sig __attribute__ ((unused)))
259{ 309{
260 int pid, save_errno = errno; 310 int pid, save_errno = errno;
261 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 311 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
262 ; 312 ;
263 errno = save_errno; 313 errno = save_errno;
264 314
265#if 0 315#if 0
266 if (pid == R->cmd_pid) 316 if (pid == cmd_pid)
267 exit (EXIT_SUCCESS); 317 exit (EXIT_SUCCESS);
268#endif 318#endif
269} 319}
270 320
271/* 321/*
272 * Catch a fatal signal and tidy up before quitting 322 * Catch a fatal signal and tidy up before quitting
273 */ 323 */
274/* EXTPROTO */ 324/* EXTPROTO */
275RETSIGTYPE 325RETSIGTYPE
276rxvt_Exit_signal(int sig) 326rxvt_Exit_signal (int sig)
277{ 327{
278 signal(sig, SIG_DFL); 328 signal (sig, SIG_DFL);
279#ifdef DEBUG_CMD 329#ifdef DEBUG_CMD
280 rxvt_print_error("signal %d", sig); 330 rxvt_print_error ("signal %d", sig);
281#endif 331#endif
282 rxvt_clean_exit(); 332 rxvt_clean_exit ();
283 kill(getpid(), sig); 333 kill (getpid (), sig);
284} 334}
285 335
286/* ARGSUSED */
287/* INTPROTO */ 336/* INTPROTO */
288int 337int
289rxvt_xerror_handler(const Display * display 338rxvt_xerror_handler (Display *display, XErrorEvent *event)
290 __attribute__ ((unused)), const XErrorEvent * event)
291{ 339{
292 dR;
293
294 if (R->allowedxerror == -1) 340 if (GET_R->allowedxerror == -1)
295 R->allowedxerror = event->error_code; 341 GET_R->allowedxerror = event->error_code;
296 else 342 else
297 { 343 {
298 rxvt_print_error("XError: Request: %d . %d, Error: %d", 344 old_xerror_handler (display, event);
299 event->request_code, event->minor_code,
300 event->error_code);
301
302 R->destroy (); 345 GET_R->destroy ();
303 } 346 }
304 347
305 return 0; 348 return 0;
306} 349}
307 350
312 */ 355 */
313/* EXTPROTO */ 356/* EXTPROTO */
314void 357void
315rxvt_clean_exit () 358rxvt_clean_exit ()
316{ 359{
317 dR; 360 // TODO: rxvtd should clean up all ressources
318 361 if (GET_R)
319 R->destroy (); 362 GET_R->destroy ();
320} 363}
321 364
322/* ------------------------------------------------------------------------- * 365/* ------------------------------------------------------------------------- *
323 * MEMORY ALLOCATION WRAPPERS * 366 * MEMORY ALLOCATION WRAPPERS *
324 * ------------------------------------------------------------------------- */ 367 * ------------------------------------------------------------------------- */
325/* EXTPROTO */ 368/* EXTPROTO */
326void * 369void *
327rxvt_malloc(size_t size) 370rxvt_malloc (size_t size)
328{ 371{
329 void *p; 372 void *p;
330 373
331 p = malloc(size); 374 p = malloc (size);
332 if (p) 375 if (p)
333 return p; 376 return p;
334 377
335 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 378 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
336 rxvt_clean_exit(); 379 rxvt_clean_exit ();
337 exit(EXIT_FAILURE); 380 exit (EXIT_FAILURE);
338/* NOTREACHED */ 381 /* NOTREACHED */
339} 382}
340 383
341/* EXTPROTO */ 384/* EXTPROTO */
342void * 385void *
343rxvt_calloc(size_t number, size_t size) 386rxvt_calloc (size_t number, size_t size)
344{ 387{
345 void *p; 388 void *p;
346 389
347 p = calloc(number, size); 390 p = calloc (number, size);
348 if (p) 391 if (p)
349 return p; 392 return p;
350 393
351 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 394 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
352 rxvt_clean_exit(); 395 rxvt_clean_exit ();
353 exit(EXIT_FAILURE); 396 exit (EXIT_FAILURE);
354/* NOTREACHED */ 397 /* NOTREACHED */
355} 398}
356 399
357/* EXTPROTO */ 400/* EXTPROTO */
358void * 401void *
359rxvt_realloc(void *ptr, size_t size) 402rxvt_realloc (void *ptr, size_t size)
360{ 403{
361 void *p; 404 void *p;
362 405
363 if (ptr) 406 if (ptr)
364 p = realloc(ptr, size); 407 p = realloc (ptr, size);
365 else 408 else
366 p = malloc(size); 409 p = malloc (size);
367 if (p) 410 if (p)
368 return p; 411 return p;
369 412
370 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 413 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
371 rxvt_clean_exit(); 414 rxvt_clean_exit ();
372 exit(EXIT_FAILURE); 415 exit (EXIT_FAILURE);
373/* NOTREACHED */ 416 /* NOTREACHED */
374} 417}
375 418
376/* ------------------------------------------------------------------------- * 419/* ------------------------------------------------------------------------- *
377 * PRIVILEGED OPERATIONS * 420 * PRIVILEGED OPERATIONS *
378 * ------------------------------------------------------------------------- */ 421 * ------------------------------------------------------------------------- */
379/* take care of suid/sgid super-user (root) privileges */ 422/* take care of suid/sgid super-user (root) privileges */
380/* INTPROTO */
381void 423void
382rxvt_privileges(pR_ int mode) 424rxvt_term::privileges (int mode)
383{ 425{
384#if ! defined(__CYGWIN32__) 426#if ! defined(__CYGWIN32__)
385# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 427# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
386/* setreuid() is the poor man's setuid(), seteuid() */ 428 /* setreuid () is the poor man's setuid (), seteuid () */
387# define seteuid(a) setreuid(-1, (a)) 429# define seteuid(a) setreuid(-1, (a))
388# define setegid(a) setregid(-1, (a)) 430# define setegid(a) setregid(-1, (a))
389# define HAVE_SETEUID 431# define HAVE_SETEUID
390# endif 432# endif
391# ifdef HAVE_SETEUID 433# ifdef HAVE_SETEUID
392 switch (mode) { 434 switch (mode)
435 {
393 case IGNORE: 436 case IGNORE:
394 /* 437 /*
395 * change effective uid/gid - not real uid/gid - so we can switch 438 * change effective uid/gid - not real uid/gid - so we can switch
396 * back to root later, as required 439 * back to root later, as required
397 */ 440 */
398 seteuid(getuid()); 441 seteuid (getuid ());
399 setegid(getgid()); 442 setegid (getgid ());
400 break; 443 break;
401 case SAVE: 444 case SAVE:
402 R->euid = geteuid(); 445 euid = geteuid ();
403 R->egid = getegid(); 446 egid = getegid ();
404 break; 447 break;
405 case RESTORE: 448 case RESTORE:
406 seteuid(R->euid); 449 seteuid (euid);
407 setegid(R->egid); 450 setegid (egid);
408 break; 451 break;
409 } 452 }
410# else 453# else
411 switch (mode) { 454 switch (mode)
455 {
412 case IGNORE: 456 case IGNORE:
413 setuid(getuid()); 457 setuid (getuid ());
414 setgid(getgid()); 458 setgid (getgid ());
415 /* FALLTHROUGH */ 459 /* FALLTHROUGH */
416 case SAVE: 460 case SAVE:
417 /* FALLTHROUGH */ 461 /* FALLTHROUGH */
418 case RESTORE: 462 case RESTORE:
419 break; 463 break;
420 } 464 }
421# endif 465# endif
422#endif 466#endif
423} 467}
424 468
425#ifdef UTMP_SUPPORT 469#ifdef UTMP_SUPPORT
426/* EXTPROTO */
427void 470void
428rxvt_privileged_utmp(pR_ char action) 471rxvt_term::privileged_utmp (char action)
429{ 472{
430 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", 473 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
431 action, R->next_utmp_action, getpid())); 474 action, next_utmp_action, getpid ()));
432 if (R->next_utmp_action != action || (action != SAVE && action != RESTORE) 475 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
433 || (R->Options & Opt_utmpInhibit) 476 || (Options & Opt_utmpInhibit)
434 || R->ttydev == NULL || *R->ttydev == '\0') 477 || ttydev == NULL || *ttydev == '\0')
435 return; 478 return;
436 479
437 rxvt_privileges(aR_ RESTORE); 480 privileges (RESTORE);
438 if (action == SAVE) { 481 if (action == SAVE)
482 {
439 R->next_utmp_action = RESTORE; 483 next_utmp_action = RESTORE;
440 rxvt_makeutent(aR_ R->ttydev, R->rs[Rs_display_name]); 484 makeutent (ttydev, rs[Rs_display_name]);
485 }
486 else
441 } else { /* action == RESTORE */ 487 { /* action == RESTORE */
442 R->next_utmp_action = IGNORE; 488 next_utmp_action = IGNORE;
443 rxvt_cleanutent(aR); 489 cleanutent ();
444 } 490 }
445 rxvt_privileges(aR_ IGNORE); 491 privileges (IGNORE);
446} 492}
447#endif 493#endif
448 494
449#ifndef NO_SETOWNER_TTYDEV 495#ifndef NO_SETOWNER_TTYDEV
450/* EXTPROTO */
451void 496void
452rxvt_privileged_ttydev(pR_ char action) 497rxvt_term::privileged_ttydev (char action)
453{ 498{
454 D_MAIN((stderr, 499 D_MAIN ((stderr,
455 "rxvt_privileged_ttydev(aR_ %c); waiting for: %c (pid: %d)", 500 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
456 action, R->next_tty_action, getpid())); 501 action, next_tty_action, getpid ()));
457 if (R->next_tty_action != action || (action != SAVE && action != RESTORE) 502 if (next_tty_action != action || (action != SAVE && action != RESTORE)
458 || R->ttydev == NULL || *R->ttydev == '\0') 503 || ttydev == NULL || *ttydev == '\0')
459 return; 504 return;
460 505
461 rxvt_privileges(aR_ RESTORE); 506 privileges (RESTORE);
462 507
463 if (action == SAVE) { 508 if (action == SAVE)
509 {
464 R->next_tty_action = RESTORE; 510 next_tty_action = RESTORE;
465# ifndef RESET_TTY_TO_COMMON_DEFAULTS 511# ifndef RESET_TTY_TO_COMMON_DEFAULTS
466/* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */ 512 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
467 if (lstat(R->ttydev, &R->ttyfd_stat) < 0) /* you lose out */ 513 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
468 R->next_tty_action = IGNORE; 514 next_tty_action = IGNORE;
469 else 515 else
470# endif 516# endif
517
471 { 518 {
472 chown(R->ttydev, getuid(), R->ttygid); /* fail silently */ 519 chown (ttydev, getuid (), ttygid); /* fail silently */
473 chmod(R->ttydev, R->ttymode); 520 chmod (ttydev, ttymode);
474# ifdef HAVE_REVOKE 521# ifdef HAVE_REVOKE
475 revoke(R->ttydev); 522 revoke (ttydev);
476# endif 523# endif
524
477 } 525 }
526 }
527 else
478 } else { /* action == RESTORE */ 528 { /* action == RESTORE */
479 R->next_tty_action = IGNORE; 529 next_tty_action = IGNORE;
480# ifndef RESET_TTY_TO_COMMON_DEFAULTS 530# ifndef RESET_TTY_TO_COMMON_DEFAULTS
481 chmod(R->ttydev, R->ttyfd_stat.st_mode); 531 chmod (ttydev, ttyfd_stat.st_mode);
482 chown(R->ttydev, R->ttyfd_stat.st_uid, R->ttyfd_stat.st_gid); 532 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
483# else 533# else
484 chmod(R->ttydev, 534 chmod (ttydev,
485 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 535 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
486 chown(R->ttydev, 0, 0); 536 chown (ttydev, 0, 0);
487# endif 537# endif
488 }
489 538
539 }
540
490 rxvt_privileges(aR_ IGNORE); 541 privileges (IGNORE);
491 542
492# ifndef RESET_TTY_TO_COMMON_DEFAULTS 543# ifndef RESET_TTY_TO_COMMON_DEFAULTS
493 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", 544 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
494 action == RESTORE ? "Restoring" : (action == 545 action == RESTORE ? "Restoring" : (action ==
495 SAVE ? "Saving" : 546 SAVE ? "Saving" :
496 "UNKNOWN ERROR for"), R->ttydev, 547 "UNKNOWN ERROR for"), ttydev,
497 R->ttyfd_stat.st_mode, R->ttyfd_stat.st_uid, 548 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
498 R->ttyfd_stat.st_gid)); 549 ttyfd_stat.st_gid));
499# endif 550# endif
500} 551}
501#endif 552#endif
502 553
503/*----------------------------------------------------------------------*/ 554/*----------------------------------------------------------------------*/
504/* 555/*
505 * window size/position calculcations for XSizeHint and other storage. 556 * window size/position calculcations for XSizeHint and other storage.
506 * if width/height are non-zero then override calculated width/height 557 * if width/height are non-zero then override calculated width/height
507 */ 558 */
508/* EXTPROTO */
509void 559void
510rxvt_window_calc(pR_ unsigned int width, unsigned int height) 560rxvt_term::window_calc (unsigned int width, unsigned int height)
511{ 561{
512 short recalc_x, recalc_y; 562 short recalc_x, recalc_y;
513 int x, y, sb_w, mb_h, flags; 563 int x, y, sb_w, mb_h, flags;
514 unsigned int w, h; 564 unsigned int w, h;
515 unsigned int max_width, max_height; 565 unsigned int max_width, max_height;
516 566
517 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 567 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
518 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 568 TermWin.ncol, TermWin.nrow, szHint.width,
519 R->szHint.height)); 569 szHint.height));
520 R->szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 570 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
521 R->szHint.win_gravity = NorthWestGravity; 571 szHint.win_gravity = NorthWestGravity;
522/* R->szHint.min_aspect.x = R->szHint.min_aspect.y = 1; */ 572 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
523 573
524 recalc_x = recalc_y = 0; 574 recalc_x = recalc_y = 0;
525 flags = 0; 575 flags = 0;
526 if (!R->parsed_geometry) { 576 if (!parsed_geometry)
577 {
527 R->parsed_geometry = 1; 578 parsed_geometry = 1;
528 if (R->rs[Rs_geometry]) 579 if (rs[Rs_geometry])
529 flags = XParseGeometry(R->rs[Rs_geometry], &x, &y, &w, &h); 580 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
530 if (flags & WidthValue) { 581 if (flags & WidthValue)
582 {
531 R->TermWin.ncol = BOUND_POSITIVE_INT16(w); 583 TermWin.ncol = BOUND_POSITIVE_INT16 (w);
532 R->szHint.flags |= USSize; 584 szHint.flags |= USSize;
533 } 585 }
534 if (flags & HeightValue) { 586 if (flags & HeightValue)
587 {
535 R->TermWin.nrow = BOUND_POSITIVE_INT16(h); 588 TermWin.nrow = BOUND_POSITIVE_INT16 (h);
536 R->szHint.flags |= USSize; 589 szHint.flags |= USSize;
537 } 590 }
538 if (flags & XValue) { 591 if (flags & XValue)
592 {
539 R->szHint.x = x; 593 szHint.x = x;
540 R->szHint.flags |= USPosition; 594 szHint.flags |= USPosition;
541 if (flags & XNegative) { 595 if (flags & XNegative)
596 {
542 recalc_x = 1; 597 recalc_x = 1;
543 R->szHint.win_gravity = NorthEastGravity; 598 szHint.win_gravity = NorthEastGravity;
544 } 599 }
545 } 600 }
546 if (flags & YValue) { 601 if (flags & YValue)
602 {
547 R->szHint.y = y; 603 szHint.y = y;
548 R->szHint.flags |= USPosition; 604 szHint.flags |= USPosition;
549 if (flags & YNegative) { 605 if (flags & YNegative)
606 {
550 recalc_y = 1; 607 recalc_y = 1;
551 if (R->szHint.win_gravity == NorthEastGravity) 608 if (szHint.win_gravity == NorthEastGravity)
552 R->szHint.win_gravity = SouthEastGravity; 609 szHint.win_gravity = SouthEastGravity;
553 else 610 else
554 R->szHint.win_gravity = SouthWestGravity; 611 szHint.win_gravity = SouthWestGravity;
555 } 612 }
556 } 613 }
557 } 614 }
558/* TODO: BOUNDS */ 615 /* TODO: BOUNDS */
559 R->TermWin.width = R->TermWin.ncol * R->TermWin.fwidth; 616 TermWin.width = TermWin.ncol * TermWin.fwidth;
560 R->TermWin.height = R->TermWin.nrow * R->TermWin.fheight; 617 TermWin.height = TermWin.nrow * TermWin.fheight;
561 max_width = MAX_COLS * R->TermWin.fwidth; 618 max_width = MAX_COLS * TermWin.fwidth;
562 max_height = MAX_ROWS * R->TermWin.fheight; 619 max_height = MAX_ROWS * TermWin.fheight;
563 620
564 R->szHint.base_width = R->szHint.base_height = 2 * R->TermWin.int_bwidth; 621 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
565 622
566 sb_w = mb_h = 0; 623 sb_w = mb_h = 0;
567 R->window_vt_x = R->window_vt_y = 0; 624 window_vt_x = window_vt_y = 0;
568 if (scrollbar_visible(R)) { 625 if (scrollbar_visible ())
626 {
569 sb_w = scrollbar_TotalWidth(); 627 sb_w = scrollbar_TotalWidth ();
570 R->szHint.base_width += sb_w; 628 szHint.base_width += sb_w;
571 if (!(R->Options & Opt_scrollBar_right)) 629 if (! (Options & Opt_scrollBar_right))
572 R->window_vt_x = sb_w; 630 window_vt_x = sb_w;
573 } 631 }
574 if (menubar_visible(R)) { 632 if (menubar_visible ())
633 {
575 mb_h = menuBar_TotalHeight(); 634 mb_h = menuBar_TotalHeight ();
576 R->szHint.base_height += mb_h; 635 szHint.base_height += mb_h;
577 R->window_vt_y = mb_h; 636 window_vt_y = mb_h;
578 } 637 }
579 R->szHint.width_inc = R->TermWin.fwidth; 638 szHint.width_inc = TermWin.fwidth;
580 R->szHint.height_inc = R->TermWin.fheight; 639 szHint.height_inc = TermWin.fheight;
581 R->szHint.min_width = R->szHint.base_width + R->szHint.width_inc; 640 szHint.min_width = szHint.base_width + szHint.width_inc;
582 R->szHint.min_height = R->szHint.base_height + R->szHint.height_inc; 641 szHint.min_height = szHint.base_height + szHint.height_inc;
583 642
584 if (width && width - R->szHint.base_width < max_width) { 643 if (width && width - szHint.base_width < max_width)
644 {
585 R->szHint.width = width; 645 szHint.width = width;
586 R->TermWin.width = width - R->szHint.base_width; 646 TermWin.width = width - szHint.base_width;
587 } else { 647 }
648 else
649 {
588 MIN_IT(R->TermWin.width, max_width); 650 MIN_IT (TermWin.width, max_width);
589 R->szHint.width = R->szHint.base_width + R->TermWin.width; 651 szHint.width = szHint.base_width + TermWin.width;
590 } 652 }
591 if (height && height - R->szHint.base_height < max_height) { 653 if (height && height - szHint.base_height < max_height)
654 {
592 R->szHint.height = height; 655 szHint.height = height;
593 R->TermWin.height = height - R->szHint.base_height; 656 TermWin.height = height - szHint.base_height;
594 } else { 657 }
658 else
659 {
595 MIN_IT(R->TermWin.height, max_height); 660 MIN_IT (TermWin.height, max_height);
596 R->szHint.height = R->szHint.base_height + R->TermWin.height; 661 szHint.height = szHint.base_height + TermWin.height;
597 } 662 }
598 if (scrollbar_visible(R) && (R->Options & Opt_scrollBar_right)) 663 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
599 R->window_sb_x = R->szHint.width - sb_w; 664 window_sb_x = szHint.width - sb_w;
600 665
601 if (recalc_x) 666 if (recalc_x)
602 R->szHint.x += (DisplayWidth(R->Xdisplay, Xscreen) 667 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
603 - R->szHint.width - 2 * R->TermWin.ext_bwidth); 668 - szHint.width - 2 * TermWin.ext_bwidth);
604 if (recalc_y) 669 if (recalc_y)
605 R->szHint.y += (DisplayHeight(R->Xdisplay, Xscreen) 670 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display))
606 - R->szHint.height - 2 * R->TermWin.ext_bwidth); 671 - szHint.height - 2 * TermWin.ext_bwidth);
607 672
608 R->TermWin.ncol = R->TermWin.width / R->TermWin.fwidth; 673 TermWin.ncol = TermWin.width / TermWin.fwidth;
609 R->TermWin.nrow = R->TermWin.height / R->TermWin.fheight; 674 TermWin.nrow = TermWin.height / TermWin.fheight;
610 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 675 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
611 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 676 TermWin.ncol, TermWin.nrow, szHint.width,
612 R->szHint.height)); 677 szHint.height));
613 return; 678 return;
614} 679}
615 680
616/*----------------------------------------------------------------------*/ 681/*----------------------------------------------------------------------*/
617/* 682/*
618 * Tell the teletype handler what size the window is. 683 * Tell the teletype handler what size the window is.
619 * Called after a window size change. 684 * Called after a window size change.
620 */ 685 */
621void 686void
622rxvt_term::tt_winch () 687rxvt_term::tt_winch ()
623{ 688{
624 struct winsize ws; 689 struct winsize ws;
625 690
626 if (cmd_fd < 0) 691 if (cmd_fd < 0)
627 return; 692 return;
628 693
629 ws.ws_col = TermWin.ncol; 694 ws.ws_col = TermWin.ncol;
631 ws.ws_xpixel = ws.ws_ypixel = 0; 696 ws.ws_xpixel = ws.ws_ypixel = 0;
632#ifndef DEBUG_SIZE 697#ifndef DEBUG_SIZE
633 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws); 698 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
634#else 699#else
635 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0) 700 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
636 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 701 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
637# ifdef SIGWINCH 702# ifdef SIGWINCH
638 else if (cmd_pid) /* force through to the command */ 703 else if (cmd_pid) /* force through to the command */
639 kill (cmd_pid, SIGWINCH); 704 kill (cmd_pid, SIGWINCH);
640# endif 705# endif
641#endif 706#endif
642} 707}
643 708
644/*----------------------------------------------------------------------*/ 709/*----------------------------------------------------------------------*/
645/* rxvt_change_font() - Switch to a new font */ 710/* rxvt_change_font () - Switch to a new font */
646/* 711/*
647 * init = 1 - initialize 712 * init = 1 - initialize
648 * 713 *
649 * fontname == FONT_UP - switch to bigger font 714 * fontname == FONT_UP - switch to bigger font
650 * fontname == FONT_DN - switch to smaller font 715 * fontname == FONT_DN - switch to smaller font
651 */ 716 */
652/* EXTPROTO */
653void 717void
654rxvt_change_font(pR_ int init, const char *fontname) 718rxvt_term::change_font (int init, const char *fontname)
655{ 719{}
656}
657 720
658/* INTPROTO */
659void 721void
660rxvt_font_up_down(pR_ int n, int direction) 722rxvt_term::font_up_down (int n, int direction)
661{ 723{}
662}
663 724
664/*----------------------------------------------------------------------*/ 725/*----------------------------------------------------------------------*/
665/*----------------------------------------------------------------------*/ 726/*----------------------------------------------------------------------*/
666/* xterm sequences - title, iconName, color (exptl) */ 727/* xterm sequences - title, iconName, color (exptl) */
667/* EXTPROTO */
668void 728void
669rxvt_set_title(pR_ const char *str) 729rxvt_term::set_title (const char *str)
670{ 730{
671#ifndef SMART_WINDOW_TITLE 731#ifndef SMART_WINDOW_TITLE
672 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 732 XStoreName (display->display, TermWin.parent[0], str);
673#else 733#else
674 char *name; 734 char *name;
675 735
676 if (XFetchName(R->Xdisplay, R->TermWin.parent[0], &name) == 0) 736 if (XFetchName (display->display, TermWin.parent[0], &name) == 0)
677 name = NULL; 737 name = NULL;
678 if (name == NULL || STRCMP(name, str)) 738 if (name == NULL || STRCMP (name, str))
679 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 739 XStoreName (display->display, TermWin.parent[0], str);
680 if (name) 740 if (name)
681 XFree(name); 741 XFree (name);
682#endif 742#endif
683} 743}
684 744
685/* EXTPROTO */
686void 745void
687rxvt_set_iconName(pR_ const char *str) 746rxvt_term::set_iconName (const char *str)
688{ 747{
689#ifndef SMART_WINDOW_TITLE 748#ifndef SMART_WINDOW_TITLE
690 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 749 XSetIconName (display->display, TermWin.parent[0], str);
691#else 750#else
692 char *name; 751 char *name;
693 752
694 if (XGetIconName(R->Xdisplay, R->TermWin.parent[0], &name)) 753 if (XGetIconName (display->display, TermWin.parent[0], &name))
695 name = NULL; 754 name = NULL;
696 if (name == NULL || STRCMP(name, str)) 755 if (name == NULL || STRCMP (name, str))
697 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 756 XSetIconName (display->display, TermWin.parent[0], str);
698 if (name) 757 if (name)
699 XFree(name); 758 XFree (name);
700#endif 759#endif
701} 760}
702 761
703#ifdef XTERM_COLOR_CHANGE 762#ifdef XTERM_COLOR_CHANGE
704/* EXTPROTO */
705void 763void
706rxvt_set_window_color(pR_ int idx, const char *color) 764rxvt_term::set_window_color (int idx, const char *color)
707{ 765{
708 rxvt_color xcol; 766 rxvt_color xcol;
709 int i; 767 int i;
710 768
711 if (color == NULL || *color == '\0') 769 if (color == NULL || *color == '\0')
712 return; 770 return;
713 771
714/* handle color aliases */ 772 /* handle color aliases */
715 if (isdigit(*color)) { 773 if (isdigit (*color))
774 {
716 i = atoi(color); 775 i = atoi (color);
776 if (i >= 8 && i <= 15)
717 if (i >= 8 && i <= 15) { /* bright colors */ 777 { /* bright colors */
718 i -= 8; 778 i -= 8;
719# ifndef NO_BRIGHTCOLOR 779# ifndef NO_BRIGHTCOLOR
720 R->PixColors[idx] = R->PixColors[minBrightCOLOR + i]; 780 PixColors[idx] = PixColors[minBrightCOLOR + i];
721 SET_PIXCOLOR(R, idx); 781 SET_PIXCOLOR (idx);
722 goto Done; 782 goto Done;
723# endif 783# endif
784
724 } 785 }
725 if (i >= 0 && i <= 7) { /* normal colors */ 786 if (i >= 0 && i <= 7)
787 { /* normal colors */
726 R->PixColors[idx] = R->PixColors[minCOLOR + i]; 788 PixColors[idx] = PixColors[minCOLOR + i];
727 SET_PIXCOLOR(R, idx); 789 SET_PIXCOLOR (idx);
728 goto Done; 790 goto Done;
729 } 791 }
730 } 792 }
731 if (!rxvt_rXParseAllocColor(aR_ & xcol, color)) 793 if (!rXParseAllocColor (& xcol, color))
732 return; 794 return;
733/* XStoreColor (R->Xdisplay, XCMAP, XColor*); */ 795 /* XStoreColor (display->display, XCMAP, XColor*); */
734 796
735/* 797 /*
736 * FIXME: should free colors here, but no idea how to do it so instead, 798 * FIXME: should free colors here, but no idea how to do it so instead,
737 * so just keep gobbling up the colormap 799 * so just keep gobbling up the colormap
738 */ 800 */
739# if 0 801# if 0
740 for (i = Color_Black; i <= Color_White; i++) 802 for (i = Color_Black; i <= Color_White; i++)
741 if (R->PixColors[idx] == R->PixColors[i]) 803 if (PixColors[idx] == PixColors[i])
742 break; 804 break;
743 if (i > Color_White) { 805 if (i > Color_White)
806 {
744 /* fprintf (stderr, "XFreeColors: R->PixColors [%d] = %lu\n", idx, R->PixColors [idx]); */ 807 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
745 XFreeColors(R->Xdisplay, XCMAP, (R->PixColors + idx), 1, 808 XFreeColors (display->display, XCMAP, (PixColors + idx), 1,
746 DisplayPlanes(R->Xdisplay, Xscreen)); 809 DisplayPlanes (display->display, display->screen));
747 } 810 }
748# endif 811# endif
749 812
750 R->PixColors[idx] = xcol; 813 PixColors[idx] = xcol;
751 SET_PIXCOLOR(R, idx); 814 SET_PIXCOLOR (idx);
752 815
753/* XSetWindowAttributes attr; */ 816 /* XSetWindowAttributes attr; */
754/* Cursor cursor; */ 817 /* Cursor cursor; */
755 Done: 818Done:
756 if (idx == Color_bg && !(R->Options & Opt_transparent)) 819 if (idx == Color_bg && ! (Options & Opt_transparent))
757 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 820 XSetWindowBackground (display->display, TermWin.vt,
758 R->PixColors[Color_bg]); 821 PixColors[Color_bg]);
759 822
760/* handle Color_BD, scrollbar background, etc. */ 823 /* handle Color_BD, scrollbar background, etc. */
761 824
762 rxvt_set_colorfgbg(aR); 825 set_colorfgbg ();
763 rxvt_recolour_cursor(aR); 826 recolour_cursor ();
764/* the only reasonable way to enforce a clean update */ 827 /* the only reasonable way to enforce a clean update */
765 rxvt_scr_poweron(aR); 828 scr_poweron ();
766} 829}
767 830
768#else 831#else
769# define rxvt_set_window_color(aR_ idx,color) ((void)0) 832# define set_window_color (idx,color) ((void)0)
770#endif /* XTERM_COLOR_CHANGE */ 833#endif /* XTERM_COLOR_CHANGE */
771 834
772/* EXTPROTO */
773void 835void
774rxvt_recolour_cursor(pR) 836rxvt_term::recolour_cursor ()
775{ 837{
776 rxvt_color xcol[2];
777
778#if TODO 838#if TODO
839 rxvt_color xcol[2];
840
779 xcol[0] = R->PixColors[Color_pointer]; 841 xcol[0] = PixColors[Color_pointer];
780 xcol[1] = R->PixColors[Color_bg]; 842 xcol[1] = PixColors[Color_bg];
781 XQueryColors(R->Xdisplay, XCMAP, xcol, 2); 843 XQueryColors (display->display, XCMAP, xcol, 2);
782 XRecolorCursor(R->Xdisplay, R->TermWin_cursor, &(xcol[0]), &(xcol[1])); 844 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1]));
783#endif 845#endif
784} 846}
785 847
786/*----------------------------------------------------------------------*/ 848/*----------------------------------------------------------------------*/
787/* 849/*
788 * find if fg/bg matches any of the normal (low-intensity) colors 850 * find if fg/bg matches any of the normal (low-intensity) colors
789 */ 851 */
790/* INTPROTO */
791void 852void
792rxvt_set_colorfgbg(pR) 853rxvt_term::set_colorfgbg ()
793{ 854{
794 unsigned int i; 855 unsigned int i;
795 const char *xpmb = "\0"; 856 const char *xpmb = "\0";
796 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 857 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
797 858
798 R->env_colorfgbg = 859 env_colorfgbg =
799 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 860 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
800 STRCPY(fstr, "default"); 861 STRCPY (fstr, "default");
801 STRCPY(bstr, "default"); 862 STRCPY (bstr, "default");
802 for (i = Color_Black; i <= Color_White; i++) 863 for (i = Color_Black; i <= Color_White; i++)
803 if (R->PixColors[Color_fg] == R->PixColors[i]) { 864 if (PixColors[Color_fg] == PixColors[i])
865 {
804 sprintf(fstr, "%d", (i - Color_Black)); 866 sprintf (fstr, "%d", (i - Color_Black));
805 break; 867 break;
806 } 868 }
807 for (i = Color_Black; i <= Color_White; i++) 869 for (i = Color_Black; i <= Color_White; i++)
808 if (R->PixColors[Color_bg] == R->PixColors[i]) { 870 if (PixColors[Color_bg] == PixColors[i])
871 {
809 sprintf(bstr, "%d", (i - Color_Black)); 872 sprintf (bstr, "%d", (i - Color_Black));
810#ifdef XPM_BACKGROUND 873#ifdef XPM_BACKGROUND
811 xpmb = "default;"; 874 xpmb = "default;";
812#endif 875#endif
813 break; 876 break;
814 } 877 }
815 sprintf(R->env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 878 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
816 putenv(R->env_colorfgbg); 879 putenv (env_colorfgbg);
817 880
818#ifndef NO_BRIGHTCOLOR 881#ifndef NO_BRIGHTCOLOR
819 R->colorfgbg = DEFAULT_RSTYLE; 882 colorfgbg = DEFAULT_RSTYLE;
820 for (i = minCOLOR; i <= maxCOLOR; i++) { 883 for (i = minCOLOR; i <= maxCOLOR; i++)
884 {
821 if (R->PixColors[Color_fg] == R->PixColors[i]) 885 if (PixColors[Color_fg] == PixColors[i])
822 R->colorfgbg = SET_FGCOLOR(R->colorfgbg, i); 886 colorfgbg = SET_FGCOLOR (colorfgbg, i);
823 if (R->PixColors[Color_bg] == R->PixColors[i]) 887 if (PixColors[Color_bg] == PixColors[i])
824 R->colorfgbg = SET_BGCOLOR(R->colorfgbg, i); 888 colorfgbg = SET_BGCOLOR (colorfgbg, i);
825 } 889 }
826#endif 890#endif
827} 891}
828 892
829/*----------------------------------------------------------------------*/ 893/*----------------------------------------------------------------------*/
830/* 894/*
831 * Colour determination for low colour displays, routine from 895 * Colour determination for low colour displays, routine from
832 * Hans de Goede <hans@highrise.nl> 896 * Hans de Goede <hans@highrise.nl>
833 */ 897 */
834 898
835/* EXTPROTO */
836int 899int
837rxvt_rXParseAllocColor(pR_ rxvt_color * screen_in_out, const char *colour) 900rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
838{ 901{
839 screen_in_out->set(aR_ colour);
840
841 if (!screen_in_out->set(aR_ colour)) { 902 if (!screen_in_out->set (display, colour))
903 {
842 rxvt_print_error("can't allocate colour: %s", colour); 904 rxvt_print_error ("can't allocate colour: %s", colour);
843 return false; 905 return false;
844 } 906 }
845 907
846 return true; 908 return true;
847} 909}
848 910
849/* -------------------------------------------------------------------- * 911/* -------------------------------------------------------------------- *
850 * - WINDOW RESIZING - * 912 * - WINDOW RESIZING - *
851 * -------------------------------------------------------------------- */ 913 * -------------------------------------------------------------------- */
852/* EXTPROTO */
853void 914void
854rxvt_resize_all_windows(pR_ unsigned int width, unsigned int height, 915rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
855 int ignoreparent)
856{ 916{
857 int fix_screen; 917 int fix_screen;
858 918
859#ifdef SMART_RESIZE 919#ifdef SMART_RESIZE
860 int old_width = R->szHint.width, old_height = R->szHint.height; 920 int old_width = szHint.width, old_height = szHint.height;
861#endif 921#endif
862 922
863 rxvt_window_calc(aR_ width, height); 923 window_calc (width, height);
864 XSetWMNormalHints(R->Xdisplay, R->TermWin.parent[0], &R->szHint); 924 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);
865 if (!ignoreparent) { 925 if (!ignoreparent)
926 {
866#ifdef SMART_RESIZE 927#ifdef SMART_RESIZE
867/* 928 /*
868 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 929 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
869 * reposition window on resize depending on placement on screen 930 * reposition window on resize depending on placement on screen
870 */ 931 */
871 int x, y, x1, y1; 932 int x, y, x1, y1;
872 int dx, dy; 933 int dx, dy;
873 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 934 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
874 Window unused_cr; 935 Window unused_cr;
875 936
876 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 937 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
877 0, 0, &x, &y, &unused_cr); 938 0, 0, &x, &y, &unused_cr);
878 XGetGeometry(R->Xdisplay, R->TermWin.parent[0], &unused_cr, &x1, &y1, 939 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1,
879 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 940 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
880 /* 941 /*
881 * if Xroot isn't the parent window, a WM will probably have offset 942 * if display->root isn't the parent window, a WM will probably have offset
882 * our position for handles and decorations. Counter it 943 * our position for handles and decorations. Counter it
883 */ 944 */
884 if (x1 != x || y1 != y) { 945 if (x1 != x || y1 != y)
946 {
885 x -= x1; 947 x -= x1;
886 y -= y1; 948 y -= y1;
887 } 949 }
888 950
889 x1 = (DisplayWidth(R->Xdisplay, Xscreen) - old_width) / 2; 951 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2;
890 y1 = (DisplayHeight(R->Xdisplay, Xscreen) - old_height) / 2; 952 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2;
891 dx = old_width - R->szHint.width; 953 dx = old_width - szHint.width;
892 dy = old_height - R->szHint.height; 954 dy = old_height - szHint.height;
893 955
894 /* Check position of the center of the window */ 956 /* Check position of the center of the window */
895 if (x < x1) /* left half */ 957 if (x < x1) /* left half */
896 dx = 0; 958 dx = 0;
897 else if (x == x1) /* exact center */ 959 else if (x == x1) /* exact center */
898 dx /= 2; 960 dx /= 2;
899 if (y < y1) /* top half */ 961 if (y < y1) /* top half */
900 dy = 0; 962 dy = 0;
901 else if (y == y1) /* exact center */ 963 else if (y == y1) /* exact center */
902 dy /= 2; 964 dy /= 2;
903 965
904 XMoveResizeWindow(R->Xdisplay, R->TermWin.parent[0], x + dx, y + dy, 966 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,
905 R->szHint.width, R->szHint.height); 967 szHint.width, szHint.height);
906#else 968#else
907 XResizeWindow(R->Xdisplay, R->TermWin.parent[0], R->szHint.width, 969 XResizeWindow (display->display, TermWin.parent[0], szHint.width,
908 R->szHint.height); 970 szHint.height);
909#endif 971#endif
910 }
911 972
973 }
974
912 fix_screen = (R->TermWin.ncol != R->prev_ncol 975 fix_screen = (TermWin.ncol != prev_ncol
913 || R->TermWin.nrow != R->prev_nrow); 976 || TermWin.nrow != prev_nrow);
977
914 if (fix_screen || width != R->old_width || height != R->old_height) { 978 if (fix_screen || width != old_width || height != old_height)
979 {
915 if (scrollbar_visible(R)) { 980 if (scrollbar_visible ())
981 {
916 XMoveResizeWindow(R->Xdisplay, R->scrollBar.win, R->window_sb_x, 982 XMoveResizeWindow (display->display, scrollBar.win, window_sb_x,
917 0, scrollbar_TotalWidth(), R->szHint.height); 983 0, scrollbar_TotalWidth (), szHint.height);
918 rxvt_Resize_scrollBar(aR); 984 resize_scrollbar ();
919 } 985 }
986
920 if (menubar_visible(R)) 987 if (menubar_visible ())
921 XMoveResizeWindow(R->Xdisplay, R->menuBar.win, R->window_vt_x, 988 XMoveResizeWindow (display->display, menuBar.win, window_vt_x,
922 0, TermWin_TotalWidth(), menuBar_TotalHeight()); 989 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
990
923 XMoveResizeWindow(R->Xdisplay, R->TermWin.vt, R->window_vt_x, 991 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
924 R->window_vt_y, TermWin_TotalWidth(), 992 window_vt_y, TermWin_TotalWidth (),
925 TermWin_TotalHeight()); 993 TermWin_TotalHeight ());
926#ifdef RXVT_GRAPHICS 994#ifdef RXVT_GRAPHICS
927 if (R->old_height) 995 if (old_height)
928 rxvt_Gr_Resize(aR_ R->old_width - R->szHint.base_width, 996 Gr_Resize (old_width - szHint.base_width,
929 R->old_height - R->szHint.base_height); 997 old_height - szHint.base_height);
930#endif 998#endif
931 rxvt_scr_clear(aR); 999 scr_clear ();
932#ifdef XPM_BACKGROUND 1000#ifdef XPM_BACKGROUND
933 rxvt_resize_pixmap(aR); 1001 resize_pixmap ();
934#endif 1002#endif
935 }
936 1003
1004 }
1005
937 if (fix_screen || R->old_height == 0) { 1006 if (fix_screen || old_height == 0)
1007 {
938 int curr_screen = -1; 1008 int curr_screen = -1;
939 uint16_t old_ncol = R->prev_ncol; 1009 int old_ncol = prev_ncol;
940 1010
941 /* scr_reset only works on the primary screen */ 1011 /* scr_reset only works on the primary screen */
942 if (R->old_height) /* this is not the first time through */ 1012 if (old_height) /* this is not the first time through */
1013 {
1014 unsigned int ncol = TermWin.ncol;
1015 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
943 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY); 1016 curr_screen = scr_change_screen (PRIMARY);
944 rxvt_scr_reset(aR); 1017 TermWin.ncol = ncol;
945 if (curr_screen >= 0) { /* this is not the first time through */
946 rxvt_scr_change_screen(aR_ curr_screen);
947 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0));
948 } 1018 }
949 }
950 1019
1020 scr_reset ();
1021
1022 if (curr_screen >= 0) /* this is not the first time through */
1023 {
1024 scr_change_screen (curr_screen);
1025 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
1026 }
1027 }
1028
951 R->old_width = R->szHint.width; 1029 old_width = szHint.width;
952 R->old_height = R->szHint.height; 1030 old_height = szHint.height;
953 1031
954#ifdef USE_XIM 1032#ifdef USE_XIM
955 rxvt_IMSetStatusPosition(aR); 1033 IMSetStatusPosition ();
956#endif 1034#endif
957} 1035}
958 1036
959/* 1037/*
960 * Set the width/height of the vt window in characters. Units are pixels. 1038 * Set the width/height of the vt window in characters. Units are pixels.
961 * good for toggling 80/132 columns 1039 * good for toggling 80/132 columns
962 */ 1040 */
963/* EXTPROTO */
964void 1041void
965rxvt_set_widthheight(pR_ unsigned int width, unsigned int height) 1042rxvt_term::set_widthheight (unsigned int width, unsigned int height)
966{ 1043{
967 XWindowAttributes wattr; 1044 XWindowAttributes wattr;
968 1045
969 if (width == 0 || height == 0) { 1046 if (width == 0 || height == 0)
1047 {
970 XGetWindowAttributes(R->Xdisplay, Xroot, &wattr); 1048 XGetWindowAttributes (display->display, display->root, &wattr);
971 if (width == 0) 1049 if (width == 0)
972 width = wattr.width - R->szHint.base_width; 1050 width = wattr.width - szHint.base_width;
973 if (height == 0) 1051 if (height == 0)
974 height = wattr.height - R->szHint.base_height; 1052 height = wattr.height - szHint.base_height;
975 } 1053 }
976 if (width != R->TermWin.width || height != R->TermWin.height) { 1054 if (width != TermWin.width || height != TermWin.height)
1055 {
977 width += R->szHint.base_width; 1056 width += szHint.base_width;
978 height += R->szHint.base_height; 1057 height += szHint.base_height;
979 rxvt_resize_all_windows(aR_ width, height, 0); 1058 resize_all_windows (width, height, 0);
980 } 1059 }
981} 1060}
982 1061
983/* -------------------------------------------------------------------- * 1062/* -------------------------------------------------------------------- *
984 * - X INPUT METHOD ROUTINES - * 1063 * - X INPUT METHOD ROUTINES - *
985 * -------------------------------------------------------------------- */ 1064 * -------------------------------------------------------------------- */
986#ifdef USE_XIM 1065#ifdef USE_XIM
987/* INTPROTO */ 1066
988void 1067void
989rxvt_setSize(pR_ XRectangle * size) 1068rxvt_term::im_set_size (XRectangle *size)
990{ 1069{
991 size->x = R->TermWin.int_bwidth; 1070 size->x = TermWin.int_bwidth;
992 size->y = R->TermWin.int_bwidth; 1071 size->y = TermWin.int_bwidth;
993 size->width = Width2Pixel(R->TermWin.ncol); 1072 size->width = Width2Pixel (TermWin.ncol);
994 size->height = Height2Pixel(R->TermWin.nrow); 1073 size->height = Height2Pixel (TermWin.nrow);
995} 1074}
996 1075
997/* INTPROTO */
998void 1076void
999rxvt_setColor(pR_ unsigned long *fg, unsigned long *bg) 1077rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg)
1000{ 1078{
1001 *fg = R->PixColors[Color_fg]; 1079 *fg = PixColors[Color_fg];
1002 *bg = R->PixColors[Color_bg]; 1080 *bg = PixColors[Color_bg];
1003} 1081}
1004 1082
1005/* Checking whether input method is running. */ 1083/* Checking whether input method is running. */
1006/* INTPROTO */
1007Bool 1084bool
1008rxvt_IMisRunning(pR) 1085rxvt_term::IMisRunning ()
1009{ 1086{
1010 char *p; 1087 char *p;
1011 Atom atom; 1088 Atom atom;
1012 Window win; 1089 Window win;
1013 char server[IMBUFSIZ]; 1090 char server[IMBUFSIZ];
1014 1091
1015/* get current locale modifier */ 1092 /* get current locale modifier */
1016 if ((p = XSetLocaleModifiers(NULL)) != NULL) { 1093 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1094 {
1017 STRCPY(server, "@server="); 1095 STRCPY (server, "@server=");
1018 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1096 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1019 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1097 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */
1020 *p = '\0'; 1098 *p = '\0';
1021 1099
1022 atom = XInternAtom(R->Xdisplay, server, False); 1100 atom = XInternAtom (display->display, server, False);
1023 win = XGetSelectionOwner(R->Xdisplay, atom); 1101 win = XGetSelectionOwner (display->display, atom);
1024 if (win != None) 1102 if (win != None)
1025 return True; 1103 return True;
1026 } 1104 }
1027 return False; 1105 return False;
1028} 1106}
1029 1107
1030/* EXTPROTO */
1031void 1108void
1032rxvt_IMSendSpot(pR) 1109rxvt_term::IMSendSpot ()
1033{ 1110{
1034 XPoint spot; 1111 XPoint spot;
1035 XVaNestedList preedit_attr; 1112 XVaNestedList preedit_attr;
1036 1113
1037 if (R->Input_Context == NULL 1114 if (Input_Context == NULL
1038 || !R->TermWin.focus || !(R->input_style & XIMPreeditPosition) 1115 || !TermWin.focus || ! (input_style & XIMPreeditPosition)
1039 || !(R->event_type == KeyPress 1116 || ! (event_type == KeyPress
1040 || R->event_type == Expose 1117 || event_type == Expose
1041 || R->event_type == NoExpose 1118 || event_type == NoExpose
1042 || R->event_type == SelectionNotify 1119 || event_type == SelectionNotify
1043 || R->event_type == ButtonRelease || R->event_type == FocusIn) 1120 || event_type == ButtonRelease || event_type == FocusIn)
1044 || !rxvt_IMisRunning(aR)) 1121 || !IMisRunning ())
1045 return; 1122 return;
1046 1123
1047 rxvt_setPosition(aR_ & spot); 1124 im_set_position (&spot);
1048 1125
1049 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1126 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1050 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1127 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1051 XFree(preedit_attr); 1128 XFree (preedit_attr);
1052} 1129}
1053 1130
1054/* EXTPROTO */
1055void 1131void
1056rxvt_setTermFontSet(pR_ int idx)
1057{
1058 char *string;
1059 long length;
1060 int success = 0;
1061
1062 if (idx < 0 || idx >= MAX_NFONTS)
1063 return;
1064}
1065
1066/* INTPROTO */
1067void
1068rxvt_setPreeditArea (pR_ XRectangle * preedit_rect, XRectangle * status_rect, 1132rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1069 XRectangle * needed_rect) 1133 XRectangle * needed_rect)
1070{ 1134{
1071 int mbh, vtx = 0; 1135 int mbh, vtx = 0;
1072 1136
1073 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right)) 1137 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1074 vtx = scrollbar_TotalWidth(); 1138 vtx = scrollbar_TotalWidth ();
1139
1075 mbh = menubar_visible(R) ? menuBar_TotalHeight() : 0; 1140 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1076 mbh -= R->TermWin.lineSpace; 1141 mbh -= TermWin.lineSpace;
1077 1142
1078 preedit_rect->x = needed_rect->width + vtx; 1143 preedit_rect->x = needed_rect->width + vtx;
1079 preedit_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1144 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1080 1145
1081 preedit_rect->width = Width2Pixel(R->TermWin.ncol + 1) - needed_rect->width 1146 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1082 + vtx;
1083 preedit_rect->height = Height2Pixel(1); 1147 preedit_rect->height = Height2Pixel (1);
1084 1148
1085 status_rect->x = vtx; 1149 status_rect->x = vtx;
1086 status_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1150 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1087 1151
1088 status_rect->width = needed_rect->width ? needed_rect->width 1152 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1089 : Width2Pixel(R->TermWin.ncol + 1);
1090 status_rect->height = Height2Pixel(1); 1153 status_rect->height = Height2Pixel (1);
1091} 1154}
1092 1155
1093/* ARGSUSED */
1094/* INTPROTO */
1095void 1156void
1096rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data 1157rxvt_term::im_destroy ()
1097 __attribute__ ((unused)), XPointer call_data
1098 __attribute__ ((unused)))
1099{ 1158{
1100 dR; 1159 if (Input_Context)
1101 1160 {
1161 XDestroyIC (Input_Context);
1102 R->Input_Context = NULL; 1162 Input_Context = NULL;
1103/* To avoid Segmentation Fault in C locale: Solaris only? */ 1163 }
1104 if (STRCMP(R->locale, "C")) 1164
1105 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL, 1165 if (input_method)
1106 rxvt_IMInstantiateCallback, NULL); 1166 {
1167 display->put_xim (input_method);
1168 input_method = 0;
1169 }
1107} 1170}
1108 1171
1109/* 1172/*
1110 * X manual pages and include files don't match on some systems: 1173 * Try to open a XIM with the current modifiers, then see if we can
1111 * some think this is an XIDProc and others an XIMProc so we can't 1174 * open a suitable preedit type
1112 * use the first argument - need to update this to be nice for
1113 * both types via some sort of configure detection
1114 */ 1175 */
1115/* ARGSUSED */ 1176bool
1116/* EXTPROTO */ 1177rxvt_term::IM_get_IC (const char *modifiers)
1117void
1118rxvt_IMInstantiateCallback(Display * unused
1119 __attribute__ ((unused)), XPointer client_data
1120 __attribute__ ((unused)), XPointer call_data
1121 __attribute__ ((unused)))
1122{ 1178{
1123 dR; 1179 int i, j, found;
1180 XIM xim;
1181 XPoint spot;
1182 XRectangle rect, status_rect, needed_rect;
1183 unsigned long fg, bg;
1184 const char *p;
1185 char **s;
1186 XIMStyles *xim_styles;
1187 XVaNestedList preedit_attr, status_attr;
1188
1189 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1190 return false;
1191
1192 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1193 input_method = display->get_xim (locale, modifiers);
1194 if (input_method == NULL)
1195 return false;
1196
1197 xim = input_method->xim;
1198
1199 xim_styles = NULL;
1200 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1201 || !xim_styles || !xim_styles->count_styles)
1202 {
1203 display->put_xim (input_method);
1204 return false;
1205 }
1206
1207 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";
1208 s = rxvt_splitcommastring (p);
1209 for (i = found = 0; !found && s[i]; i++)
1210 {
1211 if (!STRCMP (s[i], "OverTheSpot"))
1212 input_style = (XIMPreeditPosition | XIMStatusNothing);
1213 else if (!STRCMP (s[i], "OffTheSpot"))
1214 input_style = (XIMPreeditArea | XIMStatusArea);
1215 else if (!STRCMP (s[i], "Root"))
1216 input_style = (XIMPreeditNothing | XIMStatusNothing);
1217
1218 for (j = 0; j < xim_styles->count_styles; j++)
1219 if (input_style == xim_styles->supported_styles[j])
1220 {
1221 found = 1;
1222 break;
1223 }
1224 }
1225
1226 for (i = 0; s[i]; i++)
1227 free (s[i]);
1228
1229 free (s);
1230 XFree (xim_styles);
1231
1232 if (!found)
1233 {
1234 display->put_xim (input_method);
1235 return false;
1236 }
1237
1238 preedit_attr = status_attr = NULL;
1239
1240 if (input_style & XIMPreeditPosition)
1241 {
1242 im_set_size (&rect);
1243 im_set_position (&spot);
1244 im_set_color (&fg, &bg);
1245
1246 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1247 XNSpotLocation, &spot,
1248 XNForeground, fg, XNBackground, bg,
1249 //XNFontSet, TermWin.fontset,
1250 NULL);
1251 }
1252 else if (input_style & XIMPreeditArea)
1253 {
1254 im_set_color (&fg, &bg);
1255
1256 /*
1257 * The necessary width of preedit area is unknown
1258 * until create input context.
1259 */
1260 needed_rect.width = 0;
1261
1262 im_set_preedit_area (&rect, &status_rect, &needed_rect);
1263
1264 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1265 XNForeground, fg, XNBackground, bg,
1266 //XNFontSet, TermWin.fontset,
1267 NULL);
1268 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1269 XNForeground, fg, XNBackground, bg,
1270 //XNFontSet, TermWin.fontset,
1271 NULL);
1272 }
1273
1274 Input_Context = XCreateIC (xim, XNInputStyle, input_style,
1275 XNClientWindow, TermWin.parent[0],
1276 XNFocusWindow, TermWin.parent[0],
1277 preedit_attr ? XNPreeditAttributes : NULL,
1278 preedit_attr,
1279 status_attr ? XNStatusAttributes : NULL,
1280 status_attr, NULL);
1281 if (preedit_attr) XFree (preedit_attr);
1282 if (status_attr) XFree (status_attr);
1283
1284 if (Input_Context == NULL)
1285 {
1286 rxvt_print_error ("failed to create input context");
1287 display->put_xim (input_method);
1288 return false;
1289 }
1290
1291 if (input_style & XIMPreeditArea)
1292 IMSetStatusPosition ();
1293
1294 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1295 return true;
1296}
1297
1298void
1299rxvt_term::im_cb ()
1300{
1124 int i, found, had_im; 1301 int i, found, had_im;
1125 const char *p; 1302 const char *p;
1126 char **s; 1303 char **s;
1127 char buf[IMBUFSIZ]; 1304 char buf[IMBUFSIZ];
1128 1305
1306 im_destroy ();
1307
1129 D_MAIN((stderr, "rxvt_IMInstantiateCallback()")); 1308 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1130 if (R->Input_Context) 1309 if (Input_Context)
1131 return; 1310 return;
1132 1311
1312#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1313 if (rs[Rs_imLocale])
1314 setlocale (LC_CTYPE, rs[Rs_imLocale]);
1315#endif
1316
1133 p = R->rs[Rs_inputMethod]; 1317 p = rs[Rs_inputMethod];
1134 if (p && *p) 1318 if (p && *p)
1135 { 1319 {
1136 bool found = false; 1320 bool found = false;
1137 1321
1138 s = rxvt_splitcommastring (p); 1322 s = rxvt_splitcommastring (p);
1140 { 1324 {
1141 if (*s[i]) 1325 if (*s[i])
1142 { 1326 {
1143 STRCPY (buf, "@im="); 1327 STRCPY (buf, "@im=");
1144 STRNCAT (buf, s[i], IMBUFSIZ - 5); 1328 STRNCAT (buf, s[i], IMBUFSIZ - 5);
1145 if ((p = XSetLocaleModifiers (buf)) && *p 1329 if (IM_get_IC (buf))
1146 && rxvt_IM_get_IC (aR))
1147 { 1330 {
1148 found = true; 1331 found = true;
1149 break; 1332 break;
1150 } 1333 }
1151 } 1334 }
1152 } 1335 }
1153 for (i = 0; s[i]; i++) 1336 for (i = 0; s[i]; i++)
1154 free(s[i]); 1337 free (s[i]);
1155 free(s); 1338 free (s);
1156 1339
1157 if (found) 1340 if (found)
1158 return; 1341 goto done;
1159 } 1342 }
1160 1343
1161/* try with XMODIFIERS env. var. */ 1344 /* try with XMODIFIERS env. var. */
1162 if ((p = XSetLocaleModifiers ("")) && *p 1345 if (IM_get_IC (""))
1163 && rxvt_IM_get_IC (aR)) 1346 goto done;
1347
1348 /* try with no modifiers base IF the user didn't specify an IM */
1349 if (IM_get_IC ("@im=none"))
1350 goto done;
1351
1352done:
1353#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1354 if (rs[Rs_imLocale])
1355 setlocale (LC_CTYPE, locale);
1356#endif
1357}
1358
1359void
1360rxvt_term::IMSetStatusPosition ()
1361{
1362 XRectangle preedit_rect, status_rect, *needed_rect;
1363 XVaNestedList preedit_attr, status_attr;
1364
1365 if (Input_Context == NULL
1366 || !TermWin.focus || ! (input_style & XIMPreeditArea)
1367 || !IMisRunning ())
1164 return; 1368 return;
1165 1369
1166/* try with no modifiers base IF the user didn't specify an IM */
1167 if ((p = XSetLocaleModifiers ("@im=none")) && *p
1168 && rxvt_IM_get_IC (aR) == True)
1169 return;
1170}
1171
1172/*
1173 * Try to open a XIM with the current modifiers, then see if we can
1174 * open a suitable preedit type
1175 */
1176/* INTPROTO */
1177Bool
1178rxvt_IM_get_IC(pR)
1179{
1180 int i, j, found;
1181 XIM xim;
1182 XPoint spot;
1183 XRectangle rect, status_rect, needed_rect;
1184 unsigned long fg, bg;
1185 const char *p;
1186 char **s;
1187 XIMStyles *xim_styles;
1188 XVaNestedList preedit_attr, status_attr;
1189 XIMCallback ximcallback;
1190
1191 D_MAIN((stderr, "rxvt_IM_get_IC()"));
1192 xim = XOpenIM(R->Xdisplay, NULL, NULL, NULL);
1193 if (xim == NULL)
1194 return False;
1195
1196 xim_styles = NULL;
1197 if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL)
1198 || !xim_styles || !xim_styles->count_styles) {
1199 XCloseIM(xim);
1200 return False;
1201 }
1202
1203 p = R->rs[Rs_preeditType] ? R->rs[Rs_preeditType]
1204 : "OverTheSpot,OffTheSpot,Root";
1205 s = rxvt_splitcommastring(p);
1206 for (i = found = 0; !found && s[i]; i++) {
1207 if (!STRCMP(s[i], "OverTheSpot"))
1208 R->input_style = (XIMPreeditPosition | XIMStatusNothing);
1209 else if (!STRCMP(s[i], "OffTheSpot"))
1210 R->input_style = (XIMPreeditArea | XIMStatusArea);
1211 else if (!STRCMP(s[i], "Root"))
1212 R->input_style = (XIMPreeditNothing | XIMStatusNothing);
1213
1214 for (j = 0; j < xim_styles->count_styles; j++)
1215 if (R->input_style == xim_styles->supported_styles[j]) {
1216 found = 1;
1217 break;
1218 }
1219 }
1220 for (i = 0; s[i]; i++)
1221 free(s[i]);
1222 free(s);
1223 XFree(xim_styles);
1224
1225 if (!found) {
1226 XCloseIM(xim);
1227 return False;
1228 }
1229
1230 ximcallback.callback = rxvt_IMDestroyCallback;
1231
1232/* XXX: not sure why we need this (as well as IC one below) */
1233 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL);
1234
1235 preedit_attr = status_attr = NULL;
1236
1237 if (R->input_style & XIMPreeditPosition) {
1238 rxvt_setSize(aR_ & rect);
1239 rxvt_setPosition(aR_ & spot);
1240 rxvt_setColor(aR_ & fg, &bg);
1241
1242 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1243 XNSpotLocation, &spot,
1244 XNForeground, fg, XNBackground, bg,
1245 //XNFontSet, R->TermWin.fontset,
1246 NULL);
1247 } else if (R->input_style & XIMPreeditArea) {
1248 rxvt_setColor(aR_ & fg, &bg);
1249
1250 /*
1251 * The necessary width of preedit area is unknown
1252 * until create input context.
1253 */
1254 needed_rect.width = 0;
1255
1256 rxvt_setPreeditArea(aR_ & rect, &status_rect, &needed_rect);
1257
1258 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1259 XNForeground, fg, XNBackground, bg,
1260 //XNFontSet, R->TermWin.fontset,
1261 NULL);
1262 status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1263 XNForeground, fg, XNBackground, bg,
1264 //XNFontSet, R->TermWin.fontset,
1265 NULL);
1266 }
1267 R->Input_Context = XCreateIC(xim, XNInputStyle, R->input_style,
1268 XNClientWindow, R->TermWin.parent[0],
1269 XNFocusWindow, R->TermWin.parent[0],
1270 XNDestroyCallback, &ximcallback,
1271 preedit_attr ? XNPreeditAttributes : NULL,
1272 preedit_attr,
1273 status_attr ? XNStatusAttributes : NULL,
1274 status_attr, NULL);
1275 if (preedit_attr)
1276 XFree(preedit_attr);
1277 if (status_attr)
1278 XFree(status_attr);
1279 if (R->Input_Context == NULL) {
1280 rxvt_print_error("failed to create input context");
1281 XCloseIM(xim);
1282 return False;
1283 }
1284 if (R->input_style & XIMPreeditArea)
1285 rxvt_IMSetStatusPosition(aR);
1286 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1287 return True;
1288}
1289
1290/* EXTPROTO */
1291void
1292rxvt_IMSetStatusPosition(pR)
1293{
1294 XRectangle preedit_rect, status_rect, *needed_rect;
1295 XVaNestedList preedit_attr, status_attr;
1296
1297 if (R->Input_Context == NULL
1298 || !R->TermWin.focus || !(R->input_style & XIMPreeditArea)
1299 || !rxvt_IMisRunning(aR))
1300 return;
1301
1302/* Getting the necessary width of preedit area */ 1370 /* Getting the necessary width of preedit area */
1303 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1371 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1304 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL); 1372 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1305 XFree(status_attr); 1373 XFree (status_attr);
1306 1374
1307 rxvt_setPreeditArea(aR_ & preedit_rect, &status_rect, needed_rect); 1375 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);
1308 1376
1309 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1377 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1310 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1378 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1311 1379
1312 XSetICValues(R->Input_Context, 1380 XSetICValues (Input_Context,
1313 XNPreeditAttributes, preedit_attr, 1381 XNPreeditAttributes, preedit_attr,
1314 XNStatusAttributes, status_attr, NULL); 1382 XNStatusAttributes, status_attr, NULL);
1315 1383
1316 XFree(preedit_attr); 1384 XFree (preedit_attr);
1317 XFree(status_attr); 1385 XFree (status_attr);
1318} 1386}
1319#endif /* USE_XIM */ 1387#endif /* USE_XIM */
1320 1388
1321/*----------------------------------------------------------------------*/ 1389/*----------------------------------------------------------------------*/
1322rxvt_t rxvt_current_term; 1390rxvt_t rxvt_current_term;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines