ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.228 by root, Wed May 24 03:52:54 2006 UTC vs.
Revision 1.262 by elmex, Wed May 31 13:44:26 2006 UTC

…		…
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8		8
9	use CFClient;	9	use CFClient;
		10	use CFClient::Texture;
10		11
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		13
		14	our $LAYOUT;
13	our $ROOT;	15	our $ROOT;
14	our $TOOLTIP;	16	our $TOOLTIP;
15	our $BUTTON_STATE;	17	our $BUTTON_STATE;
16		18
17	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
		20
		21	sub get_layout {
		22	my $layout;
		23
		24	for (grep { $_->{name} } values %WIDGET) {
		25	my $win = $layout->{$_->{name}} = { };
		26
		27	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
		28	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
		29	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
		30	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
		31
		32	$win->{show} = $_->{visible} && $_->{is_toplevel};
		33	}
		34
		35	$layout
		36	}
		37
		38	sub set_layout {
		39	my ($layout) = @_;
		40
		41	$LAYOUT = $layout;
		42	}
18		43
19	sub check_tooltip {	44	sub check_tooltip {
20	if (!$GRAB) {	45	if (!$GRAB) {
21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	46	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22	if (length $widget->{tooltip}) {	47	if (length $widget->{tooltip}) {
23		48
24	if ($TOOLTIP->{owner} != $widget) {	49	if ($TOOLTIP->{owner} != $widget) {
		50	$TOOLTIP->hide;
		51
25	$TOOLTIP->{owner} = $widget;	52	$TOOLTIP->{owner} = $widget;
26		53
27	my $tip = $widget->{tooltip};	54	my $tip = $widget->{tooltip};
28		55
29	$tip = $tip->($widget) if CODE:: eq ref $tip;	56	$tip = $tip->($widget) if CODE:: eq ref $tip;
30		57
31	$TOOLTIP->set_tooltip_from ($widget);	58	$TOOLTIP->set_tooltip_from ($widget);
32	$TOOLTIP->show;	59	$TOOLTIP->show;
33
34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37	if $x + $TOOLTIP->{w} > $::WIDTH;
38
39	$TOOLTIP->move ($x, $y);
40	$TOOLTIP->check_size;
41	$TOOLTIP->update;
42	}	60	}
43		61
44	return;	62	return;
45	}	63	}
46	}	64	}
…		…
50	delete $TOOLTIP->{owner};	68	delete $TOOLTIP->{owner};
51	}	69	}
52		70
53	# class methods for events	71	# class methods for events
54	sub feed_sdl_key_down_event {	72	sub feed_sdl_key_down_event {
55	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	73	$FOCUS->emit (key_down => $_[0])
56	if $FOCUS;	74	if $FOCUS;
57	}	75	}
58		76
59	sub feed_sdl_key_up_event {	77	sub feed_sdl_key_up_event {
60	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	78	$FOCUS->emit (key_up => $_[0])
61	if $FOCUS;	79	if $FOCUS;
62	}	80	}
63		81
64	sub feed_sdl_button_down_event {	82	sub feed_sdl_button_down_event {
65	my ($ev) = @_;	83	my ($ev) = @_;
…		…
74	check_tooltip;	92	check_tooltip;
75	}	93	}
76		94
77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	95	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
78		96
79	if ($GRAB) {	97	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80	($x, $y) = $GRAB->coord2local ($x, $y);	98	if $GRAB;
81	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82	}
83	}	99	}
84		100
85	sub feed_sdl_button_up_event {	101	sub feed_sdl_button_up_event {
86	my ($ev) = @_;	102	my ($ev) = @_;
87	my ($x, $y) = ($ev->{x}, $ev->{y});	103	my ($x, $y) = ($ev->{x}, $ev->{y});
88		104
89	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	105	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90		106
91	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	107	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92		108
93	if ($GRAB) {	109	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94	($x, $y) = $GRAB->coord2local ($x, $y);	110	if $GRAB;
95	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96	}
97		111
98	if (!$BUTTON_STATE) {	112	if (!$BUTTON_STATE) {
99	my $grab = $GRAB; undef $GRAB;	113	my $grab = $GRAB; undef $GRAB;
100	$grab->update if $grab;	114	$grab->update if $grab;
101	$GRAB->update if $GRAB;	115	$GRAB->update if $GRAB;
…		…
117	$HOVER->update if $HOVER && $HOVER->{can_hover};	131	$HOVER->update if $HOVER && $HOVER->{can_hover};
118		132
119	check_tooltip;	133	check_tooltip;
120	}	134	}
121		135
122	if ($HOVER) {
123	($x, $y) = $HOVER->coord2local ($x, $y);
124	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	136	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125	}	137	if $HOVER;
126	}	138	}
127		139
128	# convert position array to integers	140	# convert position array to integers
129	sub harmonize {	141	sub harmonize {
130	my ($vals) = @_;	142	my ($vals) = @_;
…		…
144		156
145	$_->update	157	$_->update
146	for @widgets;	158	for @widgets;
147	}	159	}
148		160
		161	sub reconfigure_widgets {
		162	# make a copy, otherwise C<for> complains about freed values.
		163	my @widgets = values %WIDGET;
		164
		165	$_->reconfigure
		166	for @widgets;
		167	}
		168
149	# call when resolution changes etc.	169	# call when resolution changes etc.
150	sub rescale_widgets {	170	sub rescale_widgets {
151	my ($sx, $sy) = @_;	171	my ($sx, $sy) = @_;
152		172
153	# make a copy, otherwise for complains about freed values.
154	my @widgets = values %WIDGET;	173	for my $widget (values %WIDGET) {
155
156	for my $widget (@widgets) {
157	if ($widget->{toplevel}) {	174	if ($widget->{is_toplevel}) {
		175	$widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		176	$widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		177
158	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	178	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
159	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	179	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	180	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
161	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	181	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
163	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	182	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	183	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
165	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};	184
		185	$widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		186	$widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		187
166	}	188	}
167
168	$widget->reconfigure;
169	}	189	}
		190
		191	reconfigure_widgets;
170	}	192	}
171		193
172	#############################################################################	194	#############################################################################
173		195
174	package CFClient::UI::Base;	196	package CFClient::UI::Base;
…		…
179		201
180	sub new {	202	sub new {
181	my $class = shift;	203	my $class = shift;
182		204
183	my $self = bless {	205	my $self = bless {
184	x => 0,	206	x => "center",
185	y => 0,	207	y => "center",
186	z => 0,	208	z => 0,
		209	w => undef,
		210	h => undef,
187	can_events => 1,	211	can_events => 1,
188	@_	212	@_
189	}, $class;	213	}, $class;
190		214
		215	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		216
191	for (keys %$self) {	217	for (keys %$self) {
192	if (/^connect_(.*)$/) {	218	if (/^on_(.*)$/) {
193	$self->connect ($1 => delete $self->{$_});	219	$self->connect ($1 => delete $self->{$_});
194	}	220	}
195	}	221	}
196		222
197	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	223	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		224	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
		225	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
		226	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
		227	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
		228
		229	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		230	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		231
		232	$self->show if $layout->{show};
		233	}
198		234
199	$self	235	$self
200	}	236	}
201		237
202	sub destroy {	238	sub destroy {
…		…
206	%$self = ();	242	%$self = ();
207	}	243	}
208		244
209	sub show {	245	sub show {
210	my ($self) = @_;	246	my ($self) = @_;
		247
211	return if $self->{parent};	248	return if $self->{parent};
212		249
213	$CFClient::UI::ROOT->add ($self);	250	$CFClient::UI::ROOT->add ($self);
214	}	251	}
215		252
216	sub show_centered {	253	sub set_visible {
217	my ($self) = @_;	254	my ($self) = @_;
		255
218	return if $self->{parent};	256	return if $self->{visible};
219		257
220	$self->show;	258	$self->{root} = $self->{parent}{root};
		259	$self->{visible} = $self->{parent}{visible} + 1;
221		260
222	$CFClient::UI::ROOT->on_post_alloc (	261	$self->emit (visibility_change => 1);
223	"centered $self" => sub {
224	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225	},
226	);
227	}
228		262
229	sub hide {	263	$self->realloc if !exists $self->{req_w};
		264
		265	$_->set_visible for $self->children;
		266	}
		267
		268	sub set_invisible {
230	my ($self) = @_;	269	my ($self) = @_;
		270
		271	return unless $self->{visible};
		272
		273	$_->set_invisible for $self->children;
		274
		275	delete $self->{root};
		276	delete $self->{visible};
231		277
232	undef $GRAB if $GRAB == $self;	278	undef $GRAB if $GRAB == $self;
233	undef $HOVER if $HOVER == $self;	279	undef $HOVER if $HOVER == $self;
234		280
		281	CFClient::UI::check_tooltip
		282	if $TOOLTIP->{owner} == $self;
		283
		284	$self->focus_out;
		285
		286	$self->emit (visibility_change => 0);
		287	}
		288
		289	sub set_visibility {
		290	my ($self, $visible) = @_;
		291
		292	return if $self->{visible} == $visible;
		293
		294	$visible ? $self->hide
		295	: $self->show;
		296	}
		297
		298	sub toggle_visibility {
		299	my ($self) = @_;
		300
		301	$self->{visible}
		302	? $self->hide
		303	: $self->show;
		304	}
		305
		306	sub hide {
		307	my ($self) = @_;
		308
		309	$self->set_invisible;
		310
235	$self->{parent}->remove ($self)	311	$self->{parent}->remove ($self)
236	if $self->{parent};	312	if $self->{parent};
237	}	313	}
238		314
239	sub move {	315	sub move_abs {
240	my ($self, $x, $y, $z) = @_;	316	my ($self, $x, $y, $z) = @_;
241		317
242	$self->{x} = int $x;	318	$self->{x} = List::Util::max 0, int $x;
243	$self->{y} = int $y;	319	$self->{y} = List::Util::max 0, int $y;
244	$self->{z} = $z if defined $z;	320	$self->{z} = $z if defined $z;
245		321
246	$self->update;	322	$self->update;
247	}	323	}
248		324
249	sub set_size {	325	sub set_size {
250	my ($self, $w, $h) = @_;	326	my ($self, $w, $h) = @_;
251		327
252	$self->{user_w} = $w;	328	$self->{force_w} = $w;
253	$self->{user_h} = $h;	329	$self->{force_h} = $h;
254		330
255	$self->check_size;	331	$self->realloc;
256	}	332	}
257		333
258	sub size_request {	334	sub size_request {
259	require Carp;	335	require Carp;
260	Carp::confess "size_request is abstract";	336	Carp::confess "size_request is abstract";
…		…
262		338
263	sub configure {	339	sub configure {
264	my ($self, $x, $y, $w, $h) = @_;	340	my ($self, $x, $y, $w, $h) = @_;
265		341
266	if ($self->{aspect}) {	342	if ($self->{aspect}) {
		343	my ($ow, $oh) = ($w, $h);
		344
267	my $w2 = List::Util::min $w, int $h * $self->{aspect};	345	$w = List::Util::min $w, int $h * $self->{aspect};
268	my $h2 = List::Util::min $h, int $w / $self->{aspect};	346	$h = List::Util::min $h, int $w / $self->{aspect};
269		347
270	# use alignment to adjust x, y	348	# use alignment to adjust x, y
271		349
272	$x += int +($w - $w2) * 0.5;	350	$x += int 0.5 * ($ow - $w);
273	$y += int +($h - $h2) * 0.5;	351	$y += int 0.5 * ($oh - $h);
274
275	($w, $h) = ($w2, $h2);
276	}	352	}
277		353
278	if ($self->{x} != $x || $self->{y} != $y) {	354	if ($self->{x} ne $x || $self->{y} ne $y) {
279	$self->{x} = $x;	355	$self->{x} = $x;
280	$self->{y} = $y;	356	$self->{y} = $y;
281	$self->update;	357	$self->update;
282	}	358	}
283		359
284	if ($self->{w} != $w || $self->{h} != $h) {	360	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
285	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	361	return unless $self->{visible};
		362
		363	$self->{alloc_w} = $w;
		364	$self->{alloc_h} = $h;
		365
		366	$self->{root}{size_alloc}{$self+0} = $self;
286	}	367	}
287	}	368	}
288		369
289	sub size_allocate {	370	sub size_allocate {
290	# nothing to be done	371	# nothing to be done
291	}	372	}
292		373
293	sub reconfigure {
294	my ($self) = @_;
295
296	$self->check_size (1);
297	$self->update;
298	}
299
300	sub children {	374	sub children {
301	}	375	}
302		376
303	sub set_max_size {	377	sub set_max_size {
304	my ($self, $w, $h) = @_;	378	my ($self, $w, $h) = @_;
…		…
307	delete $self->{max_h}; $self->{max_h} = $h if $h;	381	delete $self->{max_h}; $self->{max_h} = $h if $h;
308	}	382	}
309		383
310	sub set_tooltip {	384	sub set_tooltip {
311	my ($self, $tooltip) = @_;	385	my ($self, $tooltip) = @_;
		386
		387	$tooltip =~ s/^\s+//;
		388	$tooltip =~ s/\s+$//;
		389
		390	return if $self->{tooltip} eq $tooltip;
312		391
313	$self->{tooltip} = $tooltip;	392	$self->{tooltip} = $tooltip;
314		393
315	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	394	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316	delete $CFClient::UI::TOOLTIP->{owner};	395	delete $CFClient::UI::TOOLTIP->{owner};
…		…
338	return if $FOCUS == $self;	417	return if $FOCUS == $self;
339	return unless $self->{can_focus};	418	return unless $self->{can_focus};
340		419
341	my $focus = $FOCUS; $FOCUS = $self;	420	my $focus = $FOCUS; $FOCUS = $self;
342		421
343	$self->emit (focus_in => $focus);	422	$self->_emit (focus_in => $focus);
344		423
345	$focus->update if $focus;	424	$focus->update if $focus;
346	$FOCUS->update;	425	$FOCUS->update;
347	}	426	}
348		427
…		…
351		430
352	return unless $FOCUS == $self;	431	return unless $FOCUS == $self;
353		432
354	my $focus = $FOCUS; undef $FOCUS;	433	my $focus = $FOCUS; undef $FOCUS;
355		434
356	$self->emit (focus_out => $focus);	435	$self->_emit (focus_out => $focus);
357		436
358	$focus->update if $focus; #?	437	$focus->update if $focus; #?
		438
		439	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		440	unless $FOCUS;
359	}	441	}
360		442
361	sub mouse_motion { }	443	sub mouse_motion { }
362	sub button_up { }	444	sub button_up { }
363	sub key_down { }	445	sub key_down { }
364	sub key_up { }	446	sub key_up { }
365		447
366	sub button_down {	448	sub button_down {
367	my ($self, $ev, $x, $y) = @_;	449	my ($self, $ev, $x, $y) = @_;
368		450
369	$self->focus_in;	451	$self->focus_in;
…		…
372	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	454	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
373	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	455	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
374	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	456	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
375	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	457	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
376	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	458	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
		459
		460	sub find_widget {
		461	my ($self, $x, $y) = @_;
		462
		463	return () unless $self->{can_events};
		464
		465	return $self
		466	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		467	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		468
		469	()
		470	}
		471
		472	sub set_parent {
		473	my ($self, $parent) = @_;
		474
		475	Scalar::Util::weaken ($self->{parent} = $parent);
		476	$self->set_visible if $parent->{visible};
		477	}
		478
		479	sub connect {
		480	my ($self, $signal, $cb) = @_;
		481
		482	push @{ $self->{signal_cb}{$signal} }, $cb;
		483	}
		484
		485	sub _emit {
		486	my ($self, $signal, @args) = @_;
		487
		488	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		489	}
		490
		491	sub emit {
		492	my ($self, $signal, @args) = @_;
		493
		494	$self->_emit ($signal, @args)
		495	|| $self->$signal (@args);
		496	}
		497
		498	sub visibility_change {
		499	#my ($self, $visible) = @_;
		500	}
		501
		502	sub realloc {
		503	my ($self) = @_;
		504
		505	if ($self->{visible}) {
		506	return if $self->{root}{realloc}{$self+0};
		507
		508	$self->{root}{realloc}{$self+0} = $self;
		509	$self->{root}->update;
		510	} else {
		511	delete $self->{req_w};
		512	delete $self->{req_h};
		513	}
		514	}
		515
		516	sub update {
		517	my ($self) = @_;
		518
		519	$self->{parent}->update
		520	if $self->{parent};
		521	}
		522
		523	sub reconfigure {
		524	my ($self) = @_;
		525
		526	$self->realloc;
		527	$self->update;
		528	}
377		529
378	sub draw {	530	sub draw {
379	my ($self) = @_;	531	my ($self) = @_;
380		532
381	return unless $self->{h} && $self->{w};	533	return unless $self->{h} && $self->{w};
…		…
398	glVertex $x , $y + $self->{h};	550	glVertex $x , $y + $self->{h};
399	glEnd;	551	glEnd;
400	glDisable GL_BLEND;	552	glDisable GL_BLEND;
401	}	553	}
402		554
403	if ($ENV{PCLIENT_DEBUG}) {	555	if ($ENV{CFPLUS_DEBUG} & 1) {
404	glPushMatrix;	556	glPushMatrix;
405	glColor 1, 1, 0, 1;	557	glColor 1, 1, 0, 1;
406	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	558	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407	glBegin GL_LINE_LOOP;	559	glBegin GL_LINE_LOOP;
408	glVertex 0 , 0;	560	glVertex 0 , 0;
409	glVertex $self->{w}, 0;	561	glVertex $self->{w} - 1, 0;
410	glVertex $self->{w}, $self->{h};	562	glVertex $self->{w} - 1, $self->{h} - 1;
411	glVertex 0 , $self->{h};	563	glVertex 0 , $self->{h} - 1;
412	glEnd;	564	glEnd;
413	glPopMatrix;	565	glPopMatrix;
414	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	566	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
415	}	567	}
416	}	568	}
417		569
418	sub _draw {	570	sub _draw {
419	my ($self) = @_;	571	my ($self) = @_;
420		572
421	warn "no draw defined for $self\n";	573	warn "no draw defined for $self\n";
422	}
423
424	sub find_widget {
425	my ($self, $x, $y) = @_;
426
427	return () unless $self->{can_events};
428
429	return $self
430	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
431	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
432
433	()
434	}
435
436	sub set_parent {
437	my ($self, $parent) = @_;
438
439	Scalar::Util::weaken ($self->{parent} = $parent);
440
441	# TODO: req_w _does_change after ->reconfigure
442	$self->check_size
443	unless exists $self->{req_w};
444
445	$self->show;
446	}
447
448	sub check_size {
449	my ($self, $forced) = @_;
450
451	$self->{force_alloc} = 1 if $forced;
452	$CFClient::UI::ROOT->{check_size}{$self} = $self;
453	}
454
455	sub update {
456	my ($self) = @_;
457
458	$self->{parent}->update
459	if $self->{parent};
460	}
461
462	sub connect {
463	my ($self, $signal, $cb) = @_;
464
465	push @{ $self->{signal_cb}{$signal} }, $cb;
466	}
467
468	sub emit {
469	my ($self, $signal, @args) = @_;
470
471	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
472	}	574	}
473		575
474	sub DESTROY {	576	sub DESTROY {
475	my ($self) = @_;	577	my ($self) = @_;
476		578
…		…
534	my ($class, %arg) = @_;	636	my ($class, %arg) = @_;
535	$class->SUPER::new (can_events => 0, %arg);	637	$class->SUPER::new (can_events => 0, %arg);
536	}	638	}
537		639
538	sub size_request {	640	sub size_request {
539	(0, 0)	641	my ($self) = @_;
		642
		643	($self->{w} + 0, $self->{h} + 0)
540	}	644	}
541		645
542	sub draw { }	646	sub draw { }
543		647
544	#############################################################################	648	#############################################################################
…		…
573	$self->{children} = [	677	$self->{children} = [
574	sort { $a->{z} <=> $b->{z} }	678	sort { $a->{z} <=> $b->{z} }
575	@{$self->{children}}, @widgets	679	@{$self->{children}}, @widgets
576	];	680	];
577		681
578	$self->check_size (1);	682	$self->realloc;
579	$self->update;
580	}	683	}
581		684
582	sub children {	685	sub children {
583	@{ $_[0]{children} }	686	@{ $_[0]{children} }
584	}	687	}
…		…
589	delete $child->{parent};	692	delete $child->{parent};
590	$child->hide;	693	$child->hide;
591		694
592	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	695	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593		696
594	$self->check_size;	697	$self->realloc;
595	$self->update;
596	}	698	}
597		699
598	sub clear {	700	sub clear {
599	my ($self) = @_;	701	my ($self) = @_;
600		702
…		…
604	for (@$children) {	706	for (@$children) {
605	delete $_->{parent};	707	delete $_->{parent};
606	$_->hide;	708	$_->hide;
607	}	709	}
608		710
609	$self->check_size;	711	$self->realloc;
610	$self->update;
611	}	712	}
612		713
613	sub find_widget {	714	sub find_widget {
614	my ($self, $x, $y) = @_;	715	my ($self, $x, $y) = @_;
615		716
…		…
739		840
740	package CFClient::UI::ViewPort;	841	package CFClient::UI::ViewPort;
741		842
742	our @ISA = CFClient::UI::Window::;	843	our @ISA = CFClient::UI::Window::;
743		844
		845	sub new {
		846	my $class = shift;
		847
		848	$class->SUPER::new (
		849	scroll_x => 0,
		850	scroll_y => 1,
		851	@_,
		852	)
		853	}
		854
744	sub size_request {	855	sub size_request {
745	my ($self) = @_;	856	my ($self) = @_;
746		857
747	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	858	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
748		859
749	@$self{qw(child_w child_h)}	860	$w = 10 if $self->{scroll_x};
		861	$h = 10 if $self->{scroll_y};
		862
		863	($w, $h)
750	}	864	}
751		865
752	sub size_allocate {	866	sub size_allocate {
753	my ($self, $w, $h) = @_;	867	my ($self, $w, $h) = @_;
754		868
755	my ($cw, $ch) = @$self{qw(child_w child_h)};	869	my $child = $self->child;
756	# $w = $self->{w};	870
		871	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
		872	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
		873
757	$self->child->configure (0, 0, $cw, $ch);	874	$self->child->configure (0, 0, $w, $h);
758	$self->update;	875	$self->update;
759	}	876	}
760		877
761	sub set_offset {	878	sub set_offset {
762	my ($self, $x, $y) = @_;	879	my ($self, $x, $y) = @_;
…		…
813	my $class = shift;	930	my $class = shift;
814		931
815	my $self;	932	my $self;
816		933
817	my $slider = new CFClient::UI::Slider	934	my $slider = new CFClient::UI::Slider
818	vertical => 1,	935	vertical => 1,
819	range => [0, 0, 1, 0.01], # HACK fix	936	range => [0, 0, 1, 0.01], # HACK fix
820	connect_changed => sub {	937	on_changed => sub {
821	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	938	$self->{vp}->set_offset (0, $_[1]);
822	},	939	},
823	;	940	;
824		941
825	$self = $class->SUPER::new (	942	$self = $class->SUPER::new (
826	vp => (new CFClient::UI::ViewPort expand => 1),	943	vp => (new CFClient::UI::ViewPort expand => 1),
…		…
831	$self->{vp}->add ($self->{scrolled});	948	$self->{vp}->add ($self->{scrolled});
832	$self->add ($self->{vp});	949	$self->add ($self->{vp});
833	$self->add ($self->{slider});	950	$self->add ($self->{slider});
834		951
835	$self	952	$self
		953	}
		954
		955	sub update {
		956	my ($self) = @_;
		957
		958	$self->SUPER::update;
		959
		960	# todo: overwrite size_allocate of child
		961	my $child = $self->{vp}->child;
		962	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		963	}
		964
		965	sub size_allocate {
		966	my ($self, $w, $h) = @_;
		967
		968	$self->SUPER::size_allocate ($w, $h);
		969
		970	my $child = $self->{vp}->child;
		971	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
836	}	972	}
837		973
838	#TODO# update range on size_allocate depending on child	974	#TODO# update range on size_allocate depending on child
839	# update viewport offset on scroll	975	# update viewport offset on scroll
840		976
…		…
884		1020
885	our @ISA = CFClient::UI::Bin::;	1021	our @ISA = CFClient::UI::Bin::;
886		1022
887	use CFClient::OpenGL;	1023	use CFClient::OpenGL;
888		1024
889	my @tex =	1025	my $bg =
		1026	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1027	mipmap => 1, wrap => 1;
		1028
		1029	my @border =
890	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1030	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
891	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1031	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
892		1032
893	sub new {	1033	sub new {
894	my $class = shift;	1034	my $class = shift;
895		1035
896	# TODO: user_x, user_y, overwrite moveto?
897
898	my $self = $class->SUPER::new (	1036	my $self = $class->SUPER::new (
899	bg => [1, 1, 1, 1],	1037	bg => [1, 1, 1, 1],
900	border_bg => [1, 1, 1, 1],	1038	border_bg => [1, 1, 1, 1],
901	border => 0.6,	1039	border => 0.6,
902	toplevel => 1,
903	can_events => 1,	1040	can_events => 1,
		1041	min_w => 16,
		1042	min_h => 16,
904	@_	1043	@_
905	);	1044	);
906		1045
907	$self->{title} &&= new CFClient::UI::Label	1046	$self->{title} &&= new CFClient::UI::Label
908	align => 0,	1047	align => 0,
…		…
961	my ($ev, $x, $y) = @_;	1100	my ($ev, $x, $y) = @_;
962		1101
963	my $dx = $ev->{x} - $ox;	1102	my $dx = $ev->{x} - $ox;
964	my $dy = $ev->{y} - $oy;	1103	my $dy = $ev->{y} - $oy;
965		1104
966	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1105	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
967	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1106	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1107
		1108	$self->realloc;
968	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1109	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
969	$self->check_size;
970	};	1110	};
971		1111
972	} elsif ($lr ^ $td) {	1112	} elsif ($lr ^ $td) {
973	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1113	my ($ox, $oy) = ($ev->{x}, $ev->{y});
974	my ($bx, $by) = ($self->{x}, $self->{y});	1114	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
976	$self->{motion} = sub {	1116	$self->{motion} = sub {
977	my ($ev, $x, $y) = @_;	1117	my ($ev, $x, $y) = @_;
978		1118
979	($x, $y) = ($ev->{x}, $ev->{y});	1119	($x, $y) = ($ev->{x}, $ev->{y});
980		1120
981	$self->move ($bx + $x - $ox, $by + $y - $oy);	1121	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
982	$self->update;
983	};	1122	};
984	}	1123	}
985	}	1124	}
986		1125
987	sub button_up {	1126	sub button_up {
…		…
1006	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1145	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1007		1146
1008	my $border = $self->border;	1147	my $border = $self->border;
1009		1148
1010	glColor @{ $self->{border_bg} };	1149	glColor @{ $self->{border_bg} };
1011	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1150	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1012	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1151	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1013	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1152	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1014	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1153	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1015		1154
1016	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1155	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1017	my $bg = $tex[0];	1156	glColor @{ $self->{bg} };
1018		1157
1019	# TODO: repeat texture not scale	1158	# TODO: repeat texture not scale
		1159	# solve this better(?)
1020	my $rep_x = $cw / $bg->{w};	1160	$bg->{s} = $cw / $bg->{w};
1021	my $rep_y = $ch / $bg->{h};	1161	$bg->{t} = $ch / $bg->{h};
1022
1023	glColor @{ $self->{bg} };
1024
1025	$bg->{s} = $rep_x;
1026	$bg->{t} = $rep_y;
1027	$bg->{wrap_mode} = 1;
1028	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1162	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1029	}	1163	}
1030		1164
1031	glDisable GL_TEXTURE_2D;	1165	glDisable GL_TEXTURE_2D;
1032		1166
…		…
1048	sub new {	1182	sub new {
1049	my $class = shift;	1183	my $class = shift;
1050		1184
1051	$class->SUPER::new (	1185	$class->SUPER::new (
1052	col_expand => [],	1186	col_expand => [],
1053	@_	1187	@_,
1054	)	1188	)
		1189	}
		1190
		1191	sub children {
		1192	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1055	}	1193	}
1056		1194
1057	sub add {	1195	sub add {
1058	my ($self, $x, $y, $child) = @_;	1196	my ($self, $x, $y, $child) = @_;
1059		1197
1060	$child->set_parent ($self);	1198	$child->set_parent ($self);
1061	$self->{children}[$y][$x] = $child;	1199	$self->{children}[$y][$x] = $child;
1062		1200
1063	$child->check_size;	1201	$self->realloc;
1064	}	1202	}
1065		1203
1066	sub children {
1067	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1068	}
1069
1070	# TODO: move to container class maybe? send childs a signal on removal?	1204	# TODO: move to container class maybe? send children a signal on removal?
1071	sub clear {	1205	sub clear {
1072	my ($self) = @_;	1206	my ($self) = @_;
1073		1207
1074	my @children = $self->children;	1208	my @children = $self->children;
1075	delete $self->{children};	1209	delete $self->{children};
…		…
1077	for (@children) {	1211	for (@children) {
1078	delete $_->{parent};	1212	delete $_->{parent};
1079	$_->hide;	1213	$_->hide;
1080	}	1214	}
1081		1215
1082	$self->update;	1216	$self->realloc;
1083	}	1217	}
1084		1218
1085	sub get_wh {	1219	sub get_wh {
1086	my ($self) = @_;	1220	my ($self) = @_;
1087		1221
…		…
1118	sub size_allocate {	1252	sub size_allocate {
1119	my ($self, $w, $h) = @_;	1253	my ($self, $w, $h) = @_;
1120		1254
1121	my ($ws, $hs) = $self->get_wh;	1255	my ($ws, $hs) = $self->get_wh;
1122		1256
1123	my $req_w = sum @$ws;	1257	my $req_w = (sum @$ws) || 1;
1124	my $req_h = sum @$hs;	1258	my $req_h = (sum @$hs) || 1;
1125		1259
1126	# TODO: nicer code && do row_expand	1260	# TODO: nicer code && do row_expand
1127	my @col_expand = @{$self->{col_expand}};	1261	my @col_expand = @{$self->{col_expand}};
1128	@col_expand = (1) x @$ws unless @col_expand;	1262	@col_expand = (1) x @$ws unless @col_expand;
1129	my $col_expand = (sum @col_expand) || 1;	1263	my $col_expand = (sum @col_expand) || 1;
…		…
1183	}	1317	}
1184	}	1318	}
1185		1319
1186	#############################################################################	1320	#############################################################################
1187		1321
1188	package CFClient::UI::HBox;	1322	package CFClient::UI::Box;
1189
1190	# TODO: wrap into common Box base class
1191		1323
1192	our @ISA = CFClient::UI::Container::;	1324	our @ISA = CFClient::UI::Container::;
1193		1325
1194	sub size_request {	1326	sub size_request {
1195	my ($self) = @_;	1327	my ($self) = @_;
1196		1328
1197	my @alloc = map [$_->size_request], @{$self->{children}};	1329	$self->{vertical}
1198		1330	? (
1199	(	1331	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1200	(List::Util::sum map $_->[0], @alloc),	1332	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1201	(List::Util::max map $_->[1], @alloc),	1333	)
1202	)	1334	: (
		1335	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1336	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1337	)
1203	}	1338	}
1204		1339
1205	sub size_allocate {	1340	sub size_allocate {
1206	my ($self, $w, $h) = @_;	1341	my ($self, $w, $h) = @_;
1207		1342
1208	($h, $w) = ($w, $h);	1343	my $space = $self->{vertical} ? $h : $w;
1209
1210	my $children = $self->{children};	1344	my $children = $self->{children};
1211		1345
1212	my @h = map $_->{req_w}, @$children;	1346	my @req;
1213		1347
1214	my $req_h = List::Util::sum @h;	1348	if ($self->{homogeneous}) {
1215		1349	@req = ($space / (@$children || 1)) x @$children;
1216	if ($req_h > $h) {
1217	# ah well, not enough space
1218	$_ *= $h / $req_h for @h;
1219	} else {	1350	} else {
		1351	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1352	my $req = List::Util::sum @req;
		1353
		1354	if ($req > $space) {
		1355	# ah well, not enough space
		1356	$_ *= $space / $req for @req;
		1357	} else {
1220	my $exp = List::Util::sum map $_->{expand}, @$children;	1358	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1221	$exp ||= 1;
1222		1359
		1360	$space = ($space - $req) / $expand; # remaining space to give away
		1361
		1362	$req[$_] += $space * $children->[$_]{expand}
1223	for (0 .. $#$children) {	1363	for 0 .. $#$children;
1224	my $child = $children->[$_];
1225
1226	my $alloc_h = $h[$_];
1227	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1228	$h[$_] = $alloc_h;
1229	}	1364	}
1230	}	1365	}
1231		1366
1232	CFClient::UI::harmonize \@h;	1367	CFClient::UI::harmonize \@req;
1233		1368
1234	my $y = 0;	1369	my $pos = 0;
1235	for (0 .. $#$children) {	1370	for (0 .. $#$children) {
1236	my $child = $children->[$_];
1237	my $h = $h[$_];	1371	my $alloc = $req[$_];
1238	$child->configure ($y, 0, $h, $w);	1372	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1239		1373
1240	$y += $h;	1374	$pos += $alloc;
1241	}	1375	}
1242		1376
1243	1	1377	1
1244	}	1378	}
1245		1379
1246	#############################################################################	1380	#############################################################################
1247		1381
		1382	package CFClient::UI::HBox;
		1383
		1384	our @ISA = CFClient::UI::Box::;
		1385
		1386	sub new {
		1387	my $class = shift;
		1388
		1389	$class->SUPER::new (
		1390	vertical => 0,
		1391	@_,
		1392	)
		1393	}
		1394
		1395	#############################################################################
		1396
1248	package CFClient::UI::VBox;	1397	package CFClient::UI::VBox;
1249		1398
1250	# TODO: wrap into common Box base class
1251
1252	our @ISA = CFClient::UI::Container::;	1399	our @ISA = CFClient::UI::Box::;
1253		1400
1254	sub size_request {	1401	sub new {
1255	my ($self) = @_;	1402	my $class = shift;
1256		1403
1257	my @alloc = map [$_->size_request], @{$self->{children}};	1404	$class->SUPER::new (
1258		1405	vertical => 1,
1259	(	1406	@_,
1260	(List::Util::max map $_->[0], @alloc),
1261	(List::Util::sum map $_->[1], @alloc),
1262	)	1407	)
1263	}
1264
1265	sub size_allocate {
1266	my ($self, $w, $h) = @_;
1267
1268	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1269
1270	my $children = $self->{children};
1271
1272	my @h = map $_->{req_h}, @$children;
1273
1274	my $req_h = List::Util::sum @h;
1275
1276	if ($req_h > $h) {
1277	# ah well, not enough space
1278	$_ *= $h / $req_h for @h;
1279	} else {
1280	my $exp = List::Util::sum map $_->{expand}, @$children;
1281	$exp ||= 1;
1282
1283	for (0 .. $#$children) {
1284	my $child = $children->[$_];
1285
1286	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1287	}
1288	}
1289
1290	CFClient::UI::harmonize \@h;
1291
1292	my $y = 0;
1293	for (0 .. $#$children) {
1294	my $child = $children->[$_];
1295	my $h = $h[$_];
1296	$child->configure (0, $y, $w, $h);
1297
1298	$y += $h;
1299	}
1300
1301	1
1302	}	1408	}
1303		1409
1304	#############################################################################	1410	#############################################################################
1305		1411
1306	package CFClient::UI::Label;	1412	package CFClient::UI::Label;
…		…
1323	ellipsise => 3, # end	1429	ellipsise => 3, # end
1324	layout => (new CFClient::Layout),	1430	layout => (new CFClient::Layout),
1325	fontsize => 1,	1431	fontsize => 1,
1326	align => -1,	1432	align => -1,
1327	valign => -1,	1433	valign => -1,
1328	padding => 2,	1434	padding_x => 2,
		1435	padding_y => 2,
1329	can_events => 0,	1436	can_events => 0,
1330	%arg	1437	%arg
1331	);	1438	);
1332		1439
1333	if (exists $self->{template}) {	1440	if (exists $self->{template}) {
…		…
1369	$self->{text} = "T$text";	1476	$self->{text} = "T$text";
1370		1477
1371	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1478	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1372	$self->{layout}->set_text ($text);	1479	$self->{layout}->set_text ($text);
1373		1480
		1481	$self->realloc;
1374	$self->update;	1482	$self->update;
1375	$self->check_size;
1376	}	1483	}
1377		1484
1378	sub set_markup {	1485	sub set_markup {
1379	my ($self, $markup) = @_;	1486	my ($self, $markup) = @_;
1380		1487
…		…
1384	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1491	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1385		1492
1386	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1493	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1387	$self->{layout}->set_markup ($markup);	1494	$self->{layout}->set_markup ($markup);
1388		1495
		1496	$self->realloc;
1389	$self->update;	1497	$self->update;
1390	$self->check_size;
1391	}	1498	}
1392		1499
1393	sub size_request {	1500	sub size_request {
1394	my ($self) = @_;	1501	my ($self) = @_;
1395		1502
…		…
1409		1516
1410	$w = List::Util::max $w, $w2;	1517	$w = List::Util::max $w, $w2;
1411	$h = List::Util::max $h, $h2;	1518	$h = List::Util::max $h, $h2;
1412	}	1519	}
1413		1520
1414	(	1521	($w, $h)
1415	$w + $self->{padding} * 2,
1416	$h + $self->{padding} * 2,
1417	)
1418	}	1522	}
1419		1523
1420	sub size_allocate {	1524	sub size_allocate {
1421	my ($self, $w, $h) = @_;	1525	my ($self, $w, $h) = @_;
1422		1526
…		…
1427	my ($self, $fontsize) = @_;	1531	my ($self, $fontsize) = @_;
1428		1532
1429	$self->{fontsize} = $fontsize;	1533	$self->{fontsize} = $fontsize;
1430	delete $self->{texture};	1534	delete $self->{texture};
1431		1535
1432	$self->update;	1536	$self->realloc;
1433	$self->check_size;
1434	}	1537	}
1435		1538
1436	sub _draw {	1539	sub _draw {
1437	my ($self) = @_;	1540	my ($self) = @_;
1438		1541
…		…
1446	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1549	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1447	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1550	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1448		1551
1449	my $tex = new_from_layout CFClient::Texture $self->{layout};	1552	my $tex = new_from_layout CFClient::Texture $self->{layout};
1450		1553
1451	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1554	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1452	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1555	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1453	: ($self->{w} - $tex->{w}) * 0.5);	1556	: ($self->{w} - $tex->{w}) * 0.5);
1454		1557
1455	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1558	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1456	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1559	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1457	: ($self->{h} - $tex->{h}) * 0.5);	1560	: ($self->{h} - $tex->{h}) * 0.5);
1458		1561
1459	$tex	1562	$tex
1460	};	1563	};
1461		1564
…		…
1510	$self->{text} = $text;	1613	$self->{text} = $text;
1511		1614
1512	$text =~ s/./*/g if $self->{hidden};	1615	$text =~ s/./*/g if $self->{hidden};
1513	$self->{layout}->set_text ("$text ");	1616	$self->{layout}->set_text ("$text ");
1514		1617
1515	$self->emit (changed => $self->{text});	1618	$self->_emit (changed => $self->{text});
1516	}	1619	}
1517		1620
1518	sub set_text {	1621	sub set_text {
1519	my ($self, $text) = @_;	1622	my ($self, $text) = @_;
1520		1623
1521	$self->{cursor} = length $text;	1624	$self->{cursor} = length $text;
1522	$self->_set_text ($text);	1625	$self->_set_text ($text);
1523	$self->update;	1626
1524	$self->check_size;	1627	$self->realloc;
1525	}	1628	}
1526		1629
1527	sub get_text {	1630	sub get_text {
1528	$_[0]{text}	1631	$_[0]{text}
1529	}	1632	}
…		…
1532	my ($self) = @_;	1635	my ($self) = @_;
1533		1636
1534	my ($w, $h) = $self->SUPER::size_request;	1637	my ($w, $h) = $self->SUPER::size_request;
1535		1638
1536	($w + 1, $h) # add 1 for cursor	1639	($w + 1, $h) # add 1 for cursor
1537	}
1538
1539	sub size_allocate {
1540	my ($self, $w, $h) = @_;
1541
1542	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1543	}	1640	}
1544		1641
1545	sub key_down {	1642	sub key_down {
1546	my ($self, $ev) = @_;	1643	my ($self, $ev) = @_;
1547		1644
…		…
1562	} elsif ($sym == CFClient::SDLK_HOME) {	1659	} elsif ($sym == CFClient::SDLK_HOME) {
1563	$self->{cursor} = 0;	1660	$self->{cursor} = 0;
1564	} elsif ($sym == CFClient::SDLK_END) {	1661	} elsif ($sym == CFClient::SDLK_END) {
1565	$self->{cursor} = length $text;	1662	$self->{cursor} = length $text;
1566	} elsif ($uni == 27) {	1663	} elsif ($uni == 27) {
1567	$self->emit ('escape');	1664	$self->_emit ('escape');
1568	} elsif ($uni) {	1665	} elsif ($uni) {
1569	substr $text, $self->{cursor}++, 0, chr $uni;	1666	substr $text, $self->{cursor}++, 0, chr $uni;
1570	}	1667	}
1571		1668
1572	$self->_set_text ($text);	1669	$self->_set_text ($text);
1573	$self->update;	1670
1574	$self->check_size;	1671	$self->realloc;
1575	}	1672	}
1576		1673
1577	sub focus_in {	1674	sub focus_in {
1578	my ($self) = @_;	1675	my ($self) = @_;
1579		1676
…		…
1659	if ($sym == 13) {	1756	if ($sym == 13) {
1660	unshift @{$self->{history}},	1757	unshift @{$self->{history}},
1661	my $txt = $self->get_text;	1758	my $txt = $self->get_text;
1662	$self->{history_pointer} = -1;	1759	$self->{history_pointer} = -1;
1663	$self->{history_saveback} = '';	1760	$self->{history_saveback} = '';
1664	$self->emit (activate => $txt);	1761	$self->_emit (activate => $txt);
1665	$self->update;	1762	$self->update;
1666		1763
1667	} elsif ($sym == CFClient::SDLK_UP) {	1764	} elsif ($sym == CFClient::SDLK_UP) {
1668	if ($self->{history_pointer} < 0) {	1765	if ($self->{history_pointer} < 0) {
1669	$self->{history_saveback} = $self->get_text;	1766	$self->{history_saveback} = $self->get_text;
…		…
1706		1803
1707	sub new {	1804	sub new {
1708	my $class = shift;	1805	my $class = shift;
1709		1806
1710	$class->SUPER::new (	1807	$class->SUPER::new (
1711	padding => 4,	1808	padding_x => 4,
		1809	padding_y => 4,
1712	fg => [1, 1, 1],	1810	fg => [1, 1, 1],
1713	active_fg => [0, 0, 1],	1811	active_fg => [0, 0, 1],
1714	can_hover => 1,	1812	can_hover => 1,
1715	align => 0,	1813	align => 0,
1716	valign => 0,	1814	valign => 0,
1717	can_events => 1,	1815	can_events => 1,
1718	@_	1816	@_
1719	)	1817	)
1720	}	1818	}
1721		1819
		1820	sub activate { }
		1821
1722	sub button_up {	1822	sub button_up {
1723	my ($self, $ev, $x, $y) = @_;	1823	my ($self, $ev, $x, $y) = @_;
1724		1824
		1825	$self->emit ("activate")
1725	if ($x >= 0 && $x < $self->{w}	1826	if $x >= 0 && $x < $self->{w}
1726	&& $y >= 0 && $y < $self->{h}) {	1827	&& $y >= 0 && $y < $self->{h};
1727	$self->emit ("activate");
1728	}
1729	}	1828	}
1730		1829
1731	sub _draw {	1830	sub _draw {
1732	my ($self) = @_;	1831	my ($self) = @_;
1733		1832
…		…
1762		1861
1763	sub new {	1862	sub new {
1764	my $class = shift;	1863	my $class = shift;
1765		1864
1766	$class->SUPER::new (	1865	$class->SUPER::new (
1767	padding => 2,	1866	padding_x => 2,
		1867	padding_y => 2,
1768	fg => [1, 1, 1],	1868	fg => [1, 1, 1],
1769	active_fg => [1, 1, 0],	1869	active_fg => [1, 1, 0],
1770	bg => [0, 0, 0, 0.2],	1870	bg => [0, 0, 0, 0.2],
1771	active_bg => [1, 1, 1, 0.5],	1871	active_bg => [1, 1, 1, 0.5],
1772	state => 0,	1872	state => 0,
…		…
1776	}	1876	}
1777		1877
1778	sub size_request {	1878	sub size_request {
1779	my ($self) = @_;	1879	my ($self) = @_;
1780		1880
1781	($self->{padding} * 2 + 6) x 2	1881	(6) x 2
1782	}	1882	}
1783		1883
1784	sub button_down {	1884	sub button_down {
1785	my ($self, $ev, $x, $y) = @_;	1885	my ($self, $ev, $x, $y) = @_;
1786		1886
1787	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1887	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1788	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1888	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1789	$self->{state} = !$self->{state};	1889	$self->{state} = !$self->{state};
1790	$self->emit (changed => $self->{state});	1890	$self->_emit (changed => $self->{state});
1791	}	1891	}
1792	}	1892	}
1793		1893
1794	sub _draw {	1894	sub _draw {
1795	my ($self) = @_;	1895	my ($self) = @_;
1796		1896
1797	$self->SUPER::_draw;	1897	$self->SUPER::_draw;
1798		1898
1799	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1899	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1800		1900
1801	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1901	my ($w, $h) = @$self{qw(w h)};
		1902
		1903	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1802		1904
1803	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1905	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1804		1906
1805	my $tex = $self->{state} ? $tex[1] : $tex[0];	1907	my $tex = $self->{state} ? $tex[1] : $tex[0];
1806		1908
…		…
2071	fg => [1, 1, 1],	2173	fg => [1, 1, 1],
2072	active_fg => [0, 0, 0],	2174	active_fg => [0, 0, 0],
2073	bg => [0, 0, 0, 0.2],	2175	bg => [0, 0, 0, 0.2],
2074	active_bg => [1, 1, 1, 0.5],	2176	active_bg => [1, 1, 1, 0.5],
2075	range => [0, 0, 100, 10, 0],	2177	range => [0, 0, 100, 10, 0],
2076	req_w => $::WIDTH / 80,	2178	min_w => $::WIDTH / 80,
2077	req_h => $::WIDTH / 80,	2179	min_h => $::WIDTH / 80,
2078	vertical => 0,	2180	vertical => 0,
2079	can_hover => 1,	2181	can_hover => 1,
2080	inner_pad => 0.02,	2182	inner_pad => 0.02,
2081	@_	2183	@_
2082	);	2184	);
…		…
2085	$self->update;	2187	$self->update;
2086		2188
2087	$self	2189	$self
2088	}	2190	}
2089		2191
		2192	sub changed { }
		2193
2090	sub set_range {	2194	sub set_range {
2091	my ($self, $range) = @_;	2195	my ($self, $range) = @_;
2092		2196
2093	$self->{range} = $range;	2197	($range, $self->{range}) = ($self->{range}, $range);
2094		2198
2095	$self->update;	2199	$self->update
		2200	if "@$range" ne "@{$self->{range}}";
2096	}	2201	}
2097		2202
2098	sub set_value {	2203	sub set_value {
2099	my ($self, $value) = @_;	2204	my ($self, $value) = @_;
2100		2205
…		…
2111	if $unit;	2216	if $unit;
2112		2217
2113	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2218	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114		2219
2115	if ($value != $old_value) {	2220	if ($value != $old_value) {
2116	$self->emit (changed => $value);	2221	$self->_emit (changed => $value);
2117	$self->update;	2222	$self->update;
2118	}	2223	}
2119	}	2224	}
2120		2225
2121	sub size_request {	2226	sub size_request {
2122	my ($self) = @_;	2227	my ($self) = @_;
2123		2228
2124	my $w = $self->{req_w};	2229	($self->{req_w}, $self->{req_h})
2125	my $h = $self->{req_h};
2126
2127	$self->{vertical} ? ($h, $w) : ($w, $h)
2128	}	2230	}
2129		2231
2130	sub button_down {	2232	sub button_down {
2131	my ($self, $ev, $x, $y) = @_;	2233	my ($self, $ev, $x, $y) = @_;
2132		2234
…		…
2483		2585
2484	sub new {	2586	sub new {
2485	my $class = shift;	2587	my $class = shift;
2486		2588
2487	my $self = $class->SUPER::new (	2589	my $self = $class->SUPER::new (
2488	state => 0,	2590	state => 0,
2489	connect_activate => \&toggle_flopper,	2591	on_activate => \&toggle_flopper,
2490	@_	2592	@_
2491	);	2593	);
2492		2594
2493	if ($self->{state}) {
2494	$self->{state} = 0;
2495	$self->toggle_flopper;
2496	}
2497
2498	$self	2595	$self
2499	}	2596	}
2500		2597
2501	sub toggle_flopper {	2598	sub toggle_flopper {
2502	my ($self) = @_;	2599	my ($self) = @_;
2503		2600
2504	# TODO: use animation	2601	$self->{other}->toggle_visibility;
2505	if ($self->{state} = !$self->{state}) {
2506	$CFClient::UI::ROOT->add ($self->{other});
2507	$self->{other}->move ($self->coord2global (0, $self->{h}));
2508	$self->emit ("open");
2509	} else {
2510	$CFClient::UI::ROOT->remove ($self->{other});
2511	$self->emit ("close");
2512	}
2513
2514	$self->emit (changed => $self->{state});
2515	}	2602	}
2516		2603
2517	#############################################################################	2604	#############################################################################
2518		2605
2519	package CFClient::UI::Tooltip;	2606	package CFClient::UI::Tooltip;
…		…
2532	}	2619	}
2533		2620
2534	sub set_tooltip_from {	2621	sub set_tooltip_from {
2535	my ($self, $widget) = @_;	2622	my ($self, $widget) = @_;
2536		2623
		2624	my $tooltip = $widget->{tooltip};
		2625
		2626	if ($ENV{CFPLUS_DEBUG} & 2) {
		2627	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2628	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2629	. "req $widget->{req_w} $widget->{req_h}\n"
		2630	. "visible $widget->{visible}";
		2631	}
		2632
2537	$self->add (new CFClient::UI::Label	2633	$self->add (new CFClient::UI::Label
2538	markup => $widget->{tooltip},	2634	markup => $tooltip,
2539	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2635	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2540	fontsize => 0.8,	2636	fontsize => 0.8,
2541	fg => [0, 0, 0, 1],	2637	fg => [0, 0, 0, 1],
2542	ellipsise => 0,	2638	ellipsise => 0,
2543	font => ($widget->{tooltip_font} || $::FONT_PROP),	2639	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2554		2650
2555	sub size_allocate {	2651	sub size_allocate {
2556	my ($self, $w, $h) = @_;	2652	my ($self, $w, $h) = @_;
2557		2653
2558	$self->SUPER::size_allocate ($w - 4, $h - 4);	2654	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2655	}
		2656
		2657	sub visibility_change {
		2658	my ($self, $visible) = @_;
		2659
		2660	return unless $visible;
		2661
		2662	$self->{root}->on_post_alloc ("move_$self" => sub {
		2663	my $widget = $self->{owner}
		2664	or return;
		2665
		2666	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2667
		2668	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2669	if $x + $self->{w} > $::WIDTH;
		2670
		2671	$self->move_abs ($x, $y);
		2672	});
2559	}	2673	}
2560		2674
2561	sub _draw {	2675	sub _draw {
2562	my ($self) = @_;	2676	my ($self) = @_;
2563		2677
…		…
2580	glVertex $w, $h;	2694	glVertex $w, $h;
2581	glVertex $w, 0;	2695	glVertex $w, 0;
2582	glEnd;	2696	glEnd;
2583		2697
2584	glTranslate 2 - 0.375, 2 - 0.375;	2698	glTranslate 2 - 0.375, 2 - 0.375;
		2699
2585	$self->SUPER::_draw;	2700	$self->SUPER::_draw;
2586	}	2701	}
2587		2702
2588	#############################################################################	2703	#############################################################################
2589		2704
…		…
2595		2710
2596	sub new {	2711	sub new {
2597	my $class = shift;	2712	my $class = shift;
2598		2713
2599	my $self = $class->SUPER::new (	2714	my $self = $class->SUPER::new (
2600	aspect => 1,	2715	aspect => 1,
		2716	can_events => 0,
2601	@_,	2717	@_,
2602	);	2718	);
2603		2719
2604	if ($self->{anim} && $self->{animspeed}) {	2720	if ($self->{anim} && $self->{animspeed}) {
2605	Scalar::Util::weaken (my $widget = $self);	2721	Scalar::Util::weaken (my $widget = $self);
…		…
2664	$self->SUPER::DESTROY;	2780	$self->SUPER::DESTROY;
2665	}	2781	}
2666		2782
2667	#############################################################################	2783	#############################################################################
2668		2784
2669	package CFClient::UI::InventoryItem;	2785	package CFClient::UI::Inventory;
2670		2786
2671	our @ISA = CFClient::UI::HBox::;	2787	our @ISA = CFClient::UI::ScrolledWindow::;
2672
2673	sub _item_to_desc {
2674	my ($item) = @_;
2675
2676	my $desc =
2677	$item->{nrof} < 2
2678	? $item->{name}
2679	: "$item->{nrof} × $item->{name_pl}";
2680
2681	$item->{flags} & Crossfire::Protocol::F_OPEN
2682	and $desc .= " (open)";
2683	$item->{flags} & Crossfire::Protocol::F_APPLIED
2684	and $desc .= " (applied)";
2685	$item->{flags} & Crossfire::Protocol::F_UNPAID
2686	and $desc .= " (unpaid)";
2687	$item->{flags} & Crossfire::Protocol::F_MAGIC
2688	and $desc .= " (magic)";
2689	$item->{flags} & Crossfire::Protocol::F_CURSED
2690	and $desc .= " (cursed)";
2691	$item->{flags} & Crossfire::Protocol::F_DAMNED
2692	and $desc .= " (damned)";
2693	$item->{flags} & Crossfire::Protocol::F_LOCKED
2694	and $desc .= " *";
2695
2696	$desc
2697	}
2698		2788
2699	sub new {	2789	sub new {
2700	my $class = shift;	2790	my $class = shift;
2701		2791
2702	my %args = @_;
2703
2704	my $item = delete $args{item};
2705
2706	my $desc = _item_to_desc ($item);
2707
2708	my $self = $class->SUPER::new (	2792	my $self = $class->SUPER::new (
2709	can_hover => 1,
2710	can_events => 1,
2711	tooltip => ((CFClient::UI::Label::escape $desc)
2712	. "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2713	connect_button_down => sub {
2714	my ($self, $ev, $x, $y) = @_;
2715
2716	# todo: maybe put examine on 1? but should just be a tooltip :(
2717	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2718	my $targ = $::CONN->{player}{tag};
2719
2720	if ($item->{container} == $::CONN->{player}{tag}) {
2721	$targ = $main::OPENCONT;
2722	}
2723
2724	$::CONN->send ("move $targ $item->{tag} 0");
2725	} elsif ($ev->{button} == 1) {
2726	$::CONN->send ("examine $item->{tag}");
2727	} elsif ($ev->{button} == 2) {
2728	$::CONN->send ("apply $item->{tag}");
2729	} elsif ($ev->{button} == 3) {
2730	my @menu_items = (
2731	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2732	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2733	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2734	(
2735	$item->{flags} & Crossfire::Protocol::F_LOCKED
2736	? (
2737	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2738	)
2739	: (
2740	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2741	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2742	)
2743	),
2744	);
2745
2746	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2747	}
2748
2749	1
2750	},
2751	%args
2752	);
2753
2754
2755	$self->add (new CFClient::UI::Face
2756	can_events => 0,
2757	face => $item->{face},
2758	anim => $item->{anim},
2759	animspeed => $item->{animspeed},
2760	);
2761
2762	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2763
2764	$self->{item} = $item;
2765
2766	$self->update_item;
2767
2768	$self
2769	}
2770
2771	sub update_item {
2772	my ($self) = @_;
2773
2774	my $desc = _item_to_desc ($self->{item});
2775
2776	$self->{name_lbl}->set_text ($desc);
2777	}
2778
2779	#############################################################################
2780
2781	package CFClient::UI::Inventory;
2782
2783	our @ISA = CFClient::UI::ScrolledWindow::;
2784
2785	sub new {
2786	my $class = shift;
2787
2788	my $self = $class->SUPER::new (
2789	scrolled => (new CFClient::UI::Table),	2793	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2790	@_,	2794	@_,
2791	);	2795	);
2792		2796
2793	$self	2797	$self
2794	}	2798	}
…		…
2804	or ($a->{name} cmp $b->{name})	2808	or ($a->{name} cmp $b->{name})
2805	} @$items;	2809	} @$items;
2806		2810
2807	$self->{real_items} = \@items;	2811	$self->{real_items} = \@items;
2808		2812
		2813	my $row = 0;
2809	for my $item (@items) {	2814	for my $item (@items) {
2810	$item->{item} = $item;	2815	CFClient::Item::update_widgets $item;
2811	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2812	$item->update_item ();
2813	}
2814		2816
2815	my $i = 0;	2817	$self->{scrolled}->add (0, $row, $item->{face_widget});
2816	for (@items) {	2818	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2817	$self->{scrolled}->add (0, $i, $_);	2819	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2818	my $nrof = $_->{item}->{nrof} || 1;
2819	$self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2820	}
2821		2820
2822	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2821	$row++;
2823	}	2822	}
2824
2825	sub size_request {
2826	my ($self) = @_;
2827	($self->{req_w}, $self->{req_h});
2828	}	2823	}
2829		2824
2830	#############################################################################	2825	#############################################################################
2831		2826
2832	package CFClient::UI::Menu;	2827	package CFClient::UI::Menu;
…		…
2867		2862
2868	# popup given the event (must be a mouse button down event currently)	2863	# popup given the event (must be a mouse button down event currently)
2869	sub popup {	2864	sub popup {
2870	my ($self, $ev) = @_;	2865	my ($self, $ev) = @_;
2871		2866
2872	$self->emit ("popdown");	2867	$self->_emit ("popdown");
2873		2868
2874	# maybe save $GRAB? must be careful about events...	2869	# maybe save $GRAB? must be careful about events...
2875	$GRAB = $self;	2870	$GRAB = $self;
2876	$self->{button} = $ev->{button};	2871	$self->{button} = $ev->{button};
2877		2872
2878	$self->show;	2873	$self->show;
2879	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2874	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2880	}	2875	}
2881		2876
2882	sub mouse_motion {	2877	sub mouse_motion {
2883	my ($self, $ev, $x, $y) = @_;	2878	my ($self, $ev, $x, $y) = @_;
2884		2879
…		…
2892		2887
2893	if ($ev->{button} == $self->{button}) {	2888	if ($ev->{button} == $self->{button}) {
2894	undef $GRAB;	2889	undef $GRAB;
2895	$self->hide;	2890	$self->hide;
2896		2891
2897	$self->emit ("popdown");	2892	$self->_emit ("popdown");
2898	$self->{hover}[1]->() if $self->{hover};	2893	$self->{hover}[1]->() if $self->{hover};
2899	}	2894	}
2900	}	2895	}
2901		2896
2902	#############################################################################	2897	#############################################################################
…		…
2964	sub add {	2959	sub add {
2965	my ($self, $text, %arg) = @_;	2960	my ($self, $text, %arg) = @_;
2966		2961
2967	$text =~ s/^\s+//;	2962	$text =~ s/^\s+//;
2968	$text =~ s/\s+$//;	2963	$text =~ s/\s+$//;
		2964
		2965	return unless $text;
2969		2966
2970	my $timeout = time + ((delete $arg{timeout}) || 60);	2967	my $timeout = time + ((delete $arg{timeout}) || 60);
2971		2968
2972	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2969	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2973		2970
…		…
3016	use CFClient::OpenGL;	3013	use CFClient::OpenGL;
3017		3014
3018	sub new {	3015	sub new {
3019	my $class = shift;	3016	my $class = shift;
3020		3017
3021	$class->SUPER::new (	3018	my $self = $class->SUPER::new (
		3019	visible => 1,
3022	@_,	3020	@_,
3023	)	3021	);
3024	}
3025		3022
3026	sub configure {	3023	Scalar::Util::weaken ($self->{root} = $self);
3027	my ($self, $x, $y, $w, $h) = @_;
3028		3024
3029	$self->{w} = $w;	3025	$self
3030	$self->{h} = $h;
3031	}
3032
3033	sub check_size {
3034	my ($self) = @_;
3035
3036	$self->size_allocate ($self->{w}, $self->{h})
3037	if $self->{w};
3038	}	3026	}
3039		3027
3040	sub size_request {	3028	sub size_request {
3041	my ($self) = @_;	3029	my ($self) = @_;
3042		3030
3043	($self->{w}, $self->{h})	3031	($self->{w}, $self->{h})
		3032	}
		3033
		3034	sub _to_pixel {
		3035	my ($coord, $size, $max) = @_;
		3036
		3037	$coord =
		3038	$coord eq "center" ? ($max - $size) * 0.5
		3039	: $coord eq "max" ? $max
		3040	: $coord;
		3041
		3042	$coord = 0 if $coord < 0;
		3043	$coord = $max - $size if $coord > $max - $size;
		3044
		3045	int $coord + 0.5
3044	}	3046	}
3045		3047
3046	sub size_allocate {	3048	sub size_allocate {
3047	my ($self, $w, $h) = @_;	3049	my ($self, $w, $h) = @_;
3048		3050
3049	my $old_w = $self->{old_w}; $self->{old_w} = $w;
3050	my $old_h = $self->{old_h}; $self->{old_h} = $h;
3051
3052	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
3053	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
3054
3055	for my $child ($self->children) {	3051	for my $child ($self->children) {
3056	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3052	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3057		3053
3058	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3054	$X = $child->{force_x} if exists $child->{force_x};
3059	if exists $child->{req_x};	3055	$Y = $child->{force_y} if exists $child->{force_y};
3060		3056
3061	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3057	$X = _to_pixel $X, $W, $self->{w};
3062	if exists $child->{req_y};	3058	$Y = _to_pixel $Y, $H, $self->{h};
3063
3064	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3065	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3066		3059
3067	$child->configure ($X, $Y, $W, $H);	3060	$child->configure ($X, $Y, $W, $H);
3068	}	3061	}
3069	}	3062	}
3070		3063
…		…
3081	}	3074	}
3082		3075
3083	sub update {	3076	sub update {
3084	my ($self) = @_;	3077	my ($self) = @_;
3085		3078
3086	$self->check_size;
3087	$::WANT_REFRESH++;	3079	$::WANT_REFRESH++;
3088	}	3080	}
3089		3081
3090	sub add {	3082	sub add {
3091	my ($self, @children) = @_;	3083	my ($self, @children) = @_;
3092		3084
3093	for my $child (@children) {
3094	$child->{toplevel} = 1;	3085	$_->{is_toplevel} = 1
3095		3086	for @children;
3096	# integerise window positions
3097	$child->{x} = int $child->{x};
3098	$child->{y} = int $child->{y};
3099	}
3100		3087
3101	$self->SUPER::add (@children);	3088	$self->SUPER::add (@children);
		3089	}
		3090
		3091	sub remove {
		3092	my ($self, @children) = @_;
		3093
		3094	$self->SUPER::remove (@children);
		3095
		3096	delete $self->{is_toplevel}
		3097	for @children;
3102		3098
3103	while (@children) {	3099	while (@children) {
3104	my $w = pop @children;	3100	my $w = pop @children;
3105	push @children, $w->children;	3101	push @children, $w->children;
3106	$w->{visible} = 1;	3102	$w->set_invisible;
3107	}
3108	}
3109
3110	sub remove {
3111	my ($self, @children) = @_;
3112
3113	$self->SUPER::remove (@children);
3114
3115	while (@children) {
3116	my $w = pop @children;
3117	push @children, $w->children;
3118	delete $w->{visible};
3119	}	3103	}
3120	}	3104	}
3121		3105
3122	sub on_refresh {	3106	sub on_refresh {
3123	my ($self, $id, $cb) = @_;	3107	my ($self, $id, $cb) = @_;
…		…
3137	while ($self->{refresh_hook}) {	3121	while ($self->{refresh_hook}) {
3138	$_->()	3122	$_->()
3139	for values %{delete $self->{refresh_hook}};	3123	for values %{delete $self->{refresh_hook}};
3140	}	3124	}
3141		3125
3142	if ($self->{check_size}) {	3126	if ($self->{realloc}) {
3143	my @queue = ([], []);	3127	my @queue;
3144		3128
3145	for (;;) {	3129	while () {
3146	if ($self->{check_size}) {	3130	if ($self->{realloc}) {
3147	# heuristic: check containers last	3131	#TODO use array-of-depth approach
3148	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3132
3149	for values %{delete $self->{check_size}}	3133	use sort 'stable';
		3134
		3135	@queue = sort { $a->{visible} <=> $b->{visible} }
		3136	@queue, values %{delete $self->{realloc}};
3150	}	3137	}
3151		3138
3152	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3139	my $widget = pop @queue || last;
3153		3140
3154	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3141	$widget->{visible} or last; # do not resize invisible widgets
3155	? @$widget{qw(user_w user_h)}	3142
3156	: $widget->size_request;	3143	my ($w, $h) = $widget->size_request;
3157		3144
		3145	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3146	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3147
		3148	$w = $widget->{force_w} if exists $widget->{force_w};
		3149	$h = $widget->{force_h} if exists $widget->{force_h};
		3150
		3151	if ($widget->{req_w} != $w || $widget->{req_h} != $h
3158	if (delete $widget->{force_alloc}	3152	|| delete $widget->{force_realloc}) {
3159	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3160	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3161
3162	$widget->{req_w} = $w;	3153	$widget->{req_w} = $w;
3163	$widget->{req_h} = $h;	3154	$widget->{req_h} = $h;
3164		3155
3165	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3156	$self->{size_alloc}{$widget+0} = $widget;
3166		3157
3167	$widget->{parent}->check_size
3168	if $widget->{parent};	3158	if (my $parent = $widget->{parent}) {
		3159	$self->{realloc}{$parent+0} = $parent;
		3160	#unshift @queue, $parent;
		3161	$parent->{force_size_alloc} = 1;
		3162	$self->{size_alloc}{$parent+0} = $parent;
		3163	}
3169	}	3164	}
		3165
		3166	delete $self->{realloc}{$widget+0};
3170	}	3167	}
3171	}	3168	}
3172		3169
3173	while ($self->{size_alloc}) {	3170	while (my $size_alloc = delete $self->{size_alloc}) {
3174	for (values %{delete $self->{size_alloc}}) {	3171	my @queue = sort { $b->{visible} <=> $a->{visible} }
3175	my ($widget, $w, $h) = @$_;	3172	values %$size_alloc;
		3173
		3174	while () {
		3175	my $widget = pop @queue || last;
		3176
		3177	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3176		3178
3177	$w = 0 if $w < 0;	3179	$w = 0 if $w < 0;
3178	$h = 0 if $h < 0;	3180	$h = 0 if $h < 0;
3179		3181
		3182	$w = int $w + 0.5;
		3183	$h = int $h + 0.5;
		3184
		3185	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3180	$widget->{w} = $w;	3186	$widget->{w} = $w;
3181	$widget->{h} = $h;	3187	$widget->{h} = $h;
3182	$widget->size_allocate ($w, $h);	3188
3183	$widget->emit (size_allocate => $w, $h);	3189	$widget->emit (size_allocate => $w, $h);
		3190	}
3184	}	3191	}
3185	}	3192	}
3186		3193
3187	while ($self->{post_alloc_hook}) {	3194	while ($self->{post_alloc_hook}) {
3188	$_->()	3195	$_->()
3189	for values %{delete $self->{post_alloc_hook}};	3196	for values %{delete $self->{post_alloc_hook}};
3190	}	3197	}
		3198
3191		3199
3192	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3200	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3193	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3201	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3194	glClear GL_COLOR_BUFFER_BIT;	3202	glClear GL_COLOR_BUFFER_BIT;
3195		3203
…		…
3202	$self->_draw;	3210	$self->_draw;
3203	}	3211	}
3204		3212
3205	#############################################################################	3213	#############################################################################
3206		3214
		3215	package CFClient::UI::BindEditor;
		3216
		3217	our @ISA = CFClient::UI::FancyFrame::;
		3218
		3219	sub new {
		3220	my $class = shift;
		3221
		3222	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3223
		3224	$self->add (my $vb = new CFClient::UI::VBox);
		3225
		3226
		3227	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3228	text => "start recording",
		3229	tooltip => "Start/Stops recording of actions."
		3230	."All subsequent actions after the recording started will be captured."
		3231	."The actions are displayed after the record was stopped."
		3232	."To bind the action you have to click on the 'Bind' button",
		3233	on_activate => sub {
		3234	unless ($self->{recording}) {
		3235	$self->start;
		3236	} else {
		3237	$self->stop;
		3238	}
		3239	});
		3240
		3241	$vb->add (new CFClient::UI::Label text => "Actions:");
		3242	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3243
		3244	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3245	$vb->add (my $hb = new CFClient::UI::HBox);
		3246	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3247	$hb->add (new CFClient::UI::Button
		3248	text => "bind",
		3249	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3250	on_activate => sub {
		3251	$self->ask_for_bind;
		3252	});
		3253
		3254	$vb->add (my $hb = new CFClient::UI::HBox);
		3255	$hb->add (new CFClient::UI::Button
		3256	text => "ok",
		3257	expand => 1,
		3258	tooltip => "This closes the binding editor and saves the binding",
		3259	on_activate => sub {
		3260	$self->hide;
		3261	$self->commit;
		3262	});
		3263
		3264	$hb->add (new CFClient::UI::Button
		3265	text => "cancel",
		3266	expand => 1,
		3267	tooltip => "This closes the binding editor without saving",
		3268	on_activate => sub {
		3269	$self->hide;
		3270	$self->{binding_cancel}->()
		3271	if $self->{binding_cancel};
		3272	});
		3273
		3274	$self->update_binding_widgets;
		3275
		3276	$self
		3277	}
		3278
		3279	sub commit {
		3280	my ($self) = @_;
		3281	my ($mod, $sym, $cmds) = $self->get_binding;
		3282	if ($sym != 0 && @$cmds > 0) {
		3283	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3284	."'. Don't forget 'Save Config'!");
		3285	$self->{binding_change}->($mod, $sym, $cmds)
		3286	if $self->{binding_change};
		3287	} else {
		3288	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3289	$self->{binding_cancel}->()
		3290	if $self->{binding_cancel};
		3291	}
		3292	}
		3293
		3294	sub start {
		3295	my ($self) = @_;
		3296
		3297	$self->{rec_btn}->set_text ("stop recording");
		3298	$self->{recording} = 1;
		3299	$self->clear_command_list;
		3300	$::CONN->start_record if $::CONN;
		3301	}
		3302
		3303	sub stop {
		3304	my ($self) = @_;
		3305
		3306	$self->{rec_btn}->set_text ("start recording");
		3307	$self->{recording} = 0;
		3308
		3309	my $rec;
		3310	$rec = $::CONN->stop_record if $::CONN;
		3311	return unless ref $rec eq 'ARRAY';
		3312	$self->set_command_list ($rec);
		3313	}
		3314
		3315	# if $commit is true, the binding will be set after the user entered a key combo
		3316	sub ask_for_bind {
		3317	my ($self, $commit) = @_;
		3318
		3319	CFClient::Binder::open_binding_dialog (sub {
		3320	my ($mod, $sym) = @_;
		3321	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3322	$self->update_binding_widgets;
		3323	$self->commit if $commit;
		3324	});
		3325	}
		3326
		3327	# $mod and $sym are the modifiers and key symbol
		3328	# $cmds is a array ref of strings (the commands)
		3329	# $cb is the callback that is executed on OK
		3330	# $ccb is the callback that is executed on CANCEL and
		3331	# when the binding was unsuccessful on OK
		3332	sub set_binding {
		3333	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3334
		3335	$self->clear_command_list;
		3336	$self->{recording} = 0;
		3337	$self->{rec_btn}->set_text ("start recording");
		3338
		3339	$self->{binding} = [$mod, $sym];
		3340	$self->{commands} = $cmds;
		3341
		3342	$self->{binding_change} = $cb;
		3343	$self->{binding_cancel} = $ccb;
		3344
		3345	$self->update_binding_widgets;
		3346	}
		3347
		3348	# this is a shortcut method that asks for a binding
		3349	# and then just binds it.
		3350	sub do_quick_binding {
		3351	my ($self, $cmds) = @_;
		3352	$self->set_binding (undef, undef, $cmds, sub {
		3353	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3354	});
		3355	$self->ask_for_bind (1);
		3356	}
		3357
		3358	sub update_binding_widgets {
		3359	my ($self) = @_;
		3360	my ($mod, $sym, $cmds) = $self->get_binding;
		3361	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3362	$self->set_command_list ($cmds);
		3363	}
		3364
		3365	sub get_binding {
		3366	my ($self) = @_;
		3367	return (
		3368	$self->{binding}->[0],
		3369	$self->{binding}->[1],
		3370	[ grep { defined $_ } @{$self->{commands}} ]
		3371	);
		3372	}
		3373
		3374	sub clear_command_list {
		3375	my ($self) = @_;
		3376	$self->{cmdbox}->clear ();
		3377	}
		3378
		3379	sub set_command_list {
		3380	my ($self, $cmds) = @_;
		3381
		3382	$self->{cmdbox}->clear ();
		3383	$self->{commands} = $cmds;
		3384
		3385	my $idx = 0;
		3386
		3387	for (@$cmds) {
		3388	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3389
		3390	my $i = $idx;
		3391	$hb->add (new CFClient::UI::Button
		3392	text => "delete",
		3393	tooltip => "Deletes the action from the record",
		3394	on_activate => sub {
		3395	$self->{cmdbox}->remove ($hb);
		3396	$cmds->[$i] = undef;
		3397	});
		3398
		3399	$hb->add (new CFClient::UI::Label text => $_);
		3400
		3401	$idx++
		3402	}
		3403	}
		3404
		3405
		3406	#############################################################################
		3407
		3408	package CFClient::UI::SpellList;
		3409
		3410	our @ISA = CFClient::UI::FancyFrame::;
		3411
		3412	sub new {
		3413	my $class = shift;
		3414
		3415	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3416
		3417	$self->add (new CFClient::UI::ScrolledWindow
		3418	scrolled => $self->{spellbox} = new CFClient::UI::Table);
		3419
		3420	$self;
		3421	}
		3422
		3423	# XXX: Do sorting? Argl...
		3424	sub add_spell {
		3425	my ($self, $spell) = @_;
		3426	$self->{spells}->{$spell->{name}} = $spell;
		3427
		3428	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3429	face => $spell->{face},
		3430	can_hover => 1,
		3431	can_events => 1,
		3432	tooltip => $spell->{message});
		3433
		3434	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3435	text => $spell->{name},
		3436	can_hover => 1,
		3437	can_events => 1,
		3438	tooltip => $spell->{message},
		3439	expand => 1);
		3440	$self->{spellbox}->add (2, $self->{tbl_idx}++, new CFClient::UI::Button
		3441	text => "bind to key",
		3442	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3443	}
		3444
		3445	sub rebuild_spell_list {
		3446	my ($self) = @_;
		3447	$self->{tbl_idx} = 0;
		3448	$self->add_spell ($_) for values %{$self->{spells}};
		3449	}
		3450
		3451	sub remove_spell {
		3452	my ($self, $spell) = @_;
		3453	delete $self->{spells}->{$spell->{name}};
		3454	$self->rebuild_spell_list;
		3455	}
		3456
		3457	#############################################################################
		3458
3207	package CFClient::UI;	3459	package CFClient::UI;
3208		3460
3209	$ROOT = new CFClient::UI::Root;	3461	$ROOT = new CFClient::UI::Root;
3210	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	3462	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
3211		3463

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines