… | |
… | |
90 | text_blink_ev (this, &rxvt_term::text_blink_cb), |
90 | text_blink_ev (this, &rxvt_term::text_blink_cb), |
91 | #endif |
91 | #endif |
92 | #ifdef POINTER_BLANK |
92 | #ifdef POINTER_BLANK |
93 | pointer_ev (this, &rxvt_term::pointer_cb), |
93 | pointer_ev (this, &rxvt_term::pointer_cb), |
94 | #endif |
94 | #endif |
|
|
95 | #ifdef USE_XIM |
|
|
96 | im_ev (this, &rxvt_term::im_cb), |
|
|
97 | #endif |
95 | check_ev (this, &rxvt_term::check_cb), |
98 | check_ev (this, &rxvt_term::check_cb), |
96 | destroy_ev (this, &rxvt_term::destroy_cb), |
99 | destroy_ev (this, &rxvt_term::destroy_cb), |
97 | pty_ev (this, &rxvt_term::pty_cb), |
100 | pty_ev (this, &rxvt_term::pty_cb), |
98 | incr_ev (this, &rxvt_term::incr_cb), |
101 | incr_ev (this, &rxvt_term::incr_cb) |
99 | #ifdef USE_XIM |
|
|
100 | im_ev (this, &rxvt_term::im_cb) |
|
|
101 | #endif |
|
|
102 | { |
102 | { |
103 | cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; |
103 | cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; |
104 | } |
104 | } |
105 | |
105 | |
106 | rxvt_term::~rxvt_term () |
106 | rxvt_term::~rxvt_term () |
107 | { |
107 | { |
108 | if (cmd_fd >= 0) |
108 | if (cmd_fd >= 0) |
109 | close (cmd_fd); |
109 | close (cmd_fd); |
110 | |
110 | |
|
|
111 | #ifndef NO_SETOWNER_TTYDEV |
|
|
112 | privileged_ttydev (RESTORE); |
|
|
113 | #endif |
|
|
114 | #ifdef UTMP_SUPPORT |
|
|
115 | privileged_utmp (RESTORE); |
|
|
116 | #endif |
|
|
117 | |
|
|
118 | delete TermWin.fontset; |
|
|
119 | |
|
|
120 | if (display) |
|
|
121 | if (TermWin.parent[0]) |
|
|
122 | XDestroyWindow (display->display, TermWin.parent[0]); |
|
|
123 | |
|
|
124 | // TODO: free pixcolours, colours should become part of rxvt_display |
|
|
125 | |
|
|
126 | delete PixColors; |
|
|
127 | |
|
|
128 | displays.put (display); |
|
|
129 | |
111 | scr_release (); |
130 | scr_release (); |
112 | |
131 | |
|
|
132 | free (env_windowid); |
|
|
133 | free (env_display); |
|
|
134 | free (env_term); |
|
|
135 | free (env_colorfgbg); |
113 | free (locale); |
136 | free (locale); |
114 | free (codeset); |
137 | free (codeset); |
115 | |
138 | |
116 | #ifndef NO_SETOWNER_TTYDEV |
139 | delete envv; |
117 | privileged_ttydev (RESTORE); |
140 | delete argv; |
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 | |
|
|
125 | delete PixColors; |
|
|
126 | |
|
|
127 | displays.put (display); |
|
|
128 | } |
141 | } |
129 | |
142 | |
130 | void |
143 | void |
131 | rxvt_term::destroy () |
144 | rxvt_term::destroy () |
132 | { |
145 | { |
133 | if (display) |
146 | if (display) |
134 | { |
147 | { |
135 | if (TermWin.parent[0]) |
148 | rootwin_ev.stop (display); |
136 | XDestroyWindow (display->display, TermWin.parent[0]); |
|
|
137 | |
|
|
138 | termwin_ev.stop (display); |
149 | termwin_ev.stop (display); |
139 | vt_ev.stop (display); |
150 | vt_ev.stop (display); |
140 | |
|
|
141 | #ifdef USE_XIM |
151 | #ifdef USE_XIM |
142 | im_destroy (); |
152 | im_destroy (); |
143 | im_ev.stop (display); |
153 | im_ev.stop (display); |
144 | #endif |
154 | #endif |
145 | #ifdef HAVE_SCROLLBARS |
155 | #ifdef HAVE_SCROLLBARS |
… | |
… | |
172 | |
182 | |
173 | delete this; |
183 | delete this; |
174 | } |
184 | } |
175 | |
185 | |
176 | /*----------------------------------------------------------------------*/ |
186 | /*----------------------------------------------------------------------*/ |
177 | /* rxvt_init() */ |
187 | /* rxvt_init () */ |
178 | /* LIBPROTO */ |
188 | /* LIBPROTO */ |
179 | rxvt_t |
189 | rxvt_t |
180 | rxvt_init (int argc, const char *const *argv) |
190 | rxvt_init (int argc, const char *const *argv) |
181 | { |
191 | { |
182 | SET_R (new rxvt_term); |
192 | SET_R (new rxvt_term); |
… | |
… | |
188 | } |
198 | } |
189 | |
199 | |
190 | return GET_R; |
200 | return GET_R; |
191 | } |
201 | } |
192 | |
202 | |
193 | static int (*old_xerror_handler)(Display *dpy, XErrorEvent *event); |
203 | static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event); |
194 | |
204 | |
195 | void |
205 | void |
196 | rxvt_init_signals () |
206 | rxvt_init_signals () |
197 | { |
207 | { |
198 | /* install exit handler for cleanup */ |
208 | /* install exit handler for cleanup */ |
199 | #if 0 |
209 | #if 0 |
200 | #ifdef HAVE_ATEXIT |
210 | #ifdef HAVE_ATEXIT |
201 | atexit(rxvt_clean_exit); |
211 | atexit (rxvt_clean_exit); |
202 | #else |
212 | #else |
203 | #endif |
213 | #endif |
204 | #endif |
214 | #endif |
205 | |
215 | |
206 | struct sigaction sa; |
216 | struct sigaction sa; |
… | |
… | |
255 | scr_reset (); /* initialize screen */ |
265 | scr_reset (); /* initialize screen */ |
256 | #ifdef RXVT_GRAPHICS |
266 | #ifdef RXVT_GRAPHICS |
257 | Gr_reset (); /* reset graphics */ |
267 | Gr_reset (); /* reset graphics */ |
258 | #endif |
268 | #endif |
259 | |
269 | |
260 | #if 0 |
270 | #if 1 |
261 | #ifdef DEBUG_X |
|
|
262 | XSynchronize(display->display, True); |
271 | XSynchronize (display->display, True); |
263 | #endif |
|
|
264 | #endif |
272 | #endif |
265 | |
273 | |
266 | #ifdef HAVE_SCROLLBARS |
274 | #ifdef HAVE_SCROLLBARS |
267 | if (Options & Opt_scrollBar) |
275 | if (Options & Opt_scrollBar) |
268 | resize_scrollbar (); /* create and map scrollbar */ |
276 | resize_scrollbar (); /* create and map scrollbar */ |
269 | #endif |
277 | #endif |
270 | #if (MENUBAR_MAX) |
278 | #if (MENUBAR_MAX) |
271 | if (menubar_visible(r)) |
279 | if (menubar_visible (r)) |
272 | XMapWindow (display->display, menuBar.win); |
280 | XMapWindow (display->display, menuBar.win); |
273 | #endif |
281 | #endif |
274 | #ifdef TRANSPARENT |
282 | #ifdef TRANSPARENT |
275 | if (Options & Opt_transparent) |
283 | if (Options & Opt_transparent) |
276 | { |
284 | { |
… | |
… | |
282 | rootwin_ev.start (display, display->root); |
290 | rootwin_ev.start (display, display->root); |
283 | |
291 | |
284 | XMapWindow (display->display, TermWin.vt); |
292 | XMapWindow (display->display, TermWin.vt); |
285 | XMapWindow (display->display, TermWin.parent[0]); |
293 | XMapWindow (display->display, TermWin.parent[0]); |
286 | |
294 | |
287 | init_env (); |
|
|
288 | init_command (cmd_argv); |
295 | init_command (cmd_argv); |
289 | |
296 | |
290 | pty_ev.start (cmd_fd, EVENT_READ); |
297 | pty_ev.start (cmd_fd, EVENT_READ); |
291 | |
298 | |
292 | check_ev.start (); |
299 | check_ev.start (); |
… | |
… | |
301 | * Catch a SIGCHLD signal and exit if the direct child has died |
308 | * Catch a SIGCHLD signal and exit if the direct child has died |
302 | */ |
309 | */ |
303 | /* ARGSUSED */ |
310 | /* ARGSUSED */ |
304 | /* EXTPROTO */ |
311 | /* EXTPROTO */ |
305 | RETSIGTYPE |
312 | RETSIGTYPE |
306 | rxvt_Child_signal(int sig __attribute__ ((unused))) |
313 | rxvt_Child_signal (int sig __attribute__ ((unused))) |
307 | { |
314 | { |
308 | int pid, save_errno = errno; |
315 | int pid, save_errno = errno; |
309 | while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) |
316 | while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) |
310 | ; |
317 | ; |
311 | errno = save_errno; |
318 | errno = save_errno; |
… | |
… | |
319 | /* |
326 | /* |
320 | * Catch a fatal signal and tidy up before quitting |
327 | * Catch a fatal signal and tidy up before quitting |
321 | */ |
328 | */ |
322 | /* EXTPROTO */ |
329 | /* EXTPROTO */ |
323 | RETSIGTYPE |
330 | RETSIGTYPE |
324 | rxvt_Exit_signal(int sig) |
331 | rxvt_Exit_signal (int sig) |
325 | { |
332 | { |
326 | signal (sig, SIG_DFL); |
333 | signal (sig, SIG_DFL); |
327 | #ifdef DEBUG_CMD |
334 | #ifdef DEBUG_CMD |
328 | rxvt_print_error ("signal %d", sig); |
335 | rxvt_print_error ("signal %d", sig); |
329 | #endif |
336 | #endif |
330 | rxvt_clean_exit(); |
337 | rxvt_clean_exit (); |
331 | kill (getpid (), sig); |
338 | kill (getpid (), sig); |
332 | } |
339 | } |
333 | |
340 | |
334 | /* INTPROTO */ |
341 | /* INTPROTO */ |
335 | int |
342 | int |
… | |
… | |
363 | /* ------------------------------------------------------------------------- * |
370 | /* ------------------------------------------------------------------------- * |
364 | * MEMORY ALLOCATION WRAPPERS * |
371 | * MEMORY ALLOCATION WRAPPERS * |
365 | * ------------------------------------------------------------------------- */ |
372 | * ------------------------------------------------------------------------- */ |
366 | /* EXTPROTO */ |
373 | /* EXTPROTO */ |
367 | void * |
374 | void * |
368 | rxvt_malloc(size_t size) |
375 | rxvt_malloc (size_t size) |
369 | { |
376 | { |
370 | void *p; |
377 | void *p; |
371 | |
378 | |
372 | p = malloc(size); |
379 | p = malloc (size); |
373 | if (p) |
380 | if (p) |
374 | return p; |
381 | return p; |
375 | |
382 | |
376 | fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); |
383 | fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); |
377 | rxvt_clean_exit(); |
384 | rxvt_clean_exit (); |
378 | exit(EXIT_FAILURE); |
385 | exit (EXIT_FAILURE); |
379 | /* NOTREACHED */ |
386 | /* NOTREACHED */ |
380 | } |
387 | } |
381 | |
388 | |
382 | /* EXTPROTO */ |
389 | /* EXTPROTO */ |
383 | void * |
390 | void * |
384 | rxvt_calloc(size_t number, size_t size) |
391 | rxvt_calloc (size_t number, size_t size) |
385 | { |
392 | { |
386 | void *p; |
393 | void *p; |
387 | |
394 | |
388 | p = calloc(number, size); |
395 | p = calloc (number, size); |
389 | if (p) |
396 | if (p) |
390 | return p; |
397 | return p; |
391 | |
398 | |
392 | fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); |
399 | fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); |
393 | rxvt_clean_exit(); |
400 | rxvt_clean_exit (); |
394 | exit(EXIT_FAILURE); |
401 | exit (EXIT_FAILURE); |
395 | /* NOTREACHED */ |
402 | /* NOTREACHED */ |
396 | } |
403 | } |
397 | |
404 | |
398 | /* EXTPROTO */ |
405 | /* EXTPROTO */ |
399 | void * |
406 | void * |
400 | rxvt_realloc(void *ptr, size_t size) |
407 | rxvt_realloc (void *ptr, size_t size) |
401 | { |
408 | { |
402 | void *p; |
409 | void *p; |
403 | |
410 | |
404 | if (ptr) |
411 | if (ptr) |
405 | p = realloc(ptr, size); |
412 | p = realloc (ptr, size); |
406 | else |
413 | else |
407 | p = malloc(size); |
414 | p = malloc (size); |
408 | if (p) |
415 | if (p) |
409 | return p; |
416 | return p; |
410 | |
417 | |
411 | fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); |
418 | fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); |
412 | rxvt_clean_exit(); |
419 | rxvt_clean_exit (); |
413 | exit(EXIT_FAILURE); |
420 | exit (EXIT_FAILURE); |
414 | /* NOTREACHED */ |
421 | /* NOTREACHED */ |
415 | } |
422 | } |
416 | |
423 | |
417 | /* ------------------------------------------------------------------------- * |
424 | /* ------------------------------------------------------------------------- * |
418 | * PRIVILEGED OPERATIONS * |
425 | * PRIVILEGED OPERATIONS * |
… | |
… | |
421 | void |
428 | void |
422 | rxvt_term::privileges (int mode) |
429 | rxvt_term::privileges (int mode) |
423 | { |
430 | { |
424 | #if ! defined(__CYGWIN32__) |
431 | #if ! defined(__CYGWIN32__) |
425 | # if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) |
432 | # if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) |
426 | /* setreuid() is the poor man's setuid(), seteuid() */ |
433 | /* setreuid () is the poor man's setuid (), seteuid () */ |
427 | # define seteuid(a) setreuid(-1, (a)) |
434 | # define seteuid(a) setreuid(-1, (a)) |
428 | # define setegid(a) setregid(-1, (a)) |
435 | # define setegid(a) setregid(-1, (a)) |
429 | # define HAVE_SETEUID |
436 | # define HAVE_SETEUID |
430 | # endif |
437 | # endif |
431 | # ifdef HAVE_SETEUID |
438 | # ifdef HAVE_SETEUID |
… | |
… | |
434 | case IGNORE: |
441 | case IGNORE: |
435 | /* |
442 | /* |
436 | * change effective uid/gid - not real uid/gid - so we can switch |
443 | * change effective uid/gid - not real uid/gid - so we can switch |
437 | * back to root later, as required |
444 | * back to root later, as required |
438 | */ |
445 | */ |
439 | seteuid(getuid()); |
446 | seteuid (getuid ()); |
440 | setegid(getgid()); |
447 | setegid (getgid ()); |
441 | break; |
448 | break; |
442 | case SAVE: |
449 | case SAVE: |
443 | euid = geteuid(); |
450 | euid = geteuid (); |
444 | egid = getegid(); |
451 | egid = getegid (); |
445 | break; |
452 | break; |
446 | case RESTORE: |
453 | case RESTORE: |
447 | seteuid(euid); |
454 | seteuid (euid); |
448 | setegid(egid); |
455 | setegid (egid); |
449 | break; |
456 | break; |
450 | } |
457 | } |
451 | # else |
458 | # else |
452 | switch (mode) |
459 | switch (mode) |
453 | { |
460 | { |
454 | case IGNORE: |
461 | case IGNORE: |
455 | setuid(getuid()); |
462 | setuid (getuid ()); |
456 | setgid(getgid()); |
463 | setgid (getgid ()); |
457 | /* FALLTHROUGH */ |
464 | /* FALLTHROUGH */ |
458 | case SAVE: |
465 | case SAVE: |
459 | /* FALLTHROUGH */ |
466 | /* FALLTHROUGH */ |
460 | case RESTORE: |
467 | case RESTORE: |
461 | break; |
468 | break; |
… | |
… | |
466 | |
473 | |
467 | #ifdef UTMP_SUPPORT |
474 | #ifdef UTMP_SUPPORT |
468 | void |
475 | void |
469 | rxvt_term::privileged_utmp (char action) |
476 | rxvt_term::privileged_utmp (char action) |
470 | { |
477 | { |
471 | D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", |
478 | D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)", |
472 | action, next_utmp_action, getpid())); |
479 | action, next_utmp_action, getpid ())); |
473 | if (next_utmp_action != action || (action != SAVE && action != RESTORE) |
480 | if (next_utmp_action != action || (action != SAVE && action != RESTORE) |
474 | || (Options & Opt_utmpInhibit) |
481 | || (Options & Opt_utmpInhibit) |
475 | || ttydev == NULL || *ttydev == '\0') |
482 | || ttydev == NULL || *ttydev == '\0') |
476 | return; |
483 | return; |
477 | |
484 | |
… | |
… | |
492 | |
499 | |
493 | #ifndef NO_SETOWNER_TTYDEV |
500 | #ifndef NO_SETOWNER_TTYDEV |
494 | void |
501 | void |
495 | rxvt_term::privileged_ttydev (char action) |
502 | rxvt_term::privileged_ttydev (char action) |
496 | { |
503 | { |
497 | D_MAIN((stderr, |
504 | D_MAIN ((stderr, |
498 | "privileged_ttydev (%c); waiting for: %c (pid: %d)", |
505 | "privileged_ttydev (%c); waiting for: %c (pid: %d)", |
499 | action, next_tty_action, getpid())); |
506 | action, next_tty_action, getpid ())); |
500 | if (next_tty_action != action || (action != SAVE && action != RESTORE) |
507 | if (next_tty_action != action || (action != SAVE && action != RESTORE) |
501 | || ttydev == NULL || *ttydev == '\0') |
508 | || ttydev == NULL || *ttydev == '\0') |
502 | return; |
509 | return; |
503 | |
510 | |
504 | privileges (RESTORE); |
511 | privileges (RESTORE); |
505 | |
512 | |
506 | if (action == SAVE) |
513 | if (action == SAVE) |
507 | { |
514 | { |
508 | next_tty_action = RESTORE; |
515 | next_tty_action = RESTORE; |
509 | # ifndef RESET_TTY_TO_COMMON_DEFAULTS |
516 | # ifndef RESET_TTY_TO_COMMON_DEFAULTS |
510 | /* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */ |
517 | /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */ |
511 | if (lstat(ttydev, &ttyfd_stat) < 0) /* you lose out */ |
518 | if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */ |
512 | next_tty_action = IGNORE; |
519 | next_tty_action = IGNORE; |
513 | else |
520 | else |
514 | # endif |
521 | # endif |
515 | |
522 | |
516 | { |
523 | { |
517 | chown(ttydev, getuid(), ttygid); /* fail silently */ |
524 | chown (ttydev, getuid (), ttygid); /* fail silently */ |
518 | chmod(ttydev, ttymode); |
525 | chmod (ttydev, ttymode); |
519 | # ifdef HAVE_REVOKE |
526 | # ifdef HAVE_REVOKE |
520 | revoke(ttydev); |
527 | revoke (ttydev); |
521 | # endif |
528 | # endif |
522 | |
529 | |
523 | } |
530 | } |
524 | } |
531 | } |
525 | else |
532 | else |
526 | { /* action == RESTORE */ |
533 | { /* action == RESTORE */ |
527 | next_tty_action = IGNORE; |
534 | next_tty_action = IGNORE; |
528 | # ifndef RESET_TTY_TO_COMMON_DEFAULTS |
535 | # ifndef RESET_TTY_TO_COMMON_DEFAULTS |
529 | chmod(ttydev, ttyfd_stat.st_mode); |
536 | chmod (ttydev, ttyfd_stat.st_mode); |
530 | chown(ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid); |
537 | chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid); |
531 | # else |
538 | # else |
532 | chmod(ttydev, |
539 | chmod (ttydev, |
533 | (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); |
540 | (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); |
534 | chown(ttydev, 0, 0); |
541 | chown (ttydev, 0, 0); |
535 | # endif |
542 | # endif |
536 | |
543 | |
537 | } |
544 | } |
538 | |
545 | |
539 | privileges (IGNORE); |
546 | privileges (IGNORE); |
540 | |
547 | |
541 | # ifndef RESET_TTY_TO_COMMON_DEFAULTS |
548 | # ifndef RESET_TTY_TO_COMMON_DEFAULTS |
542 | D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", |
549 | D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", |
543 | action == RESTORE ? "Restoring" : (action == |
550 | action == RESTORE ? "Restoring" : (action == |
544 | SAVE ? "Saving" : |
551 | SAVE ? "Saving" : |
545 | "UNKNOWN ERROR for"), ttydev, |
552 | "UNKNOWN ERROR for"), ttydev, |
546 | ttyfd_stat.st_mode, ttyfd_stat.st_uid, |
553 | ttyfd_stat.st_mode, ttyfd_stat.st_uid, |
547 | ttyfd_stat.st_gid)); |
554 | ttyfd_stat.st_gid)); |
… | |
… | |
560 | short recalc_x, recalc_y; |
567 | short recalc_x, recalc_y; |
561 | int x, y, sb_w, mb_h, flags; |
568 | int x, y, sb_w, mb_h, flags; |
562 | unsigned int w, h; |
569 | unsigned int w, h; |
563 | unsigned int max_width, max_height; |
570 | unsigned int max_width, max_height; |
564 | |
571 | |
565 | D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", |
572 | D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", |
566 | TermWin.ncol, TermWin.nrow, szHint.width, |
573 | TermWin.ncol, TermWin.nrow, szHint.width, |
567 | szHint.height)); |
574 | szHint.height)); |
568 | szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; |
575 | szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; |
569 | szHint.win_gravity = NorthWestGravity; |
576 | szHint.win_gravity = NorthWestGravity; |
570 | /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ |
577 | /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ |
… | |
… | |
573 | flags = 0; |
580 | flags = 0; |
574 | if (!parsed_geometry) |
581 | if (!parsed_geometry) |
575 | { |
582 | { |
576 | parsed_geometry = 1; |
583 | parsed_geometry = 1; |
577 | if (rs[Rs_geometry]) |
584 | if (rs[Rs_geometry]) |
578 | flags = XParseGeometry(rs[Rs_geometry], &x, &y, &w, &h); |
585 | flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); |
579 | if (flags & WidthValue) |
586 | if (flags & WidthValue) |
580 | { |
587 | { |
581 | TermWin.ncol = BOUND_POSITIVE_INT16(w); |
588 | TermWin.ncol = BOUND_POSITIVE_INT16 (w); |
582 | szHint.flags |= USSize; |
589 | szHint.flags |= USSize; |
583 | } |
590 | } |
584 | if (flags & HeightValue) |
591 | if (flags & HeightValue) |
585 | { |
592 | { |
586 | TermWin.nrow = BOUND_POSITIVE_INT16(h); |
593 | TermWin.nrow = BOUND_POSITIVE_INT16 (h); |
587 | szHint.flags |= USSize; |
594 | szHint.flags |= USSize; |
588 | } |
595 | } |
589 | if (flags & XValue) |
596 | if (flags & XValue) |
590 | { |
597 | { |
591 | szHint.x = x; |
598 | szHint.x = x; |
… | |
… | |
620 | |
627 | |
621 | sb_w = mb_h = 0; |
628 | sb_w = mb_h = 0; |
622 | window_vt_x = window_vt_y = 0; |
629 | window_vt_x = window_vt_y = 0; |
623 | if (scrollbar_visible ()) |
630 | if (scrollbar_visible ()) |
624 | { |
631 | { |
625 | sb_w = scrollbar_TotalWidth(); |
632 | sb_w = scrollbar_TotalWidth (); |
626 | szHint.base_width += sb_w; |
633 | szHint.base_width += sb_w; |
627 | if (!(Options & Opt_scrollBar_right)) |
634 | if (! (Options & Opt_scrollBar_right)) |
628 | window_vt_x = sb_w; |
635 | window_vt_x = sb_w; |
629 | } |
636 | } |
630 | if (menubar_visible ()) |
637 | if (menubar_visible ()) |
631 | { |
638 | { |
632 | mb_h = menuBar_TotalHeight(); |
639 | mb_h = menuBar_TotalHeight (); |
633 | szHint.base_height += mb_h; |
640 | szHint.base_height += mb_h; |
634 | window_vt_y = mb_h; |
641 | window_vt_y = mb_h; |
635 | } |
642 | } |
636 | szHint.width_inc = TermWin.fwidth; |
643 | szHint.width_inc = TermWin.fwidth; |
637 | szHint.height_inc = TermWin.fheight; |
644 | szHint.height_inc = TermWin.fheight; |
… | |
… | |
643 | szHint.width = width; |
650 | szHint.width = width; |
644 | TermWin.width = width - szHint.base_width; |
651 | TermWin.width = width - szHint.base_width; |
645 | } |
652 | } |
646 | else |
653 | else |
647 | { |
654 | { |
648 | MIN_IT(TermWin.width, max_width); |
655 | MIN_IT (TermWin.width, max_width); |
649 | szHint.width = szHint.base_width + TermWin.width; |
656 | szHint.width = szHint.base_width + TermWin.width; |
650 | } |
657 | } |
651 | if (height && height - szHint.base_height < max_height) |
658 | if (height && height - szHint.base_height < max_height) |
652 | { |
659 | { |
653 | szHint.height = height; |
660 | szHint.height = height; |
654 | TermWin.height = height - szHint.base_height; |
661 | TermWin.height = height - szHint.base_height; |
655 | } |
662 | } |
656 | else |
663 | else |
657 | { |
664 | { |
658 | MIN_IT(TermWin.height, max_height); |
665 | MIN_IT (TermWin.height, max_height); |
659 | szHint.height = szHint.base_height + TermWin.height; |
666 | szHint.height = szHint.base_height + TermWin.height; |
660 | } |
667 | } |
661 | if (scrollbar_visible () && (Options & Opt_scrollBar_right)) |
668 | if (scrollbar_visible () && (Options & Opt_scrollBar_right)) |
662 | window_sb_x = szHint.width - sb_w; |
669 | window_sb_x = szHint.width - sb_w; |
663 | |
670 | |
… | |
… | |
668 | szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) |
675 | szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) |
669 | - szHint.height - 2 * TermWin.ext_bwidth); |
676 | - szHint.height - 2 * TermWin.ext_bwidth); |
670 | |
677 | |
671 | TermWin.ncol = TermWin.width / TermWin.fwidth; |
678 | TermWin.ncol = TermWin.width / TermWin.fwidth; |
672 | TermWin.nrow = TermWin.height / TermWin.fheight; |
679 | TermWin.nrow = TermWin.height / TermWin.fheight; |
673 | D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", |
680 | D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", |
674 | TermWin.ncol, TermWin.nrow, szHint.width, |
681 | TermWin.ncol, TermWin.nrow, szHint.width, |
675 | szHint.height)); |
682 | szHint.height)); |
676 | return; |
683 | return; |
677 | } |
684 | } |
678 | |
685 | |
… | |
… | |
694 | ws.ws_xpixel = ws.ws_ypixel = 0; |
701 | ws.ws_xpixel = ws.ws_ypixel = 0; |
695 | #ifndef DEBUG_SIZE |
702 | #ifndef DEBUG_SIZE |
696 | (void)ioctl (cmd_fd, TIOCSWINSZ, &ws); |
703 | (void)ioctl (cmd_fd, TIOCSWINSZ, &ws); |
697 | #else |
704 | #else |
698 | if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0) |
705 | if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0) |
699 | D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); |
706 | D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); |
700 | # ifdef SIGWINCH |
707 | # ifdef SIGWINCH |
701 | else if (cmd_pid) /* force through to the command */ |
708 | else if (cmd_pid) /* force through to the command */ |
702 | kill (cmd_pid, SIGWINCH); |
709 | kill (cmd_pid, SIGWINCH); |
703 | # endif |
710 | # endif |
704 | #endif |
711 | #endif |
705 | } |
712 | } |
706 | |
713 | |
707 | /*----------------------------------------------------------------------*/ |
714 | /*----------------------------------------------------------------------*/ |
708 | /* rxvt_change_font() - Switch to a new font */ |
715 | /* rxvt_change_font () - Switch to a new font */ |
709 | /* |
716 | /* |
710 | * init = 1 - initialize |
717 | * init = 1 - initialize |
711 | * |
718 | * |
712 | * fontname == FONT_UP - switch to bigger font |
719 | * fontname == FONT_UP - switch to bigger font |
713 | * fontname == FONT_DN - switch to smaller font |
720 | * fontname == FONT_DN - switch to smaller font |
… | |
… | |
725 | /* xterm sequences - title, iconName, color (exptl) */ |
732 | /* xterm sequences - title, iconName, color (exptl) */ |
726 | void |
733 | void |
727 | rxvt_term::set_title (const char *str) |
734 | rxvt_term::set_title (const char *str) |
728 | { |
735 | { |
729 | #ifndef SMART_WINDOW_TITLE |
736 | #ifndef SMART_WINDOW_TITLE |
730 | XStoreName(display->display, TermWin.parent[0], str); |
737 | XStoreName (display->display, TermWin.parent[0], str); |
731 | #else |
738 | #else |
732 | char *name; |
739 | char *name; |
733 | |
740 | |
734 | if (XFetchName(display->display, TermWin.parent[0], &name) == 0) |
741 | if (XFetchName (display->display, TermWin.parent[0], &name) == 0) |
735 | name = NULL; |
742 | name = NULL; |
736 | if (name == NULL || STRCMP(name, str)) |
743 | if (name == NULL || STRCMP (name, str)) |
737 | XStoreName(display->display, TermWin.parent[0], str); |
744 | XStoreName (display->display, TermWin.parent[0], str); |
738 | if (name) |
745 | if (name) |
739 | XFree(name); |
746 | XFree (name); |
740 | #endif |
747 | #endif |
741 | } |
748 | } |
742 | |
749 | |
743 | void |
750 | void |
744 | rxvt_term::set_iconName (const char *str) |
751 | rxvt_term::set_iconName (const char *str) |
745 | { |
752 | { |
746 | #ifndef SMART_WINDOW_TITLE |
753 | #ifndef SMART_WINDOW_TITLE |
747 | XSetIconName(display->display, TermWin.parent[0], str); |
754 | XSetIconName (display->display, TermWin.parent[0], str); |
748 | #else |
755 | #else |
749 | char *name; |
756 | char *name; |
750 | |
757 | |
751 | if (XGetIconName(display->display, TermWin.parent[0], &name)) |
758 | if (XGetIconName (display->display, TermWin.parent[0], &name)) |
752 | name = NULL; |
759 | name = NULL; |
753 | if (name == NULL || STRCMP(name, str)) |
760 | if (name == NULL || STRCMP (name, str)) |
754 | XSetIconName(display->display, TermWin.parent[0], str); |
761 | XSetIconName (display->display, TermWin.parent[0], str); |
755 | if (name) |
762 | if (name) |
756 | XFree(name); |
763 | XFree (name); |
757 | #endif |
764 | #endif |
758 | } |
765 | } |
759 | |
766 | |
760 | #ifdef XTERM_COLOR_CHANGE |
767 | #ifdef XTERM_COLOR_CHANGE |
761 | void |
768 | void |
… | |
… | |
766 | |
773 | |
767 | if (color == NULL || *color == '\0') |
774 | if (color == NULL || *color == '\0') |
768 | return; |
775 | return; |
769 | |
776 | |
770 | /* handle color aliases */ |
777 | /* handle color aliases */ |
771 | if (isdigit(*color)) |
778 | if (isdigit (*color)) |
772 | { |
779 | { |
773 | i = atoi(color); |
780 | i = atoi (color); |
774 | if (i >= 8 && i <= 15) |
781 | if (i >= 8 && i <= 15) |
775 | { /* bright colors */ |
782 | { /* bright colors */ |
776 | i -= 8; |
783 | i -= 8; |
777 | # ifndef NO_BRIGHTCOLOR |
784 | # ifndef NO_BRIGHTCOLOR |
778 | PixColors[idx] = PixColors[minBrightCOLOR + i]; |
785 | PixColors[idx] = PixColors[minBrightCOLOR + i]; |
779 | SET_PIXCOLOR(idx); |
786 | SET_PIXCOLOR (idx); |
780 | goto Done; |
787 | goto Done; |
781 | # endif |
788 | # endif |
782 | |
789 | |
783 | } |
790 | } |
784 | if (i >= 0 && i <= 7) |
791 | if (i >= 0 && i <= 7) |
785 | { /* normal colors */ |
792 | { /* normal colors */ |
786 | PixColors[idx] = PixColors[minCOLOR + i]; |
793 | PixColors[idx] = PixColors[minCOLOR + i]; |
787 | SET_PIXCOLOR(idx); |
794 | SET_PIXCOLOR (idx); |
788 | goto Done; |
795 | goto Done; |
789 | } |
796 | } |
790 | } |
797 | } |
791 | if (!rXParseAllocColor (& xcol, color)) |
798 | if (!rXParseAllocColor (& xcol, color)) |
792 | return; |
799 | return; |
… | |
… | |
801 | if (PixColors[idx] == PixColors[i]) |
808 | if (PixColors[idx] == PixColors[i]) |
802 | break; |
809 | break; |
803 | if (i > Color_White) |
810 | if (i > Color_White) |
804 | { |
811 | { |
805 | /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */ |
812 | /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */ |
806 | XFreeColors(display->display, XCMAP, (PixColors + idx), 1, |
813 | XFreeColors (display->display, XCMAP, (PixColors + idx), 1, |
807 | DisplayPlanes(display->display, display->screen)); |
814 | DisplayPlanes (display->display, display->screen)); |
808 | } |
815 | } |
809 | # endif |
816 | # endif |
810 | |
817 | |
811 | PixColors[idx] = xcol; |
818 | PixColors[idx] = xcol; |
812 | SET_PIXCOLOR(idx); |
819 | SET_PIXCOLOR (idx); |
813 | |
820 | |
814 | /* XSetWindowAttributes attr; */ |
821 | /* XSetWindowAttributes attr; */ |
815 | /* Cursor cursor; */ |
822 | /* Cursor cursor; */ |
816 | Done: |
823 | Done: |
817 | if (idx == Color_bg && !(Options & Opt_transparent)) |
824 | if (idx == Color_bg && ! (Options & Opt_transparent)) |
818 | XSetWindowBackground(display->display, TermWin.vt, |
825 | XSetWindowBackground (display->display, TermWin.vt, |
819 | PixColors[Color_bg]); |
826 | PixColors[Color_bg]); |
820 | |
827 | |
821 | /* handle Color_BD, scrollbar background, etc. */ |
828 | /* handle Color_BD, scrollbar background, etc. */ |
822 | |
829 | |
823 | set_colorfgbg (); |
830 | set_colorfgbg (); |
… | |
… | |
837 | rxvt_color xcol[2]; |
844 | rxvt_color xcol[2]; |
838 | |
845 | |
839 | xcol[0] = PixColors[Color_pointer]; |
846 | xcol[0] = PixColors[Color_pointer]; |
840 | xcol[1] = PixColors[Color_bg]; |
847 | xcol[1] = PixColors[Color_bg]; |
841 | XQueryColors (display->display, XCMAP, xcol, 2); |
848 | XQueryColors (display->display, XCMAP, xcol, 2); |
842 | XRecolorCursor (display->display, TermWin_cursor, &(xcol[0]), &(xcol[1])); |
849 | XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1])); |
843 | #endif |
850 | #endif |
844 | } |
851 | } |
845 | |
852 | |
846 | /*----------------------------------------------------------------------*/ |
853 | /*----------------------------------------------------------------------*/ |
847 | /* |
854 | /* |
… | |
… | |
850 | void |
857 | void |
851 | rxvt_term::set_colorfgbg () |
858 | rxvt_term::set_colorfgbg () |
852 | { |
859 | { |
853 | unsigned int i; |
860 | unsigned int i; |
854 | const char *xpmb = "\0"; |
861 | const char *xpmb = "\0"; |
855 | char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; |
862 | char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; |
856 | |
863 | |
857 | env_colorfgbg = |
864 | env_colorfgbg = |
858 | (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); |
865 | (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1); |
859 | STRCPY(fstr, "default"); |
866 | STRCPY (fstr, "default"); |
860 | STRCPY(bstr, "default"); |
867 | STRCPY (bstr, "default"); |
861 | for (i = Color_Black; i <= Color_White; i++) |
868 | for (i = Color_Black; i <= Color_White; i++) |
862 | if (PixColors[Color_fg] == PixColors[i]) |
869 | if (PixColors[Color_fg] == PixColors[i]) |
863 | { |
870 | { |
864 | sprintf(fstr, "%d", (i - Color_Black)); |
871 | sprintf (fstr, "%d", (i - Color_Black)); |
865 | break; |
872 | break; |
866 | } |
873 | } |
867 | for (i = Color_Black; i <= Color_White; i++) |
874 | for (i = Color_Black; i <= Color_White; i++) |
868 | if (PixColors[Color_bg] == PixColors[i]) |
875 | if (PixColors[Color_bg] == PixColors[i]) |
869 | { |
876 | { |
870 | sprintf(bstr, "%d", (i - Color_Black)); |
877 | sprintf (bstr, "%d", (i - Color_Black)); |
871 | #ifdef XPM_BACKGROUND |
878 | #ifdef XPM_BACKGROUND |
872 | xpmb = "default;"; |
879 | xpmb = "default;"; |
873 | #endif |
880 | #endif |
874 | break; |
881 | break; |
875 | } |
882 | } |
|
|
883 | |
876 | sprintf(env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); |
884 | sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); |
877 | putenv(env_colorfgbg); |
|
|
878 | |
885 | |
879 | #ifndef NO_BRIGHTCOLOR |
886 | #ifndef NO_BRIGHTCOLOR |
880 | colorfgbg = DEFAULT_RSTYLE; |
887 | colorfgbg = DEFAULT_RSTYLE; |
881 | for (i = minCOLOR; i <= maxCOLOR; i++) |
888 | for (i = minCOLOR; i <= maxCOLOR; i++) |
882 | { |
889 | { |
883 | if (PixColors[Color_fg] == PixColors[i]) |
890 | if (PixColors[Color_fg] == PixColors[i]) |
884 | colorfgbg = SET_FGCOLOR(colorfgbg, i); |
891 | colorfgbg = SET_FGCOLOR (colorfgbg, i); |
885 | if (PixColors[Color_bg] == PixColors[i]) |
892 | if (PixColors[Color_bg] == PixColors[i]) |
886 | colorfgbg = SET_BGCOLOR(colorfgbg, i); |
893 | colorfgbg = SET_BGCOLOR (colorfgbg, i); |
887 | } |
894 | } |
888 | #endif |
895 | #endif |
889 | } |
896 | } |
890 | |
897 | |
891 | /*----------------------------------------------------------------------*/ |
898 | /*----------------------------------------------------------------------*/ |
… | |
… | |
897 | int |
904 | int |
898 | rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) |
905 | rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) |
899 | { |
906 | { |
900 | if (!screen_in_out->set (display, colour)) |
907 | if (!screen_in_out->set (display, colour)) |
901 | { |
908 | { |
902 | rxvt_print_error("can't allocate colour: %s", colour); |
909 | rxvt_print_error ("can't allocate colour: %s", colour); |
903 | return false; |
910 | return false; |
904 | } |
911 | } |
905 | |
912 | |
906 | return true; |
913 | return true; |
907 | } |
914 | } |
… | |
… | |
1013 | TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this |
1020 | TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this |
1014 | curr_screen = scr_change_screen (PRIMARY); |
1021 | curr_screen = scr_change_screen (PRIMARY); |
1015 | TermWin.ncol = ncol; |
1022 | TermWin.ncol = ncol; |
1016 | } |
1023 | } |
1017 | |
1024 | |
1018 | scr_reset(); |
1025 | scr_reset (); |
1019 | |
1026 | |
1020 | if (curr_screen >= 0) /* this is not the first time through */ |
1027 | if (curr_screen >= 0) /* this is not the first time through */ |
1021 | { |
1028 | { |
1022 | scr_change_screen (curr_screen); |
1029 | scr_change_screen (curr_screen); |
1023 | selection_check (old_ncol != TermWin.ncol ? 4 : 0); |
1030 | selection_check (old_ncol != TermWin.ncol ? 4 : 0); |
… | |
… | |
1041 | { |
1048 | { |
1042 | XWindowAttributes wattr; |
1049 | XWindowAttributes wattr; |
1043 | |
1050 | |
1044 | if (width == 0 || height == 0) |
1051 | if (width == 0 || height == 0) |
1045 | { |
1052 | { |
1046 | XGetWindowAttributes(display->display, display->root, &wattr); |
1053 | XGetWindowAttributes (display->display, display->root, &wattr); |
1047 | if (width == 0) |
1054 | if (width == 0) |
1048 | width = wattr.width - szHint.base_width; |
1055 | width = wattr.width - szHint.base_width; |
1049 | if (height == 0) |
1056 | if (height == 0) |
1050 | height = wattr.height - szHint.base_height; |
1057 | height = wattr.height - szHint.base_height; |
1051 | } |
1058 | } |
… | |
… | |
1065 | void |
1072 | void |
1066 | rxvt_term::im_set_size (XRectangle *size) |
1073 | rxvt_term::im_set_size (XRectangle *size) |
1067 | { |
1074 | { |
1068 | size->x = TermWin.int_bwidth; |
1075 | size->x = TermWin.int_bwidth; |
1069 | size->y = TermWin.int_bwidth; |
1076 | size->y = TermWin.int_bwidth; |
1070 | size->width = Width2Pixel(TermWin.ncol); |
1077 | size->width = Width2Pixel (TermWin.ncol); |
1071 | size->height = Height2Pixel(TermWin.nrow); |
1078 | size->height = Height2Pixel (TermWin.nrow); |
1072 | } |
1079 | } |
1073 | |
1080 | |
1074 | void |
1081 | void |
1075 | rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg) |
1082 | rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg) |
1076 | { |
1083 | { |
… | |
… | |
1086 | Atom atom; |
1093 | Atom atom; |
1087 | Window win; |
1094 | Window win; |
1088 | char server[IMBUFSIZ]; |
1095 | char server[IMBUFSIZ]; |
1089 | |
1096 | |
1090 | /* get current locale modifier */ |
1097 | /* get current locale modifier */ |
1091 | if ((p = XSetLocaleModifiers(NULL)) != NULL) |
1098 | if ((p = XSetLocaleModifiers (NULL)) != NULL) |
1092 | { |
1099 | { |
1093 | STRCPY(server, "@server="); |
1100 | STRCPY (server, "@server="); |
1094 | STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ |
1101 | STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ |
1095 | if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ |
1102 | if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */ |
1096 | *p = '\0'; |
1103 | *p = '\0'; |
1097 | |
1104 | |
1098 | atom = XInternAtom(display->display, server, False); |
1105 | atom = XInternAtom (display->display, server, False); |
1099 | win = XGetSelectionOwner(display->display, atom); |
1106 | win = XGetSelectionOwner (display->display, atom); |
1100 | if (win != None) |
1107 | if (win != None) |
1101 | return True; |
1108 | return True; |
1102 | } |
1109 | } |
1103 | return False; |
1110 | return False; |
1104 | } |
1111 | } |
… | |
… | |
1108 | { |
1115 | { |
1109 | XPoint spot; |
1116 | XPoint spot; |
1110 | XVaNestedList preedit_attr; |
1117 | XVaNestedList preedit_attr; |
1111 | |
1118 | |
1112 | if (Input_Context == NULL |
1119 | if (Input_Context == NULL |
1113 | || !TermWin.focus || !(input_style & XIMPreeditPosition) |
1120 | || !TermWin.focus || ! (input_style & XIMPreeditPosition) |
1114 | || !(event_type == KeyPress |
1121 | || ! (event_type == KeyPress |
1115 | || event_type == Expose |
1122 | || event_type == Expose |
1116 | || event_type == NoExpose |
1123 | || event_type == NoExpose |
1117 | || event_type == SelectionNotify |
1124 | || event_type == SelectionNotify |
1118 | || event_type == ButtonRelease || event_type == FocusIn) |
1125 | || event_type == ButtonRelease || event_type == FocusIn) |
1119 | || !IMisRunning ()) |
1126 | || !IMisRunning ()) |
1120 | return; |
1127 | return; |
1121 | |
1128 | |
1122 | im_set_position (&spot); |
1129 | im_set_position (&spot); |
1123 | |
1130 | |
1124 | preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); |
1131 | preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL); |
1125 | XSetICValues(Input_Context, XNPreeditAttributes, preedit_attr, NULL); |
1132 | XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL); |
1126 | XFree(preedit_attr); |
1133 | XFree (preedit_attr); |
1127 | } |
1134 | } |
1128 | |
1135 | |
1129 | void |
1136 | void |
1130 | rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, |
1137 | rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, |
1131 | XRectangle * needed_rect) |
1138 | XRectangle * needed_rect) |
1132 | { |
1139 | { |
1133 | int mbh, vtx = 0; |
1140 | int mbh, vtx = 0; |
1134 | |
1141 | |
1135 | if (scrollbar_visible () && !(Options & Opt_scrollBar_right)) |
1142 | if (scrollbar_visible () && ! (Options & Opt_scrollBar_right)) |
1136 | vtx = scrollbar_TotalWidth(); |
1143 | vtx = scrollbar_TotalWidth (); |
1137 | |
1144 | |
1138 | mbh = menubar_visible () ? menuBar_TotalHeight() : 0; |
1145 | mbh = menubar_visible () ? menuBar_TotalHeight () : 0; |
1139 | mbh -= TermWin.lineSpace; |
1146 | mbh -= TermWin.lineSpace; |
1140 | |
1147 | |
1141 | preedit_rect->x = needed_rect->width + vtx; |
1148 | preedit_rect->x = needed_rect->width + vtx; |
1142 | preedit_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh; |
1149 | preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh; |
1143 | |
1150 | |
1144 | preedit_rect->width = Width2Pixel(TermWin.ncol + 1) - needed_rect->width + vtx; |
1151 | preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx; |
1145 | preedit_rect->height = Height2Pixel(1); |
1152 | preedit_rect->height = Height2Pixel (1); |
1146 | |
1153 | |
1147 | status_rect->x = vtx; |
1154 | status_rect->x = vtx; |
1148 | status_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh; |
1155 | status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh; |
1149 | |
1156 | |
1150 | status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel(TermWin.ncol + 1); |
1157 | status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1); |
1151 | status_rect->height = Height2Pixel(1); |
1158 | status_rect->height = Height2Pixel (1); |
1152 | } |
1159 | } |
1153 | |
1160 | |
1154 | void |
1161 | void |
1155 | rxvt_term::im_destroy () |
1162 | rxvt_term::im_destroy () |
1156 | { |
1163 | { |
… | |
… | |
1182 | const char *p; |
1189 | const char *p; |
1183 | char **s; |
1190 | char **s; |
1184 | XIMStyles *xim_styles; |
1191 | XIMStyles *xim_styles; |
1185 | XVaNestedList preedit_attr, status_attr; |
1192 | XVaNestedList preedit_attr, status_attr; |
1186 | |
1193 | |
1187 | if (!((p = XSetLocaleModifiers (modifiers)) && *p)) |
1194 | if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) |
1188 | return false; |
1195 | return false; |
1189 | |
1196 | |
1190 | D_MAIN((stderr, "rxvt_IM_get_IC()")); |
1197 | D_MAIN ((stderr, "rxvt_IM_get_IC ()")); |
1191 | input_method = display->get_xim (locale, modifiers); |
1198 | input_method = display->get_xim (locale, modifiers); |
1192 | if (input_method == NULL) |
1199 | if (input_method == NULL) |
1193 | return false; |
1200 | return false; |
1194 | |
1201 | |
1195 | xim = input_method->xim; |
1202 | xim = input_method->xim; |
… | |
… | |
1201 | display->put_xim (input_method); |
1208 | display->put_xim (input_method); |
1202 | return false; |
1209 | return false; |
1203 | } |
1210 | } |
1204 | |
1211 | |
1205 | p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root"; |
1212 | p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root"; |
1206 | s = rxvt_splitcommastring(p); |
1213 | s = rxvt_splitcommastring (p); |
1207 | for (i = found = 0; !found && s[i]; i++) |
1214 | for (i = found = 0; !found && s[i]; i++) |
1208 | { |
1215 | { |
1209 | if (!STRCMP(s[i], "OverTheSpot")) |
1216 | if (!STRCMP (s[i], "OverTheSpot")) |
1210 | input_style = (XIMPreeditPosition | XIMStatusNothing); |
1217 | input_style = (XIMPreeditPosition | XIMStatusNothing); |
1211 | else if (!STRCMP(s[i], "OffTheSpot")) |
1218 | else if (!STRCMP (s[i], "OffTheSpot")) |
1212 | input_style = (XIMPreeditArea | XIMStatusArea); |
1219 | input_style = (XIMPreeditArea | XIMStatusArea); |
1213 | else if (!STRCMP(s[i], "Root")) |
1220 | else if (!STRCMP (s[i], "Root")) |
1214 | input_style = (XIMPreeditNothing | XIMStatusNothing); |
1221 | input_style = (XIMPreeditNothing | XIMStatusNothing); |
1215 | |
1222 | |
1216 | for (j = 0; j < xim_styles->count_styles; j++) |
1223 | for (j = 0; j < xim_styles->count_styles; j++) |
1217 | if (input_style == xim_styles->supported_styles[j]) |
1224 | if (input_style == xim_styles->supported_styles[j]) |
1218 | { |
1225 | { |
… | |
… | |
1239 | { |
1246 | { |
1240 | im_set_size (&rect); |
1247 | im_set_size (&rect); |
1241 | im_set_position (&spot); |
1248 | im_set_position (&spot); |
1242 | im_set_color (&fg, &bg); |
1249 | im_set_color (&fg, &bg); |
1243 | |
1250 | |
1244 | preedit_attr = XVaCreateNestedList(0, XNArea, &rect, |
1251 | preedit_attr = XVaCreateNestedList (0, XNArea, &rect, |
1245 | XNSpotLocation, &spot, |
1252 | XNSpotLocation, &spot, |
1246 | XNForeground, fg, XNBackground, bg, |
1253 | XNForeground, fg, XNBackground, bg, |
1247 | //XNFontSet, TermWin.fontset, |
1254 | //XNFontSet, TermWin.fontset, |
1248 | NULL); |
1255 | NULL); |
1249 | } |
1256 | } |
… | |
… | |
1257 | */ |
1264 | */ |
1258 | needed_rect.width = 0; |
1265 | needed_rect.width = 0; |
1259 | |
1266 | |
1260 | im_set_preedit_area (&rect, &status_rect, &needed_rect); |
1267 | im_set_preedit_area (&rect, &status_rect, &needed_rect); |
1261 | |
1268 | |
1262 | preedit_attr = XVaCreateNestedList(0, XNArea, &rect, |
1269 | preedit_attr = XVaCreateNestedList (0, XNArea, &rect, |
1263 | XNForeground, fg, XNBackground, bg, |
1270 | XNForeground, fg, XNBackground, bg, |
1264 | //XNFontSet, TermWin.fontset, |
1271 | //XNFontSet, TermWin.fontset, |
1265 | NULL); |
1272 | NULL); |
1266 | status_attr = XVaCreateNestedList(0, XNArea, &status_rect, |
1273 | status_attr = XVaCreateNestedList (0, XNArea, &status_rect, |
1267 | XNForeground, fg, XNBackground, bg, |
1274 | XNForeground, fg, XNBackground, bg, |
1268 | //XNFontSet, TermWin.fontset, |
1275 | //XNFontSet, TermWin.fontset, |
1269 | NULL); |
1276 | NULL); |
1270 | } |
1277 | } |
1271 | |
1278 | |
1272 | Input_Context = XCreateIC(xim, XNInputStyle, input_style, |
1279 | Input_Context = XCreateIC (xim, XNInputStyle, input_style, |
1273 | XNClientWindow, TermWin.parent[0], |
1280 | XNClientWindow, TermWin.parent[0], |
1274 | XNFocusWindow, TermWin.parent[0], |
1281 | XNFocusWindow, TermWin.parent[0], |
1275 | preedit_attr ? XNPreeditAttributes : NULL, |
1282 | preedit_attr ? XNPreeditAttributes : NULL, |
1276 | preedit_attr, |
1283 | preedit_attr, |
1277 | status_attr ? XNStatusAttributes : NULL, |
1284 | status_attr ? XNStatusAttributes : NULL, |
1278 | status_attr, NULL); |
1285 | status_attr, NULL); |
1279 | if (preedit_attr) XFree(preedit_attr); |
1286 | if (preedit_attr) XFree (preedit_attr); |
1280 | if (status_attr) XFree(status_attr); |
1287 | if (status_attr) XFree (status_attr); |
1281 | |
1288 | |
1282 | if (Input_Context == NULL) |
1289 | if (Input_Context == NULL) |
1283 | { |
1290 | { |
1284 | rxvt_print_error("failed to create input context"); |
1291 | rxvt_print_error ("failed to create input context"); |
1285 | display->put_xim (input_method); |
1292 | display->put_xim (input_method); |
1286 | return false; |
1293 | return false; |
1287 | } |
1294 | } |
1288 | |
1295 | |
1289 | if (input_style & XIMPreeditArea) |
1296 | if (input_style & XIMPreeditArea) |
1290 | IMSetStatusPosition (); |
1297 | IMSetStatusPosition (); |
1291 | |
1298 | |
1292 | D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection")); |
1299 | D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection")); |
1293 | return true; |
1300 | return true; |
1294 | } |
1301 | } |
1295 | |
1302 | |
1296 | void |
1303 | void |
1297 | rxvt_term::im_cb () |
1304 | rxvt_term::im_cb () |
… | |
… | |
1301 | char **s; |
1308 | char **s; |
1302 | char buf[IMBUFSIZ]; |
1309 | char buf[IMBUFSIZ]; |
1303 | |
1310 | |
1304 | im_destroy (); |
1311 | im_destroy (); |
1305 | |
1312 | |
1306 | D_MAIN((stderr, "rxvt_IMInstantiateCallback()")); |
1313 | D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); |
1307 | if (Input_Context) |
1314 | if (Input_Context) |
1308 | return; |
1315 | return; |
1309 | |
1316 | |
1310 | #if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) |
1317 | #if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) |
1311 | if (rs[Rs_imLocale]) |
1318 | if (rs[Rs_imLocale]) |
… | |
… | |
1330 | break; |
1337 | break; |
1331 | } |
1338 | } |
1332 | } |
1339 | } |
1333 | } |
1340 | } |
1334 | for (i = 0; s[i]; i++) |
1341 | for (i = 0; s[i]; i++) |
1335 | free(s[i]); |
1342 | free (s[i]); |
1336 | free(s); |
1343 | free (s); |
1337 | |
1344 | |
1338 | if (found) |
1345 | if (found) |
1339 | goto done; |
1346 | goto done; |
1340 | } |
1347 | } |
1341 | |
1348 | |
… | |
… | |
1359 | { |
1366 | { |
1360 | XRectangle preedit_rect, status_rect, *needed_rect; |
1367 | XRectangle preedit_rect, status_rect, *needed_rect; |
1361 | XVaNestedList preedit_attr, status_attr; |
1368 | XVaNestedList preedit_attr, status_attr; |
1362 | |
1369 | |
1363 | if (Input_Context == NULL |
1370 | if (Input_Context == NULL |
1364 | || !TermWin.focus || !(input_style & XIMPreeditArea) |
1371 | || !TermWin.focus || ! (input_style & XIMPreeditArea) |
1365 | || !IMisRunning ()) |
1372 | || !IMisRunning ()) |
1366 | return; |
1373 | return; |
1367 | |
1374 | |
1368 | /* Getting the necessary width of preedit area */ |
1375 | /* Getting the necessary width of preedit area */ |
1369 | status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); |
1376 | status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); |
1370 | XGetICValues(Input_Context, XNStatusAttributes, status_attr, NULL); |
1377 | XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); |
1371 | XFree(status_attr); |
1378 | XFree (status_attr); |
1372 | |
1379 | |
1373 | im_set_preedit_area (&preedit_rect, &status_rect, needed_rect); |
1380 | im_set_preedit_area (&preedit_rect, &status_rect, needed_rect); |
1374 | |
1381 | |
1375 | preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); |
1382 | preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); |
1376 | status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); |
1383 | status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); |
1377 | |
1384 | |
1378 | XSetICValues(Input_Context, |
1385 | XSetICValues (Input_Context, |
1379 | XNPreeditAttributes, preedit_attr, |
1386 | XNPreeditAttributes, preedit_attr, |
1380 | XNStatusAttributes, status_attr, NULL); |
1387 | XNStatusAttributes, status_attr, NULL); |
1381 | |
1388 | |
1382 | XFree(preedit_attr); |
1389 | XFree (preedit_attr); |
1383 | XFree(status_attr); |
1390 | XFree (status_attr); |
1384 | } |
1391 | } |
1385 | #endif /* USE_XIM */ |
1392 | #endif /* USE_XIM */ |
1386 | |
1393 | |
1387 | /*----------------------------------------------------------------------*/ |
1394 | /*----------------------------------------------------------------------*/ |
1388 | rxvt_t rxvt_current_term; |
1395 | rxvt_t rxvt_current_term; |