diff -Naurd ../nethack-3.3.1/win/gem/gr_rect.c ./win/gem/gr_rect.c --- ../nethack-3.3.1/win/gem/gr_rect.c Thu Jan 1 01:00:00 1970 +++ ./win/gem/gr_rect.c Fri Mar 22 14:40:55 2002 @@ -0,0 +1,181 @@ +/* SCCS Id: @(#)gr_rect.c 3.4 2001/12/10 */ +/* Copyright (c) Christian Bressler, 2001 */ +/* NetHack may be freely redistributed. See license for details. */ +/* This is an almost exact copy of qt_clust.cpp */ +/* gr_rect.c */ +#include +#include +#include +#include "gr_rect.h" +dirty_rect *new_dirty_rect(int size){ + dirty_rect *new=NULL; + if(size>0){ + new=(dirty_rect *)calloc(1L,sizeof(dirty_rect)); + if(new){ + new->rects=(GRECT *)calloc((long)size,sizeof(GRECT)); + if(new->rects==NULL){ + free(new); + return(NULL); + } + new->max=size; + } + } + return(new); +} +void delete_dirty_rect(dirty_rect *this){ + if(this==NULL) + return; + if(this->rects) + free(this->rects); + /* In case the Pointer is reused wrongly */ + this->rects=NULL; + this->max=0; + this->used=0; + free(this); +} +static int gc_inside(GRECT *frame,GRECT *test); +static int gc_touch(GRECT *frame,GRECT *test); +static void gc_combine(GRECT *frame,GRECT *test); +static long gc_area(GRECT *area); +int add_dirty_rect(dirty_rect *dr,GRECT *area){ + int cursor; + long lowestcost=9999999L; + int cheapest=-1; + int cheapestmerge1=-1; + int cheapestmerge2=-1; + int merge1; + int merge2; + for (cursor=0; cursorused; cursor++) { + if (gc_inside(&dr->rects[cursor],area)) { + /* Wholly contained already. */ + return(TRUE); + } + } + for (cursor=0; cursorused; cursor++) { + if (gc_touch(&dr->rects[cursor],area)) { + GRECT larger=dr->rects[cursor]; + long cost; + gc_combine(&larger,area); + cost=gc_area(&larger)-gc_area(&dr->rects[cursor]); + if (cost < lowestcost) { + int bad=FALSE,c; + for (c=0; cused && !bad; c++) { + bad=gc_touch(&dr->rects[c],&larger) && c!=cursor; + } + if (!bad) { + cheapest=cursor; + lowestcost=cost; + } + } + } + } + if (cheapest>=0) { + gc_combine(&dr->rects[cheapest],area); + return(TRUE); + } + if (dr->used < dr->max) { + dr->rects[dr->used++]=*area; + return(TRUE); + } + // Do cheapest of: + // add to closest cluster + // do cheapest cluster merge, add to new cluster + lowestcost=9999999L; + cheapest=-1; + for (cursor=0; cursorused; cursor++) { + GRECT larger=dr->rects[cursor]; + long cost; + gc_combine(&larger,area); + cost=gc_area(&larger)-gc_area(&dr->rects[cursor]); + if (cost < lowestcost) { + int bad=FALSE, c; + for (c=0; cused && !bad; c++) { + bad=gc_touch(&dr->rects[c],&larger) && c!=cursor; + } + if (!bad) { + cheapest=cursor; + lowestcost=cost; + } + } + } + // XXX could make an heuristic guess as to whether we + // XXX need to bother looking for a cheap merge. + for (merge1=0; merge1used; merge1++) { + for (merge2=0; merge2used; merge2++) { + if (merge1!=merge2) { + GRECT larger=dr->rects[merge1]; + long cost; + gc_combine(&larger,&dr->rects[merge2]); + cost=gc_area(&larger)-gc_area(&dr->rects[merge1])-gc_area(&dr->rects[merge2]); + if (cost < lowestcost) { + int bad=FALSE, c; + for (c=0; cused && !bad; c++) { + bad=gc_touch(&dr->rects[c],&larger) && c!=cursor; + } + if (!bad) { + cheapestmerge1=merge1; + cheapestmerge2=merge2; + lowestcost=cost; + } + } + } + } + } + if (cheapestmerge1>=0) { + gc_combine(&dr->rects[cheapestmerge1],&dr->rects[cheapestmerge2]); + dr->rects[cheapestmerge2]=dr->rects[dr->used-1]; + dr->rects[dr->used-1]=*area; + } else { + gc_combine(&dr->rects[cheapest],area); + } + // NB: clusters do not intersect (or intersection will + // overwrite). This is a result of the above algorithm, + // given the assumption that (x,y) are ordered topleft + // to bottomright. + return(TRUE); +} +int get_dirty_rect(dirty_rect* dr,GRECT *area){ + if(dr==NULL || area==NULL || dr->rects==NULL || dr->used<=0 || dr->max<=0) + return(FALSE); + *area=dr->rects[--dr->used]; + return(TRUE); +} +int clear_dirty_rect(dirty_rect *dr){ + if(dr) + dr->used=0; + return(TRUE); +} +int resize_dirty_rect(dirty_rect *dr,int new_size){ + return(FALSE); +} +static int gc_inside(GRECT *frame,GRECT *test){ + if(frame && test && frame->g_x<=test->g_x && frame->g_y<=test->g_y && + frame->g_x+frame->g_w>=test->g_x+test->g_w && + frame->g_y+frame->g_h>=test->g_y+test->g_h + ) + return(TRUE); + return(FALSE); +} +static int gc_touch(GRECT *frame,GRECT *test){ + GRECT tmp={test->g_x-1,test->g_y-1,test->g_w+2,test->g_h+2}; + return(rc_intersect(frame,&tmp)); +} +static void gc_combine(GRECT *frame,GRECT *test){ + if(!frame || !test) + return; + if(frame->g_x>test->g_x){ + frame->g_w+=frame->g_x-test->g_x; + frame->g_x=test->g_x; + } + if(frame->g_y>test->g_y){ + frame->g_h+=frame->g_y-test->g_y; + frame->g_y=test->g_y; + } + if(frame->g_x+frame->g_wg_x+test->g_w) + frame->g_w=test->g_x+test->g_w-frame->g_x; + if(frame->g_y+frame->g_hg_y+test->g_h) + frame->g_h=test->g_y+test->g_h-frame->g_y; +} +static long gc_area(GRECT *area){ + return((long)area->g_h*(long)area->g_w); +} diff -Naurd ../nethack-3.3.1/win/gem/gr_rect.h ./win/gem/gr_rect.h --- ../nethack-3.3.1/win/gem/gr_rect.h Thu Jan 1 01:00:00 1970 +++ ./win/gem/gr_rect.h Fri Mar 22 14:40:55 2002 @@ -0,0 +1,14 @@ +/* gr_rect.h */ +#include +/********** structs **********/ +typedef struct { + GRECT *rects; + int max,used; +} dirty_rect; +/********* functions ************/ +dirty_rect *new_dirty_rect(int size); +void delete_dirty_rect(dirty_rect *this); +int add_dirty_rect(dirty_rect *dr,GRECT *area); +int get_dirty_rect(dirty_rect* dr,GRECT *area); +int clear_dirty_rect(dirty_rect *dr); +int resize_dirty_rect(dirty_rect *dr,int new_size); diff -Naurd ../nethack-3.3.1/win/gem/Install.gem ./win/gem/Install.gem --- ../nethack-3.3.1/win/gem/Install.gem Mon Aug 7 16:40:17 2000 +++ ./win/gem/Install.gem Fri Mar 22 14:40:55 2002 @@ -1,6 +1,6 @@ Hi, -This is nethack3.3.1 for Atari Gem and tty +This is nethack3.4.0 for Atari Gem and tty Windowing System. It is by far not complete or perfect. diff -Naurd ../nethack-3.3.1/win/gem/load_img.c ./win/gem/load_img.c --- ../nethack-3.3.1/win/gem/load_img.c Thu Feb 17 23:04:29 2000 +++ ./win/gem/load_img.c Fri Mar 22 14:40:55 2002 @@ -37,7 +37,7 @@ if(i<16) idx=vdi2dev4[i]; else - idx=i; + idx= i==255 ? 1 : i; } vq_color(handle, i, 0, (int *)palette + idx * 3); } @@ -49,7 +49,7 @@ /* set color palette */ end=min(1< pic->img_h) scan_repeat = pic->img_h - line; - /* copy line to image buffer */ if(scan_repeat>1){ /* calculate address of a current line in a current bitplane */ diff -Naurd ../nethack-3.3.1/win/gem/wingem1.c ./win/gem/wingem1.c --- ../nethack-3.3.1/win/gem/wingem1.c Mon Aug 7 16:40:17 2000 +++ ./win/gem/wingem1.c Fri Mar 22 14:40:55 2002 @@ -1,10 +1,11 @@ -/* SCCS Id: @(#)wingem1.c 3.3 1999/12/10 */ +/* SCCS Id: @(#)wingem1.c 3.4 1999/12/10 */ /* Copyright (c) Christian Bressler 1999 */ /* NetHack may be freely redistributed. See license for details. */ #define __TCC_COMPAT__ #include +#include #include #include #include @@ -13,6 +14,7 @@ #include "gem_rsc.h" #include "load_img.h" +#include "gr_rect.h" #define genericptr_t void * #include "wintype.h" @@ -39,13 +41,14 @@ #undef NDECL #undef FDECL -static char nullstr[]="", md[]="NetHack 3.3.1", strCancel[]="Cancel", strOk[]="Ok", strText[]="Text"; +static char nullstr[]="", md[]="NetHack 3.4.0", strCancel[]="Cancel", strOk[]="Ok", strText[]="Text"; extern winid WIN_MESSAGE, WIN_MAP, WIN_STATUS, WIN_INVEN; #define MAXWIN 20 #define ROWNO 21 #define COLNO 80 +#define MSGLEN 100 #define MAP_GADGETS NAME|MOVER|CLOSER|FULLER|LFARROW|RTARROW|UPARROW|DNARROW|VSLIDE|HSLIDE|SIZER|SMALLER #define DIALOG_MODE AUTO_DIAL|MODAL|NO_ICONIFY @@ -116,11 +119,19 @@ extern void Gem_raw_print(const char *); /* from wingem.c */ extern int mar_hp_query(void); /* from wingem.c */ extern int mar_get_msg_history(void); /* from wingem.c */ +extern int mar_get_msg_visible(void); /* from wingem.c */ +extern void mar_get_font(int,char **,int *);/* from wingem.c */ extern int vdi2dev4[]; /* from load_img.c */ +void recalc_msg_win(GRECT*); +void recalc_status_win(GRECT*); +void calc_std_winplace(int, GRECT *); +int (*v_mtext)(int,int,int,char*); static int no_glyph; /* the int indicating there is no glyph */ IMG_header tile_image, titel_image, rip_image; -MFDB Tile_bilder, Map_bild, Titel_bild, Rip_bild, Black_bild, Pet_Mark; +MFDB Tile_bilder, Map_bild, Titel_bild, Rip_bild, Black_bild, Pet_Mark, FontCol_Bild; +static int Tile_width=16, Tile_heigth=16, Tiles_per_line=20; +char *Tilefile=NULL; /* pet_mark Design by Warwick Allison warwick@troll.no */ static int pet_mark_data[]={0x0000,0x3600,0x7F00,0x7F00,0x3E00,0x1C00,0x0800}; static short *normal_palette=NULL; @@ -131,19 +142,28 @@ GRECT gw_place; } Gem_nhwindow[MAXWIN]; -int Fcw, Fch; +typedef struct { + int id; + int size; + int cw, ch; + int prop; +} NHGEM_FONT; /*struct gemmapdata {*/ - GRECT dirty_map_area={COLNO,ROWNO,0,0}; + GRECT dirty_map_area={COLNO-1,ROWNO,0,0}; int map_cursx=0, map_cursy=0, curs_col=WHITE; - int draw_cursor=TRUE, map_cell_width=16; + int draw_cursor=TRUE, scroll_margin=-1; + NHGEM_FONT map_font; SCROLL scroll_map; char **map_glyphs=NULL; + dirty_rect *dr_map; /*};*/ /*struct gemstatusdata{*/ char **status_line; - int Anz_status_lines, status_w, StFch, StFcw; + int Anz_status_lines, status_w, status_align=FALSE; + NHGEM_FONT status_font; + dirty_rect *dr_stat; /*};*/ /*struct gemmessagedata{*/ @@ -152,19 +172,25 @@ int messages_pro_zug=0; char **message_line; int *message_age; - int msg_pos=0, msg_max=0, msg_anz=0, msg_width=0; + int msg_pos=0, msg_max=0, msg_anz=0, msg_width=0, msg_vis=3, msg_align=TRUE; + NHGEM_FONT msg_font; + dirty_rect *dr_msg; /*};*/ /*struct geminvdata {*/ SCROLL scroll_menu; Gem_menu_item *invent_list; int Anz_inv_lines=0, Inv_breite=16; + NHGEM_FONT menu_font; int Inv_how; /*};*/ /*struct gemtextdata{*/ char **text_lines; int Anz_text_lines=0, text_width; + NHGEM_FONT text_font; + int use_rip=FALSE; + extern char** rip_line; /*};*/ static OBJECT *zz_oblist[NHICON+1]; @@ -222,6 +248,35 @@ mar_display_nhwindow(WIN_MESSAGE); } +void clipbrd_save(void *data,int cnt,boolean append,boolean is_inv){ + char path[MAX_PATH],*text,*crlf="\r\n"; + long handle; + int i; + + if (data && cnt>0 && scrp_path(path,"scrap.txt") && (handle = append ? Fopen(path,1) : Fcreate(path,0))>0){ + if (append) + Fseek(0L,(int) handle,SEEK_END); + if(is_inv){ + Gem_menu_item *it=(Gem_menu_item *)data; + + for(;it;it=it->Gmi_next){ + text=it->Gmi_str; + Fwrite((int) handle,strlen(text),text); + Fwrite((int) handle,2L,crlf); + } + }else{ + for(i=0;i2){ + if(msg_pos>msg_vis-1){ msg_pos--; Gem_nhwindow[WIN_MESSAGE].gw_dirty=TRUE; mar_display_nhwindow(WIN_MESSAGE); @@ -281,8 +336,191 @@ no_glyph=ng; } +void +mar_set_tilefile(name) +char* name; +{ + Tilefile=name; +} +void +mar_set_tilex(value) +int value; +{ + Min(&value,32); + Max(&value,1); + Tile_width=value; +} +void +mar_set_tiley(value) +int value; +{ + Min(&value,32); + Max(&value,1); + Tile_heigth=value; +} /****************************** userdef_draw *************************************/ +void rearrange_windows(void); +void mar_set_status_align(int sa){ + if(status_align!=sa){ + status_align=sa; + rearrange_windows(); + } +} +void mar_set_msg_align(int ma){ + if(msg_align!=ma){ + msg_align=ma; + rearrange_windows(); + } +} +void mar_set_msg_visible(int mv){ + if(mv!=msg_vis){ + Max(&mv,1); + Min(&mv,min(msg_anz,20)); + Min(&mv,desk.g_h/msg_font.ch/2); + msg_vis=mv; + rearrange_windows(); + } +} +/* size<0 cellheight; size>0 points */ +void mar_set_fontbyid(int type, int id, int size){ + int chardim[4]; + if(id<=0) + id=ibm_font_id; + if((size>-3 && size<3) || size<-20 || size>20) + size=-ibm_font; + /* MAR -- 17.Mar 2002 For now allow FNT_PROP only with NHW_TEXT */ + if(type!=NHW_TEXT && (FontInfo(id)->type & (FNT_PROP|FNT_ASCII))) + id=ibm_font_id; + switch(type){ + case NHW_MESSAGE: + if(msg_font.size==-size && msg_font.id==id) + break; + msg_font.size=-size; + msg_font.id=id; + msg_font.prop=FontInfo(id)->type & (FNT_PROP|FNT_ASCII); + v_set_text(msg_font.id,msg_font.size,BLACK,0,0,chardim); + msg_font.ch=chardim[3] ? chardim[3] : 1; + msg_font.cw=chardim[2] ? chardim[2] : 1; + msg_width=min(max_w/msg_font.cw-3,MSGLEN); + rearrange_windows(); + break; + case NHW_MAP: + if(map_font.size!=-size || map_font.id!=id){ + MFDB mtmp; + map_font.size=-size; + map_font.id=id; + map_font.prop=FontInfo(id)->type & (FNT_PROP|FNT_ASCII); + v_set_text(map_font.id,map_font.size,BLACK,0,0,chardim); + map_font.ch=chardim[3] ? chardim[3] : 1; + map_font.cw=chardim[2] ? chardim[2] : 1; + mfdb(&mtmp,NULL,(COLNO-1)*map_font.cw, ROWNO*map_font.ch, 0, planes); + if(mfdb_size(&mtmp)>mfdb_size(&FontCol_Bild) && mfdb_size(&mtmp)>mfdb_size(&Map_bild)){ + FontCol_Bild.fd_addr=Map_bild.fd_addr=(int *)realloc(Map_bild.fd_addr,mfdb_size(&mtmp)); + if(!Map_bild.fd_addr) /* FIXME -- Not really neccessary since the former space is still valid */ + panic("Not enough Space for the map."); + } + mfdb(&FontCol_Bild,FontCol_Bild.fd_addr,(COLNO-1)*map_font.cw, ROWNO*map_font.ch, 0, planes); + rearrange_windows(); + } + break; + case NHW_STATUS: + if(status_font.size==-size && status_font.id==id) + break; + status_font.size=-size; + status_font.id=id; + status_font.prop=FontInfo(id)->type & (FNT_PROP|FNT_ASCII); + v_set_text(status_font.id,status_font.size,BLACK,0,0,chardim); + status_font.ch=chardim[3] ? chardim[3] : 1; + status_font.cw=chardim[2] ? chardim[2] : 1; + rearrange_windows(); + break; + case NHW_MENU: + if(menu_font.size==-size && menu_font.id==id) + break; + menu_font.size=-size; + menu_font.id=id; + menu_font.prop=FontInfo(id)->type & (FNT_PROP|FNT_ASCII); + v_set_text(menu_font.id,menu_font.size,BLACK,0,0,chardim); + menu_font.ch=chardim[3] ? chardim[3] : 1; + menu_font.cw=chardim[2] ? chardim[2] : 1; + break; + case NHW_TEXT: + if(text_font.size==-size && text_font.id==id) + break; + text_font.size=-size; + text_font.id=id; + text_font.prop=FontInfo(id)->type & (FNT_PROP|FNT_ASCII); + v_set_text(text_font.id,text_font.size,BLACK,0,0,chardim); + text_font.ch=chardim[3] ? chardim[3] : 1; + text_font.cw=chardim[2] ? chardim[2] : 1; + break; + default: + break; + } +} +void mar_set_font(int type, const char *font_name, int size){ + int id=0; + /* MAR -- 17.Mar 2002 usual Gem behavior, use the Font-ID */ + if(font_name && *font_name){ + id=atoi(font_name); + if(id<=0){ + int i, tid; + char name[32]; + for(i=fonts_loaded;--i>=0;){ + tid=vqt_name(x_handle,i,name); + if(!stricmp(name,font_name)){ + id=tid; + break; + } + } + } + } + mar_set_fontbyid(type,id,size); +} +void rearrange_windows(void){ + GRECT area; + int todo=TRUE; + if(WIN_MAP != WIN_ERR && Gem_nhwindow[WIN_MAP].gw_window){ + scroll_map.px_hline=mar_set_tile_mode(FAIL)?Tile_width:map_font.cw; + scroll_map.px_vline=mar_set_tile_mode(FAIL)?Tile_heigth:map_font.ch; + if(todo){ + calc_std_winplace(FAIL,&area); + todo=FALSE; + } + calc_std_winplace(NHW_MAP,&area); + Gem_nhwindow[WIN_MAP].gw_window->max.g_w=area.g_w; + Gem_nhwindow[WIN_MAP].gw_window->max.g_h=area.g_h; + Gem_nhwindow[WIN_MAP].gw_window->max.g_w=area.g_w; + window_reinit(Gem_nhwindow[WIN_MAP].gw_window,md,md,NULL,FALSE,FALSE); + { + int buf[8]; + buf[3]=K_CTRL; + buf[4]=C('L'); + AvSendMsg(ap_id,AV_SENDKEY,buf); + } + } + if(WIN_MESSAGE != WIN_ERR && Gem_nhwindow[WIN_MESSAGE].gw_window){ + if(todo){ + calc_std_winplace(FAIL,&area); + todo=FALSE; + } + calc_std_winplace(NHW_MESSAGE,&area); + Gem_nhwindow[WIN_MESSAGE].gw_window->min_h=area.g_h; + window_size(Gem_nhwindow[WIN_MESSAGE].gw_window,&area); + redraw_window(Gem_nhwindow[WIN_MESSAGE].gw_window,NULL); + } + if(WIN_STATUS != WIN_ERR && Gem_nhwindow[WIN_STATUS].gw_window){ + if(todo){ + calc_std_winplace(FAIL,&area); + todo=FALSE; + } + calc_std_winplace(NHW_STATUS,&area); + Gem_nhwindow[WIN_STATUS].gw_window->min_h=area.g_h; + window_size(Gem_nhwindow[WIN_STATUS].gw_window,&area); + redraw_window(Gem_nhwindow[WIN_STATUS].gw_window,NULL); + } +} void my_color_area(GRECT *area, int col){ int pxy[4]; @@ -299,41 +537,42 @@ static void win_draw_map(int first, WIN *win, GRECT *area){ int pla[8], w=area->g_w-1, h=area->g_h-1; - int i, x, y, mode, mch; + int i, x, y; GRECT back=*area; first=first; - v_set_mode(MD_REPLACE); - mode=S_ONLY; if(!mar_set_tile_mode(FAIL)){ - v_set_text(ibm_font_id,ibm_font,WHITE,0,0,NULL); + int start=(area->g_x-win->work.g_x)/map_font.cw+scroll_map.hpos; + int stop=(area->g_x+area->g_w+map_font.cw-1-win->work.g_x)/map_font.cw+scroll_map.hpos; + int starty=(area->g_y-win->work.g_y)/map_font.ch+scroll_map.vpos; + int stopy=min((area->g_y+area->g_h+map_font.ch-1-win->work.g_y)/map_font.ch+scroll_map.vpos,ROWNO); + char tmp; + v_set_text(map_font.id,map_font.size,WHITE,0,0,NULL); v_set_mode(MD_TRANS); - mode=S_OR_D; - mch=Fch-1; - x=win->work.g_x-scroll_map.px_hpos; - y=win->work.g_y-scroll_map.px_vpos; - pla[2]=pla[0]=area->g_x-x; - pla[3]=pla[1]=0; + x=win->work.g_x-scroll_map.px_hpos+start*map_font.cw; + y=win->work.g_y-scroll_map.px_vpos+starty*map_font.ch; + pla[2]=pla[0]=scroll_map.px_hpos+area->g_x-win->work.g_x; + pla[3]=pla[1]=starty*map_font.ch; pla[2]+=w; - pla[3]+=mch; /* MAR -- was 16 */ + pla[3]+=map_font.ch-1; pla[6]=pla[4]=area->g_x; /* x_wert to */ pla[7]=pla[5]=y; /* y_wert to */ pla[6]+=w; - pla[7]+=mch; /* MAR -- was 16 */ - Vsync(); - back.g_h=Fch; /* MAR -- was 16 */ - for(i=0;ig_x-win->work.g_x; pla[3]=pla[1]=scroll_map.px_vpos+area->g_y-win->work.g_y; pla[2]+=w; @@ -342,15 +581,15 @@ pla[7]=pla[5]=area->g_y; /* y_wert to */ pla[6]+=w; pla[7]+=h; - vro_cpyfm(x_handle, mode, pla, &Map_bild, screen); + vro_cpyfm(x_handle, S_ONLY, pla, &Map_bild, screen); } if(draw_cursor){ v_set_line(curs_col,1,1,0,0); pla[0]=pla[2]=win->work.g_x+scroll_map.px_hline*(map_cursx-scroll_map.hpos); pla[1]=pla[3]=win->work.g_y+scroll_map.px_vline*(map_cursy-scroll_map.vpos); - pla[2]+=map_cell_width-1; - pla[3]+=mch; + pla[2]+=scroll_map.px_hline-1; + pla[3]+=scroll_map.px_vline-1; v_rect(pla[0],pla[1],pla[2],pla[3]); } } @@ -379,32 +618,78 @@ if(rc_intersect((GRECT *)&pb->pb_xc,&area)){ char **ptr; - int x=pb->pb_x,y=pb->pb_y,start_line=(area.g_y-y), chardim[4]; + int x=pb->pb_x,y=pb->pb_y,start_line=(area.g_y-y); - v_set_mode(MD_REPLACE); + v_set_mode((text_font.cw&7)==0 && text_font.prop==0 ? MD_REPLACE : MD_TRANS); /* void v_set_text(int font,int height,int color,int effect,int rotate,int out[4]) */ - v_set_text(ibm_font_id,ibm_font,BLACK,0,0,chardim); + v_set_text(text_font.id,text_font.size,BLACK,0,0,NULL); + start_line /= text_font.ch; + y+=start_line*text_font.ch; + x-=(int)scroll_menu.px_hpos; + ptr=&text_lines[start_line+=scroll_menu.vpos]; + start_line = min((area.g_y-y+area.g_h+text_font.ch-1)/text_font.ch,Anz_text_lines-start_line); + area.g_h=text_font.ch; + Vsync(); +/* x=(x+7) & ~7;*/ + for(;--start_line>=0;y+=text_font.ch){ + area.g_y=y; + my_clear_area(&area); + if(**ptr-1){ + v_set_text(FAIL,0,BLUE,0x01,0,NULL); + (*v_mtext)(x_handle,x,y,(*ptr++)+1); + v_set_text(FAIL,0,BLACK,0x00,0,NULL); + }else + (*v_mtext)(x_handle,x,y,(*ptr++)+1); + } + } + return(0); +} - Fch= chardim[3] ? chardim[3] : 1; - start_line /= Fch; - y+=start_line*Fch; +static int draw_rip(PARMBLK *pb){ + GRECT area=*(GRECT *) &pb->pb_x; + if(rc_intersect((GRECT *)&pb->pb_xc,&area)){ + char **ptr; + int x=pb->pb_x,y=pb->pb_y,start_line=(area.g_y-y), chardim[4], pla[8],i; + v_set_mode(MD_REPLACE); +/* void v_set_text(int font,int height,int color,int effect,int rotate,int out[4]) */ + v_set_text(text_font.id,text_font.size,BLACK,0,0,chardim); + start_line /= text_font.ch; + y+=start_line*text_font.ch; x-=scroll_menu.px_hpos; ptr=&text_lines[start_line+=scroll_menu.vpos]; - start_line = min((area.g_y-y+area.g_h+Fch-1)/Fch,Anz_text_lines-start_line); - area.g_h=Fch; + start_line = min((area.g_y-y+area.g_h+text_font.ch-1)/text_font.ch,Anz_text_lines-start_line); + area.g_h=text_font.ch; Vsync(); - for(;--start_line>=0;y+=Fch){ + x=(x+7) & ~7; + for(;--start_line>=0;y+=text_font.ch){ area.g_y=y; my_clear_area(&area); if(**ptr-1){ v_set_text(FAIL,0,BLUE,0x01,0,NULL); - v_gtext(x_handle,x,y,(*ptr++)+1); + (*v_mtext)(x_handle,x,y,(*ptr++)+1); v_set_text(FAIL,0,BLACK,0x00,0,NULL); }else - v_gtext(x_handle,x,y,(*ptr++)+1); - + (*v_mtext)(x_handle,x,y,(*ptr++)+1); } + pla[0]=pla[1]=0; + pla[2]=min(pb->pb_w-1,Rip_bild.fd_w-1); + pla[3]=min(pb->pb_h-1,Rip_bild.fd_h-1); + pla[6]=pla[4]=pb->pb_x+(pb->pb_w-Rip_bild.fd_w)/2; /* x_wert to */ + pla[7]=pla[5]=pb->pb_y; /* y_wert to */ + pla[6]+=pla[2]; + pla[7]+=pla[3]; + vro_cpyfm(x_handle, S_ONLY, pla, &Rip_bild, screen); + v_set_mode(MD_TRANS); + vst_alignment(x_handle,1,5,&i,&i); + pla[5]+=64; + for(i=0;i<7;i++,pla[5]+=chardim[3]){ + v_set_text(text_font.id,(i==0 || i==6) ? text_font.size : 12,WHITE,1,0,chardim); + (*v_mtext)(x_handle,pla[4]+157,pla[5],rip_line[i]); + v_set_text(text_font.id,(i==0 || i==6) ? text_font.size : 12,BLACK,0,0,chardim); + (*v_mtext)(x_handle,pla[4]+157,pla[5],rip_line[i]); + } + vst_alignment(x_handle,0,5,&i,&i); } return(0); } @@ -413,27 +698,32 @@ GRECT area=*(GRECT *) &pb->pb_x; if(rc_intersect((GRECT *)&pb->pb_xc,&area)){ - int x=pb->pb_x, y=pb->pb_y+2*Fch, foo, i; - char **ptr=&message_line[msg_pos]; + int x=pb->pb_x, y=pb->pb_y+(msg_vis-1)*msg_font.ch, foo, i; + char **ptr=&message_line[msg_pos], tmp; + int startx, stopx, starty, stopy; x=(x+7) & ~7; /* Byte alignment speeds output up */ v_set_mode(MD_REPLACE); /* void v_set_text(int font,int height,int color,int effect,int rotate,int out[4]) */ - v_set_text(ibm_font_id,ibm_font,FAIL, FAIL,0,NULL); + v_set_text(msg_font.id,msg_font.size,FAIL, FAIL,0,NULL); vst_alignment(x_handle,0,5,&foo,&foo); - foo=min(msg_pos,3); -/* area.g_h=Fch;*/ - Vsync(); - for(i=0;ipb_x; + area.g_x+=2*status_font.cw-2; + area.g_w-=2*status_font.cw-2; if(rc_intersect((GRECT *)&pb->pb_xc,&area)){ - char **ptr=status_line; - int x=pb->pb_x, y=pb->pb_y, chardim[4], h; + int x=pb->pb_x, y=pb->pb_y, startx, stopx, starty, stopy, i; + char tmp; /* void v_set_text(int font,int height,int color,int effect,int rotate,int out[4]) */ v_set_mode(MD_REPLACE); - if(max_w/Fcw>=COLNO-1) - v_set_text(ibm_font_id,ibm_font,BLACK,0,0,chardim); - else - v_set_text(small_font_id,small_font,BLACK,0,0,chardim); - h=chardim[3] ? chardim[3] : 1; - x+=2*chardim[2]; + v_set_text(status_font.id,status_font.size,BLACK,0,0,NULL); + x = (x+2*status_font.cw+6) & ~7; - Vsync(); + startx=(area.g_x-x)/status_font.cw; + starty=(area.g_y-y)/status_font.ch; + stopx=(area.g_x+area.g_w+status_font.ch-1-x)/status_font.cw; + stopy=(area.g_y+area.g_h+status_font.ch-1-y)/status_font.ch; + Max(&startx,0); /* MAR -- Hmm, area.g_x could end up 1 below x */ + Max(&stopx,0); + x+=startx*status_font.cw; + y+=starty*status_font.ch; +/* Vsync();*/ + area.g_h=status_font.ch; + for(i=starty;i=0 && it; it=it->Gmi_next); - i = min((area.g_y-y+area.g_h+Fch-1)/Fch,Anz_inv_lines-start_line); + i = min((area.g_y-y+area.g_h+menu_font.ch-1)/menu_font.ch,Anz_inv_lines-start_line); Vsync(); - area.g_h=Fch; + area.g_h=menu_font.ch; - for(;(--i>=0) && it;it=it->Gmi_next,y+=Fch){ + for(;(--i>=0) && it;it=it->Gmi_next,y+=menu_font.ch){ if(it->Gmi_attr) v_set_text(FAIL,FALSE,BLUE,1,FAIL,NULL); /* Bold */ else @@ -494,22 +795,22 @@ area.g_y=y; my_clear_area(&area); if((gl=it->Gmi_glyph) != no_glyph){ - int pla[8], h=min(Fch,16)-1; + int pla[8], h=min(menu_font.ch,Tile_heigth)-1; - pla[0]=pla[2]=(gl%20)*16; /* x_wert from */ - pla[1]=pla[3]=(gl/20)*16; /* y_wert from */ + pla[0]=pla[2]=(gl%Tiles_per_line)*Tile_width; /* x_wert from */ + pla[1]=pla[3]=(gl/Tiles_per_line)*Tile_heigth; /* y_wert from */ pla[4]=pla[6]=x; /* x_wert to */ pla[5]=pla[7]=y; /* y_wert to */ - pla[2]+=15; + pla[2]+=Tile_width-1; pla[3]+=h; - pla[6]+=15; + pla[6]+=Tile_heigth-1; pla[7]+=h; vro_cpyfm(x_handle,S_ONLY,pla,&Tile_bilder,screen); } if(it->Gmi_identifier) it->Gmi_str[2]=it->Gmi_selected ? (it->Gmi_count == -1L ? '+' : '#') : '-'; - v_gtext(x_handle,x+16,y,it->Gmi_str); + (*v_mtext)(x_handle,(x+23) & ~7,y,it->Gmi_str); } } return(0); @@ -520,23 +821,22 @@ if(rc_intersect((GRECT *)&pb->pb_xc,&area)){ char **ptr=(char **)pb->pb_parm; - int x=pb->pb_x, y=pb->pb_y, chardim[4], h; + int x=pb->pb_x, y=pb->pb_y, chardim[4]; /* void v_set_text(int font,int height,int color,int effect,int rotate,int out[4]) */ v_set_mode(MD_TRANS); - v_set_text(ibm_font_id,ibm_font,WHITE,0,0,NULL); + v_set_text(ibm_font_id,ibm_font,WHITE,0,0,chardim); Vsync(); if(planes<4){ int pxy[4]; - v_set_fill(BLACK,2,4,0); rc_grect_to_array(&area,pxy); v_bar(x_handle,pxy); }else my_color_area(&area,LWHITE); - v_gtext(x_handle,x,y,*(ptr++)); + (*v_mtext)(x_handle,x,y,*(ptr++)); if(*ptr) - v_gtext(x_handle,x,y+Fch,*ptr); + (*v_mtext)(x_handle,x,y+chardim[3],*ptr); } return(0); } @@ -606,7 +906,6 @@ if(mi_numpad!=mar_iflags_numpad()){ OBJECT *z_ob=zz_oblist[DIRECTION]; int i; - mi_numpad=mar_iflags_numpad(); ob_set_hotkey(z_ob,DIRDOWN,'>'); ob_set_hotkey(z_ob,DIRUP,'<'); @@ -619,7 +918,8 @@ int mar_gem_init() { - int i, bild_fehler=FALSE, chardim[4]; + int i, bild_fehler=FALSE, fsize; + char *fname; static MITEM wish_workaround= {FAIL,key(0,'J'),K_CTRL,W_CYCLE,FAIL}; OBJECT *z_ob; @@ -637,6 +937,8 @@ } MouseBee(); + /* MAR -- 17.Mar 2002 NVDI 3.0 or better uses v_ftext */ + v_mtext= speedo==3 ? &v_ftext : &v_gtext; for(i=0;i=COLNO-1){ - status_w=msg_width; - StFch=Fch; - StFcw=Fcw; - }else{ - v_set_text(small_font_id,small_font,BLACK,0,0,chardim); - StFch=chardim[3] ? chardim[3] : 1; - StFcw=chardim[2] ? chardim[2] : 1; - status_w=min(max_w/StFcw-3,100); - } + mar_set_msg_visible(mar_get_msg_visible()); + msg_width=min(max_w/msg_font.cw-3,MSGLEN); + if(max_w/status_font.cw0 && planes<9) normal_palette=(short *)m_alloc(3*colors*sizeof(short)); get_colors(x_handle,normal_palette, colors); if(planes<4){ - bild_fehler=depack_img("NH2.IMG",&tile_image); + bild_fehler=depack_img(Tilefile?Tilefile:"NH2.IMG",&tile_image); }else{ - bild_fehler=depack_img("NH16.IMG",&tile_image); + bild_fehler=depack_img(Tilefile?Tilefile:"NH16.IMG",&tile_image); if(!bild_fehler) - img_set_colors(x_handle, tile_image.palette, tile_image.planes); + if(tile_image.planes>1) + img_set_colors(x_handle, tile_image.palette, tile_image.planes); +#if 0 + else{ + int mypalette[]={}; + img_set_colors(x_handle, mypalette, 4); + } +#endif } if(bild_fehler ){ @@ -682,13 +992,15 @@ mfdb(&Tile_bilder, (int *)tile_image.addr, tile_image.img_w, tile_image.img_h, 1, tile_image.planes); transform_img(&Tile_bilder); - mfdb(&Map_bild,NULL,COLNO*16, ROWNO*16, 0, planes); - Map_bild.fd_addr=(int *)m_alloc(mfdb_size(&Map_bild)); + mfdb(&Map_bild,NULL,(COLNO-1)*Tile_width, ROWNO*Tile_heigth, 0, planes); + mfdb(&FontCol_Bild,NULL,(COLNO-1)*map_font.cw, ROWNO*map_font.ch, 0, planes); + Map_bild.fd_addr=(int *)m_alloc(mfdb_size(&Map_bild)>mfdb_size(&FontCol_Bild)?mfdb_size(&Map_bild):mfdb_size(&FontCol_Bild)); + FontCol_Bild.fd_addr=Map_bild.fd_addr; mfdb(&Pet_Mark,pet_mark_data,8, 7, 1, 1); vr_trnfm(x_handle,&Pet_Mark,&Pet_Mark); - mfdb(&Black_bild,NULL,8, 16, 1, 1); + mfdb(&Black_bild,NULL,16, 32, 1, 1); /* MAR -- 17.Mar 2002 that should cover the biggest map-font */ Black_bild.fd_addr=(int *)m_alloc(mfdb_size(&Black_bild)); memset(Black_bild.fd_addr,255,mfdb_size(&Black_bild)); vr_trnfm(x_handle,&Black_bild,&Black_bild); @@ -702,20 +1014,20 @@ memset(&scroll_menu,0,sizeof(scroll_menu)); scroll_menu.scroll=AUTO_SCROLL; scroll_menu.obj=LINESLIST; - scroll_menu.px_hline=Fcw; - scroll_menu.px_vline=Fch; + scroll_menu.px_hline=menu_font.cw; + scroll_menu.px_vline=menu_font.ch; scroll_menu.hscroll= scroll_menu.vscroll=1; - scroll_menu.tbar_d=2*Fch-2; + scroll_menu.tbar_d=2*gr_ch-2; mar_set_dir_keys(); memset(&scroll_map,0,sizeof(scroll_map)); scroll_map.scroll=AUTO_SCROLL; scroll_map.obj=ROOT; - scroll_map.px_hline=16; /* width of Cell 8 char or 16 tile */ - scroll_map.px_vline=16; /* height of Cell always 16 */ - scroll_map.hsize=COLNO; + scroll_map.px_hline=mar_set_tile_mode(FAIL)?Tile_width:map_font.cw; + scroll_map.px_vline=mar_set_tile_mode(FAIL)?Tile_heigth:map_font.ch; + scroll_map.hsize=COLNO-1; scroll_map.vsize=ROWNO; scroll_map.hpage=8; scroll_map.vpage=8; @@ -760,7 +1072,7 @@ mar_destroy_nhwindow(i); if(normal_palette){ - img_set_colors(x_handle,normal_palette,planes); + img_set_colors(x_handle,normal_palette,tile_image.planes); null_free(normal_palette); } test_free(tile_image.palette); @@ -791,9 +1103,11 @@ Gem_nhwindow[WIN_MAP].gw_dirty=TRUE; } +void mar_cliparound(void); void mar_map_curs_weiter(void) { mar_curs(map_cursx+1,map_cursy); + mar_cliparound(); } /************************* about *******************************/ @@ -921,7 +1235,7 @@ dial_colors(7,RED,BLACK,RED,RED,BLACK,BLACK,BLACK,BLACK,WHITE,WHITE,WHITE,WHITE,TRUE,TRUE); if(WIN_MESSAGE!=WIN_ERR && (p_w=Gem_nhwindow[WIN_MESSAGE].gw_window)){ z_ob->ob_x=p_w->work.g_x; - z_ob->ob_y=p_w->curr.g_y+p_w->curr.g_h+Fch; + z_ob->ob_y=p_w->curr.g_y+p_w->curr.g_h+gr_ch; } xdialog(z_ob,NULL, NULL, NULL, DIA_LASTPOS, FALSE, DIALOG_MODE); Event_Timer(0,0,TRUE); @@ -988,7 +1302,10 @@ Gem_menu_item *curr; for(curr=invent_list;curr;curr=curr->Gmi_next){ - Max(&Inv_breite,Fcw*(strlen(curr->Gmi_str)+1)+16); + int extent[8]; + v_set_text(menu_font.id,menu_font.size,BLACK,0,0,NULL); + vqt_extent(x_handle,curr->Gmi_str,extent); + Max(&Inv_breite,extent[4]+Tile_width+menu_font.cw); if(ch && curr->Gmi_accelerator==0 && curr->Gmi_identifier){ curr->Gmi_accelerator=ch; curr->Gmi_str[0]=ch; @@ -1009,6 +1326,9 @@ void mar_raw_print(const char *); +void mar_set_text_to_rip(winid w){ + use_rip=TRUE; +} void mar_putstr_text(winid window, int attr, const char *str) { @@ -1027,6 +1347,7 @@ } if(!text_lines){ mar_raw_print("No room for Text"); + return; } if(str) @@ -1047,24 +1368,25 @@ OBJECT *z_ob=zz_oblist[LINES]; int retval=WIN_DIAL|MODAL|NO_ICONIFY; - scroll_menu.vpage= (desk.g_h-3*Fch)/Fch; + scroll_menu.hsize=0; + scroll_menu.vpage= (desk.g_h-3*gr_ch)/scroll_menu.px_vline; if(Anzahl>scroll_menu.vpage){ retval |= WD_VSLIDER; - if(Breite>max_w-3*Fcw){ + if(Breite>max_w-3*scroll_menu.px_hline){ retval|=WD_HSLIDER; - scroll_menu.hpage=(max_w-3*Fcw)/Fcw; + scroll_menu.hpage=(max_w-3*scroll_menu.px_hline)/scroll_menu.px_hline; scroll_menu.hpos=0; - scroll_menu.hsize=Breite/Fcw; - scroll_menu.vpage=(desk.g_h-4*Fch-1)/Fch; + scroll_menu.hsize=Breite/scroll_menu.px_hline; + scroll_menu.vpage=(desk.g_h-4*gr_ch-1)/scroll_menu.px_vline; } Anzahl=scroll_menu.vpage; }else{ - if(Breite>max_w-Fcw){ + if(Breite>max_w-scroll_menu.px_hline){ retval|=WD_HSLIDER; - scroll_menu.hpage=(max_w-Fcw)/Fcw; + scroll_menu.hpage=(max_w-scroll_menu.px_hline)/scroll_menu.px_hline; scroll_menu.hpos=0; - scroll_menu.hsize=Breite/Fcw; - scroll_menu.vpage= (desk.g_h-4*Fch-1)/Fch; + scroll_menu.hsize=Breite/scroll_menu.px_hline; + scroll_menu.vpage= (desk.g_h-4*gr_ch-1)/scroll_menu.px_vline; if(Anzahl>scroll_menu.vpage){ retval |= WD_VSLIDER; Anzahl=scroll_menu.vpage; @@ -1077,14 +1399,14 @@ if((scroll_menu.vmax=scroll_menu.vsize-scroll_menu.vpage)<0) scroll_menu.vmax=0; - /* left/right/up 2 pixel border down 2Fch toolbar */ + /* left/right/up 2 pixel border down 2gr_ch toolbar */ z_ob[ROOT].ob_width=z_ob[LINESLIST].ob_width=Breite; z_ob[ROOT].ob_height= z_ob[QLINE].ob_y= - z_ob[LINESLIST].ob_height=Fch*Anzahl; - z_ob[QLINE].ob_y+=Fch/2; + z_ob[LINESLIST].ob_height=scroll_menu.px_vline*Anzahl; + z_ob[QLINE].ob_y+=gr_ch/2; z_ob[ROOT].ob_width+=4; - z_ob[ROOT].ob_height+=2*Fch+2; + z_ob[ROOT].ob_height+=2*gr_ch+2; return(retval); } @@ -1096,9 +1418,6 @@ { int ccol; - if(WIN_STATUS != WIN_ERR) - Gem_nhwindow[WIN_STATUS].gw_dirty=TRUE; - ccol=mar_hp_query(); if(ccol<2) curs_col=WHITE; /* 50-100% : 0 */ @@ -1155,7 +1474,7 @@ rest=strcpy(buf,toplines+pos); }else{ message_age[msg_max]=TRUE; - strcpy(message_line[msg_max],toplines); + strncpy(message_line[msg_max],toplines,msg_width); rest=0; } @@ -1176,8 +1495,29 @@ const char *str; int line; { - strncpy(status_line[line],str,status_w-1); - status_line[line][status_w-1]='\0'; + int i,last_diff=-1; + GRECT area={0,line*status_font.ch,status_font.cw,status_font.ch}; + for(i=0;(i=0){ + add_dirty_rect(dr_stat,&area); + last_diff=-1; + area.g_w=status_font.cw; + } + for(;i=0) + add_dirty_rect(dr_stat,&area); } /************************* mar_set_menu_title *******************************/ @@ -1288,7 +1628,7 @@ return(FALSE); } -#define Text_Init K_Init +#define Text_Init KM_Init int Text_Handler(xev) @@ -1296,6 +1636,15 @@ { int ev=xev->ev_mwich; + if(ev&MU_MESAG){ + int *buf=xev->ev_mmgpbuf, y_wo, i; + if(*buf==FONT_CHANGED){ + if(buf[3]>=0){ + mar_set_fontbyid(NHW_TEXT,buf[4],buf[5]); + FontAck(buf[1],1); + } + } + } if(ev&MU_KEYBD){ char ch=(char)(xev->ev_mkreturn&0x00FF); @@ -1304,6 +1653,9 @@ case '\033': send_return(); /* just closes the textwin */ break; + case C('c'): + clipbrd_save(text_lines,Anz_text_lines,xev->ev_mmokstate&K_SHIFT,FALSE); + break; default: ev &= ~MU_KEYBD; /* unknown key */ break; @@ -1314,6 +1666,7 @@ #define Inv_Init KM_Init +static long count=0; int Inv_Handler(xev) XEVENT *xev; @@ -1321,30 +1674,35 @@ int ev=xev->ev_mwich; Gem_menu_item *it; GRECT area; - static long count=0; OBJECT *z_ob=zz_oblist[LINES]; ob_pos(z_ob,LINESLIST,&area); - if(ev&MU_MESAG){ int *buf=xev->ev_mmgpbuf, y_wo, i; + if(*buf==FONT_CHANGED){ + if(buf[3]>=0){ + mar_set_fontbyid(NHW_MENU,buf[4],buf[5]); + FontAck(buf[1],1); + } + }else if(*buf==OBJC_CHANGED && buf[3]==LINESLIST){ ob_undostate(z_ob,LINESLIST,SELECTED); mouse(NULL,&y_wo); - y_wo=(y_wo-area.g_y)/Fch+scroll_menu.vpos; + y_wo=(y_wo-area.g_y)/menu_font.ch+scroll_menu.vpos; for(it=invent_list,i=0;iGmi_next,i++); if(it->Gmi_identifier){ it->Gmi_selected=!it->Gmi_selected; it->Gmi_count= count==0L ? -1L : count; count = 0L; - if(Inv_how!=PICK_ANY) - my_close_dialog(Inv_dialog,TRUE); - else{ - area.g_x+=16+2*Fcw; - area.g_w=Fcw; - area.g_h=Fch; - area.g_y+=(y_wo-scroll_menu.vpos)*Fch; + if(Inv_how!=PICK_ANY){ + /*my_close_dialog(Inv_dialog,TRUE);*/ + send_return(); + }else{ + area.g_x=(area.g_x+23+2*menu_font.cw) & ~7; + area.g_w=menu_font.cw; + area.g_h=menu_font.ch; + area.g_y+=(y_wo-scroll_menu.vpos)*menu_font.ch; ob_draw_chg(Inv_dialog,LINESLIST,&area,FAIL); } /* how != PICK_ANY */ } /* identifier */ @@ -1412,7 +1770,6 @@ case MENU_SEARCH: if(Inv_how!=PICK_NONE){ char buf[BUFSZ]; - Gem_getlin("Search for:",buf); if(!*buf || buf[0]=='\033') break; @@ -1427,24 +1784,28 @@ } } break; + case C('c'): + clipbrd_save(invent_list,Anz_inv_lines,xev->ev_mmokstate&K_SHIFT,TRUE); + break; default: find_acc: if(Inv_how==PICK_NONE) my_close_dialog(Inv_dialog,TRUE); - for(it=invent_list;it;it=it->Gmi_next){ - if(it->Gmi_identifier && (it->Gmi_accelerator==ch || it->Gmi_groupacc==ch)){ - it->Gmi_selected=!it->Gmi_selected; - it->Gmi_count= count==0L ? -1L : count; - count = 0L; - if(Inv_how!=PICK_ANY) - my_close_dialog(Inv_dialog,TRUE); + else + for(it=invent_list;it;it=it->Gmi_next){ + if(it->Gmi_identifier && (it->Gmi_accelerator==ch || it->Gmi_groupacc==ch)){ + it->Gmi_selected=!it->Gmi_selected; + it->Gmi_count= count==0L ? -1L : count; + count = 0L; + if(Inv_how!=PICK_ANY) + my_close_dialog(Inv_dialog,TRUE); + } } - } break; } /* end switch(ch) */ if(Inv_how==PICK_ANY){ - area.g_x+=16+2*Fcw; - area.g_w=Fcw; + area.g_x=(area.g_x+23+2*menu_font.cw) & ~7; + area.g_w=menu_font.cw; ob_draw_chg(Inv_dialog,LINESLIST,&area,FAIL); } } /* !scroll_Inv_dialog */ @@ -1485,6 +1846,11 @@ /************************* mar_display_nhwindow *******************************/ +void redraw_winwork(WIN *w,GRECT *area){ + area->g_x+=w->work.g_x; + area->g_y+=w->work.g_y; + redraw_window(w,area); +} void mar_menu_set_slider(WIN *p_win){ if(p_win){ SCROLL *sc=p_win->scroll; @@ -1513,45 +1879,73 @@ } } +void recalc_msg_win(GRECT *area){ + OBJECT *z_ob; + z_ob=zz_oblist[MSGWIN]; + z_ob[MSGLINES].ob_spec.userblk=&ub_msg; + z_ob[MSGLINES].ob_width= + z_ob[ROOT].ob_width= (msg_width+3)*msg_font.cw; + z_ob[MSGLINES].ob_width-=z_ob[UPMSG].ob_width; + z_ob[ROOT].ob_height= + z_ob[GRABMSGWIN].ob_height= + z_ob[MSGLINES].ob_height=msg_vis*msg_font.ch; + z_ob[DNMSG].ob_y=z_ob[GRABMSGWIN].ob_height-z_ob[DNMSG].ob_height; + window_border(0,0,0,z_ob->ob_width,z_ob->ob_height, area); +} +void recalc_status_win(GRECT *area){ + OBJECT *z_ob; + z_ob=zz_oblist[STATUSLINE]; + z_ob[ROOT].ob_type=G_USERDEF; + z_ob[ROOT].ob_spec.userblk=&ub_status; + z_ob[ROOT].ob_width=(status_w+2)*status_font.cw; + z_ob[ROOT].ob_height= + z_ob[GRABSTATUS].ob_height=2*status_font.ch; + z_ob[GRABSTATUS].ob_width=2*status_font.cw-2; + window_border(0,0,0,z_ob->ob_width,z_ob->ob_height,area); +} void calc_std_winplace(int which, GRECT *place){ static int todo=TRUE; static GRECT me, ma, st; - if(todo){ + if(todo || which<0){ OBJECT *z_ob; int map_h_off, foo; /* First the messagewin */ - z_ob=zz_oblist[MSGWIN]; - z_ob[MSGLINES].ob_spec.userblk=&ub_msg; - z_ob[MSGLINES].ob_width= - z_ob[ROOT].ob_width= (msg_width+3)*Fcw; - z_ob[MSGLINES].ob_width-=z_ob[UPMSG].ob_width; - window_border(0,0,0,z_ob->ob_width,z_ob->ob_height, &me); + recalc_msg_win(&me); /* Now the map */ - wind_calc(WC_BORDER,MAP_GADGETS,0,0,16*COLNO,16*ROWNO,&foo,&foo,&foo,&map_h_off); - map_h_off-=16*ROWNO; - window_border(MAP_GADGETS,0,0,16*COLNO,16*ROWNO, &ma); - ma.g_y=desk.g_y+me.g_h; + wind_calc(WC_BORDER,MAP_GADGETS,0,0,scroll_map.px_hline*(COLNO-1),scroll_map.px_vline*ROWNO,&foo,&foo,&foo,&map_h_off); + map_h_off-=scroll_map.px_vline*ROWNO; + window_border(MAP_GADGETS,0,0,scroll_map.px_hline*(COLNO-1),scroll_map.px_vline*ROWNO, &ma); /* Next the statuswin */ - z_ob=zz_oblist[STATUSLINE]; - z_ob[ROOT].ob_type=G_USERDEF; - z_ob[ROOT].ob_spec.userblk=&ub_status; - z_ob[ROOT].ob_width=(status_w+2)*StFcw; - z_ob[ROOT].ob_height= - z_ob[GRABSTATUS].ob_height=2*StFch; - z_ob[GRABSTATUS].ob_width=2*StFcw-2; - window_border(0,0,0,z_ob->ob_width,z_ob->ob_height,&st); + recalc_status_win(&st); /* And last but not least a final test */ - ma.g_h=map_h_off+16*ROWNO; + ma.g_h=map_h_off+scroll_map.px_vline*ROWNO; while(me.g_h+ma.g_h+st.g_h>=desk.g_h) - ma.g_h-=16; - st.g_y=desk.g_y+me.g_h+ma.g_h; + ma.g_h-=scroll_map.px_vline; + /* stack the windows */ + ma.g_y=me.g_y=st.g_y=desk.g_y; + if(status_align){ + ma.g_y+=st.g_h; + if(msg_align){ + st.g_y+=me.g_h; + ma.g_y+=me.g_h; + }else{ + me.g_y+=st.g_h+ma.g_h; + } + }else{ + if(msg_align){ + ma.g_y+=me.g_h; + }else{ + me.g_y+=ma.g_h; + } + st.g_y+=me.g_h+ma.g_h; + } - todo=FALSE; + if(which) todo=FALSE; } switch(which){ case NHW_MESSAGE: @@ -1589,14 +1983,28 @@ z_ob=zz_oblist[LINES]; scroll_menu.vsize=Anz_text_lines; scroll_menu.vpos=0; + if(use_rip){ + if(!depack_img(planes<4 ? "RIP2.IMG" : "RIP.IMG", &rip_image)){ + mfdb(&Rip_bild, (int *)rip_image.addr, rip_image.img_w, rip_image.img_h, 1, rip_image.planes); + transform_img(&Rip_bild); + } + ub_lines.ub_code=draw_rip; + }else + ub_lines.ub_code=draw_lines; z_ob[LINESLIST].ob_spec.userblk=&ub_lines; breite=16; - for(i=0;idi_win; @@ -1621,11 +2029,13 @@ scroll_menu.vpos=0; z_ob[LINESLIST].ob_spec.userblk=&ub_inventory; if((Menu_title)&&(wind!=WIN_INVEN)) /* because I sets no Menu_title */ - Max(&Inv_breite,Fcw*strlen(Menu_title)+16); - mar_di_mode=mar_set_inv_win(Anz_inv_lines, Inv_breite); + Max(&Inv_breite,gr_cw*strlen(Menu_title)+16); + scroll_menu.px_vline=menu_font.ch; + scroll_menu.px_hline=menu_font.cw; + mar_di_mode=mar_set_inv_win(Anz_inv_lines, Inv_breite, NHW_MENU); tmp_button=ob_get_text(z_ob,QLINE,0); ob_set_text(z_ob,QLINE,Inv_how!=PICK_NONE ? strCancel : strOk ); - ob_doflag(z_ob,LINESLIST,SELECTABLE); + ob_doflag(z_ob,LINESLIST,TOUCHEXIT); Event_Handler(Inv_Init, Inv_Handler); if((Inv_dialog=open_dialog(z_ob,(wind==WIN_INVEN) ? "Inventory" : (Menu_title ? Menu_title : "Staun"), NULL, NULL, mar_ob_mapcenter(z_ob), FALSE, mar_di_mode, FAIL, NULL, NULL))!=NULL){ WIN *ptr_win=Inv_dialog->di_win; @@ -1633,7 +2043,43 @@ ptr_win->scroll=&scroll_menu; mar_menu_set_slider(ptr_win); WindowItems(ptr_win,SCROLL_KEYS,scroll_keys); - if((d_exit=X_Form_Do(NULL))!=W_ABANDON){ + do{ + int y_wo,x_wo,ru_w=1,ru_h=1; + GRECT oarea; + Gem_menu_item *it; + d_exit=X_Form_Do(NULL); + if((d_exit&NO_CLICK)==LINESLIST){ + ob_pos(z_ob,LINESLIST,&oarea); + if(mouse(&x_wo,&y_wo) && Inv_how==PICK_ANY){ + graf_rt_rubberbox(FALSE,x_wo,y_wo,FAIL,FAIL,&oarea,&ru_w,&ru_h,NULL); + invert_all_on_page((int)((y_wo-oarea.g_y)/menu_font.ch+scroll_menu.vpos),(ru_h+menu_font.ch-1)/menu_font.ch,0); + }else{ + for(it=invent_list,i=0;i<((y_wo-oarea.g_y)/menu_font.ch+scroll_menu.vpos) && it;it=it->Gmi_next,i++); + if(it && it->Gmi_identifier){ + it->Gmi_selected=!it->Gmi_selected; + it->Gmi_count= count==0L ? -1L : count; + count = 0L; + if(Inv_how!=PICK_ANY) + break; + } /* identifier */ + } + oarea.g_x=(oarea.g_x+23+2*menu_font.cw) & ~7; + oarea.g_y=y_wo-(y_wo-oarea.g_y)%menu_font.ch; + oarea.g_w=menu_font.cw; + oarea.g_h=((ru_h+menu_font.ch-1)/menu_font.ch)*menu_font.ch; + ob_draw_chg(Inv_dialog,LINESLIST,&oarea,FAIL); + } + if(Inv_how==PICK_ANY){ + ob_set_text(Inv_dialog->di_tree,QLINE,strCancel); + for(it=invent_list;it;it=it->Gmi_next) + if(it->Gmi_identifier && it->Gmi_selected){ + ob_set_text(Inv_dialog->di_tree,QLINE,strOk); + break; + } + ob_draw_chg(Inv_dialog,QLINE,NULL,FAIL); + } + }while((d_exit&NO_CLICK)==LINESLIST); + if(d_exit!=W_ABANDON){ my_close_dialog(Inv_dialog,FALSE); if(d_exit!=W_CLOSED) ob_undostate(z_ob,d_exit&NO_CLICK,SELECTED); @@ -1645,7 +2091,7 @@ case NHW_MAP: if(p_Gw->gw_window==NULL){ calc_std_winplace(NHW_MAP,&p_Gw->gw_place); - window_border(MAP_GADGETS,0,0,16*COLNO,16*ROWNO, &g_mapmax); + window_border(MAP_GADGETS,0,0,Tile_width*(COLNO-1),Tile_heigth*ROWNO, &g_mapmax); p_Gw->gw_window=open_window(md, md, NULL, zz_oblist[NHICON], MAP_GADGETS, TRUE, 128, 128, &g_mapmax, &p_Gw->gw_place, &scroll_map, win_draw_map, NULL, XM_TOP|XM_BOTTOM|XM_SIZE); WindowItems(p_Gw->gw_window,SCROLL_KEYS-1,scroll_keys); /* ClrHome centers on u */ mar_clear_map(); @@ -1658,7 +2104,7 @@ redraw_window(p_Gw->gw_window,&area); - dirty_map_area.g_x=COLNO; + dirty_map_area.g_x=COLNO-1; dirty_map_area.g_y=ROWNO; dirty_map_area.g_w= dirty_map_area.g_h=0; @@ -1672,19 +2118,21 @@ p_Gw->gw_window=open_window(NULL, NULL, NULL, NULL, 0, 0, 0, 0, NULL, &p_Gw->gw_place, NULL, mar_draw_window, z_ob, XM_TOP|XM_BOTTOM|XM_SIZE); magx=tmp_magx; window_size(p_Gw->gw_window,&p_Gw->gw_window->curr); + p_Gw->gw_dirty=TRUE; } if(p_Gw->gw_dirty){ + ob_pos(zz_oblist[MSGWIN],MSGLINES,&area); while(messages_pro_zug>3){ messages_pro_zug-=3; msg_pos+=3; - redraw_window(p_Gw->gw_window,NULL); + redraw_window(p_Gw->gw_window,&area); mar_more(); } msg_pos+=messages_pro_zug; messages_pro_zug=0; if(msg_pos>msg_max) msg_pos=msg_max; - redraw_window(p_Gw->gw_window,NULL); + redraw_window(p_Gw->gw_window,&area); mar_message_pause=FALSE; } break; @@ -1695,11 +2143,17 @@ magx=0; /* MAR -- Fake E_GEM to remove Backdropper */ p_Gw->gw_window=open_window(NULL, NULL, NULL, NULL, 0, FALSE, 0, 0, NULL, &p_Gw->gw_place, NULL, mar_draw_window, z_ob, XM_TOP|XM_BOTTOM|XM_SIZE); magx=tmp_magx; - /* Because 2*StFch is smaller then e_gem expects the minimum win_height */ + /* Because 2*status_font.ch is smaller then e_gem expects the minimum win_height */ p_Gw->gw_window->min_h=z_ob[ROOT].ob_height; window_size(p_Gw->gw_window,&p_Gw->gw_place); + p_Gw->gw_dirty=TRUE; } - /* Fall thru */ + while(get_dirty_rect(dr_stat,&area)){ + area.g_x=(area.g_x+p_Gw->gw_window->work.g_x+2*status_font.cw+6)&~7; + area.g_y+=p_Gw->gw_window->work.g_y; + redraw_window(p_Gw->gw_window,&area); + } + break; default: if(p_Gw->gw_dirty) redraw_window(p_Gw->gw_window,NULL); @@ -1732,23 +2186,29 @@ message_age=(int *)m_alloc(msg_anz*sizeof(int)); for(i=0;i0 ? scroll_margin : max(scroll_map.hpage/4,1), + hoehe=scroll_margin>0 ? scroll_margin : max(scroll_map.vpage/4,1), + adjust_needed; adjust_needed=FALSE; if ((map_cursx < scroll_map.hpos + breite) || (map_cursx >= scroll_map.hpos + scroll_map.hpage - breite)){ - scroll_map.hpos=map_cursx - 2*breite; + scroll_map.hpos=map_cursx - scroll_map.hpage/2; adjust_needed=TRUE; } - if ((map_cursy < scroll_map.vpos + hoehe) || (map_cursy >= scroll_map.vpos + scroll_map.vpage - hoehe)){ - scroll_map.vpos=map_cursy - 2*hoehe; + scroll_map.vpos=map_cursy - scroll_map.vpage/2; adjust_needed=TRUE; } - if(adjust_needed) scroll_window(Gem_nhwindow[WIN_MAP].gw_window,WIN_SCROLL,NULL); } @@ -1874,6 +2341,9 @@ mar_display_nhwindow(WIN_MESSAGE); } + if(WIN_MAP!=WIN_ERR) + mar_cliparound(); + if(WIN_STATUS!=WIN_ERR){ mar_check_hilight_status(); mar_display_nhwindow(WIN_STATUS); @@ -1922,9 +2392,14 @@ kpad = mar_iflags_numpad()==1 ? numpad : keypad; if (shift & K_SHIFT) ch = kpad[scan - KEYPADLO].shift; - else if (shift & K_CTRL) + else if (shift & K_CTRL){ + if(scan>=0x67 && scan<=0x6f && scan!=0x6b){ + send_key(kpad[scan - KEYPADLO].normal); + ch = 'g'; + }else{ ch = kpad[scan - KEYPADLO].cntrl; - else + } + }else ch = kpad[scan - KEYPADLO].normal; } if(scan==SCANHOME) @@ -1938,6 +2413,10 @@ draw_cursor=!draw_cursor; mar_curs(map_cursx,map_cursy); mar_display_nhwindow(WIN_MAP); + }else if(scan == SCANF4){ /* Font-Selector */ + if(!CallFontSelector(0,FAIL,FAIL,FAIL,FAIL)){ + xalert(1,1,X_ICN_ALERT,NULL,SYS_MODAL,BUTTONS_RIGHT,TRUE,"Hello","Fontselector not available!",NULL); + } }else if(!ch && shift&K_CTRL && scan==-57){ /* MAR -- nothing ignore Ctrl-Alt-Clr/Home == MagiC's restore screen */ }else{ @@ -1954,7 +2433,7 @@ WIN *akt_win=window_find(ex,ey); if(WIN_MAP != WIN_ERR && akt_win==Gem_nhwindow[WIN_MAP].gw_window){ - *x=max(min((ex-akt_win->work.g_x)/scroll_map.px_hline+scroll_map.hpos,COLNO),0)+1; + *x=max(min((ex-akt_win->work.g_x)/scroll_map.px_hline+scroll_map.hpos,COLNO-1),0)+1; *y=max(min((ey-akt_win->work.g_y)/scroll_map.px_vline+scroll_map.vpos,ROWNO),0); *mod=xev.ev_mmobutton; retval=0; @@ -1997,8 +2476,8 @@ break; case '3': draw_cursor=!draw_cursor; - if(WIN_MAP != WIN_ERR && Gem_nhwindow[WIN_MAP].gw_window) - redraw_window(Gem_nhwindow[WIN_MAP].gw_window,NULL); + mar_curs(map_cursx,map_cursy); + mar_display_nhwindow(WIN_MAP); break; default: } @@ -2011,6 +2490,24 @@ case WM_CLOSED: WindowHandler(W_ICONIFYALL,NULL,NULL); break; + case AP_TERM: + retval='S'; + break; + case FONT_CHANGED: + if(buf[3]>=0){ + if(buf[3]==Gem_nhwindow[WIN_MESSAGE].gw_window->handle){ + mar_set_fontbyid(NHW_MESSAGE,buf[4],buf[5]); + mar_display_nhwindow(WIN_MESSAGE); + }else if(buf[3]==Gem_nhwindow[WIN_MAP].gw_window->handle){ + mar_set_fontbyid(NHW_MAP,buf[4],buf[5]); + mar_display_nhwindow(WIN_MAP); + }else if(buf[3]==Gem_nhwindow[WIN_STATUS].gw_window->handle){ + mar_set_fontbyid(NHW_STATUS,buf[4],buf[5]); + mar_display_nhwindow(WIN_STATUS); + } + FontAck(buf[1],1); + } + break; default: break; } @@ -2039,10 +2536,12 @@ int Gem_doprev_message() { - if(msg_pos>2) msg_pos--; + if(msg_pos>2){ + msg_pos--; if(WIN_MESSAGE != WIN_ERR) Gem_nhwindow[WIN_MESSAGE].gw_dirty=TRUE; mar_display_nhwindow(WIN_MESSAGE); + } return(0); } @@ -2056,21 +2555,23 @@ { static int tile_mode=TRUE; static GRECT prev; - WIN *z_w=Gem_nhwindow[WIN_MAP].gw_window; + WIN *z_w=WIN_MAP!=WIN_ERR ? Gem_nhwindow[WIN_MAP].gw_window : NULL; - if(tiles<0) return(tile_mode); + if(tiles<0) + return(tile_mode); + else if(!z_w) + tile_mode=tiles; + else if(tile_mode==tiles || (mar_set_rogue(FAIL) && tiles)) + return(FAIL); else{ GRECT tmp; - if(tile_mode==tiles || (mar_set_rogue(FAIL) && tiles) || !z_w) - return(FAIL); - tile_mode=tiles; - map_cell_width= tiles ? 16 : Fcw; - scroll_map.px_hline=map_cell_width; - scroll_map.px_vline=tiles ? 16 : Fch; - window_border(MAP_GADGETS,0,0,map_cell_width*COLNO,16*ROWNO, &tmp); + scroll_map.px_hline= tiles ? Tile_width : map_font.cw; + scroll_map.px_vline= tiles ? Tile_heigth : map_font.ch; + window_border(MAP_GADGETS,0,0,scroll_map.px_hline*(COLNO-1),scroll_map.px_vline*ROWNO, &tmp); z_w->max.g_w=tmp.g_w; + z_w->max.g_h=tmp.g_h; if(tiles) z_w->curr=prev; else @@ -2120,33 +2621,26 @@ winid window; int x, y, gl; { + if(window != WIN_ERR && window==WIN_MAP){ static int pla[8]; - if(window != WIN_ERR && window==WIN_MAP){ - Min(&dirty_map_area.g_x,x); - Min(&dirty_map_area.g_y,y); - Max(&dirty_map_area.g_w,x); - Max(&dirty_map_area.g_h,y); - Gem_nhwindow[window].gw_dirty=TRUE; - if(mar_set_tile_mode(FAIL)){ - pla[2]=pla[0]=(gl%20)*16; - pla[3]=pla[1]=(gl/20)*16; - pla[2]+=15; - pla[3]+=15; - pla[6]=pla[4]=16*x; /* x_wert to */ - pla[7]=pla[5]=16*y; /* y_wert to */ - pla[6]+=15; - pla[7]+=15; + pla[2]=pla[0]=(gl%Tiles_per_line)*Tile_width; + pla[3]=pla[1]=(gl/Tiles_per_line)*Tile_heigth; + pla[2]+=Tile_width-1; + pla[3]+=Tile_heigth-1; + pla[6]=pla[4]=Tile_width*x; /* x_wert to */ + pla[7]=pla[5]=Tile_heigth*y; /* y_wert to */ + pla[6]+=Tile_width-1; + pla[7]+=Tile_heigth-1; vro_cpyfm(x_handle, gl!=-1 ? S_ONLY : ALL_BLACK, pla, &Tile_bilder, &Map_bild); } } -} void mar_print_char(window, x, y, ch, col) winid window; -int x, y; +int x, y; char ch; int col; { @@ -2158,15 +2652,15 @@ pla[0]= pla[1]=0; - pla[2]=Fcw-1; - pla[3]=Fch-1; - pla[6]=pla[4]=Fcw*x; - pla[7]=pla[5]=Fch*y; - pla[6]+=Fcw-1; - pla[7]+=Fch-1; + pla[2]=map_font.cw-1; + pla[3]=map_font.ch-1; + pla[6]=pla[4]=map_font.cw*x; + pla[7]=pla[5]=map_font.ch*y; + pla[6]+=map_font.cw-1; + pla[7]+=map_font.ch-1; colindex[0]=gem_color[col]; colindex[1]=WHITE; - vrt_cpyfm(x_handle,MD_REPLACE,pla,&Black_bild,&Map_bild,colindex); + vrt_cpyfm(x_handle,MD_REPLACE,pla,&Black_bild,&FontCol_Bild,colindex); } } @@ -2186,9 +2680,9 @@ z_ob[LGPROMPT].ob_type=G_USERDEF; z_ob[LGPROMPT].ob_spec.userblk=&ub_prompt; - z_ob[LGPROMPT].ob_height=2*Fch; + z_ob[LGPROMPT].ob_height=2*gr_ch; - length=z_ob[LGPROMPT].ob_width/Fcw; + length=z_ob[LGPROMPT].ob_width/gr_cw; if(strlen(ques)>length){ tmp=ques+length; while(*tmp!=' ' && tmp>=ques){ @@ -2361,9 +2855,9 @@ if(strstr(query,"irect")) return(mar_ask_direction()); - len=min(strlen(query),(max_w-8*Fcw)/Fcw); - z_ob[ROOT].ob_width=(len+8)*Fcw; - z_ob[YNPROMPT].ob_width=Fcw*len+8; + len=min(strlen(query),(max_w-8*gr_cw)/gr_cw); + z_ob[ROOT].ob_width=(len+8)*gr_cw; + z_ob[YNPROMPT].ob_width=gr_cw*len+8; tmp=ob_get_text(z_ob,YNPROMPT,0); ob_set_text(z_ob,YNPROMPT,mar_copy_of(query)); @@ -2397,11 +2891,11 @@ } z_ob[SOMECHARS].ob_width=z_ob[YN1+i].ob_x+8; - z_ob[SOMECHARS].ob_height=z_ob[YN1+i].ob_y+Fch+Fch/2; - Max((int *)&z_ob[ROOT].ob_width,z_ob[SOMECHARS].ob_width+4*Fcw); - z_ob[ROOT].ob_height=z_ob[SOMECHARS].ob_height+4*Fch; + z_ob[SOMECHARS].ob_height=z_ob[YN1+i].ob_y+gr_ch+gr_ch/2; + Max((int *)&z_ob[ROOT].ob_width,z_ob[SOMECHARS].ob_width+4*gr_cw); + z_ob[ROOT].ob_height=z_ob[SOMECHARS].ob_height+4*gr_ch; if(strchr(resp,'#')) - z_ob[ROOT].ob_height=z_ob[YNOK].ob_y+2*Fch; + z_ob[ROOT].ob_height=z_ob[YNOK].ob_y+2*gr_ch; for(i+=YN1;i<(YNN+1);i+=2){ ob_hide(z_ob,i,TRUE); @@ -2412,11 +2906,11 @@ ob_hide(z_ob,ANYCHAR,FALSE); ob_hide(z_ob,YNOK,TRUE); ob_hide(z_ob,COUNT,TRUE); - z_ob[ANYCHAR].ob_height=2*Fch; + z_ob[ANYCHAR].ob_height=2*gr_ch; z_ob[CHOSENCH].ob_y= - z_ob[CHOSENCH+1].ob_y=Fch/2; - z_ob[ROOT].ob_width=max(z_ob[YNPROMPT].ob_width+z_ob[YNPROMPT].ob_x,z_ob[ANYCHAR].ob_width+z_ob[ANYCHAR].ob_x)+2*Fcw; - z_ob[ROOT].ob_height=z_ob[ANYCHAR].ob_height+z_ob[ANYCHAR].ob_y+Fch/2; + z_ob[CHOSENCH+1].ob_y=gr_ch/2; + z_ob[ROOT].ob_width=max(z_ob[YNPROMPT].ob_width+z_ob[YNPROMPT].ob_x,z_ob[ANYCHAR].ob_width+z_ob[ANYCHAR].ob_x)+2*gr_cw; + z_ob[ROOT].ob_height=z_ob[ANYCHAR].ob_height+z_ob[ANYCHAR].ob_y+gr_ch/2; *ob_get_text(z_ob,CHOSENCH,0)='?'; Event_Handler(any_init,any_handler); } diff -Naurd ../nethack-3.3.1/win/gem/wingem.c ./win/gem/wingem.c --- ../nethack-3.3.1/win/gem/wingem.c Mon Aug 7 16:40:16 2000 +++ ./win/gem/wingem.c Fri Mar 22 14:41:12 2002 @@ -1,4 +1,4 @@ -/* SCCS Id: @(#)wingem.c 3.3 1999/12/10 */ +/* SCCS Id: @(#)wingem.c 3.4 1999/12/10 */ /* Copyright (c) Christian Bressler, 1999 */ /* NetHack may be freely redistributed. See license for details. */ @@ -21,12 +21,28 @@ static char *FDECL(copy_of, (const char *)); static void FDECL(bail, (const char *)); /* __attribute__((noreturn)) */ +extern int mar_set_tile_mode(int); +extern void mar_set_font(int,const char*,int); +extern void mar_set_margin(int); +extern void mar_set_msg_visible(int); +extern void mar_set_status_align(int); +extern void mar_set_msg_align(int); +extern void mar_set_tilefile(char *); +extern void mar_set_tilex(int); +extern void mar_set_tiley(int); extern short glyph2tile[MAX_GLYPH]; /* from tile.c */ extern void mar_display_nhwindow(winid); /* from wingem1.c */ +void Gem_outrip(winid,int); +void Gem_preference_update(const char *); /* Interface definition, for windows.c */ struct window_procs Gem_procs = { "Gem", + WC_COLOR|WC_HILITE_PET|WC_ALIGN_MESSAGE|WC_ALIGN_STATUS| + WC_INVERSE|WC_SCROLL_MARGIN| + WC_FONT_MESSAGE|WC_FONT_STATUS|WC_FONT_MENU|WC_FONT_TEXT|WC_FONT_MAP| + WC_FONTSIZ_MESSAGE|WC_FONTSIZ_STATUS|WC_FONTSIZ_MENU|WC_FONTSIZ_TEXT|WC_FONTSIZ_MAP| + WC_TILE_WIDTH|WC_TILE_HEIGHT|WC_TILE_FILE|WC_VARY_MSGCOUNT|WC_ASCII_MAP, Gem_init_nhwindows, Gem_player_selection, Gem_askname, @@ -79,7 +95,8 @@ /* other defs that really should go away (they're tty specific) */ Gem_start_screen, Gem_end_screen, - genl_outrip + Gem_outrip, + Gem_preference_update }; #ifdef MAC @@ -115,6 +132,11 @@ return(iflags.msg_history); } +int +mar_get_msg_visible() +{ + return(iflags.wc_vary_msgcount); +} /* clean up and quit */ static void bail(mesg) @@ -126,6 +148,17 @@ /*NOTREACHED*/ } +/*$$$*/ +#define DEF_CLIPAROUND_MARGIN -1 +#ifndef TILE_X +#define TILE_X 16 +#endif +#define TILE_Y 16 +#define TILES_PER_LINE 20 +#define NHFONT_DEFAULT_SIZE 10 +#define NHFONT_SIZE_MIN 3 +#define NHFONT_SIZE_MAX 20 +/*$$$*/ /*ARGSUSED*/ void Gem_init_nhwindows(argcp,argv) @@ -135,6 +168,42 @@ argv=argv, argcp=argcp; colors_changed=TRUE; + set_wc_option_mod_status( + WC_ALIGN_MESSAGE | + WC_ALIGN_STATUS | + WC_TILE_WIDTH | + WC_TILE_HEIGHT | + WC_TILE_FILE, + DISP_IN_GAME); + set_wc_option_mod_status( + WC_HILITE_PET | + WC_SCROLL_MARGIN | + WC_FONT_MESSAGE | + WC_FONT_MAP | + WC_FONT_STATUS | + WC_FONT_MENU | + WC_FONT_TEXT | + WC_FONTSIZ_MESSAGE | + WC_FONTSIZ_MAP | + WC_FONTSIZ_STATUS | + WC_FONTSIZ_MENU | + WC_FONTSIZ_TEXT | + WC_VARY_MSGCOUNT, + SET_IN_GAME + ); + if( iflags.wc_align_message==0 ) iflags.wc_align_message = ALIGN_TOP; + if( iflags.wc_align_status==0 ) iflags.wc_align_status = ALIGN_BOTTOM; + if( iflags.wc_scroll_margin==0 ) iflags.wc_scroll_margin = DEF_CLIPAROUND_MARGIN; + if( iflags.wc_tile_width==0 ) iflags.wc_tile_width = TILE_X; + if( iflags.wc_tile_height==0 ) iflags.wc_tile_height = TILE_Y; + if(iflags.wc_tile_file && *iflags.wc_tile_file) + mar_set_tilefile(iflags.wc_tile_file); + if( iflags.wc_vary_msgcount==0 ) iflags.wc_vary_msgcount = 3; + mar_set_tile_mode(!iflags.wc_ascii_map); /* MAR -- 17.Mar 2002 True is tiles */ + mar_set_tilex(iflags.wc_tile_width); + mar_set_tiley(iflags.wc_tile_height); + mar_set_msg_align(iflags.wc_align_message-ALIGN_BOTTOM); + mar_set_status_align(iflags.wc_align_status-ALIGN_BOTTOM); if(mar_gem_init()==0){ bail((char *)0); /*NOTREACHED*/ @@ -157,10 +226,19 @@ anything any; menu_item *selected=NULL; + /* avoid unnecessary prompts further down */ + rigid_role_checks(); + /* Should we randomly pick for the player? */ - if (flags.initrole == ROLE_NONE || flags.initrace == ROLE_NONE || - flags.initgend == ROLE_NONE || flags.initalign == ROLE_NONE) { - pick4u = yn_function("Shall I pick a character for you? [ynq]",ynqchars,'n'); + if (!flags.randomall && + (flags.initrole == ROLE_NONE || flags.initrace == ROLE_NONE || + flags.initgend == ROLE_NONE || flags.initalign == ROLE_NONE)) { +/* pick4u = yn_function("Shall I pick a character for you? [ynq]",ynqchars,'n');*/ + pick4u = yn_function( + build_plselection_prompt(pbuf, QBUFSZ, flags.initrole,flags.initrace, + flags.initgend, flags.initalign) + ,ynqchars,'n' + ); if(pick4u=='q'){ give_up: /* Just quit */ if (selected) free((genericptr_t) selected); @@ -174,10 +252,10 @@ if (flags.initrole < 0) { /* Process the choice */ - if(pick4u=='y' || flags.initrole == ROLE_RANDOM) { + if(pick4u=='y' || flags.initrole == ROLE_RANDOM || flags.randomall) { /* Pick a random role */ flags.initrole = pick_role(flags.initrace, flags.initgend, - flags.initalign); + flags.initalign, PICK_RANDOM); if (flags.initrole < 0) { mar_add_message("Incompatible role!"); mar_display_nhwindow(WIN_MESSAGE); @@ -201,7 +279,7 @@ } } any.a_int = pick_role(flags.initrace, flags.initgend, - flags.initalign)+1; + flags.initalign, PICK_RANDOM)+1; if (any.a_int == 0) /* must be non-zero */ any.a_int = randrole()+1; add_menu(win, NO_GLYPH, &any , '*', 0, ATR_NONE, @@ -227,9 +305,9 @@ * pre-selected gender/alignment */ if (flags.initrace < 0 || !validrace(flags.initrole, flags.initrace)) { /* pre-selected race not valid */ - if (pick4u == 'y' || flags.initrace == ROLE_RANDOM) { + if (pick4u == 'y' || flags.initrace == ROLE_RANDOM || flags.randomall) { flags.initrace = pick_race(flags.initrole, flags.initgend, - flags.initalign); + flags.initalign, PICK_RANDOM); if (flags.initrace < 0) { mar_add_message("Incompatible race!"); mar_display_nhwindow(WIN_MESSAGE); @@ -254,7 +332,6 @@ } } } - /* Permit the user to pick, if there is more than one */ if (n > 1) { win = create_nhwindow(NHW_MENU); @@ -268,7 +345,7 @@ 0, ATR_NONE, races[i].noun, MENU_UNSELECTED); } any.a_int = pick_race(flags.initrole, flags.initgend, - flags.initalign)+1; + flags.initalign, PICK_RANDOM)+1; if (any.a_int == 0) /* must be non-zero */ any.a_int = randrace(flags.initrole)+1; add_menu(win, NO_GLYPH, &any , '*', 0, ATR_NONE, @@ -283,7 +360,6 @@ destroy_nhwindow(win); if (n != 1 || selected[0].item.a_int == any.a_int) goto give_up; /* Selected quit */ - k = selected[0].item.a_int - 1; free((genericptr_t) selected), selected = 0; } @@ -297,9 +373,9 @@ if (flags.initgend < 0 || !validgend(flags.initrole, flags.initrace, flags.initgend)) { /* pre-selected gender not valid */ - if (pick4u == 'y' || flags.initgend == ROLE_RANDOM) { + if (pick4u == 'y' || flags.initgend == ROLE_RANDOM || flags.randomall) { flags.initgend = pick_gend(flags.initrole, flags.initrace, - flags.initalign); + flags.initalign, PICK_RANDOM); if (flags.initgend < 0) { mar_add_message("Incompatible gender!"); mar_display_nhwindow(WIN_MESSAGE); @@ -324,7 +400,6 @@ } } } - /* Permit the user to pick, if there is more than one */ if (n > 1) { win = create_nhwindow(NHW_MENU); @@ -338,7 +413,7 @@ 0, ATR_NONE, genders[i].adj, MENU_UNSELECTED); } any.a_int = pick_gend(flags.initrole, flags.initrace, - flags.initalign)+1; + flags.initalign, PICK_RANDOM)+1; if (any.a_int == 0) /* must be non-zero */ any.a_int = randgend(flags.initrole, flags.initrace)+1; add_menu(win, NO_GLYPH, &any , '*', 0, ATR_NONE, @@ -354,7 +429,6 @@ destroy_nhwindow(win); if (n != 1 || selected[0].item.a_int == any.a_int) goto give_up; /* Selected quit */ - k = selected[0].item.a_int - 1; free((genericptr_t) selected), selected = 0; } @@ -367,9 +441,9 @@ if (flags.initalign < 0 || !validalign(flags.initrole, flags.initrace, flags.initalign)) { /* pre-selected alignment not valid */ - if (pick4u == 'y' || flags.initalign == ROLE_RANDOM) { + if (pick4u == 'y' || flags.initalign == ROLE_RANDOM || flags.randomall) { flags.initalign = pick_align(flags.initrole, flags.initrace, - flags.initgend); + flags.initgend, PICK_RANDOM); if (flags.initalign < 0) { mar_add_message("Incompatible alignment!"); mar_display_nhwindow(WIN_MESSAGE); @@ -394,7 +468,6 @@ } } } - /* Permit the user to pick, if there is more than one */ if (n > 1) { win = create_nhwindow(NHW_MENU); @@ -408,7 +481,7 @@ 0, ATR_NONE, aligns[i].adj, MENU_UNSELECTED); } any.a_int = pick_align(flags.initrole, flags.initrace, - flags.initgend)+1; + flags.initgend, PICK_RANDOM)+1; if (any.a_int == 0) /* must be non-zero */ any.a_int = randalign(flags.initrole, flags.initrace)+1; add_menu(win, NO_GLYPH, &any , '*', 0, ATR_NONE, @@ -427,7 +500,6 @@ destroy_nhwindow(win); if (n != 1 || selected[0].item.a_int == any.a_int) goto give_up; /* Selected quit */ - k = selected[0].item.a_int - 1; free((genericptr_t) selected), selected = 0; } @@ -643,6 +715,8 @@ Gem_putstr(WIN_MESSAGE,0,str); else mar_map_curs_weiter(); + mar_display_nhwindow(WIN_MESSAGE); + mar_display_nhwindow(WIN_STATUS); break; case NHW_MENU: @@ -827,7 +901,6 @@ #endif extern void mar_add_pet_sign(winid,int,int); -extern int mar_set_tile_mode(int); void Gem_print_glyph(window, x, y, glyph) @@ -845,10 +918,11 @@ x--; /* MAR -- because x ranges from 1 to COLNO */ if(mar_set_tile_mode(-1)){ mar_print_glyph(window,x,y,glyph2tile[glyph]); - if(glyph_is_pet(glyph) + if( #ifdef TEXTCOLOR - && iflags.hilite_pet + iflags.hilite_pet && #endif + glyph_is_pet(glyph) ) mar_add_pet_sign(window,x,y); }else @@ -862,78 +936,12 @@ xchar x, y; int glyph; { - uchar ch; - register int offset; -#ifdef TEXTCOLOR + int ch; int color; + unsigned special; -#define zap_color(n) color = iflags.use_color ? zapcolors[n] : NO_COLOR -#define cmap_color(n) color = iflags.use_color ? defsyms[n].color : NO_COLOR -#define obj_color(n) color = iflags.use_color ? objects[n].oc_color : NO_COLOR -#define mon_color(n) color = iflags.use_color ? mons[n].mcolor : NO_COLOR -#define invis_color(n) color = NO_COLOR -#define pet_color(n) color = iflags.use_color ? mons[n].mcolor : \ - /* If no color, try to hilite pets; black */ \ - /* should be HI */ \ - ((iflags.hilite_pet) ? CLR_BLACK : NO_COLOR) -#define warn_color(n) color = iflags.use_color ? def_warnsyms[n].color : NO_COLOR - -# else /* no text color */ - -#define zap_color(n) -#define cmap_color(n) -#define obj_color(n) -#define mon_color(n) -#define invis_color(n) -#define pet_color(c) -#define warn_color(c) -#endif /* no text color */ - - /* - * Map the glyph back to a character. - * - * Warning: For speed, this makes an assumption on the order of - * offsets. The order is set in display.h. - */ - if ((offset = (glyph - GLYPH_WARNING_OFF)) >= 0) { /* a warning flash */ - ch = warnsyms[offset]; - warn_color(offset); - } else - if ((offset = (glyph - GLYPH_SWALLOW_OFF)) >= 0) { /* swallow */ - /* see swallow_to_glyph() in display.c */ - ch = (uchar) showsyms[S_sw_tl + (offset & 0x7)]; - mon_color(offset >> 3); - } else if ((offset = (glyph - GLYPH_ZAP_OFF)) >= 0) { /* zap beam */ - /* see zapdir_to_glyph() in display.c */ - ch = showsyms[S_vbeam + (offset & 0x3)]; - zap_color((offset >> 2)); - } else if ((offset = (glyph - GLYPH_CMAP_OFF)) >= 0) { /* cmap */ - ch = showsyms[offset]; - cmap_color(offset); - } else if ((offset = (glyph - GLYPH_OBJ_OFF)) >= 0) { /* object */ - ch = oc_syms[(int)objects[offset].oc_class]; - obj_color(offset); - } else if ((offset = (glyph - GLYPH_RIDDEN_OFF)) >= 0) { /* mon ridden */ - ch = monsyms[(int)mons[offset].mlet]; - mon_color(offset); - } else if ((offset = (glyph - GLYPH_BODY_OFF)) >= 0) { /* a corpse */ - ch = oc_syms[(int)objects[CORPSE].oc_class]; - mon_color(offset); - } else if ((offset = (glyph - GLYPH_DETECT_OFF)) >= 0) { /* mon detect */ - ch = monsyms[(int)mons[offset].mlet]; - mon_color(offset); - /* Disabled for now; anyone want to get reverse video to work? */ - /* is_reverse = TRUE; */ - } else if ((offset = (glyph - GLYPH_INVIS_OFF)) >= 0) { /* invisible */ - ch = DEF_INVISIBLE; - invis_color(offset); - } else if ((offset = (glyph - GLYPH_PET_OFF)) >= 0) { /* a pet */ - ch = monsyms[(int)mons[offset].mlet]; - pet_color(offset); - } else { /* a monster */ - ch = monsyms[(int)mons[glyph].mlet]; - mon_color(glyph); - } + /* map glyph to character and color */ + mapglyph(glyph, &ch, &color, &special, x, y); #ifdef TEXTCOLOR /* Turn off color if rogue level. */ @@ -1038,6 +1046,178 @@ {} #endif +/** Gem_outrip **/ +void mar_set_text_to_rip(winid); +char** rip_line=0; +extern const char *killed_by_prefix[]; +void +Gem_outrip(w, how) +winid w; +int how; +{ +/* Code from X11 windowport */ +#define STONE_LINE_LEN 15 /* # chars that fit on one line */ +#define NAME_LINE 0 /* line # for player name */ +#define GOLD_LINE 1 /* line # for amount of gold */ +#define DEATH_LINE 2 /* line # for death description */ +#define YEAR_LINE 6 /* line # for year */ + char buf[BUFSZ]; + char *dpx; + int line; + if (!rip_line) { + int i; + rip_line= (char **)malloc((YEAR_LINE+1)*sizeof(char *)); + for (i=0; i STONE_LINE_LEN) { + for(i = STONE_LINE_LEN; + ((i0 > STONE_LINE_LEN) && i); i--) + if(dpx[i] == ' ') i0 = i; + if(!i) i0 = STONE_LINE_LEN; + } + tmpchar = dpx[i0]; + dpx[i0] = 0; + strcpy(rip_line[line], dpx); + if (tmpchar != ' ') { + dpx[i0] = tmpchar; + dpx= &dpx[i0]; + } else dpx= &dpx[i0+1]; + } + /* Put year on stone */ + Sprintf(rip_line[YEAR_LINE], "%4d", getyear()); + mar_set_text_to_rip(w); + for(line=0;line<13;line++) + putstr(w, 0, ""); +} +void +mar_get_font(type,p_fname,psize) +int type; +char **p_fname; +int *psize; +{ + switch(type){ + case NHW_MESSAGE: + *p_fname=iflags.wc_font_message; + *psize=iflags.wc_fontsiz_message; + break; + case NHW_MAP: + *p_fname=iflags.wc_font_map; + *psize=iflags.wc_fontsiz_map; + break; + case NHW_STATUS: + *p_fname=iflags.wc_font_status; + *psize=iflags.wc_fontsiz_status; + break; + case NHW_MENU: + *p_fname=iflags.wc_font_menu; + *psize=iflags.wc_fontsiz_menu; + break; + case NHW_TEXT: + *p_fname=iflags.wc_font_text; + *psize=iflags.wc_fontsiz_text; + break; + default: + break; + } +} +void +Gem_preference_update(pref) +const char *pref; +{ + if( stricmp( pref, "font_message")==0 || + stricmp( pref, "font_size_message")==0 ) { + if( iflags.wc_fontsiz_messageNHFONT_SIZE_MAX ) + iflags.wc_fontsiz_message = NHFONT_DEFAULT_SIZE; + mar_set_font(NHW_MESSAGE,iflags.wc_font_message,iflags.wc_fontsiz_message); + return; + } + if( stricmp( pref, "font_map")==0 || + stricmp( pref, "font_size_map")==0 ) { + if( iflags.wc_fontsiz_mapNHFONT_SIZE_MAX ) + iflags.wc_fontsiz_map = NHFONT_DEFAULT_SIZE; + mar_set_font(NHW_MAP,iflags.wc_font_map,iflags.wc_fontsiz_map); + return; + } + if( stricmp( pref, "font_status")==0 || + stricmp( pref, "font_size_status")==0 ) { + if( iflags.wc_fontsiz_statusNHFONT_SIZE_MAX ) + iflags.wc_fontsiz_status = NHFONT_DEFAULT_SIZE; + mar_set_font(NHW_STATUS,iflags.wc_font_status,iflags.wc_fontsiz_status); + return; + } + if( stricmp( pref, "font_menu")==0 || + stricmp( pref, "font_size_menu")==0 ) { + if( iflags.wc_fontsiz_menuNHFONT_SIZE_MAX ) + iflags.wc_fontsiz_menu = NHFONT_DEFAULT_SIZE; + mar_set_font(NHW_MENU,iflags.wc_font_menu,iflags.wc_fontsiz_menu); + return; + } + if( stricmp( pref, "font_text")==0 || + stricmp( pref, "font_size_text")==0 ) { + if( iflags.wc_fontsiz_textNHFONT_SIZE_MAX ) + iflags.wc_fontsiz_text = NHFONT_DEFAULT_SIZE; + mar_set_font(NHW_TEXT,iflags.wc_font_text,iflags.wc_fontsiz_text); + return; + } + if( stricmp( pref, "scroll_margin")==0 ) { + mar_set_margin(iflags.wc_scroll_margin); + Gem_cliparound(u.ux, u.uy); + return; + } + if( stricmp( pref, "ascii_map")==0 ) { + mar_set_tile_mode(!iflags.wc_ascii_map); + doredraw(); + return; + } + if( stricmp( pref, "hilite_pet")==0 ){ + /* MAR -- works without doing something here. */ + return; + } + if( stricmp( pref, "align_message")==0){ + mar_set_msg_align(iflags.wc_align_message-ALIGN_BOTTOM); + return; + } + if(stricmp( pref, "align_status")==0 ){ + mar_set_status_align(iflags.wc_align_status-ALIGN_BOTTOM); + return; + } + if( stricmp( pref, "vary_msgcount")==0 ){ + mar_set_msg_visible(iflags.wc_vary_msgcount); + return; + } +} /* * Allocate a copy of the given string. If null, return a string of * zero length. diff -Naurd ../nethack-3.3.1/win/gem/xpm2img.c ./win/gem/xpm2img.c --- ../nethack-3.3.1/win/gem/xpm2img.c Thu Jan 1 01:00:00 1970 +++ ./win/gem/xpm2img.c Fri Mar 22 14:40:55 2002 @@ -0,0 +1,164 @@ +/* SCCS Id: @(#)xpm2img.c 3.4 2002/03/17 */ +/* Copyright (c) Christian Bressler 2002 */ +/* NetHack may be freely redistributed. See license for details. */ +/* This is mainly a reworked tile2bmp.c + xpm2iff.c -- Marvin */ +#include +#include +#include +#include "bitmfile.h" +#define TRUE 1 +#define FALSE 0 +void get_color(unsigned int colind, struct RGB *rgb); +void get_pixel(int x, int y, unsigned int *colind); +char *xpmgetline(); +unsigned int **Bild_daten; +/* translation table from xpm characters to RGB and colormap slots */ +struct Ttable { + char flag; + struct RGB col; + int slot; /* output colortable index */ +}ttable[256]; +struct RGB *ColorMap; +int num_colors = 0; +int width=0, height=0; +int initflag; +FILE *fp; +int +main(argc, argv) +int argc; +char *argv[]; +{ + int i; + int row, col, planeno; + int farben, planes; + if (argc != 3) { + fprintf(stderr, "usage: tile2img infile.xpm outfile.img\n"); + exit(EXIT_FAILURE); + } + initflag = 0; + fp = fopen(argv[2],"wb"); + if (!fp) { + printf("Error creating IMG-file %s, aborting.\n",argv[2]); + exit(EXIT_FAILURE); + } + fclose(fp); + if(fopen_xpm_file(argv[1],"r")!=TRUE){ + printf("Error reading xpm-file %s, aborting.\n",argv[1]); + exit(EXIT_FAILURE); + } + Bild_daten=(unsigned int **)malloc((long)height*sizeof(unsigned int *)); + for(i=0;i256){ + fprintf(stderr,"ERROR: zuviele Farben\n"); + exit(EXIT_FAILURE); + }else if(num_colors>16){ + farben=256; + planes=8; + }else if(num_colors>2){ + farben=16; + planes=4; + }else{ + farben=2; + planes=1; + } + bitmap_to_file(XIMG, width, height, 372, 372, planes, farben, argv[2], get_color, get_pixel ); + exit(EXIT_SUCCESS); + /*NOTREACHED*/ + return 0; +} +void get_color(unsigned int colind, struct RGB *rgb){ + rgb->r=(1000L*(long)ColorMap[colind].r)/0xFF; + rgb->g=(1000L*(long)ColorMap[colind].g)/0xFF; + rgb->b=(1000L*(long)ColorMap[colind].b)/0xFF; +} +void get_pixel(int x, int y, unsigned int *colind){ + *colind=Bild_daten[y][x]; +} +FILE *xpmfh = 0; +char initbuf[200]; +char *xpmbuf = initbuf; +/* version 1. Reads the raw xpm file, NOT the compiled version. This is + * not a particularly good idea but I don't have time to do the right thing + * at this point, even if I was absolutely sure what that was. */ +fopen_xpm_file(const char *fn, const char *mode){ + int temp; + char *xb; + if(strcmp(mode, "r"))return FALSE; /* no choice now */ + if(xpmfh)return FALSE; /* one file at a time */ + xpmfh = fopen(fn, mode); + if(!xpmfh)return FALSE; /* I'm hard to please */ + /* read the header */ + xb = xpmgetline(); + if(xb == 0)return FALSE; + if(4 != sscanf(xb,"%d %d %d %d", + &width, &height,&num_colors, &temp)) + return FALSE; /* bad header */ + /* replace the original buffer with one big enough for + * the real data + */ +/* XXX */ + xpmbuf = malloc(width * 2); + if(!xpmbuf){ + fprintf(stderr,"ERROR: Can't allocate line buffer\n"); + exit(1); + } + if(temp != 1)return FALSE; /* limitation of this code */ + { + /* read the colormap and translation table */ + int ccount = -1; + ColorMap = (struct RGB *)malloc((long)num_colors*sizeof(struct RGB)); + while(ccount++ < (num_colors-1)){ + char index; + int r, g, b; + xb = xpmgetline(); + if(xb==0)return FALSE; + if(4 != sscanf(xb,"%c c #%2x%2x%2x",&index,&r,&g,&b)){ + fprintf(stderr,"Bad color entry: %s\n",xb); + return FALSE; + } + ttable[index].flag = 1; /* this color is valid */ + ttable[index].col.r = r; + ttable[index].col.g = g; + ttable[index].col.b = b; + ttable[index].slot = ccount; + ColorMap[ccount].r=r; + ColorMap[ccount].g=g; + ColorMap[ccount].b=b; + } + } + return TRUE; +} +/* This deserves better. Don't read it too closely - you'll get ill. */ +#define bufsz 2048 +char buf[bufsz]; +char * +xpmgetline(){ + char *bp; + do { + if(fgets(buf, bufsz, xpmfh) == 0)return 0; + } while(buf[0] != '"'); + /* strip off the trailing <",> if any */ + for(bp = buf;*bp;bp++); + bp--; + while(isspace(*bp))bp--; + if(*bp==',')bp--; + if(*bp=='"')bp--; + bp++; + *bp = '\0'; + return &buf[1]; +}