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.196 by root, Sun Jan 22 04:01:52 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
… …
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
… …
620 int x, y, sb_w, flags; 616 int x, y, sb_w, flags;
621 unsigned int w, h; 617 unsigned int w, h;
622 unsigned int max_width, max_height; 618 unsigned int max_width, max_height;
623 dDisp; 619 dDisp;
624 620
625 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
626 ncol, nrow, szHint.width, szHint.height));
627
628 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 621 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
629 szHint.win_gravity = NorthWestGravity; 622 szHint.win_gravity = NorthWestGravity;
630 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 623 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
631 624
632 recalc_x = recalc_y = 0; 625 recalc_x = recalc_y = 0;
… …
734 if (recalc_y) 727 if (recalc_y)
735 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 728 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
736 729
737 ncol = width / fwidth; 730 ncol = width / fwidth;
738 nrow = height / fheight; 731 nrow = height / fheight;
739 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
740 ncol, nrow, szHint.width,
741 szHint.height));
742 return;
743} 732}
744 733
745/*----------------------------------------------------------------------*/ 734/*----------------------------------------------------------------------*/
746/* 735/*
747 * Tell the teletype handler what size the window is. 736 * Tell the teletype handler what size the window is.
… …
1031 * -------------------------------------------------------------------- */ 1020 * -------------------------------------------------------------------- */
1032void 1021void
1033rxvt_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)
1034{ 1023{
1035 int fix_screen; 1024 int fix_screen;
1036 int old_width = szHint.width, old_height = szHint.height; 1025 int old_width = szHint.width;
1026 int old_height = szHint.height;
1037 dDisp; 1027 dDisp;
1038 1028
1039 window_calc (newwidth, newheight); 1029 window_calc (newwidth, newheight);
1040 XSetWMNormalHints (disp, parent[0], &szHint); 1030 XSetWMNormalHints (disp, parent[0], &szHint);
1041 1031
… …
1063 { 1053 {
1064 x -= x1; 1054 x -= x1;
1065 y -= y1; 1055 y -= y1;
1066 } 1056 }
1067 1057
1068 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1058 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1069 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1059 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1070 dx = old_width - szHint.width; 1060 dx = old_width - szHint.width;
1071 dy = old_height - szHint.height; 1061 dy = old_height - szHint.height;
1072 1062
1073 /* Check position of the center of the window */ 1063 /* Check position of the center of the window */
1074 if (x < x1) /* left half */ 1064 if (x < x1) /* left half */
1075 dx = 0; 1065 dx = 0;
… …
1108 resize_pixmap (); 1098 resize_pixmap ();
1109#endif 1099#endif
1110 } 1100 }
1111 1101
1112 if (fix_screen || old_height == 0) 1102 if (fix_screen || old_height == 0)
1113 {
1114 int curr_screen = -1;
1115 int old_ncol = prev_ncol;
1116
1117 /* scr_reset only works on the primary screen */
1118 if (old_height) /* this is not the first time through */
1119 {
1120 unsigned int ocol = ncol;
1121 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1122 curr_screen = scr_change_screen (PRIMARY);
1123 ncol = ocol;
1124 }
1125
1126 scr_reset (); 1103 scr_reset ();
1127
1128 if (curr_screen >= 0) /* this is not the first time through */
1129 {
1130 scr_change_screen (curr_screen);
1131 selection_check (old_ncol != ncol ? 4 : 0);
1132 }
1133 }
1134
1135 old_width = szHint.width;
1136 old_height = szHint.height;
1137 1104
1138#ifdef XPM_BACKGROUND 1105#ifdef XPM_BACKGROUND
1139 if (pixmap) 1106 if (pixmap)
1140 scr_touch (false); 1107 scr_touch (false);
1141#endif 1108#endif
… …
1244 XPoint nspot; 1211 XPoint nspot;
1245 XVaNestedList preedit_attr; 1212 XVaNestedList preedit_attr;
1246 1213
1247 if (!Input_Context 1214 if (!Input_Context
1248 || !focus 1215 || !focus
1249 || !(input_style & XIMPreeditPosition)) 1216 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1250 return; 1217 return;
1251 1218
1252 im_set_position (nspot); 1219 im_set_position (nspot);
1253 1220
1254 if (nspot.x == spot.x && nspot.y == spot.y) 1221 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1273 input_method = 0; 1240 input_method = 0;
1274 } 1241 }
1275 1242
1276 Input_Context = 0; 1243 Input_Context = 0;
1277} 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
1278 1319
1279/* 1320/*
1280 * 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
1281 * open a suitable preedit type 1322 * open a suitable preedit type
1282 */ 1323 */
… …
1289 XRectangle rect, status_rect, needed_rect; 1330 XRectangle rect, status_rect, needed_rect;
1290 unsigned long fg, bg; 1331 unsigned long fg, bg;
1291 const char *p; 1332 const char *p;
1292 char **s; 1333 char **s;
1293 XIMStyles *xim_styles; 1334 XIMStyles *xim_styles;
1335#ifdef ENABLE_XIM_ONTHESPOT
1336 XIMCallback xcb[4];
1337#endif
1294 1338
1295 set_environ (envv); 1339 set_environ (envv);
1296 1340
1297 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1341 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1298 return false; 1342 return false;
1299 1343
1300 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1301 input_method = display->get_xim (locale, modifiers); 1344 input_method = display->get_xim (locale, modifiers);
1302 if (input_method == NULL) 1345 if (input_method == NULL)
1303 return false; 1346 return false;
1304 1347
1305 xim = input_method->xim; 1348 xim = input_method->xim;
… …
1325 s = rxvt_splitcommastring (p); 1368 s = rxvt_splitcommastring (p);
1326 1369
1327 for (i = found = 0; !found && s[i]; i++) 1370 for (i = found = 0; !found && s[i]; i++)
1328 { 1371 {
1329 if (!strcmp (s[i], "OverTheSpot")) 1372 if (!strcmp (s[i], "OverTheSpot"))
1330 input_style = (XIMPreeditPosition | XIMStatusNothing); 1373 input_style = XIMPreeditPosition | XIMStatusNothing;
1331 else if (!strcmp (s[i], "OffTheSpot")) 1374 else if (!strcmp (s[i], "OffTheSpot"))
1332 input_style = (XIMPreeditArea | XIMStatusArea); 1375 input_style = XIMPreeditArea | XIMStatusArea;
1333 else if (!strcmp (s[i], "Root")) 1376 else if (!strcmp (s[i], "Root"))
1334 input_style = (XIMPreeditNothing | XIMStatusNothing); 1377 input_style = XIMPreeditNothing | XIMStatusNothing;
1335 else if (!strcmp (s[i], "None")) 1378 else if (!strcmp (s[i], "None"))
1336 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;
1337 1386
1338 for (j = 0; j < xim_styles->count_styles; j++) 1387 for (j = 0; j < xim_styles->count_styles; j++)
1339 if (input_style == xim_styles->supported_styles[j]) 1388 if (input_style == xim_styles->supported_styles[j])
1340 { 1389 {
1341 rxvt_freecommastring (s); 1390 rxvt_freecommastring (s);
… …
1430 XNBackground, bg, 1479 XNBackground, bg,
1431 XNArea, &status_rect, 1480 XNArea, &status_rect,
1432 XNFontSet, fs, 1481 XNFontSet, fs,
1433 NULL); 1482 NULL);
1434 } 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 }
1435 1505
1436 Input_Context = XCreateIC (xim, 1506 Input_Context = XCreateIC (xim,
1437 XNInputStyle, input_style, 1507 XNInputStyle, input_style,
1438 XNClientWindow, vt, 1508 XNClientWindow, vt,
1439 XNFocusWindow, parent[0], 1509 XNFocusWindow, parent[0],
… …
1451 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1521 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1452 im_destroy (); 1522 im_destroy ();
1453 return false; 1523 return false;
1454 } 1524 }
1455 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
1456 if (input_style & XIMPreeditArea) 1532 if (input_style & XIMPreeditArea)
1457 IMSetStatusPosition (); 1533 IMSetStatusPosition ();
1458 1534
1459 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1460 return true; 1535 return true;
1461} 1536}
1462 1537
1463void 1538void
1464rxvt_term::im_cb () 1539rxvt_term::im_cb ()
… …
1470 1545
1471 make_current (); 1546 make_current ();
1472 1547
1473 im_destroy (); 1548 im_destroy ();
1474 1549
1475 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1476 if (Input_Context) 1550 if (Input_Context)
1477 return; 1551 return;
1478 1552
1479#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1553#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1480 if (rs[Rs_imLocale]) 1554 if (rs[Rs_imLocale])

Diff Legend

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