Commit 8c98b4cac9cca42b5f4ff69f9c8d2a639ed376e7
1 parent
2529cf50
Exists in
master
and in
3 other branches
Resolvendo conflito no nome da ação "Reset"; reset de teclado passa a chamar "kybdreset"
Showing
1 changed file
with
12 additions
and
3 deletions
Show diff stats
kybd.c
... | ... | @@ -1123,8 +1123,12 @@ static void defer_unlock(H3270 *hSession) |
1123 | 1123 | ps_process(hSession); |
1124 | 1124 | } |
1125 | 1125 | |
1126 | -/* | |
1126 | +/** | |
1127 | 1127 | * Reset keyboard lock. |
1128 | + * | |
1129 | + * @param hSession Session handle. | |
1130 | + * @param explicit Explicit request from the keyboard. | |
1131 | + * | |
1128 | 1132 | */ |
1129 | 1133 | void do_reset(H3270 *hSession, Boolean explicit) |
1130 | 1134 | { |
... | ... | @@ -1132,12 +1136,16 @@ void do_reset(H3270 *hSession, Boolean explicit) |
1132 | 1136 | * If explicit (from the keyboard) and there is typeahead or |
1133 | 1137 | * a half-composed key, simply flush it. |
1134 | 1138 | */ |
1135 | - | |
1136 | 1139 | if (explicit |
1137 | 1140 | #if defined(X3270_FT) /*[*/ |
1138 | 1141 | || lib3270_get_ft_state(hSession) != LIB3270_FT_STATE_NONE |
1139 | 1142 | #endif /*]*/ |
1140 | 1143 | ) { |
1144 | + | |
1145 | + if (flush_ta(hSession)) | |
1146 | + return; | |
1147 | + | |
1148 | +/* | |
1141 | 1149 | Boolean half_reset = False; |
1142 | 1150 | |
1143 | 1151 | if (flush_ta(hSession)) |
... | ... | @@ -1145,6 +1153,7 @@ void do_reset(H3270 *hSession, Boolean explicit) |
1145 | 1153 | |
1146 | 1154 | if (half_reset) |
1147 | 1155 | return; |
1156 | +*/ | |
1148 | 1157 | } |
1149 | 1158 | |
1150 | 1159 | /* Always clear insert mode. */ |
... | ... | @@ -1185,7 +1194,7 @@ void do_reset(H3270 *hSession, Boolean explicit) |
1185 | 1194 | |
1186 | 1195 | } |
1187 | 1196 | |
1188 | -LIB3270_ACTION( reset ) | |
1197 | +LIB3270_ACTION( kybdreset ) | |
1189 | 1198 | { |
1190 | 1199 | lib3270_unselect(hSession); |
1191 | 1200 | do_reset(hSession,True); | ... | ... |