diff options
Diffstat (limited to 'app/wlib/gtklib/window.c')
| -rw-r--r-- | app/wlib/gtklib/window.c | 1339 |
1 files changed, 661 insertions, 678 deletions
diff --git a/app/wlib/gtklib/window.c b/app/wlib/gtklib/window.c index 1468c89..b8a3cdf 100644 --- a/app/wlib/gtklib/window.c +++ b/app/wlib/gtklib/window.c @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include <stdio.h> @@ -40,11 +40,8 @@ wWin_p gtkMainW; -#define MIN_WIN_WIDTH 150 -#define MIN_WIN_HEIGHT 150 - -#define MIN_WIN_WIDTH_MAIN 400 -#define MIN_WIN_HEIGHT_MAIN 400 +#define MIN_WIN_WIDTH 50 +#define MIN_WIN_HEIGHT 50 #define SECTIONWINDOWSIZE "gtklib window size" #define SECTIONWINDOWPOS "gtklib window pos" @@ -55,6 +52,9 @@ static wControl_p firstWin = NULL, lastWin; static int keyState; static wBool_t gtkBlockEnabled = TRUE; static wBool_t maximize_at_next_show = FALSE; + +#include "../../bin/bitmaps/xtc.xpm" +static GdkPixbuf *windowIconPixbuf = NULL; /* ***************************************************************************** @@ -70,7 +70,8 @@ static wBool_t maximize_at_next_show = FALSE; * */ -static GdkRectangle getMonitorDimensions(GtkWidget * widget) { +static GdkRectangle getMonitorDimensions(GtkWidget * widget) +{ GdkRectangle monitor_dimensions; @@ -81,9 +82,10 @@ static GdkRectangle getMonitorDimensions(GtkWidget * widget) { GtkWidget * toplevel = gtk_widget_get_toplevel(widget); if (gtk_widget_is_toplevel(GTK_WIDGET(toplevel)) && - gtk_widget_get_parent_window(GTK_WIDGET(toplevel))) { + gtk_widget_get_parent_window(GTK_WIDGET(toplevel))) { - GdkWindow * window = GDK_WINDOW(gtk_widget_get_parent_window(GTK_WIDGET(toplevel))); + GdkWindow * window = GDK_WINDOW(gtk_widget_get_parent_window(GTK_WIDGET( + toplevel))); screen = gdk_window_get_screen(GDK_WINDOW(window)); @@ -113,46 +115,39 @@ static GdkRectangle getMonitorDimensions(GtkWidget * widget) { static void getWinSize(wWin_p win, const char * nameStr) { - int w=50, h=50; - const char *cp; - char *cp1, *cp2; - - - /* - * Clamp window to be no bigger than one monitor size (to start - the user can always maximize) - */ - - GdkRectangle monitor_dimensions = getMonitorDimensions(GTK_WIDGET(win->gtkwin)); - - wPos_t maxDisplayWidth = monitor_dimensions.width-10; - wPos_t maxDisplayHeight = monitor_dimensions.height-50; - - - - if ((win->option&F_RECALLSIZE) && - (win->option&F_RECALLPOS) && - (cp = wPrefGetString(SECTIONWINDOWSIZE, nameStr)) && - (w = strtod(cp, &cp1), cp != cp1) && - (h = strtod(cp1, &cp2), cp1 != cp2)) { - win->option &= ~F_AUTOSIZE; - - if (w < 50) { - w = 50; - } - - if (h < 50) { - h = 50; - } - } - - if (w > maxDisplayWidth) w = maxDisplayWidth; - if (h > maxDisplayHeight) h = maxDisplayHeight; - - if (w<MIN_WIDTH) w = MIN_WIDTH; - if (h<MIN_HEIGHT) h = MIN_HEIGHT; - - win->w = win->origX = w; - win->h = win->origY = h; + /* + * original w/h values in .origX/Y + */ + int w = win->w = win->origX; + int h = win->h = win->origY; + + /* + * Take values from Prefs if possible + */ + const char *cp; + char *cp1, *cp2; + if ((win->option&F_RESIZE) && + (win->option&F_RECALLSIZE) && + (cp = wPrefGetString(SECTIONWINDOWSIZE, nameStr)) && + (w = strtod(cp, &cp1), cp != cp1) && + (h = strtod(cp1, &cp2), cp1 != cp2)) { + win->option &= ~F_AUTOSIZE; + + /* + * Clamp window to be no bigger than one monitor size (to start - the user can always maximize) + */ + GdkRectangle monitor_dimensions = getMonitorDimensions(GTK_WIDGET(win->gtkwin)); + wWinPix_t maxDisplayWidth = monitor_dimensions.width-10; + wWinPix_t maxDisplayHeight = monitor_dimensions.height-50; + if (w > maxDisplayWidth) { w = maxDisplayWidth; } + if (h > maxDisplayHeight) { h = maxDisplayHeight; } + + if (w<MIN_WIDTH) { w = MIN_WIDTH; } + if (h<MIN_HEIGHT) { h = MIN_HEIGHT; } + + win->w = win->origX = w; + win->h = win->origY = h; + } } @@ -166,14 +161,14 @@ static void getWinSize(wWin_p win, const char * nameStr) static void saveSize(wWin_p win) { - if ((win->option&F_RECALLSIZE) && - gtk_widget_get_visible(GTK_WIDGET(win->gtkwin))) { - char pos_s[20]; + if ((win->option&F_RECALLSIZE) && + gtk_widget_get_visible(GTK_WIDGET(win->gtkwin))) { + char pos_s[32]; - sprintf(pos_s, "%d %d", win->w, - win->h-(BORDERSIZE + ((win->option&F_MENUBAR)?MENUH:0))); - wPrefSetString(SECTIONWINDOWSIZE, win->nameStr, pos_s); - } + sprintf(pos_s, "%ld %ld", win->w, + (win->h-(BORDERSIZE + ((win->option&F_MENUBAR)?MENUH:0)))); + wPrefSetString(SECTIONWINDOWSIZE, win->nameStr, pos_s); + } } /** @@ -185,47 +180,46 @@ static void saveSize(wWin_p win) static void getPos(wWin_p win) { - char *cp1, *cp2; - GdkRectangle monitor_dimensions = getMonitorDimensions(GTK_WIDGET(win->gtkwin)); + char *cp1, *cp2; + GdkRectangle monitor_dimensions = getMonitorDimensions(GTK_WIDGET(win->gtkwin)); - if ((win->option&F_RECALLPOS) && (!win->shown)) { - const char *cp; + if ((win->option&F_RECALLPOS) && (!win->shown)) { + const char *cp; - if ((cp = wPrefGetString(SECTIONWINDOWPOS, win->nameStr))) { - int x, y; + if ((cp = wPrefGetString(SECTIONWINDOWPOS, win->nameStr))) { + int x, y; - x = strtod(cp, &cp1); + x = strtod(cp, &cp1); - if (cp == cp1) { - return; - } + if (cp == cp1) { + return; + } - y = strtod(cp1, &cp2); + y = strtod(cp1, &cp2); - if (cp2 == cp1) { - return; - } + if (cp2 == cp1) { + return; + } - if (y > monitor_dimensions.height+monitor_dimensions.y-win->h) { - y = monitor_dimensions.height+monitor_dimensions.y-win->h; - } + if (y > monitor_dimensions.height+monitor_dimensions.y-win->h) { + y = monitor_dimensions.height+monitor_dimensions.y-win->h; + } - if (x > monitor_dimensions.width+monitor_dimensions.x-win->w) { - x = monitor_dimensions.width+monitor_dimensions.x-win->w; - } + if (x > monitor_dimensions.width+monitor_dimensions.x-win->w) { + x = monitor_dimensions.width+monitor_dimensions.x-win->w; + } - if (x <= 0) { - x = 1; - } + if (x <= 0) { + x = 1; + } - if (y <= 0) { - y = 1; - } + if (y <= 0) { + y = 1; + } - gtk_window_move(GTK_WINDOW(win->gtkwin), x, y); - //gtk_window_resize(GTK_WINDOW(win->gtkwin), win->w, win->h); - } - } + gtk_window_move(GTK_WINDOW(win->gtkwin), x, y); + } + } } /** @@ -237,17 +231,17 @@ static void getPos(wWin_p win) static void savePos(wWin_p win) { - int x, y; + int x, y; - if ((win->option&F_RECALLPOS)) { - char pos_s[20]; + if ((win->option&F_RECALLPOS)) { + char pos_s[32]; - gdk_window_get_position(gtk_widget_get_window(GTK_WIDGET(win->gtkwin)), &x, &y); - x -= 5; - y -= 25; - sprintf(pos_s, "%d %d", x, y); - wPrefSetString(SECTIONWINDOWPOS, win->nameStr, pos_s); - } + gdk_window_get_position(gtk_widget_get_window(GTK_WIDGET(win->gtkwin)), &x, &y); + x -= 5; + y -= 25; + sprintf(pos_s, "%d %d", x, y); + wPrefSetString(SECTIONWINDOWPOS, win->nameStr, pos_s); + } } /** @@ -259,28 +253,17 @@ static void savePos(wWin_p win) */ void wWinGetSize( - wWin_p win, /* Window */ - wPos_t * width, /* Returned window width */ - wPos_t * height) /* Returned window height */ + wWin_p win, /* Window */ + wWinPix_t * width, /* Returned window width */ + wWinPix_t * height) /* Returned window height */ { - GtkRequisition requisition; - wPos_t w, h; - gtk_widget_size_request(win->gtkwin, &requisition); - w = win->w; - h = win->h; - - if (win->option&F_AUTOSIZE) { - if (win->realX > w) { - w = win->realX; - } - - if (win->realY > h) { - h = win->realY; - } - } - - *width = w; - *height = h - BORDERSIZE - ((win->option&F_MENUBAR)?win->menu_height:0); + GtkRequisition requisition; + wWinPix_t w, h; + gtk_widget_size_request(win->gtkwin, &requisition); + w = win->w; + h = win->h; + *width = w; + *height = h - BORDERSIZE - ((win->option&F_MENUBAR)?win->menu_height:0); } /** @@ -292,24 +275,23 @@ void wWinGetSize( */ void wWinSetSize( - wWin_p win, /* Window */ - wPos_t width, /* Window width */ - wPos_t height) /* Window height */ + wWin_p win, /* Window */ + wWinPix_t width, /* Window width */ + wWinPix_t height) /* Window height */ { - win->busy = TRUE; - win->w = width; - win->h = height + BORDERSIZE + ((win->option&F_MENUBAR)?MENUH:0); - if (win->option&F_RESIZE) { - gtk_window_resize(GTK_WINDOW(win->gtkwin), win->w, win->h); - gtk_widget_set_size_request(win->widget, win->w-10, win->h-10); - } - else { - gtk_widget_set_size_request(win->gtkwin, win->w, win->h); - gtk_widget_set_size_request(win->widget, win->w, win->h); - } - - - win->busy = FALSE; + win->busy = TRUE; + win->w = width; + win->h = height + BORDERSIZE + ((win->option&F_MENUBAR)?MENUH:0); + if (win->option&F_RESIZE) { + gtk_window_resize(GTK_WINDOW(win->gtkwin), win->w, win->h); + gtk_widget_set_size_request(win->widget, win->w-10, win->h-10); + } else { + gtk_widget_set_size_request(win->gtkwin, win->w, win->h); + gtk_widget_set_size_request(win->widget, win->w, win->h); + } + + + win->busy = FALSE; } /** @@ -322,93 +304,93 @@ void wWinSetSize( */ void wWinShow( - wWin_p win, /* Window */ - wBool_t show) /* Command */ + wWin_p win, /* Window */ + wBool_t show) /* Command */ { - //GtkRequisition min_req, pref_req; + //GtkRequisition min_req, pref_req; - if (debugWindow >= 2) { - printf("Set Show %s\n", win->labelStr?win->labelStr:"No label"); - } + if (debugWindow >= 2) { + printf("Set Show %s\n", win->labelStr?win->labelStr:"No label"); + } - if (win->widget == 0) { - abort(); - } + if (win->widget == 0) { + abort(); + } - int width, height; + int width, height; - if (show) { - keyState = 0; - getPos(win); + if (show) { + keyState = 0; + getPos(win); - if (!win->shown) { + if (!win->shown) { gtk_widget_show(win->gtkwin); gtk_widget_show(win->widget); } - if (win->option & F_AUTOSIZE) { - GtkAllocation allocation; - GtkRequisition requistion; - gtk_widget_size_request(win->widget,&requistion); + if (win->option & F_AUTOSIZE) { + GtkAllocation allocation; + GtkRequisition requistion; + gtk_widget_size_request(win->widget,&requistion); - width = win->w; - height = win->h; + width = win->w; + height = win->h; - if (requistion.width != width || requistion.height != height ) { + if (requistion.width != width || requistion.height != height ) { width = requistion.width; height = requistion.height; - win->w = width; - win->h = height; + win->w = width; + win->h = height; - gtk_window_set_resizable(GTK_WINDOW(win->gtkwin),TRUE); + gtk_window_set_resizable(GTK_WINDOW(win->gtkwin),TRUE); - if (win->option&F_MENUBAR) { - gtk_widget_set_size_request(win->menubar, win->w-20, MENUH); + if (win->option&F_MENUBAR) { + gtk_widget_set_size_request(win->menubar, win->w-20, MENUH); - gtk_widget_get_allocation(win->menubar, &allocation); - win->menu_height = allocation.height; - } - } - gtk_window_resize(GTK_WINDOW(win->gtkwin), width+10, height+10); - } + gtk_widget_get_allocation(win->menubar, &allocation); + win->menu_height = allocation.height; + } + } + gtk_window_resize(GTK_WINDOW(win->gtkwin), width+10, height+10); + } - gtk_window_present(GTK_WINDOW(win->gtkwin)); + gtk_window_present(GTK_WINDOW(win->gtkwin)); - gdk_window_raise(gtk_widget_get_window(win->gtkwin)); + gdk_window_raise(gtk_widget_get_window(win->gtkwin)); - if (win->shown && win->modalLevel > 0) { - gtk_widget_set_sensitive(GTK_WIDGET(win->gtkwin), TRUE); - } + if (win->shown && win->modalLevel > 0) { + gtk_widget_set_sensitive(GTK_WIDGET(win->gtkwin), TRUE); + } - win->shown = show; - win->modalLevel = 0; + win->shown = show; + win->modalLevel = 0; - if ((!gtkBlockEnabled) || (win->option & F_BLOCK) == 0) { - wFlush(); - } else { - wlibDoModal(win, TRUE); - } - if (maximize_at_next_show) { - gtk_window_maximize(GTK_WINDOW(win->gtkwin)); - maximize_at_next_show = FALSE; - } - } else { - wFlush(); - saveSize(win); - savePos(win); - win->shown = show; + if ((!gtkBlockEnabled) || (win->option & F_BLOCK) == 0) { + wFlush(); + } else { + wlibDoModal(win, TRUE); + } + if (maximize_at_next_show) { + gtk_window_maximize(GTK_WINDOW(win->gtkwin)); + maximize_at_next_show = FALSE; + } + } else { + wFlush(); + saveSize(win); + savePos(win); + win->shown = show; - if (gtkBlockEnabled && (win->option & F_BLOCK) != 0) { - wlibDoModal(win, FALSE); - } + if (gtkBlockEnabled && (win->option & F_BLOCK) != 0) { + wlibDoModal(win, FALSE); + } - gtk_widget_hide(win->gtkwin); - gtk_widget_hide(win->widget); - } + gtk_widget_hide(win->gtkwin); + gtk_widget_hide(win->widget); + } } /** @@ -418,9 +400,9 @@ void wWinShow( */ void wWinBlockEnable( - wBool_t enabled) + wBool_t enabled) { - gtkBlockEnabled = enabled; + gtkBlockEnabled = enabled; } /** @@ -431,9 +413,9 @@ void wWinBlockEnable( */ wBool_t wWinIsVisible( - wWin_p win) + wWin_p win) { - return win->shown; + return win->shown; } /** @@ -445,7 +427,7 @@ wBool_t wWinIsVisible( wBool_t wWinIsMaximized(wWin_p win) { - return win->maximize_initially; + return win->maximize_initially; } /** @@ -456,10 +438,10 @@ wBool_t wWinIsMaximized(wWin_p win) */ void wWinSetTitle( - wWin_p win, /* Window */ - const char * title) /* New title */ + wWin_p win, /* Window */ + const char * title) /* New title */ { - gtk_window_set_title(GTK_WINDOW(win->gtkwin), title); + gtk_window_set_title(GTK_WINDOW(win->gtkwin), title); } /** @@ -470,28 +452,28 @@ void wWinSetTitle( */ void wWinSetBusy( - wWin_p win, /* Window */ - wBool_t busy) /* Command */ + wWin_p win, /* Window */ + wBool_t busy) /* Command */ { - GdkCursor * cursor; + GdkCursor * cursor; - if (win->gtkwin == 0) { - abort(); - } + if (win->gtkwin == 0) { + abort(); + } - if (busy) { - cursor = gdk_cursor_new(GDK_WATCH); - } else { - cursor = NULL; - } + if (busy) { + cursor = gdk_cursor_new(GDK_WATCH); + } else { + cursor = NULL; + } - gdk_window_set_cursor(gtk_widget_get_window(win->gtkwin), cursor); + gdk_window_set_cursor(gtk_widget_get_window(win->gtkwin), cursor); - if (cursor) { - gdk_cursor_unref(cursor); - } + if (cursor) { + gdk_cursor_unref(cursor); + } - gtk_widget_set_sensitive(GTK_WIDGET(win->gtkwin), busy==0); + gtk_widget_set_sensitive(GTK_WIDGET(win->gtkwin), busy==0); } /** @@ -507,42 +489,42 @@ void wWinSetBusy( */ void wlibDoModal( - wWin_p win0, - wBool_t modal) + wWin_p win0, + wBool_t modal) { - wWin_p win; - - for (win=(wWin_p)firstWin; win; win=(wWin_p)win->next) { - if (win->shown && win != win0) { - if (modal) { - if (win->modalLevel == 0) { - gtk_widget_set_sensitive(GTK_WIDGET(win->gtkwin), FALSE); - } - - win->modalLevel++; - } else { - if (win->modalLevel > 0) { - win->modalLevel--; - - if (win->modalLevel == 0) { - gtk_widget_set_sensitive(GTK_WIDGET(win->gtkwin), TRUE); - } - } - } - - if (win->modalLevel < 0) { - fprintf(stderr, "DoModal: %s modalLevel < 0", - win->nameStr?win->nameStr:"<NULL>"); - abort(); - } - } - } - - if (modal) { - gtk_main(); - } else { - gtk_main_quit(); - } + wWin_p win; + + for (win=(wWin_p)firstWin; win; win=(wWin_p)win->next) { + if (win->shown && win != win0) { + if (modal) { + if (win->modalLevel == 0) { + gtk_widget_set_sensitive(GTK_WIDGET(win->gtkwin), FALSE); + } + + win->modalLevel++; + } else { + if (win->modalLevel > 0) { + win->modalLevel--; + + if (win->modalLevel == 0) { + gtk_widget_set_sensitive(GTK_WIDGET(win->gtkwin), TRUE); + } + } + } + + if (win->modalLevel < 0) { + fprintf(stderr, "DoModal: %s modalLevel < 0", + win->nameStr?win->nameStr:"<NULL>"); + abort(); + } + } + } + + if (modal) { + gtk_main(); + } else { + gtk_main_quit(); + } } /** @@ -553,32 +535,32 @@ void wlibDoModal( */ const char * wWinGetTitle( - wWin_p win) /* Window */ + wWin_p win) /* Window */ { - return win->labelStr; + return win->labelStr; } void wWinClear( - wWin_p win, - wPos_t x, - wPos_t y, - wPos_t width, - wPos_t height) + wWin_p win, + wWinPix_t x, + wWinPix_t y, + wWinPix_t width, + wWinPix_t height) { } void wWinDoCancel( - wWin_p win) + wWin_p win) { - wControl_p b; + wControl_p b; - for (b=win->first; b; b=b->next) { - if ((b->type == B_BUTTON) && (b->option & BB_CANCEL)) { - wlibButtonDoAction((wButton_p)b); - } - } + for (b=win->first; b; b=b->next) { + if ((b->type == B_BUTTON) && (b->option & BB_CANCEL)) { + wlibButtonDoAction((wButton_p)b); + } + } } /* @@ -590,155 +572,161 @@ void wWinDoCancel( */ static int window_redraw( - wWin_p win, - wBool_t doWinProc) + wWin_p win, + wBool_t doWinProc) { - wControl_p b; + wControl_p b; - if (win==NULL) { - return FALSE; - } + if (win==NULL) { + return FALSE; + } - for (b=win->first; b != NULL; b = b->next) { - if (b->repaintProc) { - b->repaintProc(b); - } - } + for (b=win->first; b != NULL; b = b->next) { + if (b->repaintProc) { + b->repaintProc(b); + } + } - return FALSE; + return FALSE; } static gint window_delete_event( - GtkWidget *widget, - GdkEvent *event, - wWin_p win) + GtkWidget *widget, + GdkEvent *event, + wWin_p win) { - wControl_p b; - /* if you return FALSE in the "delete_event" signal handler, - * GTK will emit the "destroy" signal. Returning TRUE means - * you don't want the window to be destroyed. - * This is useful for popping up 'are you sure you want to quit ?' - * type dialogs. */ - - /* Change TRUE to FALSE and the main window will be destroyed with - * a "delete_event". */ - - for (b = win->first; b; b=b->next) - if (b->doneProc) { - b->doneProc(b); - } - - if (win->winProc) { - win->winProc(win, wClose_e, NULL, win->data); - - if (win != gtkMainW) { - wWinShow(win, FALSE); - } - } - - return (TRUE); + wControl_p b; + /* if you return FALSE in the "delete_event" signal handler, + * GTK will emit the "destroy" signal. Returning TRUE means + * you don't want the window to be destroyed. + * This is useful for popping up 'are you sure you want to quit ?' + * type dialogs. */ + + /* Change TRUE to FALSE and the main window will be destroyed with + * a "delete_event". */ + + for (b = win->first; b; b=b->next) + if (b->doneProc) { + b->doneProc(b); + } + + if (win->winProc) { + win->winProc(win, wClose_e, NULL, win->data); + + if (win != gtkMainW) { + wWinShow(win, FALSE); + } + } + + return (TRUE); } static int fixed_expose_event( - GtkWidget * widget, - GdkEventExpose * event, - wWin_p win) + GtkWidget * widget, + GdkEventExpose * event, + wWin_p win) { int rc; - if (event->count==0) { - rc = window_redraw(win, TRUE); - } else { - rc = FALSE; - } - cairo_t* cr = gdk_cairo_create (gtk_widget_get_window(widget)); -#ifdef CURSOR_SURFACE - if (win && win->cursor_surface.surface && win->cursor_surface.show) { - cairo_set_source_surface(cr,win->cursor_surface.surface,event->area.x, event->area.y); - cairo_set_operator(cr,CAIRO_OPERATOR_OVER); - cairo_rectangle(cr,event->area.x, event->area.y, - event->area.width, event->area.height); - cairo_fill(cr); + if (event->count==0) { + rc = window_redraw(win, TRUE); + } else { + rc = FALSE; } -#endif - return rc; + return rc; } -static int resizeTime(wWin_p win) { +static int resizeTime(wWin_p win) +{ - if (win->resizeW == win->w && win->resizeH == win->h) { // If hasn't changed since last + if (debugWindow >= 2) { + printf( "resizeTime idleCnt %d, busyCnt %d [%d %d] [%ld %ld]\n", + win->timer_idle_count, win->timer_busy_count, + win->resizeW, win->resizeH, win->w, win->h ); + } + if (win->resizeW == win->w + && win->resizeH == win->h) { // If hasn't changed since last if (win->timer_idle_count>3) { - win->winProc(win, wResize_e, NULL, win->data); //Trigger Redraw on last occasion if one-third of a second has elapsed + win->winProc(win, wResize_e, NULL, + win->data); //Trigger Redraw on last occasion if one-third of a second has elapsed win->timer_idle_count = 0; win->resizeTimer = 0; win->timer_busy_count = 0; return FALSE; //Stop Timer and don't resize - } else win->timer_idle_count++; + } else { win->timer_idle_count++; } } if (win->busy==FALSE && win->winProc) { //Always drive once if (win->timer_busy_count>10) { - win->winProc(win, wResize_e, NULL, win->data); //Redraw if ten times we saw a change (1 sec) - win->timer_busy_count = 0; + win->winProc(win, wResize_e, NULL, + win->data); //Redraw if ten times we saw a change (1 sec) + win->timer_busy_count = 0; } else { win->winProc(win, wResize_e, (void*) 1, win->data); //No Redraw win->timer_busy_count++; } - win->resizeW = win->w; //Remember this one - win->resizeH = win->h; + win->resizeW = win->w; //Remember this one + win->resizeH = win->h; } return TRUE; //Will redrive after another timer interval } static int window_configure_event( - GtkWidget * widget, - GdkEventConfigure * event, - wWin_p win) + GtkWidget * widget, + GdkEventConfigure * event, + wWin_p win) { - if (win==NULL) { - return FALSE; - } - - if (win->option&F_RESIZE) { - if (event->width < 10 || event->height < 10) { - return TRUE; - } - int w = win->w; - int h = win->h; - - - if (win->w != event->width || win->h != event->height) { - win->w = event->width; - win->h = event->height; - - if (win->w < MIN_WIN_WIDTH) { - win->w = MIN_WIN_WIDTH; - } - - if (win->h < MIN_WIN_HEIGHT) { - win->h = MIN_WIN_HEIGHT; - } - - if (win->option&F_MENUBAR) { - GtkAllocation allocation; - gtk_widget_get_allocation(win->menubar, &allocation); - win->menu_height= allocation.height; - gtk_widget_set_size_request(win->menubar, win->w-20, win->menu_height); - } - if (win->resizeTimer) { // Already have a timer - return FALSE; - } else { - win->resizeW = w; //Remember where this started - win->resizeH = h; - win->timer_idle_count = 0; //Start background timer on redraw - win->timer_busy_count = 0; - win->resizeTimer = g_timeout_add(100,(GSourceFunc)resizeTime,win); // 100ms delay - return FALSE; - } - } - } - - return FALSE; + if (win==NULL) { + return FALSE; + } + + if (debugWindow >= 2) { + printf( "config/resize: [%d %d]\n", event->width, event->height ); + } + if (win->option&F_RESIZE) { + if (event->width < 10 || event->height < 10) { + return TRUE; + } + int w = win->w; + int h = win->h; + + + if (win->w != event->width || win->h != event->height) { + if (debugWindow >= 2) { + printf( " Update [%ld %ld]\n", event->width-win->w, event->height-win->h ); + } + win->w = event->width; + win->h = event->height; + + if (win->w < MIN_WIN_WIDTH) { + win->w = MIN_WIN_WIDTH; + } + + if (win->h < MIN_WIN_HEIGHT) { + win->h = MIN_WIN_HEIGHT; + } + + if (win->option&F_MENUBAR) { + GtkAllocation allocation; + gtk_widget_get_allocation(win->menubar, &allocation); + win->menu_height= allocation.height; + gtk_widget_set_size_request(win->menubar, win->w-20, win->menu_height); + } + if (win->resizeTimer) { // Already have a timer + return FALSE; + } else { + win->resizeW = w; //Remember where this started + win->resizeH = h; + win->timer_idle_count = 0; //Start background timer on redraw + win->timer_busy_count = 0; + win->resizeTimer = g_timeout_add(100,(GSourceFunc)resizeTime, + win); // 100ms delay + return FALSE; + } + } + } + + return FALSE; } /** @@ -753,25 +741,25 @@ static int window_configure_event( */ gboolean window_state_event( - GtkWidget *widget, - GdkEventWindowState *event, - wWin_p win) + GtkWidget *widget, + GdkEventWindowState *event, + wWin_p win) { - if (!win) { - return (FALSE); - } + if (!win) { + return (FALSE); + } - win->maximize_initially = FALSE; + win->maximize_initially = FALSE; - if (event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED) { - win->maximize_initially = TRUE; - } + if (event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED) { + win->maximize_initially = TRUE; + } - if (win->busy==FALSE && win->winProc) { - win->winProc(win, wState_e, NULL, win->data); - } + if (win->busy==FALSE && win->winProc) { + win->winProc(win, wState_e, NULL, win->data); + } - return TRUE; + return TRUE; } /** * Get current state of shift, ctrl or alt keys. @@ -781,87 +769,90 @@ gboolean window_state_event( int wGetKeyState(void) { - return keyState; + return keyState; } wBool_t catch_shift_ctrl_alt_keys( - GtkWidget * widget, - GdkEventKey *event, - void * data) + GtkWidget * widget, + GdkEventKey *event, + void * data) { - int state = 0; - switch (event->keyval ) { - case GDK_KEY_Shift_L: - case GDK_KEY_Shift_R: - state |= WKEY_SHIFT; - break; - - case GDK_KEY_Control_L: - case GDK_KEY_Control_R: - state |= WKEY_CTRL; - break; - - case GDK_KEY_Alt_L: - case GDK_KEY_Alt_R: - state |= WKEY_ALT; - break; - - case GDK_KEY_Meta_L: - case GDK_KEY_Meta_R: - // Pressing SHIFT and then ALT generates a Meta key - //printf( "Meta\n" ); - state |= WKEY_ALT; - break; - } - - if (state != 0) { - if (event->type == GDK_KEY_PRESS) { - keyState |= state; - } else { - keyState &= ~state; - } - return TRUE; - } - return FALSE; + int state = 0; + switch (event->keyval ) { + case GDK_KEY_Shift_L: + case GDK_KEY_Shift_R: + state |= WKEY_SHIFT; + break; + + case GDK_KEY_Control_L: + case GDK_KEY_Control_R: + state |= WKEY_CTRL; + break; + + case GDK_KEY_Alt_L: + case GDK_KEY_Alt_R: + state |= WKEY_ALT; + break; + + case GDK_KEY_Meta_L: + case GDK_KEY_Meta_R: + // Pressing SHIFT and then ALT generates a Meta key + //printf( "Meta\n" ); + state |= WKEY_ALT; + break; + } + + if (state != 0) { + if (event->type == GDK_KEY_PRESS) { + keyState |= state; + } else { + keyState &= ~state; + } + return TRUE; + } + return FALSE; } static gint window_char_event( - GtkWidget * widget, - GdkEventKey *event, - wWin_p win) + GtkWidget * widget, + GdkEventKey *event, + wWin_p win) { - wControl_p bb; - - if (catch_shift_ctrl_alt_keys(widget, event, win)) { - return FALSE; - } - - if (event->type == GDK_KEY_RELEASE) { - return FALSE; - } - - if ( ( event->state & GDK_MODIFIER_MASK ) == 0 ) { - if (event->keyval == GDK_KEY_Escape) { - for (bb=win->first; bb; bb=bb->next) { - if (bb->type == B_BUTTON && (bb->option&BB_CANCEL)) { - wlibButtonDoAction((wButton_p)bb); - return TRUE; - } - } - } - } - - if (wlibHandleAccelKey(event)) { - return TRUE; - } else { - return FALSE; - } + wControl_p bb; + + if (catch_shift_ctrl_alt_keys(widget, event, win)) { + return FALSE; + } + + if (event->type == GDK_KEY_RELEASE) { + return FALSE; + } + + if ( ( event->state & GDK_MODIFIER_MASK ) == 0 ) { + if (event->keyval == GDK_KEY_Escape) { + for (bb=win->first; bb; bb=bb->next) { + if (bb->type == B_BUTTON && (bb->option&BB_CANCEL)) { + wlibButtonDoAction((wButton_p)bb); + return TRUE; + } + } + } + } + + if (wlibHandleAccelKey(event)) { + return TRUE; + } else { + return FALSE; + } } -void wSetGeometry(wWin_p win, int min_width, int max_width, int min_height, int max_height, int base_width, int base_height, double aspect_ratio ) { +void wSetGeometry(wWin_p win, wWinPix_t min_width, wWinPix_t max_width, + wWinPix_t min_height, wWinPix_t max_height, wWinPix_t base_width, + wWinPix_t base_height, double aspect_ratio ) +{ GdkGeometry hints; GdkWindowHints hintMask = GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE; - hints.min_width = min_width; + hints.min_width = min_width; hints.max_width = max_width; hints.min_height = min_height; hints.max_height = max_height; @@ -871,16 +862,16 @@ void wSetGeometry(wWin_p win, int min_width, int max_width, int min_height, int if( base_width != -1 && base_height != -1 ) { hintMask |= GDK_HINT_BASE_SIZE; } - + if(aspect_ratio > -1.0 ) { hintMask |= GDK_HINT_ASPECT; - } + } gtk_window_set_geometry_hints( - GTK_WINDOW(win->gtkwin), - win->gtkwin, - &hints, - hintMask); + GTK_WINDOW(win->gtkwin), + win->gtkwin, + &hints, + hintMask); } @@ -911,166 +902,158 @@ void wSetGeometry(wWin_p win, int min_width, int max_width, int min_height, int */ static wWin_p wWinCommonCreate( - wWin_p parent, - int winType, - wPos_t x, - wPos_t y, - const char * labelStr, - const char * nameStr, - long option, - wWinCallBack_p winProc, - void * data) + wWin_p parent, + int winType, + wWinPix_t x, + wWinPix_t y, + const char * labelStr, + const char * nameStr, + long option, + wWinCallBack_p winProc, + void * data) { - wWin_p w; - int h; - w = wlibAlloc(NULL, winType, x, y, labelStr, sizeof *w, data); - w->busy = TRUE; - w->option = option; + wWin_p w; + int h; + w = wlibAlloc(NULL, winType, x, y, labelStr, sizeof *w, data); + w->busy = TRUE; + w->option = option; w->resizeTimer = 0; - h = BORDERSIZE; - - if (w->option&F_MENUBAR) { - h += MENUH; - } - - if (winType == W_MAIN) { - w->gtkwin = gtk_window_new(GTK_WINDOW_TOPLEVEL); - } else { - w->gtkwin = gtk_window_new(GTK_WINDOW_TOPLEVEL); - - if (gtkMainW) { - if (!(w->option&F_NOTTRANSIENT)) - gtk_window_set_transient_for(GTK_WINDOW(w->gtkwin), - GTK_WINDOW(gtkMainW->gtkwin)); - } - } - getWinSize(w, nameStr); - if (winType != W_MAIN) { - gtk_widget_set_app_paintable (w->gtkwin,TRUE); - } - - if (option & F_HIDE) { - gtk_widget_hide(w->gtkwin); - } - - /* center window on top of parent window */ - if (option & F_CENTER) { - gtk_window_set_position(GTK_WINDOW(w->gtkwin), GTK_WIN_POS_CENTER_ON_PARENT); - } - - - w->widget = gtk_fixed_new(); - - if (w->widget == 0) { - abort(); - } - - if (w->option&F_MENUBAR) { - w->menubar = gtk_menu_bar_new(); - gtk_container_add(GTK_CONTAINER(w->widget), w->menubar); - gtk_widget_show(w->menubar); - GtkAllocation allocation; - gtk_widget_get_allocation(w->menubar, &allocation); - w->menu_height = allocation.height; - gtk_widget_set_size_request(w->menubar, -1, w->menu_height); - } - - gtk_container_add(GTK_CONTAINER(w->gtkwin), w->widget); - - - - - if (w->option&F_AUTOSIZE) { - w->realX = 0; - w->w = MIN_WIN_WIDTH+20; - w->realY = h; - w->h = MIN_WIN_HEIGHT; - } else if (w->origX != 0){ - w->realX = w->origX; - w->realY = w->origY+h; - - w->default_size_x = w->w; - w->default_size_y = w->h; - //gtk_widget_set_size_request(w->widget, w->w-20, w->h); - - if (w->option&F_MENUBAR) { - gtk_widget_set_size_request(w->menubar, w->w-20, MENUH); - } - } - int scr_w, scr_h; - wGetDisplaySize(&scr_w, &scr_h); - if (scr_w < MIN_WIN_WIDTH) scr_w = MIN_WIN_WIDTH+10; - if (scr_h < MIN_WIN_HEIGHT) scr_h = MIN_WIN_HEIGHT; + h = BORDERSIZE; + + if (w->option&F_MENUBAR) { + h += MENUH; + } + + if (winType == W_MAIN) { + w->gtkwin = gtk_window_new(GTK_WINDOW_TOPLEVEL); + } else { + w->gtkwin = gtk_window_new(GTK_WINDOW_TOPLEVEL); + + if (gtkMainW) { + if (!(w->option&F_NOTTRANSIENT)) + gtk_window_set_transient_for(GTK_WINDOW(w->gtkwin), + GTK_WINDOW(gtkMainW->gtkwin)); + } + } + getWinSize(w, nameStr); if (winType != W_MAIN) { - wSetGeometry(w, MIN_WIN_WIDTH, scr_w-10, MIN_WIN_HEIGHT, scr_h, -1, -1, -1); + gtk_widget_set_app_paintable (w->gtkwin,TRUE); + } + + if (option & F_HIDE) { + gtk_widget_hide(w->gtkwin); + } + + /* center window on top of parent window */ + if (option & F_CENTER) { + gtk_window_set_position(GTK_WINDOW(w->gtkwin), GTK_WIN_POS_CENTER_ON_PARENT); + } + + + w->widget = gtk_fixed_new(); + + if (w->widget == 0) { + abort(); + } + + if (w->option&F_MENUBAR) { + w->menubar = gtk_menu_bar_new(); + gtk_container_add(GTK_CONTAINER(w->widget), w->menubar); + gtk_widget_show(w->menubar); + GtkAllocation allocation; + gtk_widget_get_allocation(w->menubar, &allocation); + w->menu_height = allocation.height; + gtk_widget_set_size_request(w->menubar, -1, w->menu_height); + } + + gtk_container_add(GTK_CONTAINER(w->gtkwin), w->widget); + + + + + if (w->option&F_AUTOSIZE) { + w->realX = 0; + w->w = 0; + w->realY = h; + w->h = 0; + } else if (w->origX != 0) { + w->realX = w->origX; + w->realY = w->origY+h; + + //gtk_widget_set_size_request(w->widget, w->w-20, w->h); + + if (w->option&F_MENUBAR) { + gtk_widget_set_size_request(w->menubar, w->w-20, MENUH); + } + } + + w->first = w->last = NULL; + w->winProc = winProc; + g_signal_connect(GTK_OBJECT(w->gtkwin), "delete_event", + G_CALLBACK(window_delete_event), w); + g_signal_connect(GTK_OBJECT(w->widget), "expose_event", + G_CALLBACK(fixed_expose_event), w); + g_signal_connect(GTK_OBJECT(w->gtkwin), "configure_event", + G_CALLBACK(window_configure_event), w); + g_signal_connect(GTK_OBJECT(w->gtkwin), "window-state-event", + G_CALLBACK(window_state_event), w); + g_signal_connect(GTK_OBJECT(w->gtkwin), "key_press_event", + G_CALLBACK(window_char_event), w); + g_signal_connect(GTK_OBJECT(w->gtkwin), "key_release_event", + G_CALLBACK(window_char_event), w); + gtk_widget_set_events(w->widget, GDK_EXPOSURE_MASK); + gtk_widget_set_events(GTK_WIDGET(w->gtkwin), + GDK_EXPOSURE_MASK|GDK_KEY_PRESS_MASK|GDK_KEY_RELEASE_MASK); + + if (w->option & F_RESIZE) { + gtk_window_set_resizable(GTK_WINDOW(w->gtkwin), TRUE); + if ( ( w->option & F_AUTOSIZE ) == 0 ) { + gtk_window_resize(GTK_WINDOW(w->gtkwin), w->w, w->h); + } } else { - if (scr_w < MIN_WIN_WIDTH_MAIN+10) scr_w = MIN_WIN_WIDTH_MAIN+200; - if (scr_h < MIN_WIN_HEIGHT_MAIN+10) scr_h = MIN_WIN_HEIGHT_MAIN+200; - wSetGeometry(w, MIN_WIN_WIDTH_MAIN, scr_w-10, MIN_WIN_HEIGHT_MAIN, scr_h-10, -1, -1, -1); - } - - - - w->first = w->last = NULL; - w->winProc = winProc; - g_signal_connect(GTK_OBJECT(w->gtkwin), "delete_event", - G_CALLBACK(window_delete_event), w); - g_signal_connect(GTK_OBJECT(w->widget), "expose_event", - G_CALLBACK(fixed_expose_event), w); - g_signal_connect(GTK_OBJECT(w->gtkwin), "configure_event", - G_CALLBACK(window_configure_event), w); - g_signal_connect(GTK_OBJECT(w->gtkwin), "window-state-event", - G_CALLBACK(window_state_event), w); - g_signal_connect(GTK_OBJECT(w->gtkwin), "key_press_event", - G_CALLBACK(window_char_event), w); - g_signal_connect(GTK_OBJECT(w->gtkwin), "key_release_event", - G_CALLBACK(window_char_event), w); - gtk_widget_set_events(w->widget, GDK_EXPOSURE_MASK); - gtk_widget_set_events(GTK_WIDGET(w->gtkwin), - GDK_EXPOSURE_MASK|GDK_KEY_PRESS_MASK|GDK_KEY_RELEASE_MASK); - - if (w->option & F_RESIZE) { - gtk_window_set_resizable(GTK_WINDOW(w->gtkwin), TRUE); - gtk_window_resize(GTK_WINDOW(w->gtkwin), w->w, w->h); - } else { - gtk_window_set_resizable(GTK_WINDOW(w->gtkwin), FALSE); - } - - w->lastX = 0; - w->lastY = h; - w->shown = FALSE; - w->nameStr = nameStr?strdup(nameStr):NULL; - - if (labelStr) { - gtk_window_set_title(GTK_WINDOW(w->gtkwin), labelStr); - } - - if (listHelpStrings) { - printf("WINDOW - %s\n", nameStr?nameStr:"<NULL>"); - } - - if (firstWin) { - lastWin->next = (wControl_p)w; - } else { - firstWin = (wControl_p)w; - } - - lastWin = (wControl_p)w; - gtk_widget_show(w->widget); - gtk_widget_realize(w->gtkwin); - GtkAllocation allocation; - gtk_widget_get_allocation(w->gtkwin, &allocation); - w->menu_height = allocation.height; - - w->busy = FALSE; - - if (option&F_MAXIMIZE) { - maximize_at_next_show = TRUE; - } - - return w; + gtk_window_set_resizable(GTK_WINDOW(w->gtkwin), FALSE); + } + + w->lastX = 0; + w->lastY = h; + w->shown = FALSE; + w->nameStr = nameStr?strdup(nameStr):NULL; + + if (labelStr) { + gtk_window_set_title(GTK_WINDOW(w->gtkwin), labelStr); + } + + if (listHelpStrings) { + printf("WINDOW - %s\n", nameStr?nameStr:"<NULL>"); + } + + if (firstWin) { + lastWin->next = (wControl_p)w; + } else { + firstWin = (wControl_p)w; + } + + lastWin = (wControl_p)w; + gtk_widget_show(w->widget); + gtk_widget_realize(w->gtkwin); + GtkAllocation allocation; + gtk_widget_get_allocation(w->gtkwin, &allocation); + w->menu_height = allocation.height; + + w->busy = FALSE; + + if (option&F_MAXIMIZE) { + maximize_at_next_show = TRUE; + } + + if ( windowIconPixbuf == NULL ) { + windowIconPixbuf = gdk_pixbuf_new_from_xpm_data((const char**)&xtc_xpm); + } + gtk_window_set_icon( GTK_WINDOW(w->gtkwin), windowIconPixbuf ); + + return w; } @@ -1091,38 +1074,38 @@ static wWin_p wWinCommonCreate( */ wWin_p wWinMainCreate( - const char * name, /* Application name */ - wPos_t x, /* Initial window width */ - wPos_t y, /* Initial window height */ - const char * helpStr, /* Help topic string */ - const char * labelStr, /* Window title */ - const char * nameStr, /* Window name */ - long option, /* Options */ - wWinCallBack_p winProc, /* Call back function */ - void * data) /* User context */ + const char * name, /* Application name */ + wWinPix_t x, /* Initial window width */ + wWinPix_t y, /* Initial window height */ + const char * helpStr, /* Help topic string */ + const char * labelStr, /* Window title */ + const char * nameStr, /* Window name */ + long option, /* Options */ + wWinCallBack_p winProc, /* Call back function */ + void * data) /* User context */ { - char *pos; - long isMaximized; + char *pos; + long isMaximized; - pos = strchr(name, ';'); + pos = strchr(name, ';'); - if (pos) { - /* if found, split application name and configuration name */ - strcpy(wConfigName, pos + 1); - } else { - /* if not found, application name and configuration name are same */ - strcpy(wConfigName, name); - } + if (pos) { + /* if found, split application name and configuration name */ + strcpy(wConfigName, pos + 1); + } else { + /* if not found, application name and configuration name are same */ + strcpy(wConfigName, name); + } - wPrefGetInteger("draw", "maximized", &isMaximized, 0); - option = option | (isMaximized?F_MAXIMIZE:0); + wPrefGetInteger("draw", "maximized", &isMaximized, 0); + option = option | (isMaximized?F_MAXIMIZE:0); - gtkMainW = wWinCommonCreate(NULL, W_MAIN, x, y, labelStr, nameStr, option, - winProc, data); + gtkMainW = wWinCommonCreate(NULL, W_MAIN, x, y, labelStr, nameStr, option, + winProc, data); - wDrawColorWhite = wDrawFindColor(0xFFFFFF); - wDrawColorBlack = wDrawFindColor(0x000000); - return gtkMainW; + wDrawColorWhite = wDrawFindColor(0xFFFFFF); + wDrawColorBlack = wDrawFindColor(0x000000); + return gtkMainW; } /** @@ -1141,29 +1124,29 @@ wWin_p wWinMainCreate( */ wWin_p wWinPopupCreate( - wWin_p parent, - wPos_t x, - wPos_t y, - const char * helpStr, - const char * labelStr, - const char * nameStr, - long option, - wWinCallBack_p winProc, - void * data) + wWin_p parent, + wWinPix_t x, + wWinPix_t y, + const char * helpStr, + const char * labelStr, + const char * nameStr, + long option, + wWinCallBack_p winProc, + void * data) { - wWin_p win; + wWin_p win; - if (parent == NULL) { - if (gtkMainW == NULL) { - abort(); - } + if (parent == NULL) { + if (gtkMainW == NULL) { + abort(); + } - parent = gtkMainW; - } + parent = gtkMainW; + } - win = wWinCommonCreate(parent, W_POPUP, x, y, labelStr, nameStr, option, - winProc, data); - return win; + win = wWinCommonCreate(parent, W_POPUP, x, y, labelStr, nameStr, option, + winProc, data); + return win; } @@ -1178,22 +1161,22 @@ wWin_p wWinPopupCreate( void wExit( - int rc) /* Application return code */ + int rc) /* Application return code */ { - wWin_p win; + wWin_p win; - for (win = (wWin_p)firstWin; win; win = (wWin_p)win->next) { - if (gtk_widget_get_visible(GTK_WIDGET(win->gtkwin))) { - saveSize(win); - savePos(win); - } - } + for (win = (wWin_p)firstWin; win; win = (wWin_p)win->next) { + if (gtk_widget_get_visible(GTK_WIDGET(win->gtkwin))) { + saveSize(win); + savePos(win); + } + } - wPrefFlush(); + wPrefFlush(""); - if (gtkMainW && gtkMainW->winProc != NULL) { - gtkMainW->winProc(gtkMainW, wQuit_e, NULL, gtkMainW->data); - } + if (gtkMainW && gtkMainW->winProc != NULL) { + gtkMainW->winProc(gtkMainW, wQuit_e, NULL, gtkMainW->data); + } - exit(rc); + exit(rc); } |