diff options
| author | Luigi Rizzo <rizzo@icir.org> | 2008-06-29 18:50:20 +0000 |
|---|---|---|
| committer | Luigi Rizzo <rizzo@icir.org> | 2008-06-29 18:50:20 +0000 |
| commit | dc4c6733ac7ae8dc13c40bf6d723a6f928436431 (patch) | |
| tree | 7798bdbcfced2abcb7814f36f0a8a39760eb3117 /channels/console_gui.c | |
| parent | 7b267dcb2f46cbb4d76a0c9e83edb015d9f57fde (diff) | |
fix wrong argument in checking boundaries for a rectangle
some whitespace fixes
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@126448 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/console_gui.c')
| -rw-r--r-- | channels/console_gui.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/channels/console_gui.c b/channels/console_gui.c index ebb2d5312..699e6b1fa 100644 --- a/channels/console_gui.c +++ b/channels/console_gui.c @@ -75,7 +75,7 @@ struct keypad_entry { /* our representation of a displayed window. SDL can only do one main * window so we map everything within that one */ -struct display_window { +struct display_window { SDL_Overlay *bmp; SDL_Rect rect; /* location of the window */ }; @@ -444,6 +444,7 @@ static void handle_mousedown(struct video_desc *env, SDL_MouseButtonEvent button case KEY_DIGIT_BACKGROUND: break; + default: ast_log(LOG_WARNING, "function not yet defined %i\n", index); } @@ -1027,7 +1028,7 @@ static int kp_match_area(const struct keypad_entry *e, int x, int y) xp = ((x - e->x0)*dx + (y - e->y0)*dy)/l; yp = (-(x - e->x0)*dy + (y - e->y0)*dx)/l; if (e->type == KP_RECT) { - ret = (xp >= 0 && xp < l && yp >=0 && yp < l); + ret = (xp >= 0 && xp < l && yp >=0 && yp < e->h); } else if (e->type == KP_CIRCLE) { dx = xp*xp/(l*l) + yp*yp/(e->h*e->h); ret = (dx < 1); |