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.193 by root, Sat Jan 21 14:25:05 2006 UTC vs.
Revision 1.202 by root, Wed Jan 25 01:08:38 2006 UTC

… …
305rxvt_term::destroy () 305rxvt_term::destroy ()
306{ 306{
307 if (destroy_ev.active) 307 if (destroy_ev.active)
308 return; 308 return;
309 309
310 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END))) 310 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
311 return;
312 311
313#if ENABLE_OVERLAY 312#if ENABLE_OVERLAY
314 scr_overlay_off (); 313 scr_overlay_off ();
315#endif 314#endif
316 315
… …
450 _exit (EXIT_FAILURE); 449 _exit (EXIT_FAILURE);
451} 450}
452 451
453/*----------------------------------------------------------------------*/ 452/*----------------------------------------------------------------------*/
454bool 453bool
455rxvt_term::init (int argc, const char *const *argv) 454rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
456{ 455{
456 this->envv = envv;
457
457 SET_R (this); 458 SET_R (this);
458 set_locale (""); 459 set_locale ("");
459 set_environ (envv); // few things in X do not call setlocale :( 460 set_environ (envv); // few things in X do not call setlocale :(
460 461
461 if (!init_vars ()) 462 if (!init_vars ())
… …
472#ifdef HAVE_SCROLLBARS 473#ifdef HAVE_SCROLLBARS
473 if (OPTION (Opt_scrollBar)) 474 if (OPTION (Opt_scrollBar))
474 scrollBar.setIdle (); /* set existence for size calculations */ 475 scrollBar.setIdle (); /* set existence for size calculations */
475#endif 476#endif
476 477
477 pty = rxvt_new_ptytty (); 478 pty = ptytty::create ();
478 479
479 create_windows (argc, argv); 480 create_windows (argc, argv);
480 481
481 dDisp; 482 dDisp;
482 483
… …
528 * Catch a fatal signal and tidy up before quitting 529 * Catch a fatal signal and tidy up before quitting
529 */ 530 */
530 void 531 void
531 sig_term (sig_watcher &w) 532 sig_term (sig_watcher &w)
532 { 533 {
533#ifdef DEBUG_CMD
534 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
535#endif
536 rxvt_emergency_cleanup (); 534 rxvt_emergency_cleanup ();
537 signal (w.signum, SIG_DFL); 535 signal (w.signum, SIG_DFL);
538 kill (getpid (), w.signum); 536 kill (getpid (), w.signum);
539 } 537 }
540 538
… …
548char **rxvt_environ; // startup environment 546char **rxvt_environ; // startup environment
549 547
550void 548void
551rxvt_init () 549rxvt_init ()
552{ 550{
553 uid_t uid = getuid (); 551 ptytty::init ();
554 gid_t gid = getgid ();
555
556 // before doing anything else, check for setuid/setgid operation,
557 // start the helper process and drop privileges
558 if (uid != geteuid ()
559 || gid != getegid ())
560 {
561#if PTYTTY_HELPER
562 rxvt_ptytty_server ();
563#else
564 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
565#endif
566
567 // drop privileges
568#if HAVE_SETRESUID
569 setresgid (gid, gid, gid);
570 setresuid (uid, uid, uid);
571#elif HAVE_SETREUID
572 setregid (gid, gid);
573 setreuid (uid, uid);
574#elif HAVE_SETUID
575 setgid (gid);
576 setuid (uid);
577#endif
578
579 if (uid != geteuid ()
580 || gid != getegid ())
581 rxvt_fatal ("unable to drop privileges, aborting.\n");
582 }
583 552
584 rxvt_environ = environ; 553 rxvt_environ = environ;
585 554
586 signal (SIGHUP, SIG_IGN); 555 signal (SIGHUP, SIG_IGN);
587 signal (SIGPIPE, SIG_IGN); 556 signal (SIGPIPE, SIG_IGN);
… …
646 short recalc_x, recalc_y; 615 short recalc_x, recalc_y;
647 int x, y, sb_w, flags; 616 int x, y, sb_w, flags;
648 unsigned int w, h; 617 unsigned int w, h;
649 unsigned int max_width, max_height; 618 unsigned int max_width, max_height;
650 dDisp; 619 dDisp;
651
652 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
653 ncol, nrow, szHint.width, szHint.height));
654 620
655 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 621 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
656 szHint.win_gravity = NorthWestGravity; 622 szHint.win_gravity = NorthWestGravity;
657 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 623 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
658 624
… …
761 if (recalc_y) 727 if (recalc_y)
762 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 728 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
763 729
764 ncol = width / fwidth; 730 ncol = width / fwidth;
765 nrow = height / fheight; 731 nrow = height / fheight;
766 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
767 ncol, nrow, szHint.width,
768 szHint.height));
769 return;
770} 732}
771 733
772/*----------------------------------------------------------------------*/ 734/*----------------------------------------------------------------------*/
773/* 735/*
774 * Tell the teletype handler what size the window is. 736 * Tell the teletype handler what size the window is.
… …
1058 * -------------------------------------------------------------------- */ 1020 * -------------------------------------------------------------------- */
1059void 1021void
1060rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1022rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1061{ 1023{
1062 int fix_screen; 1024 int fix_screen;
1063 int old_width = szHint.width, old_height = szHint.height; 1025 int old_width = szHint.width;
1026 int old_height = szHint.height;
1064 dDisp; 1027 dDisp;
1065 1028
1066 window_calc (newwidth, newheight); 1029 window_calc (newwidth, newheight);
1067 XSetWMNormalHints (disp, parent[0], &szHint); 1030 XSetWMNormalHints (disp, parent[0], &szHint);
1068 1031
… …
1090 { 1053 {
1091 x -= x1; 1054 x -= x1;
1092 y -= y1; 1055 y -= y1;
1093 } 1056 }
1094 1057
1095 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1058 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1096 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1059 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1097 dx = old_width - szHint.width; 1060 dx = old_width - szHint.width;
1098 dy = old_height - szHint.height; 1061 dy = old_height - szHint.height;
1099 1062
1100 /* Check position of the center of the window */ 1063 /* Check position of the center of the window */
1101 if (x < x1) /* left half */ 1064 if (x < x1) /* left half */
1102 dx = 0; 1065 dx = 0;
… …
1135 resize_pixmap (); 1098 resize_pixmap ();
1136#endif 1099#endif
1137 } 1100 }
1138 1101
1139 if (fix_screen || old_height == 0) 1102 if (fix_screen || old_height == 0)
1140 {
1141 int curr_screen = -1;
1142 int old_ncol = prev_ncol;
1143
1144 /* scr_reset only works on the primary screen */
1145 if (old_height) /* this is not the first time through */
1146 {
1147 unsigned int ocol = ncol;
1148 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1149 curr_screen = scr_change_screen (PRIMARY);
1150 ncol = ocol;
1151 }
1152
1153 scr_reset (); 1103 scr_reset ();
1154
1155 if (curr_screen >= 0) /* this is not the first time through */
1156 {
1157 scr_change_screen (curr_screen);
1158 selection_check (old_ncol != ncol ? 4 : 0);
1159 }
1160 }
1161
1162 old_width = szHint.width;
1163 old_height = szHint.height;
1164 1104
1165#ifdef XPM_BACKGROUND 1105#ifdef XPM_BACKGROUND
1166 if (pixmap) 1106 if (pixmap)
1167 scr_touch (false); 1107 scr_touch (false);
1168#endif 1108#endif
… …
1271 XPoint nspot; 1211 XPoint nspot;
1272 XVaNestedList preedit_attr; 1212 XVaNestedList preedit_attr;
1273 1213
1274 if (!Input_Context 1214 if (!Input_Context
1275 || !focus 1215 || !focus
1276 || !(input_style & XIMPreeditPosition)) 1216 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1277 return; 1217 return;
1278 1218
1279 im_set_position (nspot); 1219 im_set_position (nspot);
1280 1220
1281 if (nspot.x == spot.x && nspot.y == spot.y) 1221 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1300 input_method = 0; 1240 input_method = 0;
1301 } 1241 }
1302 1242
1303 Input_Context = 0; 1243 Input_Context = 0;
1304} 1244}
1245
1246#ifdef ENABLE_XIM_ONTHESPOT
1247
1248static void
1249xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1250{
1251 ((rxvt_term *)client_data)->make_current ();
1252 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1253}
1254
1255static void
1256xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1257{
1258 ((rxvt_term *)client_data)->make_current ();
1259 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1260}
1261
1262static void
1263xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1264{
1265 rxvt_term *term = (rxvt_term *)client_data;
1266 XIMText *text = call_data->text;
1267
1268 term->make_current ();
1269
1270 if (text)
1271 {
1272 void *str;
1273
1274 if (!text->encoding_is_wchar && text->string.multi_byte)
1275 {
1276 // of course, X makes it ugly again
1277 if (term->rs[Rs_imLocale])
1278 SET_LOCALE (term->rs[Rs_imLocale]);
1279
1280 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1281 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1282
1283 if (term->rs[Rs_imLocale])
1284 SET_LOCALE (term->locale);
1285 }
1286 else
1287 str = (void *)text->string.wide_char;
1288
1289 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1290 DT_INT, call_data->caret,
1291 DT_INT, call_data->chg_first,
1292 DT_INT, call_data->chg_length,
1293 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1294 DT_WCS_LEN, str, str ? (int)text->length : 0,
1295 DT_END));
1296 }
1297 else
1298 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1299 DT_INT, call_data->caret,
1300 DT_INT, call_data->chg_first,
1301 DT_INT, call_data->chg_length,
1302 DT_END));
1303}
1304
1305#if 0
1306static void
1307xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1308{
1309 ((rxvt_term *)client_data)->make_current ();
1310 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1311 DT_INT, call_data->position,
1312 DT_INT, call_data->direction,
1313 DT_INT, call_data->style,
1314 DT_END));
1315}
1316#endif
1317
1318#endif
1305 1319
1306/* 1320/*
1307 * Try to open a XIM with the current modifiers, then see if we can 1321 * Try to open a XIM with the current modifiers, then see if we can
1308 * open a suitable preedit type 1322 * open a suitable preedit type
1309 */ 1323 */
… …
1316 XRectangle rect, status_rect, needed_rect; 1330 XRectangle rect, status_rect, needed_rect;
1317 unsigned long fg, bg; 1331 unsigned long fg, bg;
1318 const char *p; 1332 const char *p;
1319 char **s; 1333 char **s;
1320 XIMStyles *xim_styles; 1334 XIMStyles *xim_styles;
1335#ifdef ENABLE_XIM_ONTHESPOT
1336 XIMCallback xcb[4];
1337#endif
1321 1338
1322 set_environ (envv); 1339 set_environ (envv);
1323 1340
1324 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1341 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1325 return false; 1342 return false;
1326 1343
1327 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1328 input_method = display->get_xim (locale, modifiers); 1344 input_method = display->get_xim (locale, modifiers);
1329 if (input_method == NULL) 1345 if (input_method == NULL)
1330 return false; 1346 return false;
1331 1347
1332 xim = input_method->xim; 1348 xim = input_method->xim;
… …
1352 s = rxvt_splitcommastring (p); 1368 s = rxvt_splitcommastring (p);
1353 1369
1354 for (i = found = 0; !found && s[i]; i++) 1370 for (i = found = 0; !found && s[i]; i++)
1355 { 1371 {
1356 if (!strcmp (s[i], "OverTheSpot")) 1372 if (!strcmp (s[i], "OverTheSpot"))
1357 input_style = (XIMPreeditPosition | XIMStatusNothing); 1373 input_style = XIMPreeditPosition | XIMStatusNothing;
1358 else if (!strcmp (s[i], "OffTheSpot")) 1374 else if (!strcmp (s[i], "OffTheSpot"))
1359 input_style = (XIMPreeditArea | XIMStatusArea); 1375 input_style = XIMPreeditArea | XIMStatusArea;
1360 else if (!strcmp (s[i], "Root")) 1376 else if (!strcmp (s[i], "Root"))
1361 input_style = (XIMPreeditNothing | XIMStatusNothing); 1377 input_style = XIMPreeditNothing | XIMStatusNothing;
1362 else if (!strcmp (s[i], "None")) 1378 else if (!strcmp (s[i], "None"))
1363 input_style = (XIMPreeditNone | XIMStatusNone); 1379 input_style = XIMPreeditNone | XIMStatusNone;
1380#ifdef ENABLE_XIM_ONTHESPOT
1381 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1382 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1383#endif
1384 else
1385 input_style = XIMPreeditNothing | XIMStatusNothing;
1364 1386
1365 for (j = 0; j < xim_styles->count_styles; j++) 1387 for (j = 0; j < xim_styles->count_styles; j++)
1366 if (input_style == xim_styles->supported_styles[j]) 1388 if (input_style == xim_styles->supported_styles[j])
1367 { 1389 {
1368 rxvt_freecommastring (s); 1390 rxvt_freecommastring (s);
… …
1457 XNBackground, bg, 1479 XNBackground, bg,
1458 XNArea, &status_rect, 1480 XNArea, &status_rect,
1459 XNFontSet, fs, 1481 XNFontSet, fs,
1460 NULL); 1482 NULL);
1461 } 1483 }
1484 else if (input_style & XIMPreeditCallbacks)
1485 {
1486 im_set_position (spot);
1487
1488 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1489 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1490 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1491#if 0
1492 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1493#endif
1494
1495 preedit_attr = XVaCreateNestedList (0,
1496 XNSpotLocation, &spot,
1497 XNPreeditStartCallback, &xcb[0],
1498 XNPreeditDoneCallback , &xcb[1],
1499 XNPreeditDrawCallback , &xcb[2],
1500#if 0
1501 XNPreeditCaretCallback, &xcb[3],
1502#endif
1503 NULL);
1504 }
1462 1505
1463 Input_Context = XCreateIC (xim, 1506 Input_Context = XCreateIC (xim,
1464 XNInputStyle, input_style, 1507 XNInputStyle, input_style,
1465 XNClientWindow, vt, 1508 XNClientWindow, vt,
1466 XNFocusWindow, parent[0], 1509 XNFocusWindow, parent[0],
… …
1478 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1521 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1479 im_destroy (); 1522 im_destroy ();
1480 return false; 1523 return false;
1481 } 1524 }
1482 1525
1526#if 0
1527 // unfortunately, only the focus window is used by XIM, hard to fix
1528 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1529 vt_select_input ();
1530#endif
1531
1483 if (input_style & XIMPreeditArea) 1532 if (input_style & XIMPreeditArea)
1484 IMSetStatusPosition (); 1533 IMSetStatusPosition ();
1485 1534
1486 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1487 return true; 1535 return true;
1488} 1536}
1489 1537
1490void 1538void
1491rxvt_term::im_cb () 1539rxvt_term::im_cb ()
… …
1497 1545
1498 make_current (); 1546 make_current ();
1499 1547
1500 im_destroy (); 1548 im_destroy ();
1501 1549
1502 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1503 if (Input_Context) 1550 if (Input_Context)
1504 return; 1551 return;
1505 1552
1506#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1553#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1507 if (rs[Rs_imLocale]) 1554 if (rs[Rs_imLocale])

Diff Legend

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