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.195 by root, Sun Jan 22 00:48:13 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
… …
474#ifdef HAVE_SCROLLBARS 473#ifdef HAVE_SCROLLBARS
475 if (OPTION (Opt_scrollBar)) 474 if (OPTION (Opt_scrollBar))
476 scrollBar.setIdle (); /* set existence for size calculations */ 475 scrollBar.setIdle (); /* set existence for size calculations */
477#endif 476#endif
478 477
479 pty = ptytty_new (); 478 pty = ptytty::create ();
480 479
481 create_windows (argc, argv); 480 create_windows (argc, argv);
482 481
483 dDisp; 482 dDisp;
484 483
… …
530 * Catch a fatal signal and tidy up before quitting 529 * Catch a fatal signal and tidy up before quitting
531 */ 530 */
532 void 531 void
533 sig_term (sig_watcher &w) 532 sig_term (sig_watcher &w)
534 { 533 {
535#ifdef DEBUG_CMD
536 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
537#endif
538 rxvt_emergency_cleanup (); 534 rxvt_emergency_cleanup ();
539 signal (w.signum, SIG_DFL); 535 signal (w.signum, SIG_DFL);
540 kill (getpid (), w.signum); 536 kill (getpid (), w.signum);
541 } 537 }
542 538
… …
550char **rxvt_environ; // startup environment 546char **rxvt_environ; // startup environment
551 547
552void 548void
553rxvt_init () 549rxvt_init ()
554{ 550{
555 uid_t uid = getuid (); 551 ptytty::init ();
556 gid_t gid = getgid ();
557
558 // before doing anything else, check for setuid/setgid operation,
559 // start the helper process and drop privileges
560 if (uid != geteuid ()
561 || gid != getegid ())
562 {
563#if PTYTTY_HELPER
564 ptytty_server ();
565#else
566 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
567#endif
568
569 // drop privileges
570#if HAVE_SETRESUID
571 setresgid (gid, gid, gid);
572 setresuid (uid, uid, uid);
573#elif HAVE_SETREUID
574 setregid (gid, gid);
575 setreuid (uid, uid);
576#elif HAVE_SETUID
577 setgid (gid);
578 setuid (uid);
579#endif
580
581 if (uid != geteuid ()
582 || gid != getegid ())
583 rxvt_fatal ("unable to drop privileges, aborting.\n");
584 }
585 552
586 rxvt_environ = environ; 553 rxvt_environ = environ;
587 554
588 signal (SIGHUP, SIG_IGN); 555 signal (SIGHUP, SIG_IGN);
589 signal (SIGPIPE, SIG_IGN); 556 signal (SIGPIPE, SIG_IGN);
… …
648 short recalc_x, recalc_y; 615 short recalc_x, recalc_y;
649 int x, y, sb_w, flags; 616 int x, y, sb_w, flags;
650 unsigned int w, h; 617 unsigned int w, h;
651 unsigned int max_width, max_height; 618 unsigned int max_width, max_height;
652 dDisp; 619 dDisp;
653
654 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
655 ncol, nrow, szHint.width, szHint.height));
656 620
657 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 621 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
658 szHint.win_gravity = NorthWestGravity; 622 szHint.win_gravity = NorthWestGravity;
659 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 623 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
660 624
… …
763 if (recalc_y) 727 if (recalc_y)
764 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 728 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
765 729
766 ncol = width / fwidth; 730 ncol = width / fwidth;
767 nrow = height / fheight; 731 nrow = height / fheight;
768 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
769 ncol, nrow, szHint.width,
770 szHint.height));
771 return;
772} 732}
773 733
774/*----------------------------------------------------------------------*/ 734/*----------------------------------------------------------------------*/
775/* 735/*
776 * Tell the teletype handler what size the window is. 736 * Tell the teletype handler what size the window is.
… …
1060 * -------------------------------------------------------------------- */ 1020 * -------------------------------------------------------------------- */
1061void 1021void
1062rxvt_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)
1063{ 1023{
1064 int fix_screen; 1024 int fix_screen;
1065 int old_width = szHint.width, old_height = szHint.height; 1025 int old_width = szHint.width;
1026 int old_height = szHint.height;
1066 dDisp; 1027 dDisp;
1067 1028
1068 window_calc (newwidth, newheight); 1029 window_calc (newwidth, newheight);
1069 XSetWMNormalHints (disp, parent[0], &szHint); 1030 XSetWMNormalHints (disp, parent[0], &szHint);
1070 1031
… …
1092 { 1053 {
1093 x -= x1; 1054 x -= x1;
1094 y -= y1; 1055 y -= y1;
1095 } 1056 }
1096 1057
1097 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1058 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1098 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1059 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1099 dx = old_width - szHint.width; 1060 dx = old_width - szHint.width;
1100 dy = old_height - szHint.height; 1061 dy = old_height - szHint.height;
1101 1062
1102 /* Check position of the center of the window */ 1063 /* Check position of the center of the window */
1103 if (x < x1) /* left half */ 1064 if (x < x1) /* left half */
1104 dx = 0; 1065 dx = 0;
… …
1137 resize_pixmap (); 1098 resize_pixmap ();
1138#endif 1099#endif
1139 } 1100 }
1140 1101
1141 if (fix_screen || old_height == 0) 1102 if (fix_screen || old_height == 0)
1142 {
1143 int curr_screen = -1;
1144 int old_ncol = prev_ncol;
1145
1146 /* scr_reset only works on the primary screen */
1147 if (old_height) /* this is not the first time through */
1148 {
1149 unsigned int ocol = ncol;
1150 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1151 curr_screen = scr_change_screen (PRIMARY);
1152 ncol = ocol;
1153 }
1154
1155 scr_reset (); 1103 scr_reset ();
1156
1157 if (curr_screen >= 0) /* this is not the first time through */
1158 {
1159 scr_change_screen (curr_screen);
1160 selection_check (old_ncol != ncol ? 4 : 0);
1161 }
1162 }
1163
1164 old_width = szHint.width;
1165 old_height = szHint.height;
1166 1104
1167#ifdef XPM_BACKGROUND 1105#ifdef XPM_BACKGROUND
1168 if (pixmap) 1106 if (pixmap)
1169 scr_touch (false); 1107 scr_touch (false);
1170#endif 1108#endif
… …
1273 XPoint nspot; 1211 XPoint nspot;
1274 XVaNestedList preedit_attr; 1212 XVaNestedList preedit_attr;
1275 1213
1276 if (!Input_Context 1214 if (!Input_Context
1277 || !focus 1215 || !focus
1278 || !(input_style & XIMPreeditPosition)) 1216 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1279 return; 1217 return;
1280 1218
1281 im_set_position (nspot); 1219 im_set_position (nspot);
1282 1220
1283 if (nspot.x == spot.x && nspot.y == spot.y) 1221 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1302 input_method = 0; 1240 input_method = 0;
1303 } 1241 }
1304 1242
1305 Input_Context = 0; 1243 Input_Context = 0;
1306} 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
1307 1319
1308/* 1320/*
1309 * 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
1310 * open a suitable preedit type 1322 * open a suitable preedit type
1311 */ 1323 */
… …
1318 XRectangle rect, status_rect, needed_rect; 1330 XRectangle rect, status_rect, needed_rect;
1319 unsigned long fg, bg; 1331 unsigned long fg, bg;
1320 const char *p; 1332 const char *p;
1321 char **s; 1333 char **s;
1322 XIMStyles *xim_styles; 1334 XIMStyles *xim_styles;
1335#ifdef ENABLE_XIM_ONTHESPOT
1336 XIMCallback xcb[4];
1337#endif
1323 1338
1324 set_environ (envv); 1339 set_environ (envv);
1325 1340
1326 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1341 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1327 return false; 1342 return false;
1328 1343
1329 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1330 input_method = display->get_xim (locale, modifiers); 1344 input_method = display->get_xim (locale, modifiers);
1331 if (input_method == NULL) 1345 if (input_method == NULL)
1332 return false; 1346 return false;
1333 1347
1334 xim = input_method->xim; 1348 xim = input_method->xim;
… …
1354 s = rxvt_splitcommastring (p); 1368 s = rxvt_splitcommastring (p);
1355 1369
1356 for (i = found = 0; !found && s[i]; i++) 1370 for (i = found = 0; !found && s[i]; i++)
1357 { 1371 {
1358 if (!strcmp (s[i], "OverTheSpot")) 1372 if (!strcmp (s[i], "OverTheSpot"))
1359 input_style = (XIMPreeditPosition | XIMStatusNothing); 1373 input_style = XIMPreeditPosition | XIMStatusNothing;
1360 else if (!strcmp (s[i], "OffTheSpot")) 1374 else if (!strcmp (s[i], "OffTheSpot"))
1361 input_style = (XIMPreeditArea | XIMStatusArea); 1375 input_style = XIMPreeditArea | XIMStatusArea;
1362 else if (!strcmp (s[i], "Root")) 1376 else if (!strcmp (s[i], "Root"))
1363 input_style = (XIMPreeditNothing | XIMStatusNothing); 1377 input_style = XIMPreeditNothing | XIMStatusNothing;
1364 else if (!strcmp (s[i], "None")) 1378 else if (!strcmp (s[i], "None"))
1365 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;
1366 1386
1367 for (j = 0; j < xim_styles->count_styles; j++) 1387 for (j = 0; j < xim_styles->count_styles; j++)
1368 if (input_style == xim_styles->supported_styles[j]) 1388 if (input_style == xim_styles->supported_styles[j])
1369 { 1389 {
1370 rxvt_freecommastring (s); 1390 rxvt_freecommastring (s);
… …
1459 XNBackground, bg, 1479 XNBackground, bg,
1460 XNArea, &status_rect, 1480 XNArea, &status_rect,
1461 XNFontSet, fs, 1481 XNFontSet, fs,
1462 NULL); 1482 NULL);
1463 } 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 }
1464 1505
1465 Input_Context = XCreateIC (xim, 1506 Input_Context = XCreateIC (xim,
1466 XNInputStyle, input_style, 1507 XNInputStyle, input_style,
1467 XNClientWindow, vt, 1508 XNClientWindow, vt,
1468 XNFocusWindow, parent[0], 1509 XNFocusWindow, parent[0],
… …
1480 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1521 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1481 im_destroy (); 1522 im_destroy ();
1482 return false; 1523 return false;
1483 } 1524 }
1484 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
1485 if (input_style & XIMPreeditArea) 1532 if (input_style & XIMPreeditArea)
1486 IMSetStatusPosition (); 1533 IMSetStatusPosition ();
1487 1534
1488 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1489 return true; 1535 return true;
1490} 1536}
1491 1537
1492void 1538void
1493rxvt_term::im_cb () 1539rxvt_term::im_cb ()
… …
1499 1545
1500 make_current (); 1546 make_current ();
1501 1547
1502 im_destroy (); 1548 im_destroy ();
1503 1549
1504 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1505 if (Input_Context) 1550 if (Input_Context)
1506 return; 1551 return;
1507 1552
1508#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1553#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1509 if (rs[Rs_imLocale]) 1554 if (rs[Rs_imLocale])

Diff Legend

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