mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

keyboard: Make debug output less verbose

Browse Source 
The keyboard is too chatty, make it use a dbg() function for logging
which defaults to disabled.

Also drop a noisy fprintf() in input_panel_configure().
This commit is contained in:
Kristian Høgsberg 2014-01-09 23:55:30 -08:00
parent 700d6ad071
commit d6d3b377f8
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
clients/keyboard.c
View File

@ -261,6 +261,19 @@ struct keyboard {
enum keyboard_state state; enum keyboard_state state;
}; };
static void __attribute__ ((format (printf, 1, 2)))
dbg(const char *fmt, ...)
{
#ifdef DEBUG
int l;
va_list argp;
va_start(argp, fmt);
l = vfprintf(stderr, fmt, argp);
va_end(argp);
#endif
}
static const char * static const char *
label_from_key(struct keyboard *keyboard, label_from_key(struct keyboard *keyboard,
const struct key *key) const struct key *key)
@ -463,14 +476,14 @@ delete_before_cursor(struct virtual_keyboard *keyboard)
const char *start, *end; const char *start, *end;
if (!keyboard->surrounding_text) { if (!keyboard->surrounding_text) {
fprintf(stderr, "delete_before_cursor: No surrounding text available\n"); dbg("delete_before_cursor: No surrounding text available\n");
return; return;
} }
start = prev_utf8_char(keyboard->surrounding_text, start = prev_utf8_char(keyboard->surrounding_text,
keyboard->surrounding_text + keyboard->surrounding_cursor); keyboard->surrounding_text + keyboard->surrounding_cursor);
if (!start) { if (!start) {
fprintf(stderr, "delete_before_cursor: No previous character to delete\n"); dbg("delete_before_cursor: No previous character to delete\n");
return; return;
} }
@ -715,7 +728,7 @@ handle_reset(void *data,
{ {
struct virtual_keyboard *keyboard = data; struct virtual_keyboard *keyboard = data;
fprintf(stderr, "Reset pre-edit buffer\n"); dbg("Reset pre-edit buffer\n");
if (strlen(keyboard->preedit_string)) { if (strlen(keyboard->preedit_string)) {
free(keyboard->preedit_string); free(keyboard->preedit_string);
@ -762,7 +775,7 @@ handle_commit_state(void *data,
layout = get_current_layout(keyboard); layout = get_current_layout(keyboard);
if (keyboard->surrounding_text) if (keyboard->surrounding_text)
fprintf(stderr, "Surrounding text updated: %s\n", keyboard->surrounding_text); dbg("Surrounding text updated: %s\n", keyboard->surrounding_text);
window_schedule_resize(keyboard->keyboard->window, window_schedule_resize(keyboard->keyboard->window,
layout->columns * key_width, layout->columns * key_width,

2
desktop-shell/input-panel.c
View File

@ -121,8 +121,6 @@ input_panel_configure(struct weston_surface *surface, int32_t sx, int32_t sy)
if (surface->width == 0) if (surface->width == 0)
return; return;
fprintf(stderr, "%s panel: %d, output: %p\n", __FUNCTION__, ip_surface->panel, ip_surface->output);
if (ip_surface->panel) { if (ip_surface->panel) {
x = get_default_view(shell->text_input.surface)->geometry.x + shell->text_input.cursor_rectangle.x2; x = get_default_view(shell->text_input.surface)->geometry.x + shell->text_input.cursor_rectangle.x2;
y = get_default_view(shell->text_input.surface)->geometry.y + shell->text_input.cursor_rectangle.y2; y = get_default_view(shell->text_input.surface)->geometry.y + shell->text_input.cursor_rectangle.y2;