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.4 by pcg, Tue Nov 25 15:25:17 2003 UTC vs.
Revision 1.31 by pcg, Fri Feb 13 12:11:05 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines