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

Diff Legend

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