sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-31 10:50:24 +03:00
Code

regedit: Improve calculation for centering dialogs.

Browse Source 
Add some sanity checks to avoid crashing.

Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
This commit is contained in:
C. Davis 2012-07-27 18:39:54 -07:00 committed by Michael Adam
parent 6155abcf82
commit 5e0f4be8e2
1 changed files with 32 additions and 10 deletions

42
source3/utils/regedit_dialog.c

@ -86,15 +86,40 @@ fail:
}
struct dialog *dialog_center_new(TALLOC_CTX *ctx, const char *title, int nlines,
int ncols, WINDOW *below)
static void center_dialog_above_window(WINDOW *below, int *nlines, int *ncols,
int *y, int *x)
{
int y, x, maxy, maxx;
int maxy, maxx;
int centery, centerx;
getmaxyx(below, maxy, maxx);
y = maxy / 2 - nlines;
x = maxx / 2 - ncols;
centery = maxy / 2;
centerx = maxx / 2;
*y = 0;
*x = 0;
if (*nlines > maxy) {
*nlines = maxy;
}
if (*ncols > maxx) {
*ncols = maxx;
}
if (*nlines < centery) {
*y = centery - *nlines;
}
if (*ncols < centerx) {
*x = centerx - *ncols;
}
}
struct dialog *dialog_center_new(TALLOC_CTX *ctx, const char *title, int nlines,
int ncols, WINDOW *below)
{
int y, x;
center_dialog_above_window(below, &nlines, &ncols, &y, &x);
return dialog_new(ctx, title, nlines, ncols, y, x);
}
@ -161,12 +186,9 @@ struct dialog *dialog_choice_center_new(TALLOC_CTX *ctx, const char *title,
const char **choices, int nlines,
int ncols, WINDOW *below)
{
int y, x, maxy, maxx;
int y, x;
getmaxyx(below, maxy, maxx);
y = maxy / 2 - nlines;
x = maxx / 2 - ncols;
center_dialog_above_window(below, &nlines, &ncols, &y, &x);
return dialog_choice_new(ctx, title, choices, nlines, ncols, y, x);
}