ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.310 by root, Fri Jun 23 20:28:20 2006 UTC vs.
Revision 1.436 by root, Wed Aug 22 21:40:57 2007 UTC

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

Diff Legend

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