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

Diff Legend

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