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.291 by root, Tue Jun 6 02:55:50 2006 UTC vs.
Revision 1.435 by root, Wed Aug 22 21:40:43 2007 UTC

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

Diff Legend

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