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

Diff Legend

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