fcitx-0.1.3-skk-newChooseKeyType.patch 2.9 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586
  1. diff -u -r fcitx-skk-0.1.3-orig/po/fcitx-skk.pot fcitx-skk-0.1.3/po/fcitx-skk.pot
  2. --- fcitx-skk-0.1.3-orig/po/fcitx-skk.pot 2017-12-23 17:51:32.934353018 +0900
  3. +++ fcitx-skk-0.1.3/po/fcitx-skk.pot 2017-12-23 17:55:26.463522962 +0900
  4. @@ -166,3 +166,6 @@
  5. #: src/fcitx-skk.desc:61
  6. msgid "Qwerty Center Row (a,s,d,...)"
  7. msgstr ""
  8. +
  9. +msgid "Qwerty Center Row2 (asdfjkl)"
  10. +msgstr ""
  11. diff -u -r fcitx-skk-0.1.3-orig/po/ja.po fcitx-skk-0.1.3/po/ja.po
  12. --- fcitx-skk-0.1.3-orig/po/ja.po 2017-12-23 17:51:32.935353023 +0900
  13. +++ fcitx-skk-0.1.3/po/ja.po 2017-12-23 17:56:22.452225837 +0900
  14. @@ -126,6 +126,9 @@
  15. msgid "Qwerty Center Row (a,s,d,...)"
  16. msgstr "Qwertyキーボード中央行 (a,s,d,...)"
  17. +msgid "Qwerty Center Row2 (asdfjkl)"
  18. +msgstr "Qwertyキーボード中央行2 (asdfjkl)"
  19. +
  20. #: src/fcitx-skk.desc:31
  21. msgid "Return-key does not insert new line on commit"
  22. msgstr "確定時にリターンキーを押しても改行を挿入しない"
  23. diff -u -r fcitx-skk-0.1.3-orig/src/fcitx-skk.desc fcitx-skk-0.1.3/src/fcitx-skk.desc
  24. --- fcitx-skk-0.1.3-orig/src/fcitx-skk.desc 2017-12-23 17:51:32.936353029 +0900
  25. +++ fcitx-skk-0.1.3/src/fcitx-skk.desc 2017-12-23 17:52:57.678785333 +0900
  26. @@ -55,10 +55,11 @@
  27. [General/CandidateChooseKey]
  28. Type=Enum
  29. Description=Keys to Select from Candidate Window
  30. -EnumCount=3
  31. +EnumCount=4
  32. Enum0=Digit (0,1,2,...)
  33. Enum1=ABC (a,b,c,...)
  34. Enum2=Qwerty Center Row (a,s,d,...)
  35. +Enum3=Qwerty Center Row2 (asdfjkl)
  36. DefaultValue=Digit (0,1,2,...)
  37. diff -u -r fcitx-skk-0.1.3-orig/src/skk.c fcitx-skk-0.1.3/src/skk.c
  38. --- fcitx-skk-0.1.3-orig/src/skk.c 2017-12-23 17:51:32.936353029 +0900
  39. +++ fcitx-skk-0.1.3/src/skk.c 2017-12-23 18:00:27.942195779 +0900
  40. @@ -637,6 +637,9 @@
  41. case ChooseASDF:
  42. FcitxCandidateWordSetChoose(candList, ASDF_STR_CHOOSE);
  43. break;
  44. + case ChooseASDFJ:
  45. + FcitxCandidateWordSetChoose(candList, ASDFJ_STR_CHOOSE);
  46. + break;
  47. case ChooseDigit:
  48. // FALL THRU
  49. default:
  50. @@ -644,7 +647,14 @@
  51. break;
  52. }
  53. - FcitxCandidateWordSetPageSize(candList, skk->config.pageSize);
  54. + switch (skk->config.candidateChooseKey){
  55. + case ChooseASDFJ:
  56. + FcitxCandidateWordSetPageSize(candList, 7);
  57. + break;
  58. + default:
  59. + FcitxCandidateWordSetPageSize(candList, skk->config.pageSize);
  60. + break;
  61. + }
  62. FcitxCandidateWordSetLayoutHint(candList, skk->config.candidateLayout);
  63. if (skk_candidate_list_get_page_visible(skkCandList)) {
  64. diff -u -r fcitx-skk-0.1.3-orig/src/skk.h fcitx-skk-0.1.3/src/skk.h
  65. --- fcitx-skk-0.1.3-orig/src/skk.h 2017-12-23 17:51:32.937353034 +0900
  66. +++ fcitx-skk-0.1.3/src/skk.h 2017-12-23 17:54:10.771150443 +0900
  67. @@ -35,11 +35,13 @@
  68. #define ABCD_STR_CHOOSE "abcdefghij"
  69. #define ASDF_STR_CHOOSE "asdfghjkl;"
  70. +#define ASDFJ_STR_CHOOSE "asdfjkl;"
  71. typedef enum _FcitxSkkChooseKeyType {
  72. ChooseDigit,
  73. ChooseABCD,
  74. - ChooseASDF
  75. + ChooseASDF,
  76. + ChooseASDFJ
  77. } FcitxSkkChooseKeyType;
  78. typedef struct _FcitxSkkConfig {