kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 11:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix wrong argument in checking boundaries for a rectangle

Browse Source 
some whitespace fixes


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@126448 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2008-06-29 18:50:20 +00:00
parent 7b267dcb2f
commit dc4c6733ac
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
channels/console_gui.c
View File

@@ -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);