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

Diff Legend

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