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.248 by root, Sun May 28 01:37:45 2006 UTC vs.
Revision 1.275 by root, Sat Jun 3 22:50:48 2006 UTC

…		…
17	our $BUTTON_STATE;	17	our $BUTTON_STATE;
18		18
19	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
20		20
21	sub get_layout {	21	sub get_layout {
		22	my $layout;
		23
22	for (grep { $_->{name} } values %WIDGET) {	24	for (grep { $_->{name} } values %WIDGET) {
23	$LAYOUT->{$_->{name}} = {	25	my $win = $layout->{$_->{name}} = { };
24	x => $_->{x} / $::WIDTH,
25	y => $_->{y} / $::HEIGHT,
26	w => $_->{w} / $::WIDTH,
27	h => $_->{h} / $::HEIGHT
28	};	26
29	}	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};
30		31
31	return $LAYOUT;	32	$win->{show} = $_->{visible} && $_->{is_toplevel};
		33	}
		34
		35	$layout
32	}	36	}
33		37
34	sub set_layout {	38	sub set_layout {
35	my ($layout) = @_;	39	my ($layout) = @_;
		40
36	$LAYOUT = $layout;	41	$LAYOUT = $layout;
37	}	42	}
38		43
39	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
40	if (!$GRAB) {	47	if (!$GRAB) {
41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
43
44	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
		51	$TOOLTIP->hide;
		52
45	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
46		54
47	my $tip = $widget->{tooltip};	55	my $tip = $widget->{tooltip};
48		56
49	$tip = $tip->($widget) if CODE:: eq ref $tip;	57	$tip = $tip->($widget) if CODE:: eq ref $tip;
50		58
51	$TOOLTIP->set_tooltip_from ($widget);	59	$TOOLTIP->set_tooltip_from ($widget);
52	$TOOLTIP->show;	60	$TOOLTIP->show;
53
54	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57	if $x + $TOOLTIP->{w} > $::WIDTH;
58
59	$TOOLTIP->move ($x, $y);
60	$TOOLTIP->check_size;
61	$TOOLTIP->update;
62	}	61	}
63		62
64	return;	63	return;
65	}	64	}
66	}	65	}
…		…
172	sub rescale_widgets {	171	sub rescale_widgets {
173	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
174		173
175	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
176	if ($widget->{is_toplevel}) {	175	if ($widget->{is_toplevel}) {
		176	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		177	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		178
177	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	179	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
178	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	180	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	181	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
180	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	182	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
181	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	183	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
182	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	184	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
		185
		186	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		187	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		188
183	}	189	}
184	}	190	}
185		191
186	reconfigure_widgets;	192	reconfigure_widgets;
187	}	193	}
…		…
196		202
197	sub new {	203	sub new {
198	my $class = shift;	204	my $class = shift;
199		205
200	my $self = bless {	206	my $self = bless {
201	x => 0,	207	x => "center",
202	y => 0,	208	y => "center",
203	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
204	can_events => 1,	212	can_events => 1,
205	@_	213	@_
206	}, $class;	214	}, $class;
		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
207		217
208	for (keys %$self) {	218	for (keys %$self) {
209	if (/^on_(.*)$/) {	219	if (/^on_(.*)$/) {
210	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
211	}	221	}
212	}	222	}
213		223
214	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
215
216	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217	$self->{req_x} = $layout->{x} * $::WIDTH;	225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
218	$self->{req_y} = $layout->{y} * $::HEIGHT;	226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
219	$self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;	227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
220	$self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;	228	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
		229
		230	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		231	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		232
		233	$self->show if $layout->{show};
221	}	234	}
222		235
223	$self	236	$self
224	}
225
226	sub toggle_visibility {
227	my ($self) = @_;
228
229	if ($self->{visible}) {
230	$self->hide;
231	} else {
232	$self->show;
233	}
234	}	237	}
235		238
236	sub destroy {	239	sub destroy {
237	my ($self) = @_;	240	my ($self) = @_;
238		241
…		…
246	return if $self->{parent};	249	return if $self->{parent};
247		250
248	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
249	}	252	}
250		253
251	sub center {
252	my ($self) = @_;
253
254	$CFClient::UI::ROOT->on_post_alloc (
255	"center_$self" => sub {
256	$self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
257	},
258	);
259
260	$self->update;
261	}
262
263	sub set_visible {	254	sub set_visible {
264	my ($self) = @_;	255	my ($self) = @_;
265		256
266	return if $self->{visible};	257	return if $self->{visible};
267		258
268	$self->{root} = $self->{parent}{root};	259	$self->{root} = $self->{parent}{root};
269	$self->{visible} = $self->{parent}{visible} + 1;	260	$self->{visible} = $self->{parent}{visible} + 1;
270		261
271	$self->emit (visibility_change => 1);	262	$self->emit (visibility_change => 1);
		263
		264	$self->realloc if !exists $self->{req_w};
		265
		266	$_->set_visible for $self->children;
272	}	267	}
273		268
274	sub set_invisible {	269	sub set_invisible {
275	my ($self) = @_;	270	my ($self) = @_;
276		271
277	return unless $self->{visible};	272	return unless $self->{visible};
278		273
279	# broken show/hide model	274	$_->set_invisible for $self->children;
280		275
281	delete $self->{root};	276	delete $self->{root};
282	delete $self->{visible};	277	delete $self->{visible};
283		278
284	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
285	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
286		281
287	CFClient::UI::check_tooltip	282	CFClient::UI::check_tooltip
288	if $CFClient::UI::TOOLTIP->{owner} == $self;	283	if $TOOLTIP->{owner} == $self;
289		284
290	$self->focus_out;	285	$self->focus_out;
291		286
292	$self->emit (visibility_change => 0);	287	$self->emit (visibility_change => 0);
		288	}
		289
		290	sub set_visibility {
		291	my ($self, $visible) = @_;
		292
		293	return if $self->{visible} == $visible;
		294
		295	$visible ? $self->hide
		296	: $self->show;
		297	}
		298
		299	sub toggle_visibility {
		300	my ($self) = @_;
		301
		302	$self->{visible}
		303	? $self->hide
		304	: $self->show;
293	}	305	}
294		306
295	sub hide {	307	sub hide {
296	my ($self) = @_;	308	my ($self) = @_;
297		309
…		…
299		311
300	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
301	if $self->{parent};	313	if $self->{parent};
302	}	314	}
303		315
304	sub move {	316	sub move_abs {
305	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
306		318
307	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
308	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
309	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
310		322
311	$self->update;	323	$self->update;
312	}	324	}
313		325
314	sub set_size {	326	sub set_size {
315	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
316		328
317	$self->{def_w} = $w;	329	$self->{force_w} = $w;
318	$self->{def_h} = $h;	330	$self->{force_h} = $h;
319		331
320	$self->check_size;	332	$self->realloc;
321	}	333	}
322		334
323	sub size_request {	335	sub size_request {
324	require Carp;	336	require Carp;
325	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
327		339
328	sub configure {	340	sub configure {
329	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
330		342
331	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
332	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
333	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
334		348
335	# use alignment to adjust x, y	349	# use alignment to adjust x, y
336		350
337	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
338	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
339
340	($w, $h) = ($w2, $h2);
341	}	353	}
342		354
343	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
344	$self->{x} = $x;	356	$self->{x} = $x;
345	$self->{y} = $y;	357	$self->{y} = $y;
346	$self->update;	358	$self->update;
347	}	359	}
348		360
349	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
350	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	362	return unless $self->{visible};
		363
		364	$self->{alloc_w} = $w;
		365	$self->{alloc_h} = $h;
		366
		367	$self->{root}{size_alloc}{$self+0} = $self;
351	}	368	}
352	}	369	}
353		370
354	sub size_allocate {	371	sub size_allocate {
355	# nothing to be done	372	# nothing to be done
356	}	373	}
357		374
358	sub reconfigure {
359	my ($self) = @_;
360
361	$self->check_size (1);
362	$self->update;
363	}
364
365	sub children {	375	sub children {
		376	# nop
		377	}
		378
		379	sub visible_children {
		380	$_[0]->children
366	}	381	}
367		382
368	sub set_max_size {	383	sub set_max_size {
369	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
370		385
…		…
429		444
430	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	445	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
431	unless $FOCUS;	446	unless $FOCUS;
432	}	447	}
433		448
434	sub mouse_motion { }	449	sub mouse_motion { 0 }
435	sub button_up { }	450	sub button_up { 0 }
436	sub key_down { }	451	sub key_down { 0 }
437	sub key_up { }	452	sub key_up { 0 }
438		453
439	sub button_down {	454	sub button_down {
440	my ($self, $ev, $x, $y) = @_;	455	my ($self, $ev, $x, $y) = @_;
441		456
442	$self->focus_in;	457	$self->focus_in;
443	}
444		458
445	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	459	0
446	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	460	}
447	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	461
448	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	462	sub find_widget {
449	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	463	my ($self, $x, $y) = @_;
		464
		465	return () unless $self->{can_events};
		466
		467	return $self
		468	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		469	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		470
		471	()
		472	}
		473
		474	sub set_parent {
		475	my ($self, $parent) = @_;
		476
		477	Scalar::Util::weaken ($self->{parent} = $parent);
		478	$self->set_visible if $parent->{visible};
		479	}
		480
		481	sub connect {
		482	my ($self, $signal, $cb) = @_;
		483
		484	push @{ $self->{signal_cb}{$signal} }, $cb;
		485	}
		486
		487	sub _emit {
		488	my ($self, $signal, @args) = @_;
		489
		490	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		491	}
		492
		493	sub emit {
		494	my ($self, $signal, @args) = @_;
		495
		496	$self->_emit ($signal, @args)
		497	|| $self->$signal (@args);
		498	}
		499
		500	sub visibility_change {
		501	#my ($self, $visible) = @_;
		502	}
		503
		504	sub realloc {
		505	my ($self) = @_;
		506
		507	if ($self->{visible}) {
		508	return if $self->{root}{realloc}{$self+0};
		509
		510	$self->{root}{realloc}{$self+0} = $self;
		511	$self->{root}->update;
		512	} else {
		513	delete $self->{req_w};
		514	delete $self->{req_h};
		515	}
		516	}
		517
		518	sub update {
		519	my ($self) = @_;
		520
		521	$self->{parent}->update
		522	if $self->{parent};
		523	}
		524
		525	sub reconfigure {
		526	my ($self) = @_;
		527
		528	$self->realloc;
		529	$self->update;
		530	}
		531
		532	# using global variables seems a bit hacky, but passing through all drawing
		533	# functions seems pointless.
		534	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
450		535
451	sub draw {	536	sub draw {
452	my ($self) = @_;	537	my ($self) = @_;
453		538
454	return unless $self->{h} && $self->{w};	539	return unless $self->{h} && $self->{w};
		540
		541	# update screen rectangle
		542	local $draw_x = $draw_x + $self->{x};
		543	local $draw_y = $draw_y + $self->{y};
		544	local $draw_w = $draw_x + $self->{w};
		545	local $draw_h = $draw_y + $self->{h};
		546
		547	# skip widgets that are entirely outside the drawing area
		548	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		549	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
455		550
456	glPushMatrix;	551	glPushMatrix;
457	glTranslate $self->{x}, $self->{y}, 0;	552	glTranslate $self->{x}, $self->{y}, 0;
458	$self->_draw;	553	$self->_draw;
459	glPopMatrix;	554	glPopMatrix;
…		…
471	glVertex $x , $y + $self->{h};	566	glVertex $x , $y + $self->{h};
472	glEnd;	567	glEnd;
473	glDisable GL_BLEND;	568	glDisable GL_BLEND;
474	}	569	}
475		570
476	if ($ENV{PCLIENT_DEBUG}) {	571	if ($ENV{CFPLUS_DEBUG} & 1) {
477	glPushMatrix;	572	glPushMatrix;
478	glColor 1, 1, 0, 1;	573	glColor 1, 1, 0, 1;
479	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	574	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
480	glBegin GL_LINE_LOOP;	575	glBegin GL_LINE_LOOP;
481	glVertex 0 , 0;	576	glVertex 0 , 0;
…		…
492	my ($self) = @_;	587	my ($self) = @_;
493		588
494	warn "no draw defined for $self\n";	589	warn "no draw defined for $self\n";
495	}	590	}
496		591
497	sub find_widget {
498	my ($self, $x, $y) = @_;
499
500	return () unless $self->{can_events};
501
502	return $self
503	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
504	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
505
506	()
507	}
508
509	sub set_parent {
510	my ($self, $parent) = @_;
511
512	Scalar::Util::weaken ($self->{parent} = $parent);
513
514	$self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
515
516	$self->check_size;
517	}
518
519	sub check_size {
520	my ($self, $forced) = @_;
521
522	$self->{force_alloc} = 1 if $forced;
523	$CFClient::UI::ROOT->{check_size}{$self} = $self;
524	}
525
526	sub update {
527	my ($self) = @_;
528
529	$self->{parent}->update
530	if $self->{parent};
531	}
532
533	sub connect {
534	my ($self, $signal, $cb) = @_;
535
536	push @{ $self->{signal_cb}{$signal} }, $cb;
537	}
538
539	sub _emit {
540	my ($self, $signal, @args) = @_;
541
542	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
543	}
544
545	sub emit {
546	my ($self, $signal, @args) = @_;
547
548	$self->_emit ($signal, @args)
549	|| $self->$signal (@args);
550	}
551
552	sub visibility_change {
553	#my ($self, $visible) = @_;
554	}
555
556	sub DESTROY {	592	sub DESTROY {
557	my ($self) = @_;	593	my ($self) = @_;
558		594
559	delete $WIDGET{$self+0};	595	delete $WIDGET{$self+0};
560	#$self->deactivate;	596	#$self->deactivate;
…		…
616	my ($class, %arg) = @_;	652	my ($class, %arg) = @_;
617	$class->SUPER::new (can_events => 0, %arg);	653	$class->SUPER::new (can_events => 0, %arg);
618	}	654	}
619		655
620	sub size_request {	656	sub size_request {
621	(0, 0)	657	my ($self) = @_;
		658
		659	($self->{w} + 0, $self->{h} + 0)
622	}	660	}
623		661
624	sub draw { }	662	sub draw { }
625		663
626	#############################################################################	664	#############################################################################
…		…
630	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFClient::UI::Base::;
631		669
632	sub new {	670	sub new {
633	my ($class, %arg) = @_;	671	my ($class, %arg) = @_;
634		672
635	my $children = delete $arg{children} || [];	673	my $children = delete $arg{children};
636		674
637	my $self = $class->SUPER::new (	675	my $self = $class->SUPER::new (
638	children => [],	676	children => [],
639	can_events => 0,	677	can_events => 0,
640	%arg,	678	%arg,
641	);	679	);
		680
642	$self->add ($_) for @$children;	681	$self->add (@$children)
		682	if $children;
643		683
644	$self	684	$self
645	}	685	}
646		686
647	sub add {	687	sub add {
…		…
655	$self->{children} = [	695	$self->{children} = [
656	sort { $a->{z} <=> $b->{z} }	696	sort { $a->{z} <=> $b->{z} }
657	@{$self->{children}}, @widgets	697	@{$self->{children}}, @widgets
658	];	698	];
659		699
660	$self->check_size (1);	700	$self->realloc;
661	$self->update;
662	}	701	}
663		702
664	sub children {	703	sub children {
665	@{ $_[0]{children} }	704	@{ $_[0]{children} }
666	}	705	}
…		…
671	delete $child->{parent};	710	delete $child->{parent};
672	$child->hide;	711	$child->hide;
673		712
674	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	713	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
675		714
676	$self->check_size (1);	715	$self->realloc;
677	$self->update;
678	}	716	}
679		717
680	sub clear {	718	sub clear {
681	my ($self) = @_;	719	my ($self) = @_;
682		720
…		…
686	for (@$children) {	724	for (@$children) {
687	delete $_->{parent};	725	delete $_->{parent};
688	$_->hide;	726	$_->hide;
689	}	727	}
690		728
691	$self->check_size;	729	$self->realloc;
692	$self->update;
693	}	730	}
694		731
695	sub find_widget {	732	sub find_widget {
696	my ($self, $x, $y) = @_;	733	my ($self, $x, $y) = @_;
697		734
698	$x -= $self->{x};	735	$x -= $self->{x};
699	$y -= $self->{y};	736	$y -= $self->{y};
700		737
701	my $res;	738	my $res;
702		739
703	for (reverse @{ $self->{children} }) {	740	for (reverse $self->visible_children) {
704	$res = $_->find_widget ($x, $y)	741	$res = $_->find_widget ($x, $y)
705	and return $res;	742	and return $res;
706	}	743	}
707		744
708	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	745	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
757	$self->{children}[0]->configure (0, 0, $w, $h);	794	$self->{children}[0]->configure (0, 0, $w, $h);
758	}	795	}
759		796
760	#############################################################################	797	#############################################################################
761		798
		799	# back-buffered drawing area
		800
762	package CFClient::UI::Window;	801	package CFClient::UI::Window;
763		802
764	our @ISA = CFClient::UI::Bin::;	803	our @ISA = CFClient::UI::Bin::;
765		804
766	use CFClient::OpenGL;	805	use CFClient::OpenGL;
…		…
784	$self->SUPER::size_allocate ($w, $h);	823	$self->SUPER::size_allocate ($w, $h);
785	$self->update;	824	$self->update;
786	}	825	}
787		826
788	sub _render {	827	sub _render {
		828	my ($self) = @_;
		829
789	$_[0]{children}[0]->draw;	830	$self->{children}[0]->draw;
790	}	831	}
791		832
792	sub render_child {	833	sub render_child {
793	my ($self) = @_;	834	my ($self) = @_;
794		835
795	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	836	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
796	glClearColor 0, 0, 0, 0;	837	glClearColor 0, 0, 0, 0;
797	glClear GL_COLOR_BUFFER_BIT;	838	glClear GL_COLOR_BUFFER_BIT;
798		839
		840	{
		841	package CFClient::UI::Base;
		842
		843	($draw_x, $draw_y, $draw_w, $draw_h) =
		844	(0, 0, $self->{w}, $self->{h});
		845	}
		846
799	$self->_render;	847	$self->_render;
800	};	848	};
801	}	849	}
802		850
803	sub _draw {	851	sub _draw {
804	my ($self) = @_;	852	my ($self) = @_;
805		853
806	my ($w, $h) = ($self->w, $self->h);	854	my ($w, $h) = @$self{qw(w h)};
807		855
808	my $tex = $self->{texture}	856	my $tex = $self->{texture}
809	or return;	857	or return;
810		858
811	glEnable GL_TEXTURE_2D;	859	glEnable GL_TEXTURE_2D;
…		…
834	}	882	}
835		883
836	sub size_request {	884	sub size_request {
837	my ($self) = @_;	885	my ($self) = @_;
838		886
839	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	887	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
840		888
841	$w = 10 if $self->{scroll_x};	889	$w = 10 if $self->{scroll_x};
842	$h = 10 if $self->{scroll_y};	890	$h = 10 if $self->{scroll_y};
843		891
844	($w, $h)	892	($w, $h)
845	}	893	}
846		894
847	sub size_allocate {	895	sub size_allocate {
848	my ($self, $w, $h) = @_;	896	my ($self, $w, $h) = @_;
849		897
		898	my $child = $self->child;
		899
850	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	900	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
851	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	901	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
852		902
853	$self->child->configure (0, 0, $w, $h);	903	$self->child->configure (0, 0, $w, $h);
854	$self->update;	904	$self->update;
855	}	905	}
856		906
…		…
892	}	942	}
893		943
894	sub _render {	944	sub _render {
895	my ($self) = @_;	945	my ($self) = @_;
896		946
		947	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		948	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		949
897	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	950	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
898		951
899	$self->SUPER::_render;	952	$self->SUPER::_render;
900	}	953	}
901		954
…		…
904	package CFClient::UI::ScrolledWindow;	957	package CFClient::UI::ScrolledWindow;
905		958
906	our @ISA = CFClient::UI::HBox::;	959	our @ISA = CFClient::UI::HBox::;
907		960
908	sub new {	961	sub new {
909	my $class = shift;	962	my ($class, %arg) = @_;
		963
		964	my $child = delete $arg{child};
910		965
911	my $self;	966	my $self;
912		967
913	my $slider = new CFClient::UI::Slider	968	my $slider = new CFClient::UI::Slider
914	vertical => 1,	969	vertical => 1,
…		…
919	;	974	;
920		975
921	$self = $class->SUPER::new (	976	$self = $class->SUPER::new (
922	vp => (new CFClient::UI::ViewPort expand => 1),	977	vp => (new CFClient::UI::ViewPort expand => 1),
923	slider => $slider,	978	slider => $slider,
924	@_,	979	%arg,
925	);	980	);
926		981
927	$self->{vp}->add ($self->{scrolled});
928	$self->add ($self->{vp});
929	$self->add ($self->{slider});	982	$self->SUPER::add ($self->{vp}, $self->{slider});
		983	$self->add ($child) if $child;
930		984
931	$self	985	$self
		986	}
		987
		988	sub add {
		989	my ($self, $widget) = @_;
		990
		991	$self->{vp}->add ($self->{child} = $widget);
932	}	992	}
933		993
934	sub update {	994	sub update {
935	my ($self) = @_;	995	my ($self) = @_;
936		996
…		…
999		1059
1000	our @ISA = CFClient::UI::Bin::;	1060	our @ISA = CFClient::UI::Bin::;
1001		1061
1002	use CFClient::OpenGL;	1062	use CFClient::OpenGL;
1003		1063
1004	my @tex =	1064	my $bg =
		1065	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1066	mipmap => 1, wrap => 1;
		1067
		1068	my @border =
1005	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1069	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1006	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1070	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1007		1071
1008	sub new {	1072	sub new {
1009	my $class = shift;	1073	my ($class, %arg) = @_;
		1074
		1075	my $title = delete $arg{title};
1010		1076
1011	my $self = $class->SUPER::new (	1077	my $self = $class->SUPER::new (
1012	bg => [1, 1, 1, 1],	1078	bg => [1, 1, 1, 1],
1013	border_bg => [1, 1, 1, 1],	1079	border_bg => [1, 1, 1, 1],
1014	border => 0.6,	1080	border => 0.6,
1015	is_toplevel => 1,
1016	can_events => 1,	1081	can_events => 1,
1017	@_	1082	min_w => 16,
		1083	min_h => 16,
		1084	%arg,
1018	);	1085	);
1019		1086
1020	$self->{title} &&= new CFClient::UI::Label	1087	$self->{title} = new CFClient::UI::Label
1021	align => 0,	1088	align => 0,
1022	valign => 1,	1089	valign => 1,
1023	text => $self->{title},	1090	text => $title,
1024	fontsize => $self->{border};	1091	fontsize => $self->{border}
		1092	if defined $title;
1025		1093
1026	$self	1094	$self
		1095	}
		1096
		1097	sub add {
		1098	my ($self, @widgets) = @_;
		1099
		1100	$self->SUPER::add (@widgets);
		1101	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1027	}	1102	}
1028		1103
1029	sub border {	1104	sub border {
1030	int $_[0]{border} * $::FONTSIZE	1105	int $_[0]{border} * $::FONTSIZE
1031	}	1106	}
1032		1107
1033	sub size_request {	1108	sub size_request {
1034	my ($self) = @_;	1109	my ($self) = @_;
		1110
		1111	$self->{title}->size_request
		1112	if $self->{title};
1035		1113
1036	my ($w, $h) = $self->SUPER::size_request;	1114	my ($w, $h) = $self->SUPER::size_request;
1037		1115
1038	(	1116	(
1039	$w + $self->border * 2,	1117	$w + $self->border * 2,
…		…
1042	}	1120	}
1043		1121
1044	sub size_allocate {	1122	sub size_allocate {
1045	my ($self, $w, $h) = @_;	1123	my ($self, $w, $h) = @_;
1046		1124
		1125	if ($self->{title}) {
		1126	$self->{title}{w} = $w;
		1127	$self->{title}{h} = $h;
		1128	$self->{title}->size_allocate ($w, $h);
		1129	}
		1130
		1131	my $border = $self->border;
		1132
1047	$h -= List::Util::max 0, $self->border * 2;	1133	$h -= List::Util::max 0, $border * 2;
1048	$w -= List::Util::max 0, $self->border * 2;	1134	$w -= List::Util::max 0, $border * 2;
1049		1135
1050	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1051	if $self->{title};
1052
1053	$self->child->configure ($self->border, $self->border, $w, $h);	1136	$self->child->configure ($border, $border, $w, $h);
1054	}	1137	}
1055		1138
1056	sub button_down {	1139	sub button_down {
1057	my ($self, $ev, $x, $y) = @_;	1140	my ($self, $ev, $x, $y) = @_;
1058		1141
…		…
1074	my ($ev, $x, $y) = @_;	1157	my ($ev, $x, $y) = @_;
1075		1158
1076	my $dx = $ev->{x} - $ox;	1159	my $dx = $ev->{x} - $ox;
1077	my $dy = $ev->{y} - $oy;	1160	my $dy = $ev->{y} - $oy;
1078		1161
1079	$self->{user_x} = $wx + $dx * $mx;
1080	$self->{user_y} = $wy + $dy * $my;
1081	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);	1162	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1082	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);	1163	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1083	$self->move ($self->{user_x}, $self->{user_y});	1164
1084	$self->check_size;	1165	$self->realloc;
		1166	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1085	};	1167	};
1086		1168
1087	} elsif ($lr ^ $td) {	1169	} elsif ($lr ^ $td) {
1088	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1170	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1089	my ($bx, $by) = ($self->{x}, $self->{y});	1171	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1091	$self->{motion} = sub {	1173	$self->{motion} = sub {
1092	my ($ev, $x, $y) = @_;	1174	my ($ev, $x, $y) = @_;
1093		1175
1094	($x, $y) = ($ev->{x}, $ev->{y});	1176	($x, $y) = ($ev->{x}, $ev->{y});
1095		1177
1096	$self->{user_x} = $bx + $x - $ox;	1178	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1097	$self->{user_y} = $by + $y - $oy;
1098
1099	$self->move ($self->{user_x}, $self->{user_y});
1100	$self->update;
1101	};	1179	};
		1180	} else {
		1181	return 0;
		1182	}
		1183
1102	}	1184	1
1103	}	1185	}
1104		1186
1105	sub button_up {	1187	sub button_up {
1106	my ($self, $ev, $x, $y) = @_;	1188	my ($self, $ev, $x, $y) = @_;
1107		1189
1108	delete $self->{motion};	1190	!!delete $self->{motion}
1109	}	1191	}
1110		1192
1111	sub mouse_motion {	1193	sub mouse_motion {
1112	my ($self, $ev, $x, $y) = @_;	1194	my ($self, $ev, $x, $y) = @_;
1113		1195
1114	$self->{motion}->($ev, $x, $y) if $self->{motion};	1196	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1197
		1198	!!$self->{motion}
1115	}	1199	}
1116		1200
1117	sub _draw {	1201	sub _draw {
1118	my ($self) = @_;	1202	my ($self) = @_;
1119		1203
		1204	my $child = $self->{children}[0];
		1205
1120	my ($w, $h ) = ($self->{w}, $self->{h});	1206	my ($w, $h ) = ($self->{w}, $self->{h});
1121	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1207	my ($cw, $ch) = ($child->{w}, $child->{h});
1122		1208
1123	glEnable GL_TEXTURE_2D;	1209	glEnable GL_TEXTURE_2D;
1124	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1210	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1125		1211
1126	my $border = $self->border;	1212	my $border = $self->border;
1127		1213
1128	glColor @{ $self->{border_bg} };	1214	glColor @{ $self->{border_bg} };
1129	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1215	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1130	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1216	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1131	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1217	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1132	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1218	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1133		1219
1134	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1220	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1135	my $bg = $tex[0];	1221	glColor @{ $self->{bg} };
1136		1222
1137	# TODO: repeat texture not scale	1223	# TODO: repeat texture not scale
		1224	# solve this better(?)
1138	my $rep_x = $cw / $bg->{w};	1225	$bg->{s} = $cw / $bg->{w};
1139	my $rep_y = $ch / $bg->{h};	1226	$bg->{t} = $ch / $bg->{h};
1140
1141	glColor @{ $self->{bg} };
1142
1143	$bg->{s} = $rep_x;
1144	$bg->{t} = $rep_y;
1145	$bg->{wrap_mode} = 1;
1146	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1227	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1147	}	1228	}
1148		1229
1149	glDisable GL_TEXTURE_2D;	1230	glDisable GL_TEXTURE_2D;
1150		1231
1151	$self->{title}->draw if $self->{title};
1152
1153	$self->child->draw;	1232	$child->draw;
		1233
		1234	if ($self->{title}) {
		1235	glTranslate 0, $border - $self->{h};
		1236	$self->{title}->_draw;
		1237	}
1154	}	1238	}
1155		1239
1156	#############################################################################	1240	#############################################################################
1157		1241
1158	package CFClient::UI::Table;	1242	package CFClient::UI::Table;
…		…
1180	my ($self, $x, $y, $child) = @_;	1264	my ($self, $x, $y, $child) = @_;
1181		1265
1182	$child->set_parent ($self);	1266	$child->set_parent ($self);
1183	$self->{children}[$y][$x] = $child;	1267	$self->{children}[$y][$x] = $child;
1184		1268
1185	$self->check_size (1);	1269	$self->realloc;
1186	}	1270	}
1187		1271
1188	# TODO: move to container class maybe? send children a signal on removal?	1272	# TODO: move to container class maybe? send children a signal on removal?
1189	sub clear {	1273	sub clear {
1190	my ($self) = @_;	1274	my ($self) = @_;
…		…
1195	for (@children) {	1279	for (@children) {
1196	delete $_->{parent};	1280	delete $_->{parent};
1197	$_->hide;	1281	$_->hide;
1198	}	1282	}
1199		1283
1200	$self->check_size (1);	1284	$self->realloc;
1201	$self->update;
1202	}	1285	}
1203		1286
1204	sub get_wh {	1287	sub get_wh {
1205	my ($self) = @_;	1288	my ($self) = @_;
1206		1289
…		…
1414	ellipsise => 3, # end	1497	ellipsise => 3, # end
1415	layout => (new CFClient::Layout),	1498	layout => (new CFClient::Layout),
1416	fontsize => 1,	1499	fontsize => 1,
1417	align => -1,	1500	align => -1,
1418	valign => -1,	1501	valign => -1,
1419	padding => 2,	1502	padding_x => 2,
		1503	padding_y => 2,
1420	can_events => 0,	1504	can_events => 0,
1421	%arg	1505	%arg
1422	);	1506	);
1423		1507
1424	if (exists $self->{template}) {	1508	if (exists $self->{template}) {
…		…
1460	$self->{text} = "T$text";	1544	$self->{text} = "T$text";
1461		1545
1462	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1546	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1463	$self->{layout}->set_text ($text);	1547	$self->{layout}->set_text ($text);
1464		1548
		1549	$self->realloc;
1465	$self->update;	1550	$self->update;
1466	$self->check_size;
1467	}	1551	}
1468		1552
1469	sub set_markup {	1553	sub set_markup {
1470	my ($self, $markup) = @_;	1554	my ($self, $markup) = @_;
1471		1555
…		…
1475	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1559	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1476		1560
1477	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1561	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1478	$self->{layout}->set_markup ($markup);	1562	$self->{layout}->set_markup ($markup);
1479		1563
		1564	$self->realloc;
1480	$self->update;	1565	$self->update;
1481	$self->check_size;
1482	}	1566	}
1483		1567
1484	sub size_request {	1568	sub size_request {
1485	my ($self) = @_;	1569	my ($self) = @_;
1486		1570
…		…
1500		1584
1501	$w = List::Util::max $w, $w2;	1585	$w = List::Util::max $w, $w2;
1502	$h = List::Util::max $h, $h2;	1586	$h = List::Util::max $h, $h2;
1503	}	1587	}
1504		1588
1505	(	1589	($w, $h)
1506	$w + $self->{padding} * 2,
1507	$h + $self->{padding} * 2,
1508	)
1509	}	1590	}
1510		1591
1511	sub size_allocate {	1592	sub size_allocate {
1512	my ($self, $w, $h) = @_;	1593	my ($self, $w, $h) = @_;
1513		1594
		1595	delete $self->{ox};
		1596
1514	delete $self->{texture};	1597	delete $self->{texture}
		1598	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1515	}	1599	}
1516		1600
1517	sub set_fontsize {	1601	sub set_fontsize {
1518	my ($self, $fontsize) = @_;	1602	my ($self, $fontsize) = @_;
1519		1603
1520	$self->{fontsize} = $fontsize;	1604	$self->{fontsize} = $fontsize;
1521	delete $self->{texture};	1605	delete $self->{texture};
1522		1606
1523	$self->update;	1607	$self->realloc;
1524	$self->check_size;
1525	}	1608	}
1526		1609
1527	sub _draw {	1610	sub _draw {
1528	my ($self) = @_;	1611	my ($self) = @_;
1529		1612
…		…
1535	$self->{layout}->set_width ($self->{w});	1618	$self->{layout}->set_width ($self->{w});
1536	$self->{layout}->set_ellipsise ($self->{ellipsise});	1619	$self->{layout}->set_ellipsise ($self->{ellipsise});
1537	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1620	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1538	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1621	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1539		1622
1540	my $tex = new_from_layout CFClient::Texture $self->{layout};	1623	new_from_layout CFClient::Texture $self->{layout}
		1624	};
1541		1625
		1626	unless (exists $self->{ox}) {
1542	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1627	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1543	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1628	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1544	: ($self->{w} - $tex->{w}) * 0.5);	1629	: ($self->{w} - $tex->{w}) * 0.5);
1545		1630
1546	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1631	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1547	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1632	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1548	: ($self->{h} - $tex->{h}) * 0.5);	1633	: ($self->{h} - $tex->{h}) * 0.5);
1549
1550	$tex
1551	};	1634	};
1552		1635
1553	glEnable GL_TEXTURE_2D;	1636	glEnable GL_TEXTURE_2D;
1554	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1637	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1555		1638
…		…
1609	sub set_text {	1692	sub set_text {
1610	my ($self, $text) = @_;	1693	my ($self, $text) = @_;
1611		1694
1612	$self->{cursor} = length $text;	1695	$self->{cursor} = length $text;
1613	$self->_set_text ($text);	1696	$self->_set_text ($text);
1614	$self->update;	1697
1615	$self->check_size;	1698	$self->realloc;
1616	}	1699	}
1617		1700
1618	sub get_text {	1701	sub get_text {
1619	$_[0]{text}	1702	$_[0]{text}
1620	}	1703	}
…		…
1650	$self->{cursor} = length $text;	1733	$self->{cursor} = length $text;
1651	} elsif ($uni == 27) {	1734	} elsif ($uni == 27) {
1652	$self->_emit ('escape');	1735	$self->_emit ('escape');
1653	} elsif ($uni) {	1736	} elsif ($uni) {
1654	substr $text, $self->{cursor}++, 0, chr $uni;	1737	substr $text, $self->{cursor}++, 0, chr $uni;
		1738	} else {
		1739	return 0;
1655	}	1740	}
1656		1741
1657	$self->_set_text ($text);	1742	$self->_set_text ($text);
1658	$self->update;	1743
1659	$self->check_size;	1744	$self->realloc;
		1745
		1746	1
1660	}	1747	}
1661		1748
1662	sub focus_in {	1749	sub focus_in {
1663	my ($self) = @_;	1750	my ($self) = @_;
1664		1751
…		…
1679	utf8::encode $text;	1766	utf8::encode $text;
1680	$self->{cursor} = length substr $text, 0, $idx;	1767	$self->{cursor} = length substr $text, 0, $idx;
1681		1768
1682	$self->_set_text ($self->{text});	1769	$self->_set_text ($self->{text});
1683	$self->update;	1770	$self->update;
		1771
		1772	1
1684	}	1773	}
1685		1774
1686	sub mouse_motion {	1775	sub mouse_motion {
1687	my ($self, $ev, $x, $y) = @_;	1776	my ($self, $ev, $x, $y) = @_;
1688	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1777	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1778
		1779	0
1689	}	1780	}
1690		1781
1691	sub _draw {	1782	sub _draw {
1692	my ($self) = @_;	1783	my ($self) = @_;
1693		1784
…		…
1770	} else {	1861	} else {
1771	$self->set_text ($self->{history_saveback});	1862	$self->set_text ($self->{history_saveback});
1772	}	1863	}
1773		1864
1774	} else {	1865	} else {
1775	$self->SUPER::key_down ($ev);	1866	return $self->SUPER::key_down ($ev)
		1867	}
		1868
1776	}	1869	1
1777
1778	}	1870	}
1779		1871
1780	#############################################################################	1872	#############################################################################
1781		1873
1782	package CFClient::UI::Button;	1874	package CFClient::UI::Button;
…		…
1791		1883
1792	sub new {	1884	sub new {
1793	my $class = shift;	1885	my $class = shift;
1794		1886
1795	$class->SUPER::new (	1887	$class->SUPER::new (
1796	padding => 4,	1888	padding_x => 4,
		1889	padding_y => 4,
1797	fg => [1, 1, 1],	1890	fg => [1, 1, 1],
1798	active_fg => [0, 0, 1],	1891	active_fg => [0, 0, 1],
1799	can_hover => 1,	1892	can_hover => 1,
1800	align => 0,	1893	align => 0,
1801	valign => 0,	1894	valign => 0,
…		…
1810	my ($self, $ev, $x, $y) = @_;	1903	my ($self, $ev, $x, $y) = @_;
1811		1904
1812	$self->emit ("activate")	1905	$self->emit ("activate")
1813	if $x >= 0 && $x < $self->{w}	1906	if $x >= 0 && $x < $self->{w}
1814	&& $y >= 0 && $y < $self->{h};	1907	&& $y >= 0 && $y < $self->{h};
		1908
		1909	1
1815	}	1910	}
1816		1911
1817	sub _draw {	1912	sub _draw {
1818	my ($self) = @_;	1913	my ($self) = @_;
1819		1914
…		…
1848		1943
1849	sub new {	1944	sub new {
1850	my $class = shift;	1945	my $class = shift;
1851		1946
1852	$class->SUPER::new (	1947	$class->SUPER::new (
1853	padding => 2,	1948	padding_x => 2,
		1949	padding_y => 2,
1854	fg => [1, 1, 1],	1950	fg => [1, 1, 1],
1855	active_fg => [1, 1, 0],	1951	active_fg => [1, 1, 0],
1856	bg => [0, 0, 0, 0.2],	1952	bg => [0, 0, 0, 0.2],
1857	active_bg => [1, 1, 1, 0.5],	1953	active_bg => [1, 1, 1, 0.5],
1858	state => 0,	1954	state => 0,
…		…
1862	}	1958	}
1863		1959
1864	sub size_request {	1960	sub size_request {
1865	my ($self) = @_;	1961	my ($self) = @_;
1866		1962
1867	($self->{padding} * 2 + 6) x 2	1963	(6) x 2
1868	}	1964	}
1869		1965
1870	sub button_down {	1966	sub button_down {
1871	my ($self, $ev, $x, $y) = @_;	1967	my ($self, $ev, $x, $y) = @_;
1872		1968
1873	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1969	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1874	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1970	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1875	$self->{state} = !$self->{state};	1971	$self->{state} = !$self->{state};
1876	$self->_emit (changed => $self->{state});	1972	$self->_emit (changed => $self->{state});
		1973	} else {
		1974	return 0
		1975	}
		1976
1877	}	1977	1
1878	}	1978	}
1879		1979
1880	sub _draw {	1980	sub _draw {
1881	my ($self) = @_;	1981	my ($self) = @_;
1882		1982
1883	$self->SUPER::_draw;	1983	$self->SUPER::_draw;
1884		1984
1885	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1985	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1886		1986
1887	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1987	my ($w, $h) = @$self{qw(w h)};
		1988
		1989	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1888		1990
1889	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1991	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1890		1992
1891	my $tex = $self->{state} ? $tex[1] : $tex[0];	1993	my $tex = $self->{state} ? $tex[1] : $tex[0];
1892		1994
…		…
2157	fg => [1, 1, 1],	2259	fg => [1, 1, 1],
2158	active_fg => [0, 0, 0],	2260	active_fg => [0, 0, 0],
2159	bg => [0, 0, 0, 0.2],	2261	bg => [0, 0, 0, 0.2],
2160	active_bg => [1, 1, 1, 0.5],	2262	active_bg => [1, 1, 1, 0.5],
2161	range => [0, 0, 100, 10, 0],	2263	range => [0, 0, 100, 10, 0],
2162	req_w => $::WIDTH / 80,	2264	min_w => $::WIDTH / 80,
2163	req_h => $::WIDTH / 80,	2265	min_h => $::WIDTH / 80,
2164	vertical => 0,	2266	vertical => 0,
2165	can_hover => 1,	2267	can_hover => 1,
2166	inner_pad => 0.02,	2268	inner_pad => 0.02,
2167	@_	2269	@_
2168	);	2270	);
…		…
2171	$self->update;	2273	$self->update;
2172		2274
2173	$self	2275	$self
2174	}	2276	}
2175		2277
		2278	sub changed { }
		2279
2176	sub set_range {	2280	sub set_range {
2177	my ($self, $range) = @_;	2281	my ($self, $range) = @_;
2178		2282
2179	($range, $self->{range}) = ($self->{range}, $range);	2283	($range, $self->{range}) = ($self->{range}, $range);
2180		2284
…		…
2206	}	2310	}
2207		2311
2208	sub size_request {	2312	sub size_request {
2209	my ($self) = @_;	2313	my ($self) = @_;
2210		2314
2211	my $w = $self->{req_w};	2315	($self->{req_w}, $self->{req_h})
2212	my $h = $self->{req_h};
2213
2214	$self->{vertical} ? ($h, $w) : ($w, $h)
2215	}	2316	}
2216		2317
2217	sub button_down {	2318	sub button_down {
2218	my ($self, $ev, $x, $y) = @_;	2319	my ($self, $ev, $x, $y) = @_;
2219		2320
2220	$self->SUPER::button_down ($ev, $x, $y);	2321	$self->SUPER::button_down ($ev, $x, $y);
2221		2322
2222	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2323	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2223		2324
2224	$self->mouse_motion ($ev, $x, $y);	2325	$self->mouse_motion ($ev, $x, $y)
2225	}	2326	}
2226		2327
2227	sub mouse_motion {	2328	sub mouse_motion {
2228	my ($self, $ev, $x, $y) = @_;	2329	my ($self, $ev, $x, $y) = @_;
2229		2330
…		…
2233	my (undef, $lo, $hi, $page) = @{$self->{range}};	2334	my (undef, $lo, $hi, $page) = @{$self->{range}};
2234		2335
2235	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2336	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2236		2337
2237	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2338	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2339	} else {
		2340	return 0;
		2341	}
		2342
2238	}	2343	1
2239	}	2344	}
2240		2345
2241	sub update {	2346	sub update {
2242	my ($self) = @_;	2347	my ($self) = @_;
2243		2348
2244	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2349	delete $self->{knob_w};
		2350	$self->SUPER::update;
		2351	}
		2352
		2353	sub _draw {
		2354	my ($self) = @_;
		2355
		2356	unless ($self->{knob_w}) {
2245	$self->set_value ($self->{range}[0]);	2357	$self->set_value ($self->{range}[0]);
2246		2358
2247	my ($value, $lo, $hi, $page) = @{$self->{range}};	2359	my ($value, $lo, $hi, $page) = @{$self->{range}};
2248	my $range = ($hi - $page - $lo) || 1e-100;	2360	my $range = ($hi - $page - $lo) || 1e-100;
2249		2361
…		…
2255	$value = ($value - $lo) / $range;	2367	$value = ($value - $lo) / $range;
2256	$value = $value * $self->{scale} + $self->{offset};	2368	$value = $value * $self->{scale} + $self->{offset};
2257		2369
2258	$self->{knob_x} = $value - $knob_w * 0.5;	2370	$self->{knob_x} = $value - $knob_w * 0.5;
2259	$self->{knob_w} = $knob_w;	2371	$self->{knob_w} = $knob_w;
2260	});	2372	}
2261
2262	$self->SUPER::update;
2263	}
2264
2265	sub _draw {
2266	my ($self) = @_;
2267		2373
2268	$self->SUPER::_draw ();	2374	$self->SUPER::_draw ();
2269		2375
2270	glScale $self->{w}, $self->{h};	2376	glScale $self->{w}, $self->{h};
2271		2377
…		…
2604	}	2710	}
2605		2711
2606	sub set_tooltip_from {	2712	sub set_tooltip_from {
2607	my ($self, $widget) = @_;	2713	my ($self, $widget) = @_;
2608		2714
		2715	my $tooltip = $widget->{tooltip};
		2716
		2717	if ($ENV{CFPLUS_DEBUG} & 2) {
		2718	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2719	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2720	. "req $widget->{req_w} $widget->{req_h}\n"
		2721	. "visible $widget->{visible}";
		2722	}
		2723
2609	$self->add (new CFClient::UI::Label	2724	$self->add (new CFClient::UI::Label
2610	markup => $widget->{tooltip},	2725	markup => $tooltip,
2611	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2726	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2612	fontsize => 0.8,	2727	fontsize => 0.8,
2613	fg => [0, 0, 0, 1],	2728	fg => [0, 0, 0, 1],
2614	ellipsise => 0,	2729	ellipsise => 0,
2615	font => ($widget->{tooltip_font} || $::FONT_PROP),	2730	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2626		2741
2627	sub size_allocate {	2742	sub size_allocate {
2628	my ($self, $w, $h) = @_;	2743	my ($self, $w, $h) = @_;
2629		2744
2630	$self->SUPER::size_allocate ($w - 4, $h - 4);	2745	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2746	}
		2747
		2748	sub visibility_change {
		2749	my ($self, $visible) = @_;
		2750
		2751	return unless $visible;
		2752
		2753	$self->{root}->on_post_alloc ("move_$self" => sub {
		2754	my $widget = $self->{owner}
		2755	or return;
		2756
		2757	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2758
		2759	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2760	if $x + $self->{w} > $::WIDTH;
		2761
		2762	$self->move_abs ($x, $y);
		2763	});
2631	}	2764	}
2632		2765
2633	sub _draw {	2766	sub _draw {
2634	my ($self) = @_;	2767	my ($self) = @_;
2635		2768
…		…
2652	glVertex $w, $h;	2785	glVertex $w, $h;
2653	glVertex $w, 0;	2786	glVertex $w, 0;
2654	glEnd;	2787	glEnd;
2655		2788
2656	glTranslate 2 - 0.375, 2 - 0.375;	2789	glTranslate 2 - 0.375, 2 - 0.375;
		2790
2657	$self->SUPER::_draw;	2791	$self->SUPER::_draw;
2658	}	2792	}
2659		2793
2660	#############################################################################	2794	#############################################################################
2661		2795
…		…
2737	$self->SUPER::DESTROY;	2871	$self->SUPER::DESTROY;
2738	}	2872	}
2739		2873
2740	#############################################################################	2874	#############################################################################
2741		2875
2742	package CFClient::UI::Inventory;	2876	package CFClient::UI::Buttonbar;
2743		2877
2744	our @ISA = CFClient::UI::ScrolledWindow::;	2878	our @ISA = CFClient::UI::HBox::;
2745		2879
2746	sub new {	2880	# TODO: should actualyl wrap buttons and other goodies.
2747	my $class = shift;
2748
2749	my $self = $class->SUPER::new (
2750	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2751	@_,
2752	);
2753
2754	$self
2755	}
2756
2757	sub set_items {
2758	my ($self, $items) = @_;
2759
2760	$self->{scrolled}->clear;
2761	return unless $items;
2762
2763	my @items = sort {
2764	($a->{type} <=> $b->{type})
2765	or ($a->{name} cmp $b->{name})
2766	} @$items;
2767
2768	$self->{real_items} = \@items;
2769
2770	my $row = 0;
2771	for my $item (@items) {
2772	CFClient::Item::update_widgets $item;
2773
2774	$self->{scrolled}->add (0, $row, $item->{face_widget});
2775	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2776	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2777
2778	$row++;
2779	}
2780	}
2781		2881
2782	#############################################################################	2882	#############################################################################
2783		2883
2784	package CFClient::UI::Menu;	2884	package CFClient::UI::Menu;
2785		2885
…		…
2826	# maybe save $GRAB? must be careful about events...	2926	# maybe save $GRAB? must be careful about events...
2827	$GRAB = $self;	2927	$GRAB = $self;
2828	$self->{button} = $ev->{button};	2928	$self->{button} = $ev->{button};
2829		2929
2830	$self->show;	2930	$self->show;
2831	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2931	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2832	}	2932	}
2833		2933
2834	sub mouse_motion {	2934	sub mouse_motion {
2835	my ($self, $ev, $x, $y) = @_;	2935	my ($self, $ev, $x, $y) = @_;
2836		2936
2837	# TODO: should use vbox->find_widget or so	2937	# TODO: should use vbox->find_widget or so
2838	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2938	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2839	$self->{hover} = $self->{item}{$HOVER};	2939	$self->{hover} = $self->{item}{$HOVER};
		2940
		2941	0
2840	}	2942	}
2841		2943
2842	sub button_up {	2944	sub button_up {
2843	my ($self, $ev, $x, $y) = @_;	2945	my ($self, $ev, $x, $y) = @_;
2844		2946
…		…
2846	undef $GRAB;	2948	undef $GRAB;
2847	$self->hide;	2949	$self->hide;
2848		2950
2849	$self->_emit ("popdown");	2951	$self->_emit ("popdown");
2850	$self->{hover}[1]->() if $self->{hover};	2952	$self->{hover}[1]->() if $self->{hover};
		2953	} else {
		2954	return 0
		2955	}
		2956
		2957	1
		2958	}
		2959
		2960	#############################################################################
		2961
		2962	package CFClient::UI::Multiplexer;
		2963
		2964	our @ISA = CFClient::UI::Container::;
		2965
		2966	sub new {
		2967	my $class = shift;
		2968
		2969	my $self = $class->SUPER::new (
		2970	@_,
		2971	);
		2972
		2973	$self->{current} = $self->{children}[0]
		2974	if @{ $self->{children} };
		2975
		2976	$self
		2977	}
		2978
		2979	sub add {
		2980	my ($self, @widgets) = @_;
		2981
		2982	$self->SUPER::add (@widgets);
		2983
		2984	$self->{current} = $self->{children}[0]
		2985	if @{ $self->{children} };
		2986	}
		2987
		2988	sub set_current_page {
		2989	my ($self, $page_or_widget) = @_;
		2990
		2991	my $widget = ref $page_or_widget
		2992	? $page_or_widget
		2993	: $self->{children}[$page_or_widget];
		2994
		2995	$self->{current} = $widget;
		2996	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		2997
		2998	$self->_emit (page_changed => $self->{current});
		2999
		3000	$self->realloc;
		3001	}
		3002
		3003	sub visible_children {
		3004	$_[0]{current}
		3005	}
		3006
		3007	sub size_request {
		3008	my ($self) = @_;
		3009
		3010	$self->{current}->size_request
		3011	}
		3012
		3013	sub size_allocate {
		3014	my ($self, $w, $h) = @_;
		3015
		3016	$self->{current}->configure (0, 0, $w, $h);
		3017	}
		3018
		3019	sub _draw {
		3020	my ($self) = @_;
		3021
		3022	$self->{current}->draw;
		3023	}
		3024
		3025	#############################################################################
		3026
		3027	package CFClient::UI::Notebook;
		3028
		3029	our @ISA = CFClient::UI::VBox::;
		3030
		3031	sub new {
		3032	my $class = shift;
		3033
		3034	my $self = $class->SUPER::new (
		3035	buttonbar => (new CFClient::UI::Buttonbar),
		3036	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3037	# filter => # will be put between multiplexer and $self
		3038	@_,
		3039	);
2851	}	3040
		3041	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3042	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3043
		3044	$self
		3045	}
		3046
		3047	sub add {
		3048	my ($self, $title, $widget, $tooltip) = @_;
		3049
		3050	Scalar::Util::weaken $self;
		3051
		3052	$self->{buttonbar}->add (new CFClient::UI::Button
		3053	markup => $title,
		3054	tooltip => $tooltip,
		3055	on_activate => sub { $self->set_current_page ($widget) },
		3056	);
		3057
		3058	$self->{multiplexer}->add ($widget);
		3059	}
		3060
		3061	sub set_current_page {
		3062	my ($self, $page) = @_;
		3063
		3064	$self->{multiplexer}->set_current_page ($page);
		3065	$self->_emit (page_changed => $self->{multiplexer}{current});
2852	}	3066	}
2853		3067
2854	#############################################################################	3068	#############################################################################
2855		3069
2856	package CFClient::UI::Statusbox;	3070	package CFClient::UI::Statusbox;
…		…
2961	$self->SUPER::reconfigure;	3175	$self->SUPER::reconfigure;
2962	}	3176	}
2963		3177
2964	#############################################################################	3178	#############################################################################
2965		3179
2966	package CFClient::UI::Root;	3180	package CFClient::UI::Inventory;
2967		3181
2968	our @ISA = CFClient::UI::Container::;	3182	our @ISA = CFClient::UI::ScrolledWindow::;
2969
2970	use CFClient::OpenGL;
2971		3183
2972	sub new {	3184	sub new {
2973	my $class = shift;	3185	my $class = shift;
2974		3186
2975	$class->SUPER::new (	3187	my $self = $class->SUPER::new (
		3188	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3189	@_,
		3190	);
		3191
		3192	$self
		3193	}
		3194
		3195	sub set_items {
		3196	my ($self, $items) = @_;
		3197
		3198	$self->{child}->clear;
		3199	return unless $items;
		3200
		3201	my @items = sort {
		3202	($a->{type} <=> $b->{type})
		3203	or ($a->{name} cmp $b->{name})
		3204	} @$items;
		3205
		3206	$self->{real_items} = \@items;
		3207
		3208	my $row = 0;
		3209	for my $item (@items) {
		3210	CFClient::Item::update_widgets $item;
		3211
		3212	$self->{child}->add (0, $row, $item->{face_widget});
		3213	$self->{child}->add (1, $row, $item->{desc_widget});
		3214	$self->{child}->add (2, $row, $item->{weight_widget});
		3215
		3216	$row++;
		3217	}
		3218	}
		3219
		3220	#############################################################################
		3221
		3222	package CFClient::UI::BindEditor;
		3223
		3224	our @ISA = CFClient::UI::FancyFrame::;
		3225
		3226	sub new {
		3227	my $class = shift;
		3228
		3229	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3230
		3231	$self->add (my $vb = new CFClient::UI::VBox);
		3232
		3233
		3234	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3235	text => "start recording",
		3236	tooltip => "Start/Stops recording of actions."
		3237	."All subsequent actions after the recording started will be captured."
		3238	."The actions are displayed after the record was stopped."
		3239	."To bind the action you have to click on the 'Bind' button",
		3240	on_activate => sub {
		3241	unless ($self->{recording}) {
		3242	$self->start;
		3243	} else {
		3244	$self->stop;
		3245	}
		3246	});
		3247
		3248	$vb->add (new CFClient::UI::Label text => "Actions:");
		3249	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3250
		3251	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3252	$vb->add (my $hb = new CFClient::UI::HBox);
		3253	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3254	$hb->add (new CFClient::UI::Button
		3255	text => "bind",
		3256	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3257	on_activate => sub {
		3258	$self->ask_for_bind;
		3259	});
		3260
		3261	$vb->add (my $hb = new CFClient::UI::HBox);
		3262	$hb->add (new CFClient::UI::Button
		3263	text => "ok",
		3264	expand => 1,
		3265	tooltip => "This closes the binding editor and saves the binding",
		3266	on_activate => sub {
		3267	$self->hide;
		3268	$self->commit;
		3269	});
		3270
		3271	$hb->add (new CFClient::UI::Button
		3272	text => "cancel",
		3273	expand => 1,
		3274	tooltip => "This closes the binding editor without saving",
		3275	on_activate => sub {
		3276	$self->hide;
		3277	$self->{binding_cancel}->()
		3278	if $self->{binding_cancel};
		3279	});
		3280
		3281	$self->update_binding_widgets;
		3282
		3283	$self
		3284	}
		3285
		3286	sub commit {
		3287	my ($self) = @_;
		3288	my ($mod, $sym, $cmds) = $self->get_binding;
		3289	if ($sym != 0 && @$cmds > 0) {
		3290	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3291	."'. Don't forget 'Save Config'!");
		3292	$self->{binding_change}->($mod, $sym, $cmds)
		3293	if $self->{binding_change};
		3294	} else {
		3295	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3296	$self->{binding_cancel}->()
		3297	if $self->{binding_cancel};
		3298	}
		3299	}
		3300
		3301	sub start {
		3302	my ($self) = @_;
		3303
		3304	$self->{rec_btn}->set_text ("stop recording");
		3305	$self->{recording} = 1;
		3306	$self->clear_command_list;
		3307	$::CONN->start_record if $::CONN;
		3308	}
		3309
		3310	sub stop {
		3311	my ($self) = @_;
		3312
		3313	$self->{rec_btn}->set_text ("start recording");
		3314	$self->{recording} = 0;
		3315
		3316	my $rec;
		3317	$rec = $::CONN->stop_record if $::CONN;
		3318	return unless ref $rec eq 'ARRAY';
		3319	$self->set_command_list ($rec);
		3320	}
		3321
		3322
		3323	sub ask_for_bind_and_commit {
		3324	my ($self) = @_;
		3325	$self->ask_for_bind (1);
		3326	}
		3327
		3328	sub ask_for_bind {
		3329	my ($self, $commit) = @_;
		3330
		3331	CFClient::Binder::open_binding_dialog (sub {
		3332	my ($mod, $sym) = @_;
		3333	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3334	$self->update_binding_widgets;
		3335	$self->commit if $commit;
		3336	});
		3337	}
		3338
		3339	# $mod and $sym are the modifiers and key symbol
		3340	# $cmds is a array ref of strings (the commands)
		3341	# $cb is the callback that is executed on OK
		3342	# $ccb is the callback that is executed on CANCEL and
		3343	# when the binding was unsuccessful on OK
		3344	sub set_binding {
		3345	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3346
		3347	$self->clear_command_list;
		3348	$self->{recording} = 0;
		3349	$self->{rec_btn}->set_text ("start recording");
		3350
		3351	$self->{binding} = [$mod, $sym];
		3352	$self->{commands} = $cmds;
		3353
		3354	$self->{binding_change} = $cb;
		3355	$self->{binding_cancel} = $ccb;
		3356
		3357	$self->update_binding_widgets;
		3358	}
		3359
		3360	# this is a shortcut method that asks for a binding
		3361	# and then just binds it.
		3362	sub do_quick_binding {
		3363	my ($self, $cmds) = @_;
		3364	$self->set_binding (undef, undef, $cmds, sub {
		3365	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3366	});
		3367	$self->ask_for_bind (1);
		3368	}
		3369
		3370	sub update_binding_widgets {
		3371	my ($self) = @_;
		3372	my ($mod, $sym, $cmds) = $self->get_binding;
		3373	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3374	$self->set_command_list ($cmds);
		3375	}
		3376
		3377	sub get_binding {
		3378	my ($self) = @_;
		3379	return (
		3380	$self->{binding}->[0],
		3381	$self->{binding}->[1],
		3382	[ grep { defined $_ } @{$self->{commands}} ]
		3383	);
		3384	}
		3385
		3386	sub clear_command_list {
		3387	my ($self) = @_;
		3388	$self->{cmdbox}->clear ();
		3389	}
		3390
		3391	sub set_command_list {
		3392	my ($self, $cmds) = @_;
		3393
		3394	$self->{cmdbox}->clear ();
		3395	$self->{commands} = $cmds;
		3396
		3397	my $idx = 0;
		3398
		3399	for (@$cmds) {
		3400	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3401
		3402	my $i = $idx;
		3403	$hb->add (new CFClient::UI::Label text => $_);
		3404	$hb->add (new CFClient::UI::Button
		3405	text => "delete",
		3406	tooltip => "Deletes the action from the record",
		3407	on_activate => sub {
		3408	$self->{cmdbox}->remove ($hb);
		3409	$cmds->[$i] = undef;
		3410	});
		3411
		3412
		3413	$idx++
		3414	}
		3415	}
		3416
		3417	#############################################################################
		3418
		3419	package CFClient::UI::SpellList;
		3420
		3421	our @ISA = CFClient::UI::Table::;
		3422
		3423	sub new {
		3424	my $class = shift;
		3425
		3426	my $self = $class->SUPER::new (
		3427	binding => [],
		3428	commands => [],
		3429	@_,
		3430	)
		3431	}
		3432
		3433	# XXX: Do sorting? Argl...
		3434	sub add_spell {
		3435	my ($self, $spell) = @_;
		3436	$self->{spells}->{$spell->{name}} = $spell;
		3437
		3438	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3439	face => $spell->{face},
		3440	can_hover => 1,
		3441	can_events => 1,
		3442	tooltip => $spell->{message});
		3443
		3444	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3445	text => $spell->{name},
		3446	can_hover => 1,
		3447	can_events => 1,
		3448	tooltip => $spell->{message},
		3449	expand => 1);
		3450
		3451	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3452	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3453	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3454	expand => 1);
		3455
		3456	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3457	text => "bind to key",
		3458	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3459	}
		3460
		3461	sub rebuild_spell_list {
		3462	my ($self) = @_;
		3463	$self->{tbl_idx} = 0;
		3464	$self->add_spell ($_) for values %{$self->{spells}};
		3465	}
		3466
		3467	sub remove_spell {
		3468	my ($self, $spell) = @_;
		3469	delete $self->{spells}->{$spell->{name}};
		3470	$self->rebuild_spell_list;
		3471	}
		3472
		3473	#############################################################################
		3474
		3475	package CFClient::UI::Root;
		3476
		3477	our @ISA = CFClient::UI::Container::;
		3478
		3479	use CFClient::OpenGL;
		3480
		3481	sub new {
		3482	my $class = shift;
		3483
		3484	my $self = $class->SUPER::new (
2976	visible => 1,	3485	visible => 1,
2977	@_,	3486	@_,
2978	)	3487	);
2979	}
2980		3488
2981	sub configure {	3489	Scalar::Util::weaken ($self->{root} = $self);
2982	my ($self, $x, $y, $w, $h) = @_;
2983		3490
2984	$self->{w} = $w;	3491	$self
2985	$self->{h} = $h;
2986	}
2987
2988	sub check_size {
2989	my ($self) = @_;
2990
2991	$self->size_allocate ($self->{w}, $self->{h})
2992	if $self->{w};
2993	}	3492	}
2994		3493
2995	sub size_request {	3494	sub size_request {
2996	my ($self) = @_;	3495	my ($self) = @_;
2997		3496
2998	($self->{w}, $self->{h})	3497	($self->{w}, $self->{h})
		3498	}
		3499
		3500	sub _to_pixel {
		3501	my ($coord, $size, $max) = @_;
		3502
		3503	$coord =
		3504	$coord eq "center" ? ($max - $size) * 0.5
		3505	: $coord eq "max" ? $max
		3506	: $coord;
		3507
		3508	$coord = 0 if $coord < 0;
		3509	$coord = $max - $size if $coord > $max - $size;
		3510
		3511	int $coord + 0.5
2999	}	3512	}
3000		3513
3001	sub size_allocate {	3514	sub size_allocate {
3002	my ($self, $w, $h) = @_;	3515	my ($self, $w, $h) = @_;
3003		3516
3004	for my $child ($self->children) {	3517	for my $child ($self->children) {
3005	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3518	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3006		3519
3007	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3520	$X = $child->{force_x} if exists $child->{force_x};
3008	if exists $child->{req_x};	3521	$Y = $child->{force_y} if exists $child->{force_y};
3009		3522
3010	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3523	$X = _to_pixel $X, $W, $self->{w};
3011	if exists $child->{req_y};	3524	$Y = _to_pixel $Y, $H, $self->{h};
3012
3013	delete @$child{qw(req_x req_y)};
3014
3015	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3016	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3017		3525
3018	$child->configure ($X, $Y, $W, $H);	3526	$child->configure ($X, $Y, $W, $H);
3019	}	3527	}
3020	}	3528	}
3021		3529
…		…
3032	}	3540	}
3033		3541
3034	sub update {	3542	sub update {
3035	my ($self) = @_;	3543	my ($self) = @_;
3036		3544
3037	$self->check_size;
3038	$::WANT_REFRESH++;	3545	$::WANT_REFRESH++;
3039	}	3546	}
3040		3547
3041	sub add {	3548	sub add {
3042	my ($self, @children) = @_;	3549	my ($self, @children) = @_;
3043		3550
3044	for my $child (@children) {
3045	$child->{is_toplevel} = 1;	3551	$_->{is_toplevel} = 1
3046		3552	for @children;
3047	# integerise window positions
3048	$child->{x} = int $child->{x};
3049	$child->{y} = int $child->{y};
3050	}
3051		3553
3052	$self->SUPER::add (@children);	3554	$self->SUPER::add (@children);
3053
3054	for (my @widgets = @children; my $w = pop @widgets; ) {
3055	push @widgets, $w->children;
3056	$w->set_visible;
3057	}
3058
3059	}	3555	}
3060		3556
3061	sub remove {	3557	sub remove {
3062	my ($self, @children) = @_;	3558	my ($self, @children) = @_;
3063		3559
3064	$self->SUPER::remove (@children);	3560	$self->SUPER::remove (@children);
		3561
		3562	delete $self->{is_toplevel}
		3563	for @children;
3065		3564
3066	while (@children) {	3565	while (@children) {
3067	my $w = pop @children;	3566	my $w = pop @children;
3068	push @children, $w->children;	3567	push @children, $w->children;
3069	$w->set_invisible;	3568	$w->set_invisible;
…		…
3088	while ($self->{refresh_hook}) {	3587	while ($self->{refresh_hook}) {
3089	$_->()	3588	$_->()
3090	for values %{delete $self->{refresh_hook}};	3589	for values %{delete $self->{refresh_hook}};
3091	}	3590	}
3092		3591
3093	if ($self->{check_size}) {	3592	if ($self->{realloc}) {
		3593	my %queue;
3094	my @queue;	3594	my @queue;
		3595	my $widget;
3095		3596
3096	for (;;) {	3597	outer:
3097	if ($self->{check_size}) {	3598	while () {
3098	#TODO use array-of-depth approach	3599	if (my $realloc = delete $self->{realloc}) {
		3600	for $widget (values %$realloc) {
		3601	$widget->{visible} or next; # do not resize invisible widgets
3099		3602
3100	@queue = sort { $a->{visible} <=> $b->{visible} }	3603	$queue{$widget+0}++ and next; # duplicates are common
3101	@queue, values %{delete $self->{check_size}};	3604
		3605	push @{ $queue[$widget->{visible}] }, $widget;
		3606	}
3102	}	3607	}
3103		3608
		3609	while () {
		3610	@queue or last outer;
		3611
3104	my $widget = pop @queue || last;	3612	$widget = pop @{ $queue[-1] || [] }
3105		3613	and last;
3106	defined $widget->{visible} or last; # do not resize invisible widgets
3107
3108	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3109	? @$widget{qw(def_w def_h)}
3110	: $widget->size_request;
3111
3112	if (delete $widget->{force_alloc}
3113	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3114	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3115		3614
		3615	pop @queue;
		3616	}
		3617
		3618	delete $queue{$widget+0};
		3619
		3620	my ($w, $h) = $widget->size_request;
		3621
		3622	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3623	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3624
		3625	$w = $widget->{force_w} if exists $widget->{force_w};
		3626	$h = $widget->{force_h} if exists $widget->{force_h};
		3627
		3628	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3629	|| delete $widget->{force_realloc}) {
3116	$widget->{req_w} = $w;	3630	$widget->{req_w} = $w;
3117	$widget->{req_h} = $h;	3631	$widget->{req_h} = $h;
3118		3632
3119	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3633	$self->{size_alloc}{$widget+0} = $widget;
3120		3634
3121	$widget->{parent}->check_size
3122	if $widget->{parent};	3635	if (my $parent = $widget->{parent}) {
		3636	$self->{realloc}{$parent+0} = $parent
		3637	unless $queue{$parent+0};
		3638
		3639	$parent->{force_size_alloc} = 1;
		3640	$self->{size_alloc}{$parent+0} = $parent;
		3641	}
3123	}	3642	}
		3643
		3644	delete $self->{realloc}{$widget+0};
3124	}	3645	}
3125	}	3646	}
3126		3647
3127	while ($self->{size_alloc}) {	3648	while (my $size_alloc = delete $self->{size_alloc}) {
3128	for (values %{delete $self->{size_alloc}}) {	3649	my @queue = sort { $b->{visible} <=> $a->{visible} }
3129	my ($widget, $w, $h) = @$_;	3650	values %$size_alloc;
		3651
		3652	while () {
		3653	my $widget = pop @queue || last;
		3654
		3655	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3130		3656
3131	$w = 0 if $w < 0;	3657	$w = 0 if $w < 0;
3132	$h = 0 if $h < 0;	3658	$h = 0 if $h < 0;
3133		3659
		3660	$w = int $w + 0.5;
		3661	$h = int $h + 0.5;
		3662
		3663	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3664	$widget->{old_w} = $widget->{w};
		3665	$widget->{old_h} = $widget->{h};
		3666
3134	$widget->{w} = $w;	3667	$widget->{w} = $w;
3135	$widget->{h} = $h;	3668	$widget->{h} = $h;
		3669
3136	$widget->emit (size_allocate => $w, $h);	3670	$widget->emit (size_allocate => $w, $h);
		3671	}
3137	}	3672	}
3138	}	3673	}
3139		3674
3140	while ($self->{post_alloc_hook}) {	3675	while ($self->{post_alloc_hook}) {
3141	$_->()	3676	$_->()
3142	for values %{delete $self->{post_alloc_hook}};	3677	for values %{delete $self->{post_alloc_hook}};
3143	}	3678	}
		3679
3144		3680
3145	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3681	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3146	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3682	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3147	glClear GL_COLOR_BUFFER_BIT;	3683	glClear GL_COLOR_BUFFER_BIT;
3148		3684
…		…
3150	glLoadIdentity;	3686	glLoadIdentity;
3151	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3687	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3152	glMatrixMode GL_MODELVIEW;	3688	glMatrixMode GL_MODELVIEW;
3153	glLoadIdentity;	3689	glLoadIdentity;
3154		3690
		3691	{
		3692	package CFClient::UI::Base;
		3693
		3694	($draw_x, $draw_y, $draw_w, $draw_h) =
		3695	(0, 0, $self->{w}, $self->{h});
		3696	}
		3697
3155	$self->_draw;	3698	$self->_draw;
3156	}	3699	}
3157		3700
3158	#############################################################################	3701	#############################################################################
3159		3702

Diff Legend

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