ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.158 by root, Mon Apr 24 02:41:48 2006 UTC vs.
Revision 1.265 by root, Thu Jun 1 02:59:46 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
14our $LAYOUT;
12our $ROOT; 15our $ROOT;
13our $TOOLTIP; 16our $TOOLTIP;
14our $BUTTON_STATE; 17our $BUTTON_STATE;
15 18
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
16sub check_tooltip { 44sub check_tooltip {
17 if (!$GRAB) { 45 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (exists $widget->{tooltip}) { 47 if (length $widget->{tooltip}) {
20 48
21 if ($TOOLTIP->{owner} != $widget) { 49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
22 $TOOLTIP->{owner} = $widget; 52 $TOOLTIP->{owner} = $widget;
23 53
24 my $tip = $widget->{tooltip}; 54 my $tip = $widget->{tooltip};
25 55
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 56 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 57
28 $TOOLTIP->set_text ($widget->{tooltip}); 58 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 59 $TOOLTIP->show;
31 } 60 }
32 61
33 return; 62 return;
34 } 63 }
… …
39 delete $TOOLTIP->{owner}; 68 delete $TOOLTIP->{owner};
40} 69}
41 70
42# class methods for events 71# class methods for events
43sub feed_sdl_key_down_event { 72sub feed_sdl_key_down_event {
44 $FOCUS->key_down ($_[0]) if $FOCUS; 73 $FOCUS->emit (key_down => $_[0])
74 if $FOCUS;
45} 75}
46 76
47sub feed_sdl_key_up_event { 77sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 78 $FOCUS->emit (key_up => $_[0])
79 if $FOCUS;
49} 80}
50 81
51sub feed_sdl_button_down_event { 82sub feed_sdl_button_down_event {
52 my ($ev) = @_; 83 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 84 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
61 check_tooltip; 92 check_tooltip;
62 } 93 }
63 94
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 95 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 96
66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
98 if $GRAB;
67} 99}
68 100
69sub feed_sdl_button_up_event { 101sub feed_sdl_button_up_event {
70 my ($ev) = @_; 102 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 103 my ($x, $y) = ($ev->{x}, $ev->{y});
72 104
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 105 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 106
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 107 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 108
77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 109 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
110 if $GRAB;
78 111
79 if (!$BUTTON_STATE) { 112 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 113 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 114 $grab->update if $grab;
82 $GRAB->update if $GRAB; 115 $GRAB->update if $GRAB;
… …
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 131 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 132
100 check_tooltip; 133 check_tooltip;
101 } 134 }
102 135
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
137 if $HOVER;
104} 138}
105 139
106# convert position array to integers 140# convert position array to integers
107sub harmonize { 141sub harmonize {
108 my ($vals) = @_; 142 my ($vals) = @_;
… …
114 $rem += $_ - $i; 148 $rem += $_ - $i;
115 $_ = $i; 149 $_ = $i;
116 } 150 }
117} 151}
118 152
153sub full_refresh {
154 # make a copy, otherwise for complains about freed values.
155 my @widgets = values %WIDGET;
156
157 $_->update
158 for @widgets;
159}
160
161sub reconfigure_widgets {
162 # make a copy, otherwise C<for> complains about freed values.
163 my @widgets = values %WIDGET;
164
165 $_->reconfigure
166 for @widgets;
167}
168
169# call when resolution changes etc.
170sub rescale_widgets {
171 my ($sx, $sy) = @_;
172
173 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177
178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187
188 }
189 }
190
191 reconfigure_widgets;
192}
193
119############################################################################# 194#############################################################################
120 195
121package CFClient::UI::Base; 196package CFClient::UI::Base;
122 197
123use strict; 198use strict;
… …
126 201
127sub new { 202sub new {
128 my $class = shift; 203 my $class = shift;
129 204
130 my $self = bless { 205 my $self = bless {
131 x => 0, 206 x => "center",
132 y => 0, 207 y => "center",
133 z => 0, 208 z => 0,
209 w => undef,
210 h => undef,
134 can_events => 1, 211 can_events => 1,
135 @_ 212 @_
136 }, $class; 213 }, $class;
137 214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
216
138 for (keys %$self) { 217 for (keys %$self) {
139 if (/^connect_(.*)$/) { 218 if (/^on_(.*)$/) {
140 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
141 } 220 }
142 } 221 }
143 222
223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
228
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231
232 $self->show if $layout->{show};
233 }
234
144 $self 235 $self
145} 236}
146 237
238sub destroy {
239 my ($self) = @_;
240
241 $self->hide;
242 %$self = ();
243}
244
147sub show { 245sub show {
148 my ($self) = @_; 246 my ($self) = @_;
149 247
150 return if $self->{parent}; 248 return if $self->{parent};
151 249
152 $CFClient::UI::ROOT->add ($self); 250 $CFClient::UI::ROOT->add ($self);
153} 251}
154 252
253sub set_visible {
254 my ($self) = @_;
255
256 return if $self->{visible};
257
258 $self->{root} = $self->{parent}{root};
259 $self->{visible} = $self->{parent}{visible} + 1;
260
261 $self->emit (visibility_change => 1);
262
263 $self->realloc if !exists $self->{req_w};
264
265 $_->set_visible for $self->children;
266}
267
268sub set_invisible {
269 my ($self) = @_;
270
271 return unless $self->{visible};
272
273 $_->set_invisible for $self->children;
274
275 delete $self->{root};
276 delete $self->{visible};
277
278 undef $GRAB if $GRAB == $self;
279 undef $HOVER if $HOVER == $self;
280
281 CFClient::UI::check_tooltip
282 if $TOOLTIP->{owner} == $self;
283
284 $self->focus_out;
285
286 $self->emit (visibility_change => 0);
287}
288
289sub set_visibility {
290 my ($self, $visible) = @_;
291
292 return if $self->{visible} == $visible;
293
294 $visible ? $self->hide
295 : $self->show;
296}
297
298sub toggle_visibility {
299 my ($self) = @_;
300
301 $self->{visible}
302 ? $self->hide
303 : $self->show;
304}
305
155sub hide { 306sub hide {
156 my ($self) = @_; 307 my ($self) = @_;
157 308
158 return unless $self->{parent}; 309 $self->set_invisible;
159 310
160 $self->{parent}->remove ($self); 311 $self->{parent}->remove ($self)
312 if $self->{parent};
161} 313}
162 314
163sub move { 315sub move_abs {
164 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
165 317
166 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
167 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
168 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
169 321
170 $self->update; 322 $self->update;
171} 323}
172 324
173sub set_size { 325sub set_size {
174 my ($self, $w, $h) = @_; 326 my ($self, $w, $h) = @_;
175 327
176 $self->{user_w} = $w; 328 $self->{force_w} = $w;
177 $self->{user_h} = $h; 329 $self->{force_h} = $h;
178 330
179 $self->check_size; 331 $self->realloc;
180} 332}
181 333
182sub size_request { 334sub size_request {
183 require Carp; 335 require Carp;
184 Carp::confess "size_request is abstract"; 336 Carp::confess "size_request is abstract";
… …
186 338
187sub configure { 339sub configure {
188 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
189 341
190 if ($self->{aspect}) { 342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
191 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 345 $w = List::Util::min $w, int $h * $self->{aspect};
192 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 346 $h = List::Util::min $h, int $w / $self->{aspect};
193 347
194 # use alignment to adjust x, y 348 # use alignment to adjust x, y
195 349
196 $x += int +($w - $w2) * 0.5; 350 $x += int 0.5 * ($ow - $w);
197 $y += int +($h - $h2) * 0.5; 351 $y += int 0.5 * ($oh - $h);
198
199 ($w, $h) = ($w2, $h2);
200 } 352 }
201 353
202 if ($self->{x} != $x || $self->{y} != $y) { 354 if ($self->{x} ne $x || $self->{y} ne $y) {
203 $self->{x} = $x; 355 $self->{x} = $x;
204 $self->{y} = $y; 356 $self->{y} = $y;
205 $self->update; 357 $self->update;
206 } 358 }
207 359
208 if ($self->{w} != $w || $self->{h} != $h) { 360 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
361 return unless $self->{visible};
362
209 $self->{w} = $w; 363 $self->{alloc_w} = $w;
210 $self->{h} = $h; 364 $self->{alloc_h} = $h;
211 365
212 $self->size_allocate ($w, $h); 366 $self->{root}{size_alloc}{$self+0} = $self;
213 $self->update;
214 } 367 }
215} 368}
216 369
217sub size_allocate { 370sub size_allocate {
218 # nothing to be done 371 # nothing to be done
219} 372}
220 373
374sub children {
375}
376
221sub set_max_size { 377sub set_max_size {
222 my ($self, $w, $h) = @_; 378 my ($self, $w, $h) = @_;
223 379
224 delete $self->{max_w}; $self->{max_w} = $w if $w; 380 delete $self->{max_w}; $self->{max_w} = $w if $w;
225 delete $self->{max_h}; $self->{max_h} = $h if $h; 381 delete $self->{max_h}; $self->{max_h} = $h if $h;
226} 382}
227 383
228# return top left coordinates 384sub set_tooltip {
229sub _topleft {
230 my ($self, $x, $y) = @_; 385 my ($self, $tooltip) = @_;
231 386
232 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 387 $tooltip =~ s/^\s+//;
388 $tooltip =~ s/\s+$//;
389
390 return if $self->{tooltip} eq $tooltip;
391
392 $self->{tooltip} = $tooltip;
393
394 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
395 delete $CFClient::UI::TOOLTIP->{owner};
396 CFClient::UI::check_tooltip;
397 }
233} 398}
234 399
235# translate global coordinates to local coordinate system 400# translate global coordinates to local coordinate system
236sub coord2local { 401sub coord2local {
237 my ($self, $x, $y) = @_; 402 my ($self, $x, $y) = @_;
238 403
239 my ($X, $Y) = $self->_topleft; 404 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
240 ($x - $X, $y - $Y)
241} 405}
242 406
243# translate local coordinates to global coordinate system 407# translate local coordinates to global coordinate system
244sub coord2global { 408sub coord2global {
245 my ($self, $x, $y) = @_; 409 my ($self, $x, $y) = @_;
246 410
247 my ($X, $Y) = $self->_topleft; 411 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
248 ($x + $X, $y + $Y)
249} 412}
250 413
251sub focus_in { 414sub focus_in {
252 my ($self) = @_; 415 my ($self) = @_;
253 416
254 return if $FOCUS == $self; 417 return if $FOCUS == $self;
255 return unless $self->{can_focus}; 418 return unless $self->{can_focus};
256 419
257 my $focus = $FOCUS; $FOCUS = $self; 420 my $focus = $FOCUS; $FOCUS = $self;
258 421
259 $self->emit (focus_in => $focus); 422 $self->_emit (focus_in => $focus);
260 423
261 $focus->update if $focus; 424 $focus->update if $focus;
262 $FOCUS->update; 425 $FOCUS->update;
263} 426}
264 427
… …
267 430
268 return unless $FOCUS == $self; 431 return unless $FOCUS == $self;
269 432
270 my $focus = $FOCUS; undef $FOCUS; 433 my $focus = $FOCUS; undef $FOCUS;
271 434
272 $self->emit (focus_out => $focus); 435 $self->_emit (focus_out => $focus);
273 436
274 $focus->update if $focus; #? 437 $focus->update if $focus; #?
438
439 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
440 unless $FOCUS;
275} 441}
276 442
277sub mouse_motion { } 443sub mouse_motion { }
278sub button_up { } 444sub button_up { }
279sub key_down { } 445sub key_down { }
280sub key_up { } 446sub key_up { }
281 447
282sub button_down { 448sub button_down {
283 my ($self, $ev, $x, $y) = @_; 449 my ($self, $ev, $x, $y) = @_;
284 450
285 $self->focus_in; 451 $self->focus_in;
… …
288sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
289sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
290sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
291sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
292sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 458sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
459
460sub find_widget {
461 my ($self, $x, $y) = @_;
462
463 return () unless $self->{can_events};
464
465 return $self
466 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
467 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
468
469 ()
470}
471
472sub set_parent {
473 my ($self, $parent) = @_;
474
475 Scalar::Util::weaken ($self->{parent} = $parent);
476 $self->set_visible if $parent->{visible};
477}
478
479sub connect {
480 my ($self, $signal, $cb) = @_;
481
482 push @{ $self->{signal_cb}{$signal} }, $cb;
483}
484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
491sub emit {
492 my ($self, $signal, @args) = @_;
493
494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
496}
497
498sub visibility_change {
499 #my ($self, $visible) = @_;
500}
501
502sub realloc {
503 my ($self) = @_;
504
505 if ($self->{visible}) {
506 return if $self->{root}{realloc}{$self+0};
507
508 $self->{root}{realloc}{$self+0} = $self;
509 $self->{root}->update;
510 } else {
511 delete $self->{req_w};
512 delete $self->{req_h};
513 }
514}
515
516sub update {
517 my ($self) = @_;
518
519 $self->{parent}->update
520 if $self->{parent};
521}
522
523sub reconfigure {
524 my ($self) = @_;
525
526 $self->realloc;
527 $self->update;
528}
293 529
294sub draw { 530sub draw {
295 my ($self) = @_; 531 my ($self) = @_;
296 532
297 return unless $self->{h} && $self->{w}; 533 return unless $self->{h} && $self->{w};
… …
313 glVertex $x + $self->{w}, $y + $self->{h}; 549 glVertex $x + $self->{w}, $y + $self->{h};
314 glVertex $x , $y + $self->{h}; 550 glVertex $x , $y + $self->{h};
315 glEnd; 551 glEnd;
316 glDisable GL_BLEND; 552 glDisable GL_BLEND;
317 } 553 }
554
555 if ($ENV{CFPLUS_DEBUG} & 1) {
556 glPushMatrix;
557 glColor 1, 1, 0, 1;
558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
559 glBegin GL_LINE_LOOP;
560 glVertex 0 , 0;
561 glVertex $self->{w} - 1, 0;
562 glVertex $self->{w} - 1, $self->{h} - 1;
563 glVertex 0 , $self->{h} - 1;
564 glEnd;
565 glPopMatrix;
566 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
567 }
318} 568}
319 569
320sub _draw { 570sub _draw {
321 my ($self) = @_; 571 my ($self) = @_;
322 572
323 warn "no draw defined for $self\n"; 573 warn "no draw defined for $self\n";
324} 574}
325 575
326sub find_widget {
327 my ($self, $x, $y) = @_;
328
329 return () unless $self->{can_events};
330
331 return $self
332 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
333 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
334
335 ()
336}
337
338sub set_parent {
339 my ($self, $parent) = @_;
340
341 Scalar::Util::weaken ($self->{parent} = $parent);
342}
343
344sub check_size {
345 my ($self) = @_;
346
347 $self->{parent}
348 or return 1;
349
350 my ($w, $h) = $self->{user_w} && $self->{user_h}
351 ? @$self{qw(user_w user_h)}
352 : $self->size_request;
353
354 if ($w != $self->{req_w} || $h != $self->{req_h}) {
355 $self->{req_w} = $w;
356 $self->{req_h} = $h;
357
358 $self->{parent}->check_size
359 or $self->size_allocate (
360 (List::Util::max $self->{w}, $w),
361 (List::Util::max $self->{h}, $h),
362 );
363
364 1
365 } else {
366 0
367 }
368}
369
370sub update {
371 my ($self) = @_;
372
373 $self->{parent}->update
374 if $self->{parent};
375}
376
377sub connect {
378 my ($self, $signal, $cb) = @_;
379
380 push @{ $self->{signal_cb}{$signal} }, $cb;
381}
382
383sub emit {
384 my ($self, $signal, @args) = @_;
385
386 for my $cb (@{$self->{signal_cb}{$signal} || []}) {
387 $cb->($self, @args);
388 }
389}
390
391sub DESTROY { 576sub DESTROY {
392 my ($self) = @_; 577 my ($self) = @_;
393 578
579 delete $WIDGET{$self+0};
394 #$self->deactivate; 580 #$self->deactivate;
395} 581}
396 582
397############################################################################# 583#############################################################################
398 584
… …
407 my $class = shift; 593 my $class = shift;
408 594
409 # range [value, low, high, page] 595 # range [value, low, high, page]
410 596
411 $class->SUPER::new ( 597 $class->SUPER::new (
412 bg => [0, 0, 0, 0.2], 598 #bg => [0, 0, 0, 0.2],
413 active_bg => [1, 1, 1, 0.5], 599 #active_bg => [1, 1, 1, 0.5],
414 @_ 600 @_
415 ) 601 )
416} 602}
417 603
418sub _draw { 604sub _draw {
419 my ($self) = @_; 605 my ($self) = @_;
420 606
607 my $color = $FOCUS == $self && $self->{active_bg}
608 ? $self->{active_bg}
609 : $self->{bg};
610
611 if ($color && (@$color < 4 || $color->[3])) {
421 my ($w, $h) = @$self{qw(w h)}; 612 my ($w, $h) = @$self{qw(w h)};
422 613
423 glEnable GL_BLEND; 614 glEnable GL_BLEND;
424 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 615 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
425 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 616 glColor @$color;
426 617
427 glBegin GL_QUADS; 618 glBegin GL_QUADS;
428 glVertex 0 , 0; 619 glVertex 0 , 0;
429 glVertex 0 , $h; 620 glVertex 0 , $h;
430 glVertex $w, $h; 621 glVertex $w, $h;
431 glVertex $w, 0; 622 glVertex $w, 0;
432 glEnd; 623 glEnd;
433 624
434 glDisable GL_BLEND; 625 glDisable GL_BLEND;
626 }
435} 627}
436 628
437############################################################################# 629#############################################################################
438 630
439package CFClient::UI::Empty; 631package CFClient::UI::Empty;
… …
444 my ($class, %arg) = @_; 636 my ($class, %arg) = @_;
445 $class->SUPER::new (can_events => 0, %arg); 637 $class->SUPER::new (can_events => 0, %arg);
446} 638}
447 639
448sub size_request { 640sub size_request {
449 (0, 0) 641 my ($self) = @_;
642
643 ($self->{w} + 0, $self->{h} + 0)
450} 644}
451 645
452sub draw { } 646sub draw { }
453 647
454############################################################################# 648#############################################################################
… …
460sub new { 654sub new {
461 my ($class, %arg) = @_; 655 my ($class, %arg) = @_;
462 656
463 my $children = delete $arg{children} || []; 657 my $children = delete $arg{children} || [];
464 658
465 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 659 my $self = $class->SUPER::new (
660 children => [],
661 can_events => 0,
662 %arg,
663 );
466 $self->add ($_) for @$children; 664 $self->add ($_) for @$children;
467 665
468 $self 666 $self
469} 667}
470 668
471sub add { 669sub add {
472 my ($self, $child) = @_; 670 my ($self, @widgets) = @_;
473 671
474 $child->set_parent ($self); 672 $_->set_parent ($self)
673 for @widgets;
475 674
476 use sort 'stable'; 675 use sort 'stable';
477 676
478 $self->{children} = [ 677 $self->{children} = [
479 sort { $a->{z} <=> $b->{z} } 678 sort { $a->{z} <=> $b->{z} }
480 @{$self->{children}}, $child 679 @{$self->{children}}, @widgets
481 ]; 680 ];
482 681
483 $child->check_size; 682 $self->realloc;
683}
684
685sub children {
686 @{ $_[0]{children} }
484} 687}
485 688
486sub remove { 689sub remove {
487 my ($self, $child) = @_; 690 my ($self, $child) = @_;
488 691
489 delete $child->{parent}; 692 delete $child->{parent};
693 $child->hide;
490 694
491 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 695 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
492 696
493 $self->check_size; 697 $self->realloc;
494 $self->update; 698}
699
700sub clear {
701 my ($self) = @_;
702
703 my $children = delete $self->{children};
704 $self->{children} = [];
705
706 for (@$children) {
707 delete $_->{parent};
708 $_->hide;
709 }
710
711 $self->realloc;
495} 712}
496 713
497sub find_widget { 714sub find_widget {
498 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
499 716
… …
574} 791}
575 792
576sub update { 793sub update {
577 my ($self) = @_; 794 my ($self) = @_;
578 795
579 # we want to do this delayed... 796 $ROOT->on_post_alloc ($self => sub { $self->render_child });
580 $self->render_chld;
581 $self->SUPER::update; 797 $self->SUPER::update;
582}
583
584sub render_chld {
585 my ($self) = @_;
586
587 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
588 glClearColor 0, 0, 0, 1;
589 glClear GL_COLOR_BUFFER_BIT;
590 $self->child->draw;
591 };
592} 798}
593 799
594sub size_allocate { 800sub size_allocate {
595 my ($self, $w, $h) = @_; 801 my ($self, $w, $h) = @_;
596 802
597 $self->child->configure (0, 0, $w, $h); 803 $self->SUPER::size_allocate ($w, $h);
804 $self->update;
805}
598 806
807sub _render {
808 $_[0]{children}[0]->draw;
809}
810
811sub render_child {
812 my ($self) = @_;
813
814 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
815 glClearColor 0, 0, 0, 0;
816 glClear GL_COLOR_BUFFER_BIT;
817
599 $self->render_chld; 818 $self->_render;
819 };
600} 820}
601 821
602sub _draw { 822sub _draw {
603 my ($self) = @_; 823 my ($self) = @_;
604 824
605 my ($w, $h) = ($self->w, $self->h); 825 my ($w, $h) = ($self->w, $self->h);
606 826
607 my $tex = $self->{texture} 827 my $tex = $self->{texture}
608 or return; 828 or return;
609 829
610 glEnable GL_BLEND;
611 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
612 glEnable GL_TEXTURE_2D; 830 glEnable GL_TEXTURE_2D;
613 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
832 glColor 1, 1, 1, 1;
614 833
615 $tex->draw_quad (0, 0, $w, $h); 834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
616 835
617 glDisable GL_BLEND;
618 glDisable GL_TEXTURE_2D; 836 glDisable GL_TEXTURE_2D;
619} 837}
620 838
621############################################################################# 839#############################################################################
622 840
623package CFClient::UI::ViewPort; 841package CFClient::UI::ViewPort;
624 842
625our @ISA = CFClient::UI::Window::; 843our @ISA = CFClient::UI::Window::;
626
627sub new { die }
628
629sub size_request {
630 my ($self) = @_;
631
632 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
633 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
634
635 @$self{qw(child_w child_h)}
636}
637
638sub _draw {
639 my ($self) = @_;
640
641 $self->{children}[1]->draw;
642}
643
644
645#############################################################################
646
647package CFClient::UI::Frame;
648
649our @ISA = CFClient::UI::Bin::;
650
651use CFClient::OpenGL;
652 844
653sub new { 845sub new {
654 my $class = shift; 846 my $class = shift;
655 847
656 my $self = $class->SUPER::new ( 848 $class->SUPER::new (
657 bg => [1, 1, 1, 1], 849 scroll_x => 0,
658 border_bg => [1, 1, 1, 1], 850 scroll_y => 1,
659 border => 0.8,
660 @_ 851 @_,
661 ); 852 )
662
663 $self
664} 853}
665 854
666sub _draw { 855sub size_request {
856 my ($self) = @_;
857
858 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
859
860 $w = 10 if $self->{scroll_x};
861 $h = 10 if $self->{scroll_y};
862
863 ($w, $h)
864}
865
866sub size_allocate {
667 my ($self) = @_; 867 my ($self, $w, $h) = @_;
668 868
669 my ($w, $h) = ($self->{w}, $self->{h}); 869 my $child = $self->child;
670 870
671 glEnable GL_BLEND; 871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
672 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
673 glEnable GL_TEXTURE_2D;
674 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675 873
676# glBegin GL_QUADS; 874 $self->child->configure (0, 0, $w, $h);
677# glColor 0, 0, 0, 0; 875 $self->update;
678# glVertex 0 , 0; 876}
679# glVertex 0 , $h;
680# glVertex $w, $h;
681# glVertex $w, 0;
682# glEnd;
683 877
878sub set_offset {
879 my ($self, $x, $y) = @_;
684 880
685 $self->child->draw; 881 $self->{view_x} = int $x;
686 glDisable GL_BLEND; 882 $self->{view_y} = int $y;
687 glDisable GL_TEXTURE_2D; 883
884 $self->update;
885}
886
887# hmm, this does not work for topleft of $self... but we should not ask for that
888sub coord2local {
889 my ($self, $x, $y) = @_;
890
891 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
892}
893
894sub coord2global {
895 my ($self, $x, $y) = @_;
896
897 $x = List::Util::min $self->{w}, $x - $self->{view_x};
898 $y = List::Util::min $self->{h}, $y - $self->{view_y};
899
900 $self->SUPER::coord2global ($x, $y)
901}
902
903sub find_widget {
904 my ($self, $x, $y) = @_;
905
906 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
907 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
908 ) {
909 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
910 } else {
911 $self->CFClient::UI::Base::find_widget ($x, $y)
912 }
913}
914
915sub _render {
916 my ($self) = @_;
917
918 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
919
920 $self->SUPER::_render;
688} 921}
689 922
690############################################################################# 923#############################################################################
691 924
692package CFClient::UI::FancyFrame; 925package CFClient::UI::ScrolledWindow;
693 926
694our @ISA = CFClient::UI::Bin::; 927our @ISA = CFClient::UI::HBox::;
695
696use CFClient::OpenGL;
697
698my @tex =
699 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
700 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
701 928
702sub new { 929sub new {
703 my $class = shift; 930 my $class = shift;
704 931
705 # TODO: user_x, user_y, overwrite moveto? 932 my $self;
933
934 my $slider = new CFClient::UI::Slider
935 vertical => 1,
936 range => [0, 0, 1, 0.01], # HACK fix
937 on_changed => sub {
938 $self->{vp}->set_offset (0, $_[1]);
939 },
940 ;
941
942 $self = $class->SUPER::new (
943 vp => (new CFClient::UI::ViewPort expand => 1),
944 slider => $slider,
945 @_,
946 );
947
948 $self->{vp}->add ($self->{scrolled});
949 $self->add ($self->{vp});
950 $self->add ($self->{slider});
951
952 $self
953}
954
955sub update {
956 my ($self) = @_;
957
958 $self->SUPER::update;
959
960 # todo: overwrite size_allocate of child
961 my $child = $self->{vp}->child;
962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963}
964
965sub size_allocate {
966 my ($self, $w, $h) = @_;
967
968 $self->SUPER::size_allocate ($w, $h);
969
970 my $child = $self->{vp}->child;
971 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
972}
973
974#TODO# update range on size_allocate depending on child
975# update viewport offset on scroll
976
977#############################################################################
978
979package CFClient::UI::Frame;
980
981our @ISA = CFClient::UI::Bin::;
982
983use CFClient::OpenGL;
984
985sub new {
986 my $class = shift;
987
988 $class->SUPER::new (
989 bg => undef,
990 @_,
991 )
992}
993
994sub _draw {
995 my ($self) = @_;
996
997 if ($self->{bg}) {
998 my ($w, $h) = @$self{qw(w h)};
999
1000 glEnable GL_BLEND;
1001 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1002 glColor @{ $self->{bg} };
1003
1004 glBegin GL_QUADS;
1005 glVertex 0 , 0;
1006 glVertex 0 , $h;
1007 glVertex $w, $h;
1008 glVertex $w, 0;
1009 glEnd;
1010
1011 glDisable GL_BLEND;
1012 }
1013
1014 $self->SUPER::_draw;
1015}
1016
1017#############################################################################
1018
1019package CFClient::UI::FancyFrame;
1020
1021our @ISA = CFClient::UI::Bin::;
1022
1023use CFClient::OpenGL;
1024
1025my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1;
1028
1029my @border =
1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1031 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1032
1033sub new {
1034 my $class = shift;
706 1035
707 my $self = $class->SUPER::new ( 1036 my $self = $class->SUPER::new (
708 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
709 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
710 border => 0.8, 1039 border => 0.6,
711 can_events => 1, 1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
712 @_ 1043 @_
713 ); 1044 );
714 1045
715 $self->{title} &&= new CFClient::UI::Label 1046 $self->{title} &&= new CFClient::UI::Label
716 align => 0, 1047 align => 0,
717 valign => 1, 1048 valign => 1,
718 text => $self->{title}, 1049 text => $self->{title},
719 fontsize => 1; 1050 fontsize => $self->{border};
720 1051
721 $self 1052 $self
722} 1053}
723 1054
724sub border { 1055sub border {
… …
740 my ($self, $w, $h) = @_; 1071 my ($self, $w, $h) = @_;
741 1072
742 $h -= List::Util::max 0, $self->border * 2; 1073 $h -= List::Util::max 0, $self->border * 2;
743 $w -= List::Util::max 0, $self->border * 2; 1074 $w -= List::Util::max 0, $self->border * 2;
744 1075
745 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1076 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
746 if $self->{title}; 1077 if $self->{title};
747 1078
748 $self->child->configure ($self->border, $self->border, $w, $h); 1079 $self->child->configure ($self->border, $self->border, $w, $h);
749} 1080}
750 1081
751sub button_down { 1082sub button_down {
752 my ($self, $ev, $x, $y) = @_; 1083 my ($self, $ev, $x, $y) = @_;
753 1084
1085 my ($w, $h) = @$self{qw(w h)};
754 my $border = $self->border; 1086 my $border = $self->border;
755 1087
756 if ($x < $self->{w} && $x >= $self->{w} - $border 1088 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
757 && $y < $self->{h} && $y >= $self->{h} - $border) { 1089 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
758 1090
1091 if ($lr & $td) {
1092 my ($wx, $wy) = ($self->{x}, $self->{y});
759 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1093 my ($ox, $oy) = ($ev->{x}, $ev->{y});
760 my ($bw, $bh) = ($self->{w}, $self->{h}); 1094 my ($bw, $bh) = ($self->{w}, $self->{h});
761 1095
1096 my $mx = $x < $border;
1097 my $my = $y < $border;
1098
762 $self->{motion} = sub { 1099 $self->{motion} = sub {
763 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
764 1101
765 ($x, $y) = ($ev->{x}, $ev->{y}); 1102 my $dx = $ev->{x} - $ox;
1103 my $dy = $ev->{y} - $oy;
766 1104
767 $self->{user_w} = $bw + $x - $ox; 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
768 $self->{user_h} = $bh + $y - $oy; 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
769 $self->check_size; 1107
1108 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
770 }; 1110 };
771 1111
772 } elsif ($x >= 0 && $x < $self->{w} 1112 } elsif ($lr ^ $td) {
773 && $y >= 0 && $y < $border) {
774
775 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
776 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
777 1115
778 $self->{motion} = sub { 1116 $self->{motion} = sub {
779 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
780 1118
781 ($x, $y) = ($ev->{x}, $ev->{y}); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
782 1120
783 $self->move ($bx + $x - $ox, $by + $y - $oy); 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
784 $self->update;
785 }; 1122 };
786 } 1123 }
787} 1124}
788 1125
789sub button_up { 1126sub button_up {
… …
802 my ($self) = @_; 1139 my ($self) = @_;
803 1140
804 my ($w, $h ) = ($self->{w}, $self->{h}); 1141 my ($w, $h ) = ($self->{w}, $self->{h});
805 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
806 1143
807 glEnable GL_BLEND;
808 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
809 glEnable GL_TEXTURE_2D; 1144 glEnable GL_TEXTURE_2D;
810 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
811 1146
812 my $border = $self->border; 1147 my $border = $self->border;
813 1148
814 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
815 $tex[1]->draw_quad (0, 0, $w, $border); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
816 $tex[3]->draw_quad (0, $border, $border, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
817 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
818 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
819 1154
820 my $bg = $tex[0]; 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1156 glColor @{ $self->{bg} };
821 1157
822 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
823 my $rep_x = $cw / $bg->{w}; 1159 # solve this better(?)
824 my $rep_y = $ch / $bg->{h}; 1160 $bg->{s} = $cw / $bg->{w};
825 1161 $bg->{t} = $ch / $bg->{h};
826 glColor @{ $self->{bg} };
827
828 $bg->{s} = $rep_x;
829 $bg->{t} = $rep_y;
830 $bg->{wrap_mode} = 1;
831 $bg->draw_quad ($border, $border, $cw, $ch); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 }
832 1164
833 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
834 glDisable GL_BLEND;
835 1166
836 $self->{title}->draw if $self->{title}; 1167 $self->{title}->draw if $self->{title};
1168
837 $self->child->draw; 1169 $self->child->draw;
838} 1170}
839 1171
840############################################################################# 1172#############################################################################
841 1173
… …
850sub new { 1182sub new {
851 my $class = shift; 1183 my $class = shift;
852 1184
853 $class->SUPER::new ( 1185 $class->SUPER::new (
854 col_expand => [], 1186 col_expand => [],
855 @_ 1187 @_,
856 ) 1188 )
1189}
1190
1191sub children {
1192 grep $_, map @$_, grep $_, @{ $_[0]{children} }
857} 1193}
858 1194
859sub add { 1195sub add {
860 my ($self, $x, $y, $child) = @_; 1196 my ($self, $x, $y, $child) = @_;
861 1197
862 $child->set_parent ($self); 1198 $child->set_parent ($self);
863 $self->{children}[$y][$x] = $child; 1199 $self->{children}[$y][$x] = $child;
864 1200
865 $child->check_size; 1201 $self->realloc;
866} 1202}
867 1203
868# TODO: move to container class maybe? send childs a signal on removal? 1204# TODO: move to container class maybe? send children a signal on removal?
869sub clear { 1205sub clear {
870 my ($self) = @_; 1206 my ($self) = @_;
871 1207
1208 my @children = $self->children;
872 delete $self->{children}; 1209 delete $self->{children};
873 $self->update; 1210
1211 for (@children) {
1212 delete $_->{parent};
1213 $_->hide;
1214 }
1215
1216 $self->realloc;
874} 1217}
875 1218
876sub get_wh { 1219sub get_wh {
877 my ($self) = @_; 1220 my ($self) = @_;
878 1221
… …
909sub size_allocate { 1252sub size_allocate {
910 my ($self, $w, $h) = @_; 1253 my ($self, $w, $h) = @_;
911 1254
912 my ($ws, $hs) = $self->get_wh; 1255 my ($ws, $hs) = $self->get_wh;
913 1256
914 my $req_w = sum @$ws; 1257 my $req_w = (sum @$ws) || 1;
915 my $req_h = sum @$hs; 1258 my $req_h = (sum @$hs) || 1;
916 1259
917 # TODO: nicer code && do row_expand 1260 # TODO: nicer code && do row_expand
918 my @col_expand = @{$self->{col_expand}}; 1261 my @col_expand = @{$self->{col_expand}};
919 @col_expand = (1) x @$ws unless @col_expand; 1262 @col_expand = (1) x @$ws unless @col_expand;
920 my $col_expand = (sum @col_expand) || 1; 1263 my $col_expand = (sum @col_expand) || 1;
… …
974 } 1317 }
975} 1318}
976 1319
977############################################################################# 1320#############################################################################
978 1321
979package CFClient::UI::HBox; 1322package CFClient::UI::Box;
980
981# TODO: wrap into common Box base class
982 1323
983our @ISA = CFClient::UI::Container::; 1324our @ISA = CFClient::UI::Container::;
984 1325
985sub size_request { 1326sub size_request {
986 my ($self) = @_; 1327 my ($self) = @_;
987 1328
988 my @alloc = map [$_->size_request], @{$self->{children}}; 1329 $self->{vertical}
989 1330 ? (
990 ( 1331 (List::Util::max map $_->{req_w}, @{$self->{children}}),
991 (List::Util::sum map $_->[0], @alloc), 1332 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
992 (List::Util::max map $_->[1], @alloc), 1333 )
993 ) 1334 : (
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 )
994} 1338}
995 1339
996sub size_allocate { 1340sub size_allocate {
997 my ($self, $w, $h) = @_; 1341 my ($self, $w, $h) = @_;
998 1342
999 ($h, $w) = ($w, $h); 1343 my $space = $self->{vertical} ? $h : $w;
1000
1001 my $children = $self->{children}; 1344 my $children = $self->{children};
1002 1345
1003 my @h = map $_->{req_w}, @$children; 1346 my @req;
1004 1347
1005 my $req_h = List::Util::sum @h; 1348 if ($self->{homogeneous}) {
1006 1349 @req = ($space / (@$children || 1)) x @$children;
1007 if ($req_h > $h) {
1008 # ah well, not enough space
1009 $_ *= $h / $req_h for @h;
1010 } else { 1350 } else {
1351 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1352 my $req = List::Util::sum @req;
1353
1354 if ($req > $space) {
1355 # ah well, not enough space
1356 $_ *= $space / $req for @req;
1357 } else {
1011 my $exp = List::Util::sum map $_->{expand}, @$children; 1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1012 $exp ||= 1;
1013 1359
1360 $space = ($space - $req) / $expand; # remaining space to give away
1361
1362 $req[$_] += $space * $children->[$_]{expand}
1014 for (0 .. $#$children) { 1363 for 0 .. $#$children;
1015 my $child = $children->[$_];
1016
1017 my $alloc_h = $h[$_];
1018 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1019 $h[$_] = $alloc_h;
1020 } 1364 }
1021 } 1365 }
1022 1366
1023 CFClient::UI::harmonize \@h; 1367 CFClient::UI::harmonize \@req;
1024 1368
1025 my $y = 0; 1369 my $pos = 0;
1026 for (0 .. $#$children) { 1370 for (0 .. $#$children) {
1027 my $child = $children->[$_];
1028 my $h = $h[$_]; 1371 my $alloc = $req[$_];
1029 $child->configure ($y, 0, $h, $w); 1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1030 1373
1031 $y += $h; 1374 $pos += $alloc;
1032 } 1375 }
1033 1376
1034 1 1377 1
1035} 1378}
1036 1379
1037############################################################################# 1380#############################################################################
1038 1381
1382package CFClient::UI::HBox;
1383
1384our @ISA = CFClient::UI::Box::;
1385
1386sub new {
1387 my $class = shift;
1388
1389 $class->SUPER::new (
1390 vertical => 0,
1391 @_,
1392 )
1393}
1394
1395#############################################################################
1396
1039package CFClient::UI::VBox; 1397package CFClient::UI::VBox;
1040 1398
1041# TODO: wrap into common Box base class
1042
1043our @ISA = CFClient::UI::Container::; 1399our @ISA = CFClient::UI::Box::;
1044 1400
1045sub size_request { 1401sub new {
1046 my ($self) = @_; 1402 my $class = shift;
1047 1403
1048 my @alloc = map [$_->size_request], @{$self->{children}}; 1404 $class->SUPER::new (
1049 1405 vertical => 1,
1050 ( 1406 @_,
1051 (List::Util::max map $_->[0], @alloc),
1052 (List::Util::sum map $_->[1], @alloc),
1053 ) 1407 )
1054} 1408}
1055 1409
1056sub size_allocate {
1057 my ($self, $w, $h) = @_;
1058
1059 my $children = $self->{children};
1060
1061 my @h = map $_->{req_h}, @$children;
1062
1063 my $req_h = List::Util::sum @h;
1064
1065 if ($req_h > $h) {
1066 # ah well, not enough space
1067 $_ *= $h / $req_h for @h;
1068 } else {
1069 my $exp = List::Util::sum map $_->{expand}, @$children;
1070 $exp ||= 1;
1071
1072 for (0 .. $#$children) {
1073 my $child = $children->[$_];
1074
1075 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1076 }
1077 }
1078
1079 CFClient::UI::harmonize \@h;
1080
1081 my $y = 0;
1082 for (0 .. $#$children) {
1083 my $child = $children->[$_];
1084 my $h = $h[$_];
1085 $child->configure (0, $y, $w, $h);
1086
1087 $y += $h;
1088 }
1089
1090 1
1091}
1092
1093############################################################################# 1410#############################################################################
1094 1411
1095package CFClient::UI::Label; 1412package CFClient::UI::Label;
1096 1413
1097our @ISA = CFClient::UI::Base::; 1414our @ISA = CFClient::UI::DrawBG::;
1098 1415
1099use CFClient::OpenGL; 1416use CFClient::OpenGL;
1100 1417
1101sub new { 1418sub new {
1102 my ($class, %arg) = @_; 1419 my ($class, %arg) = @_;
1103 1420
1104 my $self = $class->SUPER::new ( 1421 my $self = $class->SUPER::new (
1105 fg => [1, 1, 1], 1422 fg => [1, 1, 1],
1423 #bg => none
1424 #active_bg => none
1106 #font => default_font 1425 #font => default_font
1426 #text => initial text
1427 #markup => initial narkup
1428 #max_w => maximum pixel width
1429 ellipsise => 3, # end
1430 layout => (new CFClient::Layout),
1107 fontsize => 1, 1431 fontsize => 1,
1108 text => "",
1109 align => -1, 1432 align => -1,
1110 valign => -1, 1433 valign => -1,
1111 padding => 2, 1434 padding_x => 2,
1112 layout => new CFClient::Layout, 1435 padding_y => 2,
1113 can_events => 0, 1436 can_events => 0,
1114 %arg 1437 %arg
1115 ); 1438 );
1116 1439
1117 if (exists $self->{template}) { 1440 if (exists $self->{template}) {
1118 my $layout = new CFClient::Layout; 1441 my $layout = new CFClient::Layout;
1119 $layout->set_text (delete $self->{template}); 1442 $layout->set_text (delete $self->{template});
1120 $self->{template} = $layout; 1443 $self->{template} = $layout;
1121 } 1444 }
1122 1445
1123 $self->set_text (delete $self->{text}) if exists $self->{text}; 1446 if (exists $self->{markup}) {
1124 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1447 $self->set_markup (delete $self->{markup});
1448 } else {
1449 $self->set_text (delete $self->{text});
1450 }
1125 1451
1126 $self 1452 $self
1127} 1453}
1128 1454
1129sub escape_text { 1455sub escape($) {
1130 local $_ = $_[1]; 1456 local $_ = $_[0];
1131 1457
1132 s/&/&amp;/g; 1458 s/&/&amp;/g;
1133 s/>/&gt;/g; 1459 s/>/&gt;/g;
1134 s/</&lt;/g; 1460 s/</&lt;/g;
1135 1461
1136 $_[1] 1462 $_
1463}
1464
1465sub update {
1466 my ($self) = @_;
1467
1468 delete $self->{texture};
1469 $self->SUPER::update;
1137} 1470}
1138 1471
1139sub set_text { 1472sub set_text {
1140 my ($self, $text) = @_; 1473 my ($self, $text) = @_;
1141 1474
1475 return if $self->{text} eq "T$text";
1476 $self->{text} = "T$text";
1477
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1142 $self->{layout}->set_text ($text); 1479 $self->{layout}->set_text ($text);
1143 1480
1144 delete $self->{texture}; 1481 $self->realloc;
1145 $self->check_size;
1146 $self->update; 1482 $self->update;
1147} 1483}
1148 1484
1149sub set_markup { 1485sub set_markup {
1150 my ($self, $markup) = @_; 1486 my ($self, $markup) = @_;
1151 1487
1488 return if $self->{text} eq "M$markup";
1489 $self->{text} = "M$markup";
1490
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492
1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1152 $self->{layout}->set_markup ($markup); 1494 $self->{layout}->set_markup ($markup);
1153 1495
1154 delete $self->{texture}; 1496 $self->realloc;
1155 $self->check_size;
1156 $self->update; 1497 $self->update;
1157} 1498}
1158 1499
1159sub size_request { 1500sub size_request {
1160 my ($self) = @_; 1501 my ($self) = @_;
1161 1502
1162 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1503 $self->{layout}->set_font ($self->{font}) if $self->{font};
1163 $self->{layout}->set_width ($self->{max_w} || -1); 1504 $self->{layout}->set_width ($self->{max_w} || -1);
1505 $self->{layout}->set_ellipsise ($self->{ellipsise});
1506 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1164 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1165 1508
1166 my ($w, $h) = $self->{layout}->size; 1509 my ($w, $h) = $self->{layout}->size;
1167 1510
1168 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1173 1516
1174 $w = List::Util::max $w, $w2; 1517 $w = List::Util::max $w, $w2;
1175 $h = List::Util::max $h, $h2; 1518 $h = List::Util::max $h, $h2;
1176 } 1519 }
1177 1520
1178 ( 1521 ($w, $h)
1179 $w + $self->{padding} * 2,
1180 $h + $self->{padding} * 2,
1181 )
1182} 1522}
1183 1523
1184sub size_allocate { 1524sub size_allocate {
1185 my ($self, $w, $h) = @_; 1525 my ($self, $w, $h) = @_;
1186 1526
1187 delete $self->{texture}; 1527 delete $self->{texture}
1528 ;#d#
1188} 1529}
1189 1530
1190sub set_fontsize { 1531sub set_fontsize {
1191 my ($self, $fontsize) = @_; 1532 my ($self, $fontsize) = @_;
1192 1533
1193 $self->{fontsize} = $fontsize; 1534 $self->{fontsize} = $fontsize;
1194 delete $self->{texture}; 1535 delete $self->{texture};
1195 $self->check_size; 1536
1196 $self->update; 1537 $self->realloc;
1197} 1538}
1198 1539
1199sub _draw { 1540sub _draw {
1200 my ($self) = @_; 1541 my ($self) = @_;
1201 1542
1543 $self->SUPER::_draw; # draw background, if applicable
1544
1202 my $tex = $self->{texture} ||= do { 1545 my $tex = $self->{texture} ||= do {
1546 $self->{layout}->set_foreground (@{$self->{fg}});
1203 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1547 $self->{layout}->set_font ($self->{font}) if $self->{font};
1204 $self->{layout}->set_width ($self->{w}); 1548 $self->{layout}->set_width ($self->{w});
1549 $self->{layout}->set_ellipsise ($self->{ellipsise});
1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1205 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552
1206 new_from_layout CFClient::Texture $self->{layout} 1553 my $tex = new_from_layout CFClient::Texture $self->{layout};
1554
1555 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1556 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1557 : ($self->{w} - $tex->{w}) * 0.5);
1558
1559 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1560 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1561 : ($self->{h} - $tex->{h}) * 0.5);
1562
1563 $tex
1207 }; 1564 };
1208 1565
1209 glEnable GL_BLEND;
1210 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1211 glEnable GL_TEXTURE_2D; 1566 glEnable GL_TEXTURE_2D;
1212 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1567 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1213 1568
1569 if ($tex->{format} == GL_ALPHA) {
1214 glColor @{$self->{fg}}; 1570 glColor @{$self->{fg}};
1215
1216 $self->{ox} = int (
1217 $self->{align} < 0 ? $self->{padding}
1218 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1219 : ($self->{w} - $tex->{w}) * 0.5
1220 );
1221
1222 $self->{oy} = int (
1223 $self->{valign} < 0 ? $self->{padding}
1224 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1225 : ($self->{h} - $tex->{h}) * 0.5
1226 );
1227
1228 $tex->draw_quad ($self->{ox}, $self->{oy}); 1571 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1572 } else {
1573 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1574 }
1229 1575
1230 glDisable GL_TEXTURE_2D; 1576 glDisable GL_TEXTURE_2D;
1231 glDisable GL_BLEND;
1232} 1577}
1233 1578
1234############################################################################# 1579#############################################################################
1235 1580
1236package CFClient::UI::EntryBase; 1581package CFClient::UI::EntryBase;
… …
1241 1586
1242sub new { 1587sub new {
1243 my $class = shift; 1588 my $class = shift;
1244 1589
1245 $class->SUPER::new ( 1590 $class->SUPER::new (
1246 fg => [1, 1, 1], 1591 fg => [1, 1, 1],
1247 bg => [0, 0, 0, 0.2], 1592 bg => [0, 0, 0, 0.2],
1248 active_bg => [1, 1, 1, 0.5], 1593 active_bg => [1, 1, 1, 0.5],
1249 active_fg => [0, 0, 0], 1594 active_fg => [0, 0, 0],
1250 can_hover => 1, 1595 can_hover => 1,
1251 can_focus => 1, 1596 can_focus => 1,
1252 valign => 0, 1597 valign => 0,
1253 can_events => 1, 1598 can_events => 1,
1599 #text => ...
1254 @_ 1600 @_
1255 ) 1601 )
1256} 1602}
1257 1603
1258sub _set_text { 1604sub _set_text {
… …
1268 $self->{text} = $text; 1614 $self->{text} = $text;
1269 1615
1270 $text =~ s/./*/g if $self->{hidden}; 1616 $text =~ s/./*/g if $self->{hidden};
1271 $self->{layout}->set_text ("$text "); 1617 $self->{layout}->set_text ("$text ");
1272 1618
1273 $self->emit (changed => $self->{text}); 1619 $self->_emit (changed => $self->{text});
1620}
1621
1622sub set_text {
1623 my ($self, $text) = @_;
1624
1625 $self->{cursor} = length $text;
1626 $self->_set_text ($text);
1627
1628 $self->realloc;
1274} 1629}
1275 1630
1276sub get_text { 1631sub get_text {
1277 $_[0]{text} 1632 $_[0]{text}
1278} 1633}
… …
1281 my ($self) = @_; 1636 my ($self) = @_;
1282 1637
1283 my ($w, $h) = $self->SUPER::size_request; 1638 my ($w, $h) = $self->SUPER::size_request;
1284 1639
1285 ($w + 1, $h) # add 1 for cursor 1640 ($w + 1, $h) # add 1 for cursor
1286}
1287
1288sub size_allocate {
1289 my ($self, $w, $h) = @_;
1290
1291 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1292}
1293
1294sub set_text {
1295 my ($self, $text) = @_;
1296
1297 $self->{cursor} = length $text;
1298 $self->_set_text ($text);
1299 $self->update;
1300} 1641}
1301 1642
1302sub key_down { 1643sub key_down {
1303 my ($self, $ev) = @_; 1644 my ($self, $ev) = @_;
1304 1645
… …
1306 my $sym = $ev->{sym}; 1647 my $sym = $ev->{sym};
1307 my $uni = $ev->{unicode}; 1648 my $uni = $ev->{unicode};
1308 1649
1309 my $text = $self->get_text; 1650 my $text = $self->get_text;
1310 1651
1311 if ($sym == 8) { 1652 if ($uni == 8) {
1312 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1653 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1313 } elsif ($sym == 127) { 1654 } elsif ($uni == 127) {
1314 substr $text, $self->{cursor}, 1, ""; 1655 substr $text, $self->{cursor}, 1, "";
1315 } elsif ($sym == CFClient::SDLK_LEFT) { 1656 } elsif ($sym == CFClient::SDLK_LEFT) {
1316 --$self->{cursor} if $self->{cursor}; 1657 --$self->{cursor} if $self->{cursor};
1317 } elsif ($sym == CFClient::SDLK_RIGHT) { 1658 } elsif ($sym == CFClient::SDLK_RIGHT) {
1318 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1659 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1319 } elsif ($sym == CFClient::SDLK_HOME) { 1660 } elsif ($sym == CFClient::SDLK_HOME) {
1320 $self->{cursor} = 0; 1661 $self->{cursor} = 0;
1321 } elsif ($sym == CFClient::SDLK_END) { 1662 } elsif ($sym == CFClient::SDLK_END) {
1322 $self->{cursor} = length $text; 1663 $self->{cursor} = length $text;
1323 } elsif ($sym == 27) { 1664 } elsif ($uni == 27) {
1324 $self->emit ('escape'); 1665 $self->_emit ('escape');
1325 } elsif ($uni) { 1666 } elsif ($uni) {
1326 substr $text, $self->{cursor}++, 0, chr $uni; 1667 substr $text, $self->{cursor}++, 0, chr $uni;
1327 } 1668 }
1328 1669
1329 $self->_set_text ($text); 1670 $self->_set_text ($text);
1330 $self->update; 1671
1672 $self->realloc;
1331} 1673}
1332 1674
1333sub focus_in { 1675sub focus_in {
1334 my ($self) = @_; 1676 my ($self) = @_;
1335 1677
… …
1411 my ($self, $ev) = @_; 1753 my ($self, $ev) = @_;
1412 1754
1413 my $sym = $ev->{sym}; 1755 my $sym = $ev->{sym};
1414 1756
1415 if ($sym == 13) { 1757 if ($sym == 13) {
1758 unshift @{$self->{history}},
1759 my $txt = $self->get_text;
1760 $self->{history_pointer} = -1;
1761 $self->{history_saveback} = '';
1416 $self->emit (activate => $self->get_text); 1762 $self->_emit (activate => $txt);
1417 $self->update; 1763 $self->update;
1764
1765 } elsif ($sym == CFClient::SDLK_UP) {
1766 if ($self->{history_pointer} < 0) {
1767 $self->{history_saveback} = $self->get_text;
1768 }
1769 if (@{$self->{history} || []} > 0) {
1770 $self->{history_pointer}++;
1771 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1772 $self->{history_pointer} = @{$self->{history} || []} - 1;
1773 }
1774 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1775 }
1776
1777 } elsif ($sym == CFClient::SDLK_DOWN) {
1778 $self->{history_pointer}--;
1779 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1780
1781 if ($self->{history_pointer} >= 0) {
1782 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1783 } else {
1784 $self->set_text ($self->{history_saveback});
1785 }
1418 1786
1419 } else { 1787 } else {
1420 $self->SUPER::key_down ($ev); 1788 $self->SUPER::key_down ($ev);
1421 } 1789 }
1422 1790
… …
1436 1804
1437sub new { 1805sub new {
1438 my $class = shift; 1806 my $class = shift;
1439 1807
1440 $class->SUPER::new ( 1808 $class->SUPER::new (
1441 padding => 4, 1809 padding_x => 4,
1810 padding_y => 4,
1442 fg => [1, 1, 1], 1811 fg => [1, 1, 1],
1443 bg => [1, 1, 1, 0.2],
1444 active_fg => [0, 0, 1], 1812 active_fg => [0, 0, 1],
1445 can_hover => 1, 1813 can_hover => 1,
1446 align => 0, 1814 align => 0,
1447 valign => 0, 1815 valign => 0,
1448 can_events => 1, 1816 can_events => 1,
1449 @_ 1817 @_
1450 ) 1818 )
1451} 1819}
1452 1820
1821sub activate { }
1822
1453sub button_up { 1823sub button_up {
1454 my ($self, $ev, $x, $y) = @_; 1824 my ($self, $ev, $x, $y) = @_;
1455 1825
1826 $self->emit ("activate")
1456 if ($x >= 0 && $x < $self->{w} 1827 if $x >= 0 && $x < $self->{w}
1457 && $y >= 0 && $y < $self->{h}) { 1828 && $y >= 0 && $y < $self->{h};
1458 $self->emit ("activate");
1459 }
1460} 1829}
1461 1830
1462sub _draw { 1831sub _draw {
1463 my ($self) = @_; 1832 my ($self) = @_;
1464 1833
… …
1466 1835
1467 if ($GRAB == $self) { 1836 if ($GRAB == $self) {
1468 $self->{fg} = $self->{active_fg}; 1837 $self->{fg} = $self->{active_fg};
1469 } 1838 }
1470 1839
1471 glEnable GL_BLEND;
1472 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1473 glEnable GL_TEXTURE_2D; 1840 glEnable GL_TEXTURE_2D;
1474 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1841 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1475 glColor 0, 0, 0, 1; 1842 glColor 0, 0, 0, 1;
1476 1843
1477 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1844 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1478 1845
1479 glDisable GL_TEXTURE_2D; 1846 glDisable GL_TEXTURE_2D;
1480 glDisable GL_BLEND;
1481 1847
1482 $self->SUPER::_draw; 1848 $self->SUPER::_draw;
1483} 1849}
1484 1850
1485############################################################################# 1851#############################################################################
… …
1496 1862
1497sub new { 1863sub new {
1498 my $class = shift; 1864 my $class = shift;
1499 1865
1500 $class->SUPER::new ( 1866 $class->SUPER::new (
1501 padding => 2, 1867 padding_x => 2,
1868 padding_y => 2,
1502 fg => [1, 1, 1], 1869 fg => [1, 1, 1],
1503 active_fg => [1, 1, 0], 1870 active_fg => [1, 1, 0],
1871 bg => [0, 0, 0, 0.2],
1872 active_bg => [1, 1, 1, 0.5],
1504 state => 0, 1873 state => 0,
1505 can_hover => 1, 1874 can_hover => 1,
1506 @_ 1875 @_
1507 ) 1876 )
1508} 1877}
1509 1878
1510sub size_request { 1879sub size_request {
1511 my ($self) = @_; 1880 my ($self) = @_;
1512 1881
1513 ($self->{padding} * 2 + 6) x 2 1882 (6) x 2
1514} 1883}
1515 1884
1516sub button_down { 1885sub button_down {
1517 my ($self, $ev, $x, $y) = @_; 1886 my ($self, $ev, $x, $y) = @_;
1518 1887
1519 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1888 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1520 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1889 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1521 $self->{state} = !$self->{state}; 1890 $self->{state} = !$self->{state};
1522 $self->emit (changed => $self->{state}); 1891 $self->_emit (changed => $self->{state});
1523 } 1892 }
1524} 1893}
1525 1894
1526sub _draw { 1895sub _draw {
1527 my ($self) = @_; 1896 my ($self) = @_;
1528 1897
1529 $self->SUPER::_draw; 1898 $self->SUPER::_draw;
1530 1899
1531 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1900 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1532 1901
1533 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1902 my ($w, $h) = @$self{qw(w h)};
1903
1904 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1534 1905
1535 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1906 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1536 1907
1537 glEnable GL_BLEND; 1908 my $tex = $self->{state} ? $tex[1] : $tex[0];
1909
1538 glEnable GL_TEXTURE_2D; 1910 glEnable GL_TEXTURE_2D;
1539 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1540
1541 my $tex = $self->{state} ? $tex[1] : $tex[0];
1542
1543 $tex->draw_quad (0, 0, $s, $s); 1911 $tex->draw_quad_alpha (0, 0, $s, $s);
1544
1545 glDisable GL_TEXTURE_2D; 1912 glDisable GL_TEXTURE_2D;
1546 glDisable GL_BLEND;
1547} 1913}
1548 1914
1549############################################################################# 1915#############################################################################
1550 1916
1551package CFClient::UI::Image; 1917package CFClient::UI::Image;
… …
1594 glTranslate 0, -$self->{w}, 0; 1960 glTranslate 0, -$self->{w}, 0;
1595 1961
1596 ($w, $h) = ($h, $w); 1962 ($w, $h) = ($h, $w);
1597 } 1963 }
1598 1964
1599 glEnable GL_BLEND;
1600 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1601 glEnable GL_TEXTURE_2D; 1965 glEnable GL_TEXTURE_2D;
1602 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1966 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1603 1967
1604 $tex->draw_quad (0, 0, $w, $h); 1968 $tex->draw_quad_alpha (0, 0, $w, $h);
1605 1969
1606 glDisable GL_BLEND;
1607 glDisable GL_TEXTURE_2D; 1970 glDisable GL_TEXTURE_2D;
1608} 1971}
1609 1972
1610############################################################################# 1973#############################################################################
1611 1974
… …
1659} 2022}
1660 2023
1661sub set_max { 2024sub set_max {
1662 my ($self, $max) = @_; 2025 my ($self, $max) = @_;
1663 2026
2027 return if $self->{max_val} == $max;
2028
1664 $self->{max_val} = $max; 2029 $self->{max_val} = $max;
2030 $self->update;
1665} 2031}
1666 2032
1667sub set_value { 2033sub set_value {
1668 my ($self, $val, $max) = @_; 2034 my ($self, $val, $max) = @_;
1669 2035
1670 $self->set_max ($max) 2036 $self->set_max ($max)
1671 if defined $max; 2037 if defined $max;
1672 2038
1673 $max = $self->{max_val}; 2039 return if $self->{val} == $val;
2040
1674 $self->{val} = $val; 2041 $self->{val} = $val;
1675
1676 $self->update; 2042 $self->update;
1677} 2043}
1678 2044
1679sub _draw { 2045sub _draw {
1680 my ($self) = @_; 2046 my ($self) = @_;
… …
1743 2109
1744sub new { 2110sub new {
1745 my ($class, %arg) = @_; 2111 my ($class, %arg) = @_;
1746 2112
1747 my $self = $class->SUPER::new ( 2113 my $self = $class->SUPER::new (
1748 tooltip => $arg{type}, 2114 tooltip => $arg{type},
2115 can_hover => 1,
2116 can_events => 1,
1749 %arg, 2117 %arg,
1750 ); 2118 );
1751 2119
1752 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1); 2120 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1753 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_events => 1, can_hover => 1); 2121 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1754 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999", can_events => 1, can_hover => 1); 2122 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1755 2123
1756 $self 2124 $self
1757} 2125}
1758 2126
1759sub set_fontsize { 2127sub set_fontsize {
… …
1761 2129
1762 $self->{value}->set_fontsize ($fsize); 2130 $self->{value}->set_fontsize ($fsize);
1763 $self->{max} ->set_fontsize ($fsize); 2131 $self->{max} ->set_fontsize ($fsize);
1764} 2132}
1765 2133
2134sub set_max {
2135 my ($self, $max) = @_;
2136
2137 $self->{gauge}->set_max ($max);
2138 $self->{max}->set_text ($max);
2139}
2140
1766sub set_value { 2141sub set_value {
1767 my ($self, $val, $max) = @_; 2142 my ($self, $val, $max) = @_;
1768 2143
1769 $self->set_max ($max) 2144 $self->set_max ($max)
1770 if defined $max; 2145 if defined $max;
1771 2146
1772 $self->{gauge}->set_value ($val, $max); 2147 $self->{gauge}->set_value ($val, $max);
1773 $self->{value}->set_text ($val); 2148 $self->{value}->set_text ($val);
1774}
1775
1776sub set_max {
1777 my ($self, $max) = @_;
1778
1779 $self->{gauge}->set_max ($max);
1780 $self->{max}->set_text ($max);
1781} 2149}
1782 2150
1783############################################################################# 2151#############################################################################
1784 2152
1785package CFClient::UI::Slider; 2153package CFClient::UI::Slider;
… …
1795 qw(s1_slider.png s1_slider_bg.png); 2163 qw(s1_slider.png s1_slider_bg.png);
1796 2164
1797sub new { 2165sub new {
1798 my $class = shift; 2166 my $class = shift;
1799 2167
1800 # range [value, low, high, page] 2168 # range [value, low, high, page, unit]
1801 2169
1802 # TODO: 0-width page 2170 # TODO: 0-width page
1803 # TODO: req_w/h are wrong with vertical 2171 # TODO: req_w/h are wrong with vertical
1804 # TODO: calculations are off 2172 # TODO: calculations are off
1805 my $self = $class->SUPER::new ( 2173 my $self = $class->SUPER::new (
1806 fg => [1, 1, 1], 2174 fg => [1, 1, 1],
1807 active_fg => [0, 0, 0], 2175 active_fg => [0, 0, 0],
2176 bg => [0, 0, 0, 0.2],
2177 active_bg => [1, 1, 1, 0.5],
1808 range => [0, 0, 100, 10], 2178 range => [0, 0, 100, 10, 0],
1809 req_w => 20, 2179 min_w => $::WIDTH / 80,
1810 req_h => 20, 2180 min_h => $::WIDTH / 80,
1811 vertical => 0, 2181 vertical => 0,
1812 can_hover => 1, 2182 can_hover => 1,
1813 inner_pad => 5, 2183 inner_pad => 0.02,
1814 @_ 2184 @_
1815 ); 2185 );
1816 2186
2187 $self->set_value ($self->{range}[0]);
2188 $self->update;
2189
1817 $self 2190 $self
1818} 2191}
1819 2192
2193sub changed { }
2194
2195sub set_range {
2196 my ($self, $range) = @_;
2197
2198 ($range, $self->{range}) = ($self->{range}, $range);
2199
2200 $self->update
2201 if "@$range" ne "@{$self->{range}}";
2202}
2203
2204sub set_value {
2205 my ($self, $value) = @_;
2206
2207 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2208
2209 $hi = $lo + 1 if $hi <= $lo;
2210
2211 $page = $hi - $lo if $page > $hi - $lo;
2212
2213 $value = $lo if $value < $lo;
2214 $value = $hi - $page if $value > $hi - $page;
2215
2216 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2217 if $unit;
2218
2219 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2220
2221 if ($value != $old_value) {
2222 $self->_emit (changed => $value);
2223 $self->update;
2224 }
2225}
2226
1820sub size_request { 2227sub size_request {
1821 my ($self) = @_; 2228 my ($self) = @_;
1822 2229
1823 my $w = $self->{req_w}; 2230 ($self->{req_w}, $self->{req_h})
1824 my $h = $self->{req_h};
1825
1826 $self->{vertical} ? ($h, $w) : ($w, $h)
1827} 2231}
1828 2232
1829sub button_down { 2233sub button_down {
1830 my ($self, $ev, $x, $y) = @_; 2234 my ($self, $ev, $x, $y) = @_;
1831 2235
1832 $self->SUPER::button_down ($ev, $x, $y); 2236 $self->SUPER::button_down ($ev, $x, $y);
2237
2238 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2239
1833 $self->mouse_motion ($ev, $x, $y); 2240 $self->mouse_motion ($ev, $x, $y);
1834} 2241}
1835 2242
1836sub mouse_motion { 2243sub mouse_motion {
1837 my ($self, $ev, $x, $y) = @_; 2244 my ($self, $ev, $x, $y) = @_;
1838 2245
1839 if ($GRAB == $self) { 2246 if ($GRAB == $self) {
2247 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2248
2249 my (undef, $lo, $hi, $page) = @{$self->{range}};
2250
2251 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2252
2253 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2254 }
2255}
2256
2257sub update {
2258 my ($self) = @_;
2259
2260 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2261 $self->set_value ($self->{range}[0]);
2262
1840 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2263 my ($value, $lo, $hi, $page) = @{$self->{range}};
2264 my $range = ($hi - $page - $lo) || 1e-100;
1841 2265
1842 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2266 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1843 2267
1844 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2268 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1845 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2269 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1846 2270
1847 $x -= $inner_pad_px; # substract the padding 2271 $value = ($value - $lo) / $range;
1848 $x = $x * ($hi - $lo) / $inner_w + $lo; 2272 $value = $value * $self->{scale} + $self->{offset};
1849 $x = $lo if $x < $lo;
1850 $x = $hi - $page if $x > $hi - $page;
1851 $self->{range}[0] = $x;
1852 2273
1853 $self->emit (changed => $x); 2274 $self->{knob_x} = $value - $knob_w * 0.5;
1854 $self->update; 2275 $self->{knob_w} = $knob_w;
1855 } 2276 });
1856}
1857 2277
1858# the inner_* stuff is for generating a padding for the slider handle, 2278 $self->SUPER::update;
1859# so that the handle doesn't leave the texture. This calculation isn't 100%
1860# correct propably, but it does the job for now
1861sub _calc_inner_pad_px {
1862 my ($self, $w) = @_;
1863 ($w / 100) * $self->{inner_pad} # % to pixels
1864} 2279}
1865 2280
1866sub _draw { 2281sub _draw {
1867 my ($self) = @_; 2282 my ($self) = @_;
1868 2283
1869 $self->SUPER::_draw (); 2284 $self->SUPER::_draw ();
1870 2285
1871 my ($w, $h) = @$self{qw(w h)}; 2286 glScale $self->{w}, $self->{h};
1872 2287
1873 if ($self->{vertical}) { 2288 if ($self->{vertical}) {
1874 # draw a vertical slider like a rotated horizontal slider 2289 # draw a vertical slider like a rotated horizontal slider
1875 2290
2291 glTranslate 1, 0, 0;
1876 glRotate 90, 0, 0, 1; 2292 glRotate 90, 0, 0, 1;
1877 glTranslate 0, -$self->{w}, 0;
1878
1879 ($w, $h) = ($h, $w);
1880 } 2293 }
1881 2294
1882 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2295 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1883 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2296 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1884 2297
1885 my ($value, $lo, $hi, $page) = @{$self->{range}};
1886
1887 $hi = $value + 1 if $lo == $hi;
1888
1889 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1890 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1891
1892 $page = int $page * $inner_w / ($hi - $lo);
1893 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1894
1895 $w -= $page;
1896 $page &= ~1;
1897 glTranslate $page * 0.5, 0, 0;
1898 $page ||= 2;
1899
1900 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1901 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1902
1903 glEnable GL_BLEND;
1904 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1905 glEnable GL_TEXTURE_2D; 2298 glEnable GL_TEXTURE_2D;
1906 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2299 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1907 2300
1908 # draw background 2301 # draw background
1909 $tex[1]->draw_quad (0, 0, $w, $h); 2302 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1910 2303
1911 # draw handle 2304 # draw handle
1912 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2305 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1913 2306
1914 glDisable GL_BLEND;
1915 glDisable GL_TEXTURE_2D; 2307 glDisable GL_TEXTURE_2D;
1916} 2308}
2309
2310#############################################################################
2311
2312package CFClient::UI::ValSlider;
2313
2314our @ISA = CFClient::UI::HBox::;
2315
2316sub new {
2317 my ($class, %arg) = @_;
2318
2319 my $range = delete $arg{range};
2320
2321 my $self = $class->SUPER::new (
2322 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2323 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2324 to_value => sub { shift },
2325 from_value => sub { shift },
2326 %arg,
2327 );
2328
2329 $self->{slider}->connect (changed => sub {
2330 my ($self, $value) = @_;
2331 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2332 $self->{parent}->emit (changed => $value);
2333 });
2334
2335# $self->{entry}->connect (changed => sub {
2336# my ($self, $value) = @_;
2337# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2338# $self->{parent}->emit (changed => $value);
2339# });
2340
2341 $self->add ($self->{slider}, $self->{entry});
2342
2343 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2344
2345 $self
2346}
2347
2348sub set_range { shift->{slider}->set_range (@_) }
2349sub set_value { shift->{slider}->set_value (@_) }
1917 2350
1918############################################################################# 2351#############################################################################
1919 2352
1920package CFClient::UI::TextView; 2353package CFClient::UI::TextView;
1921 2354
… …
1925 2358
1926sub new { 2359sub new {
1927 my $class = shift; 2360 my $class = shift;
1928 2361
1929 my $self = $class->SUPER::new ( 2362 my $self = $class->SUPER::new (
1930 fontsize => 1, 2363 fontsize => 1,
2364 can_events => 0,
1931 #font => default_font 2365 #font => default_font
1932 @_, 2366 @_,
1933 2367
1934 layout => (new CFClient::Layout), 2368 layout => (new CFClient::Layout 1),
1935 par => [], 2369 par => [],
1936 height => 0, 2370 height => 0,
1937 children => [ 2371 children => [
1938 (new CFClient::UI::Empty expand => 1), 2372 (new CFClient::UI::Empty expand => 1),
1939 (new CFClient::UI::Slider vertical => 1), 2373 (new CFClient::UI::Slider vertical => 1),
1940 ], 2374 ],
1941 ); 2375 );
1942 2376
1943 $self->{children}[1]->connect (changed => sub { 2377 $self->{children}[1]->connect (changed => sub { $self->update });
1944 $self->update;
1945 });
1946 2378
1947 $self 2379 $self
1948} 2380}
1949 2381
1950sub set_fontsize { 2382sub set_fontsize {
1951 my ($self, $fontsize) = @_; 2383 my ($self, $fontsize) = @_;
1952 2384
1953 $self->{fontsize} = $fontsize; 2385 $self->{fontsize} = $fontsize;
1954 $self->reflow; 2386 $self->reflow;
1955}
1956
1957sub text_height {
1958 my ($self, $text) = @_;
1959
1960 my $layout = $self->{layout};
1961
1962 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1963 $layout->set_width ($self->{w});
1964 $layout->set_text ($text);
1965
1966 ($layout->size)[1]
1967}
1968
1969sub reflow {
1970 my ($self) = @_;
1971
1972 $self->{need_reflow}++;
1973 $self->update;
1974} 2387}
1975 2388
1976sub size_allocate { 2389sub size_allocate {
1977 my ($self, $w, $h) = @_; 2390 my ($self, $w, $h) = @_;
1978 2391
… …
1983 $self->{layout}->set_width ($self->{children}[0]{w}); 2396 $self->{layout}->set_width ($self->{children}[0]{w});
1984 2397
1985 $self->reflow; 2398 $self->reflow;
1986} 2399}
1987 2400
2401sub text_size {
2402 my ($self, $text, $indent) = @_;
2403
2404 my $layout = $self->{layout};
2405
2406 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2407 $layout->set_width ($self->{children}[0]{w} - $indent);
2408 $layout->set_markup ($text);
2409
2410 $layout->size
2411}
2412
2413sub reflow {
2414 my ($self) = @_;
2415
2416 $self->{need_reflow}++;
2417 $self->update;
2418}
2419
2420sub set_offset {
2421 my ($self, $offset) = @_;
2422
2423 # todo: base offset on lines or so, not on pixels
2424 $self->{children}[1]->set_value ($offset);
2425}
2426
2427sub clear {
2428 my ($self) = @_;
2429
2430 $self->{par} = [];
2431 $self->{height} = 0;
2432 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2433}
2434
1988sub add_paragraph { 2435sub add_paragraph {
1989 my ($self, $color, $text) = @_; 2436 my ($self, $color, $text, $indent) = @_;
1990 2437
1991 #TODO: intelligently "reformat" paragraph 2438 for my $line (split /\n/, $text) {
1992 2439 my ($w, $h) = $self->text_size ($line);
1993 my $height = $self->text_height ($text);
1994
1995 $self->{height} += $height; 2440 $self->{height} += $h;
2441 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2442 }
1996 2443
1997 push @{$self->{par}}, [$height, $color, $text];
1998
1999 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2444 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2000 $self->{children}[1]->update;
2001} 2445}
2002 2446
2003sub update { 2447sub update {
2004 my ($self) = @_; 2448 my ($self) = @_;
2005 2449
… …
2007 2451
2008 return unless $self->{h} > 0; 2452 return unless $self->{h} > 0;
2009 2453
2010 delete $self->{texture}; 2454 delete $self->{texture};
2011 2455
2012 $ROOT->on_refresh ($self, sub { 2456 $ROOT->on_post_alloc ($self, sub {
2457 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2458
2013 if (delete $self->{need_reflow}) { 2459 if (delete $self->{need_reflow}) {
2014 my $height = 0; 2460 my $height = 0;
2015 2461
2016 $height += $_->[0] = $self->text_height ($_->[2]) 2462 my $layout = $self->{layout};
2463
2464 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2465
2017 for @{$self->{par}}; 2466 for (@{$self->{par}}) {
2467 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2468 $layout->set_width ($W - $_->[3]);
2469 $layout->set_markup ($_->[4]);
2470 my ($w, $h) = $layout->size;
2471 $_->[0] = $w + $_->[3];
2472 $_->[1] = $h;
2473 }
2474
2475 $height += $_->[1];
2476 }
2018 2477
2019 $self->{height} = $height; 2478 $self->{height} = $height;
2020 2479
2021 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2480 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2022 2481
2023 delete $self->{texture}; 2482 delete $self->{texture};
2024 } 2483 }
2025 2484
2026 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2485 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2027 glClearColor 0, 0, 0, 1; 2486 glClearColor 0.5, 0.5, 0.5, 0;
2028 glClear GL_COLOR_BUFFER_BIT; 2487 glClear GL_COLOR_BUFFER_BIT;
2029 2488
2489 my $top = int $self->{children}[1]{range}[0];
2490
2491 my $y0 = $top;
2492 my $y1 = $top + $H;
2493
2494 my $y = 0;
2495
2496 my $layout = $self->{layout};
2497
2498 $layout->set_font ($self->{font}) if $self->{font};
2499
2030 glEnable GL_BLEND; 2500 glEnable GL_BLEND;
2501 #TODO# not correct in windows where rgba is forced off
2031 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2502 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2032 glEnable GL_TEXTURE_2D;
2033 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2034
2035 my $top = int $self->{children}[1]{range}[0];
2036
2037 my $y0 = $top;
2038 my $y1 = $top + $self->{h};
2039
2040 my $y = 0;
2041
2042 my $layout = $self->{layout};
2043
2044 $layout->set_font ($self->{font}) if $self->{font};
2045 2503
2046 for my $par (@{$self->{par}}) { 2504 for my $par (@{$self->{par}}) {
2047 my $h = $par->[0]; 2505 my $h = $par->[1];
2048 2506
2049 if ($y0 < $y + $h && $y < $y1) { 2507 if ($y0 < $y + $h && $y < $y1) {
2508 $layout->set_foreground (@{ $par->[2] });
2509 $layout->set_width ($W - $par->[3]);
2050 $layout->set_text ($par->[2]); 2510 $layout->set_markup ($par->[4]);
2051 2511
2052 glColor @{ $par->[1] }; 2512 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2053 my ($W, $H) = $layout->size; 2513
2054 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2514 glRasterPos $par->[3], $y - $y0;
2515 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2055 } 2516 }
2056 2517
2057 $y += $h; 2518 $y += $h;
2058 } 2519 }
2059 2520
2060 glDisable GL_TEXTURE_2D;
2061 glDisable GL_BLEND; 2521 glDisable GL_BLEND;
2062 }; 2522 };
2063 }); 2523 });
2064} 2524}
2065 2525
2066sub _draw { 2526sub _draw {
2067 my ($self) = @_; 2527 my ($self) = @_;
2068 2528
2069 if ($self->{texture}) {
2070 glEnable GL_TEXTURE_2D; 2529 glEnable GL_TEXTURE_2D;
2071 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2531 glColor 1, 1, 1, 1;
2072 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2532 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2073 glDisable GL_TEXTURE_2D; 2533 glDisable GL_TEXTURE_2D;
2074 }
2075 2534
2076 $self->{children}[1]->draw; 2535 $self->{children}[1]->draw;
2077 2536
2078} 2537}
2079 2538
… …
2127 2586
2128sub new { 2587sub new {
2129 my $class = shift; 2588 my $class = shift;
2130 2589
2131 my $self = $class->SUPER::new ( 2590 my $self = $class->SUPER::new (
2132 state => 0, 2591 state => 0,
2133 connect_activate => \&toggle_flopper, 2592 on_activate => \&toggle_flopper,
2134 can_events => 1,
2135 @_ 2593 @_
2136 ); 2594 );
2137 2595
2138 if ($self->{state}) {
2139 $self->{state} = 0;
2140 $self->toggle_flopper;
2141 }
2142
2143 $self 2596 $self
2144} 2597}
2145 2598
2146sub toggle_flopper { 2599sub toggle_flopper {
2147 my ($self) = @_; 2600 my ($self) = @_;
2148 2601
2149 # TODO: use animation 2602 $self->{other}->toggle_visibility;
2150 if ($self->{state} = !$self->{state}) {
2151 $CFClient::UI::ROOT->add ($self->{other});
2152 $self->{other}->move ($self->coord2global (0, $self->{h}));
2153 $self->emit ("open");
2154 } else {
2155 $CFClient::UI::ROOT->remove ($self->{other});
2156 $self->emit ("close");
2157 }
2158
2159 $self->emit (changed => $self->{state});
2160} 2603}
2161 2604
2162############################################################################# 2605#############################################################################
2163 2606
2164package CFClient::UI::Tooltip; 2607package CFClient::UI::Tooltip;
… …
2174 @_, 2617 @_,
2175 can_events => 0, 2618 can_events => 0,
2176 ) 2619 )
2177} 2620}
2178 2621
2179sub set_text { 2622sub set_tooltip_from {
2180 my ($self, $text) = @_; 2623 my ($self, $widget) = @_;
2181 2624
2182 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2625 my $tooltip = $widget->{tooltip};
2183 $self->{label}->set_text ($text); 2626
2184 $self->add ($self->{label}); 2627 if ($ENV{CFPLUS_DEBUG} & 2) {
2628 $tooltip .= "\n\n" . (ref $widget) . "\n"
2629 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2630 . "req $widget->{req_w} $widget->{req_h}\n"
2631 . "visible $widget->{visible}";
2632 }
2633
2634 $self->add (new CFClient::UI::Label
2635 markup => $tooltip,
2636 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2637 fontsize => 0.8,
2638 fg => [0, 0, 0, 1],
2639 ellipsise => 0,
2640 font => ($widget->{tooltip_font} || $::FONT_PROP),
2641 );
2185} 2642}
2186 2643
2187sub size_request { 2644sub size_request {
2188 my ($self) = @_; 2645 my ($self) = @_;
2189 2646
2190 $self->child->set_max_size ($::WIDTH * 0.2);
2191
2192 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2647 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2193 2648
2194 ($w + 4, $h + 4) 2649 ($w + 4, $h + 4)
2195} 2650}
2196 2651
2652sub size_allocate {
2653 my ($self, $w, $h) = @_;
2654
2655 $self->SUPER::size_allocate ($w - 4, $h - 4);
2656}
2657
2658sub visibility_change {
2659 my ($self, $visible) = @_;
2660
2661 return unless $visible;
2662
2663 $self->{root}->on_post_alloc ("move_$self" => sub {
2664 my $widget = $self->{owner}
2665 or return;
2666
2667 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2668
2669 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2670 if $x + $self->{w} > $::WIDTH;
2671
2672 $self->move_abs ($x, $y);
2673 });
2674}
2675
2197sub _draw { 2676sub _draw {
2198 my ($self) = @_; 2677 my ($self) = @_;
2199 2678
2200 glPushMatrix;
2201 glTranslate 0.375, 0.375; 2679 glTranslate 0.375, 0.375;
2202 2680
2203 my ($w, $h) = @$self{qw(w h)}; 2681 my ($w, $h) = @$self{qw(w h)};
2204 2682
2205 glColor 1, 0.8, 0.4; 2683 glColor 1, 0.8, 0.4;
… …
2216 glVertex 0 , $h; 2694 glVertex 0 , $h;
2217 glVertex $w, $h; 2695 glVertex $w, $h;
2218 glVertex $w, 0; 2696 glVertex $w, 0;
2219 glEnd; 2697 glEnd;
2220 2698
2221 glPopMatrix; 2699 glTranslate 2 - 0.375, 2 - 0.375;
2222 2700
2223 glTranslate 2, 2;
2224 $self->SUPER::_draw; 2701 $self->SUPER::_draw;
2225} 2702}
2226 2703
2227############################################################################# 2704#############################################################################
2228 2705
2706package CFClient::UI::Face;
2707
2708our @ISA = CFClient::UI::Base::;
2709
2710use CFClient::OpenGL;
2711
2712sub new {
2713 my $class = shift;
2714
2715 my $self = $class->SUPER::new (
2716 aspect => 1,
2717 can_events => 0,
2718 @_,
2719 );
2720
2721 if ($self->{anim} && $self->{animspeed}) {
2722 Scalar::Util::weaken (my $widget = $self);
2723
2724 $self->{timer} = Event->timer (
2725 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2726 hard => 1,
2727 interval => $self->{animspeed},
2728 cb => sub {
2729 ++$widget->{frame};
2730 $widget->update;
2731 },
2732 );
2733 }
2734
2735 $self
2736}
2737
2738sub size_request {
2739 (32, 8)
2740}
2741
2742sub update {
2743 my ($self) = @_;
2744
2745 return unless $self->{visible};
2746
2747 $self->SUPER::update;
2748}
2749
2750sub _draw {
2751 my ($self) = @_;
2752
2753 return unless $::CONN;
2754
2755 my $face;
2756
2757 if ($self->{frame}) {
2758 my $anim = $::CONN->{anim}[$self->{anim}];
2759
2760 $face = $anim->[ $self->{frame} % @$anim ]
2761 if $anim && @$anim;
2762 }
2763
2764 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2765
2766 if ($tex) {
2767 glEnable GL_TEXTURE_2D;
2768 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2769 glColor 1, 1, 1, 1;
2770 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2771 glDisable GL_TEXTURE_2D;
2772 }
2773}
2774
2775sub DESTROY {
2776 my ($self) = @_;
2777
2778 $self->{timer}->cancel
2779 if $self->{timer};
2780
2781 $self->SUPER::DESTROY;
2782}
2783
2784#############################################################################
2785
2786package CFClient::UI::Menu;
2787
2788our @ISA = CFClient::UI::FancyFrame::;
2789
2790use CFClient::OpenGL;
2791
2792sub new {
2793 my $class = shift;
2794
2795 my $self = $class->SUPER::new (
2796 items => [],
2797 z => 100,
2798 @_,
2799 );
2800
2801 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2802
2803 for my $item (@{ $self->{items} }) {
2804 my ($widget, $cb) = @$item;
2805
2806 # handle various types of items, only text for now
2807 if (!ref $widget) {
2808 $widget = new CFClient::UI::Label
2809 can_hover => 1,
2810 can_events => 1,
2811 text => $widget;
2812 }
2813
2814 $self->{item}{$widget} = $item;
2815
2816 $self->{vbox}->add ($widget);
2817 }
2818
2819 $self
2820}
2821
2822# popup given the event (must be a mouse button down event currently)
2823sub popup {
2824 my ($self, $ev) = @_;
2825
2826 $self->_emit ("popdown");
2827
2828 # maybe save $GRAB? must be careful about events...
2829 $GRAB = $self;
2830 $self->{button} = $ev->{button};
2831
2832 $self->show;
2833 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2834}
2835
2836sub mouse_motion {
2837 my ($self, $ev, $x, $y) = @_;
2838
2839 # TODO: should use vbox->find_widget or so
2840 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2841 $self->{hover} = $self->{item}{$HOVER};
2842}
2843
2844sub button_up {
2845 my ($self, $ev, $x, $y) = @_;
2846
2847 if ($ev->{button} == $self->{button}) {
2848 undef $GRAB;
2849 $self->hide;
2850
2851 $self->_emit ("popdown");
2852 $self->{hover}[1]->() if $self->{hover};
2853 }
2854}
2855
2856#############################################################################
2857
2858package CFClient::UI::Statusbox;
2859
2860our @ISA = CFClient::UI::VBox::;
2861
2862sub new {
2863 my $class = shift;
2864
2865 $class->SUPER::new (
2866 fontsize => 0.8,
2867 @_,
2868 )
2869}
2870
2871sub reorder {
2872 my ($self) = @_;
2873 my $NOW = time;
2874
2875 while (my ($k, $v) = each %{ $self->{item} }) {
2876 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2877 }
2878
2879 my @widgets;
2880
2881 my @items = sort {
2882 $a->{pri} <=> $b->{pri}
2883 or $b->{id} <=> $a->{id}
2884 } values %{ $self->{item} };
2885
2886 my $count = 10 + 1;
2887 for my $item (@items) {
2888 last unless --$count;
2889
2890 push @widgets, $item->{label} ||= do {
2891 # TODO: doesn't handle markup well (read as: at all)
2892 my $short = $item->{count} > 1
2893 ? "<b>$item->{count} ×</b> $item->{text}"
2894 : $item->{text};
2895
2896 for ($short) {
2897 s/^\s+//;
2898 s/\s+/ /g;
2899 }
2900
2901 new CFClient::UI::Label
2902 markup => $short,
2903 tooltip => $item->{tooltip},
2904 tooltip_font => $::FONT_PROP,
2905 tooltip_width => 0.67,
2906 fontsize => $item->{fontsize} || $self->{fontsize},
2907 max_w => $::WIDTH * 0.44,
2908 fg => $item->{fg},
2909 can_events => 1,
2910 can_hover => 1
2911 };
2912 }
2913
2914 $self->clear;
2915 $self->SUPER::add (reverse @widgets);
2916}
2917
2918sub add {
2919 my ($self, $text, %arg) = @_;
2920
2921 $text =~ s/^\s+//;
2922 $text =~ s/\s+$//;
2923
2924 return unless $text;
2925
2926 my $timeout = time + ((delete $arg{timeout}) || 60);
2927
2928 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2929
2930 if (my $item = $self->{item}{$group}) {
2931 if ($item->{text} eq $text) {
2932 $item->{count}++;
2933 } else {
2934 $item->{count} = 1;
2935 $item->{text} = $item->{tooltip} = $text;
2936 }
2937 $item->{id} = ++$self->{id};
2938 $item->{timeout} = $timeout;
2939 delete $item->{label};
2940 } else {
2941 $self->{item}{$group} = {
2942 id => ++$self->{id},
2943 text => $text,
2944 timeout => $timeout,
2945 tooltip => $text,
2946 fg => [0.8, 0.8, 0.8, 0.8],
2947 pri => 0,
2948 count => 1,
2949 %arg,
2950 };
2951 }
2952
2953 $self->reorder;
2954}
2955
2956sub reconfigure {
2957 my ($self) = @_;
2958
2959 delete $_->{label}
2960 for values %{ $self->{item} || {} };
2961
2962 $self->reorder;
2963 $self->SUPER::reconfigure;
2964}
2965
2966#############################################################################
2967
2968package CFClient::UI::Inventory;
2969
2970our @ISA = CFClient::UI::ScrolledWindow::;
2971
2972sub new {
2973 my $class = shift;
2974
2975 my $self = $class->SUPER::new (
2976 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2977 @_,
2978 );
2979
2980 $self
2981}
2982
2983sub set_items {
2984 my ($self, $items) = @_;
2985
2986 $self->{scrolled}->clear;
2987 return unless $items;
2988
2989 my @items = sort {
2990 ($a->{type} <=> $b->{type})
2991 or ($a->{name} cmp $b->{name})
2992 } @$items;
2993
2994 $self->{real_items} = \@items;
2995
2996 my $row = 0;
2997 for my $item (@items) {
2998 CFClient::Item::update_widgets $item;
2999
3000 $self->{scrolled}->add (0, $row, $item->{face_widget});
3001 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3002 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3003
3004 $row++;
3005 }
3006}
3007
3008#############################################################################
3009
3010package CFClient::UI::BindEditor;
3011
3012our @ISA = CFClient::UI::FancyFrame::;
3013
3014sub new {
3015 my $class = shift;
3016
3017 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3018
3019 $self->add (my $vb = new CFClient::UI::VBox);
3020
3021
3022 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3023 text => "start recording",
3024 tooltip => "Start/Stops recording of actions."
3025 ."All subsequent actions after the recording started will be captured."
3026 ."The actions are displayed after the record was stopped."
3027 ."To bind the action you have to click on the 'Bind' button",
3028 on_activate => sub {
3029 unless ($self->{recording}) {
3030 $self->start;
3031 } else {
3032 $self->stop;
3033 }
3034 });
3035
3036 $vb->add (new CFClient::UI::Label text => "Actions:");
3037 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3038
3039 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3040 $vb->add (my $hb = new CFClient::UI::HBox);
3041 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3042 $hb->add (new CFClient::UI::Button
3043 text => "bind",
3044 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3045 on_activate => sub {
3046 $self->ask_for_bind;
3047 });
3048
3049 $vb->add (my $hb = new CFClient::UI::HBox);
3050 $hb->add (new CFClient::UI::Button
3051 text => "ok",
3052 expand => 1,
3053 tooltip => "This closes the binding editor and saves the binding",
3054 on_activate => sub {
3055 $self->hide;
3056 $self->commit;
3057 });
3058
3059 $hb->add (new CFClient::UI::Button
3060 text => "cancel",
3061 expand => 1,
3062 tooltip => "This closes the binding editor without saving",
3063 on_activate => sub {
3064 $self->hide;
3065 $self->{binding_cancel}->()
3066 if $self->{binding_cancel};
3067 });
3068
3069 $self->update_binding_widgets;
3070
3071 $self
3072}
3073
3074sub commit {
3075 my ($self) = @_;
3076 my ($mod, $sym, $cmds) = $self->get_binding;
3077 if ($sym != 0 && @$cmds > 0) {
3078 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3079 ."'. Don't forget 'Save Config'!");
3080 $self->{binding_change}->($mod, $sym, $cmds)
3081 if $self->{binding_change};
3082 } else {
3083 $::STATUSBOX->add ("No action bound, no key or action specified!");
3084 $self->{binding_cancel}->()
3085 if $self->{binding_cancel};
3086 }
3087}
3088
3089sub start {
3090 my ($self) = @_;
3091
3092 $self->{rec_btn}->set_text ("stop recording");
3093 $self->{recording} = 1;
3094 $self->clear_command_list;
3095 $::CONN->start_record if $::CONN;
3096}
3097
3098sub stop {
3099 my ($self) = @_;
3100
3101 $self->{rec_btn}->set_text ("start recording");
3102 $self->{recording} = 0;
3103
3104 my $rec;
3105 $rec = $::CONN->stop_record if $::CONN;
3106 return unless ref $rec eq 'ARRAY';
3107 $self->set_command_list ($rec);
3108}
3109
3110# if $commit is true, the binding will be set after the user entered a key combo
3111sub ask_for_bind {
3112 my ($self, $commit) = @_;
3113
3114 CFClient::Binder::open_binding_dialog (sub {
3115 my ($mod, $sym) = @_;
3116 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3117 $self->update_binding_widgets;
3118 $self->commit if $commit;
3119 });
3120}
3121
3122# $mod and $sym are the modifiers and key symbol
3123# $cmds is a array ref of strings (the commands)
3124# $cb is the callback that is executed on OK
3125# $ccb is the callback that is executed on CANCEL and
3126# when the binding was unsuccessful on OK
3127sub set_binding {
3128 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3129
3130 $self->clear_command_list;
3131 $self->{recording} = 0;
3132 $self->{rec_btn}->set_text ("start recording");
3133
3134 $self->{binding} = [$mod, $sym];
3135 $self->{commands} = $cmds;
3136
3137 $self->{binding_change} = $cb;
3138 $self->{binding_cancel} = $ccb;
3139
3140 $self->update_binding_widgets;
3141}
3142
3143# this is a shortcut method that asks for a binding
3144# and then just binds it.
3145sub do_quick_binding {
3146 my ($self, $cmds) = @_;
3147 $self->set_binding (undef, undef, $cmds, sub {
3148 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3149 });
3150 $self->ask_for_bind (1);
3151}
3152
3153sub update_binding_widgets {
3154 my ($self) = @_;
3155 my ($mod, $sym, $cmds) = $self->get_binding;
3156 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3157 $self->set_command_list ($cmds);
3158}
3159
3160sub get_binding {
3161 my ($self) = @_;
3162 return (
3163 $self->{binding}->[0],
3164 $self->{binding}->[1],
3165 [ grep { defined $_ } @{$self->{commands}} ]
3166 );
3167}
3168
3169sub clear_command_list {
3170 my ($self) = @_;
3171 $self->{cmdbox}->clear ();
3172}
3173
3174sub set_command_list {
3175 my ($self, $cmds) = @_;
3176
3177 $self->{cmdbox}->clear ();
3178 $self->{commands} = $cmds;
3179
3180 my $idx = 0;
3181
3182 for (@$cmds) {
3183 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3184
3185 my $i = $idx;
3186 $hb->add (new CFClient::UI::Label text => $_);
3187 $hb->add (new CFClient::UI::Button
3188 text => "delete",
3189 tooltip => "Deletes the action from the record",
3190 on_activate => sub {
3191 $self->{cmdbox}->remove ($hb);
3192 $cmds->[$i] = undef;
3193 });
3194
3195
3196 $idx++
3197 }
3198}
3199
3200#############################################################################
3201
3202package CFClient::UI::SpellList;
3203
3204our @ISA = CFClient::UI::FancyFrame::;
3205
3206sub new {
3207 my $class = shift;
3208
3209 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3210
3211 $self->add (new CFClient::UI::ScrolledWindow
3212 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3213
3214 $self;
3215}
3216
3217# XXX: Do sorting? Argl...
3218sub add_spell {
3219 my ($self, $spell) = @_;
3220 $self->{spells}->{$spell->{name}} = $spell;
3221
3222 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3223 face => $spell->{face},
3224 can_hover => 1,
3225 can_events => 1,
3226 tooltip => $spell->{message});
3227
3228 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3229 text => $spell->{name},
3230 can_hover => 1,
3231 can_events => 1,
3232 tooltip => $spell->{message},
3233 expand => 1);
3234
3235 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3236 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3237 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3238 expand => 1);
3239
3240 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3241 text => "bind to key",
3242 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3243}
3244
3245sub rebuild_spell_list {
3246 my ($self) = @_;
3247 $self->{tbl_idx} = 0;
3248 $self->add_spell ($_) for values %{$self->{spells}};
3249}
3250
3251sub remove_spell {
3252 my ($self, $spell) = @_;
3253 delete $self->{spells}->{$spell->{name}};
3254 $self->rebuild_spell_list;
3255}
3256
3257#############################################################################
3258
2229package CFClient::UI::Root; 3259package CFClient::UI::Root;
2230 3260
2231our @ISA = CFClient::UI::Container::; 3261our @ISA = CFClient::UI::Container::;
2232 3262
2233use CFClient::OpenGL; 3263use CFClient::OpenGL;
2234 3264
2235sub check_size { 3265sub new {
2236 my ($self) = @_; 3266 my $class = shift;
2237 3267
2238 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3268 my $self = $class->SUPER::new (
3269 visible => 1,
3270 @_,
3271 );
3272
3273 Scalar::Util::weaken ($self->{root} = $self);
3274
3275 $self
2239} 3276}
2240 3277
2241sub size_request { 3278sub size_request {
2242 ($::WIDTH, $::HEIGHT) 3279 my ($self) = @_;
2243}
2244 3280
2245sub configure { 3281 ($self->{w}, $self->{h})
3282}
3283
3284sub _to_pixel {
3285 my ($coord, $size, $max) = @_;
3286
3287 $coord =
3288 $coord eq "center" ? ($max - $size) * 0.5
3289 : $coord eq "max" ? $max
3290 : $coord;
3291
3292 $coord = 0 if $coord < 0;
3293 $coord = $max - $size if $coord > $max - $size;
3294
3295 int $coord + 0.5
3296}
3297
3298sub size_allocate {
2246 my ($self, $x, $y, $w, $h) = @_; 3299 my ($self, $w, $h) = @_;
2247 3300
2248 $self->SUPER::configure ($x, $y, $w, $h);
2249
2250 for my $child (@{$self->{children}}) { 3301 for my $child ($self->children) {
2251 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3302 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2252 3303
2253 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3304 $X = $child->{force_x} if exists $child->{force_x};
2254 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3305 $Y = $child->{force_y} if exists $child->{force_y};
3306
3307 $X = _to_pixel $X, $W, $self->{w};
3308 $Y = _to_pixel $Y, $H, $self->{h};
3309
2255 $child->configure ($X, $Y, $W,$H); 3310 $child->configure ($X, $Y, $W, $H);
2256 } 3311 }
2257} 3312}
2258 3313
2259sub _topleft { 3314sub coord2local {
2260 my ($self, $x, $y) = @_; 3315 my ($self, $x, $y) = @_;
2261 3316
2262 ($x, $y) 3317 ($x, $y)
2263} 3318}
2264 3319
3320sub coord2global {
3321 my ($self, $x, $y) = @_;
3322
3323 ($x, $y)
3324}
3325
2265sub update { 3326sub update {
2266 my ($self) = @_; 3327 my ($self) = @_;
2267 3328
2268 $self->check_size; 3329 $::WANT_REFRESH++;
2269 ::refresh ();
2270} 3330}
2271 3331
2272sub add { 3332sub add {
2273 my ($self, $child) = @_; 3333 my ($self, @children) = @_;
2274 3334
2275 # integerize window positions 3335 $_->{is_toplevel} = 1
2276 $child->{x} = int $child->{x}; 3336 for @children;
2277 $child->{y} = int $child->{y};
2278 3337
2279 $self->SUPER::add ($child); 3338 $self->SUPER::add (@children);
3339}
3340
3341sub remove {
3342 my ($self, @children) = @_;
3343
3344 $self->SUPER::remove (@children);
3345
3346 delete $self->{is_toplevel}
3347 for @children;
3348
3349 while (@children) {
3350 my $w = pop @children;
3351 push @children, $w->children;
3352 $w->set_invisible;
3353 }
2280} 3354}
2281 3355
2282sub on_refresh { 3356sub on_refresh {
2283 my ($self, $id, $cb) = @_; 3357 my ($self, $id, $cb) = @_;
2284 3358
2285 $self->{refresh_hook}{$id} = $cb; 3359 $self->{refresh_hook}{$id} = $cb;
2286} 3360}
2287 3361
3362sub on_post_alloc {
3363 my ($self, $id, $cb) = @_;
3364
3365 $self->{post_alloc_hook}{$id} = $cb;
3366}
3367
2288sub draw { 3368sub draw {
2289 my ($self) = @_; 3369 my ($self) = @_;
2290 3370
2291 while (my $rcb = delete $self->{refresh_hook}) { 3371 while ($self->{refresh_hook}) {
2292 $_->() for values %$rcb; 3372 $_->()
3373 for values %{delete $self->{refresh_hook}};
2293 } 3374 }
3375
3376 if ($self->{realloc}) {
3377 my @queue;
3378
3379 while () {
3380 if ($self->{realloc}) {
3381 #TODO use array-of-depth approach
3382
3383 use sort 'stable';
3384
3385 @queue = sort { $a->{visible} <=> $b->{visible} }
3386 @queue, values %{delete $self->{realloc}};
3387 }
3388
3389 my $widget = pop @queue || last;
3390
3391 $widget->{visible} or last; # do not resize invisible widgets
3392
3393 my ($w, $h) = $widget->size_request;
3394
3395 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3396 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3397
3398 $w = $widget->{force_w} if exists $widget->{force_w};
3399 $h = $widget->{force_h} if exists $widget->{force_h};
3400
3401 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3402 || delete $widget->{force_realloc}) {
3403 $widget->{req_w} = $w;
3404 $widget->{req_h} = $h;
3405
3406 $self->{size_alloc}{$widget+0} = $widget;
3407
3408 if (my $parent = $widget->{parent}) {
3409 $self->{realloc}{$parent+0} = $parent;
3410 #unshift @queue, $parent;
3411 $parent->{force_size_alloc} = 1;
3412 $self->{size_alloc}{$parent+0} = $parent;
3413 }
3414 }
3415
3416 delete $self->{realloc}{$widget+0};
3417 }
3418 }
3419
3420 while (my $size_alloc = delete $self->{size_alloc}) {
3421 my @queue = sort { $b->{visible} <=> $a->{visible} }
3422 values %$size_alloc;
3423
3424 while () {
3425 my $widget = pop @queue || last;
3426
3427 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3428
3429 $w = 0 if $w < 0;
3430 $h = 0 if $h < 0;
3431
3432 $w = int $w + 0.5;
3433 $h = int $h + 0.5;
3434
3435 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3436 $widget->{w} = $w;
3437 $widget->{h} = $h;
3438
3439 $widget->emit (size_allocate => $w, $h);
3440 }
3441 }
3442 }
3443
3444 while ($self->{post_alloc_hook}) {
3445 $_->()
3446 for values %{delete $self->{post_alloc_hook}};
3447 }
3448
2294 3449
2295 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3450 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2296 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3451 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2297 glClear GL_COLOR_BUFFER_BIT; 3452 glClear GL_COLOR_BUFFER_BIT;
2298 3453
2299 glMatrixMode GL_PROJECTION; 3454 glMatrixMode GL_PROJECTION;
2300 glLoadIdentity; 3455 glLoadIdentity;
2301 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3456 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2302 glMatrixMode GL_MODELVIEW; 3457 glMatrixMode GL_MODELVIEW;
2303 glLoadIdentity; 3458 glLoadIdentity;
2304 3459
2305 $self->_draw; 3460 $self->_draw;
2306} 3461}
… …
2308############################################################################# 3463#############################################################################
2309 3464
2310package CFClient::UI; 3465package CFClient::UI;
2311 3466
2312$ROOT = new CFClient::UI::Root; 3467$ROOT = new CFClient::UI::Root;
2313$TOOLTIP = new CFClient::UI::Tooltip; 3468$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2314 3469
23151 34701
2316 3471

Diff Legend

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