| … | |
… | |
| 1353 | p = pet[pi]; |
1353 | p = pet[pi]; |
| 1354 | |
1354 | |
| 1355 | if (!p) |
1355 | if (!p) |
| 1356 | continue; |
1356 | continue; |
| 1357 | |
1357 | |
| 1358 | s = rxvt_splitcommastring (p); |
1358 | s = rxvt_strsplit (',', p); |
| 1359 | |
1359 | |
| 1360 | for (i = found = 0; !found && s[i]; i++) |
1360 | for (i = found = 0; !found && s[i]; i++) |
| 1361 | { |
1361 | { |
| 1362 | if (!strcmp (s[i], "OverTheSpot")) |
1362 | if (!strcmp (s[i], "OverTheSpot")) |
| 1363 | input_style = XIMPreeditPosition | XIMStatusNothing; |
1363 | input_style = XIMPreeditPosition | XIMStatusNothing; |
| … | |
… | |
| 1375 | input_style = XIMPreeditNothing | XIMStatusNothing; |
1375 | input_style = XIMPreeditNothing | XIMStatusNothing; |
| 1376 | |
1376 | |
| 1377 | for (j = 0; j < xim_styles->count_styles; j++) |
1377 | for (j = 0; j < xim_styles->count_styles; j++) |
| 1378 | if (input_style == xim_styles->supported_styles[j]) |
1378 | if (input_style == xim_styles->supported_styles[j]) |
| 1379 | { |
1379 | { |
| 1380 | rxvt_freecommastring (s); |
1380 | rxvt_free_strsplit (s); |
| 1381 | |
1381 | |
| 1382 | found = 1; |
1382 | found = 1; |
| 1383 | goto foundpet; |
1383 | goto foundpet; |
| 1384 | } |
1384 | } |
| 1385 | |
1385 | |
| 1386 | } |
1386 | } |
| 1387 | |
1387 | |
| 1388 | rxvt_freecommastring (s); |
1388 | rxvt_free_strsplit (s); |
| 1389 | } |
1389 | } |
| 1390 | |
1390 | |
| 1391 | foundpet: |
1391 | foundpet: |
| 1392 | |
1392 | |
| 1393 | XFree (xim_styles); |
1393 | XFree (xim_styles); |
| … | |
… | |
| 1549 | p = rs[Rs_inputMethod]; |
1549 | p = rs[Rs_inputMethod]; |
| 1550 | if (p && *p) |
1550 | if (p && *p) |
| 1551 | { |
1551 | { |
| 1552 | bool found = false; |
1552 | bool found = false; |
| 1553 | |
1553 | |
| 1554 | s = rxvt_splitcommastring (p); |
1554 | s = rxvt_strsplit (',', p); |
| 1555 | |
1555 | |
| 1556 | for (i = 0; s[i]; i++) |
1556 | for (i = 0; s[i]; i++) |
| 1557 | { |
1557 | { |
| 1558 | if (*s[i]) |
1558 | if (*s[i]) |
| 1559 | { |
1559 | { |
| … | |
… | |
| 1565 | break; |
1565 | break; |
| 1566 | } |
1566 | } |
| 1567 | } |
1567 | } |
| 1568 | } |
1568 | } |
| 1569 | |
1569 | |
| 1570 | rxvt_freecommastring (s); |
1570 | rxvt_free_strsplit (s); |
| 1571 | |
1571 | |
| 1572 | if (found) |
1572 | if (found) |
| 1573 | goto done; |
1573 | goto done; |
| 1574 | } |
1574 | } |
| 1575 | |
1575 | |
