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.442 by root, Mon Oct 8 17:01:03 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	{ "\fw" => $_[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
…		…
330	$self->{force_h} = $h;	360	$self->{force_h} = $h;
331		361
332	$self->realloc;	362	$self->realloc;
333	}	363	}
334		364
		365	# traverse the widget chain up to find the maximum "physical" size constraints
		366	sub get_max_wh {
		367	my ($self) = @_;
		368
		369	return $self->{parent}->get_max_wh
		370	if $self->{parent};
		371
		372	($::WIDTH, $::HEIGHT)
		373	}
		374
335	sub size_request {	375	sub size_request {
336	require Carp;	376	require Carp;
337	Carp::confess "size_request is abstract";	377	Carp::confess "size_request is abstract";
338	}	378	}
339		379
…		…
345	my ($self, $x, $y, $w, $h) = @_;	385	my ($self, $x, $y, $w, $h) = @_;
346		386
347	if ($self->{aspect}) {	387	if ($self->{aspect}) {
348	my ($ow, $oh) = ($w, $h);	388	my ($ow, $oh) = ($w, $h);
349		389
350	$w = List::Util::min $w, int $h * $self->{aspect};	390	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351	$h = List::Util::min $h, int $w / $self->{aspect};	391	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352		392
353	# use alignment to adjust x, y	393	# use alignment to adjust x, y
354		394
355	$x += int 0.5 * ($ow - $w);	395	$x += int 0.5 * ($ow - $w);
356	$y += int 0.5 * ($oh - $h);	396	$y += int 0.5 * ($oh - $h);
…		…
397		437
398	return if $self->{tooltip} eq $tooltip;	438	return if $self->{tooltip} eq $tooltip;
399		439
400	$self->{tooltip} = $tooltip;	440	$self->{tooltip} = $tooltip;
401		441
402	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	442	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403	delete $CFClient::UI::TOOLTIP->{owner};	443	delete $CFPlus::UI::TOOLTIP->{owner};
404	$CFClient::UI::TOOLTIP_WATCHER->cb->();	444	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
405	}	445	}
406	}	446	}
407		447
408	# translate global coordinates to local coordinate system	448	# translate global coordinates to local coordinate system
409	sub coord2local {	449	sub coord2local {
410	my ($self, $x, $y) = @_;	450	my ($self, $x, $y) = @_;
411		451
		452	Carp::confess unless $self->{parent};#d#
		453
412	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	454	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413	}	455	}
414		456
415	# translate local coordinates to global coordinate system	457	# translate local coordinates to global coordinate system
416	sub coord2global {	458	sub coord2global {
417	my ($self, $x, $y) = @_;	459	my ($self, $x, $y) = @_;
418		460
		461	Carp::confess unless $self->{parent};#d#
		462
419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	463	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420	}	464	}
421		465
422	sub invoke_focus_in {	466	sub invoke_focus_in {
423	my ($self) = @_;	467	my ($self) = @_;
424		468
425	return if $FOCUS == $self;	469	return if $FOCUS == $self;
426	return unless $self->{can_focus};	470	return unless $self->{can_focus};
427		471
428	my $focus = $FOCUS; $FOCUS = $self;	472	$FOCUS = $self;
429		473
430	$focus->update if $focus;	474	$self->update;
431	$FOCUS->update;
432		475
433	0	476	0
434	}	477	}
435		478
436	sub invoke_focus_out {	479	sub invoke_focus_out {
437	my ($self) = @_;	480	my ($self) = @_;
438		481
439	return unless $FOCUS == $self;	482	return unless $FOCUS == $self;
440		483
441	my $focus = $FOCUS; undef $FOCUS;	484	undef $FOCUS;
442		485
443	$focus->update if $focus; #?	486	$self->update;
444		487
445	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus	488	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446	unless $FOCUS;	489	unless $FOCUS;
447		490
448	0	491	0
449	}	492	}
450		493
451	sub grab_focus {	494	sub grab_focus {
452	my ($self) = @_;	495	my ($self) = @_;
453		496
		497	$FOCUS->emit ("focus_out") if $FOCUS;
454	$self->emit ("focus_in");	498	$self->emit ("focus_in");
455	}	499	}
456		500
457	sub invoke_mouse_motion { 1 }	501	sub invoke_mouse_motion { 0 }
458	sub invoke_button_up { 1 }	502	sub invoke_button_up { 0 }
459	sub invoke_key_down { 1 }	503	sub invoke_key_down { 0 }
460	sub invoke_key_up { 1 }	504	sub invoke_key_up { 0 }
		505	sub invoke_mouse_wheel { 0 }
461		506
462	sub invoke_button_down {	507	sub invoke_button_down {
463	my ($self, $ev, $x, $y) = @_;	508	my ($self, $ev, $x, $y) = @_;
464		509
465	$self->grab_focus;	510	$self->grab_focus;
466		511
467	1	512	0
468	}	513	}
469		514
470	sub connect {	515	sub connect {
471	my ($self, $signal, $cb) = @_;	516	my ($self, $signal, $cb) = @_;
472		517
473	push @{ $self->{signal_cb}{$signal} }, $cb;	518	push @{ $self->{signal_cb}{$signal} }, $cb;
		519
		520	defined wantarray and CFPlus::guard {
		521	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		522	@{ $self->{signal_cb}{$signal} };
		523	}
474	}	524	}
		525
		526	sub disconnect_all {
		527	my ($self, $signal) = @_;
		528
		529	delete $self->{signal_cb}{$signal};
		530	}
		531
		532	my %has_coords = (
		533	button_down => 1,
		534	button_up => 1,
		535	mouse_motion => 1,
		536	mouse_wheel => 1,
		537	);
475		538
476	sub emit {	539	sub emit {
477	my ($self, $signal, @args) = @_;	540	my ($self, $signal, @args) = @_;
478		541
479	#d##TODO# stop propagating at first true, do not use sum	542	# 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	543	# and needlessly verbose code, either.
		544	my @append
		545	= $has_coords{$signal}
		546	? $args[0]->xy ($self)
		547	: ();
		548
		549	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		550
		551	for my $cb (
		552	@{$self->{signal_cb}{$signal} || []}, # before
481	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	553	($self->can ("invoke_$signal") || sub { 1 }), # closure
		554	) {
		555	return $cb->($self, @args, @append) || next;
		556	}
		557
		558	# parent
482	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	559	$self->{parent} && $self->{parent}->emit ($signal, @args)
483	}	560	}
484		561
485	sub find_widget {	562	#sub find_widget {
486	my ($self, $x, $y) = @_;	563	# 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		564
497	sub set_parent {	565	sub set_parent {
498	my ($self, $parent) = @_;	566	my ($self, $parent) = @_;
499		567
500	Scalar::Util::weaken ($self->{parent} = $parent);	568	CFPlus::weaken ($self->{parent} = $parent);
501	$self->set_visible if $parent->{visible};	569	$self->set_visible if $parent->{visible};
502	}	570	}
503		571
504	sub realloc {	572	sub realloc {
505	my ($self) = @_;	573	my ($self) = @_;
…		…
531		599
532	# using global variables seems a bit hacky, but passing through all drawing	600	# using global variables seems a bit hacky, but passing through all drawing
533	# functions seems pointless.	601	# functions seems pointless.
534	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn	602	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
535		603
536	sub draw {	604	#sub draw {
537	my ($self) = @_;	605	#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		606
583	sub _draw {	607	sub _draw {
584	my ($self) = @_;	608	my ($self) = @_;
585		609
586	warn "no draw defined for $self\n";	610	warn "no draw defined for $self\n";
587	}	611	}
588		612
589	sub DESTROY {	613	sub DESTROY {
590	my ($self) = @_;	614	my ($self) = @_;
591		615
592	delete $WIDGET{$self+0};	616	return if CFPlus::in_destruct;
593		617
		618	local $@;
594	eval { $self->destroy };	619	eval { $self->destroy };
595	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	620	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		621
		622	delete $WIDGET{$self+0};
596	}	623	}
597		624
598	#############################################################################	625	#############################################################################
599		626
600	package CFClient::UI::DrawBG;	627	package CFPlus::UI::DrawBG;
601		628
602	our @ISA = CFClient::UI::Base::;	629	our @ISA = CFPlus::UI::Base::;
603		630
604	use strict;	631	use strict;
605	use CFClient::OpenGL;	632	use CFPlus::OpenGL;
606		633
607	sub new {	634	sub new {
608	my $class = shift;	635	my $class = shift;
609
610	# range [value, low, high, page]
611		636
612	$class->SUPER::new (	637	$class->SUPER::new (
613	#bg => [0, 0, 0, 0.2],	638	#bg => [0, 0, 0, 0.2],
614	#active_bg => [1, 1, 1, 0.5],	639	#active_bg => [1, 1, 1, 0.5],
615	@_	640	@_
…		…
627	my ($w, $h) = @$self{qw(w h)};	652	my ($w, $h) = @$self{qw(w h)};
628		653
629	glEnable GL_BLEND;	654	glEnable GL_BLEND;
630	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	655	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
631	glColor_premultiply @$color;	656	glColor_premultiply @$color;
632
633	glBegin GL_QUADS;
634	glVertex 0 , 0;
635	glVertex 0 , $h;
636	glVertex $w, $h;	657	glRect 0, 0, $w, $h;
637	glVertex $w, 0;
638	glEnd;
639
640	glDisable GL_BLEND;	658	glDisable GL_BLEND;
641	}	659	}
642	}	660	}
643		661
644	#############################################################################	662	#############################################################################
645		663
646	package CFClient::UI::Empty;	664	package CFPlus::UI::Empty;
647		665
648	our @ISA = CFClient::UI::Base::;	666	our @ISA = CFPlus::UI::Base::;
649		667
650	sub new {	668	sub new {
651	my ($class, %arg) = @_;	669	my ($class, %arg) = @_;
652	$class->SUPER::new (can_events => 0, %arg);	670	$class->SUPER::new (can_events => 0, %arg);
653	}	671	}
…		…
660		678
661	sub draw { }	679	sub draw { }
662		680
663	#############################################################################	681	#############################################################################
664		682
665	package CFClient::UI::Container;	683	package CFPlus::UI::Container;
666		684
667	our @ISA = CFClient::UI::Base::;	685	our @ISA = CFPlus::UI::Base::;
668		686
669	sub new {	687	sub new {
670	my ($class, %arg) = @_;	688	my ($class, %arg) = @_;
671		689
672	my $children = delete $arg{children};	690	my $children = delete $arg{children};
…		…
676	can_events => 0,	694	can_events => 0,
677	%arg,	695	%arg,
678	);	696	);
679		697
680	$self->add (@$children)	698	$self->add (@$children)
681	if $children;	699	if $children && @$children;
682		700
683	$self	701	$self
		702	}
		703
		704	sub realloc {
		705	my ($self) = @_;
		706
		707	$self->{force_realloc} = 1;
		708	$self->{force_size_alloc} = 1;
		709	$self->SUPER::realloc;
684	}	710	}
685		711
686	sub add {	712	sub add {
687	my ($self, @widgets) = @_;	713	my ($self, @widgets) = @_;
688		714
689	$_->set_parent ($self)	715	$_->set_parent ($self)
690	for @widgets;	716	for @widgets;
691		717
		718	# TODO: only do this in widgets that need it, e.g. root, fixed
692	use sort 'stable';	719	use sort 'stable';
693		720
694	$self->{children} = [	721	$self->{children} = [
695	sort { $a->{z} <=> $b->{z} }	722	sort { $a->{z} <=> $b->{z} }
696	@{$self->{children}}, @widgets	723	@{$self->{children}}, @widgets
697	];	724	];
698		725
699	$self->realloc;	726	$self->realloc;
		727
		728	$self->emit (c_add => \@widgets);
		729
		730	map $_+0, @widgets
700	}	731	}
701		732
702	sub children {	733	sub children {
703	@{ $_[0]{children} }	734	@{ $_[0]{children} }
704	}	735	}
705		736
706	sub remove {	737	sub remove {
707	my ($self, $child) = @_;	738	my ($self, @widgets) = @_;
708		739
		740	$self->emit (c_remove => \@widgets);
		741
		742	for my $child (@widgets) {
709	delete $child->{parent};	743	delete $child->{parent};
710	$child->hide;	744	$child->hide;
711
712	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	745	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		746	}
713		747
714	$self->realloc;	748	$self->realloc;
715	}	749	}
716		750
717	sub clear {	751	sub clear {
718	my ($self) = @_;	752	my ($self) = @_;
719		753
720	my $children = delete $self->{children};	754	my $children = $self->{children};
721	$self->{children} = [];	755	$self->{children} = [];
722		756
723	for (@$children) {	757	for (@$children) {
724	delete $_->{parent};	758	delete $_->{parent};
725	$_->hide;	759	$_->hide;
…		…
745	}	779	}
746		780
747	sub _draw {	781	sub _draw {
748	my ($self) = @_;	782	my ($self) = @_;
749		783
750	$_->draw for @{$self->{children}};	784	$_->draw for $self->visible_children;
751	}	785	}
752		786
753	#############################################################################	787	#############################################################################
754		788
755	package CFClient::UI::Bin;	789	package CFPlus::UI::Bin;
756		790
757	our @ISA = CFClient::UI::Container::;	791	our @ISA = CFPlus::UI::Container::;
758		792
759	sub new {	793	sub new {
760	my ($class, %arg) = @_;	794	my ($class, %arg) = @_;
761		795
762	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	796	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763		797
764	$class->SUPER::new (children => [$child], %arg)	798	$class->SUPER::new (children => [$child], %arg)
765	}	799	}
766		800
767	sub add {	801	sub add {
768	my ($self, $child) = @_;	802	my ($self, $child) = @_;
769		803
770	$self->SUPER::remove ($_) for @{ $self->{children} };	804	$self->clear;
771	$self->SUPER::add ($child);	805	$self->SUPER::add ($child);
772	}	806	}
773		807
774	sub remove {	808	sub remove {
775	my ($self, $widget) = @_;	809	my ($self, $widget) = @_;
776		810
777	$self->SUPER::remove ($widget);	811	$self->SUPER::remove ($widget);
778		812
779	$self->{children} = [new CFClient::UI::Empty]	813	$self->{children} = [new CFPlus::UI::Empty]
780	unless @{$self->{children}};	814	unless @{$self->{children}};
781	}	815	}
782		816
783	sub child { $_[0]->{children}[0] }	817	sub child { $_[0]->{children}[0] }
784		818
…		…
793		827
794	1	828	1
795	}	829	}
796		830
797	#############################################################################	831	#############################################################################
798
799	# back-buffered drawing area	832	# back-buffered drawing area
800		833
801	package CFClient::UI::Window;	834	package CFPlus::UI::Window;
802		835
803	our @ISA = CFClient::UI::Bin::;	836	our @ISA = CFPlus::UI::Bin::;
804		837
805	use CFClient::OpenGL;	838	use CFPlus::OpenGL;
806		839
807	sub new {	840	sub new {
808	my ($class, %arg) = @_;	841	my ($class, %arg) = @_;
809		842
810	my $self = $class->SUPER::new (%arg);	843	my $self = $class->SUPER::new (%arg);
…		…
832	}	865	}
833		866
834	sub render_child {	867	sub render_child {
835	my ($self) = @_;	868	my ($self) = @_;
836		869
837	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	870	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838	glClearColor 0, 0, 0, 0;	871	glClearColor 0, 0, 0, 0;
839	glClear GL_COLOR_BUFFER_BIT;	872	glClear GL_COLOR_BUFFER_BIT;
840		873
841	{	874	{
842	package CFClient::UI::Base;	875	package CFPlus::UI::Base;
843		876
844	($draw_x, $draw_y, $draw_w, $draw_h) =	877	local ($draw_x, $draw_y, $draw_w, $draw_h) =
845	(0, 0, $self->{w}, $self->{h});	878	(0, 0, $self->{w}, $self->{h});
		879
		880	$self->_render;
846	}	881	}
847
848	$self->_render;
849	};	882	};
850	}	883	}
851		884
852	sub _draw {	885	sub _draw {
853	my ($self) = @_;	886	my ($self) = @_;
854
855	my ($w, $h) = @$self{qw(w h)};
856		887
857	my $tex = $self->{texture}	888	my $tex = $self->{texture}
858	or return;	889	or return;
859		890
860	glEnable GL_TEXTURE_2D;	891	glEnable GL_TEXTURE_2D;
861	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	892	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862	glColor 0, 0, 0, 1;	893	glColor 0, 0, 0, 1;
863		894
864	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	895	$tex->draw_quad_alpha_premultiplied (0, 0);
865		896
866	glDisable GL_TEXTURE_2D;	897	glDisable GL_TEXTURE_2D;
867	}	898	}
868		899
869	#############################################################################	900	#############################################################################
870		901
871	package CFClient::UI::ViewPort;	902	package CFPlus::UI::ViewPort;
872		903
		904	use List::Util qw(min max);
		905
873	our @ISA = CFClient::UI::Window::;	906	our @ISA = CFPlus::UI::Window::;
874		907
875	sub new {	908	sub new {
876	my $class = shift;	909	my $class = shift;
877		910
878	$class->SUPER::new (	911	$class->SUPER::new (
…		…
885	sub size_request {	918	sub size_request {
886	my ($self) = @_;	919	my ($self) = @_;
887		920
888	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	921	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
889		922
890	$w = 10 if $self->{scroll_x};	923	$w = 1 if $self->{scroll_x};
891	$h = 10 if $self->{scroll_y};	924	$h = 1 if $self->{scroll_y};
892		925
893	($w, $h)	926	($w, $h)
894	}	927	}
895		928
896	sub invoke_size_allocate {	929	sub invoke_size_allocate {
…		…
908	}	941	}
909		942
910	sub set_offset {	943	sub set_offset {
911	my ($self, $x, $y) = @_;	944	my ($self, $x, $y) = @_;
912		945
		946	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		947	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		948
		949	if ($x != $self->{view_x} or $y != $self->{view_y}) {
913	$self->{view_x} = int $x;	950	$self->{view_x} = $x;
914	$self->{view_y} = int $y;	951	$self->{view_y} = $y;
915		952
		953	$self->emit (changed => $x, $y);
916	$self->update;	954	$self->update;
		955	}
		956	}
		957
		958	sub set_center {
		959	my ($self, $x, $y) = @_;
		960
		961	$self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
		962	}
		963
		964	sub make_visible {
		965	my ($self, $x, $y, $border) = @_;
		966
		967	if ( $x < $self->{view_x} + $self->{w} * $border
		968	|| $x > $self->{view_x} + $self->{w} * (1 - $border)
		969	|| $y < $self->{view_y} + $self->{h} * $border
		970	|| $y > $self->{view_y} + $self->{h} * (1 - $border)
		971	) {
		972	$self->set_center ($x, $y);
		973	}
917	}	974	}
918		975
919	# hmm, this does not work for topleft of $self... but we should not ask for that	976	# hmm, this does not work for topleft of $self... but we should not ask for that
920	sub coord2local {	977	sub coord2local {
921	my ($self, $x, $y) = @_;	978	my ($self, $x, $y) = @_;
…		…
936	my ($self, $x, $y) = @_;	993	my ($self, $x, $y) = @_;
937		994
938	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	995	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	996	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
940	) {	997	) {
941	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	998	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942	} else {	999	} else {
943	$self->CFClient::UI::Base::find_widget ($x, $y)	1000	$self->CFPlus::UI::Base::find_widget ($x, $y)
944	}	1001	}
945	}	1002	}
946		1003
947	sub _render {	1004	sub _render {
948	my ($self) = @_;	1005	my ($self) = @_;
949		1006
950	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1007	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};	1008	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952		1009
953	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1010	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954		1011
955	$self->SUPER::_render;	1012	$self->SUPER::_render;
956	}	1013	}
957		1014
958	#############################################################################	1015	#############################################################################
959		1016
960	package CFClient::UI::ScrolledWindow;	1017	package CFPlus::UI::ScrolledWindow;
961		1018
962	our @ISA = CFClient::UI::HBox::;	1019	our @ISA = CFPlus::UI::Table::;
963		1020
964	sub new {	1021	sub new {
965	my ($class, %arg) = @_;	1022	my ($class, %arg) = @_;
966		1023
967	my $child = delete $arg{child};	1024	my $child = delete $arg{child};
968		1025
969	my $self;	1026	my $self;
970		1027
971	my $slider = new CFClient::UI::Slider	1028	my $hslider = new CFPlus::UI::Slider
		1029	c_col => 0,
		1030	c_row => 1,
		1031	vertical => 0,
		1032	range => [0, 0, 1, 0.01], # HACK fix
		1033	on_changed => sub {
		1034	$self->{hpos} = $_[1];
		1035	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1036	},
		1037	;
		1038
		1039	my $vslider = new CFPlus::UI::Slider
		1040	c_col => 1,
		1041	c_row => 0,
972	vertical => 1,	1042	vertical => 1,
973	range => [0, 0, 1, 0.01], # HACK fix	1043	range => [0, 0, 1, 0.01], # HACK fix
974	on_changed => sub {	1044	on_changed => sub {
975	$self->{vp}->set_offset (0, $_[1]);	1045	$self->{vpos} = $_[1];
		1046	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976	},	1047	},
977	;	1048	;
978		1049
979	$self = $class->SUPER::new (	1050	$self = $class->SUPER::new (
980	vp => (new CFClient::UI::ViewPort expand => 1),	1051	scroll_x => 0,
		1052	scroll_y => 1,
		1053	can_events => 1,
981	slider => $slider,	1054	hslider => $hslider,
		1055	vslider => $vslider,
		1056	col_expand => [1, 0],
		1057	row_expand => [1, 0],
982	%arg,	1058	%arg,
983	);	1059	);
984		1060
		1061	$self->{vp} = new CFPlus::UI::ViewPort
		1062	c_col => 0,
		1063	c_row => 0,
		1064	expand => 1,
		1065	scroll_x => $self->{scroll_x},
		1066	scroll_y => $self->{scroll_y},
		1067	on_changed => sub {
		1068	my ($vp, $x, $y) = @_;
		1069
		1070	$vp->{parent}{hslider}->set_value ($x);
		1071	$vp->{parent}{vslider}->set_value ($y);
		1072
		1073	0
		1074	},
		1075	on_size_allocate => sub {
		1076	my ($vp, $w, $h) = @_;
		1077	$vp->{parent}->update_slider;
		1078	0
		1079	},
		1080	;
		1081
985	$self->SUPER::add ($self->{vp}, $self->{slider});	1082	$self->SUPER::add ($self->{vp});
		1083
986	$self->add ($child) if $child;	1084	$self->add ($child) if $child;
987		1085
988	$self	1086	$self
989	}	1087	}
990		1088
…		…
992	my ($self, $widget) = @_;	1090	my ($self, $widget) = @_;
993		1091
994	$self->{vp}->add ($self->{child} = $widget);	1092	$self->{vp}->add ($self->{child} = $widget);
995	}	1093	}
996		1094
		1095	sub set_offset { shift->{vp}->set_offset (@_) }
		1096	sub set_center { shift->{vp}->set_center (@_) }
		1097	sub make_visible { shift->{vp}->make_visible (@_) }
		1098
997	sub update {	1099	sub update_slider {
		1100	my ($self) = @_;
		1101
		1102	my $child = ($self->{vp} or return)->child;
		1103
		1104	if ($self->{scroll_x}) {
		1105	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
		1106	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1107
		1108	my $visible = $w1 > $w2;
		1109	if ($visible != $self->{hslider_visible}) {
		1110	$self->{hslider_visible} = $visible;
		1111	$visible ? $self->SUPER::add ($self->{hslider})
		1112	: $self->SUPER::remove ($self->{hslider});
		1113	}
		1114	}
		1115
		1116	if ($self->{scroll_y}) {
		1117	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1118	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1119
		1120	my $visible = $h1 > $h2;
		1121	if ($visible != $self->{vslider_visible}) {
		1122	$self->{vslider_visible} = $visible;
		1123	$visible ? $self->SUPER::add ($self->{vslider})
		1124	: $self->SUPER::remove ($self->{vslider});
		1125	}
		1126	}
		1127	}
		1128
		1129	sub start_dragging {
998	my ($self) = @_;	1130	my ($self, $ev) = @_;
999		1131
1000	$self->SUPER::update;	1132	$self->grab_focus;
1001		1133
1002	# todo: overwrite size_allocate of child	1134	my $ox = $self->{vp}{view_x};
1003	my $child = $self->{vp}->child;	1135	my $oy = $self->{vp}{view_y};
1004	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1136
		1137	$self->{motion} = sub {
		1138	my ($ev, $x, $y) = @_;
		1139
		1140	$ox -= $ev->{xrel};
		1141	$oy -= $ev->{yrel};
		1142
		1143	$self->{vp}->set_offset ($ox, $oy);
		1144	};
		1145	}
		1146
		1147	sub invoke_mouse_wheel {
		1148	my ($self, $ev) = @_;
		1149
		1150	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1151	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
		1152
		1153	1
		1154	}
		1155
		1156	sub invoke_button_down {
		1157	my ($self, $ev, $x, $y) = @_;
		1158
		1159	if ($ev->{button} == 2) {
		1160	$self->start_dragging ($ev);
		1161	return 1;
		1162	}
		1163
		1164	0
		1165	}
		1166
		1167	sub invoke_button_up {
		1168	my ($self, $ev, $x, $y) = @_;
		1169
		1170	if (delete $self->{motion}) {
		1171	return 1;
		1172	}
		1173
		1174	0
		1175	}
		1176
		1177	sub invoke_mouse_motion {
		1178	my ($self, $ev, $x, $y) = @_;
		1179
		1180	if ($self->{motion}) {
		1181	$self->{motion}->($ev, $x, $y);
		1182	return 1;
		1183	}
		1184
		1185	0
1005	}	1186	}
1006		1187
1007	sub invoke_size_allocate {	1188	sub invoke_size_allocate {
1008	my ($self, $w, $h) = @_;	1189	my ($self, $w, $h) = @_;
1009		1190
1010	my $child = $self->{vp}->child;	1191	$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)	1192	$self->SUPER::invoke_size_allocate ($w, $h)
1014	}	1193	}
1015		1194
1016	#TODO# update range on size_allocate depending on child
1017	# update viewport offset on scroll
1018
1019	#############################################################################	1195	#############################################################################
1020		1196
1021	package CFClient::UI::Frame;	1197	package CFPlus::UI::Frame;
1022		1198
1023	our @ISA = CFClient::UI::Bin::;	1199	our @ISA = CFPlus::UI::Bin::;
1024		1200
1025	use CFClient::OpenGL;	1201	use CFPlus::OpenGL;
1026		1202
1027	sub new {	1203	sub new {
1028	my $class = shift;	1204	my $class = shift;
1029		1205
1030	$class->SUPER::new (	1206	$class->SUPER::new (
…		…
1040	my ($w, $h) = @$self{qw(w h)};	1216	my ($w, $h) = @$self{qw(w h)};
1041		1217
1042	glEnable GL_BLEND;	1218	glEnable GL_BLEND;
1043	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1219	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1044	glColor_premultiply @{ $self->{bg} };	1220	glColor_premultiply @{ $self->{bg} };
1045
1046	glBegin GL_QUADS;
1047	glVertex 0 , 0;
1048	glVertex 0 , $h;
1049	glVertex $w, $h;	1221	glRect 0, 0, $w, $h;
1050	glVertex $w, 0;
1051	glEnd;
1052
1053	glDisable GL_BLEND;	1222	glDisable GL_BLEND;
1054	}	1223	}
1055		1224
1056	$self->SUPER::_draw;	1225	$self->SUPER::_draw;
1057	}	1226	}
1058		1227
1059	#############################################################################	1228	#############################################################################
1060		1229
1061	package CFClient::UI::FancyFrame;	1230	package CFPlus::UI::FancyFrame;
1062		1231
1063	our @ISA = CFClient::UI::Bin::;	1232	our @ISA = CFPlus::UI::Bin::;
1064		1233
1065	use CFClient::OpenGL;	1234	use CFPlus::OpenGL;
		1235
		1236	sub new {
		1237	my ($class, %arg) = @_;
		1238
		1239	if ((exists $arg{label}) && !ref $arg{label}) {
		1240	$arg{label} = new CFPlus::UI::Label
		1241	align => 1,
		1242	valign => 0,
		1243	text => $arg{label},
		1244	fontsize => ($arg{border} || 0.8) * 0.75;
		1245	}
		1246
		1247	my $self = $class->SUPER::new (
		1248	# label => "",
		1249	fg => [0.6, 0.3, 0.1],
		1250	border => 0.8,
		1251	style => 'single',
		1252	%arg,
		1253	);
		1254
		1255	$self
		1256	}
		1257
		1258	sub add {
		1259	my ($self, @widgets) = @_;
		1260
		1261	$self->SUPER::add (@widgets);
		1262	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1263	}
		1264
		1265	sub border {
		1266	int $_[0]{border} * $::FONTSIZE
		1267	}
		1268
		1269	sub size_request {
		1270	my ($self) = @_;
		1271
		1272	($self->{label_w}, undef) = $self->{label}->size_request
		1273	if $self->{label};
		1274
		1275	my ($w, $h) = $self->SUPER::size_request;
		1276
		1277	(
		1278	$w + $self->border * 2,
		1279	$h + $self->border * 2,
		1280	)
		1281	}
		1282
		1283	sub invoke_size_allocate {
		1284	my ($self, $w, $h) = @_;
		1285
		1286	my $border = $self->border;
		1287
		1288	$w -= List::Util::max 0, $border * 2;
		1289	$h -= List::Util::max 0, $border * 2;
		1290
		1291	if (my $label = $self->{label}) {
		1292	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1293	$label->{h} = List::Util::min $h, $border;
		1294	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1295	}
		1296
		1297	$self->child->configure ($border, $border, $w, $h);
		1298
		1299	1
		1300	}
		1301
		1302	sub _draw {
		1303	my ($self) = @_;
		1304
		1305	my $child = $self->{children}[0];
		1306
		1307	my $border = $self->border;
		1308	my ($w, $h) = ($self->{w}, $self->{h});
		1309
		1310	$child->draw;
		1311
		1312	glColor @{$self->{fg}};
		1313	glBegin GL_LINE_STRIP;
		1314	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1315	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1316	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1317	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1318	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1319	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1320	glEnd;
		1321
		1322	if ($self->{label}) {
		1323	glTranslate $border * 2, 0;
		1324	$self->{label}->_draw;
		1325	}
		1326	}
		1327
		1328	#############################################################################
		1329
		1330	package CFPlus::UI::Toplevel;
		1331
		1332	our @ISA = CFPlus::UI::Bin::;
		1333
		1334	use CFPlus::OpenGL;
1066		1335
1067	my $bg =	1336	my $bg =
1068	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1337	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069	mipmap => 1, wrap => 1;	1338	mipmap => 1, wrap => 1;
1070		1339
1071	my @border =	1340	my @border =
1072	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1341	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);	1342	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1343
		1344	my @icon =
		1345	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1346	qw(x1_move.png x1_resize.png);
1074		1347
1075	sub new {	1348	sub new {
1076	my ($class, %arg) = @_;	1349	my ($class, %arg) = @_;
1077		1350
1078	my $self = $class->SUPER::new (	1351	my $self = $class->SUPER::new (
1079	bg => [1, 1, 1, 1],	1352	bg => [1, 1, 1, 1],
1080	border_bg => [1, 1, 1, 1],	1353	border_bg => [1, 1, 1, 1],
1081	border => 0.6,	1354	border => 0.6,
1082	can_events => 1,	1355	can_events => 1,
1083	min_w => 16,	1356	min_w => 64,
1084	min_h => 16,	1357	min_h => 32,
1085	%arg,	1358	%arg,
1086	);	1359	);
1087		1360
1088	$self->{title_widget} = new CFClient::UI::Label	1361	$self->{title_widget} = new CFPlus::UI::Label
1089	align => 0,	1362	align => 0,
1090	valign => 1,	1363	valign => 1,
1091	text => $self->{title},	1364	text => $self->{title},
1092	fontsize => $self->{border},	1365	fontsize => $self->{border},
1093	if exists $self->{title};	1366	if exists $self->{title};
1094		1367
1095	if ($self->{has_close_button}) {	1368	if ($self->{has_close_button}) {
1096	$self->{close_button} =	1369	$self->{close_button} =
1097	new CFClient::UI::ImageButton	1370	new CFPlus::UI::ImageButton
1098	path => 'x1_close.png',	1371	path => 'x1_close.png',
1099	on_activate => sub { $self->hide };	1372	on_activate => sub { $self->emit ("delete") };
1100		1373
1101	$self->CFClient::UI::Container::add ($self->{close_button});	1374	$self->CFPlus::UI::Container::add ($self->{close_button});
1102	}	1375	}
1103		1376
1104	$self	1377	$self
1105	}	1378	}
1106		1379
1107	sub add {	1380	sub add {
1108	my ($self, @widgets) = @_;	1381	my ($self, @widgets) = @_;
1109		1382
1110	$self->SUPER::add (@widgets);	1383	$self->SUPER::add (@widgets);
1111	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1384	$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};	1385	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1113	}	1386	}
1114		1387
1115	sub border {	1388	sub border {
1116	int $_[0]{border} * $::FONTSIZE	1389	int $_[0]{border} * $::FONTSIZE
		1390	}
		1391
		1392	sub get_max_wh {
		1393	my ($self) = @_;
		1394
		1395	return ($self->{w}, $self->{h})
		1396	if $self->{visible} && $self->{w};
		1397
		1398	$self->SUPER::get_max_wh
1117	}	1399	}
1118		1400
1119	sub size_request {	1401	sub size_request {
1120	my ($self) = @_;	1402	my ($self) = @_;
1121		1403
…		…
1150	$self->child->configure ($border, $border, $w, $h);	1432	$self->child->configure ($border, $border, $w, $h);
1151		1433
1152	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)	1434	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153	if $self->{close_button};	1435	if $self->{close_button};
1154		1436
		1437	1
		1438	}
		1439
		1440	sub invoke_delete {
		1441	my ($self) = @_;
		1442
		1443	$self->hide;
		1444
1155	1	1445	1
1156	}	1446	}
1157		1447
1158	sub invoke_button_down {	1448	sub invoke_button_down {
1159	my ($self, $ev, $x, $y) = @_;	1449	my ($self, $ev, $x, $y) = @_;
…		…
1217	$self->{motion}->($ev, $x, $y) if $self->{motion};	1507	$self->{motion}->($ev, $x, $y) if $self->{motion};
1218		1508
1219	! ! $self->{motion}	1509	! ! $self->{motion}
1220	}	1510	}
1221		1511
		1512	sub invoke_visibility_change {
		1513	my ($self, $visible) = @_;
		1514
		1515	delete $self->{motion} unless $visible;
		1516
		1517	0
		1518	}
		1519
1222	sub _draw {	1520	sub _draw {
1223	my ($self) = @_;	1521	my ($self) = @_;
1224		1522
1225	my $child = $self->{children}[0];	1523	my $child = $self->{children}[0];
1226		1524
…		…
1231	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1529	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1232		1530
1233	my $border = $self->border;	1531	my $border = $self->border;
1234		1532
1235	glColor @{ $self->{border_bg} };	1533	glColor @{ $self->{border_bg} };
1236	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1534	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1237	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1535	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1238	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1536	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1239	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1537	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1538
		1539	# move
		1540	my $w2 = ($w - $border) * .5;
		1541	my $h2 = ($h - $border) * .5;
		1542	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1543	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1544	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1545
		1546	# resize
		1547	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1548	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1549	unless $self->{has_close_button};
		1550	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1551	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1240		1552
1241	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1553	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1242	glColor @{ $self->{bg} };	1554	glColor @{ $self->{bg} };
1243		1555
1244	# TODO: repeat texture not scale	1556	# TODO: repeat texture not scale
…		…
1263	if $self->{close_button};	1575	if $self->{close_button};
1264	}	1576	}
1265		1577
1266	#############################################################################	1578	#############################################################################
1267		1579
1268	package CFClient::UI::Table;	1580	package CFPlus::UI::Table;
1269		1581
1270	our @ISA = CFClient::UI::Base::;	1582	our @ISA = CFPlus::UI::Container::;
1271		1583
1272	use List::Util qw(max sum);	1584	use List::Util qw(max sum);
1273		1585
1274	use CFClient::OpenGL;	1586	use CFPlus::OpenGL;
1275		1587
1276	sub new {	1588	sub new {
1277	my $class = shift;	1589	my $class = shift;
1278		1590
1279	$class->SUPER::new (	1591	$class->SUPER::new (
1280	col_expand => [],	1592	col_expand => [],
		1593	row_expand => [],
1281	@_,	1594	@_,
1282	)	1595	)
1283	}	1596	}
1284		1597
1285	sub children {
1286	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1287	}
1288
1289	sub add {	1598	sub add {
1290	my ($self, $x, $y, $child) = @_;	1599	my ($self, @widgets) = @_;
1291		1600
1292	$child->set_parent ($self);	1601	for my $child (@widgets) {
1293	$self->{children}[$y][$x] = $child;	1602	$child->{c_rowspan} ||= 1;
		1603	$child->{c_colspan} ||= 1;
		1604	}
1294		1605
1295	$self->realloc;	1606	$self->SUPER::add (@widgets);
1296	}	1607	}
1297		1608
1298	sub remove {	1609	sub add_at {
		1610	my $self = shift;
		1611
		1612	my @widgets;
		1613
		1614	while (@_) {
		1615	my ($col, $row, $child) = splice @_, 0, 3, ();
		1616
		1617	$child->{c_row} = $row;
		1618	$child->{c_col} = $col;
		1619
		1620	push @widgets, $child;
		1621	}
		1622
		1623	$self->add (@widgets);
		1624	}
		1625
		1626	sub get_wh {
1299	my ($self, $child) = @_;	1627	my ($self) = @_;
1300		1628
1301	# TODO: not yet implemented	1629	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		1630
1308	my @children = $self->children;	1631	my @children = $self->children;
1309	delete $self->{children};	1632
		1633	# first pass, columns
		1634	for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
		1635	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
		1636
		1637	my $sw = sum @w[$c .. $c + $cs - 1];
		1638
		1639	if ($w > $sw) {
		1640	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1641	}
1310		1642	}
1311	for (@children) {
1312	delete $_->{parent};
1313	$_->hide;
1314	}
1315		1643
1316	$self->realloc;	1644	# second pass, rows
1317	}	1645	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)};	1646	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1332		1647
1333	$w[$x] = max $w[$x], $w;	1648	my $sh = sum @h[$r .. $r + $rs - 1];
1334	$h[$y] = max $h[$y], $h;	1649
		1650	if ($h > $sh) {
		1651	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1335	}	1652	}
1336	}	1653	}
1337		1654
1338	(\@w, \@h)	1655	(\@w, \@h)
1339	}	1656	}
…		…
1355	my ($ws, $hs) = $self->get_wh;	1672	my ($ws, $hs) = $self->get_wh;
1356		1673
1357	my $req_w = (sum @$ws) || 1;	1674	my $req_w = (sum @$ws) || 1;
1358	my $req_h = (sum @$hs) || 1;	1675	my $req_h = (sum @$hs) || 1;
1359		1676
1360	# TODO: nicer code && do row_expand	1677	# now linearly scale the rows/columns to the allocated size
1361	my @col_expand = @{$self->{col_expand}};	1678	my @col_expand = @{$self->{col_expand}};
1362	@col_expand = (1) x @$ws unless @col_expand;	1679	@col_expand = (1) x @$ws unless @col_expand;
1363	my $col_expand = (sum @col_expand) || 1;	1680	my $col_expand = (sum @col_expand) || 1;
1364		1681
1365	# linearly scale sizes
1366	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1682	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1367	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1368		1683
1369	CFClient::UI::harmonize $ws;	1684	CFPlus::UI::harmonize $ws;
		1685
		1686	my @row_expand = @{$self->{row_expand}};
		1687	@row_expand = (1) x @$ws unless @row_expand;
		1688	my $row_expand = (sum @row_expand) || 1;
		1689
		1690	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1691
1370	CFClient::UI::harmonize $hs;	1692	CFPlus::UI::harmonize $hs;
1371		1693
1372	my $y;	1694	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1695	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1373		1696
1374	for my $r (0 .. $#{$self->{children}}) {	1697	for my $widget ($self->children) {
1375	my $row = $self->{children}[$r]	1698	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		1699
1378	my $x = 0;	1700	$widget->configure (
1379	my $row_h = $hs->[$r];	1701	$x[$c], $y[$r],
		1702	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1380		1703	);
1381	for my $c (0 .. $#$row) {	1704	}
1382	my $col_w = $ws->[$c];
1383		1705
1384	if (my $widget = $row->[$c]) {	1706	1
1385	$widget->configure ($x, $y, $col_w, $row_h);	1707	}
1386	}
1387		1708
1388	$x += $col_w;	1709	#############################################################################
		1710
		1711	package CFPlus::UI::Fixed;
		1712
		1713	use List::Util qw(min max);
		1714
		1715	our @ISA = CFPlus::UI::Container::;
		1716
		1717	sub _scale($$$) {
		1718	my ($rel, $val, $max) = @_;
		1719
		1720	$rel ? $val * $max : $val
		1721	}
		1722
		1723	sub size_request {
		1724	my ($self) = @_;
		1725
		1726	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1727
		1728	# determine overall size by querying abs widgets
		1729	for my $child ($self->visible_children) {
		1730	unless ($child->{c_rel}) {
		1731	my $x = $child->{c_x};
		1732	my $y = $child->{c_y};
		1733
		1734	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1735	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1389	}	1736	}
		1737	}
1390		1738
1391	$y += $row_h;	1739	my $W = $x2 - $x1;
		1740	my $H = $y2 - $y1;
		1741
		1742	# now layout remaining widgets
		1743	for my $child ($self->visible_children) {
		1744	if ($child->{c_rel}) {
		1745	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1746	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1747
		1748	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1749	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
		1750	}
		1751	}
		1752
		1753	my $W = $x2 - $x1;
		1754	my $H = $y2 - $y1;
		1755
		1756	($W, $H)
		1757	}
		1758
		1759	sub invoke_size_allocate {
		1760	my ($self, $W, $H) = @_;
		1761
		1762	for my $child ($self->visible_children) {
		1763	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1764	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1765
		1766	$x += $child->{c_halign} * $child->{req_w};
		1767	$y += $child->{c_valign} * $child->{req_h};
		1768
		1769	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1392	}	1770	}
1393		1771
1394	1	1772	1
1395	}	1773	}
1396		1774
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	#############################################################################	1775	#############################################################################
1422		1776
1423	package CFClient::UI::Box;	1777	package CFPlus::UI::Box;
1424		1778
1425	our @ISA = CFClient::UI::Container::;	1779	our @ISA = CFPlus::UI::Container::;
1426		1780
1427	sub size_request {	1781	sub size_request {
1428	my ($self) = @_;	1782	my ($self) = @_;
		1783
		1784	my @children = $self->visible_children;
1429		1785
1430	$self->{vertical}	1786	$self->{vertical}
1431	? (	1787	? (
1432	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1788	(List::Util::max map $_->{req_w}, @children),
1433	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1789	(List::Util::sum map $_->{req_h}, @children),
1434	)	1790	)
1435	: (	1791	: (
1436	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1792	(List::Util::sum map $_->{req_w}, @children),
1437	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1793	(List::Util::max map $_->{req_h}, @children),
1438	)	1794	)
1439	}	1795	}
1440		1796
1441	sub invoke_size_allocate {	1797	sub invoke_size_allocate {
1442	my ($self, $w, $h) = @_;	1798	my ($self, $w, $h) = @_;
…		…
1463	$req[$_] += $space * $children[$_]{expand}	1819	$req[$_] += $space * $children[$_]{expand}
1464	for 0 .. $#children;	1820	for 0 .. $#children;
1465	}	1821	}
1466	}	1822	}
1467		1823
1468	CFClient::UI::harmonize \@req;	1824	CFPlus::UI::harmonize \@req;
1469		1825
1470	my $pos = 0;	1826	my $pos = 0;
1471	for (0 .. $#children) {	1827	for (0 .. $#children) {
1472	my $alloc = $req[$_];	1828	my $alloc = $req[$_];
1473	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1829	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1478	1	1834	1
1479	}	1835	}
1480		1836
1481	#############################################################################	1837	#############################################################################
1482		1838
1483	package CFClient::UI::HBox;	1839	package CFPlus::UI::HBox;
1484		1840
1485	our @ISA = CFClient::UI::Box::;	1841	our @ISA = CFPlus::UI::Box::;
1486		1842
1487	sub new {	1843	sub new {
1488	my $class = shift;	1844	my $class = shift;
1489		1845
1490	$class->SUPER::new (	1846	$class->SUPER::new (
…		…
1493	)	1849	)
1494	}	1850	}
1495		1851
1496	#############################################################################	1852	#############################################################################
1497		1853
1498	package CFClient::UI::VBox;	1854	package CFPlus::UI::VBox;
1499		1855
1500	our @ISA = CFClient::UI::Box::;	1856	our @ISA = CFPlus::UI::Box::;
1501		1857
1502	sub new {	1858	sub new {
1503	my $class = shift;	1859	my $class = shift;
1504		1860
1505	$class->SUPER::new (	1861	$class->SUPER::new (
…		…
1508	)	1864	)
1509	}	1865	}
1510		1866
1511	#############################################################################	1867	#############################################################################
1512		1868
1513	package CFClient::UI::Label;	1869	package CFPlus::UI::Label;
1514		1870
1515	our @ISA = CFClient::UI::DrawBG::;	1871	our @ISA = CFPlus::UI::DrawBG::;
1516		1872
1517	use CFClient::OpenGL;	1873	use CFPlus::OpenGL;
1518		1874
1519	sub new {	1875	sub new {
1520	my ($class, %arg) = @_;	1876	my ($class, %arg) = @_;
1521		1877
1522	my $self = $class->SUPER::new (	1878	my $self = $class->SUPER::new (
…		…
1525	#active_bg => none	1881	#active_bg => none
1526	#font => default_font	1882	#font => default_font
1527	#text => initial text	1883	#text => initial text
1528	#markup => initial narkup	1884	#markup => initial narkup
1529	#max_w => maximum pixel width	1885	#max_w => maximum pixel width
		1886	#style => 0, # render flags
1530	ellipsise => 3, # end	1887	ellipsise => 3, # end
1531	layout => (new CFClient::Layout),	1888	layout => (new CFPlus::Layout),
1532	fontsize => 1,	1889	fontsize => 1,
1533	align => -1,	1890	align => -1,
1534	valign => -1,	1891	valign => -1,
1535	padding_x => 2,	1892	padding_x => 2,
1536	padding_y => 2,	1893	padding_y => 2,
1537	can_events => 0,	1894	can_events => 0,
1538	%arg	1895	%arg
1539	);	1896	);
1540		1897
1541	if (exists $self->{template}) {	1898	if (exists $self->{template}) {
1542	my $layout = new CFClient::Layout;	1899	my $layout = new CFPlus::Layout;
1543	$layout->set_text (delete $self->{template});	1900	$layout->set_text (delete $self->{template});
1544	$self->{template} = $layout;	1901	$self->{template} = $layout;
1545	}	1902	}
1546		1903
1547	if (exists $self->{markup}) {	1904	if (exists $self->{markup}) {
…		…
1551	}	1908	}
1552		1909
1553	$self	1910	$self
1554	}	1911	}
1555		1912
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 {	1913	sub update {
1567	my ($self) = @_;	1914	my ($self) = @_;
1568		1915
1569	delete $self->{texture};	1916	delete $self->{texture};
1570	$self->SUPER::update;	1917	$self->SUPER::update;
…		…
1575		1922
1576	delete $self->{ox};	1923	delete $self->{ox};
1577	$self->SUPER::realloc;	1924	$self->SUPER::realloc;
1578	}	1925	}
1579		1926
		1927	sub clear {
		1928	my ($self) = @_;
		1929
		1930	$self->set_text ("");
		1931	}
		1932
1580	sub set_text {	1933	sub set_text {
1581	my ($self, $text) = @_;	1934	my ($self, $text) = @_;
1582		1935
1583	return if $self->{text} eq "T$text";	1936	return if $self->{text} eq "T$text";
1584	$self->{text} = "T$text";	1937	$self->{text} = "T$text";
1585		1938
1586	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1587	$self->{layout}->set_text ($text);	1939	$self->{layout}->set_text ($text);
1588		1940
1589	delete $self->{size_req};	1941	delete $self->{size_req};
1590	$self->realloc;	1942	$self->realloc;
1591	$self->update;	1943	$self->update;
…		…
1597	return if $self->{text} eq "M$markup";	1949	return if $self->{text} eq "M$markup";
1598	$self->{text} = "M$markup";	1950	$self->{text} = "M$markup";
1599		1951
1600	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1952	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601		1953
1602	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1603	$self->{layout}->set_markup ($markup);	1954	$self->{layout}->set_markup ($markup);
1604		1955
1605	delete $self->{size_req};	1956	delete $self->{size_req};
1606	$self->realloc;	1957	$self->realloc;
1607	$self->update;	1958	$self->update;
…		…
1609		1960
1610	sub size_request {	1961	sub size_request {
1611	my ($self) = @_;	1962	my ($self) = @_;
1612		1963
1613	$self->{size_req} ||= do {	1964	$self->{size_req} ||= do {
		1965	my ($max_w, $max_h) = $self->get_max_wh;
		1966
1614	$self->{layout}->set_font ($self->{font}) if $self->{font};	1967	$self->{layout}->set_font ($self->{font}) if $self->{font};
1615	$self->{layout}->set_width ($self->{max_w} || -1);	1968	$self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1616	$self->{layout}->set_ellipsise ($self->{ellipsise});	1969	$self->{layout}->set_ellipsise ($self->{ellipsise});
1617	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1970	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1618	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1971	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1619		1972
1620	my ($w, $h) = $self->{layout}->size;	1973	my ($w, $h) = $self->{layout}->size;
1621		1974
1622	if (exists $self->{template}) {	1975	if (exists $self->{template}) {
1623	$self->{template}->set_font ($self->{font}) if $self->{font};	1976	$self->{template}->set_font ($self->{font}) if $self->{font};
		1977	$self->{template}->set_width ($self->{max_w} || -1);
1624	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1978	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1625		1979
1626	my ($w2, $h2) = $self->{template}->size;	1980	my ($w2, $h2) = $self->{template}->size;
1627		1981
1628	$w = List::Util::max $w, $w2;	1982	$w = List::Util::max $w, $w2;
…		…
1652		2006
1653	sub set_fontsize {	2007	sub set_fontsize {
1654	my ($self, $fontsize) = @_;	2008	my ($self, $fontsize) = @_;
1655		2009
1656	$self->{fontsize} = $fontsize;	2010	$self->{fontsize} = $fontsize;
		2011	delete $self->{size_req};
1657	delete $self->{texture};	2012	delete $self->{texture};
1658		2013
1659	$self->realloc;	2014	$self->realloc;
1660	}	2015	}
1661		2016
1662	sub reconfigure {	2017	sub reconfigure {
1663	my ($self) = @_;	2018	my ($self) = @_;
1664		2019
1665	delete $self->{size_req};	2020	delete $self->{size_req};
		2021	delete $self->{texture};
1666		2022
1667	$self->SUPER::reconfigure;	2023	$self->SUPER::reconfigure;
1668	}	2024	}
1669		2025
1670	sub _draw {	2026	sub _draw {
1671	my ($self) = @_;	2027	my ($self) = @_;
1672		2028
1673	$self->SUPER::_draw; # draw background, if applicable	2029	$self->SUPER::_draw; # draw background, if applicable
1674		2030
1675	my $tex = $self->{texture} ||= do {	2031	my $size = $self->{texture} ||= do {
1676	$self->{layout}->set_foreground (@{$self->{fg}});	2032	$self->{layout}->set_foreground (@{$self->{fg}});
1677	$self->{layout}->set_font ($self->{font}) if $self->{font};	2033	$self->{layout}->set_font ($self->{font}) if $self->{font};
1678	$self->{layout}->set_width ($self->{w});	2034	$self->{layout}->set_width ($self->{w});
1679	$self->{layout}->set_ellipsise ($self->{ellipsise});	2035	$self->{layout}->set_ellipsise ($self->{ellipsise});
1680	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2036	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1681	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2037	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1682		2038
1683	new_from_layout CFClient::Texture $self->{layout}	2039	[$self->{layout}->size]
1684	};	2040	};
1685		2041
1686	unless (exists $self->{ox}) {	2042	unless (exists $self->{ox}) {
1687	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2043	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1688	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2044	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1689	: ($self->{w} - $tex->{w}) * 0.5);	2045	: ($self->{w} - $size->[0]) * 0.5);
1690		2046
1691	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2047	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1692	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2048	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1693	: ($self->{h} - $tex->{h}) * 0.5);	2049	: ($self->{h} - $size->[1]) * 0.5);
		2050
		2051	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1694	};	2052	};
1695		2053
1696	glEnable GL_TEXTURE_2D;	2054	# unless ($self->{list}) {
1697		2055	# $self->{list} = CFPlus::OpenGL::glGenList;
1698	my $w = List::Util::min $self->{w} + 4, $tex->{w};	2056	# CFPlus::OpenGL::glNewList $self->{list};
1699	my $h = List::Util::min $self->{h} + 2, $tex->{h};	2057	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1700		2058	# 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	}	2059	# }
		2060	#
		2061	# CFPlus::OpenGL::glCallList $self->{list};
1709		2062
1710	glDisable GL_TEXTURE_2D;	2063	$self->{layout}->draw;
1711	}	2064	}
		2065
		2066	#sub destroy {
		2067	# my ($self) = @_;
		2068	#
		2069	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2070	#
		2071	# $self->SUPER::destroy;
		2072	#}
1712		2073
1713	#############################################################################	2074	#############################################################################
1714		2075
1715	package CFClient::UI::EntryBase;	2076	package CFPlus::UI::EntryBase;
1716		2077
1717	our @ISA = CFClient::UI::Label::;	2078	our @ISA = CFPlus::UI::Label::;
1718		2079
1719	use CFClient::OpenGL;	2080	use CFPlus::OpenGL;
1720		2081
1721	sub new {	2082	sub new {
1722	my $class = shift;	2083	my $class = shift;
1723		2084
1724	$class->SUPER::new (	2085	$class->SUPER::new (
1725	fg => [1, 1, 1],	2086	fg => [1, 1, 1],
1726	bg => [0, 0, 0, 0.2],	2087	bg => [0, 0, 0, 0.2],
		2088	outline => [0.6, 0.3, 0.1],
1727	active_bg => [1, 1, 1, 0.5],	2089	active_bg => [0, 0, 1, .2],
1728	active_fg => [0, 0, 0],	2090	active_fg => [1, 1, 1],
		2091	active_outline => [1, 1, 0],
1729	can_hover => 1,	2092	can_hover => 1,
1730	can_focus => 1,	2093	can_focus => 1,
1731	valign => 0,	2094	valign => 0,
1732	can_events => 1,	2095	can_events => 1,
		2096	ellipsise => 0,
1733	#text => ...	2097	#text => ...
1734	#hidden => "*",	2098	#hidden => "*",
1735	@_	2099	@_
1736	)	2100	)
1737	}	2101	}
…		…
1782	my $sym = $ev->{sym};	2146	my $sym = $ev->{sym};
1783	my $uni = $ev->{unicode};	2147	my $uni = $ev->{unicode};
1784		2148
1785	my $text = $self->get_text;	2149	my $text = $self->get_text;
1786		2150
		2151	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2152
1787	if ($uni == 8) {	2153	if ($uni == 8) {
1788	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2154	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1789	} elsif ($uni == 127) {	2155	} elsif ($uni == 127) {
1790	substr $text, $self->{cursor}, 1, "";	2156	substr $text, $self->{cursor}, 1, "";
1791	} elsif ($sym == CFClient::SDLK_LEFT) {	2157	} elsif ($sym == CFPlus::SDLK_LEFT) {
1792	--$self->{cursor} if $self->{cursor};	2158	--$self->{cursor} if $self->{cursor};
1793	} elsif ($sym == CFClient::SDLK_RIGHT) {	2159	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1794	++$self->{cursor} if $self->{cursor} < length $self->{text};	2160	++$self->{cursor} if $self->{cursor} < length $self->{text};
1795	} elsif ($sym == CFClient::SDLK_HOME) {	2161	} elsif ($sym == CFPlus::SDLK_HOME) {
		2162	# what a hack
		2163	$self->{cursor} =
		2164	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2165	? length $1
		2166	: 0;
		2167	} elsif ($sym == CFPlus::SDLK_END) {
		2168	# uh, again
		2169	$self->{cursor} =
		2170	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2171	? $self->{cursor} + length $1
		2172	: length $self->{text};
		2173	} elsif ($uni == 21) { # ctrl-u
		2174	$text = "";
1796	$self->{cursor} = 0;	2175	$self->{cursor} = 0;
1797	} elsif ($sym == CFClient::SDLK_END) {
1798	$self->{cursor} = length $text;
1799	} elsif ($uni == 27) {	2176	} elsif ($uni == 27) {
1800	$self->emit ('escape');	2177	$self->emit ('escape');
1801	} elsif ($uni) {	2178	} elsif ($uni == 0x0d) {
		2179	substr $text, $self->{cursor}++, 0, "\012";
		2180	} elsif ($uni >= 0x20) {
1802	substr $text, $self->{cursor}++, 0, chr $uni;	2181	substr $text, $self->{cursor}++, 0, chr $uni;
1803	} else {	2182	} else {
1804	return 0;	2183	return 0;
1805	}	2184	}
1806		2185
1807	$self->_set_text ($text);	2186	$self->_set_text ($text);
1808		2187
1809	$self->realloc;	2188	$self->realloc;
		2189	$self->update;
1810		2190
1811	1	2191	1
1812	}	2192	}
1813		2193
1814	sub invoke_focus_in {	2194	sub invoke_focus_in {
…		…
1826		2206
1827	my $idx = $self->{layout}->xy_to_index ($x, $y);	2207	my $idx = $self->{layout}->xy_to_index ($x, $y);
1828		2208
1829	# byte-index to char-index	2209	# byte-index to char-index
1830	my $text = $self->{text};	2210	my $text = $self->{text};
1831	utf8::encode $text;	2211	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1832	$self->{cursor} = length substr $text, 0, $idx;	2212	$self->{cursor} = length $text;
1833		2213
1834	$self->_set_text ($self->{text});	2214	$self->_set_text ($self->{text});
1835	$self->update;	2215	$self->update;
1836		2216
1837	1	2217	1
…		…
1856	glColor_premultiply @{$self->{bg}};	2236	glColor_premultiply @{$self->{bg}};
1857	}	2237	}
1858		2238
1859	glEnable GL_BLEND;	2239	glEnable GL_BLEND;
1860	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2240	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};	2241	glRect 0, 0, $self->{w}, $self->{h};
1865	glVertex $self->{w}, 0;
1866	glEnd;
1867	glDisable GL_BLEND;	2242	glDisable GL_BLEND;
1868		2243
1869	$self->SUPER::_draw;	2244	$self->SUPER::_draw;
1870		2245
1871	#TODO: force update every cursor change :(	2246	#TODO: force update every cursor change :(
…		…
1873		2248
1874	unless (exists $self->{cur_h}) {	2249	unless (exists $self->{cur_h}) {
1875	my $text = substr $self->{text}, 0, $self->{cursor};	2250	my $text = substr $self->{text}, 0, $self->{cursor};
1876	utf8::encode $text;	2251	utf8::encode $text;
1877		2252
1878	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2253	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1879	}	2254	}
1880		2255
1881	glColor @{$self->{fg}};	2256	glColor_premultiply @{$self->{active_fg}};
1882	glBegin GL_LINES;	2257	glBegin GL_LINES;
1883	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2258	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1884	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2259	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1885	glEnd;	2260	glEnd;
1886	}
1887	}
1888		2261
		2262	glLineWidth 3;
		2263	glColor @{$self->{active_outline}};
		2264	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2265	glLineWidth 1;
		2266
		2267	} else {
		2268	glColor @{$self->{outline}};
		2269	glBegin GL_LINE_STRIP;
		2270	glVertex .5, $self->{h} * .5;
		2271	glVertex .5, $self->{h} - 2.5;
		2272	glVertex $self->{w} - .5, $self->{h} - 2.5;
		2273	glVertex $self->{w} - .5, $self->{h} * .5;
		2274	glEnd;
		2275	}
		2276	}
		2277
		2278	#############################################################################
		2279
1889	package CFClient::UI::Entry;	2280	package CFPlus::UI::Entry;
1890		2281
1891	our @ISA = CFClient::UI::EntryBase::;	2282	our @ISA = CFPlus::UI::EntryBase::;
1892		2283
1893	use CFClient::OpenGL;	2284	use CFPlus::OpenGL;
1894		2285
1895	sub invoke_key_down {	2286	sub invoke_key_down {
1896	my ($self, $ev) = @_;	2287	my ($self, $ev) = @_;
1897		2288
1898	my $sym = $ev->{sym};	2289	my $sym = $ev->{sym};
1899		2290
1900	if ($sym == 13) {	2291	if ($ev->{uni} == 0x0d || $sym == 13) {
1901	unshift @{$self->{history}},	2292	unshift @{$self->{history}},
1902	my $txt = $self->get_text;	2293	my $txt = $self->get_text;
1903		2294
1904	$self->{history_pointer} = -1;	2295	$self->{history_pointer} = -1;
1905	$self->{history_saveback} = '';	2296	$self->{history_saveback} = '';
1906	$self->emit (activate => $txt);	2297	$self->emit (activate => $txt);
1907	$self->update;	2298	$self->update;
1908		2299
1909	} elsif ($sym == CFClient::SDLK_UP) {	2300	} elsif ($sym == CFPlus::SDLK_UP) {
1910	if ($self->{history_pointer} < 0) {	2301	if ($self->{history_pointer} < 0) {
1911	$self->{history_saveback} = $self->get_text;	2302	$self->{history_saveback} = $self->get_text;
1912	}	2303	}
1913	if (@{$self->{history} || []} > 0) {	2304	if (@{$self->{history} || []} > 0) {
1914	$self->{history_pointer}++;	2305	$self->{history_pointer}++;
…		…
1916	$self->{history_pointer} = @{$self->{history} || []} - 1;	2307	$self->{history_pointer} = @{$self->{history} || []} - 1;
1917	}	2308	}
1918	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2309	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1919	}	2310	}
1920		2311
1921	} elsif ($sym == CFClient::SDLK_DOWN) {	2312	} elsif ($sym == CFPlus::SDLK_DOWN) {
1922	$self->{history_pointer}--;	2313	$self->{history_pointer}--;
1923	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2314	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1924		2315
1925	if ($self->{history_pointer} >= 0) {	2316	if ($self->{history_pointer} >= 0) {
1926	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2317	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1935	1	2326	1
1936	}	2327	}
1937		2328
1938	#############################################################################	2329	#############################################################################
1939		2330
		2331	package CFPlus::UI::TextEdit;
		2332
		2333	our @ISA = CFPlus::UI::EntryBase::;
		2334
		2335	use CFPlus::OpenGL;
		2336
		2337	sub move_cursor_ver {
		2338	my ($self, $dy) = @_;
		2339
		2340	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2341
		2342	$y += $dy;
		2343
		2344	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2345	$self->{cursor} = $index;
		2346	delete $self->{cur_h};
		2347	$self->update;
		2348	return;
		2349	}
		2350	}
		2351
		2352	sub invoke_key_down {
		2353	my ($self, $ev) = @_;
		2354
		2355	my $sym = $ev->{sym};
		2356
		2357	if ($sym == CFPlus::SDLK_UP) {
		2358	$self->move_cursor_ver (-1);
		2359	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2360	$self->move_cursor_ver (+1);
		2361	} else {
		2362	return $self->SUPER::invoke_key_down ($ev)
		2363	}
		2364
		2365	1
		2366	}
		2367
		2368	#############################################################################
		2369
1940	package CFClient::UI::Button;	2370	package CFPlus::UI::ButtonBin;
1941		2371
1942	our @ISA = CFClient::UI::Label::;	2372	our @ISA = CFPlus::UI::Bin::;
1943		2373
1944	use CFClient::OpenGL;	2374	use CFPlus::OpenGL;
1945		2375
1946	my @tex =	2376	my @tex =
1947	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2377	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1948	qw(b1_button_active.png);	2378	qw(b1_button_inactive.png b1_button_active.png);
1949		2379
1950	sub new {	2380	sub new {
1951	my $class = shift;	2381	my $class = shift;
1952		2382
1953	$class->SUPER::new (	2383	$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,	2384	can_hover => 1,
1959	align => 0,	2385	align => 0,
1960	valign => 0,	2386	valign => 0,
1961	can_events => 1,	2387	can_events => 1,
1962	@_	2388	@_
…		…
1974	}	2400	}
1975		2401
1976	sub _draw {	2402	sub _draw {
1977	my ($self) = @_;	2403	my ($self) = @_;
1978		2404
1979	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1980
1981	glEnable GL_TEXTURE_2D;	2405	glEnable GL_TEXTURE_2D;
1982	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2406	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1983	glColor 0, 0, 0, 1;	2407	glColor 0, 0, 0, 1;
1984		2408
		2409	my $tex = $tex[$GRAB == $self];
1985	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2410	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1986		2411
1987	glDisable GL_TEXTURE_2D;	2412	glDisable GL_TEXTURE_2D;
1988		2413
1989	$self->SUPER::_draw;	2414	$self->SUPER::_draw;
1990	}	2415	}
1991		2416
1992	#############################################################################	2417	#############################################################################
1993		2418
		2419	package CFPlus::UI::Button;
		2420
		2421	our @ISA = CFPlus::UI::Label::;
		2422
		2423	use CFPlus::OpenGL;
		2424
		2425	my @tex =
		2426	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2427	qw(b1_button_inactive.png b1_button_active.png);
		2428
		2429	sub new {
		2430	my $class = shift;
		2431
		2432	$class->SUPER::new (
		2433	padding_x => 4,
		2434	padding_y => 4,
		2435	fg => [1.0, 1.0, 1.0],
		2436	active_fg => [0.8, 0.8, 0.8],
		2437	can_hover => 1,
		2438	align => 0,
		2439	valign => 0,
		2440	can_events => 1,
		2441	@_
		2442	)
		2443	}
		2444
		2445	sub invoke_button_up {
		2446	my ($self, $ev, $x, $y) = @_;
		2447
		2448	$self->emit ("activate")
		2449	if $x >= 0 && $x < $self->{w}
		2450	&& $y >= 0 && $y < $self->{h};
		2451
		2452	1
		2453	}
		2454
		2455	sub _draw {
		2456	my ($self) = @_;
		2457
		2458	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
		2459
		2460	glEnable GL_TEXTURE_2D;
		2461	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2462	glColor 0, 0, 0, 1;
		2463
		2464	my $tex = $tex[$GRAB == $self];
		2465	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2466
		2467	glDisable GL_TEXTURE_2D;
		2468
		2469	$self->SUPER::_draw;
		2470	}
		2471
		2472	#############################################################################
		2473
		2474	package CFPlus::UI::CheckBox;
		2475
		2476	our @ISA = CFPlus::UI::DrawBG::;
		2477
		2478	my @tex =
		2479	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2480	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2481
		2482	use CFPlus::OpenGL;
		2483
		2484	sub new {
		2485	my $class = shift;
		2486
		2487	$class->SUPER::new (
		2488	padding_x => 2,
		2489	padding_y => 2,
		2490	fg => [1, 1, 1],
		2491	active_fg => [1, 1, 0],
		2492	bg => [0, 0, 0, 0.2],
		2493	active_bg => [1, 1, 1, 0.5],
		2494	state => 0,
		2495	can_hover => 1,
		2496	@_
		2497	)
		2498	}
		2499
		2500	sub size_request {
		2501	my ($self) = @_;
		2502
		2503	(6) x 2
		2504	}
		2505
		2506	sub toggle {
		2507	my ($self) = @_;
		2508
		2509	$self->{state} = !$self->{state};
		2510	$self->emit (changed => $self->{state});
		2511	$self->update;
		2512	}
		2513
		2514	sub invoke_button_down {
		2515	my ($self, $ev, $x, $y) = @_;
		2516
		2517	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2518	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2519	$self->toggle;
		2520	} else {
		2521	return 0
		2522	}
		2523
		2524	1
		2525	}
		2526
		2527	sub _draw {
		2528	my ($self) = @_;
		2529
		2530	$self->SUPER::_draw;
		2531
		2532	glTranslate $self->{padding_x}, $self->{padding_y}, 0;
		2533
		2534	my ($w, $h) = @$self{qw(w h)};
		2535
		2536	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2537
		2538	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2539
		2540	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2541
		2542	glEnable GL_TEXTURE_2D;
		2543	$tex->draw_quad_alpha (0, 0, $s, $s);
		2544	glDisable GL_TEXTURE_2D;
		2545	}
		2546
		2547	#############################################################################
		2548
		2549	package CFPlus::UI::Image;
		2550
		2551	our @ISA = CFPlus::UI::Base::;
		2552
		2553	use CFPlus::OpenGL;
		2554
		2555	our %texture_cache;
		2556
		2557	sub new {
		2558	my $class = shift;
		2559
		2560	my $self = $class->SUPER::new (
		2561	can_events => 0,
		2562	scale => 1,
		2563	@_,
		2564	);
		2565
		2566	$self->{path} || $self->{tex}
		2567	or Carp::croak "'path' or 'tex' attributes required";
		2568
		2569	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2570	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2571
		2572	CFPlus::weaken $texture_cache{$self->{path}};
		2573
		2574	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2575
		2576	$self
		2577	}
		2578
		2579	sub STORABLE_freeze {
		2580	my ($self, $cloning) = @_;
		2581
		2582	$self->{path}
		2583	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2584
		2585	$self->{path}
		2586	}
		2587
		2588	sub STORABLE_attach {
		2589	my ($self, $cloning, $path) = @_;
		2590
		2591	$self->new (path => $path)
		2592	}
		2593
		2594	sub size_request {
		2595	my ($self) = @_;
		2596
		2597	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
		2598	}
		2599
		2600	sub _draw {
		2601	my ($self) = @_;
		2602
		2603	my $tex = $self->{tex};
		2604
		2605	my ($w, $h) = ($self->{w}, $self->{h});
		2606
		2607	if ($self->{rot90}) {
		2608	glRotate 90, 0, 0, 1;
		2609	glTranslate 0, -$self->{w}, 0;
		2610
		2611	($w, $h) = ($h, $w);
		2612	}
		2613
		2614	glEnable GL_TEXTURE_2D;
		2615	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2616
		2617	$tex->draw_quad_alpha (0, 0, $w, $h);
		2618
		2619	glDisable GL_TEXTURE_2D;
		2620	}
		2621
		2622	#############################################################################
		2623
1994	package CFClient::UI::ImageButton;	2624	package CFPlus::UI::ImageButton;
1995		2625
1996	our @ISA = CFClient::UI::Image::;	2626	our @ISA = CFPlus::UI::Image::;
1997		2627
1998	use CFClient::OpenGL;	2628	use CFPlus::OpenGL;
1999		2629
2000	my %textures;	2630	my %textures;
2001		2631
2002	sub new {	2632	sub new {
2003	my $class = shift;	2633	my $class = shift;
…		…
2013	can_events => 1,	2643	can_events => 1,
2014	@_	2644	@_
2015	);	2645	);
2016	}	2646	}
2017		2647
		2648	sub invoke_button_down {
		2649	my ($self, $ev, $x, $y) = @_;
		2650
		2651	1
		2652	}
		2653
2018	sub invoke_button_up {	2654	sub invoke_button_up {
2019	my ($self, $ev, $x, $y) = @_;	2655	my ($self, $ev, $x, $y) = @_;
2020		2656
2021	$self->emit ("activate")	2657	$self->emit ("activate")
2022	if $x >= 0 && $x < $self->{w}	2658	if $x >= 0 && $x < $self->{w}
…		…
2025	1	2661	1
2026	}	2662	}
2027		2663
2028	#############################################################################	2664	#############################################################################
2029		2665
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;	2666	package CFPlus::UI::VGauge;
2099		2667
2100	our @ISA = CFClient::UI::Base::;	2668	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		2669
2161	use List::Util qw(min max);	2670	use List::Util qw(min max);
2162		2671
2163	use CFClient::OpenGL;	2672	use CFPlus::OpenGL;
2164		2673
2165	my %tex = (	2674	my %tex = (
2166	food => [	2675	food => [
2167	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2676	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2168	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2677	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2169	],	2678	],
2170	grace => [	2679	grace => [
2171	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2680	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/	2681	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2173	],	2682	],
2174	hp => [	2683	hp => [
2175	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2684	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2176	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2685	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2177	],	2686	],
2178	mana => [	2687	mana => [
2179	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2688	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/	2689	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2181	],	2690	],
2182	);	2691	);
2183		2692
2184	# eg. VGauge->new (gauge => 'food'), default gauge: food	2693	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2244	my $ycut1 = max 0, min 1, $ycut;	2753	my $ycut1 = max 0, min 1, $ycut;
2245	my $ycut2 = max 0, min 1, $ycut - 1;	2754	my $ycut2 = max 0, min 1, $ycut - 1;
2246		2755
2247	my $h1 = $self->{h} * (1 - $ycut1);	2756	my $h1 = $self->{h} * (1 - $ycut1);
2248	my $h2 = $self->{h} * (1 - $ycut2);	2757	my $h2 = $self->{h} * (1 - $ycut2);
		2758	my $h3 = $self->{h};
		2759
		2760	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2249		2761
2250	glEnable GL_BLEND;	2762	glEnable GL_BLEND;
2251	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2763	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2252	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2764	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2253	glEnable GL_TEXTURE_2D;	2765	glEnable GL_TEXTURE_2D;
…		…
2272		2784
2273	if ($t3) {	2785	if ($t3) {
2274	glBindTexture GL_TEXTURE_2D, $t3->{name};	2786	glBindTexture GL_TEXTURE_2D, $t3->{name};
2275	glBegin GL_QUADS;	2787	glBegin GL_QUADS;
2276	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2788	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2277	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2789	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2278	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2790	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2279	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2791	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2280	glEnd;	2792	glEnd;
2281	}	2793	}
2282		2794
2283	glDisable GL_BLEND;	2795	glDisable GL_BLEND;
2284	glDisable GL_TEXTURE_2D;	2796	glDisable GL_TEXTURE_2D;
2285	}	2797	}
2286		2798
2287	#############################################################################	2799	#############################################################################
2288		2800
		2801	package CFPlus::UI::Progress;
		2802
		2803	our @ISA = CFPlus::UI::Label::;
		2804
		2805	use CFPlus::OpenGL;
		2806
		2807	sub new {
		2808	my ($class, %arg) = @_;
		2809
		2810	my $self = $class->SUPER::new (
		2811	fg => [1, 1, 1],
		2812	bg => [0, 0, 1, 0.2],
		2813	bar => [0.7, 0.5, 0.1, 0.8],
		2814	outline => [0.4, 0.3, 0],
		2815	fontsize => 0.9,
		2816	valign => 0,
		2817	align => 0,
		2818	can_events => 1,
		2819	ellipsise => 1,
		2820	label => "%d%%",
		2821	%arg,
		2822	);
		2823
		2824	$self->set_value ($arg{value} || -1);
		2825
		2826	$self
		2827	}
		2828
		2829	sub set_label {
		2830	my ($self, $label) = @_;
		2831
		2832	return if $self->{label} eq $label;
		2833	$self->{label} = $label;
		2834
		2835	$self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
		2836	}
		2837
		2838	sub set_value {
		2839	my ($self, $value) = @_;
		2840
		2841	if ($self->{value} ne $value) {
		2842	$self->{value} = $value;
		2843
		2844	if ($value < 0) {
		2845	$self->set_text ("-");
		2846	} else {
		2847	$self->set_text (sprintf $self->{label}, $value * 100);
		2848	}
		2849
		2850	$self->update;
		2851	}
		2852	}
		2853
		2854	sub _draw {
		2855	my ($self) = @_;
		2856
		2857	glEnable GL_BLEND;
		2858	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2859
		2860	if ($self->{value} >= 0) {
		2861	my $s = int 2 + ($self->{w} - 4) * $self->{value};
		2862
		2863	glColor_premultiply @{$self->{bar}};
		2864	glRect 2, 2, $s, $self->{h} - 2;
		2865	glColor_premultiply @{$self->{bg}};
		2866	glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
		2867	}
		2868
		2869	glColor_premultiply @{$self->{outline}};
		2870	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2871
		2872	glDisable GL_BLEND;
		2873
		2874	{
		2875	local $self->{bg}; # do not draw background
		2876	$self->SUPER::_draw;
		2877	}
		2878	}
		2879
		2880	#############################################################################
		2881
		2882	package CFPlus::UI::ExperienceProgress;
		2883
		2884	our @ISA = CFPlus::UI::Progress::;
		2885
		2886	sub new {
		2887	my ($class, %arg) = @_;
		2888
		2889	my $self = $class->SUPER::new (
		2890	tooltip => sub {
		2891	my ($self) = @_;
		2892
		2893	sprintf "level %d\n%s points\n%s next level\n%s to go",
		2894	$self->{lvl},
		2895	::formsep ($self->{exp}),
		2896	::formsep ($self->{nxt}),
		2897	::formsep ($self->{nxt} - $self->{exp}),
		2898	},
		2899	%arg
		2900	);
		2901
		2902	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2903	if $::CONN;
		2904
		2905	$self
		2906	}
		2907
		2908	sub DESTROY {
		2909	my ($self) = @_;
		2910
		2911	delete $::CONN->{on_exp_update}{$self+0}
		2912	if $::CONN;
		2913
		2914	$self->SUPER::DESTROY;
		2915	}
		2916
		2917	sub set_value {
		2918	my ($self, $lvl, $exp) = @_;
		2919
		2920	$self->{lvl} = $lvl;
		2921	$self->{exp} = $exp;
		2922
		2923	my $v = -1;
		2924
		2925	if ($::CONN && (my $table = $::CONN->{exp_table})) {
		2926	my $l0 = $table->[$lvl - 1];
		2927	my $l1 = $table->[$lvl];
		2928
		2929	$self->{nxt} = $l1;
		2930
		2931	$v = ($exp - $l0) / ($l1 - $l0);
		2932	}
		2933
		2934	$self->SUPER::set_value ($v);
		2935	}
		2936
		2937	#############################################################################
		2938
2289	package CFClient::UI::Gauge;	2939	package CFPlus::UI::Gauge;
2290		2940
2291	our @ISA = CFClient::UI::VBox::;	2941	our @ISA = CFPlus::UI::VBox::;
2292		2942
2293	sub new {	2943	sub new {
2294	my ($class, %arg) = @_;	2944	my ($class, %arg) = @_;
2295		2945
2296	my $self = $class->SUPER::new (	2946	my $self = $class->SUPER::new (
…		…
2298	can_hover => 1,	2948	can_hover => 1,
2299	can_events => 1,	2949	can_events => 1,
2300	%arg,	2950	%arg,
2301	);	2951	);
2302		2952
2303	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2953	$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);	2954	$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");	2955	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2306		2956
2307	$self	2957	$self
2308	}	2958	}
2309		2959
2310	sub set_fontsize {	2960	sub set_fontsize {
…		…
2331	$self->{value}->set_text ($val);	2981	$self->{value}->set_text ($val);
2332	}	2982	}
2333		2983
2334	#############################################################################	2984	#############################################################################
2335		2985
2336	package CFClient::UI::Slider;	2986	package CFPlus::UI::Slider;
2337		2987
2338	use strict;	2988	use strict;
2339		2989
2340	use CFClient::OpenGL;	2990	use CFPlus::OpenGL;
2341		2991
2342	our @ISA = CFClient::UI::DrawBG::;	2992	our @ISA = CFPlus::UI::DrawBG::;
2343		2993
2344	my @tex =	2994	my @tex =
2345	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2995	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2346	qw(s1_slider.png s1_slider_bg.png);	2996	qw(s1_slider.png s1_slider_bg.png);
2347		2997
2348	sub new {	2998	sub new {
2349	my $class = shift;	2999	my $class = shift;
2350		3000
…		…
2418		3068
2419	$self->SUPER::invoke_button_down ($ev, $x, $y);	3069	$self->SUPER::invoke_button_down ($ev, $x, $y);
2420		3070
2421	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3071	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2422		3072
2423	$self->invoke_mouse_motion ($ev, $x, $y)	3073	$self->invoke_mouse_motion ($ev, $x, $y);
		3074
		3075	1
2424	}	3076	}
2425		3077
2426	sub invoke_mouse_motion {	3078	sub invoke_mouse_motion {
2427	my ($self, $ev, $x, $y) = @_;	3079	my ($self, $ev, $x, $y) = @_;
2428		3080
…		…
2435		3087
2436	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	3088	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2437	} else {	3089	} else {
2438	return 0;	3090	return 0;
2439	}	3091	}
		3092
		3093	1
		3094	}
		3095
		3096	sub invoke_mouse_wheel {
		3097	my ($self, $ev) = @_;
		3098
		3099	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		3100
		3101	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		3102
		3103	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2440		3104
2441	1	3105	1
2442	}	3106	}
2443		3107
2444	sub update {	3108	sub update {
…		…
2495	glDisable GL_TEXTURE_2D;	3159	glDisable GL_TEXTURE_2D;
2496	}	3160	}
2497		3161
2498	#############################################################################	3162	#############################################################################
2499		3163
2500	package CFClient::UI::ValSlider;	3164	package CFPlus::UI::ValSlider;
2501		3165
2502	our @ISA = CFClient::UI::HBox::;	3166	our @ISA = CFPlus::UI::HBox::;
2503		3167
2504	sub new {	3168	sub new {
2505	my ($class, %arg) = @_;	3169	my ($class, %arg) = @_;
2506		3170
2507	my $range = delete $arg{range};	3171	my $range = delete $arg{range};
2508		3172
2509	my $self = $class->SUPER::new (	3173	my $self = $class->SUPER::new (
2510	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3174	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2511	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3175	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2512	to_value => sub { shift },	3176	to_value => sub { shift },
2513	from_value => sub { shift },	3177	from_value => sub { shift },
2514	%arg,	3178	%arg,
2515	);	3179	);
2516		3180
…		…
2536	sub set_range { shift->{slider}->set_range (@_) }	3200	sub set_range { shift->{slider}->set_range (@_) }
2537	sub set_value { shift->{slider}->set_value (@_) }	3201	sub set_value { shift->{slider}->set_value (@_) }
2538		3202
2539	#############################################################################	3203	#############################################################################
2540		3204
2541	package CFClient::UI::TextScroller;	3205	package CFPlus::UI::TextScroller;
2542		3206
2543	our @ISA = CFClient::UI::HBox::;	3207	our @ISA = CFPlus::UI::HBox::;
2544		3208
2545	use CFClient::OpenGL;	3209	use CFPlus::OpenGL;
2546		3210
2547	sub new {	3211	sub new {
2548	my $class = shift;	3212	my $class = shift;
2549		3213
2550	my $self = $class->SUPER::new (	3214	my $self = $class->SUPER::new (
2551	fontsize => 1,	3215	fontsize => 1,
2552	can_events => 0,	3216	can_events => 1,
2553	indent => 0,	3217	indent => 0,
2554	#font => default_font	3218	#font => default_font
2555	@_,	3219	@_,
2556		3220
2557	layout => (new CFClient::Layout 1),	3221	layout => (new CFPlus::Layout),
2558	par => [],	3222	par => [],
		3223	max_par => 0,
2559	height => 0,	3224	height => 0,
2560	children => [	3225	children => [
2561	(new CFClient::UI::Empty expand => 1),	3226	(new CFPlus::UI::Empty expand => 1),
2562	(new CFClient::UI::Slider vertical => 1),	3227	(new CFPlus::UI::Slider vertical => 1),
2563	],	3228	],
2564	);	3229	);
2565		3230
2566	$self->{children}[1]->connect (changed => sub { $self->update });	3231	$self->{children}[1]->connect (changed => sub { $self->update });
2567		3232
…		…
2576	}	3241	}
2577		3242
2578	sub size_request {	3243	sub size_request {
2579	my ($self) = @_;	3244	my ($self) = @_;
2580		3245
2581	my ($empty, $slider) = @{ $self->{children} };	3246	my ($empty, $slider) = $self->visible_children;
2582		3247
2583	local $self->{children} = [$empty, $slider];	3248	local $self->{children} = [$empty, $slider];
2584	$self->SUPER::size_request	3249	$self->SUPER::size_request
2585	}	3250	}
2586		3251
…		…
2597		3262
2598	$self->reflow;	3263	$self->reflow;
2599		3264
2600	local $self->{children} = [$empty, $slider];	3265	local $self->{children} = [$empty, $slider];
2601	$self->SUPER::invoke_size_allocate ($w, $h)	3266	$self->SUPER::invoke_size_allocate ($w, $h)
		3267	}
		3268
		3269	sub invoke_mouse_wheel {
		3270	my ($self, $ev) = @_;
		3271
		3272	return 0 unless $ev->{dy}; # only vertical movements
		3273
		3274	$self->{children}[1]->emit (mouse_wheel => $ev);
		3275
		3276	1
2602	}	3277	}
2603		3278
2604	sub get_layout {	3279	sub get_layout {
2605	my ($self, $para) = @_;	3280	my ($self, $para) = @_;
2606		3281
…		…
2634		3309
2635	# todo: base offset on lines or so, not on pixels	3310	# todo: base offset on lines or so, not on pixels
2636	$self->{children}[1]->set_value ($offset);	3311	$self->{children}[1]->set_value ($offset);
2637	}	3312	}
2638		3313
		3314	sub current_paragraph {
		3315	my ($self) = @_;
		3316
		3317	$self->{top_paragraph} - 1
		3318	}
		3319
		3320	sub scroll_to {
		3321	my ($self, $para) = @_;
		3322
		3323	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3324
		3325	$self->{scroll_to} = $para;
		3326	$self->update;
		3327	}
		3328
2639	sub clear {	3329	sub clear {
2640	my ($self) = @_;	3330	my ($self) = @_;
2641		3331
2642	my (undef, undef, @other) = @{ $self->{children} };	3332	my (undef, undef, @other) = @{ $self->{children} };
2643	$self->remove ($_) for @other;	3333	$self->remove ($_) for @other;
…		…
2646	$self->{height} = 0;	3336	$self->{height} = 0;
2647	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3337	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2648	}	3338	}
2649		3339
2650	sub add_paragraph {	3340	sub add_paragraph {
2651	my ($self, $color, $para, $indent) = @_;	3341	my $self = shift;
2652		3342
2653	my ($text, @w) = ref $para ? @$para : $para;	3343	for my $para (@_) {
2654
2655	$para = {	3344	$para = {
		3345	fg => [1, 1, 1, 1],
		3346	indent => 0,
		3347	markup => "",
		3348	widget => [],
		3349	ref $para ? %$para : (markup => $para),
2656	w => 1e10,	3350	w => 1e10,
2657	wrapped => 1,	3351	wrapped => 1,
2658	fg => $color,
2659	indent => $indent,
2660	markup => $text,
2661	widget => \@w,
2662	};	3352	};
2663		3353
2664	$self->add (@w) if @w;	3354	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2665	push @{$self->{par}}, $para;	3355	push @{$self->{par}}, $para;
		3356	}
		3357
		3358	if (my $max = $self->{max_par}) {
		3359	shift @{$self->{par}} while @{$self->{par}} > $max;
		3360	}
2666		3361
2667	$self->{need_reflow}++;	3362	$self->{need_reflow}++;
2668	$self->update;	3363	$self->update;
2669	}	3364	}
2670		3365
2671	sub scroll_to_bottom {	3366	sub scroll_to_bottom {
2672	my ($self) = @_;	3367	my ($self) = @_;
2673		3368
2674	$self->{scroll_to_bottom} = 1;	3369	$self->{scroll_to} = $#{$self->{par}};
2675	$self->update;	3370	$self->update;
2676	}	3371	}
2677		3372
		3373	sub force_uptodate {
		3374	my ($self) = @_;
		3375
		3376	if (delete $self->{need_reflow}) {
		3377	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3378
		3379	my $height = 0;
		3380
		3381	for my $para (@{$self->{par}}) {
		3382	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3383	my $layout = $self->get_layout ($para);
		3384	my ($w, $h) = $layout->size;
		3385
		3386	$para->{w} = $w + $para->{indent};
		3387	$para->{h} = $h;
		3388	$para->{wrapped} = $layout->has_wrapped;
		3389	}
		3390
		3391	$para->{y} = $height;
		3392	$height += $para->{h};
		3393	}
		3394
		3395	$self->{height} = $height;
		3396	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3397
		3398	delete $self->{texture};
		3399	}
		3400
		3401	if (my $paridx = delete $self->{scroll_to}) {
		3402	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3403	}
		3404	}
		3405
2678	sub update {	3406	sub update {
2679	my ($self) = @_;	3407	my ($self) = @_;
2680		3408
2681	$self->SUPER::update;	3409	$self->SUPER::update;
2682		3410
2683	return unless $self->{h} > 0;	3411	return unless $self->{h} > 0;
2684		3412
2685	delete $self->{texture};	3413	delete $self->{texture};
2686		3414
2687	$ROOT->on_post_alloc ($self => sub {	3415	$ROOT->on_post_alloc ($self => sub {
		3416	$self->force_uptodate;
		3417
2688	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3418	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2689		3419
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 {	3420	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2718	glClearColor 0, 0, 0, 0;	3421	glClearColor 0, 0, 0, 0;
2719	glClear GL_COLOR_BUFFER_BIT;	3422	glClear GL_COLOR_BUFFER_BIT;
2720		3423
		3424	package CFPlus::UI::Base;
		3425	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3426	(0, 0, $self->{w}, $self->{h});
		3427
		3428	my $top = int $self->{children}[1]{range}[0];
		3429
		3430	my $paridx = 0;
		3431	my $top_paragraph;
2721	my $top = int $self->{children}[1]{range}[0];	3432	my $top = int $self->{children}[1]{range}[0];
2722		3433
2723	my $y0 = $top;	3434	my $y0 = $top;
2724	my $y1 = $top + $H;	3435	my $y1 = $top + $H;
2725		3436
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}}) {	3437	for my $para (@{$self->{par}}) {
2733	my $h = $para->{h};	3438	my $h = $para->{h};
		3439	my $y = $para->{y};
2734		3440
2735	if ($y0 < $y + $h && $y < $y1) {	3441	if ($y0 < $y + $h && $y < $y1) {
2736
2737	my $layout = $self->get_layout ($para);	3442	my $layout = $self->get_layout ($para);
2738		3443
2739	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2740
2741	glRasterPos $para->{indent}, $y - $y0;	3444	$layout->render ($para->{indent}, $y - $y0);
2742	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3445	$layout->draw;
2743		3446
2744	if (my @w = @{ $para->{widget} }) {	3447	if (my @w = @{ $para->{widget} }) {
2745	my @s = $layout->get_shapes;	3448	my @s = $layout->get_shapes;
2746		3449
2747	glDisable GL_BLEND;
2748	for (@w) {	3450	for (@w) {
2749	my ($dx, $dy) = splice @s, 0, 2, ();	3451	my ($dx, $dy) = splice @s, 0, 2, ();
2750		3452
2751	$_->{x} = $dx + $para->{indent};	3453	$_->{x} = $dx + $para->{indent};
2752	$_->{y} = $dy + $y - $y0;	3454	$_->{y} = $dy + $y - $y0;
2753		3455
2754	$_->draw;	3456	$_->draw;
2755	}	3457	}
2756	glEnable GL_BLEND;
2757	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2758	}	3458	}
2759	}	3459	}
2760		3460
2761	$y += $h;	3461	$paridx++;
		3462	$top_paragraph ||= $paridx if $y >= $top;
2762	}	3463	}
2763		3464
2764	glDisable GL_BLEND;	3465	$self->{top_paragraph} = $top_paragraph;
2765	};	3466	};
2766	});	3467	});
2767	}	3468	}
2768		3469
2769	sub reconfigure {	3470	sub reconfigure {
…		…
2787	$self->{children}[1]->draw;	3488	$self->{children}[1]->draw;
2788	}	3489	}
2789		3490
2790	#############################################################################	3491	#############################################################################
2791		3492
2792	package CFClient::UI::Animator;	3493	package CFPlus::UI::Animator;
2793		3494
2794	use CFClient::OpenGL;	3495	use CFPlus::OpenGL;
2795		3496
2796	our @ISA = CFClient::UI::Bin::;	3497	our @ISA = CFPlus::UI::Bin::;
2797		3498
2798	sub moveto {	3499	sub moveto {
2799	my ($self, $x, $y) = @_;	3500	my ($self, $x, $y) = @_;
2800		3501
2801	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3502	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2829	glPopMatrix;	3530	glPopMatrix;
2830	}	3531	}
2831		3532
2832	#############################################################################	3533	#############################################################################
2833		3534
2834	package CFClient::UI::Flopper;	3535	package CFPlus::UI::Flopper;
2835		3536
2836	our @ISA = CFClient::UI::Button::;	3537	our @ISA = CFPlus::UI::Button::;
2837		3538
2838	sub new {	3539	sub new {
2839	my $class = shift;	3540	my $class = shift;
2840		3541
2841	my $self = $class->SUPER::new (	3542	my $self = $class->SUPER::new (
…		…
2853	$self->{other}->toggle_visibility;	3554	$self->{other}->toggle_visibility;
2854	}	3555	}
2855		3556
2856	#############################################################################	3557	#############################################################################
2857		3558
2858	package CFClient::UI::Tooltip;	3559	package CFPlus::UI::Tooltip;
2859		3560
2860	our @ISA = CFClient::UI::Bin::;	3561	our @ISA = CFPlus::UI::Bin::;
2861		3562
2862	use CFClient::OpenGL;	3563	use CFPlus::OpenGL;
2863		3564
2864	sub new {	3565	sub new {
2865	my $class = shift;	3566	my $class = shift;
2866		3567
2867	$class->SUPER::new (	3568	$class->SUPER::new (
…		…
2871	}	3572	}
2872		3573
2873	sub set_tooltip_from {	3574	sub set_tooltip_from {
2874	my ($self, $widget) = @_;	3575	my ($self, $widget) = @_;
2875		3576
2876	my $tooltip = $widget->{tooltip};	3577	my $tip = $widget->{tooltip};
		3578	$tip = $tip->($widget) if "CODE" eq ref $tip;
		3579
		3580	$tip = CFPlus::Pod::section_label tooltip => $1
		3581	if $tip =~ /^#(.*)$/;
2877		3582
2878	if ($ENV{CFPLUS_DEBUG} & 2) {	3583	if ($ENV{CFPLUS_DEBUG} & 2) {
2879	$tooltip .= "\n\n" . (ref $widget) . "\n"	3584	$tip .= "\n\n" . (ref $widget) . "\n"
2880	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3585	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2881	. "req $widget->{req_w} $widget->{req_h}\n"	3586	. "req $widget->{req_w} $widget->{req_h}\n"
2882	. "visible $widget->{visible}";	3587	. "visible $widget->{visible}";
2883	}	3588	}
2884		3589
2885	$tooltip =~ s/^\n+//;	3590	$tip =~ s/^\n+//;
2886	$tooltip =~ s/\n+$//;	3591	$tip =~ s/\n+$//;
2887		3592
2888	$self->add (new CFClient::UI::Label	3593	$self->add (new CFPlus::UI::Label
2889	markup => $tooltip,	3594	markup => $tip,
2890	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3595	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2891	fontsize => 0.8,	3596	fontsize => 0.8,
2892	fg => [0, 0, 0, 1],	3597	style => 1, # FLAG_INVERSE
2893	ellipsise => 0,	3598	ellipsise => 0,
2894	font => ($widget->{tooltip_font} || $::FONT_PROP),	3599	font => ($widget->{tooltip_font} || $::FONT_PROP),
2895	);	3600	);
2896	}	3601	}
2897		3602
…		…
2916		3621
2917	$self->{root}->on_post_alloc ("move_$self" => sub {	3622	$self->{root}->on_post_alloc ("move_$self" => sub {
2918	my $widget = $self->{owner}	3623	my $widget = $self->{owner}
2919	or return;	3624	or return;
2920		3625
		3626	if ($widget->{visible}) {
2921	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3627	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2922		3628
2923	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3629	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2924	if $x + $self->{w} > $self->{root}{w};	3630	if $x + $self->{w} > $self->{root}{w};
2925		3631
2926	$self->move_abs ($x, $y);	3632	$self->move_abs ($x, $y);
		3633	} else {
		3634	$self->hide;
		3635	}
2927	});	3636	});
2928	}	3637	}
2929		3638
2930	sub _draw {	3639	sub _draw {
2931	my ($self) = @_;	3640	my ($self) = @_;
2932		3641
2933	glTranslate 0.375, 0.375;
2934
2935	my ($w, $h) = @$self{qw(w h)};	3642	my ($w, $h) = @$self{qw(w h)};
2936		3643
2937	glColor 1, 0.8, 0.4;	3644	glColor 1, 0.8, 0.4;
2938	glBegin GL_QUADS;	3645	glRect 0, 0, $w, $h;
2939	glVertex 0 , 0;
2940	glVertex 0 , $h;
2941	glVertex $w, $h;
2942	glVertex $w, 0;
2943	glEnd;
2944		3646
2945	glColor 0, 0, 0;	3647	glColor 0, 0, 0;
2946	glBegin GL_LINE_LOOP;	3648	glRect_lineloop .5, .5, $w + .5, $h + .5;
2947	glVertex 0 , 0;
2948	glVertex 0 , $h;
2949	glVertex $w, $h;
2950	glVertex $w, 0;
2951	glEnd;
2952		3649
2953	glTranslate 2 - 0.375, 2 - 0.375;	3650	glTranslate 2, 2;
2954		3651
2955	$self->SUPER::_draw;	3652	$self->SUPER::_draw;
2956	}	3653	}
2957		3654
2958	#############################################################################	3655	#############################################################################
2959		3656
2960	package CFClient::UI::Face;	3657	package CFPlus::UI::Face;
2961		3658
2962	our @ISA = CFClient::UI::Base::;	3659	our @ISA = CFPlus::UI::DrawBG::;
2963		3660
2964	use CFClient::OpenGL;	3661	use CFPlus::OpenGL;
2965		3662
2966	sub new {	3663	sub new {
2967	my $class = shift;	3664	my $class = shift;
2968		3665
2969	my $self = $class->SUPER::new (	3666	my $self = $class->SUPER::new (
		3667	size_w => 32,
		3668	size_h => 8,
2970	aspect => 1,	3669	aspect => 1,
2971	can_events => 0,	3670	can_events => 0,
2972	@_,	3671	@_,
2973	);	3672	);
2974		3673
2975	if ($self->{anim} && $self->{animspeed}) {	3674	if ($self->{anim} && $self->{animspeed}) {
2976	Scalar::Util::weaken (my $widget = $self);	3675	CFPlus::weaken (my $widget = $self);
2977		3676
		3677	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3678	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2978	$self->{timer} = Event->timer (	3679	$self->{timer} = Event->timer (
2979	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2980	hard => 1,	3680	parked => 1,
2981	interval => $self->{animspeed},
2982	cb => sub {	3681	cb => sub {
		3682	return unless $::CONN;
		3683
		3684	my $w = $widget
		3685	or return;
		3686
2983	++$widget->{frame};	3687	++$w->{frame};
		3688	$w->update_face;
		3689
		3690	# somehow, $widget can go away
2984	$widget->update;	3691	$w->update;
		3692	$w->update_timer;
2985	},	3693	},
2986	);	3694	);
		3695
		3696	$self->update_face;
		3697	$self->update_timer;
2987	}	3698	}
2988		3699
2989	$self	3700	$self
2990	}	3701	}
2991		3702
		3703	sub update_timer {
		3704	my ($self) = @_;
		3705
		3706	return unless $self->{timer};
		3707
		3708	if ($self->{visible}) {
		3709	$self->{timer}->at (
		3710	$self->{anim_start}
		3711	+ $self->{animspeed}
		3712	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3713	);
		3714	$self->{timer}->start;
		3715	} else {
		3716	$self->{timer}->stop;
		3717	}
		3718	}
		3719
		3720	sub update_face {
		3721	my ($self) = @_;
		3722
		3723	if ($::CONN) {
		3724	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3725	if ($anim && @$anim) {
		3726	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3727	delete $self->{face_change_cb};
		3728
		3729	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3730	unless ($tex->{name} || $tex->{loading}) {
		3731	$tex->upload (sub { $self->reconfigure });
		3732	}
		3733	}
		3734	}
		3735	}
		3736	}
		3737	}
		3738
2992	sub size_request {	3739	sub size_request {
2993	(32, 8)	3740	my ($self) = @_;
		3741
		3742	if ($::CONN) {
		3743	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3744	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3745	if ($tex->{name}) {
		3746	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3747	} elsif (!$tex->{loading}) {
		3748	$tex->upload (sub { $self->reconfigure });
		3749	}
		3750	}
		3751
		3752	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3753	}
		3754	}
		3755
		3756	($self->{size_w} || 8, $self->{size_h} || 8)
2994	}	3757	}
2995		3758
2996	sub update {	3759	sub update {
2997	my ($self) = @_;	3760	my ($self) = @_;
2998		3761
2999	return unless $self->{visible};	3762	return unless $self->{visible};
3000		3763
3001	$self->SUPER::update;	3764	$self->SUPER::update;
3002	}	3765	}
3003		3766
		3767	sub invoke_visibility_change {
		3768	my ($self) = @_;
		3769
		3770	$self->update_timer;
		3771
		3772	0
		3773	}
		3774
3004	sub _draw {	3775	sub _draw {
3005	my ($self) = @_;	3776	my ($self) = @_;
3006		3777
3007	return unless $::CONN;	3778	$self->SUPER::_draw;
3008		3779
3009	my $face;	3780	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;	3781	glEnable GL_TEXTURE_2D;
3022	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3782	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3023	glColor 0, 0, 0, 1;	3783	glColor 0, 0, 0, 1;
3024	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3784	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3025	glDisable GL_TEXTURE_2D;	3785	glDisable GL_TEXTURE_2D;
…		…
3027	}	3787	}
3028		3788
3029	sub destroy {	3789	sub destroy {
3030	my ($self) = @_;	3790	my ($self) = @_;
3031		3791
3032	$self->{timer}->cancel	3792	(delete $self->{timer})->cancel
3033	if $self->{timer};	3793	if $self->{timer};
3034		3794
3035	$self->SUPER::destroy;	3795	$self->SUPER::destroy;
3036	}	3796	}
3037		3797
3038	#############################################################################	3798	#############################################################################
3039		3799
3040	package CFClient::UI::Buttonbar;	3800	package CFPlus::UI::Buttonbar;
3041		3801
3042	our @ISA = CFClient::UI::HBox::;	3802	our @ISA = CFPlus::UI::HBox::;
3043		3803
3044	# TODO: should actualyl wrap buttons and other goodies.	3804	# TODO: should actually wrap buttons and other goodies.
3045		3805
3046	#############################################################################	3806	#############################################################################
3047		3807
3048	package CFClient::UI::Menu;	3808	package CFPlus::UI::Menu;
3049		3809
3050	our @ISA = CFClient::UI::FancyFrame::;	3810	our @ISA = CFPlus::UI::Toplevel::;
3051		3811
3052	use CFClient::OpenGL;	3812	use CFPlus::OpenGL;
3053		3813
3054	sub new {	3814	sub new {
3055	my $class = shift;	3815	my $class = shift;
3056		3816
3057	my $self = $class->SUPER::new (	3817	my $self = $class->SUPER::new (
3058	items => [],	3818	items => [],
3059	z => 100,	3819	z => 100,
3060	@_,	3820	@_,
3061	);	3821	);
3062		3822
3063	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3823	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3064		3824
3065	for my $item (@{ $self->{items} }) {	3825	for my $item (@{ $self->{items} }) {
3066	my ($widget, $cb, $tooltip) = @$item;	3826	my ($widget, $cb, $tooltip) = @$item;
3067		3827
3068	# handle various types of items, only text for now	3828	# handle various types of items, only text for now
3069	if (!ref $widget) {	3829	if (!ref $widget) {
		3830	if ($widget =~ /\t/) {
		3831	my ($left, $right) = split /\t/, $widget, 2;
		3832
3070	$widget = new CFClient::UI::Label	3833	$widget = new CFPlus::UI::HBox
3071	can_hover => 1,	3834	can_hover => 1,
3072	can_events => 1,	3835	can_events => 1,
		3836	tooltip => $tooltip,
		3837	children => [
		3838	(new CFPlus::UI::Label markup => $left, expand => 1),
		3839	(new CFPlus::UI::Label markup => $right, align => +1),
		3840	],
		3841	;
		3842
		3843	} else {
		3844	$widget = new CFPlus::UI::Label
		3845	can_hover => 1,
		3846	can_events => 1,
3073	markup => $widget,	3847	markup => $widget,
3074	tooltip => $tooltip	3848	tooltip => $tooltip;
		3849	}
3075	}	3850	}
3076		3851
3077	$self->{item}{$widget} = $item;	3852	$self->{item}{$widget} = $item;
3078		3853
3079	$self->{vbox}->add ($widget);	3854	$self->{vbox}->add ($widget);
…		…
3122	1	3897	1
3123	}	3898	}
3124		3899
3125	#############################################################################	3900	#############################################################################
3126		3901
3127	package CFClient::UI::Multiplexer;	3902	package CFPlus::UI::Multiplexer;
3128		3903
3129	our @ISA = CFClient::UI::Container::;	3904	our @ISA = CFPlus::UI::Container::;
3130		3905
3131	sub new {	3906	sub new {
3132	my $class = shift;	3907	my $class = shift;
3133		3908
3134	my $self = $class->SUPER::new (	3909	my $self = $class->SUPER::new (
…		…
3148		3923
3149	$self->{current} = $self->{children}[0]	3924	$self->{current} = $self->{children}[0]
3150	if @{ $self->{children} };	3925	if @{ $self->{children} };
3151	}	3926	}
3152		3927
		3928	sub get_current_page {
		3929	my ($self) = @_;
		3930
		3931	$self->{current}
		3932	}
		3933
3153	sub set_current_page {	3934	sub set_current_page {
3154	my ($self, $page_or_widget) = @_;	3935	my ($self, $page_or_widget) = @_;
3155		3936
3156	my $widget = ref $page_or_widget	3937	my $widget = ref $page_or_widget
3157	? $page_or_widget	3938	? $page_or_widget
…		…
3189	$self->{current}->draw;	3970	$self->{current}->draw;
3190	}	3971	}
3191		3972
3192	#############################################################################	3973	#############################################################################
3193		3974
3194	package CFClient::UI::Notebook;	3975	package CFPlus::UI::Notebook;
3195		3976
		3977	use CFPlus::OpenGL;
		3978
3196	our @ISA = CFClient::UI::VBox::;	3979	our @ISA = CFPlus::UI::VBox::;
3197		3980
3198	sub new {	3981	sub new {
3199	my $class = shift;	3982	my $class = shift;
3200		3983
3201	my $self = $class->SUPER::new (	3984	my $self = $class->SUPER::new (
3202	buttonbar => (new CFClient::UI::Buttonbar),	3985	buttonbar => (new CFPlus::UI::Buttonbar),
3203	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3986	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3987	active_outline => [.7, .7, 0.2],
3204	# filter => # will be put between multiplexer and $self	3988	# filter => # will be put between multiplexer and $self
3205	@_,	3989	@_,
3206	);	3990	);
3207		3991
3208	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3992	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3209	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3993	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3210		3994
		3995	{
		3996	Scalar::Util::weaken (my $wself = $self);
		3997
		3998	$self->{multiplexer}->connect (c_add => sub {
		3999	my ($mplex, $widgets) = @_;
		4000
		4001	for my $child (@$widgets) {
		4002	Scalar::Util::weaken $child;
		4003	$child->{c_tab_} ||= do {
		4004	my $tab =
		4005	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		4006	? $child->{c_tab}
		4007	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		4008
		4009	$tab->connect (activate => sub {
		4010	$wself->set_current_page ($child);
		4011	});
		4012
		4013	$tab
		4014	};
		4015
		4016	$self->{buttonbar}->add ($child->{c_tab_});
		4017	}
		4018	});
		4019
		4020	$self->{multiplexer}->connect (c_remove => sub {
		4021	my ($mplex, $widgets) = @_;
		4022
		4023	for my $child (@$widgets) {
		4024	$wself->{buttonbar}->remove ($child->{c_tab_});
		4025	}
		4026	});
		4027	}
		4028
3211	$self	4029	$self
3212	}	4030	}
3213		4031
3214	sub add {	4032	sub add {
		4033	my ($self, @widgets) = @_;
		4034
		4035	$self->{multiplexer}->add (@widgets)
		4036	}
		4037
		4038	sub remove {
		4039	my ($self, @widgets) = @_;
		4040
		4041	$self->{multiplexer}->remove (@widgets)
		4042	}
		4043
		4044	sub pages {
		4045	my ($self) = @_;
		4046	$self->{multiplexer}->children
		4047	}
		4048
		4049	sub add_tab {
3215	my ($self, $title, $widget, $tooltip) = @_;	4050	my ($self, $title, $widget, $tooltip) = @_;
3216		4051
3217	Scalar::Util::weaken $self;	4052	$title = [$title, $tooltip] unless ref $title;
		4053	$widget->{c_tab} = $title;
3218		4054
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);	4055	$self->add ($widget);
		4056	}
		4057
		4058	sub get_current_page {
		4059	my ($self) = @_;
		4060
		4061	$self->{multiplexer}->get_current_page
3226	}	4062	}
3227		4063
3228	sub set_current_page {	4064	sub set_current_page {
3229	my ($self, $page) = @_;	4065	my ($self, $page) = @_;
3230		4066
3231	$self->{multiplexer}->set_current_page ($page);	4067	$self->{multiplexer}->set_current_page ($page);
3232	$self->emit (page_changed => $self->{multiplexer}{current});	4068	$self->emit (page_changed => $self->{multiplexer}{current});
3233	}	4069	}
3234		4070
		4071	sub _draw {
		4072	my ($self) = @_;
		4073
		4074	$self->SUPER::_draw ();
		4075
		4076	if (my $cur = $self->{multiplexer}{current}) {
		4077	if ($cur = $cur->{c_tab_}) {
		4078	glTranslate $self->{buttonbar}{x} + $cur->{x},
		4079	$self->{buttonbar}{y} + $cur->{y};
		4080	glLineWidth 3;
		4081	#glEnable GL_BLEND;
		4082	#glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		4083	glColor @{$self->{active_outline}};
		4084	glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
		4085	glLineWidth 1;
		4086	#glDisable GL_BLEND;
		4087	}
		4088	}
		4089	}
		4090
3235	#############################################################################	4091	#############################################################################
3236		4092
3237	package CFClient::UI::Combobox;	4093	package CFPlus::UI::Selector;
3238		4094
3239	use utf8;	4095	use utf8;
3240		4096
3241	our @ISA = CFClient::UI::Button::;	4097	our @ISA = CFPlus::UI::Button::;
3242		4098
3243	sub new {	4099	sub new {
3244	my $class = shift;	4100	my $class = shift;
3245		4101
3246	my $self = $class->SUPER::new (	4102	my $self = $class->SUPER::new (
…		…
3263	my ($value, $title, $tooltip) = @$_;	4119	my ($value, $title, $tooltip) = @$_;
3264		4120
3265	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	4121	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3266	}	4122	}
3267		4123
3268	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	4124	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3269	}	4125	}
3270		4126
3271	sub _set_value {	4127	sub _set_value {
3272	my ($self, $value) = @_;	4128	my ($self, $value) = @_;
3273		4129
3274	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }	4130	my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
		4131	$item ||= $self->{options}[0]
3275	or return;	4132	or return;
3276		4133
3277	$self->{value} = $item->[0];	4134	$self->{value} = $item->[0];
3278	$self->set_markup ("$item->[1] ⇓");	4135	$self->set_markup ("$item->[1] ⇓");
3279	$self->set_tooltip ($item->[2]);	4136	# $self->set_tooltip ($item->[2]);
3280	}	4137	}
3281		4138
3282	sub set_value {	4139	sub set_value {
3283	my ($self, $value) = @_;	4140	my ($self, $value) = @_;
3284		4141
…		…
3286		4143
3287	$self->_set_value ($value);	4144	$self->_set_value ($value);
3288	$self->emit (changed => $value);	4145	$self->emit (changed => $value);
3289	}	4146	}
3290		4147
		4148	sub set_options {
		4149	my ($self, $options) = @_;
		4150
		4151	$self->{options} = $options;
		4152	$self->_set_value ($self->{value});
		4153	}
		4154
3291	#############################################################################	4155	#############################################################################
3292		4156
3293	package CFClient::UI::Statusbox;	4157	package CFPlus::UI::Statusbox;
3294		4158
3295	our @ISA = CFClient::UI::VBox::;	4159	our @ISA = CFPlus::UI::VBox::;
3296		4160
3297	sub new {	4161	sub new {
3298	my $class = shift;	4162	my $class = shift;
3299		4163
3300	my $self = $class->SUPER::new (	4164	my $self = $class->SUPER::new (
3301	fontsize => 0.8,	4165	fontsize => 0.8,
3302	@_,	4166	@_,
3303	);	4167	);
3304		4168
3305	Scalar::Util::weaken (my $this = $self);	4169	CFPlus::weaken (my $this = $self);
3306		4170
3307	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4171	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3308		4172
3309	$self	4173	$self
3310	}	4174	}
…		…
3312	sub reorder {	4176	sub reorder {
3313	my ($self) = @_;	4177	my ($self) = @_;
3314	my $NOW = Time::HiRes::time;	4178	my $NOW = Time::HiRes::time;
3315		4179
3316	# freeze display when hovering over any label	4180	# freeze display when hovering over any label
3317	return if $CFClient::UI::TOOLTIP->{owner}	4181	return if $CFPlus::UI::TOOLTIP->{owner}
3318	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	4182	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3319	values %{ $self->{item} };	4183	values %{ $self->{item} };
3320		4184
3321	while (my ($k, $v) = each %{ $self->{item} }) {	4185	while (my ($k, $v) = each %{ $self->{item} }) {
3322	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4186	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3323	}	4187	}
…		…
3344	for ($short) {	4208	for ($short) {
3345	s/^\s+//;	4209	s/^\s+//;
3346	s/\s+/ /g;	4210	s/\s+/ /g;
3347	}	4211	}
3348		4212
3349	new CFClient::UI::Label	4213	new CFPlus::UI::Label
3350	markup => $short,	4214	markup => $short,
3351	tooltip => $item->{tooltip},	4215	tooltip => $item->{tooltip},
3352	tooltip_font => $::FONT_PROP,	4216	tooltip_font => $::FONT_PROP,
3353	tooltip_width => 0.67,	4217	tooltip_width => 0.67,
3354	fontsize => $item->{fontsize} || $self->{fontsize},	4218	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3408	count => 1,	4272	count => 1,
3409	%arg,	4273	%arg,
3410	};	4274	};
3411	}	4275	}
3412		4276
		4277	$ROOT->on_refresh (reorder => sub {
3413	$self->reorder;	4278	$self->reorder;
		4279	});
3414	}	4280	}
3415		4281
3416	sub reconfigure {	4282	sub reconfigure {
3417	my ($self) = @_;	4283	my ($self) = @_;
3418		4284
…		…
3431	$self->SUPER::destroy;	4297	$self->SUPER::destroy;
3432	}	4298	}
3433		4299
3434	#############################################################################	4300	#############################################################################
3435		4301
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;	4302	package CFPlus::UI::Root;
3809		4303
3810	our @ISA = CFClient::UI::Container::;	4304	our @ISA = CFPlus::UI::Container::;
3811		4305
3812	use List::Util qw(min max);	4306	use List::Util qw(min max);
3813		4307
3814	use CFClient::OpenGL;	4308	use CFPlus::OpenGL;
3815		4309
3816	sub new {	4310	sub new {
3817	my $class = shift;	4311	my $class = shift;
3818		4312
3819	my $self = $class->SUPER::new (	4313	my $self = $class->SUPER::new (
3820	visible => 1,	4314	visible => 1,
3821	@_,	4315	@_,
3822	);	4316	);
3823		4317
3824	Scalar::Util::weaken ($self->{root} = $self);	4318	CFPlus::weaken ($self->{root} = $self);
3825		4319
3826	$self	4320	$self
3827	}	4321	}
3828		4322
3829	sub size_request {	4323	sub size_request {
…		…
3877	}	4371	}
3878		4372
3879	sub update {	4373	sub update {
3880	my ($self) = @_;	4374	my ($self) = @_;
3881		4375
3882	$::WANT_REFRESH++;	4376	$::WANT_REFRESH->start;
3883	}	4377	}
3884		4378
3885	sub add {	4379	sub add {
3886	my ($self, @children) = @_;	4380	my ($self, @children) = @_;
3887		4381
…		…
3924	while ($self->{refresh_hook}) {	4418	while ($self->{refresh_hook}) {
3925	$_->()	4419	$_->()
3926	for values %{delete $self->{refresh_hook}};	4420	for values %{delete $self->{refresh_hook}};
3927	}	4421	}
3928		4422
3929	if ($self->{realloc}) {	4423	while ($self->{realloc}) {
3930	my %queue;	4424	my %queue;
3931	my @queue;	4425	my @queue;
3932	my $widget;	4426	my $widget;
3933		4427
3934	outer:	4428	outer:
…		…
3981	}	4475	}
3982	}	4476	}
3983		4477
3984	delete $self->{realloc}{$widget+0};	4478	delete $self->{realloc}{$widget+0};
3985	}	4479	}
3986	}
3987		4480
3988	while (my $size_alloc = delete $self->{size_alloc}) {	4481	while (my $size_alloc = delete $self->{size_alloc}) {
3989	my @queue = sort { $b->{visible} <=> $a->{visible} }	4482	my @queue = sort { $a->{visible} <=> $b->{visible} }
3990	values %$size_alloc;	4483	values %$size_alloc;
3991		4484
3992	while () {	4485	while () {
3993	my $widget = pop @queue || last;	4486	my $widget = pop @queue || last;
3994		4487
3995	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4488	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3996		4489
3997	$w = 0 if $w < 0;	4490	$w = max $widget->{min_w}, $w;
3998	$h = 0 if $h < 0;	4491	$h = max $widget->{min_h}, $h;
3999		4492
		4493	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4494	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4495
		4496	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4497	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4498
4000	$w = int $w + 0.5;	4499	$w = int $w + 0.5;
4001	$h = int $h + 0.5;	4500	$h = int $h + 0.5;
4002		4501
4003	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4502	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4004	$widget->{old_w} = $widget->{w};	4503	$widget->{old_w} = $widget->{w};
4005	$widget->{old_h} = $widget->{h};	4504	$widget->{old_h} = $widget->{h};
4006		4505
4007	$widget->{w} = $w;	4506	$widget->{w} = $w;
4008	$widget->{h} = $h;	4507	$widget->{h} = $h;
4009		4508
4010	$widget->emit (size_allocate => $w, $h);	4509	$widget->emit (size_allocate => $w, $h);
		4510	}
4011	}	4511	}
4012	}	4512	}
4013	}	4513	}
4014		4514
4015	while ($self->{post_alloc_hook}) {	4515	while ($self->{post_alloc_hook}) {
4016	$_->()	4516	$_->()
4017	for values %{delete $self->{post_alloc_hook}};	4517	for values %{delete $self->{post_alloc_hook}};
4018	}	4518	}
4019
4020		4519
4021	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4520	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4022	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4521	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4023	glClear GL_COLOR_BUFFER_BIT;	4522	glClear GL_COLOR_BUFFER_BIT;
4024		4523
…		…
4027	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4526	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4028	glMatrixMode GL_MODELVIEW;	4527	glMatrixMode GL_MODELVIEW;
4029	glLoadIdentity;	4528	glLoadIdentity;
4030		4529
4031	{	4530	{
4032	package CFClient::UI::Base;	4531	package CFPlus::UI::Base;
4033		4532
4034	($draw_x, $draw_y, $draw_w, $draw_h) =	4533	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4035	(0, 0, $self->{w}, $self->{h});	4534	(0, 0, $self->{w}, $self->{h});
4036	}
4037		4535
4038	$self->_draw;	4536	$self->_draw;
		4537	}
4039	}	4538	}
4040		4539
4041	#############################################################################	4540	#############################################################################
4042		4541
4043	package CFClient::UI;	4542	package CFPlus::UI;
4044		4543
4045	$ROOT = new CFClient::UI::Root;	4544	$ROOT = new CFPlus::UI::Root;
4046	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4545	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4047		4546
4048	1	4547	1
4049		4548

Diff Legend

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