- window can now be resized

This commit is contained in:
Rob Pearce 2006-05-22 07:21:36 +00:00
parent c56dca3dfa
commit 8fd5f8d260
4 changed files with 494 additions and 158 deletions

View File

@ -3,6 +3,14 @@ Ideas for future versions:
Solaris (and possibly other platforms)
- Perhaps change to SVG for objects
Version 1.8a:
- Netmapr window can now be re-sized
Version 1.8:
- Fixed many crashes
- Maplist is now scrollable
Version 1.7h:
- Fixed crash when moving link points

View File

@ -1,4 +1,4 @@
#define VERSION "1.8"
#define VERSION "1.8a"
/* variable sizes */
#define SMALLBUFLEN 64 /* small text buffer */
@ -27,7 +27,18 @@
#define DEFTEXTW 8 /* default text width (in pixels) for new text items */
#define DEFTEXTH 10 /* default text height (in POINTS) for new text items */
#define STATUSH (DEFTEXTH + 4)
#define SBSIZE 15
#define DEFSCREENW 900
#define DEFSCREENH 600
/* maximum/minimum values */
#define MINSCREENX 100
#define MINSCREENY 100
#define MAXBUTTONS 18 /* maximum number of toolbox buttons from buttons.dat */
#define MAXOBJTYPES 50 /* maximum amount of different types from objects.dat */
@ -116,6 +127,8 @@
#define S_CHANGEOBJECT (24)
#define S_DRAWFLOW (25)
#define S_SEARCH (26)
#define S_XSCROLL (27)
#define S_YSCROLL (28)
/* toolbox buttons */
#define TB_POINTER (0)

617
netmapr.c

File diff suppressed because it is too large Load Diff

View File

@ -181,6 +181,7 @@ void changestate(int newstate);
void cleanup(void);
void copy(void);
int createobject(int type, int x, int y);
void calcmapdimensions(void);
void copyline(SDL_Surface *screen,int x1, int y1, int x2, int y2, int *lbuf);
void deletething(int id, int type);
void deletelink(int linkid);
@ -202,7 +203,7 @@ void drawline(SDL_Surface *screen, int x1, int y1, int x2, int y2, SDL_Color c,
void drawlinebehind(SDL_Surface *screen, int x1, int y1, int x2, int y2, SDL_Color c);
void drawlink(SDL_Surface *dest, link_t *l);
void drawlinkSVG(link_t *l);
void drawobject(SDL_Surface *dest, mapobject_t *o, int doublebuffer);
void drawobject(SDL_Surface *dest, mapobject_t *o, int doublebuffer, int adjust);
void drawobjectSVG(SDL_Surface *dest, mapobject_t *o, int doublebuffer);
void drawpixel(SDL_Surface *screen, int x, int y, SDL_Color c);
void drawmap(void);
@ -210,7 +211,7 @@ void drawmapbox(void);
void drawobox(void);
void drawscreen(void);
void drawstatusbar(void);
void drawtext(SDL_Surface *dest, text_t *t);
void drawtext(SDL_Surface *dest, text_t *t, int adjust);
void drawtextat(SDL_Surface *dest, int x, int y, char *text, int size, SDL_Color c);
void drawtextSVG(text_t *t);
void drawtoolbox(void);
@ -218,6 +219,8 @@ void drawtoolboxselector(int buttonid, int altcolour);
void drawvector(SDL_Surface *dest, vectorimg_t *vimg, int x, int y, int w, int h,SDL_Color *overridefg, SDL_Color *overridebg );
void drawvectorSVG(vectorimg_t *vimg, int x, int y, int w, int h, SDL_Color *overridefg, SDL_Color *overridebg);
int drawSVG(char *svgfilename);
void drawxscrollbar(void);
void drawyscrollbar(void);
void drillto(int mapnum);
int endobjmove(int x, int y);
int endresize(int x, int y);
@ -267,7 +270,11 @@ int isonmapbox (int x, int y);
int isonmapboxchildren (int x, int y);
int isonmapname (int x, int y);
int isongoback (int x, int y);
int isonxscrollbar(int x, int y);
int isonyscrollbar(int x, int y);
void initvars(void);
void movescreenx(int amt);
void movescreeny(int amt);
void raiseselected(int amt);
void seterror(int errnum);
void setinfo(int infonum);
@ -300,3 +307,4 @@ int updateresizetextshadow(int x, int y);
int updatetextcursor(void);
int updatetextshadow(int x, int y);
void updatewm(void);
void validatescreenpos(void);