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.329 by root, Sun Jul 23 02:44:06 2006 UTC vs.
Revision 1.435 by root, Wed Aug 22 21:40:43 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};
34
35	$tip = $tip->($widget) if CODE:: eq ref $tip;
36
37	$TOOLTIP->set_tooltip_from ($widget);	35	$TOOLTIP->set_tooltip_from ($widget);
38	$TOOLTIP->show;	36	$TOOLTIP->show;
39	}	37	}
40		38
41	return;	39	return;
42	}	40	}
43	}	41	}
44	}	42	}
45		43
46	$TOOLTIP->hide;	44	$TOOLTIP->hide;
		45	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	46	delete $TOOLTIP->{owner};
48	});	47	});
49		48
50	sub get_layout {	49	sub get_layout {
51	my $layout;	50	my $layout;
…		…
79	sub feed_sdl_key_up_event {	78	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	79	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	80	if $FOCUS;
82	}	81	}
83		82
		83	sub check_hover {
		84	my ($widget) = @_;
		85
		86	if ($widget != $HOVER) {
		87	my $hover = $HOVER; $HOVER = $widget;
		88
		89	$hover->update if $hover && $hover->{can_hover};
		90	$HOVER->update if $HOVER && $HOVER->{can_hover};
		91
		92	$TOOLTIP_WATCHER->start;
		93	}
		94	}
		95
84	sub feed_sdl_button_down_event {	96	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	97	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	98	my ($x, $y) = ($ev->{x}, $ev->{y});
87		99
88	if (!$BUTTON_STATE) {	100	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		101
		102	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	103	my $widget = $ROOT->find_widget ($x, $y);
90		104
91	$GRAB = $widget;	105	$GRAB = $widget;
92	$GRAB->update if $GRAB;	106	$GRAB->update if $GRAB;
93		107
94	$TOOLTIP_WATCHER->cb->();	108	$TOOLTIP_WATCHER->cb->();
95	}	109	}
96		110
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	111	if ($GRAB) {
		112	if ($ev->{button} == 4 || $ev->{button} == 5) {
		113	# mousewheel
		114	my $delta = $ev->{button} * 2 - 9;
		115	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
98		116
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	117	$ev->{dx} = $shift ? $delta : 0;
100	if $GRAB;	118	$ev->{dy} = $shift ? 0 : $delta;
		119
		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	{ __w_ => $_[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
…		…
345	my ($self, $x, $y, $w, $h) = @_;	375	my ($self, $x, $y, $w, $h) = @_;
346		376
347	if ($self->{aspect}) {	377	if ($self->{aspect}) {
348	my ($ow, $oh) = ($w, $h);	378	my ($ow, $oh) = ($w, $h);
349		379
350	$w = List::Util::min $w, int $h * $self->{aspect};	380	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351	$h = List::Util::min $h, int $w / $self->{aspect};	381	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352		382
353	# use alignment to adjust x, y	383	# use alignment to adjust x, y
354		384
355	$x += int 0.5 * ($ow - $w);	385	$x += int 0.5 * ($ow - $w);
356	$y += int 0.5 * ($oh - $h);	386	$y += int 0.5 * ($oh - $h);
…		…
397		427
398	return if $self->{tooltip} eq $tooltip;	428	return if $self->{tooltip} eq $tooltip;
399		429
400	$self->{tooltip} = $tooltip;	430	$self->{tooltip} = $tooltip;
401		431
402	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	432	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403	delete $CFClient::UI::TOOLTIP->{owner};	433	delete $CFPlus::UI::TOOLTIP->{owner};
404	$CFClient::UI::TOOLTIP_WATCHER->cb->();	434	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
405	}	435	}
406	}	436	}
407		437
408	# translate global coordinates to local coordinate system	438	# translate global coordinates to local coordinate system
409	sub coord2local {	439	sub coord2local {
410	my ($self, $x, $y) = @_;	440	my ($self, $x, $y) = @_;
411		441
		442	Carp::confess unless $self->{parent};#d#
		443
412	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	444	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413	}	445	}
414		446
415	# translate local coordinates to global coordinate system	447	# translate local coordinates to global coordinate system
416	sub coord2global {	448	sub coord2global {
417	my ($self, $x, $y) = @_;	449	my ($self, $x, $y) = @_;
		450
		451	Carp::confess unless $self->{parent};#d#
418		452
419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	453	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420	}	454	}
421		455
422	sub invoke_focus_in {	456	sub invoke_focus_in {
…		…
456		490
457	sub invoke_mouse_motion { 0 }	491	sub invoke_mouse_motion { 0 }
458	sub invoke_button_up { 0 }	492	sub invoke_button_up { 0 }
459	sub invoke_key_down { 0 }	493	sub invoke_key_down { 0 }
460	sub invoke_key_up { 0 }	494	sub invoke_key_up { 0 }
		495	sub invoke_mouse_wheel { 0 }
461		496
462	sub invoke_button_down {	497	sub invoke_button_down {
463	my ($self, $ev, $x, $y) = @_;	498	my ($self, $ev, $x, $y) = @_;
464		499
465	$self->grab_focus;	500	$self->grab_focus;
…		…
469		504
470	sub connect {	505	sub connect {
471	my ($self, $signal, $cb) = @_;	506	my ($self, $signal, $cb) = @_;
472		507
473	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	}
474	}	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	);
475		528
476	sub emit {	529	sub emit {
477	my ($self, $signal, @args) = @_;	530	my ($self, $signal, @args) = @_;
478		531
		532	# I do not really like this solution, but I do not like duplication
		533	# and needlessly verbose code, either.
		534	my @append
		535	= $has_coords{$signal}
		536	? $args[0]->xy ($self)
		537	: ();
		538
479	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#	539	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
480		540
481	#d##TODO# stop propagating at first true, do not use sum	541	for my $cb (
482	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	542	@{$self->{signal_cb}{$signal} || []}, # before
483	|| ($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
484	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	549	$self->{parent} && $self->{parent}->emit ($signal, @args)
485	}	550	}
486		551
487	sub find_widget {	552	#sub find_widget {
488	my ($self, $x, $y) = @_;	553	# in .xs
489
490	return () unless $self->{can_events};
491
492	return $self
493	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
494	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
495
496	()
497	}
498		554
499	sub set_parent {	555	sub set_parent {
500	my ($self, $parent) = @_;	556	my ($self, $parent) = @_;
501		557
502	Scalar::Util::weaken ($self->{parent} = $parent);	558	CFPlus::weaken ($self->{parent} = $parent);
503	$self->set_visible if $parent->{visible};	559	$self->set_visible if $parent->{visible};
504	}	560	}
505		561
506	sub realloc {	562	sub realloc {
507	my ($self) = @_;	563	my ($self) = @_;
…		…
533		589
534	# using global variables seems a bit hacky, but passing through all drawing	590	# using global variables seems a bit hacky, but passing through all drawing
535	# functions seems pointless.	591	# functions seems pointless.
536	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn	592	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
537		593
538	sub draw {	594	#sub draw {
539	my ($self) = @_;	595	#CFPlus.xs
540
541	return unless $self->{h} && $self->{w};
542
543	# update screen rectangle
544	local $draw_x = $draw_x + $self->{x};
545	local $draw_y = $draw_y + $self->{y};
546
547	# skip widgets that are entirely outside the drawing area
548	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550
551	glPushMatrix;
552	glTranslate $self->{x}, $self->{y}, 0;
553
554	if ($self == $HOVER && $self->{can_hover}) {
555	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
556	glEnable GL_BLEND;
557	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
558	glBegin GL_QUADS;
559	glVertex 0 , 0;
560	glVertex $self->{w}, 0;
561	glVertex $self->{w}, $self->{h};
562	glVertex 0 , $self->{h};
563	glEnd;
564	glDisable GL_BLEND;
565	}
566
567	if ($ENV{CFPLUS_DEBUG} & 1) {
568	glPushMatrix;
569	glColor 1, 1, 0, 1;
570	glTranslate 0.375, 0.375;
571	glBegin GL_LINE_LOOP;
572	glVertex 0 , 0;
573	glVertex $self->{w} - 1, 0;
574	glVertex $self->{w} - 1, $self->{h} - 1;
575	glVertex 0 , $self->{h} - 1;
576	glEnd;
577	glPopMatrix;
578	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
579	}
580
581	$self->_draw;
582	glPopMatrix;
583	}
584		596
585	sub _draw {	597	sub _draw {
586	my ($self) = @_;	598	my ($self) = @_;
587		599
588	warn "no draw defined for $self\n";	600	warn "no draw defined for $self\n";
589	}	601	}
590		602
591	sub DESTROY {	603	sub DESTROY {
592	my ($self) = @_;	604	my ($self) = @_;
593		605
594	return if CFClient::in_destruct;	606	return if CFPlus::in_destruct;
595		607
596	delete $WIDGET{$self+0};	608	local $@;
597
598	eval { $self->destroy };	609	eval { $self->destroy };
599	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	610	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		611
		612	delete $WIDGET{$self+0};
600	}	613	}
601		614
602	#############################################################################	615	#############################################################################
603		616
604	package CFClient::UI::DrawBG;	617	package CFPlus::UI::DrawBG;
605		618
606	our @ISA = CFClient::UI::Base::;	619	our @ISA = CFPlus::UI::Base::;
607		620
608	use strict;	621	use strict;
609	use CFClient::OpenGL;	622	use CFPlus::OpenGL;
610		623
611	sub new {	624	sub new {
612	my $class = shift;	625	my $class = shift;
613
614	# range [value, low, high, page]
615		626
616	$class->SUPER::new (	627	$class->SUPER::new (
617	#bg => [0, 0, 0, 0.2],	628	#bg => [0, 0, 0, 0.2],
618	#active_bg => [1, 1, 1, 0.5],	629	#active_bg => [1, 1, 1, 0.5],
619	@_	630	@_
…		…
631	my ($w, $h) = @$self{qw(w h)};	642	my ($w, $h) = @$self{qw(w h)};
632		643
633	glEnable GL_BLEND;	644	glEnable GL_BLEND;
634	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	645	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
635	glColor_premultiply @$color;	646	glColor_premultiply @$color;
636
637	glBegin GL_QUADS;
638	glVertex 0 , 0;
639	glVertex 0 , $h;
640	glVertex $w, $h;	647	glRect 0, 0, $w, $h;
641	glVertex $w, 0;
642	glEnd;
643
644	glDisable GL_BLEND;	648	glDisable GL_BLEND;
645	}	649	}
646	}	650	}
647		651
648	#############################################################################	652	#############################################################################
649		653
650	package CFClient::UI::Empty;	654	package CFPlus::UI::Empty;
651		655
652	our @ISA = CFClient::UI::Base::;	656	our @ISA = CFPlus::UI::Base::;
653		657
654	sub new {	658	sub new {
655	my ($class, %arg) = @_;	659	my ($class, %arg) = @_;
656	$class->SUPER::new (can_events => 0, %arg);	660	$class->SUPER::new (can_events => 0, %arg);
657	}	661	}
…		…
664		668
665	sub draw { }	669	sub draw { }
666		670
667	#############################################################################	671	#############################################################################
668		672
669	package CFClient::UI::Container;	673	package CFPlus::UI::Container;
670		674
671	our @ISA = CFClient::UI::Base::;	675	our @ISA = CFPlus::UI::Base::;
672		676
673	sub new {	677	sub new {
674	my ($class, %arg) = @_;	678	my ($class, %arg) = @_;
675		679
676	my $children = delete $arg{children};	680	my $children = delete $arg{children};
…		…
680	can_events => 0,	684	can_events => 0,
681	%arg,	685	%arg,
682	);	686	);
683		687
684	$self->add (@$children)	688	$self->add (@$children)
685	if $children;	689	if $children && @$children;
686		690
687	$self	691	$self
		692	}
		693
		694	sub realloc {
		695	my ($self) = @_;
		696
		697	$self->{force_realloc} = 1;
		698	$self->{force_size_alloc} = 1;
		699	$self->SUPER::realloc;
688	}	700	}
689		701
690	sub add {	702	sub add {
691	my ($self, @widgets) = @_;	703	my ($self, @widgets) = @_;
692		704
693	$_->set_parent ($self)	705	$_->set_parent ($self)
694	for @widgets;	706	for @widgets;
695		707
		708	# TODO: only do this in widgets that need it, e.g. root, fixed
696	use sort 'stable';	709	use sort 'stable';
697		710
698	$self->{children} = [	711	$self->{children} = [
699	sort { $a->{z} <=> $b->{z} }	712	sort { $a->{z} <=> $b->{z} }
700	@{$self->{children}}, @widgets	713	@{$self->{children}}, @widgets
701	];	714	];
702		715
703	$self->realloc;	716	$self->realloc;
		717
		718	$self->emit (c_add => \@widgets);
		719
		720	map $_+0, @widgets
704	}	721	}
705		722
706	sub children {	723	sub children {
707	@{ $_[0]{children} }	724	@{ $_[0]{children} }
708	}	725	}
709		726
710	sub remove {	727	sub remove {
711	my ($self, $child) = @_;	728	my ($self, @widgets) = @_;
712		729
		730	$self->emit (c_remove => \@widgets);
		731
		732	for my $child (@widgets) {
713	delete $child->{parent};	733	delete $child->{parent};
714	$child->hide;	734	$child->hide;
715
716	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	735	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		736	}
717		737
718	$self->realloc;	738	$self->realloc;
719	}	739	}
720		740
721	sub clear {	741	sub clear {
722	my ($self) = @_;	742	my ($self) = @_;
723		743
724	my $children = delete $self->{children};	744	my $children = $self->{children};
725	$self->{children} = [];	745	$self->{children} = [];
726		746
727	for (@$children) {	747	for (@$children) {
728	delete $_->{parent};	748	delete $_->{parent};
729	$_->hide;	749	$_->hide;
…		…
749	}	769	}
750		770
751	sub _draw {	771	sub _draw {
752	my ($self) = @_;	772	my ($self) = @_;
753		773
754	$_->draw for @{$self->{children}};	774	$_->draw for $self->visible_children;
755	}	775	}
756		776
757	#############################################################################	777	#############################################################################
758		778
759	package CFClient::UI::Bin;	779	package CFPlus::UI::Bin;
760		780
761	our @ISA = CFClient::UI::Container::;	781	our @ISA = CFPlus::UI::Container::;
762		782
763	sub new {	783	sub new {
764	my ($class, %arg) = @_;	784	my ($class, %arg) = @_;
765		785
766	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	786	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
767		787
768	$class->SUPER::new (children => [$child], %arg)	788	$class->SUPER::new (children => [$child], %arg)
769	}	789	}
770		790
771	sub add {	791	sub add {
772	my ($self, $child) = @_;	792	my ($self, $child) = @_;
773		793
774	$self->SUPER::remove ($_) for @{ $self->{children} };	794	$self->clear;
775	$self->SUPER::add ($child);	795	$self->SUPER::add ($child);
776	}	796	}
777		797
778	sub remove {	798	sub remove {
779	my ($self, $widget) = @_;	799	my ($self, $widget) = @_;
780		800
781	$self->SUPER::remove ($widget);	801	$self->SUPER::remove ($widget);
782		802
783	$self->{children} = [new CFClient::UI::Empty]	803	$self->{children} = [new CFPlus::UI::Empty]
784	unless @{$self->{children}};	804	unless @{$self->{children}};
785	}	805	}
786		806
787	sub child { $_[0]->{children}[0] }	807	sub child { $_[0]->{children}[0] }
788		808
…		…
800		820
801	#############################################################################	821	#############################################################################
802		822
803	# back-buffered drawing area	823	# back-buffered drawing area
804		824
805	package CFClient::UI::Window;	825	package CFPlus::UI::Window;
806		826
807	our @ISA = CFClient::UI::Bin::;	827	our @ISA = CFPlus::UI::Bin::;
808		828
809	use CFClient::OpenGL;	829	use CFPlus::OpenGL;
810		830
811	sub new {	831	sub new {
812	my ($class, %arg) = @_;	832	my ($class, %arg) = @_;
813		833
814	my $self = $class->SUPER::new (%arg);	834	my $self = $class->SUPER::new (%arg);
…		…
836	}	856	}
837		857
838	sub render_child {	858	sub render_child {
839	my ($self) = @_;	859	my ($self) = @_;
840		860
841	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	861	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
842	glClearColor 0, 0, 0, 0;	862	glClearColor 0, 0, 0, 0;
843	glClear GL_COLOR_BUFFER_BIT;	863	glClear GL_COLOR_BUFFER_BIT;
844		864
845	{	865	{
846	package CFClient::UI::Base;	866	package CFPlus::UI::Base;
847		867
848	($draw_x, $draw_y, $draw_w, $draw_h) =	868	local ($draw_x, $draw_y, $draw_w, $draw_h) =
849	(0, 0, $self->{w}, $self->{h});	869	(0, 0, $self->{w}, $self->{h});
		870
		871	$self->_render;
850	}	872	}
851
852	$self->_render;
853	};	873	};
854	}	874	}
855		875
856	sub _draw {	876	sub _draw {
857	my ($self) = @_;	877	my ($self) = @_;
858
859	my ($w, $h) = @$self{qw(w h)};
860		878
861	my $tex = $self->{texture}	879	my $tex = $self->{texture}
862	or return;	880	or return;
863		881
864	glEnable GL_TEXTURE_2D;	882	glEnable GL_TEXTURE_2D;
865	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	883	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
866	glColor 0, 0, 0, 1;	884	glColor 0, 0, 0, 1;
867		885
868	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	886	$tex->draw_quad_alpha_premultiplied (0, 0);
869		887
870	glDisable GL_TEXTURE_2D;	888	glDisable GL_TEXTURE_2D;
871	}	889	}
872		890
873	#############################################################################	891	#############################################################################
874		892
875	package CFClient::UI::ViewPort;	893	package CFPlus::UI::ViewPort;
876		894
		895	use List::Util qw(min max);
		896
877	our @ISA = CFClient::UI::Window::;	897	our @ISA = CFPlus::UI::Window::;
878		898
879	sub new {	899	sub new {
880	my $class = shift;	900	my $class = shift;
881		901
882	$class->SUPER::new (	902	$class->SUPER::new (
…		…
889	sub size_request {	909	sub size_request {
890	my ($self) = @_;	910	my ($self) = @_;
891		911
892	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	912	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
893		913
894	$w = 10 if $self->{scroll_x};	914	$w = 1 if $self->{scroll_x};
895	$h = 10 if $self->{scroll_y};	915	$h = 1 if $self->{scroll_y};
896		916
897	($w, $h)	917	($w, $h)
898	}	918	}
899		919
900	sub invoke_size_allocate {	920	sub invoke_size_allocate {
…		…
912	}	932	}
913		933
914	sub set_offset {	934	sub set_offset {
915	my ($self, $x, $y) = @_;	935	my ($self, $x, $y) = @_;
916		936
		937	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		938	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		939
		940	if ($x != $self->{view_x} or $y != $self->{view_y}) {
917	$self->{view_x} = int $x;	941	$self->{view_x} = $x;
918	$self->{view_y} = int $y;	942	$self->{view_y} = $y;
919		943
		944	$self->emit (changed => $x, $y);
920	$self->update;	945	$self->update;
		946	}
		947	}
		948
		949	sub set_center {
		950	my ($self, $x, $y) = @_;
		951
		952	$self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
		953	}
		954
		955	sub make_visible {
		956	my ($self, $x, $y, $border) = @_;
		957
		958	if ( $x < $self->{view_x} + $self->{w} * $border
		959	|| $x > $self->{view_x} + $self->{w} * (1 - $border)
		960	|| $y < $self->{view_y} + $self->{h} * $border
		961	|| $y > $self->{view_y} + $self->{h} * (1 - $border)
		962	) {
		963	$self->set_center ($x, $y);
		964	}
921	}	965	}
922		966
923	# hmm, this does not work for topleft of $self... but we should not ask for that	967	# hmm, this does not work for topleft of $self... but we should not ask for that
924	sub coord2local {	968	sub coord2local {
925	my ($self, $x, $y) = @_;	969	my ($self, $x, $y) = @_;
…		…
940	my ($self, $x, $y) = @_;	984	my ($self, $x, $y) = @_;
941		985
942	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	986	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
943	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	987	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
944	) {	988	) {
945	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	989	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
946	} else {	990	} else {
947	$self->CFClient::UI::Base::find_widget ($x, $y)	991	$self->CFPlus::UI::Base::find_widget ($x, $y)
948	}	992	}
949	}	993	}
950		994
951	sub _render {	995	sub _render {
952	my ($self) = @_;	996	my ($self) = @_;
953		997
954	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	998	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
955	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	999	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
956		1000
957	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1001	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
958		1002
959	$self->SUPER::_render;	1003	$self->SUPER::_render;
960	}	1004	}
961		1005
962	#############################################################################	1006	#############################################################################
963		1007
964	package CFClient::UI::ScrolledWindow;	1008	package CFPlus::UI::ScrolledWindow;
965		1009
966	our @ISA = CFClient::UI::HBox::;	1010	our @ISA = CFPlus::UI::Table::;
967		1011
968	sub new {	1012	sub new {
969	my ($class, %arg) = @_;	1013	my ($class, %arg) = @_;
970		1014
971	my $child = delete $arg{child};	1015	my $child = delete $arg{child};
972		1016
973	my $self;	1017	my $self;
974		1018
975	my $slider = new CFClient::UI::Slider	1019	my $hslider = new CFPlus::UI::Slider
		1020	c_col => 0,
		1021	c_row => 1,
		1022	vertical => 0,
		1023	range => [0, 0, 1, 0.01], # HACK fix
		1024	on_changed => sub {
		1025	$self->{hpos} = $_[1];
		1026	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1027	},
		1028	;
		1029
		1030	my $vslider = new CFPlus::UI::Slider
		1031	c_col => 1,
		1032	c_row => 0,
976	vertical => 1,	1033	vertical => 1,
977	range => [0, 0, 1, 0.01], # HACK fix	1034	range => [0, 0, 1, 0.01], # HACK fix
978	on_changed => sub {	1035	on_changed => sub {
979	$self->{vp}->set_offset (0, $_[1]);	1036	$self->{vpos} = $_[1];
		1037	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
980	},	1038	},
981	;	1039	;
982		1040
983	$self = $class->SUPER::new (	1041	$self = $class->SUPER::new (
984	vp => (new CFClient::UI::ViewPort expand => 1),	1042	scroll_x => 0,
		1043	scroll_y => 1,
		1044	can_events => 1,
985	slider => $slider,	1045	hslider => $hslider,
		1046	vslider => $vslider,
		1047	col_expand => [1, 0],
		1048	row_expand => [1, 0],
986	%arg,	1049	%arg,
987	);	1050	);
988		1051
		1052	$self->{vp} = new CFPlus::UI::ViewPort
		1053	c_col => 0,
		1054	c_row => 0,
		1055	expand => 1,
		1056	scroll_x => $self->{scroll_x},
		1057	scroll_y => $self->{scroll_y},
		1058	on_changed => sub {
		1059	my ($vp, $x, $y) = @_;
		1060
		1061	$vp->{parent}{hslider}->set_value ($x);
		1062	$vp->{parent}{vslider}->set_value ($y);
		1063
		1064	0
		1065	},
		1066	on_size_allocate => sub {
		1067	my ($vp, $w, $h) = @_;
		1068	$vp->{parent}->update_slider;
		1069	0
		1070	},
		1071	;
		1072
989	$self->SUPER::add ($self->{vp}, $self->{slider});	1073	$self->SUPER::add ($self->{vp});
		1074
990	$self->add ($child) if $child;	1075	$self->add ($child) if $child;
991		1076
992	$self	1077	$self
993	}	1078	}
994
995	#TODO# update range on size_allocate depending on child
996		1079
997	sub add {	1080	sub add {
998	my ($self, $widget) = @_;	1081	my ($self, $widget) = @_;
999		1082
1000	$self->{vp}->add ($self->{child} = $widget);	1083	$self->{vp}->add ($self->{child} = $widget);
1001	}	1084	}
1002		1085
		1086	sub set_offset { shift->{vp}->set_offset (@_) }
		1087	sub set_center { shift->{vp}->set_center (@_) }
		1088	sub make_visible { shift->{vp}->make_visible (@_) }
		1089
		1090	sub update_slider {
		1091	my ($self) = @_;
		1092
		1093	my $child = ($self->{vp} or return)->child;
		1094
		1095	if ($self->{scroll_x}) {
		1096	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
		1097	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1098
		1099	my $visible = $w1 > $w2;
		1100	if ($visible != $self->{hslider_visible}) {
		1101	$self->{hslider_visible} = $visible;
		1102	$visible ? $self->SUPER::add ($self->{hslider})
		1103	: $self->SUPER::remove ($self->{hslider});
		1104	}
		1105	}
		1106
		1107	if ($self->{scroll_y}) {
		1108	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1109	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1110
		1111	my $visible = $h1 > $h2;
		1112	if ($visible != $self->{vslider_visible}) {
		1113	$self->{vslider_visible} = $visible;
		1114	$visible ? $self->SUPER::add ($self->{vslider})
		1115	: $self->SUPER::remove ($self->{vslider});
		1116	}
		1117	}
		1118	}
		1119
		1120	sub start_dragging {
		1121	my ($self, $ev) = @_;
		1122
		1123	$self->grab_focus;
		1124
		1125	my $ox = $self->{vp}{view_x};
		1126	my $oy = $self->{vp}{view_y};
		1127
		1128	$self->{motion} = sub {
		1129	my ($ev, $x, $y) = @_;
		1130
		1131	$ox -= $ev->{xrel};
		1132	$oy -= $ev->{yrel};
		1133
		1134	$self->{vp}->set_offset ($ox, $oy);
		1135	};
		1136	}
		1137
		1138	sub invoke_mouse_wheel {
		1139	my ($self, $ev) = @_;
		1140
		1141	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1142	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
		1143
		1144	1
		1145	}
		1146
		1147	sub invoke_button_down {
		1148	my ($self, $ev, $x, $y) = @_;
		1149
		1150	if ($ev->{button} == 2) {
		1151	$self->start_dragging ($ev);
		1152	return 1;
		1153	}
		1154
		1155	0
		1156	}
		1157
1003	sub invoke_button_up {	1158	sub invoke_button_up {
1004	my ($self, $ev) = @_;	1159	my ($self, $ev, $x, $y) = @_;
1005		1160
1006	warn "button up $ev->{button}\n";#d#	1161	if (delete $self->{motion}) {
		1162	return 1;
1007		1163	}
		1164
1008	0	1165	0
1009	}	1166	}
1010		1167
1011	sub update_slider {	1168	sub invoke_mouse_motion {
1012	my ($self) = @_;	1169	my ($self, $ev, $x, $y) = @_;
1013		1170
1014	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1171	if ($self->{motion}) {
1015	}	1172	$self->{motion}->($ev, $x, $y);
		1173	return 1;
		1174	}
1016		1175
1017	sub update {	1176	0
1018	my ($self) = @_;
1019
1020	$self->SUPER::update;
1021
1022	$self->update_slider;
1023	}	1177	}
1024		1178
1025	sub invoke_size_allocate {	1179	sub invoke_size_allocate {
1026	my ($self, $w, $h) = @_;	1180	my ($self, $w, $h) = @_;
1027		1181
1028	$self->update_slider;	1182	$self->update_slider;
1029
1030	$self->SUPER::invoke_size_allocate ($w, $h)	1183	$self->SUPER::invoke_size_allocate ($w, $h)
1031	}	1184	}
1032		1185
1033	#############################################################################	1186	#############################################################################
1034		1187
1035	package CFClient::UI::Frame;	1188	package CFPlus::UI::Frame;
1036		1189
1037	our @ISA = CFClient::UI::Bin::;	1190	our @ISA = CFPlus::UI::Bin::;
1038		1191
1039	use CFClient::OpenGL;	1192	use CFPlus::OpenGL;
1040		1193
1041	sub new {	1194	sub new {
1042	my $class = shift;	1195	my $class = shift;
1043		1196
1044	$class->SUPER::new (	1197	$class->SUPER::new (
…		…
1054	my ($w, $h) = @$self{qw(w h)};	1207	my ($w, $h) = @$self{qw(w h)};
1055		1208
1056	glEnable GL_BLEND;	1209	glEnable GL_BLEND;
1057	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1210	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1058	glColor_premultiply @{ $self->{bg} };	1211	glColor_premultiply @{ $self->{bg} };
1059
1060	glBegin GL_QUADS;
1061	glVertex 0 , 0;
1062	glVertex 0 , $h;
1063	glVertex $w, $h;	1212	glRect 0, 0, $w, $h;
1064	glVertex $w, 0;
1065	glEnd;
1066
1067	glDisable GL_BLEND;	1213	glDisable GL_BLEND;
1068	}	1214	}
1069		1215
1070	$self->SUPER::_draw;	1216	$self->SUPER::_draw;
1071	}	1217	}
1072		1218
1073	#############################################################################	1219	#############################################################################
1074		1220
1075	package CFClient::UI::FancyFrame;	1221	package CFPlus::UI::FancyFrame;
1076		1222
1077	our @ISA = CFClient::UI::Bin::;	1223	our @ISA = CFPlus::UI::Bin::;
1078		1224
1079	use CFClient::OpenGL;	1225	use CFPlus::OpenGL;
		1226
		1227	sub new {
		1228	my ($class, %arg) = @_;
		1229
		1230	if ((exists $arg{label}) && !ref $arg{label}) {
		1231	$arg{label} = new CFPlus::UI::Label
		1232	align => 1,
		1233	valign => 0,
		1234	text => $arg{label},
		1235	fontsize => ($arg{border} || 0.8) * 0.75;
		1236	}
		1237
		1238	my $self = $class->SUPER::new (
		1239	# label => "",
		1240	fg => [0.6, 0.3, 0.1],
		1241	border => 0.8,
		1242	style => 'single',
		1243	%arg,
		1244	);
		1245
		1246	$self
		1247	}
		1248
		1249	sub add {
		1250	my ($self, @widgets) = @_;
		1251
		1252	$self->SUPER::add (@widgets);
		1253	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1254	}
		1255
		1256	sub border {
		1257	int $_[0]{border} * $::FONTSIZE
		1258	}
		1259
		1260	sub size_request {
		1261	my ($self) = @_;
		1262
		1263	($self->{label_w}, undef) = $self->{label}->size_request
		1264	if $self->{label};
		1265
		1266	my ($w, $h) = $self->SUPER::size_request;
		1267
		1268	(
		1269	$w + $self->border * 2,
		1270	$h + $self->border * 2,
		1271	)
		1272	}
		1273
		1274	sub invoke_size_allocate {
		1275	my ($self, $w, $h) = @_;
		1276
		1277	my $border = $self->border;
		1278
		1279	$w -= List::Util::max 0, $border * 2;
		1280	$h -= List::Util::max 0, $border * 2;
		1281
		1282	if (my $label = $self->{label}) {
		1283	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1284	$label->{h} = List::Util::min $h, $border;
		1285	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1286	}
		1287
		1288	$self->child->configure ($border, $border, $w, $h);
		1289
		1290	1
		1291	}
		1292
		1293	sub _draw {
		1294	my ($self) = @_;
		1295
		1296	my $child = $self->{children}[0];
		1297
		1298	my $border = $self->border;
		1299	my ($w, $h) = ($self->{w}, $self->{h});
		1300
		1301	$child->draw;
		1302
		1303	glColor @{$self->{fg}};
		1304	glBegin GL_LINE_STRIP;
		1305	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1306	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1307	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1308	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1309	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1310	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1311	glEnd;
		1312
		1313	if ($self->{label}) {
		1314	glTranslate $border * 2, 0;
		1315	$self->{label}->_draw;
		1316	}
		1317	}
		1318
		1319	#############################################################################
		1320
		1321	package CFPlus::UI::Toplevel;
		1322
		1323	our @ISA = CFPlus::UI::Bin::;
		1324
		1325	use CFPlus::OpenGL;
1080		1326
1081	my $bg =	1327	my $bg =
1082	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1328	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1083	mipmap => 1, wrap => 1;	1329	mipmap => 1, wrap => 1;
1084		1330
1085	my @border =	1331	my @border =
1086	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1332	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1087	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1333	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1334
		1335	my @icon =
		1336	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1337	qw(x1_move.png x1_resize.png);
1088		1338
1089	sub new {	1339	sub new {
1090	my ($class, %arg) = @_;	1340	my ($class, %arg) = @_;
1091		1341
1092	my $self = $class->SUPER::new (	1342	my $self = $class->SUPER::new (
…		…
1097	min_w => 64,	1347	min_w => 64,
1098	min_h => 32,	1348	min_h => 32,
1099	%arg,	1349	%arg,
1100	);	1350	);
1101		1351
1102	$self->{title_widget} = new CFClient::UI::Label	1352	$self->{title_widget} = new CFPlus::UI::Label
1103	align => 0,	1353	align => 0,
1104	valign => 1,	1354	valign => 1,
1105	text => $self->{title},	1355	text => $self->{title},
1106	fontsize => $self->{border},	1356	fontsize => $self->{border},
1107	if exists $self->{title};	1357	if exists $self->{title};
1108		1358
1109	if ($self->{has_close_button}) {	1359	if ($self->{has_close_button}) {
1110	$self->{close_button} =	1360	$self->{close_button} =
1111	new CFClient::UI::ImageButton	1361	new CFPlus::UI::ImageButton
1112	path => 'x1_close.png',	1362	path => 'x1_close.png',
1113	on_activate => sub { $self->emit ("delete") };	1363	on_activate => sub { $self->emit ("delete") };
1114		1364
1115	$self->CFClient::UI::Container::add ($self->{close_button});	1365	$self->CFPlus::UI::Container::add ($self->{close_button});
1116	}	1366	}
1117		1367
1118	$self	1368	$self
1119	}	1369	}
1120		1370
1121	sub add {	1371	sub add {
1122	my ($self, @widgets) = @_;	1372	my ($self, @widgets) = @_;
1123		1373
1124	$self->SUPER::add (@widgets);	1374	$self->SUPER::add (@widgets);
1125	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1375	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1126	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1376	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1127	}	1377	}
1128		1378
1129	sub border {	1379	sub border {
1130	int $_[0]{border} * $::FONTSIZE	1380	int $_[0]{border} * $::FONTSIZE
1131	}	1381	}
…		…
1239	$self->{motion}->($ev, $x, $y) if $self->{motion};	1489	$self->{motion}->($ev, $x, $y) if $self->{motion};
1240		1490
1241	! ! $self->{motion}	1491	! ! $self->{motion}
1242	}	1492	}
1243		1493
		1494	sub invoke_visibility_change {
		1495	my ($self, $visible) = @_;
		1496
		1497	delete $self->{motion} unless $visible;
		1498
		1499	0
		1500	}
		1501
1244	sub _draw {	1502	sub _draw {
1245	my ($self) = @_;	1503	my ($self) = @_;
1246		1504
1247	my $child = $self->{children}[0];	1505	my $child = $self->{children}[0];
1248		1506
…		…
1253	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1511	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1254		1512
1255	my $border = $self->border;	1513	my $border = $self->border;
1256		1514
1257	glColor @{ $self->{border_bg} };	1515	glColor @{ $self->{border_bg} };
1258	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1516	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1259	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1517	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1260	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1518	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1261	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1519	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1520
		1521	# move
		1522	my $w2 = ($w - $border) * .5;
		1523	my $h2 = ($h - $border) * .5;
		1524	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1525	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1526	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1527
		1528	# resize
		1529	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1530	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1531	unless $self->{has_close_button};
		1532	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1533	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1262		1534
1263	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1535	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1264	glColor @{ $self->{bg} };	1536	glColor @{ $self->{bg} };
1265		1537
1266	# TODO: repeat texture not scale	1538	# TODO: repeat texture not scale
…		…
1285	if $self->{close_button};	1557	if $self->{close_button};
1286	}	1558	}
1287		1559
1288	#############################################################################	1560	#############################################################################
1289		1561
1290	package CFClient::UI::Table;	1562	package CFPlus::UI::Table;
1291		1563
1292	our @ISA = CFClient::UI::Base::;	1564	our @ISA = CFPlus::UI::Container::;
1293		1565
1294	use List::Util qw(max sum);	1566	use List::Util qw(max sum);
1295		1567
1296	use CFClient::OpenGL;	1568	use CFPlus::OpenGL;
1297		1569
1298	sub new {	1570	sub new {
1299	my $class = shift;	1571	my $class = shift;
1300		1572
1301	$class->SUPER::new (	1573	$class->SUPER::new (
1302	col_expand => [],	1574	col_expand => [],
		1575	row_expand => [],
1303	@_,	1576	@_,
1304	)	1577	)
1305	}	1578	}
1306		1579
1307	sub children {
1308	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1309	}
1310
1311	sub add {	1580	sub add {
1312	my ($self, $x, $y, $child) = @_;	1581	my ($self, @widgets) = @_;
1313		1582
1314	$child->set_parent ($self);	1583	for my $child (@widgets) {
1315	$self->{children}[$y][$x] = $child;	1584	$child->{c_rowspan} ||= 1;
		1585	$child->{c_colspan} ||= 1;
		1586	}
1316		1587
1317	$self->realloc;	1588	$self->SUPER::add (@widgets);
1318	}	1589	}
1319		1590
1320	sub remove {	1591	sub add_at {
		1592	my $self = shift;
		1593
		1594	my @widgets;
		1595
		1596	while (@_) {
		1597	my ($col, $row, $child) = splice @_, 0, 3, ();
		1598
		1599	$child->{c_row} = $row;
		1600	$child->{c_col} = $col;
		1601
		1602	push @widgets, $child;
		1603	}
		1604
		1605	$self->add (@widgets);
		1606	}
		1607
		1608	sub get_wh {
1321	my ($self, $child) = @_;	1609	my ($self) = @_;
1322		1610
1323	# TODO: not yet implemented	1611	my (@w, @h);
1324	}
1325
1326	# TODO: move to container class maybe? send children a signal on removal?
1327	sub clear {
1328	my ($self) = @_;
1329		1612
1330	my @children = $self->children;	1613	my @children = $self->children;
1331	delete $self->{children};	1614
		1615	# first pass, columns
		1616	for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
		1617	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
		1618
		1619	my $sw = sum @w[$c .. $c + $cs - 1];
		1620
		1621	if ($w > $sw) {
		1622	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1623	}
1332		1624	}
1333	for (@children) {
1334	delete $_->{parent};
1335	$_->hide;
1336	}
1337		1625
1338	$self->realloc;	1626	# second pass, rows
1339	}	1627	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1340
1341	sub get_wh {
1342	my ($self) = @_;
1343
1344	my (@w, @h);
1345
1346	for my $y (0 .. $#{$self->{children}}) {
1347	my $row = $self->{children}[$y]
1348	or next;
1349
1350	for my $x (0 .. $#$row) {
1351	my $widget = $row->[$x]
1352	or next;
1353	my ($w, $h) = @$widget{qw(req_w req_h)};	1628	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1354		1629
1355	$w[$x] = max $w[$x], $w;	1630	my $sh = sum @h[$r .. $r + $rs - 1];
1356	$h[$y] = max $h[$y], $h;	1631
		1632	if ($h > $sh) {
		1633	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1357	}	1634	}
1358	}	1635	}
1359		1636
1360	(\@w, \@h)	1637	(\@w, \@h)
1361	}	1638	}
…		…
1377	my ($ws, $hs) = $self->get_wh;	1654	my ($ws, $hs) = $self->get_wh;
1378		1655
1379	my $req_w = (sum @$ws) || 1;	1656	my $req_w = (sum @$ws) || 1;
1380	my $req_h = (sum @$hs) || 1;	1657	my $req_h = (sum @$hs) || 1;
1381		1658
1382	# TODO: nicer code && do row_expand	1659	# now linearly scale the rows/columns to the allocated size
1383	my @col_expand = @{$self->{col_expand}};	1660	my @col_expand = @{$self->{col_expand}};
1384	@col_expand = (1) x @$ws unless @col_expand;	1661	@col_expand = (1) x @$ws unless @col_expand;
1385	my $col_expand = (sum @col_expand) || 1;	1662	my $col_expand = (sum @col_expand) || 1;
1386		1663
1387	# linearly scale sizes
1388	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1664	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1389	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1390		1665
1391	CFClient::UI::harmonize $ws;	1666	CFPlus::UI::harmonize $ws;
		1667
		1668	my @row_expand = @{$self->{row_expand}};
		1669	@row_expand = (1) x @$ws unless @row_expand;
		1670	my $row_expand = (sum @row_expand) || 1;
		1671
		1672	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1673
1392	CFClient::UI::harmonize $hs;	1674	CFPlus::UI::harmonize $hs;
1393		1675
1394	my $y;	1676	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1677	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1395		1678
1396	for my $r (0 .. $#{$self->{children}}) {	1679	for my $widget ($self->children) {
1397	my $row = $self->{children}[$r]	1680	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1398	or next;
1399		1681
1400	my $x = 0;	1682	$widget->configure (
1401	my $row_h = $hs->[$r];	1683	$x[$c], $y[$r],
		1684	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1402		1685	);
1403	for my $c (0 .. $#$row) {	1686	}
1404	my $col_w = $ws->[$c];
1405		1687
1406	if (my $widget = $row->[$c]) {	1688	1
1407	$widget->configure ($x, $y, $col_w, $row_h);	1689	}
1408	}
1409		1690
1410	$x += $col_w;	1691	#############################################################################
		1692
		1693	package CFPlus::UI::Fixed;
		1694
		1695	use List::Util qw(min max);
		1696
		1697	our @ISA = CFPlus::UI::Container::;
		1698
		1699	sub _scale($$$) {
		1700	my ($rel, $val, $max) = @_;
		1701
		1702	$rel ? $val * $max : $val
		1703	}
		1704
		1705	sub size_request {
		1706	my ($self) = @_;
		1707
		1708	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1709
		1710	# determine overall size by querying abs widgets
		1711	for my $child ($self->visible_children) {
		1712	unless ($child->{c_rel}) {
		1713	my $x = $child->{c_x};
		1714	my $y = $child->{c_y};
		1715
		1716	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1717	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1411	}	1718	}
		1719	}
1412		1720
1413	$y += $row_h;	1721	my $W = $x2 - $x1;
		1722	my $H = $y2 - $y1;
		1723
		1724	# now layout remaining widgets
		1725	for my $child ($self->visible_children) {
		1726	if ($child->{c_rel}) {
		1727	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1728	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1729
		1730	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1731	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
		1732	}
		1733	}
		1734
		1735	my $W = $x2 - $x1;
		1736	my $H = $y2 - $y1;
		1737
		1738	($W, $H)
		1739	}
		1740
		1741	sub invoke_size_allocate {
		1742	my ($self, $W, $H) = @_;
		1743
		1744	for my $child ($self->visible_children) {
		1745	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1746	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1747
		1748	$x += $child->{c_halign} * $child->{req_w};
		1749	$y += $child->{c_valign} * $child->{req_h};
		1750
		1751	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1414	}	1752	}
1415		1753
1416	1	1754	1
1417	}	1755	}
1418		1756
1419	sub find_widget {
1420	my ($self, $x, $y) = @_;
1421
1422	$x -= $self->{x};
1423	$y -= $self->{y};
1424
1425	my $res;
1426
1427	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1428	$res = $_->find_widget ($x, $y)
1429	and return $res;
1430	}
1431
1432	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1433	}
1434
1435	sub _draw {
1436	my ($self) = @_;
1437
1438	for (grep $_, @{$self->{children}}) {
1439	$_->draw for grep $_, @$_;
1440	}
1441	}
1442
1443	#############################################################################	1757	#############################################################################
1444		1758
1445	package CFClient::UI::Box;	1759	package CFPlus::UI::Box;
1446		1760
1447	our @ISA = CFClient::UI::Container::;	1761	our @ISA = CFPlus::UI::Container::;
1448		1762
1449	sub size_request {	1763	sub size_request {
1450	my ($self) = @_;	1764	my ($self) = @_;
		1765
		1766	my @children = $self->visible_children;
1451		1767
1452	$self->{vertical}	1768	$self->{vertical}
1453	? (	1769	? (
1454	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1770	(List::Util::max map $_->{req_w}, @children),
1455	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1771	(List::Util::sum map $_->{req_h}, @children),
1456	)	1772	)
1457	: (	1773	: (
1458	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1774	(List::Util::sum map $_->{req_w}, @children),
1459	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1775	(List::Util::max map $_->{req_h}, @children),
1460	)	1776	)
1461	}	1777	}
1462		1778
1463	sub invoke_size_allocate {	1779	sub invoke_size_allocate {
1464	my ($self, $w, $h) = @_;	1780	my ($self, $w, $h) = @_;
…		…
1485	$req[$_] += $space * $children[$_]{expand}	1801	$req[$_] += $space * $children[$_]{expand}
1486	for 0 .. $#children;	1802	for 0 .. $#children;
1487	}	1803	}
1488	}	1804	}
1489		1805
1490	CFClient::UI::harmonize \@req;	1806	CFPlus::UI::harmonize \@req;
1491		1807
1492	my $pos = 0;	1808	my $pos = 0;
1493	for (0 .. $#children) {	1809	for (0 .. $#children) {
1494	my $alloc = $req[$_];	1810	my $alloc = $req[$_];
1495	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1811	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1500	1	1816	1
1501	}	1817	}
1502		1818
1503	#############################################################################	1819	#############################################################################
1504		1820
1505	package CFClient::UI::HBox;	1821	package CFPlus::UI::HBox;
1506		1822
1507	our @ISA = CFClient::UI::Box::;	1823	our @ISA = CFPlus::UI::Box::;
1508		1824
1509	sub new {	1825	sub new {
1510	my $class = shift;	1826	my $class = shift;
1511		1827
1512	$class->SUPER::new (	1828	$class->SUPER::new (
…		…
1515	)	1831	)
1516	}	1832	}
1517		1833
1518	#############################################################################	1834	#############################################################################
1519		1835
1520	package CFClient::UI::VBox;	1836	package CFPlus::UI::VBox;
1521		1837
1522	our @ISA = CFClient::UI::Box::;	1838	our @ISA = CFPlus::UI::Box::;
1523		1839
1524	sub new {	1840	sub new {
1525	my $class = shift;	1841	my $class = shift;
1526		1842
1527	$class->SUPER::new (	1843	$class->SUPER::new (
…		…
1530	)	1846	)
1531	}	1847	}
1532		1848
1533	#############################################################################	1849	#############################################################################
1534		1850
1535	package CFClient::UI::Label;	1851	package CFPlus::UI::Label;
1536		1852
1537	our @ISA = CFClient::UI::DrawBG::;	1853	our @ISA = CFPlus::UI::DrawBG::;
1538		1854
1539	use CFClient::OpenGL;	1855	use CFPlus::OpenGL;
1540		1856
1541	sub new {	1857	sub new {
1542	my ($class, %arg) = @_;	1858	my ($class, %arg) = @_;
1543		1859
1544	my $self = $class->SUPER::new (	1860	my $self = $class->SUPER::new (
…		…
1547	#active_bg => none	1863	#active_bg => none
1548	#font => default_font	1864	#font => default_font
1549	#text => initial text	1865	#text => initial text
1550	#markup => initial narkup	1866	#markup => initial narkup
1551	#max_w => maximum pixel width	1867	#max_w => maximum pixel width
		1868	#style => 0, # render flags
1552	ellipsise => 3, # end	1869	ellipsise => 3, # end
1553	layout => (new CFClient::Layout),	1870	layout => (new CFPlus::Layout),
1554	fontsize => 1,	1871	fontsize => 1,
1555	align => -1,	1872	align => -1,
1556	valign => -1,	1873	valign => -1,
1557	padding_x => 2,	1874	padding_x => 2,
1558	padding_y => 2,	1875	padding_y => 2,
1559	can_events => 0,	1876	can_events => 0,
1560	%arg	1877	%arg
1561	);	1878	);
1562		1879
1563	if (exists $self->{template}) {	1880	if (exists $self->{template}) {
1564	my $layout = new CFClient::Layout;	1881	my $layout = new CFPlus::Layout;
1565	$layout->set_text (delete $self->{template});	1882	$layout->set_text (delete $self->{template});
1566	$self->{template} = $layout;	1883	$self->{template} = $layout;
1567	}	1884	}
1568		1885
1569	if (exists $self->{markup}) {	1886	if (exists $self->{markup}) {
…		…
1573	}	1890	}
1574		1891
1575	$self	1892	$self
1576	}	1893	}
1577		1894
1578	sub escape($) {
1579	local $_ = $_[0];
1580
1581	s/&/&amp;/g;
1582	s/>/&gt;/g;
1583	s/</&lt;/g;
1584
1585	$_
1586	}
1587
1588	sub update {	1895	sub update {
1589	my ($self) = @_;	1896	my ($self) = @_;
1590		1897
1591	delete $self->{texture};	1898	delete $self->{texture};
1592	$self->SUPER::update;	1899	$self->SUPER::update;
…		…
1595	sub realloc {	1902	sub realloc {
1596	my ($self) = @_;	1903	my ($self) = @_;
1597		1904
1598	delete $self->{ox};	1905	delete $self->{ox};
1599	$self->SUPER::realloc;	1906	$self->SUPER::realloc;
		1907	}
		1908
		1909	sub clear {
		1910	my ($self) = @_;
		1911
		1912	$self->set_text ("");
1600	}	1913	}
1601		1914
1602	sub set_text {	1915	sub set_text {
1603	my ($self, $text) = @_;	1916	my ($self, $text) = @_;
1604		1917
…		…
1712	: ($self->{w} - $size->[0]) * 0.5);	2025	: ($self->{w} - $size->[0]) * 0.5);
1713		2026
1714	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2027	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1715	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2028	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1716	: ($self->{h} - $size->[1]) * 0.5);	2029	: ($self->{h} - $size->[1]) * 0.5);
		2030
		2031	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1717	};	2032	};
1718		2033
1719	my $w = List::Util::min $self->{w} + 4, $size->[0];	2034	# unless ($self->{list}) {
1720	my $h = List::Util::min $self->{h} + 2, $size->[1];	2035	# $self->{list} = CFPlus::OpenGL::glGenList;
1721		2036	# CFPlus::OpenGL::glNewList $self->{list};
1722	$self->{layout}->render ($self->{ox}, $self->{oy});	2037	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
		2038	# CFPlus::OpenGL::glEndList;
		2039	# }
		2040	#
		2041	# CFPlus::OpenGL::glCallList $self->{list};
		2042
		2043	$self->{layout}->draw;
1723	}	2044	}
		2045
		2046	#sub destroy {
		2047	# my ($self) = @_;
		2048	#
		2049	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2050	#
		2051	# $self->SUPER::destroy;
		2052	#}
1724		2053
1725	#############################################################################	2054	#############################################################################
1726		2055
1727	package CFClient::UI::EntryBase;	2056	package CFPlus::UI::EntryBase;
1728		2057
1729	our @ISA = CFClient::UI::Label::;	2058	our @ISA = CFPlus::UI::Label::;
1730		2059
1731	use CFClient::OpenGL;	2060	use CFPlus::OpenGL;
1732		2061
1733	sub new {	2062	sub new {
1734	my $class = shift;	2063	my $class = shift;
1735		2064
1736	$class->SUPER::new (	2065	$class->SUPER::new (
1737	fg => [1, 1, 1],	2066	fg => [1, 1, 1],
1738	bg => [0, 0, 0, 0.2],	2067	bg => [0, 0, 0, 0.2],
		2068	outline => [0.6, 0.3, 0.1],
1739	active_bg => [1, 1, 1, 0.5],	2069	active_bg => [0, 0, 1, .2],
1740	active_fg => [0, 0, 0],	2070	active_fg => [1, 1, 1],
		2071	active_outline => [1, 1, 0],
1741	can_hover => 1,	2072	can_hover => 1,
1742	can_focus => 1,	2073	can_focus => 1,
1743	valign => 0,	2074	valign => 0,
1744	can_events => 1,	2075	can_events => 1,
		2076	ellipsise => 0,
1745	#text => ...	2077	#text => ...
1746	#hidden => "*",	2078	#hidden => "*",
1747	@_	2079	@_
1748	)	2080	)
1749	}	2081	}
…		…
1794	my $sym = $ev->{sym};	2126	my $sym = $ev->{sym};
1795	my $uni = $ev->{unicode};	2127	my $uni = $ev->{unicode};
1796		2128
1797	my $text = $self->get_text;	2129	my $text = $self->get_text;
1798		2130
		2131	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2132
1799	if ($uni == 8) {	2133	if ($uni == 8) {
1800	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2134	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1801	} elsif ($uni == 127) {	2135	} elsif ($uni == 127) {
1802	substr $text, $self->{cursor}, 1, "";	2136	substr $text, $self->{cursor}, 1, "";
1803	} elsif ($sym == CFClient::SDLK_LEFT) {	2137	} elsif ($sym == CFPlus::SDLK_LEFT) {
1804	--$self->{cursor} if $self->{cursor};	2138	--$self->{cursor} if $self->{cursor};
1805	} elsif ($sym == CFClient::SDLK_RIGHT) {	2139	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1806	++$self->{cursor} if $self->{cursor} < length $self->{text};	2140	++$self->{cursor} if $self->{cursor} < length $self->{text};
1807	} elsif ($sym == CFClient::SDLK_HOME) {	2141	} elsif ($sym == CFPlus::SDLK_HOME) {
		2142	# what a hack
		2143	$self->{cursor} =
		2144	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2145	? length $1
		2146	: 0;
		2147	} elsif ($sym == CFPlus::SDLK_END) {
		2148	# uh, again
		2149	$self->{cursor} =
		2150	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2151	? $self->{cursor} + length $1
		2152	: length $self->{text};
		2153	} elsif ($uni == 21) { # ctrl-u
		2154	$text = "";
1808	$self->{cursor} = 0;	2155	$self->{cursor} = 0;
1809	} elsif ($sym == CFClient::SDLK_END) {
1810	$self->{cursor} = length $text;
1811	} elsif ($uni == 27) {	2156	} elsif ($uni == 27) {
1812	$self->emit ('escape');	2157	$self->emit ('escape');
1813	} elsif ($uni) {	2158	} elsif ($uni == 0x0d) {
		2159	substr $text, $self->{cursor}++, 0, "\012";
		2160	} elsif ($uni >= 0x20) {
1814	substr $text, $self->{cursor}++, 0, chr $uni;	2161	substr $text, $self->{cursor}++, 0, chr $uni;
1815	} else {	2162	} else {
1816	return 0;	2163	return 0;
1817	}	2164	}
1818		2165
1819	$self->_set_text ($text);	2166	$self->_set_text ($text);
1820		2167
1821	$self->realloc;	2168	$self->realloc;
		2169	$self->update;
1822		2170
1823	1	2171	1
1824	}	2172	}
1825		2173
1826	sub invoke_focus_in {	2174	sub invoke_focus_in {
…		…
1868	glColor_premultiply @{$self->{bg}};	2216	glColor_premultiply @{$self->{bg}};
1869	}	2217	}
1870		2218
1871	glEnable GL_BLEND;	2219	glEnable GL_BLEND;
1872	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2220	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1873	glBegin GL_QUADS;
1874	glVertex 0 , 0;
1875	glVertex 0 , $self->{h};
1876	glVertex $self->{w}, $self->{h};	2221	glRect 0, 0, $self->{w}, $self->{h};
1877	glVertex $self->{w}, 0;
1878	glEnd;
1879	glDisable GL_BLEND;	2222	glDisable GL_BLEND;
1880		2223
1881	$self->SUPER::_draw;	2224	$self->SUPER::_draw;
1882		2225
1883	#TODO: force update every cursor change :(	2226	#TODO: force update every cursor change :(
…		…
1885		2228
1886	unless (exists $self->{cur_h}) {	2229	unless (exists $self->{cur_h}) {
1887	my $text = substr $self->{text}, 0, $self->{cursor};	2230	my $text = substr $self->{text}, 0, $self->{cursor};
1888	utf8::encode $text;	2231	utf8::encode $text;
1889		2232
1890	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2233	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1891	}	2234	}
1892		2235
1893	glColor @{$self->{fg}};	2236	glColor_premultiply @{$self->{active_fg}};
1894	glBegin GL_LINES;	2237	glBegin GL_LINES;
1895	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2238	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1896	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2239	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1897	glEnd;	2240	glEnd;
1898	}
1899	}
1900		2241
		2242	glLineWidth 3;
		2243	glColor @{$self->{active_outline}};
		2244	glRect_lineloop 0, 0, $self->{w} - 1, $self->{h} - 1;
		2245	glLineWidth 1;
		2246
		2247	} else {
		2248	glColor @{$self->{outline}};
		2249	glTranslate .375, .375;
		2250	glBegin GL_LINE_STRIP;
		2251	glVertex 0, $self->{h} * .5;
		2252	glVertex 0, $self->{h} - 3;
		2253	glVertex $self->{w} - 1, $self->{h} - 3;
		2254	glVertex $self->{w} - 1, $self->{h} * .5;
		2255	glEnd;
		2256	}
		2257	}
		2258
		2259	#############################################################################
		2260
1901	package CFClient::UI::Entry;	2261	package CFPlus::UI::Entry;
1902		2262
1903	our @ISA = CFClient::UI::EntryBase::;	2263	our @ISA = CFPlus::UI::EntryBase::;
1904		2264
1905	use CFClient::OpenGL;	2265	use CFPlus::OpenGL;
1906		2266
1907	sub invoke_key_down {	2267	sub invoke_key_down {
1908	my ($self, $ev) = @_;	2268	my ($self, $ev) = @_;
1909		2269
1910	my $sym = $ev->{sym};	2270	my $sym = $ev->{sym};
1911		2271
1912	if ($sym == 13) {	2272	if ($ev->{uni} == 0x0d || $sym == 13) {
1913	unshift @{$self->{history}},	2273	unshift @{$self->{history}},
1914	my $txt = $self->get_text;	2274	my $txt = $self->get_text;
1915		2275
1916	$self->{history_pointer} = -1;	2276	$self->{history_pointer} = -1;
1917	$self->{history_saveback} = '';	2277	$self->{history_saveback} = '';
1918	$self->emit (activate => $txt);	2278	$self->emit (activate => $txt);
1919	$self->update;	2279	$self->update;
1920		2280
1921	} elsif ($sym == CFClient::SDLK_UP) {	2281	} elsif ($sym == CFPlus::SDLK_UP) {
1922	if ($self->{history_pointer} < 0) {	2282	if ($self->{history_pointer} < 0) {
1923	$self->{history_saveback} = $self->get_text;	2283	$self->{history_saveback} = $self->get_text;
1924	}	2284	}
1925	if (@{$self->{history} || []} > 0) {	2285	if (@{$self->{history} || []} > 0) {
1926	$self->{history_pointer}++;	2286	$self->{history_pointer}++;
…		…
1928	$self->{history_pointer} = @{$self->{history} || []} - 1;	2288	$self->{history_pointer} = @{$self->{history} || []} - 1;
1929	}	2289	}
1930	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2290	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1931	}	2291	}
1932		2292
1933	} elsif ($sym == CFClient::SDLK_DOWN) {	2293	} elsif ($sym == CFPlus::SDLK_DOWN) {
1934	$self->{history_pointer}--;	2294	$self->{history_pointer}--;
1935	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2295	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1936		2296
1937	if ($self->{history_pointer} >= 0) {	2297	if ($self->{history_pointer} >= 0) {
1938	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2298	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1947	1	2307	1
1948	}	2308	}
1949		2309
1950	#############################################################################	2310	#############################################################################
1951		2311
		2312	package CFPlus::UI::TextEdit;
		2313
		2314	our @ISA = CFPlus::UI::EntryBase::;
		2315
		2316	use CFPlus::OpenGL;
		2317
		2318	sub move_cursor_ver {
		2319	my ($self, $dy) = @_;
		2320
		2321	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2322
		2323	$y += $dy;
		2324
		2325	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2326	$self->{cursor} = $index;
		2327	delete $self->{cur_h};
		2328	$self->update;
		2329	return;
		2330	}
		2331	}
		2332
		2333	sub invoke_key_down {
		2334	my ($self, $ev) = @_;
		2335
		2336	my $sym = $ev->{sym};
		2337
		2338	if ($sym == CFPlus::SDLK_UP) {
		2339	$self->move_cursor_ver (-1);
		2340	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2341	$self->move_cursor_ver (+1);
		2342	} else {
		2343	return $self->SUPER::invoke_key_down ($ev)
		2344	}
		2345
		2346	1
		2347	}
		2348
		2349	#############################################################################
		2350
1952	package CFClient::UI::Button;	2351	package CFPlus::UI::ButtonBin;
1953		2352
1954	our @ISA = CFClient::UI::Label::;	2353	our @ISA = CFPlus::UI::Bin::;
1955		2354
1956	use CFClient::OpenGL;	2355	use CFPlus::OpenGL;
1957		2356
1958	my @tex =	2357	my @tex =
1959	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2358	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1960	qw(b1_button_active.png);	2359	qw(b1_button_inactive.png b1_button_active.png);
1961		2360
1962	sub new {	2361	sub new {
1963	my $class = shift;	2362	my $class = shift;
1964		2363
1965	$class->SUPER::new (	2364	$class->SUPER::new (
1966	padding_x => 4,
1967	padding_y => 4,
1968	fg => [1, 1, 1],
1969	active_fg => [0, 0, 1],
1970	can_hover => 1,	2365	can_hover => 1,
1971	align => 0,	2366	align => 0,
1972	valign => 0,	2367	valign => 0,
1973	can_events => 1,	2368	can_events => 1,
1974	@_	2369	@_
…		…
1986	}	2381	}
1987		2382
1988	sub _draw {	2383	sub _draw {
1989	my ($self) = @_;	2384	my ($self) = @_;
1990		2385
1991	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1992
1993	glEnable GL_TEXTURE_2D;	2386	glEnable GL_TEXTURE_2D;
1994	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2387	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1995	glColor 0, 0, 0, 1;	2388	glColor 0, 0, 0, 1;
1996		2389
		2390	my $tex = $tex[$GRAB == $self];
1997	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2391	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1998		2392
1999	glDisable GL_TEXTURE_2D;	2393	glDisable GL_TEXTURE_2D;
2000		2394
2001	$self->SUPER::_draw;	2395	$self->SUPER::_draw;
2002	}	2396	}
2003		2397
2004	#############################################################################	2398	#############################################################################
2005		2399
		2400	package CFPlus::UI::Button;
		2401
		2402	our @ISA = CFPlus::UI::Label::;
		2403
		2404	use CFPlus::OpenGL;
		2405
		2406	my @tex =
		2407	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2408	qw(b1_button_inactive.png b1_button_active.png);
		2409
		2410	sub new {
		2411	my $class = shift;
		2412
		2413	$class->SUPER::new (
		2414	padding_x => 4,
		2415	padding_y => 4,
		2416	fg => [1.0, 1.0, 1.0],
		2417	active_fg => [0.8, 0.8, 0.8],
		2418	can_hover => 1,
		2419	align => 0,
		2420	valign => 0,
		2421	can_events => 1,
		2422	@_
		2423	)
		2424	}
		2425
		2426	sub invoke_button_up {
		2427	my ($self, $ev, $x, $y) = @_;
		2428
		2429	$self->emit ("activate")
		2430	if $x >= 0 && $x < $self->{w}
		2431	&& $y >= 0 && $y < $self->{h};
		2432
		2433	1
		2434	}
		2435
		2436	sub _draw {
		2437	my ($self) = @_;
		2438
		2439	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
		2440
		2441	glEnable GL_TEXTURE_2D;
		2442	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2443	glColor 0, 0, 0, 1;
		2444
		2445	my $tex = $tex[$GRAB == $self];
		2446	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2447
		2448	glDisable GL_TEXTURE_2D;
		2449
		2450	$self->SUPER::_draw;
		2451	}
		2452
		2453	#############################################################################
		2454
		2455	package CFPlus::UI::CheckBox;
		2456
		2457	our @ISA = CFPlus::UI::DrawBG::;
		2458
		2459	my @tex =
		2460	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2461	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2462
		2463	use CFPlus::OpenGL;
		2464
		2465	sub new {
		2466	my $class = shift;
		2467
		2468	$class->SUPER::new (
		2469	padding_x => 2,
		2470	padding_y => 2,
		2471	fg => [1, 1, 1],
		2472	active_fg => [1, 1, 0],
		2473	bg => [0, 0, 0, 0.2],
		2474	active_bg => [1, 1, 1, 0.5],
		2475	state => 0,
		2476	can_hover => 1,
		2477	@_
		2478	)
		2479	}
		2480
		2481	sub size_request {
		2482	my ($self) = @_;
		2483
		2484	(6) x 2
		2485	}
		2486
		2487	sub toggle {
		2488	my ($self) = @_;
		2489
		2490	$self->{state} = !$self->{state};
		2491	$self->emit (changed => $self->{state});
		2492	$self->update;
		2493	}
		2494
		2495	sub invoke_button_down {
		2496	my ($self, $ev, $x, $y) = @_;
		2497
		2498	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2499	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2500	$self->toggle;
		2501	} else {
		2502	return 0
		2503	}
		2504
		2505	1
		2506	}
		2507
		2508	sub _draw {
		2509	my ($self) = @_;
		2510
		2511	$self->SUPER::_draw;
		2512
		2513	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2514
		2515	my ($w, $h) = @$self{qw(w h)};
		2516
		2517	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2518
		2519	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2520
		2521	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2522
		2523	glEnable GL_TEXTURE_2D;
		2524	$tex->draw_quad_alpha (0, 0, $s, $s);
		2525	glDisable GL_TEXTURE_2D;
		2526	}
		2527
		2528	#############################################################################
		2529
		2530	package CFPlus::UI::Image;
		2531
		2532	our @ISA = CFPlus::UI::Base::;
		2533
		2534	use CFPlus::OpenGL;
		2535
		2536	our %texture_cache;
		2537
		2538	sub new {
		2539	my $class = shift;
		2540
		2541	my $self = $class->SUPER::new (
		2542	can_events => 0,
		2543	scale => 1,
		2544	@_,
		2545	);
		2546
		2547	$self->{path} || $self->{tex}
		2548	or Carp::croak "'path' or 'tex' attributes required";
		2549
		2550	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2551	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2552
		2553	CFPlus::weaken $texture_cache{$self->{path}};
		2554
		2555	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2556
		2557	$self
		2558	}
		2559
		2560	sub STORABLE_freeze {
		2561	my ($self, $cloning) = @_;
		2562
		2563	$self->{path}
		2564	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2565
		2566	$self->{path}
		2567	}
		2568
		2569	sub STORABLE_attach {
		2570	my ($self, $cloning, $path) = @_;
		2571
		2572	$self->new (path => $path)
		2573	}
		2574
		2575	sub size_request {
		2576	my ($self) = @_;
		2577
		2578	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
		2579	}
		2580
		2581	sub _draw {
		2582	my ($self) = @_;
		2583
		2584	my $tex = $self->{tex};
		2585
		2586	my ($w, $h) = ($self->{w}, $self->{h});
		2587
		2588	if ($self->{rot90}) {
		2589	glRotate 90, 0, 0, 1;
		2590	glTranslate 0, -$self->{w}, 0;
		2591
		2592	($w, $h) = ($h, $w);
		2593	}
		2594
		2595	glEnable GL_TEXTURE_2D;
		2596	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2597
		2598	$tex->draw_quad_alpha (0, 0, $w, $h);
		2599
		2600	glDisable GL_TEXTURE_2D;
		2601	}
		2602
		2603	#############################################################################
		2604
2006	package CFClient::UI::ImageButton;	2605	package CFPlus::UI::ImageButton;
2007		2606
2008	our @ISA = CFClient::UI::Image::;	2607	our @ISA = CFPlus::UI::Image::;
2009		2608
2010	use CFClient::OpenGL;	2609	use CFPlus::OpenGL;
2011		2610
2012	my %textures;	2611	my %textures;
2013		2612
2014	sub new {	2613	sub new {
2015	my $class = shift;	2614	my $class = shift;
…		…
2025	can_events => 1,	2624	can_events => 1,
2026	@_	2625	@_
2027	);	2626	);
2028	}	2627	}
2029		2628
		2629	sub invoke_button_down {
		2630	my ($self, $ev, $x, $y) = @_;
		2631
		2632	1
		2633	}
		2634
2030	sub invoke_button_up {	2635	sub invoke_button_up {
2031	my ($self, $ev, $x, $y) = @_;	2636	my ($self, $ev, $x, $y) = @_;
2032		2637
2033	$self->emit ("activate")	2638	$self->emit ("activate")
2034	if $x >= 0 && $x < $self->{w}	2639	if $x >= 0 && $x < $self->{w}
…		…
2037	1	2642	1
2038	}	2643	}
2039		2644
2040	#############################################################################	2645	#############################################################################
2041		2646
2042	package CFClient::UI::CheckBox;
2043
2044	our @ISA = CFClient::UI::DrawBG::;
2045
2046	my @tex =
2047	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2048	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2049
2050	use CFClient::OpenGL;
2051
2052	sub new {
2053	my $class = shift;
2054
2055	$class->SUPER::new (
2056	padding_x => 2,
2057	padding_y => 2,
2058	fg => [1, 1, 1],
2059	active_fg => [1, 1, 0],
2060	bg => [0, 0, 0, 0.2],
2061	active_bg => [1, 1, 1, 0.5],
2062	state => 0,
2063	can_hover => 1,
2064	@_
2065	)
2066	}
2067
2068	sub size_request {
2069	my ($self) = @_;
2070
2071	(6) x 2
2072	}
2073
2074	sub toggle {
2075	my ($self) = @_;
2076
2077	$self->{state} = !$self->{state};
2078	$self->emit (changed => $self->{state});
2079	$self->update;
2080	}
2081
2082	sub invoke_button_down {
2083	my ($self, $ev, $x, $y) = @_;
2084
2085	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2086	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2087	$self->toggle;
2088	} else {
2089	return 0
2090	}
2091
2092	1
2093	}
2094
2095	sub _draw {
2096	my ($self) = @_;
2097
2098	$self->SUPER::_draw;
2099
2100	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2101
2102	my ($w, $h) = @$self{qw(w h)};
2103
2104	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2105
2106	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2107
2108	my $tex = $self->{state} ? $tex[1] : $tex[0];
2109
2110	glEnable GL_TEXTURE_2D;
2111	$tex->draw_quad_alpha (0, 0, $s, $s);
2112	glDisable GL_TEXTURE_2D;
2113	}
2114
2115	#############################################################################
2116
2117	package CFClient::UI::Image;	2647	package CFPlus::UI::VGauge;
2118		2648
2119	our @ISA = CFClient::UI::Base::;	2649	our @ISA = CFPlus::UI::Base::;
2120
2121	use CFClient::OpenGL;
2122
2123	our %texture_cache;
2124
2125	sub new {
2126	my $class = shift;
2127
2128	my $self = $class->SUPER::new (
2129	can_events => 0,
2130	@_,
2131	);
2132
2133	$self->{path} || $self->{tex}
2134	or Carp::croak "'path' or 'tex' attributes required";
2135
2136	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2137	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2138
2139	Scalar::Util::weaken $texture_cache{$self->{path}};
2140
2141	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2142
2143	$self
2144	}
2145
2146	sub size_request {
2147	my ($self) = @_;
2148
2149	($self->{tex}{w}, $self->{tex}{h})
2150	}
2151
2152	sub _draw {
2153	my ($self) = @_;
2154
2155	my $tex = $self->{tex};
2156
2157	my ($w, $h) = ($self->{w}, $self->{h});
2158
2159	if ($self->{rot90}) {
2160	glRotate 90, 0, 0, 1;
2161	glTranslate 0, -$self->{w}, 0;
2162
2163	($w, $h) = ($h, $w);
2164	}
2165
2166	glEnable GL_TEXTURE_2D;
2167	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2168
2169	$tex->draw_quad_alpha (0, 0, $w, $h);
2170
2171	glDisable GL_TEXTURE_2D;
2172	}
2173
2174	#############################################################################
2175
2176	package CFClient::UI::VGauge;
2177
2178	our @ISA = CFClient::UI::Base::;
2179		2650
2180	use List::Util qw(min max);	2651	use List::Util qw(min max);
2181		2652
2182	use CFClient::OpenGL;	2653	use CFPlus::OpenGL;
2183		2654
2184	my %tex = (	2655	my %tex = (
2185	food => [	2656	food => [
2186	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2657	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2187	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2658	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2188	],	2659	],
2189	grace => [	2660	grace => [
2190	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2661	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2191	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2662	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2192	],	2663	],
2193	hp => [	2664	hp => [
2194	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2665	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2195	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2666	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2196	],	2667	],
2197	mana => [	2668	mana => [
2198	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2669	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2199	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2670	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2200	],	2671	],
2201	);	2672	);
2202		2673
2203	# eg. VGauge->new (gauge => 'food'), default gauge: food	2674	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2306	glDisable GL_TEXTURE_2D;	2777	glDisable GL_TEXTURE_2D;
2307	}	2778	}
2308		2779
2309	#############################################################################	2780	#############################################################################
2310		2781
		2782	package CFPlus::UI::Progress;
		2783
		2784	our @ISA = CFPlus::UI::Label::;
		2785
		2786	use CFPlus::OpenGL;
		2787
		2788	sub new {
		2789	my ($class, %arg) = @_;
		2790
		2791	my $self = $class->SUPER::new (
		2792	fg => [1, 1, 1],
		2793	bg => [0, 0, 1, 0.2],
		2794	bar => [0.7, 0.5, 0.1, 0.8],
		2795	outline => [0.4, 0.3, 0],
		2796	fontsize => 0.9,
		2797	valign => 0,
		2798	align => 0,
		2799	can_events => 1,
		2800	ellipsise => 1,
		2801	label => "%d%%",
		2802	%arg,
		2803	);
		2804
		2805	$self->set_value ($arg{value} || -1);
		2806
		2807	$self
		2808	}
		2809
		2810	sub set_label {
		2811	my ($self, $label) = @_;
		2812
		2813	return if $self->{label} eq $label;
		2814	$self->{label} = $label;
		2815
		2816	$self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
		2817	}
		2818
		2819	sub set_value {
		2820	my ($self, $value) = @_;
		2821
		2822	if ($self->{value} ne $value) {
		2823	$self->{value} = $value;
		2824
		2825	if ($value < 0) {
		2826	$self->set_text ("-");
		2827	} else {
		2828	$self->set_text (sprintf $self->{label}, $value * 100);
		2829	}
		2830
		2831	$self->update;
		2832	}
		2833	}
		2834
		2835	sub _draw {
		2836	my ($self) = @_;
		2837
		2838	glEnable GL_BLEND;
		2839	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2840
		2841	if ($self->{value} >= 0) {
		2842	my $s = 3 + ($self->{w} - 6) * $self->{value};
		2843
		2844	glColor_premultiply @{$self->{bar}};
		2845	glRect 2, 2, $s, $self->{h} - 2;
		2846	glColor_premultiply @{$self->{bg}};
		2847	glRect $s + 1, 0, $self->{w} - 2, $self->{h} - 2;
		2848	}
		2849
		2850	glColor_premultiply @{$self->{outline}};
		2851	glRect_lineloop 1, 1, $self->{w} - 2, $self->{h} - 2;
		2852
		2853	glDisable GL_BLEND;
		2854
		2855	{
		2856	local $self->{bg}; # do not draw background
		2857	$self->SUPER::_draw;
		2858	}
		2859	}
		2860
		2861	#############################################################################
		2862
		2863	package CFPlus::UI::ExperienceProgress;
		2864
		2865	our @ISA = CFPlus::UI::Progress::;
		2866
		2867	sub new {
		2868	my ($class, %arg) = @_;
		2869
		2870	my $self = $class->SUPER::new (
		2871	tooltip => sub {
		2872	my ($self) = @_;
		2873
		2874	sprintf "level %d\n%s points\n%s next level\n%s to go",
		2875	$self->{lvl},
		2876	::formsep ($self->{exp}),
		2877	::formsep ($self->{nxt}),
		2878	::formsep ($self->{nxt} - $self->{exp}),
		2879	},
		2880	%arg
		2881	);
		2882
		2883	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2884	if $::CONN;
		2885
		2886	$self
		2887	}
		2888
		2889	sub DESTROY {
		2890	my ($self) = @_;
		2891
		2892	delete $::CONN->{on_exp_update}{$self+0}
		2893	if $::CONN;
		2894
		2895	$self->SUPER::DESTROY;
		2896	}
		2897
		2898	sub set_value {
		2899	my ($self, $lvl, $exp) = @_;
		2900
		2901	<<<<<<< UI.pm
		2902	$self->{lvl} = $lvl;
		2903	$self->{exp} = $exp;
		2904
		2905	=======
		2906	$self->{lvl} = $exp;
		2907	$self->{exp} = $exp;
		2908
		2909	>>>>>>> 1.434
		2910	my $v = -1;
		2911
		2912	if ($::CONN && (my $table = $::CONN->{exp_table})) {
		2913	my $l0 = $table->[$lvl - 1];
		2914	my $l1 = $table->[$lvl];
		2915
		2916	$self->{nxt} = $l1;
		2917
		2918	$v = ($exp - $l0) / ($l1 - $l0);
		2919	}
		2920
		2921	$self->SUPER::set_value ($v);
		2922	}
		2923
		2924	#############################################################################
		2925
2311	package CFClient::UI::Gauge;	2926	package CFPlus::UI::Gauge;
2312		2927
2313	our @ISA = CFClient::UI::VBox::;	2928	our @ISA = CFPlus::UI::VBox::;
2314		2929
2315	sub new {	2930	sub new {
2316	my ($class, %arg) = @_;	2931	my ($class, %arg) = @_;
2317		2932
2318	my $self = $class->SUPER::new (	2933	my $self = $class->SUPER::new (
…		…
2320	can_hover => 1,	2935	can_hover => 1,
2321	can_events => 1,	2936	can_events => 1,
2322	%arg,	2937	%arg,
2323	);	2938	);
2324		2939
2325	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2940	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2326	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2941	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2327	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2942	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2328		2943
2329	$self	2944	$self
2330	}	2945	}
2331		2946
2332	sub set_fontsize {	2947	sub set_fontsize {
…		…
2353	$self->{value}->set_text ($val);	2968	$self->{value}->set_text ($val);
2354	}	2969	}
2355		2970
2356	#############################################################################	2971	#############################################################################
2357		2972
2358	package CFClient::UI::Slider;	2973	package CFPlus::UI::Slider;
2359		2974
2360	use strict;	2975	use strict;
2361		2976
2362	use CFClient::OpenGL;	2977	use CFPlus::OpenGL;
2363		2978
2364	our @ISA = CFClient::UI::DrawBG::;	2979	our @ISA = CFPlus::UI::DrawBG::;
2365		2980
2366	my @tex =	2981	my @tex =
2367	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2982	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2368	qw(s1_slider.png s1_slider_bg.png);	2983	qw(s1_slider.png s1_slider_bg.png);
2369		2984
2370	sub new {	2985	sub new {
2371	my $class = shift;	2986	my $class = shift;
2372		2987
…		…
2440		3055
2441	$self->SUPER::invoke_button_down ($ev, $x, $y);	3056	$self->SUPER::invoke_button_down ($ev, $x, $y);
2442		3057
2443	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3058	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2444		3059
2445	$self->invoke_mouse_motion ($ev, $x, $y)	3060	$self->invoke_mouse_motion ($ev, $x, $y);
		3061
		3062	1
2446	}	3063	}
2447		3064
2448	sub invoke_mouse_motion {	3065	sub invoke_mouse_motion {
2449	my ($self, $ev, $x, $y) = @_;	3066	my ($self, $ev, $x, $y) = @_;
2450		3067
…		…
2457		3074
2458	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	3075	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2459	} else {	3076	} else {
2460	return 0;	3077	return 0;
2461	}	3078	}
		3079
		3080	1
		3081	}
		3082
		3083	sub invoke_mouse_wheel {
		3084	my ($self, $ev) = @_;
		3085
		3086	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		3087
		3088	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		3089
		3090	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2462		3091
2463	1	3092	1
2464	}	3093	}
2465		3094
2466	sub update {	3095	sub update {
…		…
2517	glDisable GL_TEXTURE_2D;	3146	glDisable GL_TEXTURE_2D;
2518	}	3147	}
2519		3148
2520	#############################################################################	3149	#############################################################################
2521		3150
2522	package CFClient::UI::ValSlider;	3151	package CFPlus::UI::ValSlider;
2523		3152
2524	our @ISA = CFClient::UI::HBox::;	3153	our @ISA = CFPlus::UI::HBox::;
2525		3154
2526	sub new {	3155	sub new {
2527	my ($class, %arg) = @_;	3156	my ($class, %arg) = @_;
2528		3157
2529	my $range = delete $arg{range};	3158	my $range = delete $arg{range};
2530		3159
2531	my $self = $class->SUPER::new (	3160	my $self = $class->SUPER::new (
2532	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3161	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2533	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3162	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2534	to_value => sub { shift },	3163	to_value => sub { shift },
2535	from_value => sub { shift },	3164	from_value => sub { shift },
2536	%arg,	3165	%arg,
2537	);	3166	);
2538		3167
…		…
2558	sub set_range { shift->{slider}->set_range (@_) }	3187	sub set_range { shift->{slider}->set_range (@_) }
2559	sub set_value { shift->{slider}->set_value (@_) }	3188	sub set_value { shift->{slider}->set_value (@_) }
2560		3189
2561	#############################################################################	3190	#############################################################################
2562		3191
2563	package CFClient::UI::TextScroller;	3192	package CFPlus::UI::TextScroller;
2564		3193
2565	our @ISA = CFClient::UI::HBox::;	3194	our @ISA = CFPlus::UI::HBox::;
2566		3195
2567	use CFClient::OpenGL;	3196	use CFPlus::OpenGL;
2568		3197
2569	sub new {	3198	sub new {
2570	my $class = shift;	3199	my $class = shift;
2571		3200
2572	my $self = $class->SUPER::new (	3201	my $self = $class->SUPER::new (
2573	fontsize => 1,	3202	fontsize => 1,
2574	can_events => 0,	3203	can_events => 1,
2575	indent => 0,	3204	indent => 0,
2576	#font => default_font	3205	#font => default_font
2577	@_,	3206	@_,
2578		3207
2579	layout => (new CFClient::Layout),	3208	layout => (new CFPlus::Layout),
2580	par => [],	3209	par => [],
		3210	max_par => 0,
2581	height => 0,	3211	height => 0,
2582	children => [	3212	children => [
2583	(new CFClient::UI::Empty expand => 1),	3213	(new CFPlus::UI::Empty expand => 1),
2584	(new CFClient::UI::Slider vertical => 1),	3214	(new CFPlus::UI::Slider vertical => 1),
2585	],	3215	],
2586	);	3216	);
2587		3217
2588	$self->{children}[1]->connect (changed => sub { $self->update });	3218	$self->{children}[1]->connect (changed => sub { $self->update });
2589		3219
…		…
2598	}	3228	}
2599		3229
2600	sub size_request {	3230	sub size_request {
2601	my ($self) = @_;	3231	my ($self) = @_;
2602		3232
2603	my ($empty, $slider) = @{ $self->{children} };	3233	my ($empty, $slider) = $self->visible_children;
2604		3234
2605	local $self->{children} = [$empty, $slider];	3235	local $self->{children} = [$empty, $slider];
2606	$self->SUPER::size_request	3236	$self->SUPER::size_request
2607	}	3237	}
2608		3238
…		…
2619		3249
2620	$self->reflow;	3250	$self->reflow;
2621		3251
2622	local $self->{children} = [$empty, $slider];	3252	local $self->{children} = [$empty, $slider];
2623	$self->SUPER::invoke_size_allocate ($w, $h)	3253	$self->SUPER::invoke_size_allocate ($w, $h)
		3254	}
		3255
		3256	sub invoke_mouse_wheel {
		3257	my ($self, $ev) = @_;
		3258
		3259	return 0 unless $ev->{dy}; # only vertical movements
		3260
		3261	$self->{children}[1]->emit (mouse_wheel => $ev);
		3262
		3263	1
2624	}	3264	}
2625		3265
2626	sub get_layout {	3266	sub get_layout {
2627	my ($self, $para) = @_;	3267	my ($self, $para) = @_;
2628		3268
…		…
2656		3296
2657	# todo: base offset on lines or so, not on pixels	3297	# todo: base offset on lines or so, not on pixels
2658	$self->{children}[1]->set_value ($offset);	3298	$self->{children}[1]->set_value ($offset);
2659	}	3299	}
2660		3300
		3301	sub current_paragraph {
		3302	my ($self) = @_;
		3303
		3304	$self->{top_paragraph} - 1
		3305	}
		3306
		3307	sub scroll_to {
		3308	my ($self, $para) = @_;
		3309
		3310	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3311
		3312	$self->{scroll_to} = $para;
		3313	$self->update;
		3314	}
		3315
2661	sub clear {	3316	sub clear {
2662	my ($self) = @_;	3317	my ($self) = @_;
2663		3318
2664	my (undef, undef, @other) = @{ $self->{children} };	3319	my (undef, undef, @other) = @{ $self->{children} };
2665	$self->remove ($_) for @other;	3320	$self->remove ($_) for @other;
…		…
2668	$self->{height} = 0;	3323	$self->{height} = 0;
2669	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3324	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2670	}	3325	}
2671		3326
2672	sub add_paragraph {	3327	sub add_paragraph {
2673	my ($self, $color, $para, $indent) = @_;	3328	my $self = shift;
2674		3329
2675	my ($text, @w) = ref $para ? @$para : $para;	3330	for my $para (@_) {
2676
2677	$para = {	3331	$para = {
		3332	fg => [1, 1, 1, 1],
		3333	indent => 0,
		3334	markup => "",
		3335	widget => [],
		3336	ref $para ? %$para : (markup => $para),
2678	w => 1e10,	3337	w => 1e10,
2679	wrapped => 1,	3338	wrapped => 1,
2680	fg => $color,
2681	indent => $indent,
2682	markup => $text,
2683	widget => \@w,
2684	};	3339	};
2685		3340
2686	$self->add (@w) if @w;	3341	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2687	push @{$self->{par}}, $para;	3342	push @{$self->{par}}, $para;
		3343	}
		3344
		3345	if (my $max = $self->{max_par}) {
		3346	shift @{$self->{par}} while @{$self->{par}} > $max;
		3347	}
2688		3348
2689	$self->{need_reflow}++;	3349	$self->{need_reflow}++;
2690	$self->update;	3350	$self->update;
2691	}	3351	}
2692		3352
2693	sub scroll_to_bottom {	3353	sub scroll_to_bottom {
2694	my ($self) = @_;	3354	my ($self) = @_;
2695		3355
2696	$self->{scroll_to_bottom} = 1;	3356	$self->{scroll_to} = $#{$self->{par}};
2697	$self->update;	3357	$self->update;
2698	}	3358	}
2699		3359
		3360	sub force_uptodate {
		3361	my ($self) = @_;
		3362
		3363	if (delete $self->{need_reflow}) {
		3364	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3365
		3366	my $height = 0;
		3367
		3368	for my $para (@{$self->{par}}) {
		3369	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3370	my $layout = $self->get_layout ($para);
		3371	my ($w, $h) = $layout->size;
		3372
		3373	$para->{w} = $w + $para->{indent};
		3374	$para->{h} = $h;
		3375	$para->{wrapped} = $layout->has_wrapped;
		3376	}
		3377
		3378	$para->{y} = $height;
		3379	$height += $para->{h};
		3380	}
		3381
		3382	$self->{height} = $height;
		3383	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3384
		3385	delete $self->{texture};
		3386	}
		3387
		3388	if (my $paridx = delete $self->{scroll_to}) {
		3389	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3390	}
		3391	}
		3392
2700	sub update {	3393	sub update {
2701	my ($self) = @_;	3394	my ($self) = @_;
2702		3395
2703	$self->SUPER::update;	3396	$self->SUPER::update;
2704		3397
2705	return unless $self->{h} > 0;	3398	return unless $self->{h} > 0;
2706		3399
2707	delete $self->{texture};	3400	delete $self->{texture};
2708		3401
2709	$ROOT->on_post_alloc ($self => sub {	3402	$ROOT->on_post_alloc ($self => sub {
		3403	$self->force_uptodate;
		3404
2710	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3405	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2711		3406
2712	if (delete $self->{need_reflow}) {
2713	my $height = 0;
2714
2715	for my $para (@{$self->{par}}) {
2716	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2717	my $layout = $self->get_layout ($para);
2718	my ($w, $h) = $layout->size;
2719
2720	$para->{w} = $w + $para->{indent};
2721	$para->{h} = $h;
2722	$para->{wrapped} = $layout->has_wrapped;
2723	}
2724
2725	$height += $para->{h};
2726	}
2727
2728	$self->{height} = $height;
2729
2730	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2731
2732	delete $self->{texture};
2733	}
2734
2735	if (delete $self->{scroll_to_bottom}) {
2736	$self->{children}[1]->set_value (1e10);
2737	}
2738
2739	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3407	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2740	glClearColor 0, 0, 0, 0;	3408	glClearColor 0, 0, 0, 0;
2741	glClear GL_COLOR_BUFFER_BIT;	3409	glClear GL_COLOR_BUFFER_BIT;
2742		3410
		3411	package CFPlus::UI::Base;
		3412	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3413	(0, 0, $self->{w}, $self->{h});
		3414
		3415	my $top = int $self->{children}[1]{range}[0];
		3416
		3417	my $paridx = 0;
		3418	my $top_paragraph;
2743	my $top = int $self->{children}[1]{range}[0];	3419	my $top = int $self->{children}[1]{range}[0];
2744		3420
2745	my $y0 = $top;	3421	my $y0 = $top;
2746	my $y1 = $top + $H;	3422	my $y1 = $top + $H;
2747		3423
2748	my $y = 0;
2749
2750	for my $para (@{$self->{par}}) {	3424	for my $para (@{$self->{par}}) {
2751	my $h = $para->{h};	3425	my $h = $para->{h};
		3426	my $y = $para->{y};
2752		3427
2753	if ($y0 < $y + $h && $y < $y1) {	3428	if ($y0 < $y + $h && $y < $y1) {
2754
2755	my $layout = $self->get_layout ($para);	3429	my $layout = $self->get_layout ($para);
2756		3430
2757	$layout->render ($para->{indent}, $y - $y0);	3431	$layout->render ($para->{indent}, $y - $y0);
		3432	$layout->draw;
2758		3433
2759	if (my @w = @{ $para->{widget} }) {	3434	if (my @w = @{ $para->{widget} }) {
2760	my @s = $layout->get_shapes;	3435	my @s = $layout->get_shapes;
2761		3436
2762	for (@w) {	3437	for (@w) {
…		…
2768	$_->draw;	3443	$_->draw;
2769	}	3444	}
2770	}	3445	}
2771	}	3446	}
2772		3447
2773	$y += $h;	3448	$paridx++;
		3449	$top_paragraph ||= $paridx if $y >= $top;
2774	}	3450	}
		3451
		3452	$self->{top_paragraph} = $top_paragraph;
2775	};	3453	};
2776	});	3454	});
2777	}	3455	}
2778		3456
2779	sub reconfigure {	3457	sub reconfigure {
…		…
2797	$self->{children}[1]->draw;	3475	$self->{children}[1]->draw;
2798	}	3476	}
2799		3477
2800	#############################################################################	3478	#############################################################################
2801		3479
2802	package CFClient::UI::Animator;	3480	package CFPlus::UI::Animator;
2803		3481
2804	use CFClient::OpenGL;	3482	use CFPlus::OpenGL;
2805		3483
2806	our @ISA = CFClient::UI::Bin::;	3484	our @ISA = CFPlus::UI::Bin::;
2807		3485
2808	sub moveto {	3486	sub moveto {
2809	my ($self, $x, $y) = @_;	3487	my ($self, $x, $y) = @_;
2810		3488
2811	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3489	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2839	glPopMatrix;	3517	glPopMatrix;
2840	}	3518	}
2841		3519
2842	#############################################################################	3520	#############################################################################
2843		3521
2844	package CFClient::UI::Flopper;	3522	package CFPlus::UI::Flopper;
2845		3523
2846	our @ISA = CFClient::UI::Button::;	3524	our @ISA = CFPlus::UI::Button::;
2847		3525
2848	sub new {	3526	sub new {
2849	my $class = shift;	3527	my $class = shift;
2850		3528
2851	my $self = $class->SUPER::new (	3529	my $self = $class->SUPER::new (
…		…
2863	$self->{other}->toggle_visibility;	3541	$self->{other}->toggle_visibility;
2864	}	3542	}
2865		3543
2866	#############################################################################	3544	#############################################################################
2867		3545
2868	package CFClient::UI::Tooltip;	3546	package CFPlus::UI::Tooltip;
2869		3547
2870	our @ISA = CFClient::UI::Bin::;	3548	our @ISA = CFPlus::UI::Bin::;
2871		3549
2872	use CFClient::OpenGL;	3550	use CFPlus::OpenGL;
2873		3551
2874	sub new {	3552	sub new {
2875	my $class = shift;	3553	my $class = shift;
2876		3554
2877	$class->SUPER::new (	3555	$class->SUPER::new (
…		…
2881	}	3559	}
2882		3560
2883	sub set_tooltip_from {	3561	sub set_tooltip_from {
2884	my ($self, $widget) = @_;	3562	my ($self, $widget) = @_;
2885		3563
2886	my $tooltip = $widget->{tooltip};	3564	my $tip = $widget->{tooltip};
		3565	$tip = $tip->($widget) if "CODE" eq ref $tip;
		3566
		3567	$tip = CFPlus::Pod::section_label tooltip => $1
		3568	if $tip =~ /^#(.*)$/;
2887		3569
2888	if ($ENV{CFPLUS_DEBUG} & 2) {	3570	if ($ENV{CFPLUS_DEBUG} & 2) {
2889	$tooltip .= "\n\n" . (ref $widget) . "\n"	3571	$tip .= "\n\n" . (ref $widget) . "\n"
2890	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3572	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2891	. "req $widget->{req_w} $widget->{req_h}\n"	3573	. "req $widget->{req_w} $widget->{req_h}\n"
2892	. "visible $widget->{visible}";	3574	. "visible $widget->{visible}";
2893	}	3575	}
2894		3576
2895	$tooltip =~ s/^\n+//;	3577	$tip =~ s/^\n+//;
2896	$tooltip =~ s/\n+$//;	3578	$tip =~ s/\n+$//;
2897		3579
2898	$self->add (new CFClient::UI::Label	3580	$self->add (new CFPlus::UI::Label
2899	markup => $tooltip,	3581	markup => $tip,
2900	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3582	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2901	fontsize => 0.8,	3583	fontsize => 0.8,
2902	fg => [0, 0, 0, 1],	3584	style => 1, # FLAG_INVERSE
2903	ellipsise => 0,	3585	ellipsise => 0,
2904	font => ($widget->{tooltip_font} || $::FONT_PROP),	3586	font => ($widget->{tooltip_font} || $::FONT_PROP),
2905	);	3587	);
2906	}	3588	}
2907		3589
…		…
2926		3608
2927	$self->{root}->on_post_alloc ("move_$self" => sub {	3609	$self->{root}->on_post_alloc ("move_$self" => sub {
2928	my $widget = $self->{owner}	3610	my $widget = $self->{owner}
2929	or return;	3611	or return;
2930		3612
		3613	if ($widget->{visible}) {
2931	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3614	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2932		3615
2933	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3616	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2934	if $x + $self->{w} > $self->{root}{w};	3617	if $x + $self->{w} > $self->{root}{w};
2935		3618
2936	$self->move_abs ($x, $y);	3619	$self->move_abs ($x, $y);
		3620	} else {
		3621	$self->hide;
		3622	}
2937	});	3623	});
2938	}	3624	}
2939		3625
2940	sub _draw {	3626	sub _draw {
2941	my ($self) = @_;	3627	my ($self) = @_;
…		…
2943	glTranslate 0.375, 0.375;	3629	glTranslate 0.375, 0.375;
2944		3630
2945	my ($w, $h) = @$self{qw(w h)};	3631	my ($w, $h) = @$self{qw(w h)};
2946		3632
2947	glColor 1, 0.8, 0.4;	3633	glColor 1, 0.8, 0.4;
2948	glBegin GL_QUADS;	3634	glRect 0, 0, $w, $h;
2949	glVertex 0 , 0;
2950	glVertex 0 , $h;
2951	glVertex $w, $h;
2952	glVertex $w, 0;
2953	glEnd;
2954		3635
2955	glColor 0, 0, 0;	3636	glColor 0, 0, 0;
2956	glBegin GL_LINE_LOOP;	3637	glRect_lineloop 0, 0, $w, $h;
2957	glVertex 0 , 0;
2958	glVertex 0 , $h;
2959	glVertex $w, $h;
2960	glVertex $w, 0;
2961	glEnd;
2962		3638
2963	glTranslate 2 - 0.375, 2 - 0.375;	3639	glTranslate 2 - 0.375, 2 - 0.375;
2964		3640
2965	$self->SUPER::_draw;	3641	$self->SUPER::_draw;
2966	}	3642	}
2967		3643
2968	#############################################################################	3644	#############################################################################
2969		3645
2970	package CFClient::UI::Face;	3646	package CFPlus::UI::Face;
2971		3647
2972	our @ISA = CFClient::UI::Base::;	3648	our @ISA = CFPlus::UI::DrawBG::;
2973		3649
2974	use CFClient::OpenGL;	3650	use CFPlus::OpenGL;
2975		3651
2976	sub new {	3652	sub new {
2977	my $class = shift;	3653	my $class = shift;
2978		3654
2979	my $self = $class->SUPER::new (	3655	my $self = $class->SUPER::new (
		3656	size_w => 32,
		3657	size_h => 8,
2980	aspect => 1,	3658	aspect => 1,
2981	can_events => 0,	3659	can_events => 0,
2982	@_,	3660	@_,
2983	);	3661	);
2984		3662
2985	if ($self->{anim} && $self->{animspeed}) {	3663	if ($self->{anim} && $self->{animspeed}) {
2986	Scalar::Util::weaken (my $widget = $self);	3664	CFPlus::weaken (my $widget = $self);
2987		3665
		3666	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3667	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2988	$self->{timer} = Event->timer (	3668	$self->{timer} = Event->timer (
2989	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2990	hard => 1,	3669	parked => 1,
2991	interval => $self->{animspeed},
2992	cb => sub {	3670	cb => sub {
		3671	return unless $::CONN;
		3672
		3673	my $w = $widget
		3674	or return;
		3675
2993	++$widget->{frame};	3676	++$w->{frame};
		3677	$w->update_face;
		3678
		3679	# somehow, $widget can go away
2994	$widget->update;	3680	$w->update;
		3681	$w->update_timer;
2995	},	3682	},
2996	);	3683	);
		3684
		3685	$self->update_face;
		3686	$self->update_timer;
2997	}	3687	}
2998		3688
2999	$self	3689	$self
3000	}	3690	}
3001		3691
		3692	sub update_timer {
		3693	my ($self) = @_;
		3694
		3695	return unless $self->{timer};
		3696
		3697	if ($self->{visible}) {
		3698	$self->{timer}->at (
		3699	$self->{anim_start}
		3700	+ $self->{animspeed}
		3701	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3702	);
		3703	$self->{timer}->start;
		3704	} else {
		3705	$self->{timer}->stop;
		3706	}
		3707	}
		3708
		3709	sub update_face {
		3710	my ($self) = @_;
		3711
		3712	if ($::CONN) {
		3713	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3714	if ($anim && @$anim) {
		3715	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3716	delete $self->{face_change_cb};
		3717
		3718	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3719	unless ($tex->{name} || $tex->{loading}) {
		3720	$tex->upload (sub { $self->reconfigure });
		3721	}
		3722	}
		3723	}
		3724	}
		3725	}
		3726	}
		3727
3002	sub size_request {	3728	sub size_request {
3003	(32, 8)	3729	my ($self) = @_;
		3730
		3731	if ($::CONN) {
		3732	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3733	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3734	if ($tex->{name}) {
		3735	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3736	} elsif (!$tex->{loading}) {
		3737	$tex->upload (sub { $self->reconfigure });
		3738	}
		3739	}
		3740
		3741	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3742	}
		3743	}
		3744
		3745	($self->{size_w} || 8, $self->{size_h} || 8)
3004	}	3746	}
3005		3747
3006	sub update {	3748	sub update {
3007	my ($self) = @_;	3749	my ($self) = @_;
3008		3750
3009	return unless $self->{visible};	3751	return unless $self->{visible};
3010		3752
3011	$self->SUPER::update;	3753	$self->SUPER::update;
3012	}	3754	}
3013		3755
		3756	sub invoke_visibility_change {
		3757	my ($self) = @_;
		3758
		3759	$self->update_timer;
		3760
		3761	0
		3762	}
		3763
3014	sub _draw {	3764	sub _draw {
3015	my ($self) = @_;	3765	my ($self) = @_;
3016		3766
3017	return unless $::CONN;	3767	$self->SUPER::_draw;
3018		3768
3019	my $face;	3769	if (my $tex = $self->{tex}) {
3020
3021	if ($self->{frame}) {
3022	my $anim = $::CONN->{anim}[$self->{anim}];
3023
3024	$face = $anim->[ $self->{frame} % @$anim ]
3025	if $anim && @$anim;
3026	}
3027
3028	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3029
3030	if ($tex) {
3031	glEnable GL_TEXTURE_2D;	3770	glEnable GL_TEXTURE_2D;
3032	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3771	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3033	glColor 0, 0, 0, 1;	3772	glColor 0, 0, 0, 1;
3034	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3773	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3035	glDisable GL_TEXTURE_2D;	3774	glDisable GL_TEXTURE_2D;
…		…
3037	}	3776	}
3038		3777
3039	sub destroy {	3778	sub destroy {
3040	my ($self) = @_;	3779	my ($self) = @_;
3041		3780
3042	$self->{timer}->cancel	3781	(delete $self->{timer})->cancel
3043	if $self->{timer};	3782	if $self->{timer};
3044		3783
3045	$self->SUPER::destroy;	3784	$self->SUPER::destroy;
3046	}	3785	}
3047		3786
3048	#############################################################################	3787	#############################################################################
3049		3788
3050	package CFClient::UI::Buttonbar;	3789	package CFPlus::UI::Buttonbar;
3051		3790
3052	our @ISA = CFClient::UI::HBox::;	3791	our @ISA = CFPlus::UI::HBox::;
3053		3792
3054	# TODO: should actualyl wrap buttons and other goodies.	3793	# TODO: should actually wrap buttons and other goodies.
3055		3794
3056	#############################################################################	3795	#############################################################################
3057		3796
3058	package CFClient::UI::Menu;	3797	package CFPlus::UI::Menu;
3059		3798
3060	our @ISA = CFClient::UI::FancyFrame::;	3799	our @ISA = CFPlus::UI::Toplevel::;
3061		3800
3062	use CFClient::OpenGL;	3801	use CFPlus::OpenGL;
3063		3802
3064	sub new {	3803	sub new {
3065	my $class = shift;	3804	my $class = shift;
3066		3805
3067	my $self = $class->SUPER::new (	3806	my $self = $class->SUPER::new (
3068	items => [],	3807	items => [],
3069	z => 100,	3808	z => 100,
3070	@_,	3809	@_,
3071	);	3810	);
3072		3811
3073	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3812	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3074		3813
3075	for my $item (@{ $self->{items} }) {	3814	for my $item (@{ $self->{items} }) {
3076	my ($widget, $cb, $tooltip) = @$item;	3815	my ($widget, $cb, $tooltip) = @$item;
3077		3816
3078	# handle various types of items, only text for now	3817	# handle various types of items, only text for now
3079	if (!ref $widget) {	3818	if (!ref $widget) {
3080	if ($widget =~ /\t/) {	3819	if ($widget =~ /\t/) {
3081	my ($left, $right) = split /\t/, $widget, 2;	3820	my ($left, $right) = split /\t/, $widget, 2;
3082		3821
3083	$widget = new CFClient::UI::HBox	3822	$widget = new CFPlus::UI::HBox
3084	can_hover => 1,	3823	can_hover => 1,
3085	can_events => 1,	3824	can_events => 1,
3086	tooltip => $tooltip,	3825	tooltip => $tooltip,
3087	children => [	3826	children => [
3088	(new CFClient::UI::Label markup => $left, expand => 1),	3827	(new CFPlus::UI::Label markup => $left, expand => 1),
3089	(new CFClient::UI::Label markup => $right, align => +1),	3828	(new CFPlus::UI::Label markup => $right, align => +1),
3090	],	3829	],
3091	;	3830	;
3092		3831
3093	} else {	3832	} else {
3094	$widget = new CFClient::UI::Label	3833	$widget = new CFPlus::UI::Label
3095	can_hover => 1,	3834	can_hover => 1,
3096	can_events => 1,	3835	can_events => 1,
3097	markup => $widget,	3836	markup => $widget,
3098	tooltip => $tooltip;	3837	tooltip => $tooltip;
3099	}	3838	}
…		…
3147	1	3886	1
3148	}	3887	}
3149		3888
3150	#############################################################################	3889	#############################################################################
3151		3890
3152	package CFClient::UI::Multiplexer;	3891	package CFPlus::UI::Multiplexer;
3153		3892
3154	our @ISA = CFClient::UI::Container::;	3893	our @ISA = CFPlus::UI::Container::;
3155		3894
3156	sub new {	3895	sub new {
3157	my $class = shift;	3896	my $class = shift;
3158		3897
3159	my $self = $class->SUPER::new (	3898	my $self = $class->SUPER::new (
…		…
3220	$self->{current}->draw;	3959	$self->{current}->draw;
3221	}	3960	}
3222		3961
3223	#############################################################################	3962	#############################################################################
3224		3963
3225	package CFClient::UI::Notebook;	3964	package CFPlus::UI::Notebook;
3226		3965
		3966	use CFPlus::OpenGL;
		3967
3227	our @ISA = CFClient::UI::VBox::;	3968	our @ISA = CFPlus::UI::VBox::;
3228		3969
3229	sub new {	3970	sub new {
3230	my $class = shift;	3971	my $class = shift;
3231		3972
3232	my $self = $class->SUPER::new (	3973	my $self = $class->SUPER::new (
3233	buttonbar => (new CFClient::UI::Buttonbar),	3974	buttonbar => (new CFPlus::UI::Buttonbar),
3234	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3975	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3976	active_outline => [1, 1, 0],
3235	# filter => # will be put between multiplexer and $self	3977	# filter => # will be put between multiplexer and $self
3236	@_,	3978	@_,
3237	);	3979	);
3238		3980
3239	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3981	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3240	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3982	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3241		3983
		3984	{
		3985	Scalar::Util::weaken (my $wself = $self);
		3986
		3987	$self->{multiplexer}->connect (c_add => sub {
		3988	my ($mplex, $widgets) = @_;
		3989
		3990	for my $child (@$widgets) {
		3991	Scalar::Util::weaken $child;
		3992	$child->{c_tab_} ||= do {
		3993	my $tab =
		3994	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		3995	? $child->{c_tab}
		3996	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		3997
		3998	$tab->connect (activate => sub {
		3999	$wself->set_current_page ($child);
		4000	});
		4001
		4002	$tab
		4003	};
		4004
		4005	$self->{buttonbar}->add ($child->{c_tab_});
		4006	}
		4007	});
		4008
		4009	$self->{multiplexer}->connect (c_remove => sub {
		4010	my ($mplex, $widgets) = @_;
		4011
		4012	for my $child (@$widgets) {
		4013	$wself->{buttonbar}->remove ($child->{c_tab_});
		4014	}
		4015	});
		4016	}
		4017
3242	$self	4018	$self
3243	}	4019	}
3244		4020
3245	sub add {	4021	sub add {
		4022	my ($self, @widgets) = @_;
		4023
		4024	$self->{multiplexer}->add (@widgets)
		4025	}
		4026
		4027	sub remove {
		4028	my ($self, @widgets) = @_;
		4029
		4030	$self->{multiplexer}->remove (@widgets)
		4031	}
		4032
		4033	sub pages {
		4034	my ($self) = @_;
		4035	$self->{multiplexer}->children
		4036	}
		4037
		4038	sub add_tab {
3246	my ($self, $title, $widget, $tooltip) = @_;	4039	my ($self, $title, $widget, $tooltip) = @_;
3247		4040
3248	Scalar::Util::weaken $self;	4041	$title = [$title, $tooltip] unless ref $title;
		4042	$widget->{c_tab} = $title;
3249		4043
3250	$self->{buttonbar}->add (new CFClient::UI::Button
3251	markup => $title,
3252	tooltip => $tooltip,
3253	on_activate => sub { $self->set_current_page ($widget) },
3254	);
3255
3256	$self->{multiplexer}->add ($widget);	4044	$self->add ($widget);
3257	}	4045	}
3258		4046
3259	sub get_current_page {	4047	sub get_current_page {
3260	my ($self) = @_;	4048	my ($self) = @_;
3261		4049
…		…
3267		4055
3268	$self->{multiplexer}->set_current_page ($page);	4056	$self->{multiplexer}->set_current_page ($page);
3269	$self->emit (page_changed => $self->{multiplexer}{current});	4057	$self->emit (page_changed => $self->{multiplexer}{current});
3270	}	4058	}
3271		4059
		4060	sub _draw {
		4061	my ($self) = @_;
		4062
		4063	$self->SUPER::_draw ();
		4064
		4065	if (my $cur = $self->{multiplexer}{current}) {
		4066	if ($cur = $cur->{c_tab_}) {
		4067	glTranslate $cur->{x}, $cur->{y};
		4068	glLineWidth 3;
		4069	glColor @{$self->{active_outline}};
		4070	glRect_lineloop 1, 1, $cur->{w} - 2, $cur->{h} - 2;
		4071	glLineWidth 1;
		4072	}
		4073	}
		4074	}
		4075
3272	#############################################################################	4076	#############################################################################
3273		4077
3274	package CFClient::UI::Combobox;	4078	package CFPlus::UI::Selector;
3275		4079
3276	use utf8;	4080	use utf8;
3277		4081
3278	our @ISA = CFClient::UI::Button::;	4082	our @ISA = CFPlus::UI::Button::;
3279		4083
3280	sub new {	4084	sub new {
3281	my $class = shift;	4085	my $class = shift;
3282		4086
3283	my $self = $class->SUPER::new (	4087	my $self = $class->SUPER::new (
…		…
3300	my ($value, $title, $tooltip) = @$_;	4104	my ($value, $title, $tooltip) = @$_;
3301		4105
3302	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	4106	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3303	}	4107	}
3304		4108
3305	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	4109	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3306	}	4110	}
3307		4111
3308	sub _set_value {	4112	sub _set_value {
3309	my ($self, $value) = @_;	4113	my ($self, $value) = @_;
3310		4114
…		…
3325	$self->emit (changed => $value);	4129	$self->emit (changed => $value);
3326	}	4130	}
3327		4131
3328	#############################################################################	4132	#############################################################################
3329		4133
3330	package CFClient::UI::Statusbox;	4134	package CFPlus::UI::Statusbox;
3331		4135
3332	our @ISA = CFClient::UI::VBox::;	4136	our @ISA = CFPlus::UI::VBox::;
3333		4137
3334	sub new {	4138	sub new {
3335	my $class = shift;	4139	my $class = shift;
3336		4140
3337	my $self = $class->SUPER::new (	4141	my $self = $class->SUPER::new (
3338	fontsize => 0.8,	4142	fontsize => 0.8,
3339	@_,	4143	@_,
3340	);	4144	);
3341		4145
3342	Scalar::Util::weaken (my $this = $self);	4146	CFPlus::weaken (my $this = $self);
3343		4147
3344	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4148	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3345		4149
3346	$self	4150	$self
3347	}	4151	}
…		…
3349	sub reorder {	4153	sub reorder {
3350	my ($self) = @_;	4154	my ($self) = @_;
3351	my $NOW = Time::HiRes::time;	4155	my $NOW = Time::HiRes::time;
3352		4156
3353	# freeze display when hovering over any label	4157	# freeze display when hovering over any label
3354	return if $CFClient::UI::TOOLTIP->{owner}	4158	return if $CFPlus::UI::TOOLTIP->{owner}
3355	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	4159	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3356	values %{ $self->{item} };	4160	values %{ $self->{item} };
3357		4161
3358	while (my ($k, $v) = each %{ $self->{item} }) {	4162	while (my ($k, $v) = each %{ $self->{item} }) {
3359	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4163	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3360	}	4164	}
…		…
3381	for ($short) {	4185	for ($short) {
3382	s/^\s+//;	4186	s/^\s+//;
3383	s/\s+/ /g;	4187	s/\s+/ /g;
3384	}	4188	}
3385		4189
3386	new CFClient::UI::Label	4190	new CFPlus::UI::Label
3387	markup => $short,	4191	markup => $short,
3388	tooltip => $item->{tooltip},	4192	tooltip => $item->{tooltip},
3389	tooltip_font => $::FONT_PROP,	4193	tooltip_font => $::FONT_PROP,
3390	tooltip_width => 0.67,	4194	tooltip_width => 0.67,
3391	fontsize => $item->{fontsize} || $self->{fontsize},	4195	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3470	$self->SUPER::destroy;	4274	$self->SUPER::destroy;
3471	}	4275	}
3472		4276
3473	#############################################################################	4277	#############################################################################
3474		4278
3475	package CFClient::UI::Inventory;
3476
3477	our @ISA = CFClient::UI::Table::;
3478
3479	sub new {
3480	my $class = shift;
3481
3482	my $self = $class->SUPER::new (
3483	col_expand => [0, 1, 0],
3484	@_,
3485	);
3486
3487	$self
3488	}
3489
3490	sub set_items {
3491	my ($self, $items) = @_;
3492
3493	$self->clear;
3494	return unless $items;
3495
3496	my @items = sort {
3497	($a->{type} <=> $b->{type})
3498	or ($a->{name} cmp $b->{name})
3499	} values %$items;
3500
3501	$self->{real_items} = \@items;
3502
3503	my $row = 0;
3504	for my $item (@items) {
3505	CFClient::Item::update_widgets $item;
3506
3507	$self->add (0, $row, $item->{face_widget});
3508	$self->add (1, $row, $item->{desc_widget});
3509	$self->add (2, $row, $item->{weight_widget});
3510
3511	$row++;
3512	}
3513	}
3514
3515	#############################################################################
3516
3517	package CFClient::UI::SpellList;
3518
3519	our @ISA = CFClient::UI::Table::;
3520
3521	sub new {
3522	my $class = shift;
3523
3524	my $self = $class->SUPER::new (
3525	binding => [],
3526	commands => [],
3527	@_,
3528	)
3529	}
3530
3531	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3532
3533	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3534	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3535	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3536	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3537	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3538	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3539	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3540	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3541	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3542	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3543
3544	sub rebuild_spell_list {
3545	my ($self) = @_;
3546
3547	$CFClient::UI::ROOT->on_refresh ($self => sub {
3548	$self->clear;
3549
3550	return unless $::CONN;
3551
3552	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3553	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3554	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3555	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3556	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3557
3558	my $row = 0;
3559
3560	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3561	my $spell = $self->{spell}{$_};
3562
3563	$row++;
3564
3565	my $spell_cb = sub {
3566	my ($widget, $ev) = @_;
3567
3568	if ($ev->{button} == 1) {
3569	$::CONN->user_send ("cast $spell->{name}");
3570	} elsif ($ev->{button} == 2) {
3571	$::CONN->user_send ("invoke $spell->{name}");
3572	} elsif ($ev->{button} == 3) {
3573	(new CFClient::UI::Menu
3574	items => [
3575	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3576	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3577	],
3578	)->popup ($ev);
3579	} else {
3580	return 0;
3581	}
3582
3583	1
3584	};
3585
3586	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3587
3588	#TODO: add path info to tooltip
3589	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3590
3591	$self->add (0, $row, new CFClient::UI::Face
3592	face => $spell->{face},
3593	can_hover => 1,
3594	can_events => 1,
3595	tooltip => $tooltip,
3596	on_button_down => $spell_cb,
3597	);
3598
3599	$self->add (1, $row, new CFClient::UI::Label
3600	expand => 1,
3601	text => $spell->{name},
3602	can_hover => 1,
3603	can_events => 1,
3604	tooltip => $tooltip,
3605	on_button_down => $spell_cb,
3606	);
3607
3608	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3609	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3610	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3611	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3612	}
3613	});
3614	}
3615
3616	sub add_spell {
3617	my ($self, $spell) = @_;
3618
3619	$self->{spell}->{$spell->{name}} = $spell;
3620	$self->rebuild_spell_list;
3621	}
3622
3623	sub remove_spell {
3624	my ($self, $spell) = @_;
3625
3626	delete $self->{spell}->{$spell->{name}};
3627	$self->rebuild_spell_list;
3628	}
3629
3630	sub clear_spells {
3631	my ($self) = @_;
3632
3633	$self->{spell} = {};
3634	$self->rebuild_spell_list;
3635	}
3636
3637	#############################################################################
3638
3639	package CFClient::UI::Root;	4279	package CFPlus::UI::Root;
3640		4280
3641	our @ISA = CFClient::UI::Container::;	4281	our @ISA = CFPlus::UI::Container::;
3642		4282
3643	use List::Util qw(min max);	4283	use List::Util qw(min max);
3644		4284
3645	use CFClient::OpenGL;	4285	use CFPlus::OpenGL;
3646		4286
3647	sub new {	4287	sub new {
3648	my $class = shift;	4288	my $class = shift;
3649		4289
3650	my $self = $class->SUPER::new (	4290	my $self = $class->SUPER::new (
3651	visible => 1,	4291	visible => 1,
3652	@_,	4292	@_,
3653	);	4293	);
3654		4294
3655	Scalar::Util::weaken ($self->{root} = $self);	4295	CFPlus::weaken ($self->{root} = $self);
3656		4296
3657	$self	4297	$self
3658	}	4298	}
3659		4299
3660	sub size_request {	4300	sub size_request {
…		…
3708	}	4348	}
3709		4349
3710	sub update {	4350	sub update {
3711	my ($self) = @_;	4351	my ($self) = @_;
3712		4352
3713	$::WANT_REFRESH++;	4353	$::WANT_REFRESH->start;
3714	}	4354	}
3715		4355
3716	sub add {	4356	sub add {
3717	my ($self, @children) = @_;	4357	my ($self, @children) = @_;
3718		4358
…		…
3755	while ($self->{refresh_hook}) {	4395	while ($self->{refresh_hook}) {
3756	$_->()	4396	$_->()
3757	for values %{delete $self->{refresh_hook}};	4397	for values %{delete $self->{refresh_hook}};
3758	}	4398	}
3759		4399
3760	if ($self->{realloc}) {	4400	while ($self->{realloc}) {
3761	my %queue;	4401	my %queue;
3762	my @queue;	4402	my @queue;
3763	my $widget;	4403	my $widget;
3764		4404
3765	outer:	4405	outer:
…		…
3812	}	4452	}
3813	}	4453	}
3814		4454
3815	delete $self->{realloc}{$widget+0};	4455	delete $self->{realloc}{$widget+0};
3816	}	4456	}
3817	}
3818		4457
3819	while (my $size_alloc = delete $self->{size_alloc}) {	4458	while (my $size_alloc = delete $self->{size_alloc}) {
3820	my @queue = sort { $b->{visible} <=> $a->{visible} }	4459	my @queue = sort { $a->{visible} <=> $b->{visible} }
3821	values %$size_alloc;	4460	values %$size_alloc;
3822		4461
3823	while () {	4462	while () {
3824	my $widget = pop @queue || last;	4463	my $widget = pop @queue || last;
3825		4464
3826	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4465	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3827		4466
3828	$w = 0 if $w < 0;
3829	$h = 0 if $h < 0;
3830
3831	$w = max $widget->{min_w}, $w;	4467	$w = max $widget->{min_w}, $w;
3832	$h = max $widget->{min_h}, $h;	4468	$h = max $widget->{min_h}, $h;
3833		4469
		4470	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4471	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4472
3834	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4473	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3835	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4474	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3836		4475
3837	$w = int $w + 0.5;	4476	$w = int $w + 0.5;
3838	$h = int $h + 0.5;	4477	$h = int $h + 0.5;
3839		4478
3840	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4479	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3841	$widget->{old_w} = $widget->{w};	4480	$widget->{old_w} = $widget->{w};
3842	$widget->{old_h} = $widget->{h};	4481	$widget->{old_h} = $widget->{h};
3843		4482
3844	$widget->{w} = $w;	4483	$widget->{w} = $w;
3845	$widget->{h} = $h;	4484	$widget->{h} = $h;
3846		4485
3847	$widget->emit (size_allocate => $w, $h);	4486	$widget->emit (size_allocate => $w, $h);
		4487	}
3848	}	4488	}
3849	}	4489	}
3850	}	4490	}
3851		4491
3852	while ($self->{post_alloc_hook}) {	4492	while ($self->{post_alloc_hook}) {
3853	$_->()	4493	$_->()
3854	for values %{delete $self->{post_alloc_hook}};	4494	for values %{delete $self->{post_alloc_hook}};
3855	}	4495	}
3856
3857		4496
3858	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4497	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3859	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4498	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3860	glClear GL_COLOR_BUFFER_BIT;	4499	glClear GL_COLOR_BUFFER_BIT;
3861		4500
…		…
3864	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4503	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3865	glMatrixMode GL_MODELVIEW;	4504	glMatrixMode GL_MODELVIEW;
3866	glLoadIdentity;	4505	glLoadIdentity;
3867		4506
3868	{	4507	{
3869	package CFClient::UI::Base;	4508	package CFPlus::UI::Base;
3870		4509
3871	($draw_x, $draw_y, $draw_w, $draw_h) =	4510	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3872	(0, 0, $self->{w}, $self->{h});	4511	(0, 0, $self->{w}, $self->{h});
3873	}
3874		4512
3875	$self->_draw;	4513	$self->_draw;
		4514	}
3876	}	4515	}
3877		4516
3878	#############################################################################	4517	#############################################################################
3879		4518
3880	package CFClient::UI;	4519	package CFPlus::UI;
3881		4520
3882	$ROOT = new CFClient::UI::Root;	4521	$ROOT = new CFPlus::UI::Root;
3883	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4522	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3884		4523
3885	1	4524	1
3886		4525

Diff Legend

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