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.235 by root, Thu May 25 16:35:42 2006 UTC vs.
Revision 1.279 by root, Mon Jun 5 00:17:47 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
18 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
19sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
20 if (!$GRAB) { 47 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
25 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
26 54
27 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
28 56
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 58
31 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 60 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 61 }
43 62
44 return; 63 return;
45 } 64 }
46 } 65 }
… …
152sub rescale_widgets { 171sub rescale_widgets {
153 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
154 173
155 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
156 if ($widget->{is_toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
157 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
158 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
159 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
162 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
163 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
165 } 189 }
166 } 190 }
167 191
168 reconfigure_widgets; 192 reconfigure_widgets;
169} 193}
… …
178 202
179sub new { 203sub new {
180 my $class = shift; 204 my $class = shift;
181 205
182 my $self = bless { 206 my $self = bless {
183 x => 0, 207 x => "center",
184 y => 0, 208 y => "center",
185 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
186 can_events => 1, 212 can_events => 1,
187 @_ 213 @_
188 }, $class; 214 }, $class;
189 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
190 for (keys %$self) { 218 for (keys %$self) {
191 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
192 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
193 } 221 }
194 } 222 }
195 223
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
197 235
198 $self 236 $self
199} 237}
200 238
201sub destroy { 239sub destroy {
… …
205 %$self = (); 243 %$self = ();
206} 244}
207 245
208sub show { 246sub show {
209 my ($self) = @_; 247 my ($self) = @_;
248
210 return if $self->{parent}; 249 return if $self->{parent};
211 250
212 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
213} 252}
214 253
215sub show_centered { 254sub set_visible {
216 my ($self) = @_; 255 my ($self) = @_;
256
217 return if $self->{parent}; 257 return if $self->{visible};
218 258
219 $self->show; 259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
220 261
221 $CFClient::UI::ROOT->on_post_alloc ( 262 $self->emit (visibility_change => 1);
222 "centered $self" => sub { 263
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 264 $self->realloc if !exists $self->{req_w};
224 }, 265
225 ); 266 $_->set_visible for $self->children;
226} 267}
227 268
228sub set_invisible { 269sub set_invisible {
229 my ($self) = @_; 270 my ($self) = @_;
230 271
231 # broken show/hide model 272 return unless $self->{visible};
232 273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
233 delete $self->{visible}; 277 delete $self->{visible};
234 278
235 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
237 281
238 CFClient::UI::check_tooltip 282 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self; 283 if $TOOLTIP->{owner} == $self;
240 284
241 $self->focus_out; 285 $self->focus_out;
286
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
242} 305}
243 306
244sub hide { 307sub hide {
245 my ($self) = @_; 308 my ($self) = @_;
246 309
… …
248 311
249 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
250 if $self->{parent}; 313 if $self->{parent};
251} 314}
252 315
253sub move { 316sub move_abs {
254 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
255 318
256 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
257 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
258 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
259 322
260 $self->update; 323 $self->update;
261} 324}
262 325
263sub set_size { 326sub set_size {
264 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
265 328
266 $self->{user_w} = $w; 329 $self->{force_w} = $w;
267 $self->{user_h} = $h; 330 $self->{force_h} = $h;
268 331
269 $self->check_size; 332 $self->realloc;
270} 333}
271 334
272sub size_request { 335sub size_request {
273 require Carp; 336 require Carp;
274 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
276 339
277sub configure { 340sub configure {
278 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
279 342
280 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
281 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
282 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
283 348
284 # use alignment to adjust x, y 349 # use alignment to adjust x, y
285 350
286 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
287 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
288
289 ($w, $h) = ($w2, $h2);
290 } 353 }
291 354
292 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
293 $self->{x} = $x; 356 $self->{x} = $x;
294 $self->{y} = $y; 357 $self->{y} = $y;
295 $self->update; 358 $self->update;
296 } 359 }
297 360
298 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
299 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
300 } 368 }
301} 369}
302 370
303sub size_allocate { 371sub size_allocate {
304 # nothing to be done 372 # nothing to be done
305} 373}
306 374
307sub reconfigure {
308 my ($self) = @_;
309
310 $self->check_size (1);
311 $self->update;
312}
313
314sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
315} 381}
316 382
317sub set_max_size { 383sub set_max_size {
318 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
319 385
… …
378 444
379 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
380 unless $FOCUS; 446 unless $FOCUS;
381} 447}
382 448
383sub mouse_motion { } 449sub mouse_motion { 0 }
384sub button_up { } 450sub button_up { 0 }
385sub key_down { } 451sub key_down { 0 }
386sub key_up { } 452sub key_up { 0 }
387 453
388sub button_down { 454sub button_down {
389 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
390 456
391 $self->focus_in; 457 $self->focus_in;
392}
393 458
394sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
395sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
396sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
397sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
398sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 463 my ($self, $x, $y) = @_;
464
465 return () unless $self->{can_events};
466
467 return $self
468 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
469 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
470
471 ()
472}
473
474sub set_parent {
475 my ($self, $parent) = @_;
476
477 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502}
503
504sub realloc {
505 my ($self) = @_;
506
507 if ($self->{visible}) {
508 return if $self->{root}{realloc}{$self+0};
509
510 $self->{root}{realloc}{$self+0} = $self;
511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
516}
517
518sub update {
519 my ($self) = @_;
520
521 $self->{parent}->update
522 if $self->{parent};
523}
524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
399 535
400sub draw { 536sub draw {
401 my ($self) = @_; 537 my ($self) = @_;
402 538
403 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
404 550
405 glPushMatrix; 551 glPushMatrix;
406 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
407 $self->_draw;
408 glPopMatrix;
409 553
410 if ($self == $HOVER && $self->{can_hover}) { 554 if ($self == $HOVER && $self->{can_hover}) {
411 my ($x, $y) = @$self{qw(x y)};
412
413 glColor 1, 0.8, 0.5, 0.2; 555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
414 glEnable GL_BLEND; 556 glEnable GL_BLEND;
415 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
416 glBegin GL_QUADS; 558 glBegin GL_QUADS;
417 glVertex $x , $y; 559 glVertex 0 , 0;
418 glVertex $x + $self->{w}, $y; 560 glVertex $self->{w}, 0;
419 glVertex $x + $self->{w}, $y + $self->{h}; 561 glVertex $self->{w}, $self->{h};
420 glVertex $x , $y + $self->{h}; 562 glVertex 0 , $self->{h};
421 glEnd; 563 glEnd;
422 glDisable GL_BLEND; 564 glDisable GL_BLEND;
423 } 565 }
424 566
425 if ($ENV{PCLIENT_DEBUG}) { 567 if ($ENV{CFPLUS_DEBUG} & 1) {
426 glPushMatrix; 568 glPushMatrix;
427 glColor 1, 1, 0, 1; 569 glColor 1, 1, 0, 1;
428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 570 glTranslate 0.375, 0.375;
429 glBegin GL_LINE_LOOP; 571 glBegin GL_LINE_LOOP;
430 glVertex 0 , 0; 572 glVertex 0 , 0;
431 glVertex $self->{w} - 1, 0; 573 glVertex $self->{w} - 1, 0;
432 glVertex $self->{w} - 1, $self->{h} - 1; 574 glVertex $self->{w} - 1, $self->{h} - 1;
433 glVertex 0 , $self->{h} - 1; 575 glVertex 0 , $self->{h} - 1;
434 glEnd; 576 glEnd;
435 glPopMatrix; 577 glPopMatrix;
436 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 578 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
437 } 579 }
580
581 $self->_draw;
582 glPopMatrix;
438} 583}
439 584
440sub _draw { 585sub _draw {
441 my ($self) = @_; 586 my ($self) = @_;
442 587
443 warn "no draw defined for $self\n"; 588 warn "no draw defined for $self\n";
444}
445
446sub find_widget {
447 my ($self, $x, $y) = @_;
448
449 return () unless $self->{can_events};
450
451 return $self
452 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
453 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
454
455 ()
456}
457
458sub set_parent {
459 my ($self, $parent) = @_;
460
461 Scalar::Util::weaken ($self->{parent} = $parent);
462
463 # TODO: req_w _does_change after ->reconfigure
464 $self->check_size
465 unless exists $self->{req_w};
466
467 $self->show;
468}
469
470sub check_size {
471 my ($self, $forced) = @_;
472
473 $self->{force_alloc} = 1 if $forced;
474 $CFClient::UI::ROOT->{check_size}{$self} = $self;
475}
476
477sub update {
478 my ($self) = @_;
479
480 $self->{parent}->update
481 if $self->{parent};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501} 589}
502 590
503sub DESTROY { 591sub DESTROY {
504 my ($self) = @_; 592 my ($self) = @_;
505 593
… …
537 625
538 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
539 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
540 628
541 glEnable GL_BLEND; 629 glEnable GL_BLEND;
542 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
543 glColor @$color; 631 glColor_premultiply @$color;
544 632
545 glBegin GL_QUADS; 633 glBegin GL_QUADS;
546 glVertex 0 , 0; 634 glVertex 0 , 0;
547 glVertex 0 , $h; 635 glVertex 0 , $h;
548 glVertex $w, $h; 636 glVertex $w, $h;
… …
563 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
564 $class->SUPER::new (can_events => 0, %arg); 652 $class->SUPER::new (can_events => 0, %arg);
565} 653}
566 654
567sub size_request { 655sub size_request {
568 (0, 0) 656 my ($self) = @_;
657
658 ($self->{w} + 0, $self->{h} + 0)
569} 659}
570 660
571sub draw { } 661sub draw { }
572 662
573############################################################################# 663#############################################################################
… …
577our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
578 668
579sub new { 669sub new {
580 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
581 671
582 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
583 673
584 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
585 children => [], 675 children => [],
586 can_events => 0, 676 can_events => 0,
587 %arg, 677 %arg,
588 ); 678 );
679
589 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
590 682
591 $self 683 $self
592} 684}
593 685
594sub add { 686sub add {
… …
602 $self->{children} = [ 694 $self->{children} = [
603 sort { $a->{z} <=> $b->{z} } 695 sort { $a->{z} <=> $b->{z} }
604 @{$self->{children}}, @widgets 696 @{$self->{children}}, @widgets
605 ]; 697 ];
606 698
607 $self->check_size (1); 699 $self->realloc;
608 $self->update;
609} 700}
610 701
611sub children { 702sub children {
612 @{ $_[0]{children} } 703 @{ $_[0]{children} }
613} 704}
… …
618 delete $child->{parent}; 709 delete $child->{parent};
619 $child->hide; 710 $child->hide;
620 711
621 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
622 713
623 $self->check_size; 714 $self->realloc;
624 $self->update;
625} 715}
626 716
627sub clear { 717sub clear {
628 my ($self) = @_; 718 my ($self) = @_;
629 719
… …
633 for (@$children) { 723 for (@$children) {
634 delete $_->{parent}; 724 delete $_->{parent};
635 $_->hide; 725 $_->hide;
636 } 726 }
637 727
638 $self->check_size; 728 $self->realloc;
639 $self->update;
640} 729}
641 730
642sub find_widget { 731sub find_widget {
643 my ($self, $x, $y) = @_; 732 my ($self, $x, $y) = @_;
644 733
645 $x -= $self->{x}; 734 $x -= $self->{x};
646 $y -= $self->{y}; 735 $y -= $self->{y};
647 736
648 my $res; 737 my $res;
649 738
650 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
651 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
652 and return $res; 741 and return $res;
653 } 742 }
654 743
655 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
704 $self->{children}[0]->configure (0, 0, $w, $h); 793 $self->{children}[0]->configure (0, 0, $w, $h);
705} 794}
706 795
707############################################################################# 796#############################################################################
708 797
798# back-buffered drawing area
799
709package CFClient::UI::Window; 800package CFClient::UI::Window;
710 801
711our @ISA = CFClient::UI::Bin::; 802our @ISA = CFClient::UI::Bin::;
712 803
713use CFClient::OpenGL; 804use CFClient::OpenGL;
… …
731 $self->SUPER::size_allocate ($w, $h); 822 $self->SUPER::size_allocate ($w, $h);
732 $self->update; 823 $self->update;
733} 824}
734 825
735sub _render { 826sub _render {
827 my ($self) = @_;
828
736 $_[0]{children}[0]->draw; 829 $self->{children}[0]->draw;
737} 830}
738 831
739sub render_child { 832sub render_child {
740 my ($self) = @_; 833 my ($self) = @_;
741 834
742 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 835 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
743 glClearColor 0, 0, 0, 0; 836 glClearColor 0, 0, 0, 0;
744 glClear GL_COLOR_BUFFER_BIT; 837 glClear GL_COLOR_BUFFER_BIT;
745 838
839 {
840 package CFClient::UI::Base;
841
842 ($draw_x, $draw_y, $draw_w, $draw_h) =
843 (0, 0, $self->{w}, $self->{h});
844 }
845
746 $self->_render; 846 $self->_render;
747 }; 847 };
748} 848}
749 849
750sub _draw { 850sub _draw {
751 my ($self) = @_; 851 my ($self) = @_;
752 852
753 my ($w, $h) = ($self->w, $self->h); 853 my ($w, $h) = @$self{qw(w h)};
754 854
755 my $tex = $self->{texture} 855 my $tex = $self->{texture}
756 or return; 856 or return;
757 857
758 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
759 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
760 glColor 1, 1, 1, 1; 860 glColor 0, 0, 0, 1;
761 861
762 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 862 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
763 863
764 glDisable GL_TEXTURE_2D; 864 glDisable GL_TEXTURE_2D;
765} 865}
… …
781} 881}
782 882
783sub size_request { 883sub size_request {
784 my ($self) = @_; 884 my ($self) = @_;
785 885
786 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 886 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
787 887
788 @$self{qw(child_w child_h)} 888 $w = 10 if $self->{scroll_x};
889 $h = 10 if $self->{scroll_y};
890
891 ($w, $h)
789} 892}
790 893
791sub size_allocate { 894sub size_allocate {
792 my ($self, $w, $h) = @_; 895 my ($self, $w, $h) = @_;
793 896
897 my $child = $self->child;
898
794 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 899 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
795 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 900 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
796 901
797 $self->child->configure (0, 0, $w, $h); 902 $self->child->configure (0, 0, $w, $h);
798 $self->update; 903 $self->update;
799} 904}
800 905
… …
836} 941}
837 942
838sub _render { 943sub _render {
839 my ($self) = @_; 944 my ($self) = @_;
840 945
946 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
947 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
948
841 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 949 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
842 950
843 $self->SUPER::_render; 951 $self->SUPER::_render;
844} 952}
845 953
… …
848package CFClient::UI::ScrolledWindow; 956package CFClient::UI::ScrolledWindow;
849 957
850our @ISA = CFClient::UI::HBox::; 958our @ISA = CFClient::UI::HBox::;
851 959
852sub new { 960sub new {
853 my $class = shift; 961 my ($class, %arg) = @_;
962
963 my $child = delete $arg{child};
854 964
855 my $self; 965 my $self;
856 966
857 my $slider = new CFClient::UI::Slider 967 my $slider = new CFClient::UI::Slider
858 vertical => 1, 968 vertical => 1,
859 range => [0, 0, 1, 0.01], # HACK fix 969 range => [0, 0, 1, 0.01], # HACK fix
860 connect_changed => sub { 970 on_changed => sub {
861 $self->{vp}->set_offset (0, $_[1]); 971 $self->{vp}->set_offset (0, $_[1]);
862 }, 972 },
863 ; 973 ;
864 974
865 $self = $class->SUPER::new ( 975 $self = $class->SUPER::new (
866 vp => (new CFClient::UI::ViewPort expand => 1), 976 vp => (new CFClient::UI::ViewPort expand => 1),
867 slider => $slider, 977 slider => $slider,
868 @_, 978 %arg,
869 ); 979 );
870 980
871 $self->{vp}->add ($self->{scrolled});
872 $self->add ($self->{vp});
873 $self->add ($self->{slider}); 981 $self->SUPER::add ($self->{vp}, $self->{slider});
982 $self->add ($child) if $child;
874 983
875 $self 984 $self
985}
986
987sub add {
988 my ($self, $widget) = @_;
989
990 $self->{vp}->add ($self->{child} = $widget);
991}
992
993sub update {
994 my ($self) = @_;
995
996 $self->SUPER::update;
997
998 # todo: overwrite size_allocate of child
999 my $child = $self->{vp}->child;
1000 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
876} 1001}
877 1002
878sub size_allocate { 1003sub size_allocate {
879 my ($self, $w, $h) = @_; 1004 my ($self, $w, $h) = @_;
880 1005
… …
909 1034
910 if ($self->{bg}) { 1035 if ($self->{bg}) {
911 my ($w, $h) = @$self{qw(w h)}; 1036 my ($w, $h) = @$self{qw(w h)};
912 1037
913 glEnable GL_BLEND; 1038 glEnable GL_BLEND;
914 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1039 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
915 glColor @{ $self->{bg} }; 1040 glColor_premultiply @{ $self->{bg} };
916 1041
917 glBegin GL_QUADS; 1042 glBegin GL_QUADS;
918 glVertex 0 , 0; 1043 glVertex 0 , 0;
919 glVertex 0 , $h; 1044 glVertex 0 , $h;
920 glVertex $w, $h; 1045 glVertex $w, $h;
… …
933 1058
934our @ISA = CFClient::UI::Bin::; 1059our @ISA = CFClient::UI::Bin::;
935 1060
936use CFClient::OpenGL; 1061use CFClient::OpenGL;
937 1062
938my @tex = 1063my $bg =
1064 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1065 mipmap => 1, wrap => 1;
1066
1067my @border =
939 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1068 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
940 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1069 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
941 1070
942sub new { 1071sub new {
943 my $class = shift; 1072 my ($class, %arg) = @_;
944 1073
945 # TODO: user_x, user_y, overwrite moveto? 1074 my $title = delete $arg{title};
946 1075
947 my $self = $class->SUPER::new ( 1076 my $self = $class->SUPER::new (
948 bg => [1, 1, 1, 1], 1077 bg => [1, 1, 1, 1],
949 border_bg => [1, 1, 1, 1], 1078 border_bg => [1, 1, 1, 1],
950 border => 0.6, 1079 border => 0.6,
951 is_toplevel => 1,
952 can_events => 1, 1080 can_events => 1,
953 @_ 1081 min_w => 16,
1082 min_h => 16,
1083 %arg,
954 ); 1084 );
955 1085
956 $self->{title} &&= new CFClient::UI::Label 1086 $self->{title} = new CFClient::UI::Label
957 align => 0, 1087 align => 0,
958 valign => 1, 1088 valign => 1,
959 text => $self->{title}, 1089 text => $title,
960 fontsize => $self->{border}; 1090 fontsize => $self->{border}
1091 if defined $title;
961 1092
962 $self 1093 $self
1094}
1095
1096sub add {
1097 my ($self, @widgets) = @_;
1098
1099 $self->SUPER::add (@widgets);
1100 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
963} 1101}
964 1102
965sub border { 1103sub border {
966 int $_[0]{border} * $::FONTSIZE 1104 int $_[0]{border} * $::FONTSIZE
967} 1105}
968 1106
969sub size_request { 1107sub size_request {
970 my ($self) = @_; 1108 my ($self) = @_;
1109
1110 $self->{title}->size_request
1111 if $self->{title};
971 1112
972 my ($w, $h) = $self->SUPER::size_request; 1113 my ($w, $h) = $self->SUPER::size_request;
973 1114
974 ( 1115 (
975 $w + $self->border * 2, 1116 $w + $self->border * 2,
… …
978} 1119}
979 1120
980sub size_allocate { 1121sub size_allocate {
981 my ($self, $w, $h) = @_; 1122 my ($self, $w, $h) = @_;
982 1123
1124 if ($self->{title}) {
1125 $self->{title}{w} = $w;
1126 $self->{title}{h} = $h;
1127 $self->{title}->size_allocate ($w, $h);
1128 }
1129
1130 my $border = $self->border;
1131
983 $h -= List::Util::max 0, $self->border * 2; 1132 $h -= List::Util::max 0, $border * 2;
984 $w -= List::Util::max 0, $self->border * 2; 1133 $w -= List::Util::max 0, $border * 2;
985 1134
986 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
987 if $self->{title};
988
989 $self->child->configure ($self->border, $self->border, $w, $h); 1135 $self->child->configure ($border, $border, $w, $h);
990} 1136}
991 1137
992sub button_down { 1138sub button_down {
993 my ($self, $ev, $x, $y) = @_; 1139 my ($self, $ev, $x, $y) = @_;
994 1140
… …
1010 my ($ev, $x, $y) = @_; 1156 my ($ev, $x, $y) = @_;
1011 1157
1012 my $dx = $ev->{x} - $ox; 1158 my $dx = $ev->{x} - $ox;
1013 my $dy = $ev->{y} - $oy; 1159 my $dy = $ev->{y} - $oy;
1014 1160
1015 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1161 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1016 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1162 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1163
1017 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1018 $self->check_size; 1165 $self->realloc;
1019 }; 1166 };
1020 1167
1021 } elsif ($lr ^ $td) { 1168 } elsif ($lr ^ $td) {
1022 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1169 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1023 my ($bx, $by) = ($self->{x}, $self->{y}); 1170 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1025 $self->{motion} = sub { 1172 $self->{motion} = sub {
1026 my ($ev, $x, $y) = @_; 1173 my ($ev, $x, $y) = @_;
1027 1174
1028 ($x, $y) = ($ev->{x}, $ev->{y}); 1175 ($x, $y) = ($ev->{x}, $ev->{y});
1029 1176
1030 $self->move ($bx + $x - $ox, $by + $y - $oy); 1177 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1031 $self->update; 1178 # HACK: the next line is required to enforce placement
1179 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1032 }; 1180 };
1181 } else {
1182 return 0;
1183 }
1184
1033 } 1185 1
1034} 1186}
1035 1187
1036sub button_up { 1188sub button_up {
1037 my ($self, $ev, $x, $y) = @_; 1189 my ($self, $ev, $x, $y) = @_;
1038 1190
1039 delete $self->{motion}; 1191 !!delete $self->{motion}
1040} 1192}
1041 1193
1042sub mouse_motion { 1194sub mouse_motion {
1043 my ($self, $ev, $x, $y) = @_; 1195 my ($self, $ev, $x, $y) = @_;
1044 1196
1045 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1197 $self->{motion}->($ev, $x, $y) if $self->{motion};
1198
1199 !!$self->{motion}
1046} 1200}
1047 1201
1048sub _draw { 1202sub _draw {
1049 my ($self) = @_; 1203 my ($self) = @_;
1050 1204
1205 my $child = $self->{children}[0];
1206
1051 my ($w, $h ) = ($self->{w}, $self->{h}); 1207 my ($w, $h ) = ($self->{w}, $self->{h});
1052 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1208 my ($cw, $ch) = ($child->{w}, $child->{h});
1053 1209
1054 glEnable GL_TEXTURE_2D; 1210 glEnable GL_TEXTURE_2D;
1055 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1211 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1056 1212
1057 my $border = $self->border; 1213 my $border = $self->border;
1058 1214
1059 glColor @{ $self->{border_bg} }; 1215 glColor @{ $self->{border_bg} };
1060 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1216 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1061 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1217 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1062 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1218 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1063 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1219 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1064 1220
1065 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1221 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1066 my $bg = $tex[0]; 1222 glColor @{ $self->{bg} };
1067 1223
1068 # TODO: repeat texture not scale 1224 # TODO: repeat texture not scale
1225 # solve this better(?)
1069 my $rep_x = $cw / $bg->{w}; 1226 $bg->{s} = $cw / $bg->{w};
1070 my $rep_y = $ch / $bg->{h}; 1227 $bg->{t} = $ch / $bg->{h};
1071
1072 glColor @{ $self->{bg} };
1073
1074 $bg->{s} = $rep_x;
1075 $bg->{t} = $rep_y;
1076 $bg->{wrap_mode} = 1;
1077 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1228 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1078 } 1229 }
1079 1230
1080 glDisable GL_TEXTURE_2D; 1231 glDisable GL_TEXTURE_2D;
1081 1232
1082 $self->{title}->draw if $self->{title};
1083
1084 $self->child->draw; 1233 $child->draw;
1234
1235 if ($self->{title}) {
1236 glTranslate 0, $border - $self->{h};
1237 $self->{title}->_draw;
1238 }
1085} 1239}
1086 1240
1087############################################################################# 1241#############################################################################
1088 1242
1089package CFClient::UI::Table; 1243package CFClient::UI::Table;
… …
1101 col_expand => [], 1255 col_expand => [],
1102 @_, 1256 @_,
1103 ) 1257 )
1104} 1258}
1105 1259
1260sub children {
1261 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1262}
1263
1106sub add { 1264sub add {
1107 my ($self, $x, $y, $child) = @_; 1265 my ($self, $x, $y, $child) = @_;
1108 1266
1109 $child->set_parent ($self); 1267 $child->set_parent ($self);
1110 $self->{children}[$y][$x] = $child; 1268 $self->{children}[$y][$x] = $child;
1111 1269
1112 $child->check_size; 1270 $self->realloc;
1113} 1271}
1114 1272
1115sub children {
1116 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1117}
1118
1119# TODO: move to container class maybe? send childs a signal on removal? 1273# TODO: move to container class maybe? send children a signal on removal?
1120sub clear { 1274sub clear {
1121 my ($self) = @_; 1275 my ($self) = @_;
1122 1276
1123 my @children = $self->children; 1277 my @children = $self->children;
1124 delete $self->{children}; 1278 delete $self->{children};
… …
1126 for (@children) { 1280 for (@children) {
1127 delete $_->{parent}; 1281 delete $_->{parent};
1128 $_->hide; 1282 $_->hide;
1129 } 1283 }
1130 1284
1131 $self->update; 1285 $self->realloc;
1132} 1286}
1133 1287
1134sub get_wh { 1288sub get_wh {
1135 my ($self) = @_; 1289 my ($self) = @_;
1136 1290
… …
1167sub size_allocate { 1321sub size_allocate {
1168 my ($self, $w, $h) = @_; 1322 my ($self, $w, $h) = @_;
1169 1323
1170 my ($ws, $hs) = $self->get_wh; 1324 my ($ws, $hs) = $self->get_wh;
1171 1325
1172 my $req_w = sum @$ws; 1326 my $req_w = (sum @$ws) || 1;
1173 my $req_h = sum @$hs; 1327 my $req_h = (sum @$hs) || 1;
1174 1328
1175 # TODO: nicer code && do row_expand 1329 # TODO: nicer code && do row_expand
1176 my @col_expand = @{$self->{col_expand}}; 1330 my @col_expand = @{$self->{col_expand}};
1177 @col_expand = (1) x @$ws unless @col_expand; 1331 @col_expand = (1) x @$ws unless @col_expand;
1178 my $col_expand = (sum @col_expand) || 1; 1332 my $col_expand = (sum @col_expand) || 1;
… …
1232 } 1386 }
1233} 1387}
1234 1388
1235############################################################################# 1389#############################################################################
1236 1390
1237package CFClient::UI::HBox; 1391package CFClient::UI::Box;
1238
1239# TODO: wrap into common Box base class
1240 1392
1241our @ISA = CFClient::UI::Container::; 1393our @ISA = CFClient::UI::Container::;
1242 1394
1243sub size_request { 1395sub size_request {
1244 my ($self) = @_; 1396 my ($self) = @_;
1245 1397
1246 my @alloc = map [$_->size_request], @{$self->{children}}; 1398 $self->{vertical}
1247 1399 ? (
1248 ( 1400 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1249 (List::Util::sum map $_->[0], @alloc), 1401 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1250 (List::Util::max map $_->[1], @alloc), 1402 )
1251 ) 1403 : (
1404 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1405 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1406 )
1252} 1407}
1253 1408
1254sub size_allocate { 1409sub size_allocate {
1255 my ($self, $w, $h) = @_; 1410 my ($self, $w, $h) = @_;
1256 1411
1257 ($h, $w) = ($w, $h); 1412 my $space = $self->{vertical} ? $h : $w;
1258
1259 my $children = $self->{children}; 1413 my $children = $self->{children};
1260 1414
1261 my @h = map $_->{req_w}, @$children; 1415 my @req;
1262 1416
1263 my $req_h = List::Util::sum @h; 1417 if ($self->{homogeneous}) {
1264 1418 @req = ($space / (@$children || 1)) x @$children;
1265 if ($req_h > $h) {
1266 # ah well, not enough space
1267 $_ *= $h / $req_h for @h;
1268 } else { 1419 } else {
1420 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1421 my $req = List::Util::sum @req;
1422
1423 if ($req > $space) {
1424 # ah well, not enough space
1425 $_ *= $space / $req for @req;
1426 } else {
1269 my $exp = List::Util::sum map $_->{expand}, @$children; 1427 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1270 $exp ||= 1;
1271 1428
1429 $space = ($space - $req) / $expand; # remaining space to give away
1430
1431 $req[$_] += $space * $children->[$_]{expand}
1272 for (0 .. $#$children) { 1432 for 0 .. $#$children;
1273 my $child = $children->[$_];
1274
1275 my $alloc_h = $h[$_];
1276 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1277 $h[$_] = $alloc_h;
1278 } 1433 }
1279 } 1434 }
1280 1435
1281 CFClient::UI::harmonize \@h; 1436 CFClient::UI::harmonize \@req;
1282 1437
1283 my $y = 0; 1438 my $pos = 0;
1284 for (0 .. $#$children) { 1439 for (0 .. $#$children) {
1285 my $child = $children->[$_];
1286 my $h = $h[$_]; 1440 my $alloc = $req[$_];
1287 $child->configure ($y, 0, $h, $w); 1441 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1288 1442
1289 $y += $h; 1443 $pos += $alloc;
1290 } 1444 }
1291 1445
1292 1 1446 1
1293} 1447}
1294 1448
1295############################################################################# 1449#############################################################################
1296 1450
1451package CFClient::UI::HBox;
1452
1453our @ISA = CFClient::UI::Box::;
1454
1455sub new {
1456 my $class = shift;
1457
1458 $class->SUPER::new (
1459 vertical => 0,
1460 @_,
1461 )
1462}
1463
1464#############################################################################
1465
1297package CFClient::UI::VBox; 1466package CFClient::UI::VBox;
1298 1467
1299# TODO: wrap into common Box base class
1300
1301our @ISA = CFClient::UI::Container::; 1468our @ISA = CFClient::UI::Box::;
1302 1469
1303sub size_request { 1470sub new {
1304 my ($self) = @_; 1471 my $class = shift;
1305 1472
1306 my @alloc = map [$_->size_request], @{$self->{children}}; 1473 $class->SUPER::new (
1307 1474 vertical => 1,
1308 ( 1475 @_,
1309 (List::Util::max map $_->[0], @alloc),
1310 (List::Util::sum map $_->[1], @alloc),
1311 ) 1476 )
1312}
1313
1314sub size_allocate {
1315 my ($self, $w, $h) = @_;
1316
1317 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1318
1319 my $children = $self->{children};
1320
1321 my @h = map $_->{req_h}, @$children;
1322
1323 my $req_h = List::Util::sum @h;
1324
1325 if ($req_h > $h) {
1326 # ah well, not enough space
1327 $_ *= $h / $req_h for @h;
1328 } else {
1329 my $exp = List::Util::sum map $_->{expand}, @$children;
1330 $exp ||= 1;
1331
1332 for (0 .. $#$children) {
1333 my $child = $children->[$_];
1334
1335 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1336 }
1337 }
1338
1339 CFClient::UI::harmonize \@h;
1340
1341 my $y = 0;
1342 for (0 .. $#$children) {
1343 my $child = $children->[$_];
1344 my $h = $h[$_];
1345 $child->configure (0, $y, $w, $h);
1346
1347 $y += $h;
1348 }
1349
1350 1
1351} 1477}
1352 1478
1353############################################################################# 1479#############################################################################
1354 1480
1355package CFClient::UI::Label; 1481package CFClient::UI::Label;
… …
1372 ellipsise => 3, # end 1498 ellipsise => 3, # end
1373 layout => (new CFClient::Layout), 1499 layout => (new CFClient::Layout),
1374 fontsize => 1, 1500 fontsize => 1,
1375 align => -1, 1501 align => -1,
1376 valign => -1, 1502 valign => -1,
1377 padding => 2, 1503 padding_x => 2,
1504 padding_y => 2,
1378 can_events => 0, 1505 can_events => 0,
1379 %arg 1506 %arg
1380 ); 1507 );
1381 1508
1382 if (exists $self->{template}) { 1509 if (exists $self->{template}) {
… …
1418 $self->{text} = "T$text"; 1545 $self->{text} = "T$text";
1419 1546
1420 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1547 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1421 $self->{layout}->set_text ($text); 1548 $self->{layout}->set_text ($text);
1422 1549
1550 $self->realloc;
1423 $self->update; 1551 $self->update;
1424 $self->check_size;
1425} 1552}
1426 1553
1427sub set_markup { 1554sub set_markup {
1428 my ($self, $markup) = @_; 1555 my ($self, $markup) = @_;
1429 1556
… …
1433 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1560 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1434 1561
1435 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1562 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1436 $self->{layout}->set_markup ($markup); 1563 $self->{layout}->set_markup ($markup);
1437 1564
1565 $self->realloc;
1438 $self->update; 1566 $self->update;
1439 $self->check_size;
1440} 1567}
1441 1568
1442sub size_request { 1569sub size_request {
1443 my ($self) = @_; 1570 my ($self) = @_;
1444 1571
… …
1458 1585
1459 $w = List::Util::max $w, $w2; 1586 $w = List::Util::max $w, $w2;
1460 $h = List::Util::max $h, $h2; 1587 $h = List::Util::max $h, $h2;
1461 } 1588 }
1462 1589
1463 ( 1590 ($w, $h)
1464 $w + $self->{padding} * 2,
1465 $h + $self->{padding} * 2,
1466 )
1467} 1591}
1468 1592
1469sub size_allocate { 1593sub size_allocate {
1470 my ($self, $w, $h) = @_; 1594 my ($self, $w, $h) = @_;
1471 1595
1596 delete $self->{ox};
1597
1472 delete $self->{texture}; 1598 delete $self->{texture}
1599 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1473} 1600}
1474 1601
1475sub set_fontsize { 1602sub set_fontsize {
1476 my ($self, $fontsize) = @_; 1603 my ($self, $fontsize) = @_;
1477 1604
1478 $self->{fontsize} = $fontsize; 1605 $self->{fontsize} = $fontsize;
1479 delete $self->{texture}; 1606 delete $self->{texture};
1480 1607
1481 $self->update; 1608 $self->realloc;
1482 $self->check_size;
1483} 1609}
1484 1610
1485sub _draw { 1611sub _draw {
1486 my ($self) = @_; 1612 my ($self) = @_;
1487 1613
… …
1493 $self->{layout}->set_width ($self->{w}); 1619 $self->{layout}->set_width ($self->{w});
1494 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1620 $self->{layout}->set_ellipsise ($self->{ellipsise});
1495 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1621 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1496 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1622 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1497 1623
1498 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1624 new_from_layout CFClient::Texture $self->{layout}
1625 };
1499 1626
1627 unless (exists $self->{ox}) {
1500 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1628 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1501 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1629 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1502 : ($self->{w} - $tex->{w}) * 0.5); 1630 : ($self->{w} - $tex->{w}) * 0.5);
1503 1631
1504 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1632 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1505 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1633 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1506 : ($self->{h} - $tex->{h}) * 0.5); 1634 : ($self->{h} - $tex->{h}) * 0.5);
1507
1508 $tex
1509 }; 1635 };
1510 1636
1511 glEnable GL_TEXTURE_2D; 1637 glEnable GL_TEXTURE_2D;
1512 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1638 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1513 1639
1640 glColor_premultiply @{$self->{fg}}
1514 if ($tex->{format} == GL_ALPHA) { 1641 if $tex->{format} == GL_ALPHA;
1515 glColor @{$self->{fg}}; 1642
1516 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1517 } else {
1518 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1519 }
1520 1644
1521 glDisable GL_TEXTURE_2D; 1645 glDisable GL_TEXTURE_2D;
1522} 1646}
1523 1647
1524############################################################################# 1648#############################################################################
… …
1551 1675
1552 delete $self->{cur_h}; 1676 delete $self->{cur_h};
1553 1677
1554 return if $self->{text} eq $text; 1678 return if $self->{text} eq $text;
1555 1679
1556 delete $self->{texture};
1557
1558 $self->{last_activity} = $::NOW; 1680 $self->{last_activity} = $::NOW;
1559 $self->{text} = $text; 1681 $self->{text} = $text;
1560 1682
1561 $text =~ s/./*/g if $self->{hidden}; 1683 $text =~ s/./*/g if $self->{hidden};
1562 $self->{layout}->set_text ("$text "); 1684 $self->{layout}->set_text ("$text ");
1563 1685
1564 $self->_emit (changed => $self->{text}); 1686 $self->_emit (changed => $self->{text});
1687 $self->update;
1565} 1688}
1566 1689
1567sub set_text { 1690sub set_text {
1568 my ($self, $text) = @_; 1691 my ($self, $text) = @_;
1569 1692
1570 $self->{cursor} = length $text; 1693 $self->{cursor} = length $text;
1571 $self->_set_text ($text); 1694 $self->_set_text ($text);
1572 $self->update; 1695
1573 $self->check_size; 1696 $self->realloc;
1574} 1697}
1575 1698
1576sub get_text { 1699sub get_text {
1577 $_[0]{text} 1700 $_[0]{text}
1578} 1701}
… …
1608 $self->{cursor} = length $text; 1731 $self->{cursor} = length $text;
1609 } elsif ($uni == 27) { 1732 } elsif ($uni == 27) {
1610 $self->_emit ('escape'); 1733 $self->_emit ('escape');
1611 } elsif ($uni) { 1734 } elsif ($uni) {
1612 substr $text, $self->{cursor}++, 0, chr $uni; 1735 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else {
1737 return 0;
1613 } 1738 }
1614 1739
1615 $self->_set_text ($text); 1740 $self->_set_text ($text);
1616 $self->update; 1741
1617 $self->check_size; 1742 $self->realloc;
1743
1744 1
1618} 1745}
1619 1746
1620sub focus_in { 1747sub focus_in {
1621 my ($self) = @_; 1748 my ($self) = @_;
1622 1749
… …
1637 utf8::encode $text; 1764 utf8::encode $text;
1638 $self->{cursor} = length substr $text, 0, $idx; 1765 $self->{cursor} = length substr $text, 0, $idx;
1639 1766
1640 $self->_set_text ($self->{text}); 1767 $self->_set_text ($self->{text});
1641 $self->update; 1768 $self->update;
1769
1770 1
1642} 1771}
1643 1772
1644sub mouse_motion { 1773sub mouse_motion {
1645 my ($self, $ev, $x, $y) = @_; 1774 my ($self, $ev, $x, $y) = @_;
1646# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1775# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1776
1777 0
1647} 1778}
1648 1779
1649sub _draw { 1780sub _draw {
1650 my ($self) = @_; 1781 my ($self) = @_;
1651 1782
1652 local $self->{fg} = $self->{fg}; 1783 local $self->{fg} = $self->{fg};
1653 1784
1654 if ($FOCUS == $self) { 1785 if ($FOCUS == $self) {
1655 glColor @{$self->{active_bg}}; 1786 glColor_premultiply @{$self->{active_bg}};
1656 $self->{fg} = $self->{active_fg}; 1787 $self->{fg} = $self->{active_fg};
1657 } else { 1788 } else {
1658 glColor @{$self->{bg}}; 1789 glColor_premultiply @{$self->{bg}};
1659 } 1790 }
1660 1791
1661 glEnable GL_BLEND; 1792 glEnable GL_BLEND;
1662 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1793 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1663 glBegin GL_QUADS; 1794 glBegin GL_QUADS;
1664 glVertex 0 , 0; 1795 glVertex 0 , 0;
1665 glVertex 0 , $self->{h}; 1796 glVertex 0 , $self->{h};
1666 glVertex $self->{w}, $self->{h}; 1797 glVertex $self->{w}, $self->{h};
1667 glVertex $self->{w}, 0; 1798 glVertex $self->{w}, 0;
… …
1728 } else { 1859 } else {
1729 $self->set_text ($self->{history_saveback}); 1860 $self->set_text ($self->{history_saveback});
1730 } 1861 }
1731 1862
1732 } else { 1863 } else {
1733 $self->SUPER::key_down ($ev); 1864 return $self->SUPER::key_down ($ev)
1865 }
1866
1734 } 1867 1
1735
1736} 1868}
1737 1869
1738############################################################################# 1870#############################################################################
1739 1871
1740package CFClient::UI::Button; 1872package CFClient::UI::Button;
… …
1749 1881
1750sub new { 1882sub new {
1751 my $class = shift; 1883 my $class = shift;
1752 1884
1753 $class->SUPER::new ( 1885 $class->SUPER::new (
1754 padding => 4, 1886 padding_x => 4,
1887 padding_y => 4,
1755 fg => [1, 1, 1], 1888 fg => [1, 1, 1],
1756 active_fg => [0, 0, 1], 1889 active_fg => [0, 0, 1],
1757 can_hover => 1, 1890 can_hover => 1,
1758 align => 0, 1891 align => 0,
1759 valign => 0, 1892 valign => 0,
… …
1768 my ($self, $ev, $x, $y) = @_; 1901 my ($self, $ev, $x, $y) = @_;
1769 1902
1770 $self->emit ("activate") 1903 $self->emit ("activate")
1771 if $x >= 0 && $x < $self->{w} 1904 if $x >= 0 && $x < $self->{w}
1772 && $y >= 0 && $y < $self->{h}; 1905 && $y >= 0 && $y < $self->{h};
1906
1907 1
1773} 1908}
1774 1909
1775sub _draw { 1910sub _draw {
1776 my ($self) = @_; 1911 my ($self) = @_;
1777 1912
1778 local $self->{fg} = $self->{fg}; 1913 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1779
1780 if ($GRAB == $self) {
1781 $self->{fg} = $self->{active_fg};
1782 }
1783 1914
1784 glEnable GL_TEXTURE_2D; 1915 glEnable GL_TEXTURE_2D;
1785 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1916 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1786 glColor 0, 0, 0, 1; 1917 glColor 0, 0, 0, 1;
1787 1918
… …
1806 1937
1807sub new { 1938sub new {
1808 my $class = shift; 1939 my $class = shift;
1809 1940
1810 $class->SUPER::new ( 1941 $class->SUPER::new (
1811 padding => 2, 1942 padding_x => 2,
1943 padding_y => 2,
1812 fg => [1, 1, 1], 1944 fg => [1, 1, 1],
1813 active_fg => [1, 1, 0], 1945 active_fg => [1, 1, 0],
1814 bg => [0, 0, 0, 0.2], 1946 bg => [0, 0, 0, 0.2],
1815 active_bg => [1, 1, 1, 0.5], 1947 active_bg => [1, 1, 1, 0.5],
1816 state => 0, 1948 state => 0,
… …
1820} 1952}
1821 1953
1822sub size_request { 1954sub size_request {
1823 my ($self) = @_; 1955 my ($self) = @_;
1824 1956
1825 ($self->{padding} * 2 + 6) x 2 1957 (6) x 2
1826} 1958}
1827 1959
1828sub button_down { 1960sub button_down {
1829 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1830 1962
1831 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1963 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1832 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1964 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1833 $self->{state} = !$self->{state}; 1965 $self->{state} = !$self->{state};
1834 $self->_emit (changed => $self->{state}); 1966 $self->_emit (changed => $self->{state});
1967 } else {
1968 return 0
1969 }
1970
1835 } 1971 1
1836} 1972}
1837 1973
1838sub _draw { 1974sub _draw {
1839 my ($self) = @_; 1975 my ($self) = @_;
1840 1976
1841 $self->SUPER::_draw; 1977 $self->SUPER::_draw;
1842 1978
1843 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1979 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1844 1980
1845 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1981 my ($w, $h) = @$self{qw(w h)};
1982
1983 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1846 1984
1847 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1985 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1848 1986
1849 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1987 my $tex = $self->{state} ? $tex[1] : $tex[0];
1850 1988
… …
2005 2143
2006 my $h1 = $self->{h} * (1 - $ycut1); 2144 my $h1 = $self->{h} * (1 - $ycut1);
2007 my $h2 = $self->{h} * (1 - $ycut2); 2145 my $h2 = $self->{h} * (1 - $ycut2);
2008 2146
2009 glEnable GL_BLEND; 2147 glEnable GL_BLEND;
2010 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2148 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2149 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2011 glEnable GL_TEXTURE_2D; 2150 glEnable GL_TEXTURE_2D;
2012 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2151 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2013 2152
2014 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2153 glBindTexture GL_TEXTURE_2D, $t1->{name};
2015 glBegin GL_QUADS; 2154 glBegin GL_QUADS;
… …
2115 fg => [1, 1, 1], 2254 fg => [1, 1, 1],
2116 active_fg => [0, 0, 0], 2255 active_fg => [0, 0, 0],
2117 bg => [0, 0, 0, 0.2], 2256 bg => [0, 0, 0, 0.2],
2118 active_bg => [1, 1, 1, 0.5], 2257 active_bg => [1, 1, 1, 0.5],
2119 range => [0, 0, 100, 10, 0], 2258 range => [0, 0, 100, 10, 0],
2120 req_w => $::WIDTH / 80, 2259 min_w => $::WIDTH / 80,
2121 req_h => $::WIDTH / 80, 2260 min_h => $::WIDTH / 80,
2122 vertical => 0, 2261 vertical => 0,
2123 can_hover => 1, 2262 can_hover => 1,
2124 inner_pad => 0.02, 2263 inner_pad => 0.02,
2125 @_ 2264 @_
2126 ); 2265 );
… …
2129 $self->update; 2268 $self->update;
2130 2269
2131 $self 2270 $self
2132} 2271}
2133 2272
2273sub changed { }
2274
2134sub set_range { 2275sub set_range {
2135 my ($self, $range) = @_; 2276 my ($self, $range) = @_;
2136 2277
2137 $self->{range} = $range; 2278 ($range, $self->{range}) = ($self->{range}, $range);
2138 2279
2139 $self->update; 2280 $self->update
2281 if "@$range" ne "@{$self->{range}}";
2140} 2282}
2141 2283
2142sub set_value { 2284sub set_value {
2143 my ($self, $value) = @_; 2285 my ($self, $value) = @_;
2144 2286
… …
2163} 2305}
2164 2306
2165sub size_request { 2307sub size_request {
2166 my ($self) = @_; 2308 my ($self) = @_;
2167 2309
2168 my $w = $self->{req_w}; 2310 ($self->{req_w}, $self->{req_h})
2169 my $h = $self->{req_h};
2170
2171 $self->{vertical} ? ($h, $w) : ($w, $h)
2172} 2311}
2173 2312
2174sub button_down { 2313sub button_down {
2175 my ($self, $ev, $x, $y) = @_; 2314 my ($self, $ev, $x, $y) = @_;
2176 2315
2177 $self->SUPER::button_down ($ev, $x, $y); 2316 $self->SUPER::button_down ($ev, $x, $y);
2178 2317
2179 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2318 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2180 2319
2181 $self->mouse_motion ($ev, $x, $y); 2320 $self->mouse_motion ($ev, $x, $y)
2182} 2321}
2183 2322
2184sub mouse_motion { 2323sub mouse_motion {
2185 my ($self, $ev, $x, $y) = @_; 2324 my ($self, $ev, $x, $y) = @_;
2186 2325
… …
2190 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2329 my (undef, $lo, $hi, $page) = @{$self->{range}};
2191 2330
2192 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2331 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2193 2332
2194 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2333 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2334 } else {
2335 return 0;
2336 }
2337
2195 } 2338 1
2196} 2339}
2197 2340
2198sub update { 2341sub update {
2199 my ($self) = @_; 2342 my ($self) = @_;
2200 2343
2201 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2344 delete $self->{knob_w};
2345 $self->SUPER::update;
2346}
2347
2348sub _draw {
2349 my ($self) = @_;
2350
2351 unless ($self->{knob_w}) {
2202 $self->set_value ($self->{range}[0]); 2352 $self->set_value ($self->{range}[0]);
2203 2353
2204 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2354 my ($value, $lo, $hi, $page) = @{$self->{range}};
2205 my $range = ($hi - $page - $lo) || 1e-100; 2355 my $range = ($hi - $page - $lo) || 1e-100;
2206 2356
… …
2212 $value = ($value - $lo) / $range; 2362 $value = ($value - $lo) / $range;
2213 $value = $value * $self->{scale} + $self->{offset}; 2363 $value = $value * $self->{scale} + $self->{offset};
2214 2364
2215 $self->{knob_x} = $value - $knob_w * 0.5; 2365 $self->{knob_x} = $value - $knob_w * 0.5;
2216 $self->{knob_w} = $knob_w; 2366 $self->{knob_w} = $knob_w;
2217 }); 2367 }
2218
2219 $self->SUPER::update;
2220}
2221
2222sub _draw {
2223 my ($self) = @_;
2224 2368
2225 $self->SUPER::_draw (); 2369 $self->SUPER::_draw ();
2226 2370
2227 glScale $self->{w}, $self->{h}; 2371 glScale $self->{w}, $self->{h};
2228 2372
… …
2422 2566
2423 delete $self->{texture}; 2567 delete $self->{texture};
2424 } 2568 }
2425 2569
2426 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2570 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2427 glClearColor 0.5, 0.5, 0.5, 0; 2571 glClearColor 0, 0, 0, 0;
2428 glClear GL_COLOR_BUFFER_BIT; 2572 glClear GL_COLOR_BUFFER_BIT;
2429 2573
2430 my $top = int $self->{children}[1]{range}[0]; 2574 my $top = int $self->{children}[1]{range}[0];
2431 2575
2432 my $y0 = $top; 2576 my $y0 = $top;
… …
2467sub _draw { 2611sub _draw {
2468 my ($self) = @_; 2612 my ($self) = @_;
2469 2613
2470 glEnable GL_TEXTURE_2D; 2614 glEnable GL_TEXTURE_2D;
2471 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2615 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2472 glColor 1, 1, 1, 1; 2616 glColor 0, 0, 0, 1;
2473 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2617 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2474 glDisable GL_TEXTURE_2D; 2618 glDisable GL_TEXTURE_2D;
2475 2619
2476 $self->{children}[1]->draw; 2620 $self->{children}[1]->draw;
2477 2621
2478} 2622}
… …
2527 2671
2528sub new { 2672sub new {
2529 my $class = shift; 2673 my $class = shift;
2530 2674
2531 my $self = $class->SUPER::new ( 2675 my $self = $class->SUPER::new (
2532 state => 0, 2676 state => 0,
2533 connect_activate => \&toggle_flopper, 2677 on_activate => \&toggle_flopper,
2534 @_ 2678 @_
2535 ); 2679 );
2536 2680
2537 if ($self->{state}) {
2538 $self->{state} = 0;
2539 $self->toggle_flopper;
2540 }
2541
2542 $self 2681 $self
2543} 2682}
2544 2683
2545sub toggle_flopper { 2684sub toggle_flopper {
2546 my ($self) = @_; 2685 my ($self) = @_;
2547 2686
2548 # TODO: use animation 2687 $self->{other}->toggle_visibility;
2549 if ($self->{state} = !$self->{state}) {
2550 $CFClient::UI::ROOT->add ($self->{other});
2551 $self->{other}->move ($self->coord2global (0, $self->{h}));
2552 $self->_emit ("open");
2553 } else {
2554 $CFClient::UI::ROOT->remove ($self->{other});
2555 $self->_emit ("close");
2556 }
2557
2558 $self->_emit (changed => $self->{state});
2559} 2688}
2560 2689
2561############################################################################# 2690#############################################################################
2562 2691
2563package CFClient::UI::Tooltip; 2692package CFClient::UI::Tooltip;
… …
2576} 2705}
2577 2706
2578sub set_tooltip_from { 2707sub set_tooltip_from {
2579 my ($self, $widget) = @_; 2708 my ($self, $widget) = @_;
2580 2709
2710 my $tooltip = $widget->{tooltip};
2711
2712 if ($ENV{CFPLUS_DEBUG} & 2) {
2713 $tooltip .= "\n\n" . (ref $widget) . "\n"
2714 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2715 . "req $widget->{req_w} $widget->{req_h}\n"
2716 . "visible $widget->{visible}";
2717 }
2718
2581 $self->add (new CFClient::UI::Label 2719 $self->add (new CFClient::UI::Label
2582 markup => $widget->{tooltip}, 2720 markup => $tooltip,
2583 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2721 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2584 fontsize => 0.8, 2722 fontsize => 0.8,
2585 fg => [0, 0, 0, 1], 2723 fg => [0, 0, 0, 1],
2586 ellipsise => 0, 2724 ellipsise => 0,
2587 font => ($widget->{tooltip_font} || $::FONT_PROP), 2725 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2598 2736
2599sub size_allocate { 2737sub size_allocate {
2600 my ($self, $w, $h) = @_; 2738 my ($self, $w, $h) = @_;
2601 2739
2602 $self->SUPER::size_allocate ($w - 4, $h - 4); 2740 $self->SUPER::size_allocate ($w - 4, $h - 4);
2741}
2742
2743sub visibility_change {
2744 my ($self, $visible) = @_;
2745
2746 return unless $visible;
2747
2748 $self->{root}->on_post_alloc ("move_$self" => sub {
2749 my $widget = $self->{owner}
2750 or return;
2751
2752 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2753
2754 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2755 if $x + $self->{w} > $::WIDTH;
2756
2757 $self->move_abs ($x, $y);
2758 });
2603} 2759}
2604 2760
2605sub _draw { 2761sub _draw {
2606 my ($self) = @_; 2762 my ($self) = @_;
2607 2763
… …
2624 glVertex $w, $h; 2780 glVertex $w, $h;
2625 glVertex $w, 0; 2781 glVertex $w, 0;
2626 glEnd; 2782 glEnd;
2627 2783
2628 glTranslate 2 - 0.375, 2 - 0.375; 2784 glTranslate 2 - 0.375, 2 - 0.375;
2785
2629 $self->SUPER::_draw; 2786 $self->SUPER::_draw;
2630} 2787}
2631 2788
2632############################################################################# 2789#############################################################################
2633 2790
… …
2692 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2849 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2693 2850
2694 if ($tex) { 2851 if ($tex) {
2695 glEnable GL_TEXTURE_2D; 2852 glEnable GL_TEXTURE_2D;
2696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2853 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2697 glColor 1, 1, 1, 1; 2854 glColor 0, 0, 0, 1;
2698 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2855 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2699 glDisable GL_TEXTURE_2D; 2856 glDisable GL_TEXTURE_2D;
2700 } 2857 }
2701} 2858}
2702 2859
… …
2709 $self->SUPER::DESTROY; 2866 $self->SUPER::DESTROY;
2710} 2867}
2711 2868
2712############################################################################# 2869#############################################################################
2713 2870
2714package CFClient::UI::Inventory; 2871package CFClient::UI::Buttonbar;
2715 2872
2716our @ISA = CFClient::UI::ScrolledWindow::; 2873our @ISA = CFClient::UI::HBox::;
2717 2874
2718sub new { 2875# TODO: should actualyl wrap buttons and other goodies.
2719 my $class = shift;
2720
2721 my $self = $class->SUPER::new (
2722 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2723 @_,
2724 );
2725
2726 $self
2727}
2728
2729sub set_items {
2730 my ($self, $items) = @_;
2731
2732 $self->{scrolled}->clear;
2733 return unless $items;
2734
2735 my @items = sort {
2736 ($a->{type} <=> $b->{type})
2737 or ($a->{name} cmp $b->{name})
2738 } @$items;
2739
2740 $self->{real_items} = \@items;
2741
2742 my $row = 0;
2743 for my $item (@items) {
2744 CFClient::Item::update_widgets $item;
2745
2746 $self->{scrolled}->add (0, $row, $item->{face_widget});
2747 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2748 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2749
2750 $row++;
2751 }
2752
2753# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2754}
2755
2756sub size_request {
2757 my ($self) = @_;
2758 ($self->{req_w}, $self->{req_h});
2759}
2760 2876
2761############################################################################# 2877#############################################################################
2762 2878
2763package CFClient::UI::Menu; 2879package CFClient::UI::Menu;
2764 2880
… …
2805 # maybe save $GRAB? must be careful about events... 2921 # maybe save $GRAB? must be careful about events...
2806 $GRAB = $self; 2922 $GRAB = $self;
2807 $self->{button} = $ev->{button}; 2923 $self->{button} = $ev->{button};
2808 2924
2809 $self->show; 2925 $self->show;
2810 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2926 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2811} 2927}
2812 2928
2813sub mouse_motion { 2929sub mouse_motion {
2814 my ($self, $ev, $x, $y) = @_; 2930 my ($self, $ev, $x, $y) = @_;
2815 2931
2816 # TODO: should use vbox->find_widget or so 2932 # TODO: should use vbox->find_widget or so
2817 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2933 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2818 $self->{hover} = $self->{item}{$HOVER}; 2934 $self->{hover} = $self->{item}{$HOVER};
2935
2936 0
2819} 2937}
2820 2938
2821sub button_up { 2939sub button_up {
2822 my ($self, $ev, $x, $y) = @_; 2940 my ($self, $ev, $x, $y) = @_;
2823 2941
… …
2825 undef $GRAB; 2943 undef $GRAB;
2826 $self->hide; 2944 $self->hide;
2827 2945
2828 $self->_emit ("popdown"); 2946 $self->_emit ("popdown");
2829 $self->{hover}[1]->() if $self->{hover}; 2947 $self->{hover}[1]->() if $self->{hover};
2948 } else {
2949 return 0
2950 }
2951
2952 1
2953}
2954
2955#############################################################################
2956
2957package CFClient::UI::Multiplexer;
2958
2959our @ISA = CFClient::UI::Container::;
2960
2961sub new {
2962 my $class = shift;
2963
2964 my $self = $class->SUPER::new (
2965 @_,
2966 );
2967
2968 $self->{current} = $self->{children}[0]
2969 if @{ $self->{children} };
2970
2971 $self
2972}
2973
2974sub add {
2975 my ($self, @widgets) = @_;
2976
2977 $self->SUPER::add (@widgets);
2978
2979 $self->{current} = $self->{children}[0]
2980 if @{ $self->{children} };
2981}
2982
2983sub set_current_page {
2984 my ($self, $page_or_widget) = @_;
2985
2986 my $widget = ref $page_or_widget
2987 ? $page_or_widget
2988 : $self->{children}[$page_or_widget];
2989
2990 $self->{current} = $widget;
2991 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2992
2993 $self->_emit (page_changed => $self->{current});
2994
2995 $self->realloc;
2996}
2997
2998sub visible_children {
2999 $_[0]{current}
3000}
3001
3002sub size_request {
3003 my ($self) = @_;
3004
3005 $self->{current}->size_request
3006}
3007
3008sub size_allocate {
3009 my ($self, $w, $h) = @_;
3010
3011 $self->{current}->configure (0, 0, $w, $h);
3012}
3013
3014sub _draw {
3015 my ($self) = @_;
3016
3017 $self->{current}->draw;
3018}
3019
3020#############################################################################
3021
3022package CFClient::UI::Notebook;
3023
3024our @ISA = CFClient::UI::VBox::;
3025
3026sub new {
3027 my $class = shift;
3028
3029 my $self = $class->SUPER::new (
3030 buttonbar => (new CFClient::UI::Buttonbar),
3031 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3032 # filter => # will be put between multiplexer and $self
3033 @_,
3034 );
2830 } 3035
3036 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3037 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3038
3039 $self
3040}
3041
3042sub add {
3043 my ($self, $title, $widget, $tooltip) = @_;
3044
3045 Scalar::Util::weaken $self;
3046
3047 $self->{buttonbar}->add (new CFClient::UI::Button
3048 markup => $title,
3049 tooltip => $tooltip,
3050 on_activate => sub { $self->set_current_page ($widget) },
3051 );
3052
3053 $self->{multiplexer}->add ($widget);
3054}
3055
3056sub set_current_page {
3057 my ($self, $page) = @_;
3058
3059 $self->{multiplexer}->set_current_page ($page);
3060 $self->_emit (page_changed => $self->{multiplexer}{current});
2831} 3061}
2832 3062
2833############################################################################# 3063#############################################################################
2834 3064
2835package CFClient::UI::Statusbox; 3065package CFClient::UI::Statusbox;
… …
2940 $self->SUPER::reconfigure; 3170 $self->SUPER::reconfigure;
2941} 3171}
2942 3172
2943############################################################################# 3173#############################################################################
2944 3174
2945package CFClient::UI::Root; 3175package CFClient::UI::Inventory;
2946 3176
2947our @ISA = CFClient::UI::Container::; 3177our @ISA = CFClient::UI::ScrolledWindow::;
2948
2949use CFClient::OpenGL;
2950 3178
2951sub new { 3179sub new {
2952 my $class = shift; 3180 my $class = shift;
2953 3181
2954 $class->SUPER::new ( 3182 my $self = $class->SUPER::new (
3183 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3184 @_,
3185 );
3186
3187 $self
3188}
3189
3190sub set_items {
3191 my ($self, $items) = @_;
3192
3193 $self->{child}->clear;
3194 return unless $items;
3195
3196 my @items = sort {
3197 ($a->{type} <=> $b->{type})
3198 or ($a->{name} cmp $b->{name})
3199 } @$items;
3200
3201 $self->{real_items} = \@items;
3202
3203 my $row = 0;
3204 for my $item (@items) {
3205 CFClient::Item::update_widgets $item;
3206
3207 $self->{child}->add (0, $row, $item->{face_widget});
3208 $self->{child}->add (1, $row, $item->{desc_widget});
3209 $self->{child}->add (2, $row, $item->{weight_widget});
3210
3211 $row++;
3212 }
3213}
3214
3215#############################################################################
3216
3217package CFClient::UI::BindEditor;
3218
3219our @ISA = CFClient::UI::FancyFrame::;
3220
3221sub new {
3222 my $class = shift;
3223
3224 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3225
3226 $self->add (my $vb = new CFClient::UI::VBox);
3227
3228
3229 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3230 text => "start recording",
3231 tooltip => "Start/Stops recording of actions."
3232 ."All subsequent actions after the recording started will be captured."
3233 ."The actions are displayed after the record was stopped."
3234 ."To bind the action you have to click on the 'Bind' button",
3235 on_activate => sub {
3236 unless ($self->{recording}) {
3237 $self->start;
3238 } else {
3239 $self->stop;
3240 }
3241 });
3242
3243 $vb->add (new CFClient::UI::Label text => "Actions:");
3244 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3245
3246 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3247 $vb->add (my $hb = new CFClient::UI::HBox);
3248 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3249 $hb->add (new CFClient::UI::Button
3250 text => "bind",
3251 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3252 on_activate => sub {
3253 $self->ask_for_bind;
3254 });
3255
3256 $vb->add (my $hb = new CFClient::UI::HBox);
3257 $hb->add (new CFClient::UI::Button
3258 text => "ok",
3259 expand => 1,
3260 tooltip => "This closes the binding editor and saves the binding",
3261 on_activate => sub {
3262 $self->hide;
3263 $self->commit;
3264 });
3265
3266 $hb->add (new CFClient::UI::Button
3267 text => "cancel",
3268 expand => 1,
3269 tooltip => "This closes the binding editor without saving",
3270 on_activate => sub {
3271 $self->hide;
3272 $self->{binding_cancel}->()
3273 if $self->{binding_cancel};
3274 });
3275
3276 $self->update_binding_widgets;
3277
3278 $self
3279}
3280
3281sub commit {
3282 my ($self) = @_;
3283 my ($mod, $sym, $cmds) = $self->get_binding;
3284 if ($sym != 0 && @$cmds > 0) {
3285 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3286 ."'. Don't forget 'Save Config'!");
3287 $self->{binding_change}->($mod, $sym, $cmds)
3288 if $self->{binding_change};
3289 } else {
3290 $::STATUSBOX->add ("No action bound, no key or action specified!");
3291 $self->{binding_cancel}->()
3292 if $self->{binding_cancel};
3293 }
3294}
3295
3296sub start {
3297 my ($self) = @_;
3298
3299 $self->{rec_btn}->set_text ("stop recording");
3300 $self->{recording} = 1;
3301 $self->clear_command_list;
3302 $::CONN->start_record if $::CONN;
3303}
3304
3305sub stop {
3306 my ($self) = @_;
3307
3308 $self->{rec_btn}->set_text ("start recording");
3309 $self->{recording} = 0;
3310
3311 my $rec;
3312 $rec = $::CONN->stop_record if $::CONN;
3313 return unless ref $rec eq 'ARRAY';
3314 $self->set_command_list ($rec);
3315}
3316
3317
3318sub ask_for_bind_and_commit {
3319 my ($self) = @_;
3320 $self->ask_for_bind (1);
3321}
3322
3323sub ask_for_bind {
3324 my ($self, $commit) = @_;
3325
3326 CFClient::Binder::open_binding_dialog (sub {
3327 my ($mod, $sym) = @_;
3328 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3329 $self->update_binding_widgets;
3330 $self->commit if $commit;
3331 });
3332}
3333
3334# $mod and $sym are the modifiers and key symbol
3335# $cmds is a array ref of strings (the commands)
3336# $cb is the callback that is executed on OK
3337# $ccb is the callback that is executed on CANCEL and
3338# when the binding was unsuccessful on OK
3339sub set_binding {
3340 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3341
3342 $self->clear_command_list;
3343 $self->{recording} = 0;
3344 $self->{rec_btn}->set_text ("start recording");
3345
3346 $self->{binding} = [$mod, $sym];
3347 $self->{commands} = $cmds;
3348
3349 $self->{binding_change} = $cb;
3350 $self->{binding_cancel} = $ccb;
3351
3352 $self->update_binding_widgets;
3353}
3354
3355# this is a shortcut method that asks for a binding
3356# and then just binds it.
3357sub do_quick_binding {
3358 my ($self, $cmds) = @_;
3359 $self->set_binding (undef, undef, $cmds, sub {
3360 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3361 });
3362 $self->ask_for_bind (1);
3363}
3364
3365sub update_binding_widgets {
3366 my ($self) = @_;
3367 my ($mod, $sym, $cmds) = $self->get_binding;
3368 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3369 $self->set_command_list ($cmds);
3370}
3371
3372sub get_binding {
3373 my ($self) = @_;
3374 return (
3375 $self->{binding}->[0],
3376 $self->{binding}->[1],
3377 [ grep { defined $_ } @{$self->{commands}} ]
3378 );
3379}
3380
3381sub clear_command_list {
3382 my ($self) = @_;
3383 $self->{cmdbox}->clear ();
3384}
3385
3386sub set_command_list {
3387 my ($self, $cmds) = @_;
3388
3389 $self->{cmdbox}->clear ();
3390 $self->{commands} = $cmds;
3391
3392 my $idx = 0;
3393
3394 for (@$cmds) {
3395 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3396
3397 my $i = $idx;
3398 $hb->add (new CFClient::UI::Label text => $_);
3399 $hb->add (new CFClient::UI::Button
3400 text => "delete",
3401 tooltip => "Deletes the action from the record",
3402 on_activate => sub {
3403 $self->{cmdbox}->remove ($hb);
3404 $cmds->[$i] = undef;
3405 });
3406
3407
3408 $idx++
3409 }
3410}
3411
3412#############################################################################
3413
3414package CFClient::UI::SpellList;
3415
3416our @ISA = CFClient::UI::Table::;
3417
3418sub new {
3419 my $class = shift;
3420
3421 my $self = $class->SUPER::new (
3422 binding => [],
3423 commands => [],
2955 @_, 3424 @_,
2956 ) 3425 )
2957} 3426}
2958 3427
2959sub configure { 3428# XXX: Do sorting? Argl...
2960 my ($self, $x, $y, $w, $h) = @_; 3429sub add_spell {
2961
2962 $self->{w} = $w;
2963 $self->{h} = $h;
2964}
2965
2966sub check_size {
2967 my ($self) = @_; 3430 my ($self, $spell) = @_;
3431 $self->{spells}->{$spell->{name}} = $spell;
2968 3432
2969 $self->size_allocate ($self->{w}, $self->{h}) 3433 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2970 if $self->{w}; 3434 face => $spell->{face},
3435 can_hover => 1,
3436 can_events => 1,
3437 tooltip => $spell->{message});
3438
3439 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3440 text => $spell->{name},
3441 can_hover => 1,
3442 can_events => 1,
3443 tooltip => $spell->{message},
3444 expand => 1);
3445
3446 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3447 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3448 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3449 expand => 1);
3450
3451 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3452 text => "bind to key",
3453 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3454}
3455
3456sub rebuild_spell_list {
3457 my ($self) = @_;
3458 $self->{tbl_idx} = 0;
3459 $self->add_spell ($_) for values %{$self->{spells}};
3460}
3461
3462sub remove_spell {
3463 my ($self, $spell) = @_;
3464 delete $self->{spells}->{$spell->{name}};
3465 $self->rebuild_spell_list;
3466}
3467
3468#############################################################################
3469
3470package CFClient::UI::Root;
3471
3472our @ISA = CFClient::UI::Container::;
3473
3474use CFClient::OpenGL;
3475
3476sub new {
3477 my $class = shift;
3478
3479 my $self = $class->SUPER::new (
3480 visible => 1,
3481 @_,
3482 );
3483
3484 Scalar::Util::weaken ($self->{root} = $self);
3485
3486 $self
2971} 3487}
2972 3488
2973sub size_request { 3489sub size_request {
2974 my ($self) = @_; 3490 my ($self) = @_;
2975 3491
2976 ($self->{w}, $self->{h}) 3492 ($self->{w}, $self->{h})
3493}
3494
3495sub _to_pixel {
3496 my ($coord, $size, $max) = @_;
3497
3498 $coord =
3499 $coord eq "center" ? ($max - $size) * 0.5
3500 : $coord eq "max" ? $max
3501 : $coord;
3502
3503 $coord = 0 if $coord < 0;
3504 $coord = $max - $size if $coord > $max - $size;
3505
3506 int $coord + 0.5
2977} 3507}
2978 3508
2979sub size_allocate { 3509sub size_allocate {
2980 my ($self, $w, $h) = @_; 3510 my ($self, $w, $h) = @_;
2981 3511
2982 for my $child ($self->children) { 3512 for my $child ($self->children) {
2983 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3513 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2984 3514
2985 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3515 $X = $child->{force_x} if exists $child->{force_x};
2986 if exists $child->{req_x}; 3516 $Y = $child->{force_y} if exists $child->{force_y};
2987 3517
2988 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3518 $X = _to_pixel $X, $W, $self->{w};
2989 if exists $child->{req_y}; 3519 $Y = _to_pixel $Y, $H, $self->{h};
2990
2991 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2992 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2993 3520
2994 $child->configure ($X, $Y, $W, $H); 3521 $child->configure ($X, $Y, $W, $H);
2995 } 3522 }
2996} 3523}
2997 3524
… …
3008} 3535}
3009 3536
3010sub update { 3537sub update {
3011 my ($self) = @_; 3538 my ($self) = @_;
3012 3539
3013 $self->check_size;
3014 $::WANT_REFRESH++; 3540 $::WANT_REFRESH++;
3015} 3541}
3016 3542
3017sub add { 3543sub add {
3018 my ($self, @children) = @_; 3544 my ($self, @children) = @_;
3019 3545
3020 for (my @widgets = @children; my $w = pop @widgets; ) {
3021 push @widgets, $w->children;
3022 $w->{root} = $self;
3023 $w->{visible} = 1;
3024 }
3025
3026 for my $child (@children) {
3027 $child->{is_toplevel} = 1; 3546 $_->{is_toplevel} = 1
3028 3547 for @children;
3029 # integerise window positions
3030 $child->{x} = int $child->{x};
3031 $child->{y} = int $child->{y};
3032 }
3033 3548
3034 $self->SUPER::add (@children); 3549 $self->SUPER::add (@children);
3035} 3550}
3036 3551
3037sub remove { 3552sub remove {
3038 my ($self, @children) = @_; 3553 my ($self, @children) = @_;
3039 3554
3040 $self->SUPER::remove (@children); 3555 $self->SUPER::remove (@children);
3556
3557 delete $self->{is_toplevel}
3558 for @children;
3041 3559
3042 while (@children) { 3560 while (@children) {
3043 my $w = pop @children; 3561 my $w = pop @children;
3044 push @children, $w->children; 3562 push @children, $w->children;
3045 $w->set_invisible; 3563 $w->set_invisible;
… …
3064 while ($self->{refresh_hook}) { 3582 while ($self->{refresh_hook}) {
3065 $_->() 3583 $_->()
3066 for values %{delete $self->{refresh_hook}}; 3584 for values %{delete $self->{refresh_hook}};
3067 } 3585 }
3068 3586
3069 if ($self->{check_size}) { 3587 if ($self->{realloc}) {
3070 my @queue = ([], []); 3588 my %queue;
3589 my @queue;
3590 my $widget;
3071 3591
3072 for (;;) { 3592 outer:
3073 if ($self->{check_size}) { 3593 while () {
3074 # heuristic: check containers last 3594 if (my $realloc = delete $self->{realloc}) {
3075 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3595 for $widget (values %$realloc) {
3076 for values %{delete $self->{check_size}} 3596 $widget->{visible} or next; # do not resize invisible widgets
3597
3598 $queue{$widget+0}++ and next; # duplicates are common
3599
3600 push @{ $queue[$widget->{visible}] }, $widget;
3601 }
3077 } 3602 }
3078 3603
3079 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3604 while () {
3605 @queue or last outer;
3080 3606
3081 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3607 $widget = pop @{ $queue[-1] || [] }
3082 ? @$widget{qw(user_w user_h)} 3608 and last;
3083 : $widget->size_request;
3084
3085 if (delete $widget->{force_alloc}
3086 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3087 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3088 3609
3610 pop @queue;
3611 }
3612
3613 delete $queue{$widget+0};
3614
3615 my ($w, $h) = $widget->size_request;
3616
3617 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3618 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3619
3620 $w = $widget->{force_w} if exists $widget->{force_w};
3621 $h = $widget->{force_h} if exists $widget->{force_h};
3622
3623 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3624 || delete $widget->{force_realloc}) {
3089 $widget->{req_w} = $w; 3625 $widget->{req_w} = $w;
3090 $widget->{req_h} = $h; 3626 $widget->{req_h} = $h;
3091 3627
3092 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3628 $self->{size_alloc}{$widget+0} = $widget;
3093 3629
3094 $widget->{parent}->check_size
3095 if $widget->{parent}; 3630 if (my $parent = $widget->{parent}) {
3631 $self->{realloc}{$parent+0} = $parent
3632 unless $queue{$parent+0};
3633
3634 $parent->{force_size_alloc} = 1;
3635 $self->{size_alloc}{$parent+0} = $parent;
3636 }
3096 } 3637 }
3638
3639 delete $self->{realloc}{$widget+0};
3097 } 3640 }
3098 } 3641 }
3099 3642
3100 while ($self->{size_alloc}) { 3643 while (my $size_alloc = delete $self->{size_alloc}) {
3101 for (values %{delete $self->{size_alloc}}) { 3644 my @queue = sort { $b->{visible} <=> $a->{visible} }
3102 my ($widget, $w, $h) = @$_; 3645 values %$size_alloc;
3646
3647 while () {
3648 my $widget = pop @queue || last;
3649
3650 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3103 3651
3104 $w = 0 if $w < 0; 3652 $w = 0 if $w < 0;
3105 $h = 0 if $h < 0; 3653 $h = 0 if $h < 0;
3106 3654
3655 $w = int $w + 0.5;
3656 $h = int $h + 0.5;
3657
3658 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3659 $widget->{old_w} = $widget->{w};
3660 $widget->{old_h} = $widget->{h};
3661
3107 $widget->{w} = $w; 3662 $widget->{w} = $w;
3108 $widget->{h} = $h; 3663 $widget->{h} = $h;
3664
3109 $widget->emit (size_allocate => $w, $h); 3665 $widget->emit (size_allocate => $w, $h);
3666 }
3110 } 3667 }
3111 } 3668 }
3112 3669
3113 while ($self->{post_alloc_hook}) { 3670 while ($self->{post_alloc_hook}) {
3114 $_->() 3671 $_->()
3115 for values %{delete $self->{post_alloc_hook}}; 3672 for values %{delete $self->{post_alloc_hook}};
3116 } 3673 }
3674
3117 3675
3118 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3676 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3119 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3677 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3120 glClear GL_COLOR_BUFFER_BIT; 3678 glClear GL_COLOR_BUFFER_BIT;
3121 3679
… …
3123 glLoadIdentity; 3681 glLoadIdentity;
3124 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3682 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3125 glMatrixMode GL_MODELVIEW; 3683 glMatrixMode GL_MODELVIEW;
3126 glLoadIdentity; 3684 glLoadIdentity;
3127 3685
3686 {
3687 package CFClient::UI::Base;
3688
3689 ($draw_x, $draw_y, $draw_w, $draw_h) =
3690 (0, 0, $self->{w}, $self->{h});
3691 }
3692
3128 $self->_draw; 3693 $self->_draw;
3129} 3694}
3130 3695
3131############################################################################# 3696#############################################################################
3132 3697

Diff Legend

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