zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-22 08:25:45 -07:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup: relieve frontends of the duty to call

Browse Source 
midend_rewrite_statusbar() and check the result against the last
string returned. This is now done centrally in drawing.c, and the
front end status bar function need only do what it says on the tin.

While I'm modifying the prototype of drawing_init(), I've also
renamed it drawing_new() for the same reason as random_new() (it
_allocates_ a drawing object, rather than just initialising one
passed in).

[originally from svn r6420]
This commit is contained in:
Simon Tatham
2005-10-22 17:23:55 +00:00
parent a3b837c698
commit 240b6cab8c
7 changed files with 65 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gtk.c
View File

@ -116,7 +116,6 @@ struct frontend {
GtkWidget *cfgbox;
void *paste_data;
int paste_data_len;
char *laststatus;
int pw, ph; /* pixmap size (w, h are area size) */
int ox, oy; /* offset of pixmap in drawing area */
char *filesel_name;
@ -141,19 +140,11 @@ void frontend_default_colour(frontend *fe, float *output)
void gtk_status_bar(void *handle, char *text)
{
frontend *fe = (frontend *)handle;
char *rewritten;
assert(fe->statusbar);
rewritten = midend_rewrite_statusbar(fe->me, text);
if (!fe->laststatus || strcmp(rewritten, fe->laststatus)) {
gtk_statusbar_pop(GTK_STATUSBAR(fe->statusbar), fe->statusctx);
gtk_statusbar_push(GTK_STATUSBAR(fe->statusbar), fe->statusctx, rewritten);
sfree(fe->laststatus);
fe->laststatus = rewritten;
} else {
sfree(rewritten);
}
gtk_statusbar_pop(GTK_STATUSBAR(fe->statusbar), fe->statusctx);
gtk_statusbar_push(GTK_STATUSBAR(fe->statusbar), fe->statusctx, text);
}
void gtk_start_draw(void *handle)
@ -1670,8 +1661,6 @@ static frontend *new_window(char *arg, char **error)
fe->fonts = NULL;
fe->nfonts = fe->fontsize = 0;
fe->laststatus = NULL;
fe->paste_data = NULL;
fe->paste_data_len = 0;