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

Diff Legend

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