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.310 by root, Fri Jun 23 20:28:20 2006 UTC vs.
Revision 1.389 by root, Sat Jul 21 13:02:05 2007 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
11	use CFClient::Texture;	11	use CFPlus::Texture;
12		12
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		14
15	our $LAYOUT;	15	our $LAYOUT;
16	our $ROOT;	16	our $ROOT;
…		…
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23	if (!$GRAB) {	23	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	28	$TOOLTIP->hide;
28		29
29	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		32
31	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
32		34
33	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
34		36
…		…
42	}	44	}
43	}	45	}
44	}	46	}
45		47
46	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	});	51	});
49		52
50	sub get_layout {	53	sub get_layout {
51	my $layout;	54	my $layout;
…		…
79	sub feed_sdl_key_up_event {	82	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	83	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	84	if $FOCUS;
82	}	85	}
83		86
		87	sub check_hover {
		88	my ($widget) = @_;
		89
		90	if ($widget != $HOVER) {
		91	my $hover = $HOVER; $HOVER = $widget;
		92
		93	$hover->update if $hover && $hover->{can_hover};
		94	$HOVER->update if $HOVER && $HOVER->{can_hover};
		95
		96	$TOOLTIP_WATCHER->start;
		97	}
		98	}
		99
84	sub feed_sdl_button_down_event {	100	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	101	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	102	my ($x, $y) = ($ev->{x}, $ev->{y});
87		103
88	if (!$BUTTON_STATE) {	104	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		105
		106	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	107	my $widget = $ROOT->find_widget ($x, $y);
90		108
91	$GRAB = $widget;	109	$GRAB = $widget;
92	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
93		111
94	$TOOLTIP_WATCHER->cb->();	112	$TOOLTIP_WATCHER->cb->();
95	}	113	}
96		114
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	115	if ($GRAB) {
		116	if ($ev->{button} == 4 || $ev->{button} == 5) {
		117	# mousewheel
		118	my $delta = $ev->{button} * 2 - 9;
		119	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
98		120
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	121	$ev->{dx} = $shift ? $delta : 0;
100	if $GRAB;	122	$ev->{dy} = $shift ? 0 : $delta;
		123
		124	$GRAB->emit (mouse_wheel => $ev);
		125	} else {
		126	$GRAB->emit (button_down => $ev)
		127	}
		128	}
101	}	129	}
102		130
103	sub feed_sdl_button_up_event {	131	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	132	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		133
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	134	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		135
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	136	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		137
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	138	$GRAB->emit (button_up => $ev)
112	if $GRAB;	139	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		140
114	if (!$BUTTON_STATE) {	141	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	142	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	143	$grab->update if $grab;
117	$GRAB->update if $GRAB;	144	$GRAB->update if $GRAB;
118		145
		146	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	147	$TOOLTIP_WATCHER->cb->();
120	}	148	}
121	}	149	}
122		150
123	sub feed_sdl_motion_event {	151	sub feed_sdl_motion_event {
124	my ($ev) = @_;	152	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	153	my ($x, $y) = ($ev->{x}, $ev->{y});
126		154
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	155	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		156
129	if ($widget != $HOVER) {	157	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		158
132	$hover->update if $hover && $hover->{can_hover};	159	$HOVER->emit (mouse_motion => $ev)
133	$HOVER->update if $HOVER && $HOVER->{can_hover};
134
135	$TOOLTIP_WATCHER->start;
136	}
137
138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139	if $HOVER;	160	if $HOVER;
140	}	161	}
141		162
142	# convert position array to integers	163	# convert position array to integers
143	sub harmonize {	164	sub harmonize {
…		…
193	reconfigure_widgets;	214	reconfigure_widgets;
194	}	215	}
195		216
196	#############################################################################	217	#############################################################################
197		218
		219	package CFPlus::UI::Event;
		220
		221	sub xy {
		222	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		223	}
		224
		225	#############################################################################
		226
198	package CFClient::UI::Base;	227	package CFPlus::UI::Base;
199		228
200	use strict;	229	use strict;
201		230
202	use CFClient::OpenGL;	231	use CFPlus::OpenGL;
203		232
204	sub new {	233	sub new {
205	my $class = shift;	234	my $class = shift;
206		235
207	my $self = bless {	236	my $self = bless {
…		…
212	h => undef,	241	h => undef,
213	can_events => 1,	242	can_events => 1,
214	@_	243	@_
215	}, $class;	244	}, $class;
216		245
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	246	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		247
219	for (keys %$self) {	248	for (keys %$self) {
220	if (/^on_(.*)$/) {	249	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	250	$self->connect ($1 => delete $self->{$_});
222	}	251	}
223	}	252	}
224		253
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	254	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	255	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	256	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	257	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	258	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230		259
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	260	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	261	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		262
234	$self->show if $layout->{show};	263	$self->show if $layout->{show};
…		…
239		268
240	sub destroy {	269	sub destroy {
241	my ($self) = @_;	270	my ($self) = @_;
242		271
243	$self->hide;	272	$self->hide;
		273	$self->emit ("destroy");
244	%$self = ();	274	%$self = ();
245	}	275	}
246		276
		277	sub TO_JSON {
		278	{ __widget_ref__ => $_[0]{s_id} }
		279	}
		280
247	sub show {	281	sub show {
248	my ($self) = @_;	282	my ($self) = @_;
249		283
250	return if $self->{parent};	284	return if $self->{parent};
251		285
252	$CFClient::UI::ROOT->add ($self);	286	$CFPlus::UI::ROOT->add ($self);
253	}	287	}
254		288
255	sub set_visible {	289	sub set_visible {
256	my ($self) = @_;	290	my ($self) = @_;
257		291
…		…
278	delete $self->{root};	312	delete $self->{root};
279		313
280	undef $GRAB if $GRAB == $self;	314	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	315	undef $HOVER if $HOVER == $self;
282		316
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	317	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	318	if $TOOLTIP->{owner} == $self;
285		319
286	$self->emit ("focus_out");	320	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	321	$self->emit (visibility_change => 0);
288	}	322	}
…		…
290	sub set_visibility {	324	sub set_visibility {
291	my ($self, $visible) = @_;	325	my ($self, $visible) = @_;
292		326
293	return if $self->{visible} == $visible;	327	return if $self->{visible} == $visible;
294		328
295	$visible ? $self->hide	329	$visible ? $self->show
296	: $self->show;	330	: $self->hide;
297	}	331	}
298		332
299	sub toggle_visibility {	333	sub toggle_visibility {
300	my ($self) = @_;	334	my ($self) = @_;
301		335
…		…
335	sub size_request {	369	sub size_request {
336	require Carp;	370	require Carp;
337	Carp::confess "size_request is abstract";	371	Carp::confess "size_request is abstract";
338	}	372	}
339		373
		374	sub baseline_shift {
		375	0
		376	}
		377
340	sub configure {	378	sub configure {
341	my ($self, $x, $y, $w, $h) = @_;	379	my ($self, $x, $y, $w, $h) = @_;
342		380
343	if ($self->{aspect}) {	381	if ($self->{aspect}) {
344	my ($ow, $oh) = ($w, $h);	382	my ($ow, $oh) = ($w, $h);
345		383
346	$w = List::Util::min $w, int $h * $self->{aspect};	384	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347	$h = List::Util::min $h, int $w / $self->{aspect};	385	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348		386
349	# use alignment to adjust x, y	387	# use alignment to adjust x, y
350		388
351	$x += int 0.5 * ($ow - $w);	389	$x += int 0.5 * ($ow - $w);
352	$y += int 0.5 * ($oh - $h);	390	$y += int 0.5 * ($oh - $h);
…		…
393		431
394	return if $self->{tooltip} eq $tooltip;	432	return if $self->{tooltip} eq $tooltip;
395		433
396	$self->{tooltip} = $tooltip;	434	$self->{tooltip} = $tooltip;
397		435
398	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	436	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
399	delete $CFClient::UI::TOOLTIP->{owner};	437	delete $CFPlus::UI::TOOLTIP->{owner};
400	$CFClient::UI::TOOLTIP_WATCHER->cb->();	438	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
401	}	439	}
402	}	440	}
403		441
404	# translate global coordinates to local coordinate system	442	# translate global coordinates to local coordinate system
405	sub coord2local {	443	sub coord2local {
406	my ($self, $x, $y) = @_;	444	my ($self, $x, $y) = @_;
407		445
		446	Carp::confess unless $self->{parent};#d#
		447
408	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	448	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
409	}	449	}
410		450
411	# translate local coordinates to global coordinate system	451	# translate local coordinates to global coordinate system
412	sub coord2global {	452	sub coord2global {
413	my ($self, $x, $y) = @_;	453	my ($self, $x, $y) = @_;
414		454
		455	Carp::confess unless $self->{parent};#d#
		456
415	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	457	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
416	}	458	}
417		459
418	sub invoke_focus_in {	460	sub invoke_focus_in {
419	my ($self) = @_;	461	my ($self) = @_;
420		462
421	return if $FOCUS == $self;	463	return if $FOCUS == $self;
422	return unless $self->{can_focus};	464	return unless $self->{can_focus};
423		465
424	my $focus = $FOCUS; $FOCUS = $self;	466	$FOCUS = $self;
425		467
426	$focus->update if $focus;	468	$self->update;
427	$FOCUS->update;
428		469
429	0	470	0
430	}	471	}
431		472
432	sub invoke_focus_out {	473	sub invoke_focus_out {
433	my ($self) = @_;	474	my ($self) = @_;
434		475
435	return unless $FOCUS == $self;	476	return unless $FOCUS == $self;
436		477
437	my $focus = $FOCUS; undef $FOCUS;	478	undef $FOCUS;
438		479
439	$focus->update if $focus; #?	480	$self->update;
440		481
441	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus	482	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442	unless $FOCUS;	483	unless $FOCUS;
443		484
444	0	485	0
445	}	486	}
446		487
447	sub grab_focus {	488	sub grab_focus {
448	my ($self) = @_;	489	my ($self) = @_;
449		490
		491	$FOCUS->emit ("focus_out") if $FOCUS;
450	$self->emit ("focus_in");	492	$self->emit ("focus_in");
451	}	493	}
452		494
453	sub invoke_mouse_motion { 1 }	495	sub invoke_mouse_motion { 0 }
454	sub invoke_button_up { 1 }	496	sub invoke_button_up { 0 }
455	sub invoke_key_down { 1 }	497	sub invoke_key_down { 0 }
456	sub invoke_key_up { 1 }	498	sub invoke_key_up { 0 }
		499	sub invoke_mouse_wheel { 0 }
457		500
458	sub invoke_button_down {	501	sub invoke_button_down {
459	my ($self, $ev, $x, $y) = @_;	502	my ($self, $ev, $x, $y) = @_;
460		503
461	$self->grab_focus;	504	$self->grab_focus;
462		505
463	1	506	0
464	}	507	}
465		508
466	sub connect {	509	sub connect {
467	my ($self, $signal, $cb) = @_;	510	my ($self, $signal, $cb) = @_;
468		511
469	push @{ $self->{signal_cb}{$signal} }, $cb;	512	push @{ $self->{signal_cb}{$signal} }, $cb;
		513
		514	defined wantarray and CFPlus::guard {
		515	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		516	@{ $self->{signal_cb}{$signal} };
		517	}
470	}	518	}
		519
		520	sub disconnect_all {
		521	my ($self, $signal) = @_;
		522
		523	delete $self->{signal_cb}{$signal};
		524	}
		525
		526	my %has_coords = (
		527	button_down => 1,
		528	button_up => 1,
		529	mouse_motion => 1,
		530	mouse_wheel => 1,
		531	);
471		532
472	sub emit {	533	sub emit {
473	my ($self, $signal, @args) = @_;	534	my ($self, $signal, @args) = @_;
474		535
475	#d##TODO# stop propagating at first true, do not use sum	536	# I do not really like this solution, but I do not like duplication
476	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	537	# and needlessly verbose code, either.
		538	my @append
		539	= $has_coords{$signal}
		540	? $args[0]->xy ($self)
		541	: ();
		542
		543	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		544
		545	for my $cb (
		546	@{$self->{signal_cb}{$signal} || []}, # before
477	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	547	($self->can ("invoke_$signal") || sub { 1 }), # closure
		548	) {
		549	return $cb->($self, @args, @append) || next;
		550	}
		551
		552	# parent
478	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	553	$self->{parent} && $self->{parent}->emit ($signal, @args)
479	}	554	}
480		555
481	sub find_widget {	556	#sub find_widget {
482	my ($self, $x, $y) = @_;	557	# in .xs
483
484	return () unless $self->{can_events};
485
486	return $self
487	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
488	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
489
490	()
491	}
492		558
493	sub set_parent {	559	sub set_parent {
494	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
495		561
496	Scalar::Util::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
497	$self->set_visible if $parent->{visible};	563	$self->set_visible if $parent->{visible};
498	}	564	}
499		565
500	sub realloc {	566	sub realloc {
501	my ($self) = @_;	567	my ($self) = @_;
…		…
535	return unless $self->{h} && $self->{w};	601	return unless $self->{h} && $self->{w};
536		602
537	# update screen rectangle	603	# update screen rectangle
538	local $draw_x = $draw_x + $self->{x};	604	local $draw_x = $draw_x + $self->{x};
539	local $draw_y = $draw_y + $self->{y};	605	local $draw_y = $draw_y + $self->{y};
540	local $draw_w = $draw_x + $self->{w};
541	local $draw_h = $draw_y + $self->{h};
542		606
543	# skip widgets that are entirely outside the drawing area	607	# skip widgets that are entirely outside the drawing area
544	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	608	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
545	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	609	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
546		610
…		…
569	glVertex $self->{w} - 1, 0;	633	glVertex $self->{w} - 1, 0;
570	glVertex $self->{w} - 1, $self->{h} - 1;	634	glVertex $self->{w} - 1, $self->{h} - 1;
571	glVertex 0 , $self->{h} - 1;	635	glVertex 0 , $self->{h} - 1;
572	glEnd;	636	glEnd;
573	glPopMatrix;	637	glPopMatrix;
574	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	638	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
575	}	639	}
576		640
577	$self->_draw;	641	$self->_draw;
578	glPopMatrix;	642	glPopMatrix;
579	}	643	}
…		…
582	my ($self) = @_;	646	my ($self) = @_;
583		647
584	warn "no draw defined for $self\n";	648	warn "no draw defined for $self\n";
585	}	649	}
586		650
		651	my $cntx;#d#
587	sub DESTROY {	652	sub DESTROY {
588	my ($self) = @_;	653	my ($self) = @_;
589		654
590	delete $WIDGET{$self+0};	655	return if CFPlus::in_destruct;
591		656
592	eval { $self->destroy };	657	eval { $self->destroy };
593	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	658	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		659
		660	delete $WIDGET{$self+0};
594	}	661	}
595		662
596	#############################################################################	663	#############################################################################
597		664
598	package CFClient::UI::DrawBG;	665	package CFPlus::UI::DrawBG;
599		666
600	our @ISA = CFClient::UI::Base::;	667	our @ISA = CFPlus::UI::Base::;
601		668
602	use strict;	669	use strict;
603	use CFClient::OpenGL;	670	use CFPlus::OpenGL;
604		671
605	sub new {	672	sub new {
606	my $class = shift;	673	my $class = shift;
607		674
608	# range [value, low, high, page]	675	# range [value, low, high, page]
…		…
639	}	706	}
640	}	707	}
641		708
642	#############################################################################	709	#############################################################################
643		710
644	package CFClient::UI::Empty;	711	package CFPlus::UI::Empty;
645		712
646	our @ISA = CFClient::UI::Base::;	713	our @ISA = CFPlus::UI::Base::;
647		714
648	sub new {	715	sub new {
649	my ($class, %arg) = @_;	716	my ($class, %arg) = @_;
650	$class->SUPER::new (can_events => 0, %arg);	717	$class->SUPER::new (can_events => 0, %arg);
651	}	718	}
…		…
658		725
659	sub draw { }	726	sub draw { }
660		727
661	#############################################################################	728	#############################################################################
662		729
663	package CFClient::UI::Container;	730	package CFPlus::UI::Container;
664		731
665	our @ISA = CFClient::UI::Base::;	732	our @ISA = CFPlus::UI::Base::;
666		733
667	sub new {	734	sub new {
668	my ($class, %arg) = @_;	735	my ($class, %arg) = @_;
669		736
670	my $children = delete $arg{children};	737	my $children = delete $arg{children};
…		…
679	if $children;	746	if $children;
680		747
681	$self	748	$self
682	}	749	}
683		750
		751	sub realloc {
		752	my ($self) = @_;
		753
		754	$self->{force_realloc} = 1;
		755	$self->{force_size_alloc} = 1;
		756	$self->SUPER::realloc;
		757	}
		758
684	sub add {	759	sub add {
685	my ($self, @widgets) = @_;	760	my ($self, @widgets) = @_;
686		761
687	$_->set_parent ($self)	762	$_->set_parent ($self)
688	for @widgets;	763	for @widgets;
…		…
748	$_->draw for @{$self->{children}};	823	$_->draw for @{$self->{children}};
749	}	824	}
750		825
751	#############################################################################	826	#############################################################################
752		827
753	package CFClient::UI::Bin;	828	package CFPlus::UI::Bin;
754		829
755	our @ISA = CFClient::UI::Container::;	830	our @ISA = CFPlus::UI::Container::;
756		831
757	sub new {	832	sub new {
758	my ($class, %arg) = @_;	833	my ($class, %arg) = @_;
759		834
760	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	835	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
761		836
762	$class->SUPER::new (children => [$child], %arg)	837	$class->SUPER::new (children => [$child], %arg)
763	}	838	}
764		839
765	sub add {	840	sub add {
…		…
772	sub remove {	847	sub remove {
773	my ($self, $widget) = @_;	848	my ($self, $widget) = @_;
774		849
775	$self->SUPER::remove ($widget);	850	$self->SUPER::remove ($widget);
776		851
777	$self->{children} = [new CFClient::UI::Empty]	852	$self->{children} = [new CFPlus::UI::Empty]
778	unless @{$self->{children}};	853	unless @{$self->{children}};
779	}	854	}
780		855
781	sub child { $_[0]->{children}[0] }	856	sub child { $_[0]->{children}[0] }
782		857
…		…
794		869
795	#############################################################################	870	#############################################################################
796		871
797	# back-buffered drawing area	872	# back-buffered drawing area
798		873
799	package CFClient::UI::Window;	874	package CFPlus::UI::Window;
800		875
801	our @ISA = CFClient::UI::Bin::;	876	our @ISA = CFPlus::UI::Bin::;
802		877
803	use CFClient::OpenGL;	878	use CFPlus::OpenGL;
804		879
805	sub new {	880	sub new {
806	my ($class, %arg) = @_;	881	my ($class, %arg) = @_;
807		882
808	my $self = $class->SUPER::new (%arg);	883	my $self = $class->SUPER::new (%arg);
…		…
830	}	905	}
831		906
832	sub render_child {	907	sub render_child {
833	my ($self) = @_;	908	my ($self) = @_;
834		909
835	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	910	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
836	glClearColor 0, 0, 0, 0;	911	glClearColor 0, 0, 0, 0;
837	glClear GL_COLOR_BUFFER_BIT;	912	glClear GL_COLOR_BUFFER_BIT;
838		913
839	{	914	{
840	package CFClient::UI::Base;	915	package CFPlus::UI::Base;
841		916
842	($draw_x, $draw_y, $draw_w, $draw_h) =	917	local ($draw_x, $draw_y, $draw_w, $draw_h) =
843	(0, 0, $self->{w}, $self->{h});	918	(0, 0, $self->{w}, $self->{h});
		919
		920	$self->_render;
844	}	921	}
845
846	$self->_render;
847	};	922	};
848	}	923	}
849		924
850	sub _draw {	925	sub _draw {
851	my ($self) = @_;	926	my ($self) = @_;
852
853	my ($w, $h) = @$self{qw(w h)};
854		927
855	my $tex = $self->{texture}	928	my $tex = $self->{texture}
856	or return;	929	or return;
857		930
858	glEnable GL_TEXTURE_2D;	931	glEnable GL_TEXTURE_2D;
859	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	932	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
860	glColor 0, 0, 0, 1;	933	glColor 0, 0, 0, 1;
861		934
862	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	935	$tex->draw_quad_alpha_premultiplied (0, 0);
863		936
864	glDisable GL_TEXTURE_2D;	937	glDisable GL_TEXTURE_2D;
865	}	938	}
866		939
867	#############################################################################	940	#############################################################################
868		941
869	package CFClient::UI::ViewPort;	942	package CFPlus::UI::ViewPort;
870		943
		944	use List::Util qw(min max);
		945
871	our @ISA = CFClient::UI::Window::;	946	our @ISA = CFPlus::UI::Window::;
872		947
873	sub new {	948	sub new {
874	my $class = shift;	949	my $class = shift;
875		950
876	$class->SUPER::new (	951	$class->SUPER::new (
…		…
883	sub size_request {	958	sub size_request {
884	my ($self) = @_;	959	my ($self) = @_;
885		960
886	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	961	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
887		962
888	$w = 10 if $self->{scroll_x};	963	$w = 1 if $self->{scroll_x};
889	$h = 10 if $self->{scroll_y};	964	$h = 1 if $self->{scroll_y};
890		965
891	($w, $h)	966	($w, $h)
892	}	967	}
893		968
894	sub invoke_size_allocate {	969	sub invoke_size_allocate {
…		…
906	}	981	}
907		982
908	sub set_offset {	983	sub set_offset {
909	my ($self, $x, $y) = @_;	984	my ($self, $x, $y) = @_;
910		985
		986	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		987	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		988
		989	if ($x != $self->{view_x} or $y != $self->{view_y}) {
911	$self->{view_x} = int $x;	990	$self->{view_x} = $x;
912	$self->{view_y} = int $y;	991	$self->{view_y} = $y;
913		992
		993	$self->emit (changed => $x, $y);
914	$self->update;	994	$self->update;
		995	}
915	}	996	}
916		997
917	# hmm, this does not work for topleft of $self... but we should not ask for that	998	# hmm, this does not work for topleft of $self... but we should not ask for that
918	sub coord2local {	999	sub coord2local {
919	my ($self, $x, $y) = @_;	1000	my ($self, $x, $y) = @_;
…		…
934	my ($self, $x, $y) = @_;	1015	my ($self, $x, $y) = @_;
935		1016
936	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1017	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
937	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1018	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
938	) {	1019	) {
939	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1020	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
940	} else {	1021	} else {
941	$self->CFClient::UI::Base::find_widget ($x, $y)	1022	$self->CFPlus::UI::Base::find_widget ($x, $y)
942	}	1023	}
943	}	1024	}
944		1025
945	sub _render {	1026	sub _render {
946	my ($self) = @_;	1027	my ($self) = @_;
947		1028
948	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1029	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
949	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1030	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
950		1031
951	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1032	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
952		1033
953	$self->SUPER::_render;	1034	$self->SUPER::_render;
954	}	1035	}
955		1036
956	#############################################################################	1037	#############################################################################
957		1038
958	package CFClient::UI::ScrolledWindow;	1039	package CFPlus::UI::ScrolledWindow;
959		1040
960	our @ISA = CFClient::UI::HBox::;	1041	our @ISA = CFPlus::UI::Table::;
961		1042
962	sub new {	1043	sub new {
963	my ($class, %arg) = @_;	1044	my ($class, %arg) = @_;
964		1045
965	my $child = delete $arg{child};	1046	my $child = delete $arg{child};
966		1047
967	my $self;	1048	my $self;
968		1049
969	my $slider = new CFClient::UI::Slider	1050	my $hslider = new CFPlus::UI::Slider
		1051	vertical => 0,
		1052	range => [0, 0, 1, 0.01], # HACK fix
		1053	on_changed => sub {
		1054	$self->{hpos} = $_[1];
		1055	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1056	},
		1057	;
		1058
		1059	my $vslider = new CFPlus::UI::Slider
970	vertical => 1,	1060	vertical => 1,
971	range => [0, 0, 1, 0.01], # HACK fix	1061	range => [0, 0, 1, 0.01], # HACK fix
972	on_changed => sub {	1062	on_changed => sub {
973	$self->{vp}->set_offset (0, $_[1]);	1063	$self->{vpos} = $_[1];
		1064	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
974	},	1065	},
975	;	1066	;
976		1067
977	$self = $class->SUPER::new (	1068	$self = $class->SUPER::new (
978	vp => (new CFClient::UI::ViewPort expand => 1),	1069	scroll_x => 0,
		1070	scroll_y => 1,
		1071	can_events => 1,
979	slider => $slider,	1072	hslider => $hslider,
		1073	vslider => $vslider,
		1074	col_expand => [1, 0],
		1075	row_expand => [1, 0],
980	%arg,	1076	%arg,
981	);	1077	);
982		1078
983	$self->SUPER::add ($self->{vp}, $self->{slider});	1079	$self->{vp} = new CFPlus::UI::ViewPort
		1080	expand => 1,
		1081	scroll_x => $self->{scroll_x},
		1082	scroll_y => $self->{scroll_y},
		1083	on_changed => sub {
		1084	my ($vp, $x, $y) = @_;
		1085
		1086	$vp->{parent}{hslider}->set_value ($x);
		1087	$vp->{parent}{vslider}->set_value ($y);
		1088
		1089	0
		1090	},
		1091	;
		1092
		1093	$self->SUPER::add_at (0, 0, $self->{vp});
		1094
984	$self->add ($child) if $child;	1095	$self->add ($child) if $child;
985		1096
986	$self	1097	$self
987	}	1098	}
		1099
		1100	#TODO# update range on size_allocate depending on child
988		1101
989	sub add {	1102	sub add {
990	my ($self, $widget) = @_;	1103	my ($self, $widget) = @_;
991		1104
992	$self->{vp}->add ($self->{child} = $widget);	1105	$self->{vp}->add ($self->{child} = $widget);
993	}	1106	}
994		1107
		1108	sub update_slider {
		1109	my ($self) = @_;
		1110
		1111	my $child = ($self->{vp} or return)->child;
		1112
		1113	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1114	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1115
		1116	my $visible = $w1 > $w2;
		1117	if ($visible != $self->{hslider}{visible}) {
		1118	$visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
		1119	: $self->{hslider}->hide;
		1120	}
		1121
		1122	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1123	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1124
		1125	my $visible = $h1 > $h2;
		1126	if ($visible != $self->{vslider}{visible}) {
		1127	$visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
		1128	: $self->{vslider}->hide;
		1129	}
		1130	}
		1131
995	sub update {	1132	sub update {
996	my ($self) = @_;	1133	my ($self) = @_;
997		1134
		1135	$self->update_slider;
998	$self->SUPER::update;	1136	$self->SUPER::update;
		1137	}
999		1138
1000	# todo: overwrite size_allocate of child	1139	sub invoke_mouse_wheel {
1001	my $child = $self->{vp}->child;	1140	my ($self, $ev) = @_;
1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1141
		1142	$self->{vslider}->emit (mouse_wheel => $ev)
		1143	if $ev->{dy};
		1144
		1145	$self->{hslider}->emit (mouse_wheel => $ev)
		1146	if $ev->{dx};
		1147
		1148	1
		1149	}
		1150
		1151	sub invoke_button_down {
		1152	my ($self, $ev, $x, $y) = @_;
		1153
		1154	if ($ev->{button} == 2) {
		1155	$self->grab_focus;
		1156
		1157	my $ox = $self->{vp}{view_x} + $ev->{x};
		1158	my $oy = $self->{vp}{view_y} + $ev->{y};
		1159
		1160	$self->{motion} = sub {
		1161	my ($ev, $x, $y) = @_;
		1162
		1163	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
		1164	$self->update;
		1165	};
		1166
		1167	return 1;
		1168	}
		1169
		1170	0
		1171	}
		1172
		1173	sub invoke_button_up {
		1174	my ($self, $ev, $x, $y) = @_;
		1175
		1176	if (delete $self->{motion}) {
		1177	return 1;
		1178	}
		1179
		1180	0
		1181	}
		1182
		1183	sub invoke_mouse_motion {
		1184	my ($self, $ev, $x, $y) = @_;
		1185
		1186	if ($self->{motion}) {
		1187	$self->{motion}->($ev, $x, $y);
		1188	return 1;
		1189	}
		1190
		1191	0
1003	}	1192	}
1004		1193
1005	sub invoke_size_allocate {	1194	sub invoke_size_allocate {
1006	my ($self, $w, $h) = @_;	1195	my ($self, $w, $h) = @_;
1007		1196
1008	my $child = $self->{vp}->child;	1197	$self->update_slider;
1009	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010
1011	$self->SUPER::invoke_size_allocate ($w, $h)	1198	$self->SUPER::invoke_size_allocate ($w, $h)
1012	}	1199	}
1013		1200
1014	#TODO# update range on size_allocate depending on child
1015	# update viewport offset on scroll
1016
1017	#############################################################################	1201	#############################################################################
1018		1202
1019	package CFClient::UI::Frame;	1203	package CFPlus::UI::Frame;
1020		1204
1021	our @ISA = CFClient::UI::Bin::;	1205	our @ISA = CFPlus::UI::Bin::;
1022		1206
1023	use CFClient::OpenGL;	1207	use CFPlus::OpenGL;
1024		1208
1025	sub new {	1209	sub new {
1026	my $class = shift;	1210	my $class = shift;
1027		1211
1028	$class->SUPER::new (	1212	$class->SUPER::new (
…		…
1054	$self->SUPER::_draw;	1238	$self->SUPER::_draw;
1055	}	1239	}
1056		1240
1057	#############################################################################	1241	#############################################################################
1058		1242
1059	package CFClient::UI::FancyFrame;	1243	package CFPlus::UI::FancyFrame;
1060		1244
1061	our @ISA = CFClient::UI::Bin::;	1245	our @ISA = CFPlus::UI::Bin::;
1062		1246
1063	use CFClient::OpenGL;	1247	use CFPlus::OpenGL;
		1248
		1249	sub new {
		1250	my ($class, %arg) = @_;
		1251
		1252	if ((exists $arg{label}) && !ref $arg{label}) {
		1253	$arg{label} = new CFPlus::UI::Label
		1254	align => 1,
		1255	valign => 0,
		1256	text => $arg{label},
		1257	fontsize => ($arg{border} || 0.8) * 0.75;
		1258	}
		1259
		1260	my $self = $class->SUPER::new (
		1261	# label => "",
		1262	fg => [0.6, 0.3, 0.1],
		1263	border => 0.8,
		1264	style => 'single',
		1265	%arg,
		1266	);
		1267
		1268	$self
		1269	}
		1270
		1271	sub add {
		1272	my ($self, @widgets) = @_;
		1273
		1274	$self->SUPER::add (@widgets);
		1275	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1276	}
		1277
		1278	sub border {
		1279	int $_[0]{border} * $::FONTSIZE
		1280	}
		1281
		1282	sub size_request {
		1283	my ($self) = @_;
		1284
		1285	($self->{label_w}, undef) = $self->{label}->size_request
		1286	if $self->{label};
		1287
		1288	my ($w, $h) = $self->SUPER::size_request;
		1289
		1290	(
		1291	$w + $self->border * 2,
		1292	$h + $self->border * 2,
		1293	)
		1294	}
		1295
		1296	sub invoke_size_allocate {
		1297	my ($self, $w, $h) = @_;
		1298
		1299	my $border = $self->border;
		1300
		1301	$w -= List::Util::max 0, $border * 2;
		1302	$h -= List::Util::max 0, $border * 2;
		1303
		1304	if (my $label = $self->{label}) {
		1305	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1306	$label->{h} = List::Util::min $h, $border;
		1307	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1308	}
		1309
		1310	$self->child->configure ($border, $border, $w, $h);
		1311
		1312	1
		1313	}
		1314
		1315	sub _draw {
		1316	my ($self) = @_;
		1317
		1318	my $child = $self->{children}[0];
		1319
		1320	my $border = $self->border;
		1321	my ($w, $h) = ($self->{w}, $self->{h});
		1322
		1323	$child->draw;
		1324
		1325	glColor @{$self->{fg}};
		1326	glBegin GL_LINE_STRIP;
		1327	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1328	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1329	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1330	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1331	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1332	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1333	glEnd;
		1334
		1335	if ($self->{label}) {
		1336	glTranslate $border * 2, 0;
		1337	$self->{label}->_draw;
		1338	}
		1339	}
		1340
		1341	#############################################################################
		1342
		1343	package CFPlus::UI::Toplevel;
		1344
		1345	our @ISA = CFPlus::UI::Bin::;
		1346
		1347	use CFPlus::OpenGL;
1064		1348
1065	my $bg =	1349	my $bg =
1066	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1350	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1067	mipmap => 1, wrap => 1;	1351	mipmap => 1, wrap => 1;
1068		1352
1069	my @border =	1353	my @border =
1070	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1354	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1071	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1355	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1356
		1357	my @icon =
		1358	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1359	qw(x1_move.png x1_resize.png);
1072		1360
1073	sub new {	1361	sub new {
1074	my ($class, %arg) = @_;	1362	my ($class, %arg) = @_;
1075		1363
1076	my $self = $class->SUPER::new (	1364	my $self = $class->SUPER::new (
1077	bg => [1, 1, 1, 1],	1365	bg => [1, 1, 1, 1],
1078	border_bg => [1, 1, 1, 1],	1366	border_bg => [1, 1, 1, 1],
1079	border => 0.6,	1367	border => 0.6,
1080	can_events => 1,	1368	can_events => 1,
1081	min_w => 16,	1369	min_w => 64,
1082	min_h => 16,	1370	min_h => 32,
1083	%arg,	1371	%arg,
1084	);	1372	);
1085		1373
1086	$self->{title_widget} = new CFClient::UI::Label	1374	$self->{title_widget} = new CFPlus::UI::Label
1087	align => 0,	1375	align => 0,
1088	valign => 1,	1376	valign => 1,
1089	text => $self->{title},	1377	text => $self->{title},
1090	fontsize => $self->{border},	1378	fontsize => $self->{border},
1091	if exists $self->{title};	1379	if exists $self->{title};
1092		1380
1093	if ($self->{has_close_button}) {	1381	if ($self->{has_close_button}) {
1094	$self->{close_button} =	1382	$self->{close_button} =
1095	new CFClient::UI::ImageButton	1383	new CFPlus::UI::ImageButton
1096	path => 'x1_close.png',	1384	path => 'x1_close.png',
1097	on_activate => sub { $self->hide };	1385	on_activate => sub { $self->emit ("delete") };
1098		1386
1099	$self->CFClient::UI::Container::add ($self->{close_button});	1387	$self->CFPlus::UI::Container::add ($self->{close_button});
1100	}	1388	}
1101		1389
1102	$self	1390	$self
1103	}	1391	}
1104		1392
1105	sub add {	1393	sub add {
1106	my ($self, @widgets) = @_;	1394	my ($self, @widgets) = @_;
1107		1395
1108	$self->SUPER::add (@widgets);	1396	$self->SUPER::add (@widgets);
1109	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1397	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1110	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1398	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1111	}	1399	}
1112		1400
1113	sub border {	1401	sub border {
1114	int $_[0]{border} * $::FONTSIZE	1402	int $_[0]{border} * $::FONTSIZE
1115	}	1403	}
…		…
1148	$self->child->configure ($border, $border, $w, $h);	1436	$self->child->configure ($border, $border, $w, $h);
1149		1437
1150	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1438	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151	if $self->{close_button};	1439	if $self->{close_button};
1152		1440
		1441	1
		1442	}
		1443
		1444	sub invoke_delete {
		1445	my ($self) = @_;
		1446
		1447	$self->hide;
		1448
1153	1	1449	1
1154	}	1450	}
1155		1451
1156	sub invoke_button_down {	1452	sub invoke_button_down {
1157	my ($self, $ev, $x, $y) = @_;	1453	my ($self, $ev, $x, $y) = @_;
…		…
1215	$self->{motion}->($ev, $x, $y) if $self->{motion};	1511	$self->{motion}->($ev, $x, $y) if $self->{motion};
1216		1512
1217	! ! $self->{motion}	1513	! ! $self->{motion}
1218	}	1514	}
1219		1515
		1516	sub invoke_visibility_change {
		1517	my ($self, $visible) = @_;
		1518
		1519	delete $self->{motion} unless $visible;
		1520
		1521	0
		1522	}
		1523
1220	sub _draw {	1524	sub _draw {
1221	my ($self) = @_;	1525	my ($self) = @_;
1222		1526
1223	my $child = $self->{children}[0];	1527	my $child = $self->{children}[0];
1224		1528
…		…
1229	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1533	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1230		1534
1231	my $border = $self->border;	1535	my $border = $self->border;
1232		1536
1233	glColor @{ $self->{border_bg} };	1537	glColor @{ $self->{border_bg} };
1234	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1538	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1235	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1539	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1236	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1540	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1237	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1541	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1542
		1543	# move
		1544	my $w2 = ($w - $border) * .5;
		1545	my $h2 = ($h - $border) * .5;
		1546	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1547	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1548	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1549
		1550	# resize
		1551	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1552	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1553	unless $self->{has_close_button};
		1554	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1555	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1238		1556
1239	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1557	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1240	glColor @{ $self->{bg} };	1558	glColor @{ $self->{bg} };
1241		1559
1242	# TODO: repeat texture not scale	1560	# TODO: repeat texture not scale
…		…
1261	if $self->{close_button};	1579	if $self->{close_button};
1262	}	1580	}
1263		1581
1264	#############################################################################	1582	#############################################################################
1265		1583
1266	package CFClient::UI::Table;	1584	package CFPlus::UI::Table;
1267		1585
1268	our @ISA = CFClient::UI::Base::;	1586	our @ISA = CFPlus::UI::Base::;
1269		1587
1270	use List::Util qw(max sum);	1588	use List::Util qw(max sum);
1271		1589
1272	use CFClient::OpenGL;	1590	use CFPlus::OpenGL;
1273		1591
1274	sub new {	1592	sub new {
1275	my $class = shift;	1593	my $class = shift;
1276		1594
1277	$class->SUPER::new (	1595	$class->SUPER::new (
		1596	children => [],
1278	col_expand => [],	1597	col_expand => [],
		1598	row_expand => [],
1279	@_,	1599	@_,
1280	)	1600	)
1281	}	1601	}
1282		1602
1283	sub children {	1603	sub children {
1284	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1604	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1285	}	1605	}
1286		1606
		1607	# TODO: store row/col info in child widget and use standard add/del
1287	sub add {	1608	sub add {
1288	my ($self, $x, $y, $child) = @_;	1609	my $self = shift;
1289		1610
		1611	Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
		1612	$self->add_at (@_);
		1613	}
		1614
		1615	sub add_at {
		1616	my $self = shift;
		1617
		1618	while (@_) {
		1619	my ($col, $row, $child) = splice @_, 0, 3, ();
		1620
		1621	$child->{row} = $row;
		1622	$child->{col} = $col;
		1623
		1624	$child->{rowspan} ||= 1;
		1625	$child->{colspan} ||= 1;
		1626
1290	$child->set_parent ($self);	1627	$child->set_parent ($self);
1291	$self->{children}[$y][$x] = $child;	1628	$self->{children}[$row][$col] = $child;
		1629	}
1292		1630
		1631	$self->{force_realloc} = 1;
		1632	$self->{force_size_alloc} = 1;
1293	$self->realloc;	1633	$self->realloc;
1294	}	1634	}
1295		1635
1296	sub remove {	1636	sub remove {
1297	my ($self, $child) = @_;	1637	my ($self, $child) = @_;
1298		1638
1299	# TODO: not yet implemented	1639	for (@{ $self->{children} }) {
		1640	for (@{ $_ || [] }) {
		1641	$_ = undef if $_ == $child;
		1642	}
		1643	}
1300	}	1644	}
1301		1645
1302	# TODO: move to container class maybe? send children a signal on removal?	1646	# TODO: move to container class maybe? send children a signal on removal?
1303	sub clear {	1647	sub clear {
1304	my ($self) = @_;	1648	my ($self) = @_;
…		…
1317	sub get_wh {	1661	sub get_wh {
1318	my ($self) = @_;	1662	my ($self) = @_;
1319		1663
1320	my (@w, @h);	1664	my (@w, @h);
1321		1665
1322	for my $y (0 .. $#{$self->{children}}) {	1666	my @children = $self->children;
1323	my $row = $self->{children}[$y]
1324	or next;
1325		1667
1326	for my $x (0 .. $#$row) {	1668	for my $widget (sort { $b->{rowspan} * $b->{colspan} <=> $a->{rowspan} * $a->{colspan} } @children) {
1327	my $widget = $row->[$x]	1669	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1328	or next;
1329	my ($w, $h) = @$widget{qw(req_w req_h)};
1330		1670
1331	$w[$x] = max $w[$x], $w;	1671	my $sw = sum @w[$c .. $c + $cs - 1];
1332	$h[$y] = max $h[$y], $h;	1672	my $sh = sum @h[$r .. $r + $rs - 1];
		1673
		1674	if ($w > $sw) {
		1675	$_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1];
		1676	}
		1677
		1678	if ($h > $sh) {
		1679	$_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1];
1333	}	1680	}
1334	}	1681	}
1335		1682
1336	(\@w, \@h)	1683	(\@w, \@h)
1337	}	1684	}
…		…
1353	my ($ws, $hs) = $self->get_wh;	1700	my ($ws, $hs) = $self->get_wh;
1354		1701
1355	my $req_w = (sum @$ws) || 1;	1702	my $req_w = (sum @$ws) || 1;
1356	my $req_h = (sum @$hs) || 1;	1703	my $req_h = (sum @$hs) || 1;
1357		1704
1358	# TODO: nicer code && do row_expand	1705	# now linearly scale the rows/columns to the allocated size
1359	my @col_expand = @{$self->{col_expand}};	1706	my @col_expand = @{$self->{col_expand}};
1360	@col_expand = (1) x @$ws unless @col_expand;	1707	@col_expand = (1) x @$ws unless @col_expand;
1361	my $col_expand = (sum @col_expand) || 1;	1708	my $col_expand = (sum @col_expand) || 1;
1362		1709
1363	# linearly scale sizes
1364	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1710	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1365	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1366		1711
1367	CFClient::UI::harmonize $ws;	1712	CFPlus::UI::harmonize $ws;
		1713
		1714	my @row_expand = @{$self->{row_expand}};
		1715	@row_expand = (1) x @$ws unless @row_expand;
		1716	my $row_expand = (sum @row_expand) || 1;
		1717
		1718	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1719
1368	CFClient::UI::harmonize $hs;	1720	CFPlus::UI::harmonize $hs;
1369		1721
1370	my $y;	1722	my (@x, @y);
1371		1723
		1724	for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1725	for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
		1726
1372	for my $r (0 .. $#{$self->{children}}) {	1727	for my $widget ($self->children) {
1373	my $row = $self->{children}[$r]	1728	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1374	or next;
1375		1729
1376	my $x = 0;	1730	$widget->configure (
1377	my $row_h = $hs->[$r];	1731	$x[$c], $y[$r],
		1732	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1378		1733	);
1379	for my $c (0 .. $#$row) {
1380	my $col_w = $ws->[$c];
1381
1382	if (my $widget = $row->[$c]) {
1383	$widget->configure ($x, $y, $col_w, $row_h);
1384	}
1385
1386	$x += $col_w;
1387	}
1388
1389	$y += $row_h;
1390	}	1734	}
1391		1735
1392	1	1736	1
1393	}	1737	}
1394		1738
…		…
1416	}	1760	}
1417	}	1761	}
1418		1762
1419	#############################################################################	1763	#############################################################################
1420		1764
1421	package CFClient::UI::Box;	1765	package CFPlus::UI::Fixed;
1422		1766
		1767	use List::Util qw(min max);
		1768
1423	our @ISA = CFClient::UI::Container::;	1769	our @ISA = CFPlus::UI::Container::;
		1770
		1771	sub add {
		1772	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1773
		1774	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1775	$self->SUPER::add ($child);
		1776	}
		1777
		1778	sub _scale($$$) {
		1779	my ($mode, $val, $max) = @_;
		1780
		1781	$mode eq "abs" ? $val
		1782	: $mode eq "rel" ? $val * $max
		1783	: 0
		1784	}
		1785
		1786	sub size_request {
		1787	my ($self) = @_;
		1788
		1789	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1790
		1791	# determine overall size by querying abs widgets
		1792	for my $child ($self->visible_children) {
		1793	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1794
		1795	if ($pos eq "abs") {
		1796	$w = _scale $size, $w, $child->{req_w};
		1797	$h = _scale $size, $h, $child->{req_h};
		1798
		1799	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1800	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1801	}
		1802	}
		1803
		1804	my $W = $x2 - $x1;
		1805	my $H = $y2 - $y1;
		1806
		1807	# now layout remaining widgets
		1808	for my $child ($self->visible_children) {
		1809	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1810
		1811	if ($pos ne "abs") {
		1812	$x = _scale $pos, $x, $W;
		1813	$y = _scale $pos, $x, $H;
		1814	$w = _scale $size, $w, $child->{req_w};
		1815	$h = _scale $size, $h, $child->{req_h};
		1816
		1817	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1818	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1819	}
		1820	}
		1821
		1822	my $W = $x2 - $x1;
		1823	my $H = $y2 - $y1;
		1824
		1825	($W, $H)
		1826	}
		1827
		1828	sub invoke_size_allocate {
		1829	my ($self, $W, $H) = @_;
		1830
		1831	for my $child ($self->visible_children) {
		1832	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1833
		1834	$x = _scale $pos, $x, $W;
		1835	$y = _scale $pos, $x, $H;
		1836	$w = _scale $size, $w, $child->{req_w};
		1837	$h = _scale $size, $h, $child->{req_h};
		1838
		1839	$child->configure ($x, $y, $w, $h);
		1840	}
		1841
		1842	1
		1843	}
		1844
		1845	#############################################################################
		1846
		1847	package CFPlus::UI::Box;
		1848
		1849	our @ISA = CFPlus::UI::Container::;
1424		1850
1425	sub size_request {	1851	sub size_request {
1426	my ($self) = @_;	1852	my ($self) = @_;
1427		1853
1428	$self->{vertical}	1854	$self->{vertical}
…		…
1461	$req[$_] += $space * $children[$_]{expand}	1887	$req[$_] += $space * $children[$_]{expand}
1462	for 0 .. $#children;	1888	for 0 .. $#children;
1463	}	1889	}
1464	}	1890	}
1465		1891
1466	CFClient::UI::harmonize \@req;	1892	CFPlus::UI::harmonize \@req;
1467		1893
1468	my $pos = 0;	1894	my $pos = 0;
1469	for (0 .. $#children) {	1895	for (0 .. $#children) {
1470	my $alloc = $req[$_];	1896	my $alloc = $req[$_];
1471	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1897	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1476	1	1902	1
1477	}	1903	}
1478		1904
1479	#############################################################################	1905	#############################################################################
1480		1906
1481	package CFClient::UI::HBox;	1907	package CFPlus::UI::HBox;
1482		1908
1483	our @ISA = CFClient::UI::Box::;	1909	our @ISA = CFPlus::UI::Box::;
1484		1910
1485	sub new {	1911	sub new {
1486	my $class = shift;	1912	my $class = shift;
1487		1913
1488	$class->SUPER::new (	1914	$class->SUPER::new (
…		…
1491	)	1917	)
1492	}	1918	}
1493		1919
1494	#############################################################################	1920	#############################################################################
1495		1921
1496	package CFClient::UI::VBox;	1922	package CFPlus::UI::VBox;
1497		1923
1498	our @ISA = CFClient::UI::Box::;	1924	our @ISA = CFPlus::UI::Box::;
1499		1925
1500	sub new {	1926	sub new {
1501	my $class = shift;	1927	my $class = shift;
1502		1928
1503	$class->SUPER::new (	1929	$class->SUPER::new (
…		…
1506	)	1932	)
1507	}	1933	}
1508		1934
1509	#############################################################################	1935	#############################################################################
1510		1936
1511	package CFClient::UI::Label;	1937	package CFPlus::UI::Label;
1512		1938
1513	our @ISA = CFClient::UI::DrawBG::;	1939	our @ISA = CFPlus::UI::DrawBG::;
1514		1940
1515	use CFClient::OpenGL;	1941	use CFPlus::OpenGL;
1516		1942
1517	sub new {	1943	sub new {
1518	my ($class, %arg) = @_;	1944	my ($class, %arg) = @_;
1519		1945
1520	my $self = $class->SUPER::new (	1946	my $self = $class->SUPER::new (
…		…
1523	#active_bg => none	1949	#active_bg => none
1524	#font => default_font	1950	#font => default_font
1525	#text => initial text	1951	#text => initial text
1526	#markup => initial narkup	1952	#markup => initial narkup
1527	#max_w => maximum pixel width	1953	#max_w => maximum pixel width
		1954	#style => 0, # render flags
1528	ellipsise => 3, # end	1955	ellipsise => 3, # end
1529	layout => (new CFClient::Layout),	1956	layout => (new CFPlus::Layout),
1530	fontsize => 1,	1957	fontsize => 1,
1531	align => -1,	1958	align => -1,
1532	valign => -1,	1959	valign => -1,
1533	padding_x => 2,	1960	padding_x => 2,
1534	padding_y => 2,	1961	padding_y => 2,
1535	can_events => 0,	1962	can_events => 0,
1536	%arg	1963	%arg
1537	);	1964	);
1538		1965
1539	if (exists $self->{template}) {	1966	if (exists $self->{template}) {
1540	my $layout = new CFClient::Layout;	1967	my $layout = new CFPlus::Layout;
1541	$layout->set_text (delete $self->{template});	1968	$layout->set_text (delete $self->{template});
1542	$self->{template} = $layout;	1969	$self->{template} = $layout;
1543	}	1970	}
1544		1971
1545	if (exists $self->{markup}) {	1972	if (exists $self->{markup}) {
…		…
1549	}	1976	}
1550		1977
1551	$self	1978	$self
1552	}	1979	}
1553		1980
1554	sub escape($) {
1555	local $_ = $_[0];
1556
1557	s/&/&amp;/g;
1558	s/>/&gt;/g;
1559	s/</&lt;/g;
1560
1561	$_
1562	}
1563
1564	sub update {	1981	sub update {
1565	my ($self) = @_;	1982	my ($self) = @_;
1566		1983
1567	delete $self->{texture};	1984	delete $self->{texture};
1568	$self->SUPER::update;	1985	$self->SUPER::update;
…		…
1579	my ($self, $text) = @_;	1996	my ($self, $text) = @_;
1580		1997
1581	return if $self->{text} eq "T$text";	1998	return if $self->{text} eq "T$text";
1582	$self->{text} = "T$text";	1999	$self->{text} = "T$text";
1583		2000
1584	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1585	$self->{layout}->set_text ($text);	2001	$self->{layout}->set_text ($text);
1586		2002
1587	delete $self->{size_req};	2003	delete $self->{size_req};
1588	$self->realloc;	2004	$self->realloc;
1589	$self->update;	2005	$self->update;
…		…
1595	return if $self->{text} eq "M$markup";	2011	return if $self->{text} eq "M$markup";
1596	$self->{text} = "M$markup";	2012	$self->{text} = "M$markup";
1597		2013
1598	my $rgba = $markup =~ /span.*(?:foreground|background)/;	2014	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1599		2015
1600	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1601	$self->{layout}->set_markup ($markup);	2016	$self->{layout}->set_markup ($markup);
1602		2017
1603	delete $self->{size_req};	2018	delete $self->{size_req};
1604	$self->realloc;	2019	$self->realloc;
1605	$self->update;	2020	$self->update;
…		…
1617		2032
1618	my ($w, $h) = $self->{layout}->size;	2033	my ($w, $h) = $self->{layout}->size;
1619		2034
1620	if (exists $self->{template}) {	2035	if (exists $self->{template}) {
1621	$self->{template}->set_font ($self->{font}) if $self->{font};	2036	$self->{template}->set_font ($self->{font}) if $self->{font};
		2037	$self->{template}->set_width ($self->{max_w} || -1);
1622	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	2038	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1623		2039
1624	my ($w2, $h2) = $self->{template}->size;	2040	my ($w2, $h2) = $self->{template}->size;
1625		2041
1626	$w = List::Util::max $w, $w2;	2042	$w = List::Util::max $w, $w2;
…		…
1631	};	2047	};
1632		2048
1633	@{ $self->{size_req} }	2049	@{ $self->{size_req} }
1634	}	2050	}
1635		2051
		2052	sub baseline_shift {
		2053	$_[0]{layout}->descent
		2054	}
		2055
1636	sub invoke_size_allocate {	2056	sub invoke_size_allocate {
1637	my ($self, $w, $h) = @_;	2057	my ($self, $w, $h) = @_;
1638		2058
1639	delete $self->{ox};	2059	delete $self->{ox};
1640		2060
…		…
1646		2066
1647	sub set_fontsize {	2067	sub set_fontsize {
1648	my ($self, $fontsize) = @_;	2068	my ($self, $fontsize) = @_;
1649		2069
1650	$self->{fontsize} = $fontsize;	2070	$self->{fontsize} = $fontsize;
		2071	delete $self->{size_req};
1651	delete $self->{texture};	2072	delete $self->{texture};
1652		2073
1653	$self->realloc;	2074	$self->realloc;
1654	}	2075	}
1655		2076
1656	sub reconfigure {	2077	sub reconfigure {
1657	my ($self) = @_;	2078	my ($self) = @_;
1658		2079
1659	delete $self->{size_req};	2080	delete $self->{size_req};
		2081	delete $self->{texture};
1660		2082
1661	$self->SUPER::reconfigure;	2083	$self->SUPER::reconfigure;
1662	}	2084	}
1663		2085
1664	sub _draw {	2086	sub _draw {
1665	my ($self) = @_;	2087	my ($self) = @_;
1666		2088
1667	$self->SUPER::_draw; # draw background, if applicable	2089	$self->SUPER::_draw; # draw background, if applicable
1668		2090
1669	my $tex = $self->{texture} ||= do {	2091	my $size = $self->{texture} ||= do {
1670	$self->{layout}->set_foreground (@{$self->{fg}});	2092	$self->{layout}->set_foreground (@{$self->{fg}});
1671	$self->{layout}->set_font ($self->{font}) if $self->{font};	2093	$self->{layout}->set_font ($self->{font}) if $self->{font};
1672	$self->{layout}->set_width ($self->{w});	2094	$self->{layout}->set_width ($self->{w});
1673	$self->{layout}->set_ellipsise ($self->{ellipsise});	2095	$self->{layout}->set_ellipsise ($self->{ellipsise});
1674	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2096	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2097	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676		2098
1677	new_from_layout CFClient::Texture $self->{layout}	2099	[$self->{layout}->size]
1678	};	2100	};
1679		2101
1680	unless (exists $self->{ox}) {	2102	unless (exists $self->{ox}) {
1681	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2103	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2104	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683	: ($self->{w} - $tex->{w}) * 0.5);	2105	: ($self->{w} - $size->[0]) * 0.5);
1684		2106
1685	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2107	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2108	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687	: ($self->{h} - $tex->{h}) * 0.5);	2109	: ($self->{h} - $size->[1]) * 0.5);
1688	};	2110	};
1689		2111
1690	glEnable GL_TEXTURE_2D;
1691
1692	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2112	my $w = List::Util::min $self->{w} + 4, $size->[0];
1693	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2113	my $h = List::Util::min $self->{h} + 2, $size->[1];
1694		2114
1695	if ($tex->{format} == GL_ALPHA) {	2115	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1696	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1697	glColor @{$self->{fg}};
1698	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1699	} else {
1700	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1702	}
1703
1704	glDisable GL_TEXTURE_2D;
1705	}	2116	}
1706		2117
1707	#############################################################################	2118	#############################################################################
1708		2119
1709	package CFClient::UI::EntryBase;	2120	package CFPlus::UI::EntryBase;
1710		2121
1711	our @ISA = CFClient::UI::Label::;	2122	our @ISA = CFPlus::UI::Label::;
1712		2123
1713	use CFClient::OpenGL;	2124	use CFPlus::OpenGL;
1714		2125
1715	sub new {	2126	sub new {
1716	my $class = shift;	2127	my $class = shift;
1717		2128
1718	$class->SUPER::new (	2129	$class->SUPER::new (
…		…
1722	active_fg => [0, 0, 0],	2133	active_fg => [0, 0, 0],
1723	can_hover => 1,	2134	can_hover => 1,
1724	can_focus => 1,	2135	can_focus => 1,
1725	valign => 0,	2136	valign => 0,
1726	can_events => 1,	2137	can_events => 1,
		2138	ellipsise => 0,
1727	#text => ...	2139	#text => ...
1728	#hidden => "*",	2140	#hidden => "*",
1729	@_	2141	@_
1730	)	2142	)
1731	}	2143	}
…		…
1776	my $sym = $ev->{sym};	2188	my $sym = $ev->{sym};
1777	my $uni = $ev->{unicode};	2189	my $uni = $ev->{unicode};
1778		2190
1779	my $text = $self->get_text;	2191	my $text = $self->get_text;
1780		2192
		2193	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2194
1781	if ($uni == 8) {	2195	if ($uni == 8) {
1782	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2196	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1783	} elsif ($uni == 127) {	2197	} elsif ($uni == 127) {
1784	substr $text, $self->{cursor}, 1, "";	2198	substr $text, $self->{cursor}, 1, "";
1785	} elsif ($sym == CFClient::SDLK_LEFT) {	2199	} elsif ($sym == CFPlus::SDLK_LEFT) {
1786	--$self->{cursor} if $self->{cursor};	2200	--$self->{cursor} if $self->{cursor};
1787	} elsif ($sym == CFClient::SDLK_RIGHT) {	2201	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1788	++$self->{cursor} if $self->{cursor} < length $self->{text};	2202	++$self->{cursor} if $self->{cursor} < length $self->{text};
1789	} elsif ($sym == CFClient::SDLK_HOME) {	2203	} elsif ($sym == CFPlus::SDLK_HOME) {
		2204	# what a hack
		2205	$self->{cursor} =
		2206	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2207	? length $1
		2208	: 0;
		2209	} elsif ($sym == CFPlus::SDLK_END) {
		2210	# uh, again
		2211	$self->{cursor} =
		2212	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2213	? $self->{cursor} + length $1
		2214	: length $self->{text};
		2215	} elsif ($uni == 21) { # ctrl-u
		2216	$text = "";
1790	$self->{cursor} = 0;	2217	$self->{cursor} = 0;
1791	} elsif ($sym == CFClient::SDLK_END) {
1792	$self->{cursor} = length $text;
1793	} elsif ($uni == 27) {	2218	} elsif ($uni == 27) {
1794	$self->emit ('escape');	2219	$self->emit ('escape');
1795	} elsif ($uni) {	2220	} elsif ($uni == 0x0d) {
		2221	substr $text, $self->{cursor}++, 0, "\012";
		2222	} elsif ($uni >= 0x20) {
1796	substr $text, $self->{cursor}++, 0, chr $uni;	2223	substr $text, $self->{cursor}++, 0, chr $uni;
1797	} else {	2224	} else {
1798	return 0;	2225	return 0;
1799	}	2226	}
1800		2227
1801	$self->_set_text ($text);	2228	$self->_set_text ($text);
1802		2229
1803	$self->realloc;	2230	$self->realloc;
		2231	$self->update;
1804		2232
1805	1	2233	1
1806	}	2234	}
1807		2235
1808	sub invoke_focus_in {	2236	sub invoke_focus_in {
…		…
1820		2248
1821	my $idx = $self->{layout}->xy_to_index ($x, $y);	2249	my $idx = $self->{layout}->xy_to_index ($x, $y);
1822		2250
1823	# byte-index to char-index	2251	# byte-index to char-index
1824	my $text = $self->{text};	2252	my $text = $self->{text};
1825	utf8::encode $text;	2253	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826	$self->{cursor} = length substr $text, 0, $idx;	2254	$self->{cursor} = length $text;
1827		2255
1828	$self->_set_text ($self->{text});	2256	$self->_set_text ($self->{text});
1829	$self->update;	2257	$self->update;
1830		2258
1831	1	2259	1
…		…
1870	utf8::encode $text;	2298	utf8::encode $text;
1871		2299
1872	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2300	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1873	}	2301	}
1874		2302
1875	glColor @{$self->{fg}};
1876	glBegin GL_LINES;	2303	glBegin GL_LINES;
1877	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2304	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1878	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2305	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1879	glEnd;	2306	glEnd;
1880	}	2307	}
1881	}	2308	}
1882		2309
		2310	#############################################################################
		2311
1883	package CFClient::UI::Entry;	2312	package CFPlus::UI::Entry;
1884		2313
1885	our @ISA = CFClient::UI::EntryBase::;	2314	our @ISA = CFPlus::UI::EntryBase::;
1886		2315
1887	use CFClient::OpenGL;	2316	use CFPlus::OpenGL;
1888		2317
1889	sub invoke_key_down {	2318	sub invoke_key_down {
1890	my ($self, $ev) = @_;	2319	my ($self, $ev) = @_;
1891		2320
1892	my $sym = $ev->{sym};	2321	my $sym = $ev->{sym};
1893		2322
1894	if ($sym == 13) {	2323	if ($ev->{uni} == 0x0d || $sym == 13) {
1895	unshift @{$self->{history}},	2324	unshift @{$self->{history}},
1896	my $txt = $self->get_text;	2325	my $txt = $self->get_text;
1897		2326
1898	$self->{history_pointer} = -1;	2327	$self->{history_pointer} = -1;
1899	$self->{history_saveback} = '';	2328	$self->{history_saveback} = '';
1900	$self->emit (activate => $txt);	2329	$self->emit (activate => $txt);
1901	$self->update;	2330	$self->update;
1902		2331
1903	} elsif ($sym == CFClient::SDLK_UP) {	2332	} elsif ($sym == CFPlus::SDLK_UP) {
1904	if ($self->{history_pointer} < 0) {	2333	if ($self->{history_pointer} < 0) {
1905	$self->{history_saveback} = $self->get_text;	2334	$self->{history_saveback} = $self->get_text;
1906	}	2335	}
1907	if (@{$self->{history} || []} > 0) {	2336	if (@{$self->{history} || []} > 0) {
1908	$self->{history_pointer}++;	2337	$self->{history_pointer}++;
…		…
1910	$self->{history_pointer} = @{$self->{history} || []} - 1;	2339	$self->{history_pointer} = @{$self->{history} || []} - 1;
1911	}	2340	}
1912	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2341	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1913	}	2342	}
1914		2343
1915	} elsif ($sym == CFClient::SDLK_DOWN) {	2344	} elsif ($sym == CFPlus::SDLK_DOWN) {
1916	$self->{history_pointer}--;	2345	$self->{history_pointer}--;
1917	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2346	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1918		2347
1919	if ($self->{history_pointer} >= 0) {	2348	if ($self->{history_pointer} >= 0) {
1920	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2349	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1929	1	2358	1
1930	}	2359	}
1931		2360
1932	#############################################################################	2361	#############################################################################
1933		2362
		2363	package CFPlus::UI::TextEdit;
		2364
		2365	our @ISA = CFPlus::UI::EntryBase::;
		2366
		2367	use CFPlus::OpenGL;
		2368
		2369	sub move_cursor_ver {
		2370	my ($self, $dy) = @_;
		2371
		2372	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2373
		2374	$y += $dy;
		2375
		2376	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2377	$self->{cursor} = $index;
		2378	delete $self->{cur_h};
		2379	$self->update;
		2380	return;
		2381	}
		2382	}
		2383
		2384	sub invoke_key_down {
		2385	my ($self, $ev) = @_;
		2386
		2387	my $sym = $ev->{sym};
		2388
		2389	if ($sym == CFPlus::SDLK_UP) {
		2390	$self->move_cursor_ver (-1);
		2391	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2392	$self->move_cursor_ver (+1);
		2393	} else {
		2394	return $self->SUPER::invoke_key_down ($ev)
		2395	}
		2396
		2397	1
		2398	}
		2399
		2400	#############################################################################
		2401
1934	package CFClient::UI::Button;	2402	package CFPlus::UI::Button;
1935		2403
1936	our @ISA = CFClient::UI::Label::;	2404	our @ISA = CFPlus::UI::Label::;
1937		2405
1938	use CFClient::OpenGL;	2406	use CFPlus::OpenGL;
1939		2407
1940	my @tex =	2408	my @tex =
1941	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2409	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1942	qw(b1_button_active.png);	2410	qw(b1_button_inactive.png b1_button_active.png);
1943		2411
1944	sub new {	2412	sub new {
1945	my $class = shift;	2413	my $class = shift;
1946		2414
1947	$class->SUPER::new (	2415	$class->SUPER::new (
1948	padding_x => 4,	2416	padding_x => 4,
1949	padding_y => 4,	2417	padding_y => 4,
1950	fg => [1, 1, 1],	2418	fg => [1.0, 1.0, 1.0],
1951	active_fg => [0, 0, 1],	2419	active_fg => [0.8, 0.8, 0.8],
1952	can_hover => 1,	2420	can_hover => 1,
1953	align => 0,	2421	align => 0,
1954	valign => 0,	2422	valign => 0,
1955	can_events => 1,	2423	can_events => 1,
1956	@_	2424	@_
…		…
1974		2442
1975	glEnable GL_TEXTURE_2D;	2443	glEnable GL_TEXTURE_2D;
1976	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2444	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1977	glColor 0, 0, 0, 1;	2445	glColor 0, 0, 0, 1;
1978		2446
		2447	my $tex = $tex[$GRAB == $self];
1979	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2448	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1980		2449
1981	glDisable GL_TEXTURE_2D;	2450	glDisable GL_TEXTURE_2D;
1982		2451
1983	$self->SUPER::_draw;	2452	$self->SUPER::_draw;
1984	}	2453	}
1985		2454
1986	#############################################################################	2455	#############################################################################
1987		2456
		2457	package CFPlus::UI::CheckBox;
		2458
		2459	our @ISA = CFPlus::UI::DrawBG::;
		2460
		2461	my @tex =
		2462	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2463	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2464
		2465	use CFPlus::OpenGL;
		2466
		2467	sub new {
		2468	my $class = shift;
		2469
		2470	$class->SUPER::new (
		2471	padding_x => 2,
		2472	padding_y => 2,
		2473	fg => [1, 1, 1],
		2474	active_fg => [1, 1, 0],
		2475	bg => [0, 0, 0, 0.2],
		2476	active_bg => [1, 1, 1, 0.5],
		2477	state => 0,
		2478	can_hover => 1,
		2479	@_
		2480	)
		2481	}
		2482
		2483	sub size_request {
		2484	my ($self) = @_;
		2485
		2486	(6) x 2
		2487	}
		2488
		2489	sub toggle {
		2490	my ($self) = @_;
		2491
		2492	$self->{state} = !$self->{state};
		2493	$self->emit (changed => $self->{state});
		2494	$self->update;
		2495	}
		2496
		2497	sub invoke_button_down {
		2498	my ($self, $ev, $x, $y) = @_;
		2499
		2500	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2501	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2502	$self->toggle;
		2503	} else {
		2504	return 0
		2505	}
		2506
		2507	1
		2508	}
		2509
		2510	sub _draw {
		2511	my ($self) = @_;
		2512
		2513	$self->SUPER::_draw;
		2514
		2515	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2516
		2517	my ($w, $h) = @$self{qw(w h)};
		2518
		2519	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2520
		2521	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2522
		2523	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2524
		2525	glEnable GL_TEXTURE_2D;
		2526	$tex->draw_quad_alpha (0, 0, $s, $s);
		2527	glDisable GL_TEXTURE_2D;
		2528	}
		2529
		2530	#############################################################################
		2531
		2532	package CFPlus::UI::Image;
		2533
		2534	our @ISA = CFPlus::UI::Base::;
		2535
		2536	use CFPlus::OpenGL;
		2537
		2538	our %texture_cache;
		2539
		2540	sub new {
		2541	my $class = shift;
		2542
		2543	my $self = $class->SUPER::new (
		2544	can_events => 0,
		2545	@_,
		2546	);
		2547
		2548	$self->{path} || $self->{tex}
		2549	or Carp::croak "'path' or 'tex' attributes required";
		2550
		2551	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2552	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2553
		2554	CFPlus::weaken $texture_cache{$self->{path}};
		2555
		2556	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2557
		2558	$self
		2559	}
		2560
		2561	sub STORABLE_freeze {
		2562	my ($self, $cloning) = @_;
		2563
		2564	$self->{path}
		2565	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2566
		2567	$self->{path}
		2568	}
		2569
		2570	sub STORABLE_attach {
		2571	my ($self, $cloning, $path) = @_;
		2572
		2573	$self->new (path => $path)
		2574	}
		2575
		2576	sub size_request {
		2577	my ($self) = @_;
		2578
		2579	($self->{tex}{w}, $self->{tex}{h})
		2580	}
		2581
		2582	sub _draw {
		2583	my ($self) = @_;
		2584
		2585	my $tex = $self->{tex};
		2586
		2587	my ($w, $h) = ($self->{w}, $self->{h});
		2588
		2589	if ($self->{rot90}) {
		2590	glRotate 90, 0, 0, 1;
		2591	glTranslate 0, -$self->{w}, 0;
		2592
		2593	($w, $h) = ($h, $w);
		2594	}
		2595
		2596	glEnable GL_TEXTURE_2D;
		2597	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2598
		2599	$tex->draw_quad (0, 0, $w, $h);
		2600
		2601	glDisable GL_TEXTURE_2D;
		2602	}
		2603
		2604	#############################################################################
		2605
1988	package CFClient::UI::ImageButton;	2606	package CFPlus::UI::ImageButton;
1989		2607
1990	our @ISA = CFClient::UI::Image::;	2608	our @ISA = CFPlus::UI::Image::;
1991		2609
1992	use CFClient::OpenGL;	2610	use CFPlus::OpenGL;
1993		2611
1994	my %textures;	2612	my %textures;
1995		2613
1996	sub new {	2614	sub new {
1997	my $class = shift;	2615	my $class = shift;
…		…
2019	1	2637	1
2020	}	2638	}
2021		2639
2022	#############################################################################	2640	#############################################################################
2023		2641
2024	package CFClient::UI::CheckBox;
2025
2026	our @ISA = CFClient::UI::DrawBG::;
2027
2028	my @tex =
2029	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2030	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2031
2032	use CFClient::OpenGL;
2033
2034	sub new {
2035	my $class = shift;
2036
2037	$class->SUPER::new (
2038	padding_x => 2,
2039	padding_y => 2,
2040	fg => [1, 1, 1],
2041	active_fg => [1, 1, 0],
2042	bg => [0, 0, 0, 0.2],
2043	active_bg => [1, 1, 1, 0.5],
2044	state => 0,
2045	can_hover => 1,
2046	@_
2047	)
2048	}
2049
2050	sub size_request {
2051	my ($self) = @_;
2052
2053	(6) x 2
2054	}
2055
2056	sub invoke_button_down {
2057	my ($self, $ev, $x, $y) = @_;
2058
2059	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2060	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2061	$self->{state} = !$self->{state};
2062	$self->emit (changed => $self->{state});
2063	} else {
2064	return 0
2065	}
2066
2067	1
2068	}
2069
2070	sub _draw {
2071	my ($self) = @_;
2072
2073	$self->SUPER::_draw;
2074
2075	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2076
2077	my ($w, $h) = @$self{qw(w h)};
2078
2079	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2080
2081	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2082
2083	my $tex = $self->{state} ? $tex[1] : $tex[0];
2084
2085	glEnable GL_TEXTURE_2D;
2086	$tex->draw_quad_alpha (0, 0, $s, $s);
2087	glDisable GL_TEXTURE_2D;
2088	}
2089
2090	#############################################################################
2091
2092	package CFClient::UI::Image;	2642	package CFPlus::UI::VGauge;
2093		2643
2094	our @ISA = CFClient::UI::Base::;	2644	our @ISA = CFPlus::UI::Base::;
2095
2096	use CFClient::OpenGL;
2097
2098	our %texture_cache;
2099
2100	sub new {
2101	my $class = shift;
2102
2103	my $self = $class->SUPER::new (
2104	can_events => 0,
2105	@_,
2106	);
2107
2108	$self->{path}
2109	or Carp::croak "required attribute 'path' not set";
2110
2111	$self->{tex} = $texture_cache{$self->{path}} ||=
2112	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2113
2114	Scalar::Util::weaken $texture_cache{$self->{path}};
2115
2116	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2117
2118	$self
2119	}
2120
2121	sub size_request {
2122	my ($self) = @_;
2123
2124	($self->{tex}{w}, $self->{tex}{h})
2125	}
2126
2127	sub _draw {
2128	my ($self) = @_;
2129
2130	my $tex = $self->{tex};
2131
2132	my ($w, $h) = ($self->{w}, $self->{h});
2133
2134	if ($self->{rot90}) {
2135	glRotate 90, 0, 0, 1;
2136	glTranslate 0, -$self->{w}, 0;
2137
2138	($w, $h) = ($h, $w);
2139	}
2140
2141	glEnable GL_TEXTURE_2D;
2142	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2143
2144	$tex->draw_quad_alpha (0, 0, $w, $h);
2145
2146	glDisable GL_TEXTURE_2D;
2147	}
2148
2149	#############################################################################
2150
2151	package CFClient::UI::VGauge;
2152
2153	our @ISA = CFClient::UI::Base::;
2154		2645
2155	use List::Util qw(min max);	2646	use List::Util qw(min max);
2156		2647
2157	use CFClient::OpenGL;	2648	use CFPlus::OpenGL;
2158		2649
2159	my %tex = (	2650	my %tex = (
2160	food => [	2651	food => [
2161	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2652	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2162	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2653	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2163	],	2654	],
2164	grace => [	2655	grace => [
2165	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2656	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2166	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2657	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2167	],	2658	],
2168	hp => [	2659	hp => [
2169	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2660	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2170	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2661	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2171	],	2662	],
2172	mana => [	2663	mana => [
2173	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2664	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2174	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2665	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2175	],	2666	],
2176	);	2667	);
2177		2668
2178	# eg. VGauge->new (gauge => 'food'), default gauge: food	2669	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2238	my $ycut1 = max 0, min 1, $ycut;	2729	my $ycut1 = max 0, min 1, $ycut;
2239	my $ycut2 = max 0, min 1, $ycut - 1;	2730	my $ycut2 = max 0, min 1, $ycut - 1;
2240		2731
2241	my $h1 = $self->{h} * (1 - $ycut1);	2732	my $h1 = $self->{h} * (1 - $ycut1);
2242	my $h2 = $self->{h} * (1 - $ycut2);	2733	my $h2 = $self->{h} * (1 - $ycut2);
		2734	my $h3 = $self->{h};
		2735
		2736	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2243		2737
2244	glEnable GL_BLEND;	2738	glEnable GL_BLEND;
2245	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2739	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2246	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2740	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2247	glEnable GL_TEXTURE_2D;	2741	glEnable GL_TEXTURE_2D;
…		…
2266		2760
2267	if ($t3) {	2761	if ($t3) {
2268	glBindTexture GL_TEXTURE_2D, $t3->{name};	2762	glBindTexture GL_TEXTURE_2D, $t3->{name};
2269	glBegin GL_QUADS;	2763	glBegin GL_QUADS;
2270	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2764	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2271	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2765	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2272	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2766	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2273	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2767	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2274	glEnd;	2768	glEnd;
2275	}	2769	}
2276		2770
2277	glDisable GL_BLEND;	2771	glDisable GL_BLEND;
2278	glDisable GL_TEXTURE_2D;	2772	glDisable GL_TEXTURE_2D;
2279	}	2773	}
2280		2774
2281	#############################################################################	2775	#############################################################################
2282		2776
2283	package CFClient::UI::Gauge;	2777	package CFPlus::UI::Gauge;
2284		2778
2285	our @ISA = CFClient::UI::VBox::;	2779	our @ISA = CFPlus::UI::VBox::;
2286		2780
2287	sub new {	2781	sub new {
2288	my ($class, %arg) = @_;	2782	my ($class, %arg) = @_;
2289		2783
2290	my $self = $class->SUPER::new (	2784	my $self = $class->SUPER::new (
…		…
2292	can_hover => 1,	2786	can_hover => 1,
2293	can_events => 1,	2787	can_events => 1,
2294	%arg,	2788	%arg,
2295	);	2789	);
2296		2790
2297	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2791	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2298	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2792	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2299	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2793	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2300		2794
2301	$self	2795	$self
2302	}	2796	}
2303		2797
2304	sub set_fontsize {	2798	sub set_fontsize {
…		…
2325	$self->{value}->set_text ($val);	2819	$self->{value}->set_text ($val);
2326	}	2820	}
2327		2821
2328	#############################################################################	2822	#############################################################################
2329		2823
2330	package CFClient::UI::Slider;	2824	package CFPlus::UI::Slider;
2331		2825
2332	use strict;	2826	use strict;
2333		2827
2334	use CFClient::OpenGL;	2828	use CFPlus::OpenGL;
2335		2829
2336	our @ISA = CFClient::UI::DrawBG::;	2830	our @ISA = CFPlus::UI::DrawBG::;
2337		2831
2338	my @tex =	2832	my @tex =
2339	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2833	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2340	qw(s1_slider.png s1_slider_bg.png);	2834	qw(s1_slider.png s1_slider_bg.png);
2341		2835
2342	sub new {	2836	sub new {
2343	my $class = shift;	2837	my $class = shift;
2344		2838
…		…
2433	}	2927	}
2434		2928
2435	1	2929	1
2436	}	2930	}
2437		2931
		2932	sub invoke_mouse_wheel {
		2933	my ($self, $ev) = @_;
		2934
		2935	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2936
		2937	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2938
		2939	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2940
		2941	! ! $delta
		2942	}
		2943
2438	sub update {	2944	sub update {
2439	my ($self) = @_;	2945	my ($self) = @_;
2440		2946
2441	delete $self->{knob_w};	2947	delete $self->{knob_w};
2442	$self->SUPER::update;	2948	$self->SUPER::update;
…		…
2489	glDisable GL_TEXTURE_2D;	2995	glDisable GL_TEXTURE_2D;
2490	}	2996	}
2491		2997
2492	#############################################################################	2998	#############################################################################
2493		2999
2494	package CFClient::UI::ValSlider;	3000	package CFPlus::UI::ValSlider;
2495		3001
2496	our @ISA = CFClient::UI::HBox::;	3002	our @ISA = CFPlus::UI::HBox::;
2497		3003
2498	sub new {	3004	sub new {
2499	my ($class, %arg) = @_;	3005	my ($class, %arg) = @_;
2500		3006
2501	my $range = delete $arg{range};	3007	my $range = delete $arg{range};
2502		3008
2503	my $self = $class->SUPER::new (	3009	my $self = $class->SUPER::new (
2504	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3010	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2505	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3011	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2506	to_value => sub { shift },	3012	to_value => sub { shift },
2507	from_value => sub { shift },	3013	from_value => sub { shift },
2508	%arg,	3014	%arg,
2509	);	3015	);
2510		3016
…		…
2530	sub set_range { shift->{slider}->set_range (@_) }	3036	sub set_range { shift->{slider}->set_range (@_) }
2531	sub set_value { shift->{slider}->set_value (@_) }	3037	sub set_value { shift->{slider}->set_value (@_) }
2532		3038
2533	#############################################################################	3039	#############################################################################
2534		3040
2535	package CFClient::UI::TextScroller;	3041	package CFPlus::UI::TextScroller;
2536		3042
2537	our @ISA = CFClient::UI::HBox::;	3043	our @ISA = CFPlus::UI::HBox::;
2538		3044
2539	use CFClient::OpenGL;	3045	use CFPlus::OpenGL;
2540		3046
2541	sub new {	3047	sub new {
2542	my $class = shift;	3048	my $class = shift;
2543		3049
2544	my $self = $class->SUPER::new (	3050	my $self = $class->SUPER::new (
2545	fontsize => 1,	3051	fontsize => 1,
2546	can_events => 0,	3052	can_events => 1,
2547	indent => 0,	3053	indent => 0,
2548	#font => default_font	3054	#font => default_font
2549	@_,	3055	@_,
2550		3056
2551	layout => (new CFClient::Layout 1),	3057	layout => (new CFPlus::Layout),
2552	par => [],	3058	par => [],
		3059	max_par => 0,
2553	height => 0,	3060	height => 0,
2554	children => [	3061	children => [
2555	(new CFClient::UI::Empty expand => 1),	3062	(new CFPlus::UI::Empty expand => 1),
2556	(new CFClient::UI::Slider vertical => 1),	3063	(new CFPlus::UI::Slider vertical => 1),
2557	],	3064	],
2558	);	3065	);
2559		3066
2560	$self->{children}[1]->connect (changed => sub { $self->update });	3067	$self->{children}[1]->connect (changed => sub { $self->update });
2561		3068
…		…
2567		3074
2568	$self->{fontsize} = $fontsize;	3075	$self->{fontsize} = $fontsize;
2569	$self->reflow;	3076	$self->reflow;
2570	}	3077	}
2571		3078
2572	sub visible_children {	3079	sub size_request {
2573	my ($self) = @_;	3080	my ($self) = @_;
2574		3081
2575	@{$self->{children}}[0,1]	3082	my ($empty, $slider) = @{ $self->{children} };
		3083
		3084	local $self->{children} = [$empty, $slider];
		3085	$self->SUPER::size_request
2576	}	3086	}
2577		3087
2578	sub invoke_size_allocate {	3088	sub invoke_size_allocate {
2579	my ($self, $w, $h) = @_;	3089	my ($self, $w, $h) = @_;
2580		3090
2581	my (undef, undef, @other) = @{ $self->{children} };	3091	my ($empty, $slider, @other) = @{ $self->{children} };
2582	$_->configure (@$_{qw(x y req_w req_h)}) for @other;	3092	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2583		3093
2584	$self->{layout}->set_font ($self->{font}) if $self->{font};	3094	$self->{layout}->set_font ($self->{font}) if $self->{font};
2585	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	3095	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2586	$self->{layout}->set_width ($self->{children}[0]{w});	3096	$self->{layout}->set_width ($empty->{w});
2587	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3097	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2588		3098
2589	$self->reflow;	3099	$self->reflow;
2590		3100
		3101	local $self->{children} = [$empty, $slider];
2591	$self->SUPER::invoke_size_allocate ($w, $h)	3102	$self->SUPER::invoke_size_allocate ($w, $h)
		3103	}
		3104
		3105	sub invoke_mouse_wheel {
		3106	my ($self, $ev) = @_;
		3107
		3108	return 0 unless $ev->{dy}; # only vertical movements
		3109
		3110	$self->{children}[1]->emit (mouse_wheel => $ev);
		3111
		3112	1
2592	}	3113	}
2593		3114
2594	sub get_layout {	3115	sub get_layout {
2595	my ($self, $para) = @_;	3116	my ($self, $para) = @_;
2596		3117
2597	my $layout = $self->{layout};	3118	my $layout = $self->{layout};
2598		3119
2599	$layout->set_font ($self->{font}) if $self->{font};	3120	$layout->set_font ($self->{font}) if $self->{font};
		3121	$layout->set_foreground (@{$para->{fg}});
2600	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	3122	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2601	$layout->set_width ($self->{children}[0]{w} - $para->{indent});	3123	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2602	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3124	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2603	$layout->set_markup ($para->{markup});	3125	$layout->set_markup ($para->{markup});
2604	$layout->set_shapes (map +($_->{req_w}, $_->{req_h}), @{$para->{widget}});	3126
		3127	$layout->set_shapes (
		3128	map
		3129	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		3130	@{$para->{widget}}
		3131	);
2605		3132
2606	$layout	3133	$layout
2607	}	3134	}
2608		3135
2609	sub reflow {	3136	sub reflow {
…		…
2616	sub set_offset {	3143	sub set_offset {
2617	my ($self, $offset) = @_;	3144	my ($self, $offset) = @_;
2618		3145
2619	# todo: base offset on lines or so, not on pixels	3146	# todo: base offset on lines or so, not on pixels
2620	$self->{children}[1]->set_value ($offset);	3147	$self->{children}[1]->set_value ($offset);
		3148	}
		3149
		3150	sub current_paragraph {
		3151	my ($self) = @_;
		3152
		3153	$self->{top_paragraph} - 1
		3154	}
		3155
		3156	sub scroll_to {
		3157	my ($self, $para) = @_;
		3158
		3159	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3160
		3161	$self->{scroll_to} = $para;
		3162	$self->update;
2621	}	3163	}
2622		3164
2623	sub clear {	3165	sub clear {
2624	my ($self) = @_;	3166	my ($self) = @_;
2625		3167
…		…
2630	$self->{height} = 0;	3172	$self->{height} = 0;
2631	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3173	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2632	}	3174	}
2633		3175
2634	sub add_paragraph {	3176	sub add_paragraph {
2635	my ($self, $color, $para, $indent) = @_;	3177	my $self = shift;
2636		3178
2637	my ($text, @w) = ref $para ? @$para : $para;	3179	for my $para (@_) {
2638
2639	$para = {	3180	$para = {
		3181	fg => [1, 1, 1, 1],
		3182	indent => 0,
		3183	markup => "",
		3184	widget => [],
		3185	ref $para ? %$para : (markup => $para),
2640	w => 1e10,	3186	w => 1e10,
2641	wrapped => 1,	3187	wrapped => 1,
2642	fg => $color,
2643	indent => $indent,
2644	markup => $text,
2645	widget => \@w,
2646	};	3188	};
2647		3189
2648	$self->add (@w) if @w;	3190	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2649	push @{$self->{par}}, $para;	3191	push @{$self->{par}}, $para;
		3192	}
		3193
		3194	if (my $max = $self->{max_par}) {
		3195	shift @{$self->{par}} while @{$self->{par}} > $max;
		3196	}
2650		3197
2651	$self->{need_reflow}++;	3198	$self->{need_reflow}++;
2652	$self->update;	3199	$self->update;
2653	}	3200	}
2654		3201
2655	sub scroll_to_bottom {	3202	sub scroll_to_bottom {
2656	my ($self) = @_;	3203	my ($self) = @_;
2657		3204
2658	$self->{scroll_to_bottom} = 1;	3205	$self->{scroll_to} = $#{$self->{par}};
2659	$self->update;	3206	$self->update;
2660	}	3207	}
2661		3208
		3209	sub force_uptodate {
		3210	my ($self) = @_;
		3211
		3212	if (delete $self->{need_reflow}) {
		3213	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3214
		3215	my $height = 0;
		3216
		3217	for my $para (@{$self->{par}}) {
		3218	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3219	my $layout = $self->get_layout ($para);
		3220	my ($w, $h) = $layout->size;
		3221
		3222	$para->{w} = $w + $para->{indent};
		3223	$para->{h} = $h;
		3224	$para->{wrapped} = $layout->has_wrapped;
		3225	}
		3226
		3227	$para->{y} = $height;
		3228	$height += $para->{h};
		3229	}
		3230
		3231	$self->{height} = $height;
		3232	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3233
		3234	delete $self->{texture};
		3235	}
		3236
		3237	if (my $paridx = delete $self->{scroll_to}) {
		3238	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3239	}
		3240	}
		3241
2662	sub update {	3242	sub update {
2663	my ($self) = @_;	3243	my ($self) = @_;
2664		3244
2665	$self->SUPER::update;	3245	$self->SUPER::update;
2666		3246
2667	return unless $self->{h} > 0;	3247	return unless $self->{h} > 0;
2668		3248
2669	delete $self->{texture};	3249	delete $self->{texture};
2670		3250
2671	$ROOT->on_post_alloc ($self => sub {	3251	$ROOT->on_post_alloc ($self => sub {
		3252	$self->force_uptodate;
		3253
2672	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3254	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2673		3255
2674	if (delete $self->{need_reflow}) {
2675	my $height = 0;
2676
2677	for my $para (@{$self->{par}}) {
2678	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2679	my $layout = $self->get_layout ($para);
2680	my ($w, $h) = $layout->size;
2681
2682	$para->{w} = $w + $para->{indent};
2683	$para->{h} = $h;
2684	$para->{wrapped} = $layout->has_wrapped;
2685	}
2686
2687	$height += $para->{h};
2688	}
2689
2690	$self->{height} = $height;
2691
2692	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2693
2694	delete $self->{texture};
2695	}
2696
2697	if (delete $self->{scroll_to_bottom}) {
2698	$self->{children}[1]->set_value (1e10);
2699	}
2700
2701	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3256	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2702	glClearColor 0, 0, 0, 0;	3257	glClearColor 0, 0, 0, 0;
2703	glClear GL_COLOR_BUFFER_BIT;	3258	glClear GL_COLOR_BUFFER_BIT;
2704		3259
		3260	package CFPlus::UI::Base;
		3261	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3262	(0, 0, $self->{w}, $self->{h});
		3263
		3264	my $top = int $self->{children}[1]{range}[0];
		3265
		3266	my $paridx = 0;
		3267	my $top_paragraph;
2705	my $top = int $self->{children}[1]{range}[0];	3268	my $top = int $self->{children}[1]{range}[0];
2706		3269
2707	my $y0 = $top;	3270	my $y0 = $top;
2708	my $y1 = $top + $H;	3271	my $y1 = $top + $H;
2709		3272
2710	my $y = 0;
2711
2712	glEnable GL_BLEND;
2713	#TODO# not correct in windows where rgba is forced off
2714	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2715
2716	for my $para (@{$self->{par}}) {	3273	for my $para (@{$self->{par}}) {
2717	my $h = $para->{h};	3274	my $h = $para->{h};
		3275	my $y = $para->{y};
2718		3276
2719	if ($y0 < $y + $h && $y < $y1) {	3277	if ($y0 < $y + $h && $y < $y1) {
2720
2721	my $layout = $self->get_layout ($para);	3278	my $layout = $self->get_layout ($para);
2722		3279
2723	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2724
2725	glRasterPos $para->{indent}, $y - $y0;	3280	$layout->render ($para->{indent}, $y - $y0);
2726	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2727		3281
2728	if (my @w = @{ $para->{widget} }) {	3282	if (my @w = @{ $para->{widget} }) {
2729	my @s = $layout->get_shapes;	3283	my @s = $layout->get_shapes;
2730		3284
2731	for (@w) {	3285	for (@w) {
…		…
2737	$_->draw;	3291	$_->draw;
2738	}	3292	}
2739	}	3293	}
2740	}	3294	}
2741		3295
2742	$y += $h;	3296	$paridx++;
		3297	$top_paragraph ||= $paridx if $y >= $top;
2743	}	3298	}
2744		3299
2745	glDisable GL_BLEND;	3300	$self->{top_paragraph} = $top_paragraph;
2746	};	3301	};
2747	});	3302	});
2748	}	3303	}
2749		3304
2750	sub reconfigure {	3305	sub reconfigure {
…		…
2768	$self->{children}[1]->draw;	3323	$self->{children}[1]->draw;
2769	}	3324	}
2770		3325
2771	#############################################################################	3326	#############################################################################
2772		3327
2773	package CFClient::UI::Animator;	3328	package CFPlus::UI::Animator;
2774		3329
2775	use CFClient::OpenGL;	3330	use CFPlus::OpenGL;
2776		3331
2777	our @ISA = CFClient::UI::Bin::;	3332	our @ISA = CFPlus::UI::Bin::;
2778		3333
2779	sub moveto {	3334	sub moveto {
2780	my ($self, $x, $y) = @_;	3335	my ($self, $x, $y) = @_;
2781		3336
2782	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3337	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2810	glPopMatrix;	3365	glPopMatrix;
2811	}	3366	}
2812		3367
2813	#############################################################################	3368	#############################################################################
2814		3369
2815	package CFClient::UI::Flopper;	3370	package CFPlus::UI::Flopper;
2816		3371
2817	our @ISA = CFClient::UI::Button::;	3372	our @ISA = CFPlus::UI::Button::;
2818		3373
2819	sub new {	3374	sub new {
2820	my $class = shift;	3375	my $class = shift;
2821		3376
2822	my $self = $class->SUPER::new (	3377	my $self = $class->SUPER::new (
…		…
2834	$self->{other}->toggle_visibility;	3389	$self->{other}->toggle_visibility;
2835	}	3390	}
2836		3391
2837	#############################################################################	3392	#############################################################################
2838		3393
2839	package CFClient::UI::Tooltip;	3394	package CFPlus::UI::Tooltip;
2840		3395
2841	our @ISA = CFClient::UI::Bin::;	3396	our @ISA = CFPlus::UI::Bin::;
2842		3397
2843	use CFClient::OpenGL;	3398	use CFPlus::OpenGL;
2844		3399
2845	sub new {	3400	sub new {
2846	my $class = shift;	3401	my $class = shift;
2847		3402
2848	$class->SUPER::new (	3403	$class->SUPER::new (
…		…
2851	)	3406	)
2852	}	3407	}
2853		3408
2854	sub set_tooltip_from {	3409	sub set_tooltip_from {
2855	my ($self, $widget) = @_;	3410	my ($self, $widget) = @_;
		3411
		3412	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3413	if $widget->{tooltip} =~ /^#(.*)$/;
2856		3414
2857	my $tooltip = $widget->{tooltip};	3415	my $tooltip = $widget->{tooltip};
2858		3416
2859	if ($ENV{CFPLUS_DEBUG} & 2) {	3417	if ($ENV{CFPLUS_DEBUG} & 2) {
2860	$tooltip .= "\n\n" . (ref $widget) . "\n"	3418	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2864	}	3422	}
2865		3423
2866	$tooltip =~ s/^\n+//;	3424	$tooltip =~ s/^\n+//;
2867	$tooltip =~ s/\n+$//;	3425	$tooltip =~ s/\n+$//;
2868		3426
2869	$self->add (new CFClient::UI::Label	3427	$self->add (new CFPlus::UI::Label
2870	markup => $tooltip,	3428	markup => $tooltip,
2871	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3429	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2872	fontsize => 0.8,	3430	fontsize => 0.8,
2873	fg => [0, 0, 0, 1],	3431	style => 1, # FLAG_INVERSE
2874	ellipsise => 0,	3432	ellipsise => 0,
2875	font => ($widget->{tooltip_font} || $::FONT_PROP),	3433	font => ($widget->{tooltip_font} || $::FONT_PROP),
2876	);	3434	);
2877	}	3435	}
2878		3436
…		…
2897		3455
2898	$self->{root}->on_post_alloc ("move_$self" => sub {	3456	$self->{root}->on_post_alloc ("move_$self" => sub {
2899	my $widget = $self->{owner}	3457	my $widget = $self->{owner}
2900	or return;	3458	or return;
2901		3459
		3460	if ($widget->{visible}) {
2902	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3461	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2903		3462
2904	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3463	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2905	if $x + $self->{w} > $self->{root}{w};	3464	if $x + $self->{w} > $self->{root}{w};
2906		3465
2907	$self->move_abs ($x, $y);	3466	$self->move_abs ($x, $y);
		3467	} else {
		3468	$self->hide;
		3469	}
2908	});	3470	});
2909	}	3471	}
2910		3472
2911	sub _draw {	3473	sub _draw {
2912	my ($self) = @_;	3474	my ($self) = @_;
…		…
2936	$self->SUPER::_draw;	3498	$self->SUPER::_draw;
2937	}	3499	}
2938		3500
2939	#############################################################################	3501	#############################################################################
2940		3502
2941	package CFClient::UI::Face;	3503	package CFPlus::UI::Face;
2942		3504
2943	our @ISA = CFClient::UI::Base::;	3505	our @ISA = CFPlus::UI::DrawBG::;
2944		3506
2945	use CFClient::OpenGL;	3507	use CFPlus::OpenGL;
2946		3508
2947	sub new {	3509	sub new {
2948	my $class = shift;	3510	my $class = shift;
2949		3511
2950	my $self = $class->SUPER::new (	3512	my $self = $class->SUPER::new (
		3513	size_w => 32,
		3514	size_h => 8,
2951	aspect => 1,	3515	aspect => 1,
2952	can_events => 0,	3516	can_events => 0,
2953	@_,	3517	@_,
2954	);	3518	);
2955		3519
2956	if ($self->{anim} && $self->{animspeed}) {	3520	if ($self->{anim} && $self->{animspeed}) {
2957	Scalar::Util::weaken (my $widget = $self);	3521	CFPlus::weaken (my $widget = $self);
2958		3522
		3523	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3524	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2959	$self->{timer} = Event->timer (	3525	$self->{timer} = Event->timer (
2960	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2961	hard => 1,	3526	parked => 1,
2962	interval => $self->{animspeed},
2963	cb => sub {	3527	cb => sub {
		3528	return unless $::CONN && $widget;
		3529
2964	++$widget->{frame};	3530	++$widget->{frame};
		3531	$widget->update_face;
2965	$widget->update;	3532	$widget->update;
		3533
		3534	$widget->update_timer;
2966	},	3535	},
2967	);	3536	);
		3537
		3538	$self->update_face;
		3539	$self->update_timer;
2968	}	3540	}
2969		3541
2970	$self	3542	$self
2971	}	3543	}
2972		3544
		3545	sub update_timer {
		3546	my ($self) = @_;
		3547
		3548	return unless $self->{timer};
		3549
		3550	if ($self->{visible}) {
		3551	$self->{timer}->at (
		3552	$self->{anim_start}
		3553	+ $self->{animspeed}
		3554	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3555	);
		3556	$self->{timer}->start;
		3557	} else {
		3558	$self->{timer}->stop;
		3559	}
		3560	}
		3561
		3562	sub update_face {
		3563	my ($self) = @_;
		3564
		3565	return unless $::CONN;
		3566
		3567	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3568	if ($anim && @$anim) {
		3569	delete $self->{wait_face};
		3570	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3571	}
		3572	}
		3573	}
		3574
2973	sub size_request {	3575	sub size_request {
2974	(32, 8)	3576	my ($self) = @_;
		3577
		3578	if ($::CONN) {
		3579	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3580	if (my $tex = $::CONN->{texture}[$faceid]) {
		3581	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3582	} else {
		3583	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3584	$self->realloc;
		3585	});
		3586	}
		3587	}
		3588	}
		3589
		3590	($self->{size_w} || 8, $self->{size_h} || 8)
2975	}	3591	}
2976		3592
2977	sub update {	3593	sub update {
2978	my ($self) = @_;	3594	my ($self) = @_;
2979		3595
2980	return unless $self->{visible};	3596	return unless $self->{visible};
2981		3597
2982	$self->SUPER::update;	3598	$self->SUPER::update;
2983	}	3599	}
2984		3600
		3601	sub invoke_visibility_change {
		3602	my ($self) = @_;
		3603
		3604	$self->update_timer;
		3605
		3606	0
		3607	}
		3608
2985	sub _draw {	3609	sub _draw {
2986	my ($self) = @_;	3610	my ($self) = @_;
2987		3611
2988	return unless $::CONN;	3612	return unless $::CONN;
2989		3613
2990	my $face;	3614	$self->SUPER::_draw;
2991		3615
2992	if ($self->{frame}) {
2993	my $anim = $::CONN->{anim}[$self->{anim}];	3616	my $faceid = $::CONN->{faceid}[$self->{face}]
2994		3617	or return;
2995	$face = $anim->[ $self->{frame} % @$anim ]
2996	if $anim && @$anim;
2997	}
2998		3618
2999	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3619	my $tex = $::CONN->{texture}[$faceid];
3000		3620
3001	if ($tex) {	3621	if ($tex) {
3002	glEnable GL_TEXTURE_2D;	3622	glEnable GL_TEXTURE_2D;
3003	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3623	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3004	glColor 0, 0, 0, 1;	3624	glColor 0, 0, 0, 1;
…		…
3008	}	3628	}
3009		3629
3010	sub destroy {	3630	sub destroy {
3011	my ($self) = @_;	3631	my ($self) = @_;
3012		3632
3013	$self->{timer}->cancel	3633	(delete $self->{timer})->cancel
3014	if $self->{timer};	3634	if $self->{timer};
3015		3635
3016	$self->SUPER::destroy;	3636	$self->SUPER::destroy;
3017	}	3637	}
3018		3638
3019	#############################################################################	3639	#############################################################################
3020		3640
3021	package CFClient::UI::Buttonbar;	3641	package CFPlus::UI::Buttonbar;
3022		3642
3023	our @ISA = CFClient::UI::HBox::;	3643	our @ISA = CFPlus::UI::HBox::;
3024		3644
3025	# TODO: should actualyl wrap buttons and other goodies.	3645	# TODO: should actually wrap buttons and other goodies.
3026		3646
3027	#############################################################################	3647	#############################################################################
3028		3648
3029	package CFClient::UI::Menu;	3649	package CFPlus::UI::Menu;
3030		3650
3031	our @ISA = CFClient::UI::FancyFrame::;	3651	our @ISA = CFPlus::UI::Toplevel::;
3032		3652
3033	use CFClient::OpenGL;	3653	use CFPlus::OpenGL;
3034		3654
3035	sub new {	3655	sub new {
3036	my $class = shift;	3656	my $class = shift;
3037		3657
3038	my $self = $class->SUPER::new (	3658	my $self = $class->SUPER::new (
3039	items => [],	3659	items => [],
3040	z => 100,	3660	z => 100,
3041	@_,	3661	@_,
3042	);	3662	);
3043		3663
3044	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3664	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3045		3665
3046	for my $item (@{ $self->{items} }) {	3666	for my $item (@{ $self->{items} }) {
3047	my ($widget, $cb, $tooltip) = @$item;	3667	my ($widget, $cb, $tooltip) = @$item;
3048		3668
3049	# handle various types of items, only text for now	3669	# handle various types of items, only text for now
3050	if (!ref $widget) {	3670	if (!ref $widget) {
		3671	if ($widget =~ /\t/) {
		3672	my ($left, $right) = split /\t/, $widget, 2;
		3673
3051	$widget = new CFClient::UI::Label	3674	$widget = new CFPlus::UI::HBox
3052	can_hover => 1,	3675	can_hover => 1,
3053	can_events => 1,	3676	can_events => 1,
		3677	tooltip => $tooltip,
		3678	children => [
		3679	(new CFPlus::UI::Label markup => $left, expand => 1),
		3680	(new CFPlus::UI::Label markup => $right, align => +1),
		3681	],
		3682	;
		3683
		3684	} else {
		3685	$widget = new CFPlus::UI::Label
		3686	can_hover => 1,
		3687	can_events => 1,
3054	markup => $widget,	3688	markup => $widget,
3055	tooltip => $tooltip	3689	tooltip => $tooltip;
		3690	}
3056	}	3691	}
3057		3692
3058	$self->{item}{$widget} = $item;	3693	$self->{item}{$widget} = $item;
3059		3694
3060	$self->{vbox}->add ($widget);	3695	$self->{vbox}->add ($widget);
…		…
3103	1	3738	1
3104	}	3739	}
3105		3740
3106	#############################################################################	3741	#############################################################################
3107		3742
3108	package CFClient::UI::Multiplexer;	3743	package CFPlus::UI::Multiplexer;
3109		3744
3110	our @ISA = CFClient::UI::Container::;	3745	our @ISA = CFPlus::UI::Container::;
3111		3746
3112	sub new {	3747	sub new {
3113	my $class = shift;	3748	my $class = shift;
3114		3749
3115	my $self = $class->SUPER::new (	3750	my $self = $class->SUPER::new (
…		…
3129		3764
3130	$self->{current} = $self->{children}[0]	3765	$self->{current} = $self->{children}[0]
3131	if @{ $self->{children} };	3766	if @{ $self->{children} };
3132	}	3767	}
3133		3768
		3769	sub get_current_page {
		3770	my ($self) = @_;
		3771
		3772	$self->{current}
		3773	}
		3774
3134	sub set_current_page {	3775	sub set_current_page {
3135	my ($self, $page_or_widget) = @_;	3776	my ($self, $page_or_widget) = @_;
3136		3777
3137	my $widget = ref $page_or_widget	3778	my $widget = ref $page_or_widget
3138	? $page_or_widget	3779	? $page_or_widget
…		…
3170	$self->{current}->draw;	3811	$self->{current}->draw;
3171	}	3812	}
3172		3813
3173	#############################################################################	3814	#############################################################################
3174		3815
3175	package CFClient::UI::Notebook;	3816	package CFPlus::UI::Notebook;
3176		3817
3177	our @ISA = CFClient::UI::VBox::;	3818	our @ISA = CFPlus::UI::VBox::;
3178		3819
3179	sub new {	3820	sub new {
3180	my $class = shift;	3821	my $class = shift;
3181		3822
3182	my $self = $class->SUPER::new (	3823	my $self = $class->SUPER::new (
3183	buttonbar => (new CFClient::UI::Buttonbar),	3824	buttonbar => (new CFPlus::UI::Buttonbar),
3184	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3825	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3185	# filter => # will be put between multiplexer and $self	3826	# filter => # will be put between multiplexer and $self
3186	@_,	3827	@_,
3187	);	3828	);
3188		3829
3189	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3830	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3193	}	3834	}
3194		3835
3195	sub add {	3836	sub add {
3196	my ($self, $title, $widget, $tooltip) = @_;	3837	my ($self, $title, $widget, $tooltip) = @_;
3197		3838
3198	Scalar::Util::weaken $self;	3839	CFPlus::weaken $self;
3199		3840
3200	$self->{buttonbar}->add (new CFClient::UI::Button	3841	$self->{buttonbar}->add (new CFPlus::UI::Button
3201	markup => $title,	3842	markup => $title,
3202	tooltip => $tooltip,	3843	tooltip => $tooltip,
3203	on_activate => sub { $self->set_current_page ($widget) },	3844	on_activate => sub { $self->set_current_page ($widget) },
3204	);	3845	);
3205		3846
3206	$self->{multiplexer}->add ($widget);	3847	$self->{multiplexer}->add ($widget);
3207	}	3848	}
3208		3849
		3850	sub get_current_page {
		3851	my ($self) = @_;
		3852
		3853	$self->{multiplexer}->get_current_page
		3854	}
		3855
3209	sub set_current_page {	3856	sub set_current_page {
3210	my ($self, $page) = @_;	3857	my ($self, $page) = @_;
3211		3858
3212	$self->{multiplexer}->set_current_page ($page);	3859	$self->{multiplexer}->set_current_page ($page);
3213	$self->emit (page_changed => $self->{multiplexer}{current});	3860	$self->emit (page_changed => $self->{multiplexer}{current});
3214	}	3861	}
3215		3862
3216	#############################################################################	3863	#############################################################################
3217		3864
3218	package CFClient::UI::Combobox;	3865	package CFPlus::UI::Selector;
3219		3866
3220	use utf8;	3867	use utf8;
3221		3868
3222	our @ISA = CFClient::UI::Button::;	3869	our @ISA = CFPlus::UI::Button::;
3223		3870
3224	sub new {	3871	sub new {
3225	my $class = shift;	3872	my $class = shift;
3226		3873
3227	my $self = $class->SUPER::new (	3874	my $self = $class->SUPER::new (
…		…
3244	my ($value, $title, $tooltip) = @$_;	3891	my ($value, $title, $tooltip) = @$_;
3245		3892
3246	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3893	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3247	}	3894	}
3248		3895
3249	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3896	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3250	}	3897	}
3251		3898
3252	sub _set_value {	3899	sub _set_value {
3253	my ($self, $value) = @_;	3900	my ($self, $value) = @_;
3254		3901
…		…
3269	$self->emit (changed => $value);	3916	$self->emit (changed => $value);
3270	}	3917	}
3271		3918
3272	#############################################################################	3919	#############################################################################
3273		3920
3274	package CFClient::UI::Statusbox;	3921	package CFPlus::UI::Statusbox;
3275		3922
3276	our @ISA = CFClient::UI::VBox::;	3923	our @ISA = CFPlus::UI::VBox::;
3277		3924
3278	sub new {	3925	sub new {
3279	my $class = shift;	3926	my $class = shift;
3280		3927
3281	my $self = $class->SUPER::new (	3928	my $self = $class->SUPER::new (
3282	fontsize => 0.8,	3929	fontsize => 0.8,
3283	@_,	3930	@_,
3284	);	3931	);
3285		3932
3286	Scalar::Util::weaken (my $this = $self);	3933	CFPlus::weaken (my $this = $self);
3287		3934
3288	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3935	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3289		3936
3290	$self	3937	$self
3291	}	3938	}
…		…
3293	sub reorder {	3940	sub reorder {
3294	my ($self) = @_;	3941	my ($self) = @_;
3295	my $NOW = Time::HiRes::time;	3942	my $NOW = Time::HiRes::time;
3296		3943
3297	# freeze display when hovering over any label	3944	# freeze display when hovering over any label
3298	return if $CFClient::UI::TOOLTIP->{owner}	3945	return if $CFPlus::UI::TOOLTIP->{owner}
3299	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3946	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3300	values %{ $self->{item} };	3947	values %{ $self->{item} };
3301		3948
3302	while (my ($k, $v) = each %{ $self->{item} }) {	3949	while (my ($k, $v) = each %{ $self->{item} }) {
3303	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3950	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3304	}	3951	}
…		…
3325	for ($short) {	3972	for ($short) {
3326	s/^\s+//;	3973	s/^\s+//;
3327	s/\s+/ /g;	3974	s/\s+/ /g;
3328	}	3975	}
3329		3976
3330	new CFClient::UI::Label	3977	new CFPlus::UI::Label
3331	markup => $short,	3978	markup => $short,
3332	tooltip => $item->{tooltip},	3979	tooltip => $item->{tooltip},
3333	tooltip_font => $::FONT_PROP,	3980	tooltip_font => $::FONT_PROP,
3334	tooltip_width => 0.67,	3981	tooltip_width => 0.67,
3335	fontsize => $item->{fontsize} || $self->{fontsize},	3982	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3389	count => 1,	4036	count => 1,
3390	%arg,	4037	%arg,
3391	};	4038	};
3392	}	4039	}
3393		4040
		4041	$ROOT->on_refresh (reorder => sub {
3394	$self->reorder;	4042	$self->reorder;
		4043	});
3395	}	4044	}
3396		4045
3397	sub reconfigure {	4046	sub reconfigure {
3398	my ($self) = @_;	4047	my ($self) = @_;
3399		4048
…		…
3412	$self->SUPER::destroy;	4061	$self->SUPER::destroy;
3413	}	4062	}
3414		4063
3415	#############################################################################	4064	#############################################################################
3416		4065
3417	package CFClient::UI::Inventory;
3418
3419	our @ISA = CFClient::UI::ScrolledWindow::;
3420
3421	sub new {
3422	my $class = shift;
3423
3424	my $self = $class->SUPER::new (
3425	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3426	@_,
3427	);
3428
3429	$self
3430	}
3431
3432	sub set_items {
3433	my ($self, $items) = @_;
3434
3435	$self->{child}->clear;
3436	return unless $items;
3437
3438	my @items = sort {
3439	($a->{type} <=> $b->{type})
3440	or ($a->{name} cmp $b->{name})
3441	} @$items;
3442
3443	$self->{real_items} = \@items;
3444
3445	my $row = 0;
3446	for my $item (@items) {
3447	CFClient::Item::update_widgets $item;
3448
3449	$self->{child}->add (0, $row, $item->{face_widget});
3450	$self->{child}->add (1, $row, $item->{desc_widget});
3451	$self->{child}->add (2, $row, $item->{weight_widget});
3452
3453	$row++;
3454	}
3455	}
3456
3457	#############################################################################
3458
3459	package CFClient::UI::BindEditor;
3460
3461	our @ISA = CFClient::UI::FancyFrame::;
3462
3463	sub new {
3464	my $class = shift;
3465
3466	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3467
3468	$self->add (my $vb = new CFClient::UI::VBox);
3469
3470
3471	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3472	text => "start recording",
3473	tooltip => "Start/Stops recording of actions."
3474	."All subsequent actions after the recording started will be captured."
3475	."The actions are displayed after the record was stopped."
3476	."To bind the action you have to click on the 'Bind' button",
3477	on_activate => sub {
3478	unless ($self->{recording}) {
3479	$self->start;
3480	} else {
3481	$self->stop;
3482	}
3483	});
3484
3485	$vb->add (new CFClient::UI::Label text => "Actions:");
3486	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3487
3488	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3489	$vb->add (my $hb = new CFClient::UI::HBox);
3490	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3491	$hb->add (new CFClient::UI::Button
3492	text => "bind",
3493	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3494	on_activate => sub {
3495	$self->ask_for_bind;
3496	});
3497
3498	$vb->add (my $hb = new CFClient::UI::HBox);
3499	$hb->add (new CFClient::UI::Button
3500	text => "ok",
3501	expand => 1,
3502	tooltip => "This closes the binding editor and saves the binding",
3503	on_activate => sub {
3504	$self->hide;
3505	$self->commit;
3506	});
3507
3508	$hb->add (new CFClient::UI::Button
3509	text => "cancel",
3510	expand => 1,
3511	tooltip => "This closes the binding editor without saving",
3512	on_activate => sub {
3513	$self->hide;
3514	$self->{binding_cancel}->()
3515	if $self->{binding_cancel};
3516	});
3517
3518	$self->update_binding_widgets;
3519
3520	$self
3521	}
3522
3523	sub cfg_bind {
3524	my ($self, $mod, $sym, $cmds) = @_;
3525	$::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3526	::update_bindings ();
3527	}
3528
3529	sub cfg_unbind {
3530	my ($self, $mod, $sym, $cmds) = @_;
3531	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3532	::update_bindings ();
3533	}
3534
3535	sub commit {
3536	my ($self) = @_;
3537	my ($mod, $sym, $cmds) = $self->get_binding;
3538	if ($sym != 0 && @$cmds > 0) {
3539	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3540	."'. Don't forget 'Save Config'!");
3541	$self->{binding_change}->($mod, $sym, $cmds)
3542	if $self->{binding_change};
3543	} else {
3544	$::STATUSBOX->add ("No action bound, no key or action specified!");
3545	$self->{binding_cancel}->()
3546	if $self->{binding_cancel};
3547	}
3548	}
3549
3550	sub start {
3551	my ($self) = @_;
3552
3553	$self->{rec_btn}->set_text ("stop recording");
3554	$self->{recording} = 1;
3555	$self->clear_command_list;
3556	$::CONN->start_record if $::CONN;
3557	}
3558
3559	sub stop {
3560	my ($self) = @_;
3561
3562	$self->{rec_btn}->set_text ("start recording");
3563	$self->{recording} = 0;
3564
3565	my $rec;
3566	$rec = $::CONN->stop_record if $::CONN;
3567	return unless ref $rec eq 'ARRAY';
3568	$self->set_command_list ($rec);
3569	}
3570
3571
3572	sub ask_for_bind_and_commit {
3573	my ($self) = @_;
3574	$self->ask_for_bind (1);
3575	}
3576
3577	sub ask_for_bind {
3578	my ($self, $commit, $end_cb) = @_;
3579
3580	CFClient::Binder::open_binding_dialog (sub {
3581	my ($mod, $sym) = @_;
3582	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3583	$self->update_binding_widgets;
3584	$self->commit if $commit;
3585	$end_cb->() if $end_cb;
3586	});
3587	}
3588
3589	# $mod and $sym are the modifiers and key symbol
3590	# $cmds is a array ref of strings (the commands)
3591	# $cb is the callback that is executed on OK
3592	# $ccb is the callback that is executed on CANCEL and
3593	# when the binding was unsuccessful on OK
3594	sub set_binding {
3595	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3596
3597	$self->clear_command_list;
3598	$self->{recording} = 0;
3599	$self->{rec_btn}->set_text ("start recording");
3600
3601	$self->{binding} = [$mod, $sym];
3602	$self->{commands} = $cmds;
3603
3604	$self->{binding_change} = $cb;
3605	$self->{binding_cancel} = $ccb;
3606
3607	$self->update_binding_widgets;
3608	}
3609
3610	# this is a shortcut method that asks for a binding
3611	# and then just binds it.
3612	sub do_quick_binding {
3613	my ($self, $cmds, $end_cb) = @_;
3614	$self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3615	$self->ask_for_bind (1, $end_cb);
3616	}
3617
3618	sub update_binding_widgets {
3619	my ($self) = @_;
3620	my ($mod, $sym, $cmds) = $self->get_binding;
3621	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3622	$self->set_command_list ($cmds);
3623	}
3624
3625	sub get_binding {
3626	my ($self) = @_;
3627	return (
3628	$self->{binding}->[0],
3629	$self->{binding}->[1],
3630	[ grep { defined $_ } @{$self->{commands}} ]
3631	);
3632	}
3633
3634	sub clear_command_list {
3635	my ($self) = @_;
3636	$self->{cmdbox}->clear ();
3637	}
3638
3639	sub set_command_list {
3640	my ($self, $cmds) = @_;
3641
3642	$self->{cmdbox}->clear ();
3643	$self->{commands} = $cmds;
3644
3645	my $idx = 0;
3646
3647	for (@$cmds) {
3648	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3649
3650	my $i = $idx;
3651	$hb->add (new CFClient::UI::Label text => $_);
3652	$hb->add (new CFClient::UI::Button
3653	text => "delete",
3654	tooltip => "Deletes the action from the record",
3655	on_activate => sub {
3656	$self->{cmdbox}->remove ($hb);
3657	$cmds->[$i] = undef;
3658	});
3659
3660
3661	$idx++
3662	}
3663	}
3664
3665	#############################################################################
3666
3667	package CFClient::UI::SpellList;
3668
3669	our @ISA = CFClient::UI::Table::;
3670
3671	sub new {
3672	my $class = shift;
3673
3674	my $self = $class->SUPER::new (
3675	binding => [],
3676	commands => [],
3677	@_,
3678	)
3679	}
3680
3681	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3682
3683	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3684	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3685	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3686	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3687	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3688	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3689	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3690	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3691	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3692	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3693
3694	sub rebuild_spell_list {
3695	my ($self) = @_;
3696
3697	$CFClient::UI::ROOT->on_refresh ($self => sub {
3698	$self->clear;
3699
3700	return unless $::CONN;
3701
3702	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3703	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3704	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3705	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3706	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3707
3708	my $row = 0;
3709
3710	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3711	my $spell = $self->{spell}{$_};
3712
3713	$row++;
3714
3715	my $spell_cb = sub {
3716	my ($widget, $ev) = @_;
3717
3718	if ($ev->{button} == 1) {
3719	$::CONN->user_send ("cast $spell->{name}");
3720	} elsif ($ev->{button} == 2) {
3721	$::CONN->user_send ("invoke $spell->{name}");
3722	} elsif ($ev->{button} == 3) {
3723	(new CFClient::UI::Menu
3724	items => [
3725	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3726	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3727	],
3728	)->popup ($ev);
3729	} else {
3730	return 0;
3731	}
3732
3733	1
3734	};
3735
3736	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3737
3738	#TODO: add path info to tooltip
3739	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3740
3741	$self->add (0, $row, new CFClient::UI::Face
3742	face => $spell->{face},
3743	can_hover => 1,
3744	can_events => 1,
3745	tooltip => $tooltip,
3746	on_button_down => $spell_cb,
3747	);
3748
3749	$self->add (1, $row, new CFClient::UI::Label
3750	expand => 1,
3751	text => $spell->{name},
3752	can_hover => 1,
3753	can_events => 1,
3754	tooltip => $tooltip,
3755	on_button_down => $spell_cb,
3756	);
3757
3758	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3759	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3760	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3761	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3762	}
3763	});
3764	}
3765
3766	sub add_spell {
3767	my ($self, $spell) = @_;
3768
3769	$self->{spell}->{$spell->{name}} = $spell;
3770	$self->rebuild_spell_list;
3771	}
3772
3773	sub remove_spell {
3774	my ($self, $spell) = @_;
3775
3776	delete $self->{spell}->{$spell->{name}};
3777	$self->rebuild_spell_list;
3778	}
3779
3780	sub clear_spells {
3781	my ($self) = @_;
3782
3783	$self->{spell} = {};
3784	$self->rebuild_spell_list;
3785	}
3786
3787	#############################################################################
3788
3789	package CFClient::UI::Root;	4066	package CFPlus::UI::Root;
3790		4067
3791	our @ISA = CFClient::UI::Container::;	4068	our @ISA = CFPlus::UI::Container::;
3792		4069
3793	use List::Util qw(min max);	4070	use List::Util qw(min max);
3794		4071
3795	use CFClient::OpenGL;	4072	use CFPlus::OpenGL;
3796		4073
3797	sub new {	4074	sub new {
3798	my $class = shift;	4075	my $class = shift;
3799		4076
3800	my $self = $class->SUPER::new (	4077	my $self = $class->SUPER::new (
3801	visible => 1,	4078	visible => 1,
3802	@_,	4079	@_,
3803	);	4080	);
3804		4081
3805	Scalar::Util::weaken ($self->{root} = $self);	4082	CFPlus::weaken ($self->{root} = $self);
3806		4083
3807	$self	4084	$self
3808	}	4085	}
3809		4086
3810	sub size_request {	4087	sub size_request {
…		…
3976	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4253	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3977		4254
3978	$w = 0 if $w < 0;	4255	$w = 0 if $w < 0;
3979	$h = 0 if $h < 0;	4256	$h = 0 if $h < 0;
3980		4257
		4258	$w = max $widget->{min_w}, $w;
		4259	$h = max $widget->{min_h}, $h;
		4260
		4261	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4262	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4263
		4264	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4265	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4266
3981	$w = int $w + 0.5;	4267	$w = int $w + 0.5;
3982	$h = int $h + 0.5;	4268	$h = int $h + 0.5;
3983		4269
3984	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4270	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3985	$widget->{old_w} = $widget->{w};	4271	$widget->{old_w} = $widget->{w};
…		…
3995		4281
3996	while ($self->{post_alloc_hook}) {	4282	while ($self->{post_alloc_hook}) {
3997	$_->()	4283	$_->()
3998	for values %{delete $self->{post_alloc_hook}};	4284	for values %{delete $self->{post_alloc_hook}};
3999	}	4285	}
4000
4001		4286
4002	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4287	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4003	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4288	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4004	glClear GL_COLOR_BUFFER_BIT;	4289	glClear GL_COLOR_BUFFER_BIT;
4005		4290
…		…
4008	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4293	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4009	glMatrixMode GL_MODELVIEW;	4294	glMatrixMode GL_MODELVIEW;
4010	glLoadIdentity;	4295	glLoadIdentity;
4011		4296
4012	{	4297	{
4013	package CFClient::UI::Base;	4298	package CFPlus::UI::Base;
4014		4299
4015	($draw_x, $draw_y, $draw_w, $draw_h) =	4300	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4016	(0, 0, $self->{w}, $self->{h});	4301	(0, 0, $self->{w}, $self->{h});
4017	}
4018		4302
4019	$self->_draw;	4303	$self->_draw;
		4304	}
4020	}	4305	}
4021		4306
4022	#############################################################################	4307	#############################################################################
4023		4308
4024	package CFClient::UI;	4309	package CFPlus::UI;
4025		4310
4026	$ROOT = new CFClient::UI::Root;	4311	$ROOT = new CFPlus::UI::Root;
4027	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4312	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4028		4313
4029	1	4314	1
4030		4315

Diff Legend

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