xconq ./ChangeLog sdl/sdlcmd.c sdl/sdlconq.h s ...

xconq ./ChangeLog sdl/sdlcmd.c sdl/sdlconq.h s ...

[shebs]

CVSROOT:	/cvs/xconq
Module name:	xconq
Changes by:	shebs@sources.redhat.com	2001-03-26 09:14:11

Modified files:
	.              : ChangeLog 
	sdl            : sdlcmd.c sdlconq.h sdlmain.c sdlscreen.c 

Log message:
	Add buttons to SDL interface, use for construction.  Also
	allow panels to be transparent, add mouseover help.
	* sdlconq.h (Panel overlay, label, buttons, numbuttons): New
	fields.
	(Button): New structure.
	* sdlmain.c (handle_mouse_down_in_panel): New function.
	(handle_mouse_down): Use it.
	* sdlscreen.c (create_panel): Add screen argument.
	(open_screen): Move panel_specific code to create_panel,
	add panel labels.
	(create_panel): Add a group of buttons.
	(set_panel_sizes): Account for transparent panels.
	(draw_panel): Only draw background if not transparent, tweak
	position of expand/contract button, draw buttons.
	(struct protobutton): New structure, info about possible
	buttons.
	(protobuttons, num_protobuttons, button_offset): New globals.
	(prev_button_fn, next_button_fn, build_button_fn): New functions.
	(update_unit_info): Fill in the bottom panel button with
	construction actions.
	(create_button, draw_button): New functions.
	(draw_world_map): Change calc to area to clear.
	* sdlcmd.c (impl_build): Make extern.
	
	* sdlmain.c (screen_oneliner): New function.
	(update_mouseover): Use it.
	* sdlscreen.c (draw_mouseover_panel): Ditto.

xconq ./ChangeLog sdl/sdlcmd.c sdl/sdlconq.h s ...

[shebs]

CVSROOT:	/cvs/xconq
Module name:	xconq
Changes by:	shebs@sources.redhat.com	2001-03-16 05:16:37

Modified files:
	.              : ChangeLog 
	sdl            : sdlcmd.c sdlconq.h sdlmain.c sdlmap.c 
	                 sdlscreen.c 

Log message:
	Add display of world map as minimap in bottom panel.
	* sdlconq.h (Screen minimap): New field.
	(Screen number, terrain_patterns): Remove, never used.
	(Map sx, sy, is_world): New fields.
	* sdlmain.c (default_draw_terrain_patterns): Remove, never used.
	(point_in_map): New function.
	(autoscroll): Add explicit map and minimap handling, remove
	"vp" and "which" args.
	(ui_mainloop, update_mouseover_x): Update autoscroll call.
	(set_current_unit): Call update_unit_info instead of draw_unit_info.
	(update_mouseover_x): Use point_in_map.
	(s_nearest_cell): Adjust for map position.
	(update_unit_display): Call draw_unit_info instead of
	update_unit_info.
	* sdlscreen.c (open_screen): Call create_map to create maps,
	add creation of minimap.
	(set_panel_position): New function.
	(set_panel_sizes): Call it, adjust panels according to type.
	(add_update): Do clipping into args.
	(draw_unit_info): Make this do the drawing of unit info
	strings only, improve string position calcs.
	(update_unit_info): New function.
	(draw_world_map): Fill it in.
	(draw_line): New function, only does horizontal and vertical
	right now.
	* sdlmap.c (create_map): New function.
	(draw_map_outline): New function.
	(draw_map): Call it.
	(xform): Adjust for map position.
	
	* sdlmain.c (set_tool_cursor): Remove "which" arg, simplify.
	* sdlmain.c (autoscroll, handle_event): Update call.
	* sdlcmd.c (do_survey, do_design): Ditto.
	* sdlconq.h: Update decl.