More work

This commit is contained in:
Simon 2010-08-27 13:01:20 +01:00
parent 0d25cae647
commit 07ade7ed72
8 changed files with 929 additions and 880 deletions

View File

@ -11,6 +11,8 @@
#define YRES 384
#define NPART XRES*YRES
#define MAXSIGNS 16
#define ZSIZE_D 16
#define ZFACTOR_D 8
static unsigned char ZFACTOR = 256/ZSIZE_D;
@ -36,4 +38,13 @@ extern int framerender;
extern int mousex, mousey;
extern int death;
struct sign
{
int x,y,ju;
char text[256];
};
typedef struct sign sign;
extern sign signs[MAXSIGNS];
#endif

View File

@ -976,8 +976,8 @@ void draw_line(pixel *vid, int x1, int y1, int x2, int y2, int r, int g, int b,
dx = abs(x1-x2);
dy = abs(y1-y2);
sx = sign(x2-x1);
sy = sign(y2-y1);
sx = isign(x2-x1);
sy = isign(y2-y1);
x = x1;
y = y1;
check = 0;

View File

@ -112,4 +112,6 @@ void xor_line(int x1, int y1, int x2, int y2, pixel *vid);
void xor_rect(pixel *vid, int x, int y, int w, int h);
void draw_parts(pixel *vid);
#endif

View File

@ -1,6 +1,33 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "defines.h"
#include "powder.h"
#include "interface.h"
SDLMod sdl_mod;
int sdl_key, sdl_wheel, sdl_caps=0, sdl_ascii, sdl_zoom_trig=0;
char *shift_0="`1234567890-=[]\\;',./";
char *shift_1="~!@#$%^&*()_+{}|:\"<>?";
int svf_login = 0;
int svf_admin = 0;
int svf_mod = 0;
char svf_user[64] = "";
char svf_pass[64] = "";
int svf_open = 0;
int svf_own = 0;
int svf_myvote = 0;
int svf_publish = 0;
char svf_id[16] = "";
char svf_name[64] = "";
char svf_tags[256] = "";
void *svf_last = NULL;
int svf_lsize;
int Z_keysym = 'z';
void menu_count(void)
{
@ -12,4 +39,809 @@ void menu_count(void)
msections[ptypes[i].menusection].itemcount+=ptypes[i].menu;
}
}
void add_sign_ui(pixel *vid_buf, int mx, int my)
{
int i, w, h, x, y, nm=0, ju;
int x0=(XRES-192)/2,y0=(YRES-80)/2,b=1,bq;
ui_edit ed;
// check if it is an existing sign
for(i=0; i<MAXSIGNS; i++)
if(signs[i].text[0])
{
get_sign_pos(i, &x, &y, &w, &h);
if(mx>=x && mx<=x+w && my>=y && my<=y+h)
break;
}
// else look for empty spot
if(i >= MAXSIGNS)
{
nm = 1;
for(i=0; i<MAXSIGNS; i++)
if(!signs[i].text[0])
break;
}
if(i >= MAXSIGNS)
return;
if(nm)
{
signs[i].x = mx;
signs[i].y = my;
signs[i].ju = 1;
}
while(!sdl_poll())
{
b = SDL_GetMouseState(&mx, &my);
if(!b)
break;
}
ed.x = x0+25;
ed.y = y0+25;
ed.w = 158;
ed.nx = 1;
ed.def = "[message]";
ed.focus = 1;
ed.hide = 0;
ed.cursor = strlen(signs[i].text);
strcpy(ed.str, signs[i].text);
ju = signs[i].ju;
fillrect(vid_buf, -1, -1, XRES, YRES+MENUSIZE, 0, 0, 0, 192);
while(!sdl_poll())
{
bq = b;
b = SDL_GetMouseState(&mx, &my);
mx /= sdl_scale;
my /= sdl_scale;
drawrect(vid_buf, x0, y0, 192, 80, 192, 192, 192, 255);
clearrect(vid_buf, x0, y0, 192, 80);
drawtext(vid_buf, x0+8, y0+8, nm ? "New sign:" : "Edit sign:", 255, 255, 255, 255);
drawtext(vid_buf, x0+12, y0+23, "\xA1", 32, 64, 128, 255);
drawtext(vid_buf, x0+12, y0+23, "\xA0", 255, 255, 255, 255);
drawrect(vid_buf, x0+8, y0+20, 176, 16, 192, 192, 192, 255);
ui_edit_draw(vid_buf, &ed);
drawtext(vid_buf, x0+8, y0+46, "Justify:", 255, 255, 255, 255);
draw_icon(vid_buf, x0+50, y0+42, 0x9D, ju == 0);
draw_icon(vid_buf, x0+68, y0+42, 0x9E, ju == 1);
draw_icon(vid_buf, x0+86, y0+42, 0x9F, ju == 2);
if(!nm)
{
drawtext(vid_buf, x0+138, y0+45, "\x86", 160, 48, 32, 255);
drawtext(vid_buf, x0+138, y0+45, "\x85", 255, 255, 255, 255);
drawtext(vid_buf, x0+152, y0+46, "Delete", 255, 255, 255, 255);
drawrect(vid_buf, x0+134, y0+42, 50, 15, 255, 255, 255, 255);
}
drawtext(vid_buf, x0+5, y0+69, "OK", 255, 255, 255, 255);
drawrect(vid_buf, x0, y0+64, 192, 16, 192, 192, 192, 255);
sdl_blit(0, 0, (XRES+BARSIZE), YRES+MENUSIZE, vid_buf, (XRES+BARSIZE));
ui_edit_process(mx, my, b, &ed);
if(b && !bq && mx>=x0+50 && mx<=x0+67 && my>=y0+42 && my<=y0+59)
ju = 0;
if(b && !bq && mx>=x0+68 && mx<=x0+85 && my>=y0+42 && my<=y0+59)
ju = 1;
if(b && !bq && mx>=x0+86 && mx<=x0+103 && my>=y0+42 && my<=y0+59)
ju = 2;
if(b && !bq && mx>=x0+9 && mx<x0+23 && my>=y0+22 && my<y0+36)
break;
if(b && !bq && mx>=x0 && mx<x0+192 && my>=y0+64 && my<=y0+80)
break;
if(!nm && b && !bq && mx>=x0+134 && my>=y0+42 && mx<=x0+184 && my<=y0+59)
{
signs[i].text[0] = 0;
return;
}
if(sdl_key==SDLK_RETURN)
break;
if(sdl_key==SDLK_ESCAPE)
{
if(!ed.focus)
return;
ed.focus = 0;
}
}
strcpy(signs[i].text, ed.str);
signs[i].ju = ju;
}
void ui_edit_draw(pixel *vid_buf, ui_edit *ed)
{
int cx, i;
char echo[256], *str;
if(ed->hide)
{
for(i=0; ed->str[i]; i++)
echo[i] = 0x8D;
echo[i] = 0;
str = echo;
}
else
str = ed->str;
if(ed->str[0])
{
drawtext(vid_buf, ed->x, ed->y, str, 255, 255, 255, 255);
drawtext(vid_buf, ed->x+ed->w-11, ed->y-1, "\xAA", 128, 128, 128, 255);
}
else if(!ed->focus)
drawtext(vid_buf, ed->x, ed->y, ed->def, 128, 128, 128, 255);
if(ed->focus)
{
cx = textnwidth(str, ed->cursor);
for(i=-3; i<9; i++)
drawpixel(vid_buf, ed->x+cx, ed->y+i, 255, 255, 255, 255);
}
}
void ui_edit_process(int mx, int my, int mb, ui_edit *ed)
{
char ch, ts[2], echo[256], *str;
int l, i;
#ifdef RAWINPUT
char *p;
#endif
if(mb)
{
if(ed->hide)
{
for(i=0; ed->str[i]; i++)
echo[i] = 0x8D;
echo[i] = 0;
str = echo;
}
else
str = ed->str;
if(mx>=ed->x+ed->w-11 && mx<ed->x+ed->w && my>=ed->y-5 && my<ed->y+11)
{
ed->focus = 1;
ed->cursor = 0;
ed->str[0] = 0;
}
else if(mx>=ed->x-ed->nx && mx<ed->x+ed->w && my>=ed->y-5 && my<ed->y+11)
{
ed->focus = 1;
ed->cursor = textwidthx(str, mx-ed->x);
}
else
ed->focus = 0;
}
if(ed->focus && sdl_key)
{
if(ed->hide)
{
for(i=0; ed->str[i]; i++)
echo[i] = 0x8D;
echo[i] = 0;
str = echo;
}
else
str = ed->str;
l = strlen(ed->str);
switch(sdl_key)
{
case SDLK_HOME:
ed->cursor = 0;
break;
case SDLK_END:
ed->cursor = l;
break;
case SDLK_LEFT:
if(ed->cursor > 0)
ed->cursor --;
break;
case SDLK_RIGHT:
if(ed->cursor < l)
ed->cursor ++;
break;
case SDLK_DELETE:
if(sdl_mod & (KMOD_LCTRL|KMOD_RCTRL))
ed->str[ed->cursor] = 0;
else if(ed->cursor < l)
memmove(ed->str+ed->cursor, ed->str+ed->cursor+1, l-ed->cursor);
break;
case SDLK_BACKSPACE:
if(sdl_mod & (KMOD_LCTRL|KMOD_RCTRL))
{
if(ed->cursor > 0)
memmove(ed->str, ed->str+ed->cursor, l-ed->cursor+1);
ed->cursor = 0;
}
else if(ed->cursor > 0)
{
ed->cursor--;
memmove(ed->str+ed->cursor, ed->str+ed->cursor+1, l-ed->cursor);
}
break;
default:
#ifdef RAWINPUT
if(sdl_key>=SDLK_SPACE && sdl_key<=SDLK_z && l<255)
{
ch = sdl_key;
if((sdl_mod & (KMOD_LSHIFT|KMOD_RSHIFT|KMOD_CAPS)))
{
if(ch>='a' && ch<='z')
ch &= ~0x20;
p = strchr(shift_0, ch);
if(p)
ch = shift_1[p-shift_0];
}
ts[0]=ed->hide?0x8D:ch;
ts[1]=0;
if(textwidth(str)+textwidth(ts) > ed->w-14)
break;
memmove(ed->str+ed->cursor+1, ed->str+ed->cursor, l+1-ed->cursor);
ed->str[ed->cursor] = ch;
ed->cursor++;
}
#else
if(sdl_ascii>=' ' && sdl_ascii<127)
{
ch = sdl_ascii;
ts[0]=ed->hide?0x8D:ch;
ts[1]=0;
if(textwidth(str)+textwidth(ts) > ed->w-14)
break;
memmove(ed->str+ed->cursor+1, ed->str+ed->cursor, l+1-ed->cursor);
ed->str[ed->cursor] = ch;
ed->cursor++;
}
#endif
break;
}
}
}
void ui_checkbox_draw(pixel *vid_buf, ui_checkbox *ed)
{
int w = 12;
if(ed->checked)
{
drawtext(vid_buf, ed->x+2, ed->y+2, "\xCF", 128, 128, 128, 255);
}
if(ed->focus)
{
drawrect(vid_buf, ed->x, ed->y, w, w, 255, 255, 255, 255);
}
else
{
drawrect(vid_buf, ed->x, ed->y, w, w, 128, 128, 128, 255);
}
}
void ui_checkbox_process(int mx, int my, int mb, int mbq, ui_checkbox *ed)
{
int w = 12;
if(mb && !mbq)
{
if(mx>=ed->x && mx<=ed->x+w && my>=ed->y && my<=ed->y+w)
{
ed->checked = (ed->checked)?0:1;
}
}
else
{
if(mx>=ed->x && mx<=ed->x+w && my>=ed->y && my<=ed->y+w)
{
ed->focus = 1;
}
else
{
ed->focus = 0;
}
}
}
void draw_svf_ui(pixel *vid_buf)
{
int c;
drawtext(vid_buf, 4, YRES+(MENUSIZE-14), "\x81", 255, 255, 255, 255);
drawrect(vid_buf, 1, YRES+(MENUSIZE-16), 16, 14, 255, 255, 255, 255);
c = svf_open ? 255 : 128;
drawtext(vid_buf, 23, YRES+(MENUSIZE-14), "\x91", c, c, c, 255);
drawrect(vid_buf, 19, YRES+(MENUSIZE-16), 16, 14, c, c, c, 255);
c = svf_login ? 255 : 128;
drawtext(vid_buf, 40, YRES+(MENUSIZE-14), "\x82", c, c, c, 255);
if(svf_open)
drawtext(vid_buf, 58, YRES+(MENUSIZE-12), svf_name, c, c, c, 255);
else
drawtext(vid_buf, 58, YRES+(MENUSIZE-12), "[untitled simulation]", c, c, c, 255);
drawrect(vid_buf, 37, YRES+(MENUSIZE-16), 150, 14, c, c, c, 255);
if(svf_open && svf_own)
drawdots(vid_buf, 55, YRES+(MENUSIZE-15), 12, c, c, c, 255);
c = (svf_login && svf_open) ? 255 : 128;
drawrect(vid_buf, 189, YRES+(MENUSIZE-16), 14, 14, c, c, c, 255);
drawrect(vid_buf, 203, YRES+(MENUSIZE-16), 14, 14, c, c, c, 255);
if(svf_myvote==1 && (svf_login && svf_open))
{
fillrect(vid_buf, 189, YRES+(MENUSIZE-16), 14, 14, 0, 108, 10, 255);
}
else if(svf_myvote==-1 && (svf_login && svf_open))
{
fillrect(vid_buf, 203, YRES+(MENUSIZE-16), 14, 14, 108, 10, 0, 255);
}
drawtext(vid_buf, 192, YRES+(MENUSIZE-12), "\xCB", 0, 187, 18, c);
drawtext(vid_buf, 205, YRES+(MENUSIZE-14), "\xCA", 187, 40, 0, c);
drawtext(vid_buf, 222, YRES+(MENUSIZE-15), "\x83", c, c, c, 255);
if(svf_tags[0])
drawtextmax(vid_buf, 240, YRES+(MENUSIZE-12), 154, svf_tags, c, c, c, 255);
else
drawtext(vid_buf, 240, YRES+(MENUSIZE-12), "[no tags set]", c, c, c, 255);
drawrect(vid_buf, 219, YRES+(MENUSIZE-16), XRES+BARSIZE-380, 14, c, c, c, 255);
drawtext(vid_buf, XRES-139+BARSIZE/*371*/, YRES+(MENUSIZE-14), "\x92", 255, 255, 255, 255);
drawrect(vid_buf, XRES-143+BARSIZE/*367*/, YRES+(MENUSIZE-16), 16, 14, 255, 255, 255, 255);
drawtext(vid_buf, XRES-122+BARSIZE/*388*/, YRES+(MENUSIZE-13), "\x84", 255, 255, 255, 255);
if(svf_login)
drawtext(vid_buf, XRES-104+BARSIZE/*406*/, YRES+(MENUSIZE-12), svf_user, 255, 255, 255, 255);
else
drawtext(vid_buf, XRES-104+BARSIZE/*406*/, YRES+(MENUSIZE-12), "[sign in]", 255, 255, 255, 255);
drawrect(vid_buf, XRES-125+BARSIZE/*385*/, YRES+(MENUSIZE-16), 91, 14, 255, 255, 255, 255);
if(sys_pause)
{
fillrect(vid_buf, XRES-17+BARSIZE/*493*/, YRES+(MENUSIZE-17), 16, 16, 255, 255, 255, 255);
drawtext(vid_buf, XRES-14+BARSIZE/*496*/, YRES+(MENUSIZE-14), "\x90", 0, 0, 0, 255);
}
else
{
drawtext(vid_buf, XRES-14+BARSIZE/*496*/, YRES+(MENUSIZE-14), "\x90", 255, 255, 255, 255);
drawrect(vid_buf, XRES-16+BARSIZE/*494*/, YRES+(MENUSIZE-16), 14, 14, 255, 255, 255, 255);
}
if(!legacy_enable)
{
fillrect(vid_buf, XRES-160+BARSIZE/*493*/, YRES+(MENUSIZE-17), 16, 16, 255, 255, 255, 255);
drawtext(vid_buf, XRES-154+BARSIZE/*481*/, YRES+(MENUSIZE-13), "\xBE", 255, 0, 0, 255);
drawtext(vid_buf, XRES-154+BARSIZE/*481*/, YRES+(MENUSIZE-13), "\xBD", 0, 0, 0, 255);
}
else
{
drawtext(vid_buf, XRES-154+BARSIZE/*481*/, YRES+(MENUSIZE-13), "\xBD", 255, 255, 255, 255);
drawrect(vid_buf, XRES-159+BARSIZE/*494*/, YRES+(MENUSIZE-16), 14, 14, 255, 255, 255, 255);
}
switch(cmode)
{
case 0:
drawtext(vid_buf, XRES-29+BARSIZE/*481*/, YRES+(MENUSIZE-13), "\x98", 128, 160, 255, 255);
break;
case 1:
drawtext(vid_buf, XRES-29+BARSIZE/*481*/, YRES+(MENUSIZE-13), "\x99", 255, 212, 32, 255);
break;
case 2:
drawtext(vid_buf, XRES-29+BARSIZE/*481*/, YRES+(MENUSIZE-13), "\x9A", 212, 212, 212, 255);
break;
case 3:
drawtext(vid_buf, XRES-29+BARSIZE/*481*/, YRES+(MENUSIZE-13), "\x9B", 255, 0, 0, 255);
drawtext(vid_buf, XRES-29+BARSIZE/*481*/, YRES+(MENUSIZE-13), "\x9C", 255, 255, 64, 255);
break;
case 4:
drawtext(vid_buf, XRES-29+BARSIZE/*481*/, YRES+(MENUSIZE-13), "\xBF", 55, 255, 55, 255);
break;
case 5:
drawtext(vid_buf, XRES-27+BARSIZE/*481*/, YRES+(MENUSIZE-13), "\xBE", 255, 0, 0, 255);
drawtext(vid_buf, XRES-27+BARSIZE/*481*/, YRES+(MENUSIZE-13), "\xBD", 255, 255, 255, 255);
break;
case 6:
drawtext(vid_buf, XRES-29+BARSIZE/*481*/, YRES+(MENUSIZE-13), "\xC4", 100, 150, 255, 255);
break;
}
drawrect(vid_buf, XRES-32+BARSIZE/*478*/, YRES+(MENUSIZE-16), 14, 14, 255, 255, 255, 255);
if(svf_admin)
{
drawtext(vid_buf, XRES-45+BARSIZE/*463*/, YRES+(MENUSIZE-14), "\xC9", 232, 127, 35, 255);
drawtext(vid_buf, XRES-45+BARSIZE/*463*/, YRES+(MENUSIZE-14), "\xC7", 255, 255, 255, 255);
drawtext(vid_buf, XRES-45+BARSIZE/*463*/, YRES+(MENUSIZE-14), "\xC8", 255, 255, 255, 255);
}
else if(svf_mod)
{
drawtext(vid_buf, XRES-45+BARSIZE/*463*/, YRES+(MENUSIZE-14), "\xC9", 35, 127, 232, 255);
drawtext(vid_buf, XRES-45+BARSIZE/*463*/, YRES+(MENUSIZE-14), "\xC7", 255, 255, 255, 255);
}//else if(amd)
// drawtext(vid_buf, XRES-45/*465*/, YRES+(MENUSIZE-15), "\x97", 0, 230, 153, 255); Why is this here?
}
void error_ui(pixel *vid_buf, int err, char *txt)
{
int x0=(XRES-240)/2,y0=(YRES-MENUSIZE)/2,b=1,bq,mx,my;
char *msg;
msg = malloc(strlen(txt)+16);
if(err)
sprintf(msg, "%03d %s", err, txt);
else
sprintf(msg, "%s", txt);
while(!sdl_poll())
{
b = SDL_GetMouseState(&mx, &my);
if(!b)
break;
}
while(!sdl_poll())
{
bq = b;
b = SDL_GetMouseState(&mx, &my);
mx /= sdl_scale;
my /= sdl_scale;
clearrect(vid_buf, x0-2, y0-2, 244, 64);
drawrect(vid_buf, x0, y0, 240, 60, 192, 192, 192, 255);
if(err)
drawtext(vid_buf, x0+8, y0+8, "HTTP error:", 255, 64, 32, 255);
else
drawtext(vid_buf, x0+8, y0+8, "Error:", 255, 64, 32, 255);
drawtext(vid_buf, x0+8, y0+26, msg, 255, 255, 255, 255);
drawtext(vid_buf, x0+5, y0+49, "Dismiss", 255, 255, 255, 255);
drawrect(vid_buf, x0, y0+44, 240, 16, 192, 192, 192, 255);
sdl_blit(0, 0, (XRES+BARSIZE), YRES+MENUSIZE, vid_buf, (XRES+BARSIZE));
if(b && !bq && mx>=x0 && mx<x0+240 && my>=y0+44 && my<=y0+60)
break;
if(sdl_key==SDLK_RETURN)
break;
if(sdl_key==SDLK_ESCAPE)
break;
}
free(msg);
while(!sdl_poll())
{
b = SDL_GetMouseState(&mx, &my);
if(!b)
break;
}
}
void info_ui(pixel *vid_buf, char *top, char *txt)
{
int x0=(XRES-240)/2,y0=(YRES-MENUSIZE)/2,b=1,bq,mx,my;
while(!sdl_poll())
{
b = SDL_GetMouseState(&mx, &my);
if(!b)
break;
}
while(!sdl_poll())
{
bq = b;
b = SDL_GetMouseState(&mx, &my);
mx /= sdl_scale;
my /= sdl_scale;
clearrect(vid_buf, x0-2, y0-2, 244, 64);
drawrect(vid_buf, x0, y0, 240, 60, 192, 192, 192, 255);
drawtext(vid_buf, x0+8, y0+8, top, 160, 160, 255, 255);
drawtext(vid_buf, x0+8, y0+26, txt, 255, 255, 255, 255);
drawtext(vid_buf, x0+5, y0+49, "OK", 255, 255, 255, 255);
drawrect(vid_buf, x0, y0+44, 240, 16, 192, 192, 192, 255);
sdl_blit(0, 0, (XRES+BARSIZE), YRES+MENUSIZE, vid_buf, (XRES+BARSIZE));
if(b && !bq && mx>=x0 && mx<x0+240 && my>=y0+44 && my<=y0+60)
break;
if(sdl_key==SDLK_RETURN)
break;
if(sdl_key==SDLK_ESCAPE)
break;
}
while(!sdl_poll())
{
b = SDL_GetMouseState(&mx, &my);
if(!b)
break;
}
}
void info_box(pixel *vid_buf, char *msg)
{
int w = textwidth(msg)+16;
int x0=(XRES-w)/2,y0=(YRES-24)/2;
clearrect(vid_buf, x0-2, y0-2, w+4, 28);
drawrect(vid_buf, x0, y0, w, 24, 192, 192, 192, 255);
drawtext(vid_buf, x0+8, y0+8, msg, 192, 192, 240, 255);
sdl_blit(0, 0, (XRES+BARSIZE), YRES+MENUSIZE, vid_buf, (XRES+BARSIZE));
}
int confirm_ui(pixel *vid_buf, char *top, char *msg, char *btn)
{
int x0=(XRES-240)/2,y0=(YRES-MENUSIZE)/2,b=1,bq,mx,my;
int ret = 0;
while(!sdl_poll())
{
b = SDL_GetMouseState(&mx, &my);
if(!b)
break;
}
while(!sdl_poll())
{
bq = b;
b = SDL_GetMouseState(&mx, &my);
mx /= sdl_scale;
my /= sdl_scale;
clearrect(vid_buf, x0-2, y0-2, 244, 64);
drawrect(vid_buf, x0, y0, 240, 60, 192, 192, 192, 255);
drawtext(vid_buf, x0+8, y0+8, top, 255, 216, 32, 255);
drawtext(vid_buf, x0+8, y0+26, msg, 255, 255, 255, 255);
drawtext(vid_buf, x0+5, y0+49, "Cancel", 255, 255, 255, 255);
drawtext(vid_buf, x0+165, y0+49, btn, 255, 216, 32, 255);
drawrect(vid_buf, x0, y0+44, 160, 16, 192, 192, 192, 255);
drawrect(vid_buf, x0+160, y0+44, 80, 16, 192, 192, 192, 255);
sdl_blit(0, 0, (XRES+BARSIZE), YRES+MENUSIZE, vid_buf, (XRES+BARSIZE));
if(b && !bq && mx>=x0+160 && mx<x0+240 && my>=y0+44 && my<=y0+60)
{
ret = 1;
break;
}
if(b && !bq && mx>=x0 && mx<x0+160 && my>=y0+44 && my<=y0+60)
break;
if(sdl_key==SDLK_RETURN)
{
ret = 1;
break;
}
if(sdl_key==SDLK_ESCAPE)
break;
}
while(!sdl_poll())
{
b = SDL_GetMouseState(&mx, &my);
if(!b)
break;
}
return ret;
}
void login_ui(pixel *vid_buf)
{
int x0=(XRES-192)/2,y0=(YRES-80)/2,b=1,bq,mx,my,err;
ui_edit ed1,ed2;
char *res;
while(!sdl_poll())
{
b = SDL_GetMouseState(&mx, &my);
if(!b)
break;
}
ed1.x = x0+25;
ed1.y = y0+25;
ed1.w = 158;
ed1.nx = 1;
ed1.def = "[user name]";
ed1.focus = 1;
ed1.hide = 0;
ed1.cursor = strlen(svf_user);
strcpy(ed1.str, svf_user);
ed2.x = x0+25;
ed2.y = y0+45;
ed2.w = 158;
ed2.nx = 1;
ed2.def = "[password]";
ed2.focus = 0;
ed2.hide = 1;
ed2.cursor = 0;
strcpy(ed2.str, "");
fillrect(vid_buf, -1, -1, XRES, YRES+MENUSIZE, 0, 0, 0, 192);
while(!sdl_poll())
{
bq = b;
b = SDL_GetMouseState(&mx, &my);
mx /= sdl_scale;
my /= sdl_scale;
drawrect(vid_buf, x0, y0, 192, 80, 192, 192, 192, 255);
clearrect(vid_buf, x0, y0, 192, 80);
drawtext(vid_buf, x0+8, y0+8, "Server login:", 255, 255, 255, 255);
drawtext(vid_buf, x0+12, y0+23, "\x8B", 32, 64, 128, 255);
drawtext(vid_buf, x0+12, y0+23, "\x8A", 255, 255, 255, 255);
drawrect(vid_buf, x0+8, y0+20, 176, 16, 192, 192, 192, 255);
drawtext(vid_buf, x0+11, y0+44, "\x8C", 160, 144, 32, 255);
drawtext(vid_buf, x0+11, y0+44, "\x84", 255, 255, 255, 255);
drawrect(vid_buf, x0+8, y0+40, 176, 16, 192, 192, 192, 255);
ui_edit_draw(vid_buf, &ed1);
ui_edit_draw(vid_buf, &ed2);
drawtext(vid_buf, x0+5, y0+69, "Sign in", 255, 255, 255, 255);
drawrect(vid_buf, x0, y0+64, 192, 16, 192, 192, 192, 255);
sdl_blit(0, 0, (XRES+BARSIZE), YRES+MENUSIZE, vid_buf, (XRES+BARSIZE));
ui_edit_process(mx, my, b, &ed1);
ui_edit_process(mx, my, b, &ed2);
if(b && !bq && mx>=x0+9 && mx<x0+23 && my>=y0+22 && my<y0+36)
break;
if(b && !bq && mx>=x0+9 && mx<x0+23 && my>=y0+42 && my<y0+46)
break;
if(b && !bq && mx>=x0 && mx<x0+192 && my>=y0+64 && my<=y0+80)
break;
if(sdl_key==SDLK_RETURN || sdl_key==SDLK_TAB)
{
if(!ed1.focus)
break;
ed1.focus = 0;
ed2.focus = 1;
}
if(sdl_key==SDLK_ESCAPE)
{
if(!ed1.focus && !ed2.focus)
return;
ed1.focus = 0;
ed2.focus = 0;
}
}
strcpy(svf_user, ed1.str);
md5_ascii(svf_pass, (unsigned char *)ed2.str, 0);
res = http_multipart_post(
"http://" SERVER "/Login.api",
NULL, NULL, NULL,
svf_user, svf_pass,
&err, NULL);
if(err != 200)
{
error_ui(vid_buf, err, http_ret_text(err));
if(res)
free(res);
goto fail;
}
if(res && !strncmp(res, "OK", 2))
{
if(!strcmp(res, "OK ADMIN"))
{
svf_admin = 1;
svf_mod = 0;
}
else if(!strcmp(res, "OK MOD"))
{
svf_admin = 0;
svf_mod = 1;
}
else
{
svf_admin = 0;
svf_mod = 0;
}
free(res);
svf_login = 1;
return;
}
if(!res)
res = mystrdup("Unspecified Error");
error_ui(vid_buf, 0, res);
free(res);
fail:
strcpy(svf_user, "");
strcpy(svf_pass, "");
svf_login = 0;
svf_own = 0;
svf_admin = 0;
svf_mod = 0;
}
int sdl_poll(void)
{
SDL_Event event;
sdl_key=sdl_wheel=sdl_ascii=0;
while(SDL_PollEvent(&event))
{
switch (event.type)
{
case SDL_KEYDOWN:
sdl_key=event.key.keysym.sym;
sdl_ascii=event.key.keysym.unicode;
if(event.key.keysym.sym == SDLK_CAPSLOCK)
sdl_caps = 1;
if(event.key.keysym.unicode=='z' || event.key.keysym.unicode=='Z')
{
sdl_zoom_trig = 1;
Z_keysym = event.key.keysym.sym;
}
if( event.key.keysym.sym == SDLK_PLUS || event.key.keysym.sym == SDLK_RIGHTBRACKET)
{
sdl_wheel++;
}
if( event.key.keysym.sym == SDLK_MINUS || event.key.keysym.sym == SDLK_LEFTBRACKET)
{
sdl_wheel--;
}
// 4
//1 8 2
if(event.key.keysym.sym == SDLK_RIGHT)
{
player[0] = (int)(player[0])|0x02; //Go right command
}
if(event.key.keysym.sym == SDLK_LEFT)
{
player[0] = (int)(player[0])|0x01; //Go left command
}
if(event.key.keysym.sym == SDLK_DOWN && ((int)(player[0])&0x08)!=0x08)
{
player[0] = (int)(player[0])|0x08; //Go left command
}
if(event.key.keysym.sym == SDLK_UP && ((int)(player[0])&0x04)!=0x04)
{
player[0] = (int)(player[0])|0x04; //Jump command
}
break;
case SDL_KEYUP:
if(event.key.keysym.sym == SDLK_CAPSLOCK)
sdl_caps = 0;
if(event.key.keysym.sym == Z_keysym)
sdl_zoom_trig = 0;
if(event.key.keysym.sym == SDLK_RIGHT || event.key.keysym.sym == SDLK_LEFT)
{
player[1] = player[0]; //Saving last movement
player[0] = (int)(player[0])&12; //Stop command
}
if(event.key.keysym.sym == SDLK_UP)
{
player[0] = (int)(player[0])&11;
}
if(event.key.keysym.sym == SDLK_DOWN)
{
player[0] = (int)(player[0])&7;
}
break;
case SDL_MOUSEBUTTONDOWN:
if(event.button.button == SDL_BUTTON_WHEELUP)
sdl_wheel++;
if(event.button.button == SDL_BUTTON_WHEELDOWN)
sdl_wheel--;
break;
case SDL_QUIT:
return 1;
}
}
sdl_mod = SDL_GetModState();
return 0;
}

View File

@ -63,5 +63,66 @@ static menu_section msections[] =
{"\xCC", "Special", 0},
};
struct ui_edit
{
int x, y, w, nx;
char str[256],*def;
int focus, cursor, hide;
};
typedef struct ui_edit ui_edit;
struct ui_checkbox
{
int x, y;
int focus, checked;
};
typedef struct ui_checkbox ui_checkbox;
extern SDLMod sdl_mod;
extern int sdl_key, sdl_wheel, sdl_caps, sdl_ascii, sdl_zoom_trig;
extern char *shift_0;
extern char *shift_1;
extern int svf_login;
extern int svf_admin;
extern int svf_mod;
extern char svf_user[64];
extern char svf_pass[64];
extern int svf_open;
extern int svf_own;
extern int svf_myvote;
extern int svf_publish;
extern char svf_id[16];
extern char svf_name[64];
extern char svf_tags[256];
extern void *svf_last;
extern int svf_lsize;
extern int Z_keysym;
void menu_count(void);
void add_sign_ui(pixel *vid_buf, int mx, int my);
void ui_edit_draw(pixel *vid_buf, ui_edit *ed);
void ui_edit_process(int mx, int my, int mb, ui_edit *ed);
void ui_checkbox_draw(pixel *vid_buf, ui_checkbox *ed);
void ui_checkbox_process(int mx, int my, int mb, int mbq, ui_checkbox *ed);
void draw_svf_ui(pixel *vid_buf);
void error_ui(pixel *vid_buf, int err, char *txt);
void info_ui(pixel *vid_buf, char *top, char *txt);
void info_box(pixel *vid_buf, char *msg);
int confirm_ui(pixel *vid_buf, char *top, char *msg, char *btn);
void login_ui(pixel *vid_buf);
int sdl_poll(void);
#endif

875
main.c
View File

@ -100,15 +100,7 @@ int legacy_enable = 0; //Used to disable new features such as heat, will be set
int death = 1, framerender = 0;
int amd = 1;
#define MAXSIGNS 16
struct sign
{
int x,y,ju;
char text[256];
} signs[MAXSIGNS];
sign signs[MAXSIGNS];
/***********************************************************
* AIR FLOW SIMULATOR *
@ -153,9 +145,6 @@ int mousex, mousey = 0; //They contain mouse position
* SDL OUTPUT *
***********************************************************/
SDLMod sdl_mod;
int sdl_key, sdl_wheel, sdl_caps=0, sdl_ascii, sdl_zoom_trig=0;
#include "icon.h"
void sdl_seticon(void)
{
@ -222,106 +211,10 @@ void dump_frame(pixel *src, int w, int h, int pitch)
frame_idx++;
}
int Z_keysym = 'z';
int sdl_poll(void)
{
SDL_Event event;
sdl_key=sdl_wheel=sdl_ascii=0;
while(SDL_PollEvent(&event))
{
switch (event.type)
{
case SDL_KEYDOWN:
sdl_key=event.key.keysym.sym;
sdl_ascii=event.key.keysym.unicode;
if(event.key.keysym.sym == SDLK_CAPSLOCK)
sdl_caps = 1;
if(event.key.keysym.unicode=='z' || event.key.keysym.unicode=='Z')
{
sdl_zoom_trig = 1;
Z_keysym = event.key.keysym.sym;
}
if( event.key.keysym.sym == SDLK_PLUS || event.key.keysym.sym == SDLK_RIGHTBRACKET)
{
sdl_wheel++;
}
if( event.key.keysym.sym == SDLK_MINUS || event.key.keysym.sym == SDLK_LEFTBRACKET)
{
sdl_wheel--;
}
// 4
//1 8 2
if(event.key.keysym.sym == SDLK_RIGHT)
{
player[0] = (int)(player[0])|0x02; //Go right command
}
if(event.key.keysym.sym == SDLK_LEFT)
{
player[0] = (int)(player[0])|0x01; //Go left command
}
if(event.key.keysym.sym == SDLK_DOWN && ((int)(player[0])&0x08)!=0x08)
{
player[0] = (int)(player[0])|0x08; //Go left command
}
if(event.key.keysym.sym == SDLK_UP && ((int)(player[0])&0x04)!=0x04)
{
player[0] = (int)(player[0])|0x04; //Jump command
}
break;
case SDL_KEYUP:
if(event.key.keysym.sym == SDLK_CAPSLOCK)
sdl_caps = 0;
if(event.key.keysym.sym == Z_keysym)
sdl_zoom_trig = 0;
if(event.key.keysym.sym == SDLK_RIGHT || event.key.keysym.sym == SDLK_LEFT)
{
player[1] = player[0]; //Saving last movement
player[0] = (int)(player[0])&12; //Stop command
}
if(event.key.keysym.sym == SDLK_UP)
{
player[0] = (int)(player[0])&11;
}
if(event.key.keysym.sym == SDLK_DOWN)
{
player[0] = (int)(player[0])&7;
}
break;
case SDL_MOUSEBUTTONDOWN:
if(event.button.button == SDL_BUTTON_WHEELUP)
sdl_wheel++;
if(event.button.button == SDL_BUTTON_WHEELDOWN)
sdl_wheel--;
break;
case SDL_QUIT:
return 1;
}
}
sdl_mod = SDL_GetModState();
return 0;
}
/***********************************************************
* STATE MANAGEMENT *
***********************************************************/
int svf_login = 0;
int svf_admin = 0;
int svf_mod = 0;
char svf_user[64] = "";
char svf_pass[64] = "";
int svf_open = 0;
int svf_own = 0;
int svf_myvote = 0;
int svf_publish = 0;
char svf_id[16] = "";
char svf_name[64] = "";
char svf_tags[256] = "";
void *svf_last = NULL;
int svf_lsize;
void *build_thumb(int *size, int bzip2)
{
unsigned char *d=calloc(1,XRES*YRES), *c;
@ -460,18 +353,6 @@ corrupt:
return 1;
}
static char *mystrdup(char *s)
{
char *x;
if(s)
{
x = malloc(strlen(s)+1);
strcpy(x, s);
return x;
}
return s;
}
void *build_save(int *size, int x0, int y0, int w, int h)
{
unsigned char *d=calloc(1,3*(XRES/CELL)*(YRES/CELL)+(XRES*YRES)*7+MAXSIGNS*262), *c;
@ -1922,500 +1803,6 @@ int flood_parts(int x, int y, int c, int cm, int bm)
return 1;
}
void draw_svf_ui(pixel *vid_buf)
{
int c;
drawtext(vid_buf, 4, YRES+(MENUSIZE-14), "\x81", 255, 255, 255, 255);
drawrect(vid_buf, 1, YRES+(MENUSIZE-16), 16, 14, 255, 255, 255, 255);
c = svf_open ? 255 : 128;
drawtext(vid_buf, 23, YRES+(MENUSIZE-14), "\x91", c, c, c, 255);
drawrect(vid_buf, 19, YRES+(MENUSIZE-16), 16, 14, c, c, c, 255);
c = svf_login ? 255 : 128;
drawtext(vid_buf, 40, YRES+(MENUSIZE-14), "\x82", c, c, c, 255);
if(svf_open)
drawtext(vid_buf, 58, YRES+(MENUSIZE-12), svf_name, c, c, c, 255);
else
drawtext(vid_buf, 58, YRES+(MENUSIZE-12), "[untitled simulation]", c, c, c, 255);
drawrect(vid_buf, 37, YRES+(MENUSIZE-16), 150, 14, c, c, c, 255);
if(svf_open && svf_own)
drawdots(vid_buf, 55, YRES+(MENUSIZE-15), 12, c, c, c, 255);
c = (svf_login && svf_open) ? 255 : 128;
drawrect(vid_buf, 189, YRES+(MENUSIZE-16), 14, 14, c, c, c, 255);
drawrect(vid_buf, 203, YRES+(MENUSIZE-16), 14, 14, c, c, c, 255);
if(svf_myvote==1 && (svf_login && svf_open))
{
fillrect(vid_buf, 189, YRES+(MENUSIZE-16), 14, 14, 0, 108, 10, 255);
}
else if(svf_myvote==-1 && (svf_login && svf_open))
{
fillrect(vid_buf, 203, YRES+(MENUSIZE-16), 14, 14, 108, 10, 0, 255);
}
drawtext(vid_buf, 192, YRES+(MENUSIZE-12), "\xCB", 0, 187, 18, c);
drawtext(vid_buf, 205, YRES+(MENUSIZE-14), "\xCA", 187, 40, 0, c);
drawtext(vid_buf, 222, YRES+(MENUSIZE-15), "\x83", c, c, c, 255);
if(svf_tags[0])
drawtextmax(vid_buf, 240, YRES+(MENUSIZE-12), 154, svf_tags, c, c, c, 255);
else
drawtext(vid_buf, 240, YRES+(MENUSIZE-12), "[no tags set]", c, c, c, 255);
drawrect(vid_buf, 219, YRES+(MENUSIZE-16), XRES+BARSIZE-380, 14, c, c, c, 255);
drawtext(vid_buf, XRES-139+BARSIZE/*371*/, YRES+(MENUSIZE-14), "\x92", 255, 255, 255, 255);
drawrect(vid_buf, XRES-143+BARSIZE/*367*/, YRES+(MENUSIZE-16), 16, 14, 255, 255, 255, 255);
drawtext(vid_buf, XRES-122+BARSIZE/*388*/, YRES+(MENUSIZE-13), "\x84", 255, 255, 255, 255);
if(svf_login)
drawtext(vid_buf, XRES-104+BARSIZE/*406*/, YRES+(MENUSIZE-12), svf_user, 255, 255, 255, 255);
else
drawtext(vid_buf, XRES-104+BARSIZE/*406*/, YRES+(MENUSIZE-12), "[sign in]", 255, 255, 255, 255);
drawrect(vid_buf, XRES-125+BARSIZE/*385*/, YRES+(MENUSIZE-16), 91, 14, 255, 255, 255, 255);
if(sys_pause)
{
fillrect(vid_buf, XRES-17+BARSIZE/*493*/, YRES+(MENUSIZE-17), 16, 16, 255, 255, 255, 255);
drawtext(vid_buf, XRES-14+BARSIZE/*496*/, YRES+(MENUSIZE-14), "\x90", 0, 0, 0, 255);
}
else
{
drawtext(vid_buf, XRES-14+BARSIZE/*496*/, YRES+(MENUSIZE-14), "\x90", 255, 255, 255, 255);
drawrect(vid_buf, XRES-16+BARSIZE/*494*/, YRES+(MENUSIZE-16), 14, 14, 255, 255, 255, 255);
}
if(!legacy_enable)
{
fillrect(vid_buf, XRES-160+BARSIZE/*493*/, YRES+(MENUSIZE-17), 16, 16, 255, 255, 255, 255);
drawtext(vid_buf, XRES-154+BARSIZE/*481*/, YRES+(MENUSIZE-13), "\xBE", 255, 0, 0, 255);
drawtext(vid_buf, XRES-154+BARSIZE/*481*/, YRES+(MENUSIZE-13), "\xBD", 0, 0, 0, 255);
}
else
{
drawtext(vid_buf, XRES-154+BARSIZE/*481*/, YRES+(MENUSIZE-13), "\xBD", 255, 255, 255, 255);
drawrect(vid_buf, XRES-159+BARSIZE/*494*/, YRES+(MENUSIZE-16), 14, 14, 255, 255, 255, 255);
}
switch(cmode)
{
case 0:
drawtext(vid_buf, XRES-29+BARSIZE/*481*/, YRES+(MENUSIZE-13), "\x98", 128, 160, 255, 255);
break;
case 1:
drawtext(vid_buf, XRES-29+BARSIZE/*481*/, YRES+(MENUSIZE-13), "\x99", 255, 212, 32, 255);
break;
case 2:
drawtext(vid_buf, XRES-29+BARSIZE/*481*/, YRES+(MENUSIZE-13), "\x9A", 212, 212, 212, 255);
break;
case 3:
drawtext(vid_buf, XRES-29+BARSIZE/*481*/, YRES+(MENUSIZE-13), "\x9B", 255, 0, 0, 255);
drawtext(vid_buf, XRES-29+BARSIZE/*481*/, YRES+(MENUSIZE-13), "\x9C", 255, 255, 64, 255);
break;
case 4:
drawtext(vid_buf, XRES-29+BARSIZE/*481*/, YRES+(MENUSIZE-13), "\xBF", 55, 255, 55, 255);
break;
case 5:
drawtext(vid_buf, XRES-27+BARSIZE/*481*/, YRES+(MENUSIZE-13), "\xBE", 255, 0, 0, 255);
drawtext(vid_buf, XRES-27+BARSIZE/*481*/, YRES+(MENUSIZE-13), "\xBD", 255, 255, 255, 255);
break;
case 6:
drawtext(vid_buf, XRES-29+BARSIZE/*481*/, YRES+(MENUSIZE-13), "\xC4", 100, 150, 255, 255);
break;
}
drawrect(vid_buf, XRES-32+BARSIZE/*478*/, YRES+(MENUSIZE-16), 14, 14, 255, 255, 255, 255);
if(svf_admin)
{
drawtext(vid_buf, XRES-45+BARSIZE/*463*/, YRES+(MENUSIZE-14), "\xC9", 232, 127, 35, 255);
drawtext(vid_buf, XRES-45+BARSIZE/*463*/, YRES+(MENUSIZE-14), "\xC7", 255, 255, 255, 255);
drawtext(vid_buf, XRES-45+BARSIZE/*463*/, YRES+(MENUSIZE-14), "\xC8", 255, 255, 255, 255);
}
else if(svf_mod)
{
drawtext(vid_buf, XRES-45+BARSIZE/*463*/, YRES+(MENUSIZE-14), "\xC9", 35, 127, 232, 255);
drawtext(vid_buf, XRES-45+BARSIZE/*463*/, YRES+(MENUSIZE-14), "\xC7", 255, 255, 255, 255);
}//else if(amd)
// drawtext(vid_buf, XRES-45/*465*/, YRES+(MENUSIZE-15), "\x97", 0, 230, 153, 255); Why is this here?
}
typedef struct ui_edit
{
int x, y, w, nx;
char str[256],*def;
int focus, cursor, hide;
} ui_edit;
void ui_edit_draw(pixel *vid_buf, ui_edit *ed)
{
int cx, i;
char echo[256], *str;
if(ed->hide)
{
for(i=0; ed->str[i]; i++)
echo[i] = 0x8D;
echo[i] = 0;
str = echo;
}
else
str = ed->str;
if(ed->str[0])
{
drawtext(vid_buf, ed->x, ed->y, str, 255, 255, 255, 255);
drawtext(vid_buf, ed->x+ed->w-11, ed->y-1, "\xAA", 128, 128, 128, 255);
}
else if(!ed->focus)
drawtext(vid_buf, ed->x, ed->y, ed->def, 128, 128, 128, 255);
if(ed->focus)
{
cx = textnwidth(str, ed->cursor);
for(i=-3; i<9; i++)
drawpixel(vid_buf, ed->x+cx, ed->y+i, 255, 255, 255, 255);
}
}
char *shift_0="`1234567890-=[]\\;',./";
char *shift_1="~!@#$%^&*()_+{}|:\"<>?";
void ui_edit_process(int mx, int my, int mb, ui_edit *ed)
{
char ch, ts[2], echo[256], *str;
int l, i;
#ifdef RAWINPUT
char *p;
#endif
if(mb)
{
if(ed->hide)
{
for(i=0; ed->str[i]; i++)
echo[i] = 0x8D;
echo[i] = 0;
str = echo;
}
else
str = ed->str;
if(mx>=ed->x+ed->w-11 && mx<ed->x+ed->w && my>=ed->y-5 && my<ed->y+11)
{
ed->focus = 1;
ed->cursor = 0;
ed->str[0] = 0;
}
else if(mx>=ed->x-ed->nx && mx<ed->x+ed->w && my>=ed->y-5 && my<ed->y+11)
{
ed->focus = 1;
ed->cursor = textwidthx(str, mx-ed->x);
}
else
ed->focus = 0;
}
if(ed->focus && sdl_key)
{
if(ed->hide)
{
for(i=0; ed->str[i]; i++)
echo[i] = 0x8D;
echo[i] = 0;
str = echo;
}
else
str = ed->str;
l = strlen(ed->str);
switch(sdl_key)
{
case SDLK_HOME:
ed->cursor = 0;
break;
case SDLK_END:
ed->cursor = l;
break;
case SDLK_LEFT:
if(ed->cursor > 0)
ed->cursor --;
break;
case SDLK_RIGHT:
if(ed->cursor < l)
ed->cursor ++;
break;
case SDLK_DELETE:
if(sdl_mod & (KMOD_LCTRL|KMOD_RCTRL))
ed->str[ed->cursor] = 0;
else if(ed->cursor < l)
memmove(ed->str+ed->cursor, ed->str+ed->cursor+1, l-ed->cursor);
break;
case SDLK_BACKSPACE:
if(sdl_mod & (KMOD_LCTRL|KMOD_RCTRL))
{
if(ed->cursor > 0)
memmove(ed->str, ed->str+ed->cursor, l-ed->cursor+1);
ed->cursor = 0;
}
else if(ed->cursor > 0)
{
ed->cursor--;
memmove(ed->str+ed->cursor, ed->str+ed->cursor+1, l-ed->cursor);
}
break;
default:
#ifdef RAWINPUT
if(sdl_key>=SDLK_SPACE && sdl_key<=SDLK_z && l<255)
{
ch = sdl_key;
if((sdl_mod & (KMOD_LSHIFT|KMOD_RSHIFT|KMOD_CAPS)))
{
if(ch>='a' && ch<='z')
ch &= ~0x20;
p = strchr(shift_0, ch);
if(p)
ch = shift_1[p-shift_0];
}
ts[0]=ed->hide?0x8D:ch;
ts[1]=0;
if(textwidth(str)+textwidth(ts) > ed->w-14)
break;
memmove(ed->str+ed->cursor+1, ed->str+ed->cursor, l+1-ed->cursor);
ed->str[ed->cursor] = ch;
ed->cursor++;
}
#else
if(sdl_ascii>=' ' && sdl_ascii<127)
{
ch = sdl_ascii;
ts[0]=ed->hide?0x8D:ch;
ts[1]=0;
if(textwidth(str)+textwidth(ts) > ed->w-14)
break;
memmove(ed->str+ed->cursor+1, ed->str+ed->cursor, l+1-ed->cursor);
ed->str[ed->cursor] = ch;
ed->cursor++;
}
#endif
break;
}
}
}
typedef struct ui_checkbox
{
int x, y;
int focus, checked;
} ui_checkbox;
void ui_checkbox_draw(pixel *vid_buf, ui_checkbox *ed)
{
int w = 12;
if(ed->checked)
{
drawtext(vid_buf, ed->x+2, ed->y+2, "\xCF", 128, 128, 128, 255);
}
if(ed->focus)
{
drawrect(vid_buf, ed->x, ed->y, w, w, 255, 255, 255, 255);
}
else
{
drawrect(vid_buf, ed->x, ed->y, w, w, 128, 128, 128, 255);
}
}
void ui_checkbox_process(int mx, int my, int mb, int mbq, ui_checkbox *ed)
{
int w = 12;
if(mb && !mbq)
{
if(mx>=ed->x && mx<=ed->x+w && my>=ed->y && my<=ed->y+w)
{
ed->checked = (ed->checked)?0:1;
}
}
else
{
if(mx>=ed->x && mx<=ed->x+w && my>=ed->y && my<=ed->y+w)
{
ed->focus = 1;
}
else
{
ed->focus = 0;
}
}
}
void error_ui(pixel *vid_buf, int err, char *txt)
{
int x0=(XRES-240)/2,y0=(YRES-MENUSIZE)/2,b=1,bq,mx,my;
char *msg;
msg = malloc(strlen(txt)+16);
if(err)
sprintf(msg, "%03d %s", err, txt);
else
sprintf(msg, "%s", txt);
while(!sdl_poll())
{
b = SDL_GetMouseState(&mx, &my);
if(!b)
break;
}
while(!sdl_poll())
{
bq = b;
b = SDL_GetMouseState(&mx, &my);
mx /= sdl_scale;
my /= sdl_scale;
clearrect(vid_buf, x0-2, y0-2, 244, 64);
drawrect(vid_buf, x0, y0, 240, 60, 192, 192, 192, 255);
if(err)
drawtext(vid_buf, x0+8, y0+8, "HTTP error:", 255, 64, 32, 255);
else
drawtext(vid_buf, x0+8, y0+8, "Error:", 255, 64, 32, 255);
drawtext(vid_buf, x0+8, y0+26, msg, 255, 255, 255, 255);
drawtext(vid_buf, x0+5, y0+49, "Dismiss", 255, 255, 255, 255);
drawrect(vid_buf, x0, y0+44, 240, 16, 192, 192, 192, 255);
sdl_blit(0, 0, (XRES+BARSIZE), YRES+MENUSIZE, vid_buf, (XRES+BARSIZE));
if(b && !bq && mx>=x0 && mx<x0+240 && my>=y0+44 && my<=y0+60)
break;
if(sdl_key==SDLK_RETURN)
break;
if(sdl_key==SDLK_ESCAPE)
break;
}
free(msg);
while(!sdl_poll())
{
b = SDL_GetMouseState(&mx, &my);
if(!b)
break;
}
}
void info_ui(pixel *vid_buf, char *top, char *txt)
{
int x0=(XRES-240)/2,y0=(YRES-MENUSIZE)/2,b=1,bq,mx,my;
while(!sdl_poll())
{
b = SDL_GetMouseState(&mx, &my);
if(!b)
break;
}
while(!sdl_poll())
{
bq = b;
b = SDL_GetMouseState(&mx, &my);
mx /= sdl_scale;
my /= sdl_scale;
clearrect(vid_buf, x0-2, y0-2, 244, 64);
drawrect(vid_buf, x0, y0, 240, 60, 192, 192, 192, 255);
drawtext(vid_buf, x0+8, y0+8, top, 160, 160, 255, 255);
drawtext(vid_buf, x0+8, y0+26, txt, 255, 255, 255, 255);
drawtext(vid_buf, x0+5, y0+49, "OK", 255, 255, 255, 255);
drawrect(vid_buf, x0, y0+44, 240, 16, 192, 192, 192, 255);
sdl_blit(0, 0, (XRES+BARSIZE), YRES+MENUSIZE, vid_buf, (XRES+BARSIZE));
if(b && !bq && mx>=x0 && mx<x0+240 && my>=y0+44 && my<=y0+60)
break;
if(sdl_key==SDLK_RETURN)
break;
if(sdl_key==SDLK_ESCAPE)
break;
}
while(!sdl_poll())
{
b = SDL_GetMouseState(&mx, &my);
if(!b)
break;
}
}
void info_box(pixel *vid_buf, char *msg)
{
int w = textwidth(msg)+16;
int x0=(XRES-w)/2,y0=(YRES-24)/2;
clearrect(vid_buf, x0-2, y0-2, w+4, 28);
drawrect(vid_buf, x0, y0, w, 24, 192, 192, 192, 255);
drawtext(vid_buf, x0+8, y0+8, msg, 192, 192, 240, 255);
sdl_blit(0, 0, (XRES+BARSIZE), YRES+MENUSIZE, vid_buf, (XRES+BARSIZE));
}
int confirm_ui(pixel *vid_buf, char *top, char *msg, char *btn)
{
int x0=(XRES-240)/2,y0=(YRES-MENUSIZE)/2,b=1,bq,mx,my;
int ret = 0;
while(!sdl_poll())
{
b = SDL_GetMouseState(&mx, &my);
if(!b)
break;
}
while(!sdl_poll())
{
bq = b;
b = SDL_GetMouseState(&mx, &my);
mx /= sdl_scale;
my /= sdl_scale;
clearrect(vid_buf, x0-2, y0-2, 244, 64);
drawrect(vid_buf, x0, y0, 240, 60, 192, 192, 192, 255);
drawtext(vid_buf, x0+8, y0+8, top, 255, 216, 32, 255);
drawtext(vid_buf, x0+8, y0+26, msg, 255, 255, 255, 255);
drawtext(vid_buf, x0+5, y0+49, "Cancel", 255, 255, 255, 255);
drawtext(vid_buf, x0+165, y0+49, btn, 255, 216, 32, 255);
drawrect(vid_buf, x0, y0+44, 160, 16, 192, 192, 192, 255);
drawrect(vid_buf, x0+160, y0+44, 80, 16, 192, 192, 192, 255);
sdl_blit(0, 0, (XRES+BARSIZE), YRES+MENUSIZE, vid_buf, (XRES+BARSIZE));
if(b && !bq && mx>=x0+160 && mx<x0+240 && my>=y0+44 && my<=y0+60)
{
ret = 1;
break;
}
if(b && !bq && mx>=x0 && mx<x0+160 && my>=y0+44 && my<=y0+60)
break;
if(sdl_key==SDLK_RETURN)
{
ret = 1;
break;
}
if(sdl_key==SDLK_ESCAPE)
break;
}
while(!sdl_poll())
{
b = SDL_GetMouseState(&mx, &my);
if(!b)
break;
}
return ret;
}
int execute_tagop(pixel *vid_buf, char *op, char *tag)
{
int status;
@ -2827,137 +2214,6 @@ void execute_save(pixel *vid_buf)
free(result);
}
void login_ui(pixel *vid_buf)
{
int x0=(XRES-192)/2,y0=(YRES-80)/2,b=1,bq,mx,my,err;
ui_edit ed1,ed2;
char *res;
while(!sdl_poll())
{
b = SDL_GetMouseState(&mx, &my);
if(!b)
break;
}
ed1.x = x0+25;
ed1.y = y0+25;
ed1.w = 158;
ed1.nx = 1;
ed1.def = "[user name]";
ed1.focus = 1;
ed1.hide = 0;
ed1.cursor = strlen(svf_user);
strcpy(ed1.str, svf_user);
ed2.x = x0+25;
ed2.y = y0+45;
ed2.w = 158;
ed2.nx = 1;
ed2.def = "[password]";
ed2.focus = 0;
ed2.hide = 1;
ed2.cursor = 0;
strcpy(ed2.str, "");
fillrect(vid_buf, -1, -1, XRES, YRES+MENUSIZE, 0, 0, 0, 192);
while(!sdl_poll())
{
bq = b;
b = SDL_GetMouseState(&mx, &my);
mx /= sdl_scale;
my /= sdl_scale;
drawrect(vid_buf, x0, y0, 192, 80, 192, 192, 192, 255);
clearrect(vid_buf, x0, y0, 192, 80);
drawtext(vid_buf, x0+8, y0+8, "Server login:", 255, 255, 255, 255);
drawtext(vid_buf, x0+12, y0+23, "\x8B", 32, 64, 128, 255);
drawtext(vid_buf, x0+12, y0+23, "\x8A", 255, 255, 255, 255);
drawrect(vid_buf, x0+8, y0+20, 176, 16, 192, 192, 192, 255);
drawtext(vid_buf, x0+11, y0+44, "\x8C", 160, 144, 32, 255);
drawtext(vid_buf, x0+11, y0+44, "\x84", 255, 255, 255, 255);
drawrect(vid_buf, x0+8, y0+40, 176, 16, 192, 192, 192, 255);
ui_edit_draw(vid_buf, &ed1);
ui_edit_draw(vid_buf, &ed2);
drawtext(vid_buf, x0+5, y0+69, "Sign in", 255, 255, 255, 255);
drawrect(vid_buf, x0, y0+64, 192, 16, 192, 192, 192, 255);
sdl_blit(0, 0, (XRES+BARSIZE), YRES+MENUSIZE, vid_buf, (XRES+BARSIZE));
ui_edit_process(mx, my, b, &ed1);
ui_edit_process(mx, my, b, &ed2);
if(b && !bq && mx>=x0+9 && mx<x0+23 && my>=y0+22 && my<y0+36)
break;
if(b && !bq && mx>=x0+9 && mx<x0+23 && my>=y0+42 && my<y0+46)
break;
if(b && !bq && mx>=x0 && mx<x0+192 && my>=y0+64 && my<=y0+80)
break;
if(sdl_key==SDLK_RETURN || sdl_key==SDLK_TAB)
{
if(!ed1.focus)
break;
ed1.focus = 0;
ed2.focus = 1;
}
if(sdl_key==SDLK_ESCAPE)
{
if(!ed1.focus && !ed2.focus)
return;
ed1.focus = 0;
ed2.focus = 0;
}
}
strcpy(svf_user, ed1.str);
md5_ascii(svf_pass, (unsigned char *)ed2.str, 0);
res = http_multipart_post(
"http://" SERVER "/Login.api",
NULL, NULL, NULL,
svf_user, svf_pass,
&err, NULL);
if(err != 200)
{
error_ui(vid_buf, err, http_ret_text(err));
if(res)
free(res);
goto fail;
}
if(res && !strncmp(res, "OK", 2))
{
if(!strcmp(res, "OK ADMIN"))
{
svf_admin = 1;
svf_mod = 0;
}
else if(!strcmp(res, "OK MOD"))
{
svf_admin = 0;
svf_mod = 1;
}
else
{
svf_admin = 0;
svf_mod = 0;
}
free(res);
svf_login = 1;
return;
}
if(!res)
res = mystrdup("Unspecified Error");
error_ui(vid_buf, 0, res);
free(res);
fail:
strcpy(svf_user, "");
strcpy(svf_pass, "");
svf_login = 0;
svf_own = 0;
svf_admin = 0;
svf_mod = 0;
}
void execute_delete(pixel *vid_buf, char *id)
{
int status;
@ -4232,123 +3488,6 @@ void render_signs(pixel *vid_buf)
}
}
void add_sign_ui(pixel *vid_buf, int mx, int my)
{
int i, w, h, x, y, nm=0, ju;
int x0=(XRES-192)/2,y0=(YRES-80)/2,b=1,bq;
ui_edit ed;
// check if it is an existing sign
for(i=0; i<MAXSIGNS; i++)
if(signs[i].text[0])
{
get_sign_pos(i, &x, &y, &w, &h);
if(mx>=x && mx<=x+w && my>=y && my<=y+h)
break;
}
// else look for empty spot
if(i >= MAXSIGNS)
{
nm = 1;
for(i=0; i<MAXSIGNS; i++)
if(!signs[i].text[0])
break;
}
if(i >= MAXSIGNS)
return;
if(nm)
{
signs[i].x = mx;
signs[i].y = my;
signs[i].ju = 1;
}
while(!sdl_poll())
{
b = SDL_GetMouseState(&mx, &my);
if(!b)
break;
}
ed.x = x0+25;
ed.y = y0+25;
ed.w = 158;
ed.nx = 1;
ed.def = "[message]";
ed.focus = 1;
ed.hide = 0;
ed.cursor = strlen(signs[i].text);
strcpy(ed.str, signs[i].text);
ju = signs[i].ju;
fillrect(vid_buf, -1, -1, XRES, YRES+MENUSIZE, 0, 0, 0, 192);
while(!sdl_poll())
{
bq = b;
b = SDL_GetMouseState(&mx, &my);
mx /= sdl_scale;
my /= sdl_scale;
drawrect(vid_buf, x0, y0, 192, 80, 192, 192, 192, 255);
clearrect(vid_buf, x0, y0, 192, 80);
drawtext(vid_buf, x0+8, y0+8, nm ? "New sign:" : "Edit sign:", 255, 255, 255, 255);
drawtext(vid_buf, x0+12, y0+23, "\xA1", 32, 64, 128, 255);
drawtext(vid_buf, x0+12, y0+23, "\xA0", 255, 255, 255, 255);
drawrect(vid_buf, x0+8, y0+20, 176, 16, 192, 192, 192, 255);
ui_edit_draw(vid_buf, &ed);
drawtext(vid_buf, x0+8, y0+46, "Justify:", 255, 255, 255, 255);
draw_icon(vid_buf, x0+50, y0+42, 0x9D, ju == 0);
draw_icon(vid_buf, x0+68, y0+42, 0x9E, ju == 1);
draw_icon(vid_buf, x0+86, y0+42, 0x9F, ju == 2);
if(!nm)
{
drawtext(vid_buf, x0+138, y0+45, "\x86", 160, 48, 32, 255);
drawtext(vid_buf, x0+138, y0+45, "\x85", 255, 255, 255, 255);
drawtext(vid_buf, x0+152, y0+46, "Delete", 255, 255, 255, 255);
drawrect(vid_buf, x0+134, y0+42, 50, 15, 255, 255, 255, 255);
}
drawtext(vid_buf, x0+5, y0+69, "OK", 255, 255, 255, 255);
drawrect(vid_buf, x0, y0+64, 192, 16, 192, 192, 192, 255);
sdl_blit(0, 0, (XRES+BARSIZE), YRES+MENUSIZE, vid_buf, (XRES+BARSIZE));
ui_edit_process(mx, my, b, &ed);
if(b && !bq && mx>=x0+50 && mx<=x0+67 && my>=y0+42 && my<=y0+59)
ju = 0;
if(b && !bq && mx>=x0+68 && mx<=x0+85 && my>=y0+42 && my<=y0+59)
ju = 1;
if(b && !bq && mx>=x0+86 && mx<=x0+103 && my>=y0+42 && my<=y0+59)
ju = 2;
if(b && !bq && mx>=x0+9 && mx<x0+23 && my>=y0+22 && my<y0+36)
break;
if(b && !bq && mx>=x0 && mx<x0+192 && my>=y0+64 && my<=y0+80)
break;
if(!nm && b && !bq && mx>=x0+134 && my>=y0+42 && mx<=x0+184 && my<=y0+59)
{
signs[i].text[0] = 0;
return;
}
if(sdl_key==SDLK_RETURN)
break;
if(sdl_key==SDLK_ESCAPE)
{
if(!ed.focus)
return;
ed.focus = 0;
}
}
strcpy(signs[i].text, ed.str);
signs[i].ju = ju;
}
/***********************************************************
* CONFIG FILE *
***********************************************************/
@ -4978,19 +4117,7 @@ int main(int argc, char *argv[])
if(!sys_pause||framerender)
{
#ifdef MT
if(numCores>2)
{
pthread_t pth;
pthread_create(&pth,NULL,update_air_th,"");
}
else
{
update_air();
}
#else
update_air();
#endif
}
if(cmode==0 || cmode==1)
{

18
misc.c
View File

@ -1,10 +1,12 @@
#include <stdlib.h>
#include <string.h>
#include "misc.h"
//Signum function
#ifdef WIN32
_inline int sign(float i)
_inline int isign(float i)
#else
inline int sign(float i)
inline int isign(float i)
#endif
{
if (i<0)
@ -38,4 +40,16 @@ inline float restrict_flt(float f, float min, float max)
if(f>max)
return max;
return f;
}
char *mystrdup(char *s)
{
char *x;
if(s)
{
x = malloc(strlen(s)+1);
strcpy(x, s);
return x;
}
return s;
}

6
misc.h
View File

@ -3,9 +3,9 @@
//Signum function
#ifdef WIN32
extern _inline int sign(float i);
extern _inline int isign(float i);
#else
extern inline int sign(float i);
extern inline int isign(float i);
#endif
#ifdef WIN32
@ -20,4 +20,6 @@ extern _inline float restrict_flt(float f, float min, float max);
extern inline float restrict_flt(float f, float min, float max);
#endif
char *mystrdup(char *s);
#endif