| … | |
… | |
| 1090 | } |
1090 | } |
| 1091 | |
1091 | |
| 1092 | if (fix_screen || old_height == 0) |
1092 | if (fix_screen || old_height == 0) |
| 1093 | scr_reset (); |
1093 | scr_reset (); |
| 1094 | |
1094 | |
| 1095 | #ifdef HAVE_BG_PIXMAP |
|
|
| 1096 | // TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ? |
|
|
| 1097 | // if (bgPixmap.pixmap) |
|
|
| 1098 | // scr_touch (false); |
|
|
| 1099 | #endif |
|
|
| 1100 | |
|
|
| 1101 | #ifdef USE_XIM |
1095 | #ifdef USE_XIM |
| 1102 | IMSetPosition (); |
1096 | IMSetPosition (); |
| 1103 | #endif |
1097 | #endif |
| 1104 | } |
1098 | } |
| 1105 | |
1099 | |
| … | |
… | |
| 1353 | p = pet[pi]; |
1347 | p = pet[pi]; |
| 1354 | |
1348 | |
| 1355 | if (!p) |
1349 | if (!p) |
| 1356 | continue; |
1350 | continue; |
| 1357 | |
1351 | |
| 1358 | s = rxvt_splitcommastring (p); |
1352 | s = rxvt_strsplit (',', p); |
| 1359 | |
1353 | |
| 1360 | for (i = found = 0; !found && s[i]; i++) |
1354 | for (i = found = 0; !found && s[i]; i++) |
| 1361 | { |
1355 | { |
| 1362 | if (!strcmp (s[i], "OverTheSpot")) |
1356 | if (!strcmp (s[i], "OverTheSpot")) |
| 1363 | input_style = XIMPreeditPosition | XIMStatusNothing; |
1357 | input_style = XIMPreeditPosition | XIMStatusNothing; |
| … | |
… | |
| 1375 | input_style = XIMPreeditNothing | XIMStatusNothing; |
1369 | input_style = XIMPreeditNothing | XIMStatusNothing; |
| 1376 | |
1370 | |
| 1377 | for (j = 0; j < xim_styles->count_styles; j++) |
1371 | for (j = 0; j < xim_styles->count_styles; j++) |
| 1378 | if (input_style == xim_styles->supported_styles[j]) |
1372 | if (input_style == xim_styles->supported_styles[j]) |
| 1379 | { |
1373 | { |
| 1380 | rxvt_freecommastring (s); |
1374 | rxvt_free_strsplit (s); |
| 1381 | |
1375 | |
| 1382 | found = 1; |
1376 | found = 1; |
| 1383 | goto foundpet; |
1377 | goto foundpet; |
| 1384 | } |
1378 | } |
| 1385 | |
1379 | |
| 1386 | } |
1380 | } |
| 1387 | |
1381 | |
| 1388 | rxvt_freecommastring (s); |
1382 | rxvt_free_strsplit (s); |
| 1389 | } |
1383 | } |
| 1390 | |
1384 | |
| 1391 | foundpet: |
1385 | foundpet: |
| 1392 | |
1386 | |
| 1393 | XFree (xim_styles); |
1387 | XFree (xim_styles); |
| … | |
… | |
| 1549 | p = rs[Rs_inputMethod]; |
1543 | p = rs[Rs_inputMethod]; |
| 1550 | if (p && *p) |
1544 | if (p && *p) |
| 1551 | { |
1545 | { |
| 1552 | bool found = false; |
1546 | bool found = false; |
| 1553 | |
1547 | |
| 1554 | s = rxvt_splitcommastring (p); |
1548 | s = rxvt_strsplit (',', p); |
| 1555 | |
1549 | |
| 1556 | for (i = 0; s[i]; i++) |
1550 | for (i = 0; s[i]; i++) |
| 1557 | { |
1551 | { |
| 1558 | if (*s[i]) |
1552 | if (*s[i]) |
| 1559 | { |
1553 | { |
| … | |
… | |
| 1565 | break; |
1559 | break; |
| 1566 | } |
1560 | } |
| 1567 | } |
1561 | } |
| 1568 | } |
1562 | } |
| 1569 | |
1563 | |
| 1570 | rxvt_freecommastring (s); |
1564 | rxvt_free_strsplit (s); |
| 1571 | |
1565 | |
| 1572 | if (found) |
1566 | if (found) |
| 1573 | goto done; |
1567 | goto done; |
| 1574 | } |
1568 | } |
| 1575 | |
1569 | |
