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.311 by root, Fri Jun 23 22:35:16 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) = @_;
418		450
		451	Carp::confess unless $self->{parent};#d#
		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 {
423	my ($self) = @_;	457	my ($self) = @_;
424		458
425	return if $FOCUS == $self;	459	return if $FOCUS == $self;
426	return unless $self->{can_focus};	460	return unless $self->{can_focus};
427		461
428	my $focus = $FOCUS; $FOCUS = $self;	462	$FOCUS = $self;
429		463
430	$focus->update if $focus;	464	$self->update;
431	$FOCUS->update;
432		465
433	0	466	0
434	}	467	}
435		468
436	sub invoke_focus_out {	469	sub invoke_focus_out {
437	my ($self) = @_;	470	my ($self) = @_;
438		471
439	return unless $FOCUS == $self;	472	return unless $FOCUS == $self;
440		473
441	my $focus = $FOCUS; undef $FOCUS;	474	undef $FOCUS;
442		475
443	$focus->update if $focus; #?	476	$self->update;
444		477
445	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus	478	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446	unless $FOCUS;	479	unless $FOCUS;
447		480
448	0	481	0
449	}	482	}
450		483
451	sub grab_focus {	484	sub grab_focus {
452	my ($self) = @_;	485	my ($self) = @_;
453		486
		487	$FOCUS->emit ("focus_out") if $FOCUS;
454	$self->emit ("focus_in");	488	$self->emit ("focus_in");
455	}	489	}
456		490
457	sub invoke_mouse_motion { 1 }	491	sub invoke_mouse_motion { 0 }
458	sub invoke_button_up { 1 }	492	sub invoke_button_up { 0 }
459	sub invoke_key_down { 1 }	493	sub invoke_key_down { 0 }
460	sub invoke_key_up { 1 }	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;
466		501
467	1	502	0
468	}	503	}
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
479	#d##TODO# stop propagating at first true, do not use sum	532	# I do not really like this solution, but I do not like duplication
480	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	533	# and needlessly verbose code, either.
		534	my @append
		535	= $has_coords{$signal}
		536	? $args[0]->xy ($self)
		537	: ();
		538
		539	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		540
		541	for my $cb (
		542	@{$self->{signal_cb}{$signal} || []}, # before
481	|| ($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
482	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	549	$self->{parent} && $self->{parent}->emit ($signal, @args)
483	}	550	}
484		551
485	sub find_widget {	552	#sub find_widget {
486	my ($self, $x, $y) = @_;	553	# in .xs
487
488	return () unless $self->{can_events};
489
490	return $self
491	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
492	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
493
494	()
495	}
496		554
497	sub set_parent {	555	sub set_parent {
498	my ($self, $parent) = @_;	556	my ($self, $parent) = @_;
499		557
500	Scalar::Util::weaken ($self->{parent} = $parent);	558	CFPlus::weaken ($self->{parent} = $parent);
501	$self->set_visible if $parent->{visible};	559	$self->set_visible if $parent->{visible};
502	}	560	}
503		561
504	sub realloc {	562	sub realloc {
505	my ($self) = @_;	563	my ($self) = @_;
…		…
531		589
532	# 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
533	# functions seems pointless.	591	# functions seems pointless.
534	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
535		593
536	sub draw {	594	#sub draw {
537	my ($self) = @_;	595	#CFPlus.xs
538
539	return unless $self->{h} && $self->{w};
540
541	# update screen rectangle
542	local $draw_x = $draw_x + $self->{x};
543	local $draw_y = $draw_y + $self->{y};
544	local $draw_w = $draw_x + $self->{w};
545	local $draw_h = $draw_y + $self->{h};
546
547	# skip widgets that are entirely outside the drawing area
548	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
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	delete $WIDGET{$self+0};	606	return if CFPlus::in_destruct;
595		607
		608	local $@;
596	eval { $self->destroy };	609	eval { $self->destroy };
597	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};
598	}	613	}
599		614
600	#############################################################################	615	#############################################################################
601		616
602	package CFClient::UI::DrawBG;	617	package CFPlus::UI::DrawBG;
603		618
604	our @ISA = CFClient::UI::Base::;	619	our @ISA = CFPlus::UI::Base::;
605		620
606	use strict;	621	use strict;
607	use CFClient::OpenGL;	622	use CFPlus::OpenGL;
608		623
609	sub new {	624	sub new {
610	my $class = shift;	625	my $class = shift;
611
612	# range [value, low, high, page]
613		626
614	$class->SUPER::new (	627	$class->SUPER::new (
615	#bg => [0, 0, 0, 0.2],	628	#bg => [0, 0, 0, 0.2],
616	#active_bg => [1, 1, 1, 0.5],	629	#active_bg => [1, 1, 1, 0.5],
617	@_	630	@_
…		…
629	my ($w, $h) = @$self{qw(w h)};	642	my ($w, $h) = @$self{qw(w h)};
630		643
631	glEnable GL_BLEND;	644	glEnable GL_BLEND;
632	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	645	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
633	glColor_premultiply @$color;	646	glColor_premultiply @$color;
634
635	glBegin GL_QUADS;
636	glVertex 0 , 0;
637	glVertex 0 , $h;
638	glVertex $w, $h;	647	glRect 0, 0, $w, $h;
639	glVertex $w, 0;
640	glEnd;
641
642	glDisable GL_BLEND;	648	glDisable GL_BLEND;
643	}	649	}
644	}	650	}
645		651
646	#############################################################################	652	#############################################################################
647		653
648	package CFClient::UI::Empty;	654	package CFPlus::UI::Empty;
649		655
650	our @ISA = CFClient::UI::Base::;	656	our @ISA = CFPlus::UI::Base::;
651		657
652	sub new {	658	sub new {
653	my ($class, %arg) = @_;	659	my ($class, %arg) = @_;
654	$class->SUPER::new (can_events => 0, %arg);	660	$class->SUPER::new (can_events => 0, %arg);
655	}	661	}
…		…
662		668
663	sub draw { }	669	sub draw { }
664		670
665	#############################################################################	671	#############################################################################
666		672
667	package CFClient::UI::Container;	673	package CFPlus::UI::Container;
668		674
669	our @ISA = CFClient::UI::Base::;	675	our @ISA = CFPlus::UI::Base::;
670		676
671	sub new {	677	sub new {
672	my ($class, %arg) = @_;	678	my ($class, %arg) = @_;
673		679
674	my $children = delete $arg{children};	680	my $children = delete $arg{children};
…		…
678	can_events => 0,	684	can_events => 0,
679	%arg,	685	%arg,
680	);	686	);
681		687
682	$self->add (@$children)	688	$self->add (@$children)
683	if $children;	689	if $children && @$children;
684		690
685	$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;
686	}	700	}
687		701
688	sub add {	702	sub add {
689	my ($self, @widgets) = @_;	703	my ($self, @widgets) = @_;
690		704
691	$_->set_parent ($self)	705	$_->set_parent ($self)
692	for @widgets;	706	for @widgets;
693		707
		708	# TODO: only do this in widgets that need it, e.g. root, fixed
694	use sort 'stable';	709	use sort 'stable';
695		710
696	$self->{children} = [	711	$self->{children} = [
697	sort { $a->{z} <=> $b->{z} }	712	sort { $a->{z} <=> $b->{z} }
698	@{$self->{children}}, @widgets	713	@{$self->{children}}, @widgets
699	];	714	];
700		715
701	$self->realloc;	716	$self->realloc;
		717
		718	$self->emit (c_add => \@widgets);
		719
		720	map $_+0, @widgets
702	}	721	}
703		722
704	sub children {	723	sub children {
705	@{ $_[0]{children} }	724	@{ $_[0]{children} }
706	}	725	}
707		726
708	sub remove {	727	sub remove {
709	my ($self, $child) = @_;	728	my ($self, @widgets) = @_;
710		729
		730	$self->emit (c_remove => \@widgets);
		731
		732	for my $child (@widgets) {
711	delete $child->{parent};	733	delete $child->{parent};
712	$child->hide;	734	$child->hide;
713
714	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	735	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		736	}
715		737
716	$self->realloc;	738	$self->realloc;
717	}	739	}
718		740
719	sub clear {	741	sub clear {
720	my ($self) = @_;	742	my ($self) = @_;
721		743
722	my $children = delete $self->{children};	744	my $children = $self->{children};
723	$self->{children} = [];	745	$self->{children} = [];
724		746
725	for (@$children) {	747	for (@$children) {
726	delete $_->{parent};	748	delete $_->{parent};
727	$_->hide;	749	$_->hide;
…		…
747	}	769	}
748		770
749	sub _draw {	771	sub _draw {
750	my ($self) = @_;	772	my ($self) = @_;
751		773
752	$_->draw for @{$self->{children}};	774	$_->draw for $self->visible_children;
753	}	775	}
754		776
755	#############################################################################	777	#############################################################################
756		778
757	package CFClient::UI::Bin;	779	package CFPlus::UI::Bin;
758		780
759	our @ISA = CFClient::UI::Container::;	781	our @ISA = CFPlus::UI::Container::;
760		782
761	sub new {	783	sub new {
762	my ($class, %arg) = @_;	784	my ($class, %arg) = @_;
763		785
764	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	786	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
765		787
766	$class->SUPER::new (children => [$child], %arg)	788	$class->SUPER::new (children => [$child], %arg)
767	}	789	}
768		790
769	sub add {	791	sub add {
770	my ($self, $child) = @_;	792	my ($self, $child) = @_;
771		793
772	$self->SUPER::remove ($_) for @{ $self->{children} };	794	$self->clear;
773	$self->SUPER::add ($child);	795	$self->SUPER::add ($child);
774	}	796	}
775		797
776	sub remove {	798	sub remove {
777	my ($self, $widget) = @_;	799	my ($self, $widget) = @_;
778		800
779	$self->SUPER::remove ($widget);	801	$self->SUPER::remove ($widget);
780		802
781	$self->{children} = [new CFClient::UI::Empty]	803	$self->{children} = [new CFPlus::UI::Empty]
782	unless @{$self->{children}};	804	unless @{$self->{children}};
783	}	805	}
784		806
785	sub child { $_[0]->{children}[0] }	807	sub child { $_[0]->{children}[0] }
786		808
…		…
798		820
799	#############################################################################	821	#############################################################################
800		822
801	# back-buffered drawing area	823	# back-buffered drawing area
802		824
803	package CFClient::UI::Window;	825	package CFPlus::UI::Window;
804		826
805	our @ISA = CFClient::UI::Bin::;	827	our @ISA = CFPlus::UI::Bin::;
806		828
807	use CFClient::OpenGL;	829	use CFPlus::OpenGL;
808		830
809	sub new {	831	sub new {
810	my ($class, %arg) = @_;	832	my ($class, %arg) = @_;
811		833
812	my $self = $class->SUPER::new (%arg);	834	my $self = $class->SUPER::new (%arg);
…		…
834	}	856	}
835		857
836	sub render_child {	858	sub render_child {
837	my ($self) = @_;	859	my ($self) = @_;
838		860
839	$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 {
840	glClearColor 0, 0, 0, 0;	862	glClearColor 0, 0, 0, 0;
841	glClear GL_COLOR_BUFFER_BIT;	863	glClear GL_COLOR_BUFFER_BIT;
842		864
843	{	865	{
844	package CFClient::UI::Base;	866	package CFPlus::UI::Base;
845		867
846	($draw_x, $draw_y, $draw_w, $draw_h) =	868	local ($draw_x, $draw_y, $draw_w, $draw_h) =
847	(0, 0, $self->{w}, $self->{h});	869	(0, 0, $self->{w}, $self->{h});
		870
		871	$self->_render;
848	}	872	}
849
850	$self->_render;
851	};	873	};
852	}	874	}
853		875
854	sub _draw {	876	sub _draw {
855	my ($self) = @_;	877	my ($self) = @_;
856
857	my ($w, $h) = @$self{qw(w h)};
858		878
859	my $tex = $self->{texture}	879	my $tex = $self->{texture}
860	or return;	880	or return;
861		881
862	glEnable GL_TEXTURE_2D;	882	glEnable GL_TEXTURE_2D;
863	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	883	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864	glColor 0, 0, 0, 1;	884	glColor 0, 0, 0, 1;
865		885
866	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	886	$tex->draw_quad_alpha_premultiplied (0, 0);
867		887
868	glDisable GL_TEXTURE_2D;	888	glDisable GL_TEXTURE_2D;
869	}	889	}
870		890
871	#############################################################################	891	#############################################################################
872		892
873	package CFClient::UI::ViewPort;	893	package CFPlus::UI::ViewPort;
874		894
		895	use List::Util qw(min max);
		896
875	our @ISA = CFClient::UI::Window::;	897	our @ISA = CFPlus::UI::Window::;
876		898
877	sub new {	899	sub new {
878	my $class = shift;	900	my $class = shift;
879		901
880	$class->SUPER::new (	902	$class->SUPER::new (
…		…
887	sub size_request {	909	sub size_request {
888	my ($self) = @_;	910	my ($self) = @_;
889		911
890	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	912	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
891		913
892	$w = 10 if $self->{scroll_x};	914	$w = 1 if $self->{scroll_x};
893	$h = 10 if $self->{scroll_y};	915	$h = 1 if $self->{scroll_y};
894		916
895	($w, $h)	917	($w, $h)
896	}	918	}
897		919
898	sub invoke_size_allocate {	920	sub invoke_size_allocate {
…		…
910	}	932	}
911		933
912	sub set_offset {	934	sub set_offset {
913	my ($self, $x, $y) = @_;	935	my ($self, $x, $y) = @_;
914		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}) {
915	$self->{view_x} = int $x;	941	$self->{view_x} = $x;
916	$self->{view_y} = int $y;	942	$self->{view_y} = $y;
917		943
		944	$self->emit (changed => $x, $y);
918	$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	}
919	}	965	}
920		966
921	# 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
922	sub coord2local {	968	sub coord2local {
923	my ($self, $x, $y) = @_;	969	my ($self, $x, $y) = @_;
…		…
938	my ($self, $x, $y) = @_;	984	my ($self, $x, $y) = @_;
939		985
940	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	986	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
941	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	987	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
942	) {	988	) {
943	$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})
944	} else {	990	} else {
945	$self->CFClient::UI::Base::find_widget ($x, $y)	991	$self->CFPlus::UI::Base::find_widget ($x, $y)
946	}	992	}
947	}	993	}
948		994
949	sub _render {	995	sub _render {
950	my ($self) = @_;	996	my ($self) = @_;
951		997
952	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};
953	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};
954		1000
955	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1001	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
956		1002
957	$self->SUPER::_render;	1003	$self->SUPER::_render;
958	}	1004	}
959		1005
960	#############################################################################	1006	#############################################################################
961		1007
962	package CFClient::UI::ScrolledWindow;	1008	package CFPlus::UI::ScrolledWindow;
963		1009
964	our @ISA = CFClient::UI::HBox::;	1010	our @ISA = CFPlus::UI::Table::;
965		1011
966	sub new {	1012	sub new {
967	my ($class, %arg) = @_;	1013	my ($class, %arg) = @_;
968		1014
969	my $child = delete $arg{child};	1015	my $child = delete $arg{child};
970		1016
971	my $self;	1017	my $self;
972		1018
973	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,
974	vertical => 1,	1033	vertical => 1,
975	range => [0, 0, 1, 0.01], # HACK fix	1034	range => [0, 0, 1, 0.01], # HACK fix
976	on_changed => sub {	1035	on_changed => sub {
977	$self->{vp}->set_offset (0, $_[1]);	1036	$self->{vpos} = $_[1];
		1037	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
978	},	1038	},
979	;	1039	;
980		1040
981	$self = $class->SUPER::new (	1041	$self = $class->SUPER::new (
982	vp => (new CFClient::UI::ViewPort expand => 1),	1042	scroll_x => 0,
		1043	scroll_y => 1,
		1044	can_events => 1,
983	slider => $slider,	1045	hslider => $hslider,
		1046	vslider => $vslider,
		1047	col_expand => [1, 0],
		1048	row_expand => [1, 0],
984	%arg,	1049	%arg,
985	);	1050	);
986		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
987	$self->SUPER::add ($self->{vp}, $self->{slider});	1073	$self->SUPER::add ($self->{vp});
		1074
988	$self->add ($child) if $child;	1075	$self->add ($child) if $child;
989		1076
990	$self	1077	$self
991	}	1078	}
992		1079
…		…
994	my ($self, $widget) = @_;	1081	my ($self, $widget) = @_;
995		1082
996	$self->{vp}->add ($self->{child} = $widget);	1083	$self->{vp}->add ($self->{child} = $widget);
997	}	1084	}
998		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
999	sub update {	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 {
1000	my ($self) = @_;	1121	my ($self, $ev) = @_;
1001		1122
1002	$self->SUPER::update;	1123	$self->grab_focus;
1003		1124
1004	# todo: overwrite size_allocate of child	1125	my $ox = $self->{vp}{view_x};
1005	my $child = $self->{vp}->child;	1126	my $oy = $self->{vp}{view_y};
1006	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	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
		1158	sub invoke_button_up {
		1159	my ($self, $ev, $x, $y) = @_;
		1160
		1161	if (delete $self->{motion}) {
		1162	return 1;
		1163	}
		1164
		1165	0
		1166	}
		1167
		1168	sub invoke_mouse_motion {
		1169	my ($self, $ev, $x, $y) = @_;
		1170
		1171	if ($self->{motion}) {
		1172	$self->{motion}->($ev, $x, $y);
		1173	return 1;
		1174	}
		1175
		1176	0
1007	}	1177	}
1008		1178
1009	sub invoke_size_allocate {	1179	sub invoke_size_allocate {
1010	my ($self, $w, $h) = @_;	1180	my ($self, $w, $h) = @_;
1011		1181
1012	my $child = $self->{vp}->child;	1182	$self->update_slider;
1013	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014
1015	$self->SUPER::invoke_size_allocate ($w, $h)	1183	$self->SUPER::invoke_size_allocate ($w, $h)
1016	}	1184	}
1017		1185
1018	#TODO# update range on size_allocate depending on child
1019	# update viewport offset on scroll
1020
1021	#############################################################################	1186	#############################################################################
1022		1187
1023	package CFClient::UI::Frame;	1188	package CFPlus::UI::Frame;
1024		1189
1025	our @ISA = CFClient::UI::Bin::;	1190	our @ISA = CFPlus::UI::Bin::;
1026		1191
1027	use CFClient::OpenGL;	1192	use CFPlus::OpenGL;
1028		1193
1029	sub new {	1194	sub new {
1030	my $class = shift;	1195	my $class = shift;
1031		1196
1032	$class->SUPER::new (	1197	$class->SUPER::new (
…		…
1042	my ($w, $h) = @$self{qw(w h)};	1207	my ($w, $h) = @$self{qw(w h)};
1043		1208
1044	glEnable GL_BLEND;	1209	glEnable GL_BLEND;
1045	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1210	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1046	glColor_premultiply @{ $self->{bg} };	1211	glColor_premultiply @{ $self->{bg} };
1047
1048	glBegin GL_QUADS;
1049	glVertex 0 , 0;
1050	glVertex 0 , $h;
1051	glVertex $w, $h;	1212	glRect 0, 0, $w, $h;
1052	glVertex $w, 0;
1053	glEnd;
1054
1055	glDisable GL_BLEND;	1213	glDisable GL_BLEND;
1056	}	1214	}
1057		1215
1058	$self->SUPER::_draw;	1216	$self->SUPER::_draw;
1059	}	1217	}
1060		1218
1061	#############################################################################	1219	#############################################################################
1062		1220
1063	package CFClient::UI::FancyFrame;	1221	package CFPlus::UI::FancyFrame;
1064		1222
1065	our @ISA = CFClient::UI::Bin::;	1223	our @ISA = CFPlus::UI::Bin::;
1066		1224
1067	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;
1068		1326
1069	my $bg =	1327	my $bg =
1070	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1328	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071	mipmap => 1, wrap => 1;	1329	mipmap => 1, wrap => 1;
1072		1330
1073	my @border =	1331	my @border =
1074	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1332	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1075	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);
1076		1338
1077	sub new {	1339	sub new {
1078	my ($class, %arg) = @_;	1340	my ($class, %arg) = @_;
1079		1341
1080	my $self = $class->SUPER::new (	1342	my $self = $class->SUPER::new (
1081	bg => [1, 1, 1, 1],	1343	bg => [1, 1, 1, 1],
1082	border_bg => [1, 1, 1, 1],	1344	border_bg => [1, 1, 1, 1],
1083	border => 0.6,	1345	border => 0.6,
1084	can_events => 1,	1346	can_events => 1,
1085	min_w => 16,	1347	min_w => 64,
1086	min_h => 16,	1348	min_h => 32,
1087	%arg,	1349	%arg,
1088	);	1350	);
1089		1351
1090	$self->{title_widget} = new CFClient::UI::Label	1352	$self->{title_widget} = new CFPlus::UI::Label
1091	align => 0,	1353	align => 0,
1092	valign => 1,	1354	valign => 1,
1093	text => $self->{title},	1355	text => $self->{title},
1094	fontsize => $self->{border},	1356	fontsize => $self->{border},
1095	if exists $self->{title};	1357	if exists $self->{title};
1096		1358
1097	if ($self->{has_close_button}) {	1359	if ($self->{has_close_button}) {
1098	$self->{close_button} =	1360	$self->{close_button} =
1099	new CFClient::UI::ImageButton	1361	new CFPlus::UI::ImageButton
1100	path => 'x1_close.png',	1362	path => 'x1_close.png',
1101	on_activate => sub { $self->hide };	1363	on_activate => sub { $self->emit ("delete") };
1102		1364
1103	$self->CFClient::UI::Container::add ($self->{close_button});	1365	$self->CFPlus::UI::Container::add ($self->{close_button});
1104	}	1366	}
1105		1367
1106	$self	1368	$self
1107	}	1369	}
1108		1370
1109	sub add {	1371	sub add {
1110	my ($self, @widgets) = @_;	1372	my ($self, @widgets) = @_;
1111		1373
1112	$self->SUPER::add (@widgets);	1374	$self->SUPER::add (@widgets);
1113	$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};
1114	$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};
1115	}	1377	}
1116		1378
1117	sub border {	1379	sub border {
1118	int $_[0]{border} * $::FONTSIZE	1380	int $_[0]{border} * $::FONTSIZE
1119	}	1381	}
…		…
1152	$self->child->configure ($border, $border, $w, $h);	1414	$self->child->configure ($border, $border, $w, $h);
1153		1415
1154	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1416	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155	if $self->{close_button};	1417	if $self->{close_button};
1156		1418
		1419	1
		1420	}
		1421
		1422	sub invoke_delete {
		1423	my ($self) = @_;
		1424
		1425	$self->hide;
		1426
1157	1	1427	1
1158	}	1428	}
1159		1429
1160	sub invoke_button_down {	1430	sub invoke_button_down {
1161	my ($self, $ev, $x, $y) = @_;	1431	my ($self, $ev, $x, $y) = @_;
…		…
1219	$self->{motion}->($ev, $x, $y) if $self->{motion};	1489	$self->{motion}->($ev, $x, $y) if $self->{motion};
1220		1490
1221	! ! $self->{motion}	1491	! ! $self->{motion}
1222	}	1492	}
1223		1493
		1494	sub invoke_visibility_change {
		1495	my ($self, $visible) = @_;
		1496
		1497	delete $self->{motion} unless $visible;
		1498
		1499	0
		1500	}
		1501
1224	sub _draw {	1502	sub _draw {
1225	my ($self) = @_;	1503	my ($self) = @_;
1226		1504
1227	my $child = $self->{children}[0];	1505	my $child = $self->{children}[0];
1228		1506
…		…
1233	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1511	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1234		1512
1235	my $border = $self->border;	1513	my $border = $self->border;
1236		1514
1237	glColor @{ $self->{border_bg} };	1515	glColor @{ $self->{border_bg} };
1238	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1516	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1239	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1517	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1240	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1518	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1241	$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);
1242		1534
1243	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1535	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1244	glColor @{ $self->{bg} };	1536	glColor @{ $self->{bg} };
1245		1537
1246	# TODO: repeat texture not scale	1538	# TODO: repeat texture not scale
…		…
1265	if $self->{close_button};	1557	if $self->{close_button};
1266	}	1558	}
1267		1559
1268	#############################################################################	1560	#############################################################################
1269		1561
1270	package CFClient::UI::Table;	1562	package CFPlus::UI::Table;
1271		1563
1272	our @ISA = CFClient::UI::Base::;	1564	our @ISA = CFPlus::UI::Container::;
1273		1565
1274	use List::Util qw(max sum);	1566	use List::Util qw(max sum);
1275		1567
1276	use CFClient::OpenGL;	1568	use CFPlus::OpenGL;
1277		1569
1278	sub new {	1570	sub new {
1279	my $class = shift;	1571	my $class = shift;
1280		1572
1281	$class->SUPER::new (	1573	$class->SUPER::new (
1282	col_expand => [],	1574	col_expand => [],
		1575	row_expand => [],
1283	@_,	1576	@_,
1284	)	1577	)
1285	}	1578	}
1286		1579
1287	sub children {
1288	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289	}
1290
1291	sub add {	1580	sub add {
1292	my ($self, $x, $y, $child) = @_;	1581	my ($self, @widgets) = @_;
1293		1582
1294	$child->set_parent ($self);	1583	for my $child (@widgets) {
1295	$self->{children}[$y][$x] = $child;	1584	$child->{c_rowspan} ||= 1;
		1585	$child->{c_colspan} ||= 1;
		1586	}
1296		1587
1297	$self->realloc;	1588	$self->SUPER::add (@widgets);
1298	}	1589	}
1299		1590
1300	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 {
1301	my ($self, $child) = @_;	1609	my ($self) = @_;
1302		1610
1303	# TODO: not yet implemented	1611	my (@w, @h);
1304	}
1305
1306	# TODO: move to container class maybe? send children a signal on removal?
1307	sub clear {
1308	my ($self) = @_;
1309		1612
1310	my @children = $self->children;	1613	my @children = $self->children;
1311	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	}
1312		1624	}
1313	for (@children) {
1314	delete $_->{parent};
1315	$_->hide;
1316	}
1317		1625
1318	$self->realloc;	1626	# second pass, rows
1319	}	1627	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1320
1321	sub get_wh {
1322	my ($self) = @_;
1323
1324	my (@w, @h);
1325
1326	for my $y (0 .. $#{$self->{children}}) {
1327	my $row = $self->{children}[$y]
1328	or next;
1329
1330	for my $x (0 .. $#$row) {
1331	my $widget = $row->[$x]
1332	or next;
1333	my ($w, $h) = @$widget{qw(req_w req_h)};	1628	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1334		1629
1335	$w[$x] = max $w[$x], $w;	1630	my $sh = sum @h[$r .. $r + $rs - 1];
1336	$h[$y] = max $h[$y], $h;	1631
		1632	if ($h > $sh) {
		1633	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1337	}	1634	}
1338	}	1635	}
1339		1636
1340	(\@w, \@h)	1637	(\@w, \@h)
1341	}	1638	}
…		…
1357	my ($ws, $hs) = $self->get_wh;	1654	my ($ws, $hs) = $self->get_wh;
1358		1655
1359	my $req_w = (sum @$ws) || 1;	1656	my $req_w = (sum @$ws) || 1;
1360	my $req_h = (sum @$hs) || 1;	1657	my $req_h = (sum @$hs) || 1;
1361		1658
1362	# TODO: nicer code && do row_expand	1659	# now linearly scale the rows/columns to the allocated size
1363	my @col_expand = @{$self->{col_expand}};	1660	my @col_expand = @{$self->{col_expand}};
1364	@col_expand = (1) x @$ws unless @col_expand;	1661	@col_expand = (1) x @$ws unless @col_expand;
1365	my $col_expand = (sum @col_expand) || 1;	1662	my $col_expand = (sum @col_expand) || 1;
1366		1663
1367	# linearly scale sizes
1368	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1664	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370		1665
1371	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
1372	CFClient::UI::harmonize $hs;	1674	CFPlus::UI::harmonize $hs;
1373		1675
1374	my $y;	1676	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1677	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1375		1678
1376	for my $r (0 .. $#{$self->{children}}) {	1679	for my $widget ($self->children) {
1377	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)};
1378	or next;
1379		1681
1380	my $x = 0;	1682	$widget->configure (
1381	my $row_h = $hs->[$r];	1683	$x[$c], $y[$r],
		1684	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1382		1685	);
1383	for my $c (0 .. $#$row) {	1686	}
1384	my $col_w = $ws->[$c];
1385		1687
1386	if (my $widget = $row->[$c]) {	1688	1
1387	$widget->configure ($x, $y, $col_w, $row_h);	1689	}
1388	}
1389		1690
1390	$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};
1391	}	1718	}
		1719	}
1392		1720
1393	$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});
1394	}	1752	}
1395		1753
1396	1	1754	1
1397	}	1755	}
1398		1756
1399	sub find_widget {
1400	my ($self, $x, $y) = @_;
1401
1402	$x -= $self->{x};
1403	$y -= $self->{y};
1404
1405	my $res;
1406
1407	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1408	$res = $_->find_widget ($x, $y)
1409	and return $res;
1410	}
1411
1412	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1413	}
1414
1415	sub _draw {
1416	my ($self) = @_;
1417
1418	for (grep $_, @{$self->{children}}) {
1419	$_->draw for grep $_, @$_;
1420	}
1421	}
1422
1423	#############################################################################	1757	#############################################################################
1424		1758
1425	package CFClient::UI::Box;	1759	package CFPlus::UI::Box;
1426		1760
1427	our @ISA = CFClient::UI::Container::;	1761	our @ISA = CFPlus::UI::Container::;
1428		1762
1429	sub size_request {	1763	sub size_request {
1430	my ($self) = @_;	1764	my ($self) = @_;
		1765
		1766	my @children = $self->visible_children;
1431		1767
1432	$self->{vertical}	1768	$self->{vertical}
1433	? (	1769	? (
1434	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1770	(List::Util::max map $_->{req_w}, @children),
1435	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1771	(List::Util::sum map $_->{req_h}, @children),
1436	)	1772	)
1437	: (	1773	: (
1438	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1774	(List::Util::sum map $_->{req_w}, @children),
1439	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1775	(List::Util::max map $_->{req_h}, @children),
1440	)	1776	)
1441	}	1777	}
1442		1778
1443	sub invoke_size_allocate {	1779	sub invoke_size_allocate {
1444	my ($self, $w, $h) = @_;	1780	my ($self, $w, $h) = @_;
…		…
1465	$req[$_] += $space * $children[$_]{expand}	1801	$req[$_] += $space * $children[$_]{expand}
1466	for 0 .. $#children;	1802	for 0 .. $#children;
1467	}	1803	}
1468	}	1804	}
1469		1805
1470	CFClient::UI::harmonize \@req;	1806	CFPlus::UI::harmonize \@req;
1471		1807
1472	my $pos = 0;	1808	my $pos = 0;
1473	for (0 .. $#children) {	1809	for (0 .. $#children) {
1474	my $alloc = $req[$_];	1810	my $alloc = $req[$_];
1475	$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));
…		…
1480	1	1816	1
1481	}	1817	}
1482		1818
1483	#############################################################################	1819	#############################################################################
1484		1820
1485	package CFClient::UI::HBox;	1821	package CFPlus::UI::HBox;
1486		1822
1487	our @ISA = CFClient::UI::Box::;	1823	our @ISA = CFPlus::UI::Box::;
1488		1824
1489	sub new {	1825	sub new {
1490	my $class = shift;	1826	my $class = shift;
1491		1827
1492	$class->SUPER::new (	1828	$class->SUPER::new (
…		…
1495	)	1831	)
1496	}	1832	}
1497		1833
1498	#############################################################################	1834	#############################################################################
1499		1835
1500	package CFClient::UI::VBox;	1836	package CFPlus::UI::VBox;
1501		1837
1502	our @ISA = CFClient::UI::Box::;	1838	our @ISA = CFPlus::UI::Box::;
1503		1839
1504	sub new {	1840	sub new {
1505	my $class = shift;	1841	my $class = shift;
1506		1842
1507	$class->SUPER::new (	1843	$class->SUPER::new (
…		…
1510	)	1846	)
1511	}	1847	}
1512		1848
1513	#############################################################################	1849	#############################################################################
1514		1850
1515	package CFClient::UI::Label;	1851	package CFPlus::UI::Label;
1516		1852
1517	our @ISA = CFClient::UI::DrawBG::;	1853	our @ISA = CFPlus::UI::DrawBG::;
1518		1854
1519	use CFClient::OpenGL;	1855	use CFPlus::OpenGL;
1520		1856
1521	sub new {	1857	sub new {
1522	my ($class, %arg) = @_;	1858	my ($class, %arg) = @_;
1523		1859
1524	my $self = $class->SUPER::new (	1860	my $self = $class->SUPER::new (
…		…
1527	#active_bg => none	1863	#active_bg => none
1528	#font => default_font	1864	#font => default_font
1529	#text => initial text	1865	#text => initial text
1530	#markup => initial narkup	1866	#markup => initial narkup
1531	#max_w => maximum pixel width	1867	#max_w => maximum pixel width
		1868	#style => 0, # render flags
1532	ellipsise => 3, # end	1869	ellipsise => 3, # end
1533	layout => (new CFClient::Layout),	1870	layout => (new CFPlus::Layout),
1534	fontsize => 1,	1871	fontsize => 1,
1535	align => -1,	1872	align => -1,
1536	valign => -1,	1873	valign => -1,
1537	padding_x => 2,	1874	padding_x => 2,
1538	padding_y => 2,	1875	padding_y => 2,
1539	can_events => 0,	1876	can_events => 0,
1540	%arg	1877	%arg
1541	);	1878	);
1542		1879
1543	if (exists $self->{template}) {	1880	if (exists $self->{template}) {
1544	my $layout = new CFClient::Layout;	1881	my $layout = new CFPlus::Layout;
1545	$layout->set_text (delete $self->{template});	1882	$layout->set_text (delete $self->{template});
1546	$self->{template} = $layout;	1883	$self->{template} = $layout;
1547	}	1884	}
1548		1885
1549	if (exists $self->{markup}) {	1886	if (exists $self->{markup}) {
…		…
1553	}	1890	}
1554		1891
1555	$self	1892	$self
1556	}	1893	}
1557		1894
1558	sub escape($) {
1559	local $_ = $_[0];
1560
1561	s/&/&amp;/g;
1562	s/>/&gt;/g;
1563	s/</&lt;/g;
1564
1565	$_
1566	}
1567
1568	sub update {	1895	sub update {
1569	my ($self) = @_;	1896	my ($self) = @_;
1570		1897
1571	delete $self->{texture};	1898	delete $self->{texture};
1572	$self->SUPER::update;	1899	$self->SUPER::update;
…		…
1577		1904
1578	delete $self->{ox};	1905	delete $self->{ox};
1579	$self->SUPER::realloc;	1906	$self->SUPER::realloc;
1580	}	1907	}
1581		1908
		1909	sub clear {
		1910	my ($self) = @_;
		1911
		1912	$self->set_text ("");
		1913	}
		1914
1582	sub set_text {	1915	sub set_text {
1583	my ($self, $text) = @_;	1916	my ($self, $text) = @_;
1584		1917
1585	return if $self->{text} eq "T$text";	1918	return if $self->{text} eq "T$text";
1586	$self->{text} = "T$text";	1919	$self->{text} = "T$text";
1587		1920
1588	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589	$self->{layout}->set_text ($text);	1921	$self->{layout}->set_text ($text);
1590		1922
1591	delete $self->{size_req};	1923	delete $self->{size_req};
1592	$self->realloc;	1924	$self->realloc;
1593	$self->update;	1925	$self->update;
…		…
1599	return if $self->{text} eq "M$markup";	1931	return if $self->{text} eq "M$markup";
1600	$self->{text} = "M$markup";	1932	$self->{text} = "M$markup";
1601		1933
1602	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1934	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603		1935
1604	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605	$self->{layout}->set_markup ($markup);	1936	$self->{layout}->set_markup ($markup);
1606		1937
1607	delete $self->{size_req};	1938	delete $self->{size_req};
1608	$self->realloc;	1939	$self->realloc;
1609	$self->update;	1940	$self->update;
…		…
1621		1952
1622	my ($w, $h) = $self->{layout}->size;	1953	my ($w, $h) = $self->{layout}->size;
1623		1954
1624	if (exists $self->{template}) {	1955	if (exists $self->{template}) {
1625	$self->{template}->set_font ($self->{font}) if $self->{font};	1956	$self->{template}->set_font ($self->{font}) if $self->{font};
		1957	$self->{template}->set_width ($self->{max_w} || -1);
1626	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1958	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627		1959
1628	my ($w2, $h2) = $self->{template}->size;	1960	my ($w2, $h2) = $self->{template}->size;
1629		1961
1630	$w = List::Util::max $w, $w2;	1962	$w = List::Util::max $w, $w2;
…		…
1654		1986
1655	sub set_fontsize {	1987	sub set_fontsize {
1656	my ($self, $fontsize) = @_;	1988	my ($self, $fontsize) = @_;
1657		1989
1658	$self->{fontsize} = $fontsize;	1990	$self->{fontsize} = $fontsize;
		1991	delete $self->{size_req};
1659	delete $self->{texture};	1992	delete $self->{texture};
1660		1993
1661	$self->realloc;	1994	$self->realloc;
1662	}	1995	}
1663		1996
1664	sub reconfigure {	1997	sub reconfigure {
1665	my ($self) = @_;	1998	my ($self) = @_;
1666		1999
1667	delete $self->{size_req};	2000	delete $self->{size_req};
		2001	delete $self->{texture};
1668		2002
1669	$self->SUPER::reconfigure;	2003	$self->SUPER::reconfigure;
1670	}	2004	}
1671		2005
1672	sub _draw {	2006	sub _draw {
1673	my ($self) = @_;	2007	my ($self) = @_;
1674		2008
1675	$self->SUPER::_draw; # draw background, if applicable	2009	$self->SUPER::_draw; # draw background, if applicable
1676		2010
1677	my $tex = $self->{texture} ||= do {	2011	my $size = $self->{texture} ||= do {
1678	$self->{layout}->set_foreground (@{$self->{fg}});	2012	$self->{layout}->set_foreground (@{$self->{fg}});
1679	$self->{layout}->set_font ($self->{font}) if $self->{font};	2013	$self->{layout}->set_font ($self->{font}) if $self->{font};
1680	$self->{layout}->set_width ($self->{w});	2014	$self->{layout}->set_width ($self->{w});
1681	$self->{layout}->set_ellipsise ($self->{ellipsise});	2015	$self->{layout}->set_ellipsise ($self->{ellipsise});
1682	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2016	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2017	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684		2018
1685	new_from_layout CFClient::Texture $self->{layout}	2019	[$self->{layout}->size]
1686	};	2020	};
1687		2021
1688	unless (exists $self->{ox}) {	2022	unless (exists $self->{ox}) {
1689	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2023	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2024	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691	: ($self->{w} - $tex->{w}) * 0.5);	2025	: ($self->{w} - $size->[0]) * 0.5);
1692		2026
1693	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2027	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2028	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695	: ($self->{h} - $tex->{h}) * 0.5);	2029	: ($self->{h} - $size->[1]) * 0.5);
		2030
		2031	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1696	};	2032	};
1697		2033
1698	glEnable GL_TEXTURE_2D;	2034	# unless ($self->{list}) {
1699		2035	# $self->{list} = CFPlus::OpenGL::glGenList;
1700	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2036	# CFPlus::OpenGL::glNewList $self->{list};
1701	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2037	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1702		2038	# CFPlus::OpenGL::glEndList;
1703	if ($tex->{format} == GL_ALPHA) {
1704	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1705	glColor @{$self->{fg}};
1706	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1707	} else {
1708	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1709	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1710	}	2039	# }
		2040	#
		2041	# CFPlus::OpenGL::glCallList $self->{list};
1711		2042
1712	glDisable GL_TEXTURE_2D;	2043	$self->{layout}->draw;
1713	}	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	#}
1714		2053
1715	#############################################################################	2054	#############################################################################
1716		2055
1717	package CFClient::UI::EntryBase;	2056	package CFPlus::UI::EntryBase;
1718		2057
1719	our @ISA = CFClient::UI::Label::;	2058	our @ISA = CFPlus::UI::Label::;
1720		2059
1721	use CFClient::OpenGL;	2060	use CFPlus::OpenGL;
1722		2061
1723	sub new {	2062	sub new {
1724	my $class = shift;	2063	my $class = shift;
1725		2064
1726	$class->SUPER::new (	2065	$class->SUPER::new (
1727	fg => [1, 1, 1],	2066	fg => [1, 1, 1],
1728	bg => [0, 0, 0, 0.2],	2067	bg => [0, 0, 0, 0.2],
		2068	outline => [0.6, 0.3, 0.1],
1729	active_bg => [1, 1, 1, 0.5],	2069	active_bg => [0, 0, 1, .2],
1730	active_fg => [0, 0, 0],	2070	active_fg => [1, 1, 1],
		2071	active_outline => [1, 1, 0],
1731	can_hover => 1,	2072	can_hover => 1,
1732	can_focus => 1,	2073	can_focus => 1,
1733	valign => 0,	2074	valign => 0,
1734	can_events => 1,	2075	can_events => 1,
		2076	ellipsise => 0,
1735	#text => ...	2077	#text => ...
1736	#hidden => "*",	2078	#hidden => "*",
1737	@_	2079	@_
1738	)	2080	)
1739	}	2081	}
…		…
1784	my $sym = $ev->{sym};	2126	my $sym = $ev->{sym};
1785	my $uni = $ev->{unicode};	2127	my $uni = $ev->{unicode};
1786		2128
1787	my $text = $self->get_text;	2129	my $text = $self->get_text;
1788		2130
		2131	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2132
1789	if ($uni == 8) {	2133	if ($uni == 8) {
1790	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2134	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791	} elsif ($uni == 127) {	2135	} elsif ($uni == 127) {
1792	substr $text, $self->{cursor}, 1, "";	2136	substr $text, $self->{cursor}, 1, "";
1793	} elsif ($sym == CFClient::SDLK_LEFT) {	2137	} elsif ($sym == CFPlus::SDLK_LEFT) {
1794	--$self->{cursor} if $self->{cursor};	2138	--$self->{cursor} if $self->{cursor};
1795	} elsif ($sym == CFClient::SDLK_RIGHT) {	2139	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1796	++$self->{cursor} if $self->{cursor} < length $self->{text};	2140	++$self->{cursor} if $self->{cursor} < length $self->{text};
1797	} 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 = "";
1798	$self->{cursor} = 0;	2155	$self->{cursor} = 0;
1799	} elsif ($sym == CFClient::SDLK_END) {
1800	$self->{cursor} = length $text;
1801	} elsif ($uni == 27) {	2156	} elsif ($uni == 27) {
1802	$self->emit ('escape');	2157	$self->emit ('escape');
1803	} elsif ($uni) {	2158	} elsif ($uni == 0x0d) {
		2159	substr $text, $self->{cursor}++, 0, "\012";
		2160	} elsif ($uni >= 0x20) {
1804	substr $text, $self->{cursor}++, 0, chr $uni;	2161	substr $text, $self->{cursor}++, 0, chr $uni;
1805	} else {	2162	} else {
1806	return 0;	2163	return 0;
1807	}	2164	}
1808		2165
1809	$self->_set_text ($text);	2166	$self->_set_text ($text);
1810		2167
1811	$self->realloc;	2168	$self->realloc;
		2169	$self->update;
1812		2170
1813	1	2171	1
1814	}	2172	}
1815		2173
1816	sub invoke_focus_in {	2174	sub invoke_focus_in {
…		…
1828		2186
1829	my $idx = $self->{layout}->xy_to_index ($x, $y);	2187	my $idx = $self->{layout}->xy_to_index ($x, $y);
1830		2188
1831	# byte-index to char-index	2189	# byte-index to char-index
1832	my $text = $self->{text};	2190	my $text = $self->{text};
1833	utf8::encode $text;	2191	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1834	$self->{cursor} = length substr $text, 0, $idx;	2192	$self->{cursor} = length $text;
1835		2193
1836	$self->_set_text ($self->{text});	2194	$self->_set_text ($self->{text});
1837	$self->update;	2195	$self->update;
1838		2196
1839	1	2197	1
…		…
1858	glColor_premultiply @{$self->{bg}};	2216	glColor_premultiply @{$self->{bg}};
1859	}	2217	}
1860		2218
1861	glEnable GL_BLEND;	2219	glEnable GL_BLEND;
1862	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2220	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1863	glBegin GL_QUADS;
1864	glVertex 0 , 0;
1865	glVertex 0 , $self->{h};
1866	glVertex $self->{w}, $self->{h};	2221	glRect 0, 0, $self->{w}, $self->{h};
1867	glVertex $self->{w}, 0;
1868	glEnd;
1869	glDisable GL_BLEND;	2222	glDisable GL_BLEND;
1870		2223
1871	$self->SUPER::_draw;	2224	$self->SUPER::_draw;
1872		2225
1873	#TODO: force update every cursor change :(	2226	#TODO: force update every cursor change :(
…		…
1875		2228
1876	unless (exists $self->{cur_h}) {	2229	unless (exists $self->{cur_h}) {
1877	my $text = substr $self->{text}, 0, $self->{cursor};	2230	my $text = substr $self->{text}, 0, $self->{cursor};
1878	utf8::encode $text;	2231	utf8::encode $text;
1879		2232
1880	@$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);
1881	}	2234	}
1882		2235
1883	glColor @{$self->{fg}};	2236	glColor_premultiply @{$self->{active_fg}};
1884	glBegin GL_LINES;	2237	glBegin GL_LINES;
1885	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};
1886	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};
1887	glEnd;	2240	glEnd;
1888	}
1889	}
1890		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
1891	package CFClient::UI::Entry;	2261	package CFPlus::UI::Entry;
1892		2262
1893	our @ISA = CFClient::UI::EntryBase::;	2263	our @ISA = CFPlus::UI::EntryBase::;
1894		2264
1895	use CFClient::OpenGL;	2265	use CFPlus::OpenGL;
1896		2266
1897	sub invoke_key_down {	2267	sub invoke_key_down {
1898	my ($self, $ev) = @_;	2268	my ($self, $ev) = @_;
1899		2269
1900	my $sym = $ev->{sym};	2270	my $sym = $ev->{sym};
1901		2271
1902	if ($sym == 13) {	2272	if ($ev->{uni} == 0x0d || $sym == 13) {
1903	unshift @{$self->{history}},	2273	unshift @{$self->{history}},
1904	my $txt = $self->get_text;	2274	my $txt = $self->get_text;
1905		2275
1906	$self->{history_pointer} = -1;	2276	$self->{history_pointer} = -1;
1907	$self->{history_saveback} = '';	2277	$self->{history_saveback} = '';
1908	$self->emit (activate => $txt);	2278	$self->emit (activate => $txt);
1909	$self->update;	2279	$self->update;
1910		2280
1911	} elsif ($sym == CFClient::SDLK_UP) {	2281	} elsif ($sym == CFPlus::SDLK_UP) {
1912	if ($self->{history_pointer} < 0) {	2282	if ($self->{history_pointer} < 0) {
1913	$self->{history_saveback} = $self->get_text;	2283	$self->{history_saveback} = $self->get_text;
1914	}	2284	}
1915	if (@{$self->{history} || []} > 0) {	2285	if (@{$self->{history} || []} > 0) {
1916	$self->{history_pointer}++;	2286	$self->{history_pointer}++;
…		…
1918	$self->{history_pointer} = @{$self->{history} || []} - 1;	2288	$self->{history_pointer} = @{$self->{history} || []} - 1;
1919	}	2289	}
1920	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2290	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1921	}	2291	}
1922		2292
1923	} elsif ($sym == CFClient::SDLK_DOWN) {	2293	} elsif ($sym == CFPlus::SDLK_DOWN) {
1924	$self->{history_pointer}--;	2294	$self->{history_pointer}--;
1925	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2295	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926		2296
1927	if ($self->{history_pointer} >= 0) {	2297	if ($self->{history_pointer} >= 0) {
1928	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2298	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1937	1	2307	1
1938	}	2308	}
1939		2309
1940	#############################################################################	2310	#############################################################################
1941		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
1942	package CFClient::UI::Button;	2351	package CFPlus::UI::ButtonBin;
1943		2352
1944	our @ISA = CFClient::UI::Label::;	2353	our @ISA = CFPlus::UI::Bin::;
1945		2354
1946	use CFClient::OpenGL;	2355	use CFPlus::OpenGL;
1947		2356
1948	my @tex =	2357	my @tex =
1949	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2358	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950	qw(b1_button_active.png);	2359	qw(b1_button_inactive.png b1_button_active.png);
1951		2360
1952	sub new {	2361	sub new {
1953	my $class = shift;	2362	my $class = shift;
1954		2363
1955	$class->SUPER::new (	2364	$class->SUPER::new (
1956	padding_x => 4,
1957	padding_y => 4,
1958	fg => [1, 1, 1],
1959	active_fg => [0, 0, 1],
1960	can_hover => 1,	2365	can_hover => 1,
1961	align => 0,	2366	align => 0,
1962	valign => 0,	2367	valign => 0,
1963	can_events => 1,	2368	can_events => 1,
1964	@_	2369	@_
…		…
1976	}	2381	}
1977		2382
1978	sub _draw {	2383	sub _draw {
1979	my ($self) = @_;	2384	my ($self) = @_;
1980		2385
1981	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1982
1983	glEnable GL_TEXTURE_2D;	2386	glEnable GL_TEXTURE_2D;
1984	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2387	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1985	glColor 0, 0, 0, 1;	2388	glColor 0, 0, 0, 1;
1986		2389
		2390	my $tex = $tex[$GRAB == $self];
1987	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2391	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1988		2392
1989	glDisable GL_TEXTURE_2D;	2393	glDisable GL_TEXTURE_2D;
1990		2394
1991	$self->SUPER::_draw;	2395	$self->SUPER::_draw;
1992	}	2396	}
1993		2397
1994	#############################################################################	2398	#############################################################################
1995		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
1996	package CFClient::UI::ImageButton;	2605	package CFPlus::UI::ImageButton;
1997		2606
1998	our @ISA = CFClient::UI::Image::;	2607	our @ISA = CFPlus::UI::Image::;
1999		2608
2000	use CFClient::OpenGL;	2609	use CFPlus::OpenGL;
2001		2610
2002	my %textures;	2611	my %textures;
2003		2612
2004	sub new {	2613	sub new {
2005	my $class = shift;	2614	my $class = shift;
…		…
2015	can_events => 1,	2624	can_events => 1,
2016	@_	2625	@_
2017	);	2626	);
2018	}	2627	}
2019		2628
		2629	sub invoke_button_down {
		2630	my ($self, $ev, $x, $y) = @_;
		2631
		2632	1
		2633	}
		2634
2020	sub invoke_button_up {	2635	sub invoke_button_up {
2021	my ($self, $ev, $x, $y) = @_;	2636	my ($self, $ev, $x, $y) = @_;
2022		2637
2023	$self->emit ("activate")	2638	$self->emit ("activate")
2024	if $x >= 0 && $x < $self->{w}	2639	if $x >= 0 && $x < $self->{w}
…		…
2027	1	2642	1
2028	}	2643	}
2029		2644
2030	#############################################################################	2645	#############################################################################
2031		2646
2032	package CFClient::UI::CheckBox;
2033
2034	our @ISA = CFClient::UI::DrawBG::;
2035
2036	my @tex =
2037	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2038	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2039
2040	use CFClient::OpenGL;
2041
2042	sub new {
2043	my $class = shift;
2044
2045	$class->SUPER::new (
2046	padding_x => 2,
2047	padding_y => 2,
2048	fg => [1, 1, 1],
2049	active_fg => [1, 1, 0],
2050	bg => [0, 0, 0, 0.2],
2051	active_bg => [1, 1, 1, 0.5],
2052	state => 0,
2053	can_hover => 1,
2054	@_
2055	)
2056	}
2057
2058	sub size_request {
2059	my ($self) = @_;
2060
2061	(6) x 2
2062	}
2063
2064	sub invoke_button_down {
2065	my ($self, $ev, $x, $y) = @_;
2066
2067	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2068	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2069	$self->{state} = !$self->{state};
2070	$self->emit (changed => $self->{state});
2071	} else {
2072	return 0
2073	}
2074
2075	1
2076	}
2077
2078	sub _draw {
2079	my ($self) = @_;
2080
2081	$self->SUPER::_draw;
2082
2083	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2084
2085	my ($w, $h) = @$self{qw(w h)};
2086
2087	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2088
2089	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2090
2091	my $tex = $self->{state} ? $tex[1] : $tex[0];
2092
2093	glEnable GL_TEXTURE_2D;
2094	$tex->draw_quad_alpha (0, 0, $s, $s);
2095	glDisable GL_TEXTURE_2D;
2096	}
2097
2098	#############################################################################
2099
2100	package CFClient::UI::Image;	2647	package CFPlus::UI::VGauge;
2101		2648
2102	our @ISA = CFClient::UI::Base::;	2649	our @ISA = CFPlus::UI::Base::;
2103
2104	use CFClient::OpenGL;
2105
2106	our %texture_cache;
2107
2108	sub new {
2109	my $class = shift;
2110
2111	my $self = $class->SUPER::new (
2112	can_events => 0,
2113	@_,
2114	);
2115
2116	$self->{path}
2117	or Carp::croak "required attribute 'path' not set";
2118
2119	$self->{tex} = $texture_cache{$self->{path}} ||=
2120	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2121
2122	Scalar::Util::weaken $texture_cache{$self->{path}};
2123
2124	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2125
2126	$self
2127	}
2128
2129	sub size_request {
2130	my ($self) = @_;
2131
2132	($self->{tex}{w}, $self->{tex}{h})
2133	}
2134
2135	sub _draw {
2136	my ($self) = @_;
2137
2138	my $tex = $self->{tex};
2139
2140	my ($w, $h) = ($self->{w}, $self->{h});
2141
2142	if ($self->{rot90}) {
2143	glRotate 90, 0, 0, 1;
2144	glTranslate 0, -$self->{w}, 0;
2145
2146	($w, $h) = ($h, $w);
2147	}
2148
2149	glEnable GL_TEXTURE_2D;
2150	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2151
2152	$tex->draw_quad_alpha (0, 0, $w, $h);
2153
2154	glDisable GL_TEXTURE_2D;
2155	}
2156
2157	#############################################################################
2158
2159	package CFClient::UI::VGauge;
2160
2161	our @ISA = CFClient::UI::Base::;
2162		2650
2163	use List::Util qw(min max);	2651	use List::Util qw(min max);
2164		2652
2165	use CFClient::OpenGL;	2653	use CFPlus::OpenGL;
2166		2654
2167	my %tex = (	2655	my %tex = (
2168	food => [	2656	food => [
2169	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2657	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2170	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2658	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2171	],	2659	],
2172	grace => [	2660	grace => [
2173	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2661	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2174	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/
2175	],	2663	],
2176	hp => [	2664	hp => [
2177	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2665	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2178	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2666	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2179	],	2667	],
2180	mana => [	2668	mana => [
2181	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2669	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2182	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/
2183	],	2671	],
2184	);	2672	);
2185		2673
2186	# eg. VGauge->new (gauge => 'food'), default gauge: food	2674	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2246	my $ycut1 = max 0, min 1, $ycut;	2734	my $ycut1 = max 0, min 1, $ycut;
2247	my $ycut2 = max 0, min 1, $ycut - 1;	2735	my $ycut2 = max 0, min 1, $ycut - 1;
2248		2736
2249	my $h1 = $self->{h} * (1 - $ycut1);	2737	my $h1 = $self->{h} * (1 - $ycut1);
2250	my $h2 = $self->{h} * (1 - $ycut2);	2738	my $h2 = $self->{h} * (1 - $ycut2);
		2739	my $h3 = $self->{h};
		2740
		2741	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2251		2742
2252	glEnable GL_BLEND;	2743	glEnable GL_BLEND;
2253	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2744	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2745	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255	glEnable GL_TEXTURE_2D;	2746	glEnable GL_TEXTURE_2D;
…		…
2274		2765
2275	if ($t3) {	2766	if ($t3) {
2276	glBindTexture GL_TEXTURE_2D, $t3->{name};	2767	glBindTexture GL_TEXTURE_2D, $t3->{name};
2277	glBegin GL_QUADS;	2768	glBegin GL_QUADS;
2278	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2769	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2770	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2771	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2772	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282	glEnd;	2773	glEnd;
2283	}	2774	}
2284		2775
2285	glDisable GL_BLEND;	2776	glDisable GL_BLEND;
2286	glDisable GL_TEXTURE_2D;	2777	glDisable GL_TEXTURE_2D;
2287	}	2778	}
2288		2779
2289	#############################################################################	2780	#############################################################################
2290		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
2291	package CFClient::UI::Gauge;	2926	package CFPlus::UI::Gauge;
2292		2927
2293	our @ISA = CFClient::UI::VBox::;	2928	our @ISA = CFPlus::UI::VBox::;
2294		2929
2295	sub new {	2930	sub new {
2296	my ($class, %arg) = @_;	2931	my ($class, %arg) = @_;
2297		2932
2298	my $self = $class->SUPER::new (	2933	my $self = $class->SUPER::new (
…		…
2300	can_hover => 1,	2935	can_hover => 1,
2301	can_events => 1,	2936	can_events => 1,
2302	%arg,	2937	%arg,
2303	);	2938	);
2304		2939
2305	$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");
2306	$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);
2307	$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");
2308		2943
2309	$self	2944	$self
2310	}	2945	}
2311		2946
2312	sub set_fontsize {	2947	sub set_fontsize {
…		…
2333	$self->{value}->set_text ($val);	2968	$self->{value}->set_text ($val);
2334	}	2969	}
2335		2970
2336	#############################################################################	2971	#############################################################################
2337		2972
2338	package CFClient::UI::Slider;	2973	package CFPlus::UI::Slider;
2339		2974
2340	use strict;	2975	use strict;
2341		2976
2342	use CFClient::OpenGL;	2977	use CFPlus::OpenGL;
2343		2978
2344	our @ISA = CFClient::UI::DrawBG::;	2979	our @ISA = CFPlus::UI::DrawBG::;
2345		2980
2346	my @tex =	2981	my @tex =
2347	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2982	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2348	qw(s1_slider.png s1_slider_bg.png);	2983	qw(s1_slider.png s1_slider_bg.png);
2349		2984
2350	sub new {	2985	sub new {
2351	my $class = shift;	2986	my $class = shift;
2352		2987
…		…
2420		3055
2421	$self->SUPER::invoke_button_down ($ev, $x, $y);	3056	$self->SUPER::invoke_button_down ($ev, $x, $y);
2422		3057
2423	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3058	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2424		3059
2425	$self->invoke_mouse_motion ($ev, $x, $y)	3060	$self->invoke_mouse_motion ($ev, $x, $y);
		3061
		3062	1
2426	}	3063	}
2427		3064
2428	sub invoke_mouse_motion {	3065	sub invoke_mouse_motion {
2429	my ($self, $ev, $x, $y) = @_;	3066	my ($self, $ev, $x, $y) = @_;
2430		3067
…		…
2437		3074
2438	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	3075	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2439	} else {	3076	} else {
2440	return 0;	3077	return 0;
2441	}	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);
2442		3091
2443	1	3092	1
2444	}	3093	}
2445		3094
2446	sub update {	3095	sub update {
…		…
2497	glDisable GL_TEXTURE_2D;	3146	glDisable GL_TEXTURE_2D;
2498	}	3147	}
2499		3148
2500	#############################################################################	3149	#############################################################################
2501		3150
2502	package CFClient::UI::ValSlider;	3151	package CFPlus::UI::ValSlider;
2503		3152
2504	our @ISA = CFClient::UI::HBox::;	3153	our @ISA = CFPlus::UI::HBox::;
2505		3154
2506	sub new {	3155	sub new {
2507	my ($class, %arg) = @_;	3156	my ($class, %arg) = @_;
2508		3157
2509	my $range = delete $arg{range};	3158	my $range = delete $arg{range};
2510		3159
2511	my $self = $class->SUPER::new (	3160	my $self = $class->SUPER::new (
2512	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3161	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2513	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3162	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2514	to_value => sub { shift },	3163	to_value => sub { shift },
2515	from_value => sub { shift },	3164	from_value => sub { shift },
2516	%arg,	3165	%arg,
2517	);	3166	);
2518		3167
…		…
2538	sub set_range { shift->{slider}->set_range (@_) }	3187	sub set_range { shift->{slider}->set_range (@_) }
2539	sub set_value { shift->{slider}->set_value (@_) }	3188	sub set_value { shift->{slider}->set_value (@_) }
2540		3189
2541	#############################################################################	3190	#############################################################################
2542		3191
2543	package CFClient::UI::TextScroller;	3192	package CFPlus::UI::TextScroller;
2544		3193
2545	our @ISA = CFClient::UI::HBox::;	3194	our @ISA = CFPlus::UI::HBox::;
2546		3195
2547	use CFClient::OpenGL;	3196	use CFPlus::OpenGL;
2548		3197
2549	sub new {	3198	sub new {
2550	my $class = shift;	3199	my $class = shift;
2551		3200
2552	my $self = $class->SUPER::new (	3201	my $self = $class->SUPER::new (
2553	fontsize => 1,	3202	fontsize => 1,
2554	can_events => 0,	3203	can_events => 1,
2555	indent => 0,	3204	indent => 0,
2556	#font => default_font	3205	#font => default_font
2557	@_,	3206	@_,
2558		3207
2559	layout => (new CFClient::Layout 1),	3208	layout => (new CFPlus::Layout),
2560	par => [],	3209	par => [],
		3210	max_par => 0,
2561	height => 0,	3211	height => 0,
2562	children => [	3212	children => [
2563	(new CFClient::UI::Empty expand => 1),	3213	(new CFPlus::UI::Empty expand => 1),
2564	(new CFClient::UI::Slider vertical => 1),	3214	(new CFPlus::UI::Slider vertical => 1),
2565	],	3215	],
2566	);	3216	);
2567		3217
2568	$self->{children}[1]->connect (changed => sub { $self->update });	3218	$self->{children}[1]->connect (changed => sub { $self->update });
2569		3219
…		…
2575		3225
2576	$self->{fontsize} = $fontsize;	3226	$self->{fontsize} = $fontsize;
2577	$self->reflow;	3227	$self->reflow;
2578	}	3228	}
2579		3229
2580	sub visible_children {	3230	sub size_request {
2581	my ($self) = @_;	3231	my ($self) = @_;
2582		3232
2583	@{$self->{children}}[0,1]	3233	my ($empty, $slider) = $self->visible_children;
		3234
		3235	local $self->{children} = [$empty, $slider];
		3236	$self->SUPER::size_request
2584	}	3237	}
2585		3238
2586	sub invoke_size_allocate {	3239	sub invoke_size_allocate {
2587	my ($self, $w, $h) = @_;	3240	my ($self, $w, $h) = @_;
2588		3241
…		…
2594	$self->{layout}->set_width ($empty->{w});	3247	$self->{layout}->set_width ($empty->{w});
2595	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3248	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2596		3249
2597	$self->reflow;	3250	$self->reflow;
2598		3251
		3252	local $self->{children} = [$empty, $slider];
2599	$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
2600	}	3264	}
2601		3265
2602	sub get_layout {	3266	sub get_layout {
2603	my ($self, $para) = @_;	3267	my ($self, $para) = @_;
2604		3268
…		…
2632		3296
2633	# todo: base offset on lines or so, not on pixels	3297	# todo: base offset on lines or so, not on pixels
2634	$self->{children}[1]->set_value ($offset);	3298	$self->{children}[1]->set_value ($offset);
2635	}	3299	}
2636		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
2637	sub clear {	3316	sub clear {
2638	my ($self) = @_;	3317	my ($self) = @_;
2639		3318
2640	my (undef, undef, @other) = @{ $self->{children} };	3319	my (undef, undef, @other) = @{ $self->{children} };
2641	$self->remove ($_) for @other;	3320	$self->remove ($_) for @other;
…		…
2644	$self->{height} = 0;	3323	$self->{height} = 0;
2645	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3324	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2646	}	3325	}
2647		3326
2648	sub add_paragraph {	3327	sub add_paragraph {
2649	my ($self, $color, $para, $indent) = @_;	3328	my $self = shift;
2650		3329
2651	my ($text, @w) = ref $para ? @$para : $para;	3330	for my $para (@_) {
2652
2653	$para = {	3331	$para = {
		3332	fg => [1, 1, 1, 1],
		3333	indent => 0,
		3334	markup => "",
		3335	widget => [],
		3336	ref $para ? %$para : (markup => $para),
2654	w => 1e10,	3337	w => 1e10,
2655	wrapped => 1,	3338	wrapped => 1,
2656	fg => $color,
2657	indent => $indent,
2658	markup => $text,
2659	widget => \@w,
2660	};	3339	};
2661		3340
2662	$self->add (@w) if @w;	3341	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2663	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	}
2664		3348
2665	$self->{need_reflow}++;	3349	$self->{need_reflow}++;
2666	$self->update;	3350	$self->update;
2667	}	3351	}
2668		3352
2669	sub scroll_to_bottom {	3353	sub scroll_to_bottom {
2670	my ($self) = @_;	3354	my ($self) = @_;
2671		3355
2672	$self->{scroll_to_bottom} = 1;	3356	$self->{scroll_to} = $#{$self->{par}};
2673	$self->update;	3357	$self->update;
2674	}	3358	}
2675		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
2676	sub update {	3393	sub update {
2677	my ($self) = @_;	3394	my ($self) = @_;
2678		3395
2679	$self->SUPER::update;	3396	$self->SUPER::update;
2680		3397
2681	return unless $self->{h} > 0;	3398	return unless $self->{h} > 0;
2682		3399
2683	delete $self->{texture};	3400	delete $self->{texture};
2684		3401
2685	$ROOT->on_post_alloc ($self => sub {	3402	$ROOT->on_post_alloc ($self => sub {
		3403	$self->force_uptodate;
		3404
2686	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3405	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2687		3406
2688	if (delete $self->{need_reflow}) {
2689	my $height = 0;
2690
2691	for my $para (@{$self->{par}}) {
2692	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2693	my $layout = $self->get_layout ($para);
2694	my ($w, $h) = $layout->size;
2695
2696	$para->{w} = $w + $para->{indent};
2697	$para->{h} = $h;
2698	$para->{wrapped} = $layout->has_wrapped;
2699	}
2700
2701	$height += $para->{h};
2702	}
2703
2704	$self->{height} = $height;
2705
2706	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2707
2708	delete $self->{texture};
2709	}
2710
2711	if (delete $self->{scroll_to_bottom}) {
2712	$self->{children}[1]->set_value (1e10);
2713	}
2714
2715	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3407	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2716	glClearColor 0, 0, 0, 0;	3408	glClearColor 0, 0, 0, 0;
2717	glClear GL_COLOR_BUFFER_BIT;	3409	glClear GL_COLOR_BUFFER_BIT;
2718		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;
2719	my $top = int $self->{children}[1]{range}[0];	3419	my $top = int $self->{children}[1]{range}[0];
2720		3420
2721	my $y0 = $top;	3421	my $y0 = $top;
2722	my $y1 = $top + $H;	3422	my $y1 = $top + $H;
2723		3423
2724	my $y = 0;
2725
2726	glEnable GL_BLEND;
2727	#TODO# not correct in windows where rgba is forced off
2728	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2729
2730	for my $para (@{$self->{par}}) {	3424	for my $para (@{$self->{par}}) {
2731	my $h = $para->{h};	3425	my $h = $para->{h};
		3426	my $y = $para->{y};
2732		3427
2733	if ($y0 < $y + $h && $y < $y1) {	3428	if ($y0 < $y + $h && $y < $y1) {
2734
2735	my $layout = $self->get_layout ($para);	3429	my $layout = $self->get_layout ($para);
2736		3430
2737	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2738
2739	glRasterPos $para->{indent}, $y - $y0;	3431	$layout->render ($para->{indent}, $y - $y0);
2740	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3432	$layout->draw;
2741		3433
2742	if (my @w = @{ $para->{widget} }) {	3434	if (my @w = @{ $para->{widget} }) {
2743	my @s = $layout->get_shapes;	3435	my @s = $layout->get_shapes;
2744		3436
2745	for (@w) {	3437	for (@w) {
…		…
2751	$_->draw;	3443	$_->draw;
2752	}	3444	}
2753	}	3445	}
2754	}	3446	}
2755		3447
2756	$y += $h;	3448	$paridx++;
		3449	$top_paragraph ||= $paridx if $y >= $top;
2757	}	3450	}
2758		3451
2759	glDisable GL_BLEND;	3452	$self->{top_paragraph} = $top_paragraph;
2760	};	3453	};
2761	});	3454	});
2762	}	3455	}
2763		3456
2764	sub reconfigure {	3457	sub reconfigure {
…		…
2782	$self->{children}[1]->draw;	3475	$self->{children}[1]->draw;
2783	}	3476	}
2784		3477
2785	#############################################################################	3478	#############################################################################
2786		3479
2787	package CFClient::UI::Animator;	3480	package CFPlus::UI::Animator;
2788		3481
2789	use CFClient::OpenGL;	3482	use CFPlus::OpenGL;
2790		3483
2791	our @ISA = CFClient::UI::Bin::;	3484	our @ISA = CFPlus::UI::Bin::;
2792		3485
2793	sub moveto {	3486	sub moveto {
2794	my ($self, $x, $y) = @_;	3487	my ($self, $x, $y) = @_;
2795		3488
2796	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3489	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2824	glPopMatrix;	3517	glPopMatrix;
2825	}	3518	}
2826		3519
2827	#############################################################################	3520	#############################################################################
2828		3521
2829	package CFClient::UI::Flopper;	3522	package CFPlus::UI::Flopper;
2830		3523
2831	our @ISA = CFClient::UI::Button::;	3524	our @ISA = CFPlus::UI::Button::;
2832		3525
2833	sub new {	3526	sub new {
2834	my $class = shift;	3527	my $class = shift;
2835		3528
2836	my $self = $class->SUPER::new (	3529	my $self = $class->SUPER::new (
…		…
2848	$self->{other}->toggle_visibility;	3541	$self->{other}->toggle_visibility;
2849	}	3542	}
2850		3543
2851	#############################################################################	3544	#############################################################################
2852		3545
2853	package CFClient::UI::Tooltip;	3546	package CFPlus::UI::Tooltip;
2854		3547
2855	our @ISA = CFClient::UI::Bin::;	3548	our @ISA = CFPlus::UI::Bin::;
2856		3549
2857	use CFClient::OpenGL;	3550	use CFPlus::OpenGL;
2858		3551
2859	sub new {	3552	sub new {
2860	my $class = shift;	3553	my $class = shift;
2861		3554
2862	$class->SUPER::new (	3555	$class->SUPER::new (
…		…
2866	}	3559	}
2867		3560
2868	sub set_tooltip_from {	3561	sub set_tooltip_from {
2869	my ($self, $widget) = @_;	3562	my ($self, $widget) = @_;
2870		3563
2871	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 =~ /^#(.*)$/;
2872		3569
2873	if ($ENV{CFPLUS_DEBUG} & 2) {	3570	if ($ENV{CFPLUS_DEBUG} & 2) {
2874	$tooltip .= "\n\n" . (ref $widget) . "\n"	3571	$tip .= "\n\n" . (ref $widget) . "\n"
2875	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3572	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2876	. "req $widget->{req_w} $widget->{req_h}\n"	3573	. "req $widget->{req_w} $widget->{req_h}\n"
2877	. "visible $widget->{visible}";	3574	. "visible $widget->{visible}";
2878	}	3575	}
2879		3576
2880	$tooltip =~ s/^\n+//;	3577	$tip =~ s/^\n+//;
2881	$tooltip =~ s/\n+$//;	3578	$tip =~ s/\n+$//;
2882		3579
2883	$self->add (new CFClient::UI::Label	3580	$self->add (new CFPlus::UI::Label
2884	markup => $tooltip,	3581	markup => $tip,
2885	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3582	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2886	fontsize => 0.8,	3583	fontsize => 0.8,
2887	fg => [0, 0, 0, 1],	3584	style => 1, # FLAG_INVERSE
2888	ellipsise => 0,	3585	ellipsise => 0,
2889	font => ($widget->{tooltip_font} || $::FONT_PROP),	3586	font => ($widget->{tooltip_font} || $::FONT_PROP),
2890	);	3587	);
2891	}	3588	}
2892		3589
…		…
2911		3608
2912	$self->{root}->on_post_alloc ("move_$self" => sub {	3609	$self->{root}->on_post_alloc ("move_$self" => sub {
2913	my $widget = $self->{owner}	3610	my $widget = $self->{owner}
2914	or return;	3611	or return;
2915		3612
		3613	if ($widget->{visible}) {
2916	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3614	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2917		3615
2918	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3616	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2919	if $x + $self->{w} > $self->{root}{w};	3617	if $x + $self->{w} > $self->{root}{w};
2920		3618
2921	$self->move_abs ($x, $y);	3619	$self->move_abs ($x, $y);
		3620	} else {
		3621	$self->hide;
		3622	}
2922	});	3623	});
2923	}	3624	}
2924		3625
2925	sub _draw {	3626	sub _draw {
2926	my ($self) = @_;	3627	my ($self) = @_;
…		…
2928	glTranslate 0.375, 0.375;	3629	glTranslate 0.375, 0.375;
2929		3630
2930	my ($w, $h) = @$self{qw(w h)};	3631	my ($w, $h) = @$self{qw(w h)};
2931		3632
2932	glColor 1, 0.8, 0.4;	3633	glColor 1, 0.8, 0.4;
2933	glBegin GL_QUADS;	3634	glRect 0, 0, $w, $h;
2934	glVertex 0 , 0;
2935	glVertex 0 , $h;
2936	glVertex $w, $h;
2937	glVertex $w, 0;
2938	glEnd;
2939		3635
2940	glColor 0, 0, 0;	3636	glColor 0, 0, 0;
2941	glBegin GL_LINE_LOOP;	3637	glRect_lineloop 0, 0, $w, $h;
2942	glVertex 0 , 0;
2943	glVertex 0 , $h;
2944	glVertex $w, $h;
2945	glVertex $w, 0;
2946	glEnd;
2947		3638
2948	glTranslate 2 - 0.375, 2 - 0.375;	3639	glTranslate 2 - 0.375, 2 - 0.375;
2949		3640
2950	$self->SUPER::_draw;	3641	$self->SUPER::_draw;
2951	}	3642	}
2952		3643
2953	#############################################################################	3644	#############################################################################
2954		3645
2955	package CFClient::UI::Face;	3646	package CFPlus::UI::Face;
2956		3647
2957	our @ISA = CFClient::UI::Base::;	3648	our @ISA = CFPlus::UI::DrawBG::;
2958		3649
2959	use CFClient::OpenGL;	3650	use CFPlus::OpenGL;
2960		3651
2961	sub new {	3652	sub new {
2962	my $class = shift;	3653	my $class = shift;
2963		3654
2964	my $self = $class->SUPER::new (	3655	my $self = $class->SUPER::new (
		3656	size_w => 32,
		3657	size_h => 8,
2965	aspect => 1,	3658	aspect => 1,
2966	can_events => 0,	3659	can_events => 0,
2967	@_,	3660	@_,
2968	);	3661	);
2969		3662
2970	if ($self->{anim} && $self->{animspeed}) {	3663	if ($self->{anim} && $self->{animspeed}) {
2971	Scalar::Util::weaken (my $widget = $self);	3664	CFPlus::weaken (my $widget = $self);
2972		3665
		3666	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3667	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2973	$self->{timer} = Event->timer (	3668	$self->{timer} = Event->timer (
2974	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2975	hard => 1,	3669	parked => 1,
2976	interval => $self->{animspeed},
2977	cb => sub {	3670	cb => sub {
		3671	return unless $::CONN;
		3672
		3673	my $w = $widget
		3674	or return;
		3675
2978	++$widget->{frame};	3676	++$w->{frame};
		3677	$w->update_face;
		3678
		3679	# somehow, $widget can go away
2979	$widget->update;	3680	$w->update;
		3681	$w->update_timer;
2980	},	3682	},
2981	);	3683	);
		3684
		3685	$self->update_face;
		3686	$self->update_timer;
2982	}	3687	}
2983		3688
2984	$self	3689	$self
2985	}	3690	}
2986		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
2987	sub size_request {	3728	sub size_request {
2988	(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)
2989	}	3746	}
2990		3747
2991	sub update {	3748	sub update {
2992	my ($self) = @_;	3749	my ($self) = @_;
2993		3750
2994	return unless $self->{visible};	3751	return unless $self->{visible};
2995		3752
2996	$self->SUPER::update;	3753	$self->SUPER::update;
2997	}	3754	}
2998		3755
		3756	sub invoke_visibility_change {
		3757	my ($self) = @_;
		3758
		3759	$self->update_timer;
		3760
		3761	0
		3762	}
		3763
2999	sub _draw {	3764	sub _draw {
3000	my ($self) = @_;	3765	my ($self) = @_;
3001		3766
3002	return unless $::CONN;	3767	$self->SUPER::_draw;
3003		3768
3004	my $face;	3769	if (my $tex = $self->{tex}) {
3005
3006	if ($self->{frame}) {
3007	my $anim = $::CONN->{anim}[$self->{anim}];
3008
3009	$face = $anim->[ $self->{frame} % @$anim ]
3010	if $anim && @$anim;
3011	}
3012
3013	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3014
3015	if ($tex) {
3016	glEnable GL_TEXTURE_2D;	3770	glEnable GL_TEXTURE_2D;
3017	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3771	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3018	glColor 0, 0, 0, 1;	3772	glColor 0, 0, 0, 1;
3019	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3773	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3020	glDisable GL_TEXTURE_2D;	3774	glDisable GL_TEXTURE_2D;
…		…
3022	}	3776	}
3023		3777
3024	sub destroy {	3778	sub destroy {
3025	my ($self) = @_;	3779	my ($self) = @_;
3026		3780
3027	$self->{timer}->cancel	3781	(delete $self->{timer})->cancel
3028	if $self->{timer};	3782	if $self->{timer};
3029		3783
3030	$self->SUPER::destroy;	3784	$self->SUPER::destroy;
3031	}	3785	}
3032		3786
3033	#############################################################################	3787	#############################################################################
3034		3788
3035	package CFClient::UI::Buttonbar;	3789	package CFPlus::UI::Buttonbar;
3036		3790
3037	our @ISA = CFClient::UI::HBox::;	3791	our @ISA = CFPlus::UI::HBox::;
3038		3792
3039	# TODO: should actualyl wrap buttons and other goodies.	3793	# TODO: should actually wrap buttons and other goodies.
3040		3794
3041	#############################################################################	3795	#############################################################################
3042		3796
3043	package CFClient::UI::Menu;	3797	package CFPlus::UI::Menu;
3044		3798
3045	our @ISA = CFClient::UI::FancyFrame::;	3799	our @ISA = CFPlus::UI::Toplevel::;
3046		3800
3047	use CFClient::OpenGL;	3801	use CFPlus::OpenGL;
3048		3802
3049	sub new {	3803	sub new {
3050	my $class = shift;	3804	my $class = shift;
3051		3805
3052	my $self = $class->SUPER::new (	3806	my $self = $class->SUPER::new (
3053	items => [],	3807	items => [],
3054	z => 100,	3808	z => 100,
3055	@_,	3809	@_,
3056	);	3810	);
3057		3811
3058	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3812	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3059		3813
3060	for my $item (@{ $self->{items} }) {	3814	for my $item (@{ $self->{items} }) {
3061	my ($widget, $cb, $tooltip) = @$item;	3815	my ($widget, $cb, $tooltip) = @$item;
3062		3816
3063	# handle various types of items, only text for now	3817	# handle various types of items, only text for now
3064	if (!ref $widget) {	3818	if (!ref $widget) {
		3819	if ($widget =~ /\t/) {
		3820	my ($left, $right) = split /\t/, $widget, 2;
		3821
3065	$widget = new CFClient::UI::Label	3822	$widget = new CFPlus::UI::HBox
3066	can_hover => 1,	3823	can_hover => 1,
3067	can_events => 1,	3824	can_events => 1,
		3825	tooltip => $tooltip,
		3826	children => [
		3827	(new CFPlus::UI::Label markup => $left, expand => 1),
		3828	(new CFPlus::UI::Label markup => $right, align => +1),
		3829	],
		3830	;
		3831
		3832	} else {
		3833	$widget = new CFPlus::UI::Label
		3834	can_hover => 1,
		3835	can_events => 1,
3068	markup => $widget,	3836	markup => $widget,
3069	tooltip => $tooltip	3837	tooltip => $tooltip;
		3838	}
3070	}	3839	}
3071		3840
3072	$self->{item}{$widget} = $item;	3841	$self->{item}{$widget} = $item;
3073		3842
3074	$self->{vbox}->add ($widget);	3843	$self->{vbox}->add ($widget);
…		…
3117	1	3886	1
3118	}	3887	}
3119		3888
3120	#############################################################################	3889	#############################################################################
3121		3890
3122	package CFClient::UI::Multiplexer;	3891	package CFPlus::UI::Multiplexer;
3123		3892
3124	our @ISA = CFClient::UI::Container::;	3893	our @ISA = CFPlus::UI::Container::;
3125		3894
3126	sub new {	3895	sub new {
3127	my $class = shift;	3896	my $class = shift;
3128		3897
3129	my $self = $class->SUPER::new (	3898	my $self = $class->SUPER::new (
…		…
3143		3912
3144	$self->{current} = $self->{children}[0]	3913	$self->{current} = $self->{children}[0]
3145	if @{ $self->{children} };	3914	if @{ $self->{children} };
3146	}	3915	}
3147		3916
		3917	sub get_current_page {
		3918	my ($self) = @_;
		3919
		3920	$self->{current}
		3921	}
		3922
3148	sub set_current_page {	3923	sub set_current_page {
3149	my ($self, $page_or_widget) = @_;	3924	my ($self, $page_or_widget) = @_;
3150		3925
3151	my $widget = ref $page_or_widget	3926	my $widget = ref $page_or_widget
3152	? $page_or_widget	3927	? $page_or_widget
…		…
3184	$self->{current}->draw;	3959	$self->{current}->draw;
3185	}	3960	}
3186		3961
3187	#############################################################################	3962	#############################################################################
3188		3963
3189	package CFClient::UI::Notebook;	3964	package CFPlus::UI::Notebook;
3190		3965
		3966	use CFPlus::OpenGL;
		3967
3191	our @ISA = CFClient::UI::VBox::;	3968	our @ISA = CFPlus::UI::VBox::;
3192		3969
3193	sub new {	3970	sub new {
3194	my $class = shift;	3971	my $class = shift;
3195		3972
3196	my $self = $class->SUPER::new (	3973	my $self = $class->SUPER::new (
3197	buttonbar => (new CFClient::UI::Buttonbar),	3974	buttonbar => (new CFPlus::UI::Buttonbar),
3198	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3975	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3976	active_outline => [1, 1, 0],
3199	# filter => # will be put between multiplexer and $self	3977	# filter => # will be put between multiplexer and $self
3200	@_,	3978	@_,
3201	);	3979	);
3202		3980
3203	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3981	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3204	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3982	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3205		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
3206	$self	4018	$self
3207	}	4019	}
3208		4020
3209	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 {
3210	my ($self, $title, $widget, $tooltip) = @_;	4039	my ($self, $title, $widget, $tooltip) = @_;
3211		4040
3212	Scalar::Util::weaken $self;	4041	$title = [$title, $tooltip] unless ref $title;
		4042	$widget->{c_tab} = $title;
3213		4043
3214	$self->{buttonbar}->add (new CFClient::UI::Button
3215	markup => $title,
3216	tooltip => $tooltip,
3217	on_activate => sub { $self->set_current_page ($widget) },
3218	);
3219
3220	$self->{multiplexer}->add ($widget);	4044	$self->add ($widget);
		4045	}
		4046
		4047	sub get_current_page {
		4048	my ($self) = @_;
		4049
		4050	$self->{multiplexer}->get_current_page
3221	}	4051	}
3222		4052
3223	sub set_current_page {	4053	sub set_current_page {
3224	my ($self, $page) = @_;	4054	my ($self, $page) = @_;
3225		4055
3226	$self->{multiplexer}->set_current_page ($page);	4056	$self->{multiplexer}->set_current_page ($page);
3227	$self->emit (page_changed => $self->{multiplexer}{current});	4057	$self->emit (page_changed => $self->{multiplexer}{current});
3228	}	4058	}
3229		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
3230	#############################################################################	4076	#############################################################################
3231		4077
3232	package CFClient::UI::Combobox;	4078	package CFPlus::UI::Selector;
3233		4079
3234	use utf8;	4080	use utf8;
3235		4081
3236	our @ISA = CFClient::UI::Button::;	4082	our @ISA = CFPlus::UI::Button::;
3237		4083
3238	sub new {	4084	sub new {
3239	my $class = shift;	4085	my $class = shift;
3240		4086
3241	my $self = $class->SUPER::new (	4087	my $self = $class->SUPER::new (
…		…
3258	my ($value, $title, $tooltip) = @$_;	4104	my ($value, $title, $tooltip) = @$_;
3259		4105
3260	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	4106	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3261	}	4107	}
3262		4108
3263	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	4109	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3264	}	4110	}
3265		4111
3266	sub _set_value {	4112	sub _set_value {
3267	my ($self, $value) = @_;	4113	my ($self, $value) = @_;
3268		4114
…		…
3283	$self->emit (changed => $value);	4129	$self->emit (changed => $value);
3284	}	4130	}
3285		4131
3286	#############################################################################	4132	#############################################################################
3287		4133
3288	package CFClient::UI::Statusbox;	4134	package CFPlus::UI::Statusbox;
3289		4135
3290	our @ISA = CFClient::UI::VBox::;	4136	our @ISA = CFPlus::UI::VBox::;
3291		4137
3292	sub new {	4138	sub new {
3293	my $class = shift;	4139	my $class = shift;
3294		4140
3295	my $self = $class->SUPER::new (	4141	my $self = $class->SUPER::new (
3296	fontsize => 0.8,	4142	fontsize => 0.8,
3297	@_,	4143	@_,
3298	);	4144	);
3299		4145
3300	Scalar::Util::weaken (my $this = $self);	4146	CFPlus::weaken (my $this = $self);
3301		4147
3302	$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 });
3303		4149
3304	$self	4150	$self
3305	}	4151	}
…		…
3307	sub reorder {	4153	sub reorder {
3308	my ($self) = @_;	4154	my ($self) = @_;
3309	my $NOW = Time::HiRes::time;	4155	my $NOW = Time::HiRes::time;
3310		4156
3311	# freeze display when hovering over any label	4157	# freeze display when hovering over any label
3312	return if $CFClient::UI::TOOLTIP->{owner}	4158	return if $CFPlus::UI::TOOLTIP->{owner}
3313	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	4159	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3314	values %{ $self->{item} };	4160	values %{ $self->{item} };
3315		4161
3316	while (my ($k, $v) = each %{ $self->{item} }) {	4162	while (my ($k, $v) = each %{ $self->{item} }) {
3317	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4163	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3318	}	4164	}
…		…
3339	for ($short) {	4185	for ($short) {
3340	s/^\s+//;	4186	s/^\s+//;
3341	s/\s+/ /g;	4187	s/\s+/ /g;
3342	}	4188	}
3343		4189
3344	new CFClient::UI::Label	4190	new CFPlus::UI::Label
3345	markup => $short,	4191	markup => $short,
3346	tooltip => $item->{tooltip},	4192	tooltip => $item->{tooltip},
3347	tooltip_font => $::FONT_PROP,	4193	tooltip_font => $::FONT_PROP,
3348	tooltip_width => 0.67,	4194	tooltip_width => 0.67,
3349	fontsize => $item->{fontsize} || $self->{fontsize},	4195	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3403	count => 1,	4249	count => 1,
3404	%arg,	4250	%arg,
3405	};	4251	};
3406	}	4252	}
3407		4253
		4254	$ROOT->on_refresh (reorder => sub {
3408	$self->reorder;	4255	$self->reorder;
		4256	});
3409	}	4257	}
3410		4258
3411	sub reconfigure {	4259	sub reconfigure {
3412	my ($self) = @_;	4260	my ($self) = @_;
3413		4261
…		…
3426	$self->SUPER::destroy;	4274	$self->SUPER::destroy;
3427	}	4275	}
3428		4276
3429	#############################################################################	4277	#############################################################################
3430		4278
3431	package CFClient::UI::Inventory;
3432
3433	our @ISA = CFClient::UI::ScrolledWindow::;
3434
3435	sub new {
3436	my $class = shift;
3437
3438	my $self = $class->SUPER::new (
3439	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3440	@_,
3441	);
3442
3443	$self
3444	}
3445
3446	sub set_items {
3447	my ($self, $items) = @_;
3448
3449	$self->{child}->clear;
3450	return unless $items;
3451
3452	my @items = sort {
3453	($a->{type} <=> $b->{type})
3454	or ($a->{name} cmp $b->{name})
3455	} @$items;
3456
3457	$self->{real_items} = \@items;
3458
3459	my $row = 0;
3460	for my $item (@items) {
3461	CFClient::Item::update_widgets $item;
3462
3463	$self->{child}->add (0, $row, $item->{face_widget});
3464	$self->{child}->add (1, $row, $item->{desc_widget});
3465	$self->{child}->add (2, $row, $item->{weight_widget});
3466
3467	$row++;
3468	}
3469	}
3470
3471	#############################################################################
3472
3473	package CFClient::UI::BindEditor;
3474
3475	our @ISA = CFClient::UI::FancyFrame::;
3476
3477	sub new {
3478	my $class = shift;
3479
3480	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3481
3482	$self->add (my $vb = new CFClient::UI::VBox);
3483
3484
3485	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3486	text => "start recording",
3487	tooltip => "Start/Stops recording of actions."
3488	."All subsequent actions after the recording started will be captured."
3489	."The actions are displayed after the record was stopped."
3490	."To bind the action you have to click on the 'Bind' button",
3491	on_activate => sub {
3492	unless ($self->{recording}) {
3493	$self->start;
3494	} else {
3495	$self->stop;
3496	}
3497	});
3498
3499	$vb->add (new CFClient::UI::Label text => "Actions:");
3500	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3501
3502	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3503	$vb->add (my $hb = new CFClient::UI::HBox);
3504	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3505	$hb->add (new CFClient::UI::Button
3506	text => "bind",
3507	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3508	on_activate => sub {
3509	$self->ask_for_bind;
3510	});
3511
3512	$vb->add (my $hb = new CFClient::UI::HBox);
3513	$hb->add (new CFClient::UI::Button
3514	text => "ok",
3515	expand => 1,
3516	tooltip => "This closes the binding editor and saves the binding",
3517	on_activate => sub {
3518	$self->hide;
3519	$self->commit;
3520	});
3521
3522	$hb->add (new CFClient::UI::Button
3523	text => "cancel",
3524	expand => 1,
3525	tooltip => "This closes the binding editor without saving",
3526	on_activate => sub {
3527	$self->hide;
3528	$self->{binding_cancel}->()
3529	if $self->{binding_cancel};
3530	});
3531
3532	$self->update_binding_widgets;
3533
3534	$self
3535	}
3536
3537	sub cfg_bind {
3538	my ($self, $mod, $sym, $cmds) = @_;
3539	$::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3540	::update_bindings ();
3541	}
3542
3543	sub cfg_unbind {
3544	my ($self, $mod, $sym, $cmds) = @_;
3545	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3546	::update_bindings ();
3547	}
3548
3549	sub commit {
3550	my ($self) = @_;
3551	my ($mod, $sym, $cmds) = $self->get_binding;
3552	if ($sym != 0 && @$cmds > 0) {
3553	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3554	."'. Don't forget 'Save Config'!");
3555	$self->{binding_change}->($mod, $sym, $cmds)
3556	if $self->{binding_change};
3557	} else {
3558	$::STATUSBOX->add ("No action bound, no key or action specified!");
3559	$self->{binding_cancel}->()
3560	if $self->{binding_cancel};
3561	}
3562	}
3563
3564	sub start {
3565	my ($self) = @_;
3566
3567	$self->{rec_btn}->set_text ("stop recording");
3568	$self->{recording} = 1;
3569	$self->clear_command_list;
3570	$::CONN->start_record if $::CONN;
3571	}
3572
3573	sub stop {
3574	my ($self) = @_;
3575
3576	$self->{rec_btn}->set_text ("start recording");
3577	$self->{recording} = 0;
3578
3579	my $rec;
3580	$rec = $::CONN->stop_record if $::CONN;
3581	return unless ref $rec eq 'ARRAY';
3582	$self->set_command_list ($rec);
3583	}
3584
3585
3586	sub ask_for_bind_and_commit {
3587	my ($self) = @_;
3588	$self->ask_for_bind (1);
3589	}
3590
3591	sub ask_for_bind {
3592	my ($self, $commit, $end_cb) = @_;
3593
3594	CFClient::Binder::open_binding_dialog (sub {
3595	my ($mod, $sym) = @_;
3596	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3597	$self->update_binding_widgets;
3598	$self->commit if $commit;
3599	$end_cb->() if $end_cb;
3600	});
3601	}
3602
3603	# $mod and $sym are the modifiers and key symbol
3604	# $cmds is a array ref of strings (the commands)
3605	# $cb is the callback that is executed on OK
3606	# $ccb is the callback that is executed on CANCEL and
3607	# when the binding was unsuccessful on OK
3608	sub set_binding {
3609	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3610
3611	$self->clear_command_list;
3612	$self->{recording} = 0;
3613	$self->{rec_btn}->set_text ("start recording");
3614
3615	$self->{binding} = [$mod, $sym];
3616	$self->{commands} = $cmds;
3617
3618	$self->{binding_change} = $cb;
3619	$self->{binding_cancel} = $ccb;
3620
3621	$self->update_binding_widgets;
3622	}
3623
3624	# this is a shortcut method that asks for a binding
3625	# and then just binds it.
3626	sub do_quick_binding {
3627	my ($self, $cmds, $end_cb) = @_;
3628	$self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3629	$self->ask_for_bind (1, $end_cb);
3630	}
3631
3632	sub update_binding_widgets {
3633	my ($self) = @_;
3634	my ($mod, $sym, $cmds) = $self->get_binding;
3635	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3636	$self->set_command_list ($cmds);
3637	}
3638
3639	sub get_binding {
3640	my ($self) = @_;
3641	return (
3642	$self->{binding}->[0],
3643	$self->{binding}->[1],
3644	[ grep { defined $_ } @{$self->{commands}} ]
3645	);
3646	}
3647
3648	sub clear_command_list {
3649	my ($self) = @_;
3650	$self->{cmdbox}->clear ();
3651	}
3652
3653	sub set_command_list {
3654	my ($self, $cmds) = @_;
3655
3656	$self->{cmdbox}->clear ();
3657	$self->{commands} = $cmds;
3658
3659	my $idx = 0;
3660
3661	for (@$cmds) {
3662	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3663
3664	my $i = $idx;
3665	$hb->add (new CFClient::UI::Label text => $_);
3666	$hb->add (new CFClient::UI::Button
3667	text => "delete",
3668	tooltip => "Deletes the action from the record",
3669	on_activate => sub {
3670	$self->{cmdbox}->remove ($hb);
3671	$cmds->[$i] = undef;
3672	});
3673
3674
3675	$idx++
3676	}
3677	}
3678
3679	#############################################################################
3680
3681	package CFClient::UI::SpellList;
3682
3683	our @ISA = CFClient::UI::Table::;
3684
3685	sub new {
3686	my $class = shift;
3687
3688	my $self = $class->SUPER::new (
3689	binding => [],
3690	commands => [],
3691	@_,
3692	)
3693	}
3694
3695	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3696
3697	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3698	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3699	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3700	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3701	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3702	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3703	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3704	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3705	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3706	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3707
3708	sub rebuild_spell_list {
3709	my ($self) = @_;
3710
3711	$CFClient::UI::ROOT->on_refresh ($self => sub {
3712	$self->clear;
3713
3714	return unless $::CONN;
3715
3716	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3717	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3718	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3719	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3720	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3721
3722	my $row = 0;
3723
3724	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3725	my $spell = $self->{spell}{$_};
3726
3727	$row++;
3728
3729	my $spell_cb = sub {
3730	my ($widget, $ev) = @_;
3731
3732	if ($ev->{button} == 1) {
3733	$::CONN->user_send ("cast $spell->{name}");
3734	} elsif ($ev->{button} == 2) {
3735	$::CONN->user_send ("invoke $spell->{name}");
3736	} elsif ($ev->{button} == 3) {
3737	(new CFClient::UI::Menu
3738	items => [
3739	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3740	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3741	],
3742	)->popup ($ev);
3743	} else {
3744	return 0;
3745	}
3746
3747	1
3748	};
3749
3750	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3751
3752	#TODO: add path info to tooltip
3753	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3754
3755	$self->add (0, $row, new CFClient::UI::Face
3756	face => $spell->{face},
3757	can_hover => 1,
3758	can_events => 1,
3759	tooltip => $tooltip,
3760	on_button_down => $spell_cb,
3761	);
3762
3763	$self->add (1, $row, new CFClient::UI::Label
3764	expand => 1,
3765	text => $spell->{name},
3766	can_hover => 1,
3767	can_events => 1,
3768	tooltip => $tooltip,
3769	on_button_down => $spell_cb,
3770	);
3771
3772	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3773	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3774	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3775	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3776	}
3777	});
3778	}
3779
3780	sub add_spell {
3781	my ($self, $spell) = @_;
3782
3783	$self->{spell}->{$spell->{name}} = $spell;
3784	$self->rebuild_spell_list;
3785	}
3786
3787	sub remove_spell {
3788	my ($self, $spell) = @_;
3789
3790	delete $self->{spell}->{$spell->{name}};
3791	$self->rebuild_spell_list;
3792	}
3793
3794	sub clear_spells {
3795	my ($self) = @_;
3796
3797	$self->{spell} = {};
3798	$self->rebuild_spell_list;
3799	}
3800
3801	#############################################################################
3802
3803	package CFClient::UI::Root;	4279	package CFPlus::UI::Root;
3804		4280
3805	our @ISA = CFClient::UI::Container::;	4281	our @ISA = CFPlus::UI::Container::;
3806		4282
3807	use List::Util qw(min max);	4283	use List::Util qw(min max);
3808		4284
3809	use CFClient::OpenGL;	4285	use CFPlus::OpenGL;
3810		4286
3811	sub new {	4287	sub new {
3812	my $class = shift;	4288	my $class = shift;
3813		4289
3814	my $self = $class->SUPER::new (	4290	my $self = $class->SUPER::new (
3815	visible => 1,	4291	visible => 1,
3816	@_,	4292	@_,
3817	);	4293	);
3818		4294
3819	Scalar::Util::weaken ($self->{root} = $self);	4295	CFPlus::weaken ($self->{root} = $self);
3820		4296
3821	$self	4297	$self
3822	}	4298	}
3823		4299
3824	sub size_request {	4300	sub size_request {
…		…
3872	}	4348	}
3873		4349
3874	sub update {	4350	sub update {
3875	my ($self) = @_;	4351	my ($self) = @_;
3876		4352
3877	$::WANT_REFRESH++;	4353	$::WANT_REFRESH->start;
3878	}	4354	}
3879		4355
3880	sub add {	4356	sub add {
3881	my ($self, @children) = @_;	4357	my ($self, @children) = @_;
3882		4358
…		…
3919	while ($self->{refresh_hook}) {	4395	while ($self->{refresh_hook}) {
3920	$_->()	4396	$_->()
3921	for values %{delete $self->{refresh_hook}};	4397	for values %{delete $self->{refresh_hook}};
3922	}	4398	}
3923		4399
3924	if ($self->{realloc}) {	4400	while ($self->{realloc}) {
3925	my %queue;	4401	my %queue;
3926	my @queue;	4402	my @queue;
3927	my $widget;	4403	my $widget;
3928		4404
3929	outer:	4405	outer:
…		…
3976	}	4452	}
3977	}	4453	}
3978		4454
3979	delete $self->{realloc}{$widget+0};	4455	delete $self->{realloc}{$widget+0};
3980	}	4456	}
3981	}
3982		4457
3983	while (my $size_alloc = delete $self->{size_alloc}) {	4458	while (my $size_alloc = delete $self->{size_alloc}) {
3984	my @queue = sort { $b->{visible} <=> $a->{visible} }	4459	my @queue = sort { $a->{visible} <=> $b->{visible} }
3985	values %$size_alloc;	4460	values %$size_alloc;
3986		4461
3987	while () {	4462	while () {
3988	my $widget = pop @queue || last;	4463	my $widget = pop @queue || last;
3989		4464
3990	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4465	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3991		4466
3992	$w = 0 if $w < 0;	4467	$w = max $widget->{min_w}, $w;
3993	$h = 0 if $h < 0;	4468	$h = max $widget->{min_h}, $h;
3994		4469
		4470	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4471	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4472
		4473	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4474	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4475
3995	$w = int $w + 0.5;	4476	$w = int $w + 0.5;
3996	$h = int $h + 0.5;	4477	$h = int $h + 0.5;
3997		4478
3998	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}) {
3999	$widget->{old_w} = $widget->{w};	4480	$widget->{old_w} = $widget->{w};
4000	$widget->{old_h} = $widget->{h};	4481	$widget->{old_h} = $widget->{h};
4001		4482
4002	$widget->{w} = $w;	4483	$widget->{w} = $w;
4003	$widget->{h} = $h;	4484	$widget->{h} = $h;
4004		4485
4005	$widget->emit (size_allocate => $w, $h);	4486	$widget->emit (size_allocate => $w, $h);
		4487	}
4006	}	4488	}
4007	}	4489	}
4008	}	4490	}
4009		4491
4010	while ($self->{post_alloc_hook}) {	4492	while ($self->{post_alloc_hook}) {
4011	$_->()	4493	$_->()
4012	for values %{delete $self->{post_alloc_hook}};	4494	for values %{delete $self->{post_alloc_hook}};
4013	}	4495	}
4014
4015		4496
4016	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4497	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4017	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4498	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4018	glClear GL_COLOR_BUFFER_BIT;	4499	glClear GL_COLOR_BUFFER_BIT;
4019		4500
…		…
4022	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4503	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4023	glMatrixMode GL_MODELVIEW;	4504	glMatrixMode GL_MODELVIEW;
4024	glLoadIdentity;	4505	glLoadIdentity;
4025		4506
4026	{	4507	{
4027	package CFClient::UI::Base;	4508	package CFPlus::UI::Base;
4028		4509
4029	($draw_x, $draw_y, $draw_w, $draw_h) =	4510	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4030	(0, 0, $self->{w}, $self->{h});	4511	(0, 0, $self->{w}, $self->{h});
4031	}
4032		4512
4033	$self->_draw;	4513	$self->_draw;
		4514	}
4034	}	4515	}
4035		4516
4036	#############################################################################	4517	#############################################################################
4037		4518
4038	package CFClient::UI;	4519	package CFPlus::UI;
4039		4520
4040	$ROOT = new CFClient::UI::Root;	4521	$ROOT = new CFPlus::UI::Root;
4041	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4522	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4042		4523
4043	1	4524	1
4044		4525

Diff Legend

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