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

Diff Legend

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