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.250 by root, Sun May 28 02:31:03 2006 UTC vs.
Revision 1.281 by root, Mon Jun 5 01:59:59 2006 UTC

… …
17our $BUTTON_STATE; 17our $BUTTON_STATE;
18 18
19our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20 20
21sub get_layout { 21sub get_layout {
22 my $layout;
23
22 for (grep { $_->{name} } values %WIDGET) { 24 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = { 25 my $win = $layout->{$_->{name}} = { };
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 }; 26
29 } 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};
30 31
31 return $LAYOUT; 32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
32} 36}
33 37
34sub set_layout { 38sub set_layout {
35 my ($layout) = @_; 39 my ($layout) = @_;
40
36 $LAYOUT = $layout; 41 $LAYOUT = $layout;
37} 42}
38 43
39sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
40 if (!$GRAB) { 47 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
45 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
46 54
47 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
48 56
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 58
51 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show; 60 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
62 } 61 }
63 62
64 return; 63 return;
65 } 64 }
66 } 65 }
… …
172sub rescale_widgets { 171sub rescale_widgets {
173 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
174 173
175 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
176 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
177 $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.]+$/;
178 $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};
179 $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};
180 $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.]+$/;
181 $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};
182 $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};
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
183 } 189 }
184 } 190 }
185 191
186 reconfigure_widgets; 192 reconfigure_widgets;
187} 193}
… …
196 202
197sub new { 203sub new {
198 my $class = shift; 204 my $class = shift;
199 205
200 my $self = bless { 206 my $self = bless {
201 x => 0, 207 x => "center",
202 y => 0, 208 y => "center",
203 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
204 can_events => 1, 212 can_events => 1,
205 @_ 213 @_
206 }, $class; 214 }, $class;
215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
207 217
208 for (keys %$self) { 218 for (keys %$self) {
209 if (/^on_(.*)$/) { 219 if (/^on_(.*)$/) {
210 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
211 } 221 }
212 } 222 }
213 223
214 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
215
216 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217 $self->{req_x} = $layout->{x} * $::WIDTH; 225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
218 $self->{req_y} = $layout->{y} * $::HEIGHT; 226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
219 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
220 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 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};
221 } 234 }
222 235
223 $self 236 $self
224} 237}
225 238
… …
236 return if $self->{parent}; 249 return if $self->{parent};
237 250
238 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
239} 252}
240 253
241sub center {
242 my ($self) = @_;
243
244 $CFClient::UI::ROOT->on_post_alloc (
245 "center_$self" => sub {
246 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
247 },
248 );
249
250 $self->update;
251}
252
253sub set_visible { 254sub set_visible {
254 my ($self) = @_; 255 my ($self) = @_;
255 256
256 return if $self->{visible}; 257 return if $self->{visible};
257 258
258 $self->{root} = $self->{parent}{root}; 259 $self->{root} = $self->{parent}{root};
259 $self->{visible} = $self->{parent}{visible} + 1; 260 $self->{visible} = $self->{parent}{visible} + 1;
260 261
261 $self->emit (visibility_change => 1); 262 $self->emit (visibility_change => 1);
263
264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
262} 267}
263 268
264sub set_invisible { 269sub set_invisible {
265 my ($self) = @_; 270 my ($self) = @_;
266 271
267 return unless $self->{visible}; 272 return unless $self->{visible};
268 273
269 # broken show/hide model 274 $_->set_invisible for $self->children;
270 275
271 delete $self->{root}; 276 delete $self->{root};
272 delete $self->{visible}; 277 delete $self->{visible};
273 278
274 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
275 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
276 281
277 CFClient::UI::check_tooltip 282 CFClient::UI::check_tooltip
278 if $CFClient::UI::TOOLTIP->{owner} == $self; 283 if $TOOLTIP->{owner} == $self;
279 284
280 $self->focus_out; 285 $self->focus_out;
281 286
282 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
283} 288}
… …
306 311
307 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
308 if $self->{parent}; 313 if $self->{parent};
309} 314}
310 315
311sub move { 316sub move_abs {
312 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
313 318
314 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
315 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
316 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
317 322
318 $self->update; 323 $self->update;
319} 324}
320 325
321sub set_size { 326sub set_size {
322 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
323 328
324 $self->{def_w} = $w; 329 $self->{force_w} = $w;
325 $self->{def_h} = $h; 330 $self->{force_h} = $h;
326 331
327 $self->check_size; 332 $self->realloc;
328} 333}
329 334
330sub size_request { 335sub size_request {
331 require Carp; 336 require Carp;
332 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
334 339
335sub configure { 340sub configure {
336 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
337 342
338 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
339 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
340 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
341 348
342 # use alignment to adjust x, y 349 # use alignment to adjust x, y
343 350
344 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
345 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
346
347 ($w, $h) = ($w2, $h2);
348 } 353 }
349 354
350 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
351 $self->{x} = $x; 356 $self->{x} = $x;
352 $self->{y} = $y; 357 $self->{y} = $y;
353 $self->update; 358 $self->update;
354 } 359 }
355 360
356 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
357 $CFClient::UI::ROOT->{size_alloc}{$self+0} = [$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;
358 } 368 }
359} 369}
360 370
361sub size_allocate { 371sub size_allocate {
362 # nothing to be done 372 # nothing to be done
363} 373}
364 374
365sub reconfigure {
366 my ($self) = @_;
367
368 $self->check_size (1);
369 $self->update;
370}
371
372sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
373} 381}
374 382
375sub set_max_size { 383sub set_max_size {
376 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
377 385
378 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
379 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
380} 390}
381 391
382sub set_tooltip { 392sub set_tooltip {
383 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
384 394
… …
436 446
437 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 447 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
438 unless $FOCUS; 448 unless $FOCUS;
439} 449}
440 450
441sub mouse_motion { } 451sub mouse_motion { 0 }
442sub button_up { } 452sub button_up { 0 }
443sub key_down { } 453sub key_down { 0 }
444sub key_up { } 454sub key_up { 0 }
445 455
446sub button_down { 456sub button_down {
447 my ($self, $ev, $x, $y) = @_; 457 my ($self, $ev, $x, $y) = @_;
448 458
449 $self->focus_in; 459 $self->focus_in;
450}
451 460
452sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 461 0
453sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 462}
454sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 463
455sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 464sub find_widget {
456sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 465 my ($self, $x, $y) = @_;
466
467 return () unless $self->{can_events};
468
469 return $self
470 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
471 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
472
473 ()
474}
475
476sub set_parent {
477 my ($self, $parent) = @_;
478
479 Scalar::Util::weaken ($self->{parent} = $parent);
480 $self->set_visible if $parent->{visible};
481}
482
483sub connect {
484 my ($self, $signal, $cb) = @_;
485
486 push @{ $self->{signal_cb}{$signal} }, $cb;
487}
488
489sub _emit {
490 my ($self, $signal, @args) = @_;
491
492 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
493}
494
495sub emit {
496 my ($self, $signal, @args) = @_;
497
498 $self->_emit ($signal, @args)
499 || $self->$signal (@args);
500}
501
502sub visibility_change {
503 #my ($self, $visible) = @_;
504}
505
506sub realloc {
507 my ($self) = @_;
508
509 if ($self->{visible}) {
510 return if $self->{root}{realloc}{$self+0};
511
512 $self->{root}{realloc}{$self+0} = $self;
513 $self->{root}->update;
514 } else {
515 delete $self->{req_w};
516 delete $self->{req_h};
517 }
518}
519
520sub update {
521 my ($self) = @_;
522
523 $self->{parent}->update
524 if $self->{parent};
525}
526
527sub reconfigure {
528 my ($self) = @_;
529
530 $self->realloc;
531 $self->update;
532}
533
534# using global variables seems a bit hacky, but passing through all drawing
535# functions seems pointless.
536our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
457 537
458sub draw { 538sub draw {
459 my ($self) = @_; 539 my ($self) = @_;
460 540
461 return unless $self->{h} && $self->{w}; 541 return unless $self->{h} && $self->{w};
542
543 # update screen rectangle
544 local $draw_x = $draw_x + $self->{x};
545 local $draw_y = $draw_y + $self->{y};
546 local $draw_w = $draw_x + $self->{w};
547 local $draw_h = $draw_y + $self->{h};
548
549 # skip widgets that are entirely outside the drawing area
550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
462 552
463 glPushMatrix; 553 glPushMatrix;
464 glTranslate $self->{x}, $self->{y}, 0; 554 glTranslate $self->{x}, $self->{y}, 0;
465 $self->_draw;
466 glPopMatrix;
467 555
468 if ($self == $HOVER && $self->{can_hover}) { 556 if ($self == $HOVER && $self->{can_hover}) {
469 my ($x, $y) = @$self{qw(x y)};
470
471 glColor 1, 0.8, 0.5, 0.2; 557 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
472 glEnable GL_BLEND; 558 glEnable GL_BLEND;
473 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 559 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
474 glBegin GL_QUADS; 560 glBegin GL_QUADS;
475 glVertex $x , $y; 561 glVertex 0 , 0;
476 glVertex $x + $self->{w}, $y; 562 glVertex $self->{w}, 0;
477 glVertex $x + $self->{w}, $y + $self->{h}; 563 glVertex $self->{w}, $self->{h};
478 glVertex $x , $y + $self->{h}; 564 glVertex 0 , $self->{h};
479 glEnd; 565 glEnd;
480 glDisable GL_BLEND; 566 glDisable GL_BLEND;
481 } 567 }
482 568
483 if ($ENV{PCLIENT_DEBUG}) { 569 if ($ENV{CFPLUS_DEBUG} & 1) {
484 glPushMatrix; 570 glPushMatrix;
485 glColor 1, 1, 0, 1; 571 glColor 1, 1, 0, 1;
486 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 572 glTranslate 0.375, 0.375;
487 glBegin GL_LINE_LOOP; 573 glBegin GL_LINE_LOOP;
488 glVertex 0 , 0; 574 glVertex 0 , 0;
489 glVertex $self->{w} - 1, 0; 575 glVertex $self->{w} - 1, 0;
490 glVertex $self->{w} - 1, $self->{h} - 1; 576 glVertex $self->{w} - 1, $self->{h} - 1;
491 glVertex 0 , $self->{h} - 1; 577 glVertex 0 , $self->{h} - 1;
492 glEnd; 578 glEnd;
493 glPopMatrix; 579 glPopMatrix;
494 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 580 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
495 } 581 }
582
583 $self->_draw;
584 glPopMatrix;
496} 585}
497 586
498sub _draw { 587sub _draw {
499 my ($self) = @_; 588 my ($self) = @_;
500 589
501 warn "no draw defined for $self\n"; 590 warn "no draw defined for $self\n";
502}
503
504sub find_widget {
505 my ($self, $x, $y) = @_;
506
507 return () unless $self->{can_events};
508
509 return $self
510 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
511 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
512
513 ()
514}
515
516sub set_parent {
517 my ($self, $parent) = @_;
518
519 Scalar::Util::weaken ($self->{parent} = $parent);
520
521 $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
522
523 $self->check_size;
524}
525
526sub check_size {
527 my ($self, $forced) = @_;
528
529 $self->{force_alloc} = 1 if $forced;
530 $CFClient::UI::ROOT->{check_size}{$self} = $self;
531}
532
533sub update {
534 my ($self) = @_;
535
536 $self->{parent}->update
537 if $self->{parent};
538}
539
540sub connect {
541 my ($self, $signal, $cb) = @_;
542
543 push @{ $self->{signal_cb}{$signal} }, $cb;
544}
545
546sub _emit {
547 my ($self, $signal, @args) = @_;
548
549 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
550}
551
552sub emit {
553 my ($self, $signal, @args) = @_;
554
555 $self->_emit ($signal, @args)
556 || $self->$signal (@args);
557}
558
559sub visibility_change {
560 #my ($self, $visible) = @_;
561} 591}
562 592
563sub DESTROY { 593sub DESTROY {
564 my ($self) = @_; 594 my ($self) = @_;
565 595
… …
597 627
598 if ($color && (@$color < 4 || $color->[3])) { 628 if ($color && (@$color < 4 || $color->[3])) {
599 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
600 630
601 glEnable GL_BLEND; 631 glEnable GL_BLEND;
602 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
603 glColor @$color; 633 glColor_premultiply @$color;
604 634
605 glBegin GL_QUADS; 635 glBegin GL_QUADS;
606 glVertex 0 , 0; 636 glVertex 0 , 0;
607 glVertex 0 , $h; 637 glVertex 0 , $h;
608 glVertex $w, $h; 638 glVertex $w, $h;
… …
623 my ($class, %arg) = @_; 653 my ($class, %arg) = @_;
624 $class->SUPER::new (can_events => 0, %arg); 654 $class->SUPER::new (can_events => 0, %arg);
625} 655}
626 656
627sub size_request { 657sub size_request {
628 (0, 0) 658 my ($self) = @_;
659
660 ($self->{w} + 0, $self->{h} + 0)
629} 661}
630 662
631sub draw { } 663sub draw { }
632 664
633############################################################################# 665#############################################################################
… …
637our @ISA = CFClient::UI::Base::; 669our @ISA = CFClient::UI::Base::;
638 670
639sub new { 671sub new {
640 my ($class, %arg) = @_; 672 my ($class, %arg) = @_;
641 673
642 my $children = delete $arg{children} || []; 674 my $children = delete $arg{children};
643 675
644 my $self = $class->SUPER::new ( 676 my $self = $class->SUPER::new (
645 children => [], 677 children => [],
646 can_events => 0, 678 can_events => 0,
647 %arg, 679 %arg,
648 ); 680 );
681
649 $self->add ($_) for @$children; 682 $self->add (@$children)
683 if $children;
650 684
651 $self 685 $self
652} 686}
653 687
654sub add { 688sub add {
… …
662 $self->{children} = [ 696 $self->{children} = [
663 sort { $a->{z} <=> $b->{z} } 697 sort { $a->{z} <=> $b->{z} }
664 @{$self->{children}}, @widgets 698 @{$self->{children}}, @widgets
665 ]; 699 ];
666 700
667 $self->check_size (1); 701 $self->realloc;
668 $self->update;
669} 702}
670 703
671sub children { 704sub children {
672 @{ $_[0]{children} } 705 @{ $_[0]{children} }
673} 706}
… …
678 delete $child->{parent}; 711 delete $child->{parent};
679 $child->hide; 712 $child->hide;
680 713
681 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 714 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
682 715
683 $self->check_size (1); 716 $self->realloc;
684 $self->update;
685} 717}
686 718
687sub clear { 719sub clear {
688 my ($self) = @_; 720 my ($self) = @_;
689 721
… …
693 for (@$children) { 725 for (@$children) {
694 delete $_->{parent}; 726 delete $_->{parent};
695 $_->hide; 727 $_->hide;
696 } 728 }
697 729
698 $self->check_size; 730 $self->realloc;
699 $self->update;
700} 731}
701 732
702sub find_widget { 733sub find_widget {
703 my ($self, $x, $y) = @_; 734 my ($self, $x, $y) = @_;
704 735
705 $x -= $self->{x}; 736 $x -= $self->{x};
706 $y -= $self->{y}; 737 $y -= $self->{y};
707 738
708 my $res; 739 my $res;
709 740
710 for (reverse @{ $self->{children} }) { 741 for (reverse $self->visible_children) {
711 $res = $_->find_widget ($x, $y) 742 $res = $_->find_widget ($x, $y)
712 and return $res; 743 and return $res;
713 } 744 }
714 745
715 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 746 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
764 $self->{children}[0]->configure (0, 0, $w, $h); 795 $self->{children}[0]->configure (0, 0, $w, $h);
765} 796}
766 797
767############################################################################# 798#############################################################################
768 799
800# back-buffered drawing area
801
769package CFClient::UI::Window; 802package CFClient::UI::Window;
770 803
771our @ISA = CFClient::UI::Bin::; 804our @ISA = CFClient::UI::Bin::;
772 805
773use CFClient::OpenGL; 806use CFClient::OpenGL;
… …
791 $self->SUPER::size_allocate ($w, $h); 824 $self->SUPER::size_allocate ($w, $h);
792 $self->update; 825 $self->update;
793} 826}
794 827
795sub _render { 828sub _render {
829 my ($self) = @_;
830
796 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
797} 832}
798 833
799sub render_child { 834sub render_child {
800 my ($self) = @_; 835 my ($self) = @_;
801 836
802 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
803 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
804 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
805 840
841 {
842 package CFClient::UI::Base;
843
844 ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h});
846 }
847
806 $self->_render; 848 $self->_render;
807 }; 849 };
808} 850}
809 851
810sub _draw { 852sub _draw {
811 my ($self) = @_; 853 my ($self) = @_;
812 854
813 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
814 856
815 my $tex = $self->{texture} 857 my $tex = $self->{texture}
816 or return; 858 or return;
817 859
818 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
819 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
820 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
821 863
822 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
823 865
824 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
825} 867}
… …
841} 883}
842 884
843sub size_request { 885sub size_request {
844 my ($self) = @_; 886 my ($self) = @_;
845 887
846 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
847 889
848 $w = 10 if $self->{scroll_x}; 890 $w = 10 if $self->{scroll_x};
849 $h = 10 if $self->{scroll_y}; 891 $h = 10 if $self->{scroll_y};
850 892
851 ($w, $h) 893 ($w, $h)
852} 894}
853 895
854sub size_allocate { 896sub size_allocate {
855 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
856 898
899 my $child = $self->child;
900
857 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
858 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
859 903
860 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
861 $self->update; 905 $self->update;
862} 906}
863 907
… …
899} 943}
900 944
901sub _render { 945sub _render {
902 my ($self) = @_; 946 my ($self) = @_;
903 947
948 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
949 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
950
904 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
905 952
906 $self->SUPER::_render; 953 $self->SUPER::_render;
907} 954}
908 955
… …
911package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
912 959
913our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
914 961
915sub new { 962sub new {
916 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
917 966
918 my $self; 967 my $self;
919 968
920 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
921 vertical => 1, 970 vertical => 1,
… …
926 ; 975 ;
927 976
928 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
929 vp => (new CFClient::UI::ViewPort expand => 1), 978 vp => (new CFClient::UI::ViewPort expand => 1),
930 slider => $slider, 979 slider => $slider,
931 @_, 980 %arg,
932 ); 981 );
933 982
934 $self->{vp}->add ($self->{scrolled});
935 $self->add ($self->{vp});
936 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
937 985
938 $self 986 $self
987}
988
989sub add {
990 my ($self, $widget) = @_;
991
992 $self->{vp}->add ($self->{child} = $widget);
939} 993}
940 994
941sub update { 995sub update {
942 my ($self) = @_; 996 my ($self) = @_;
943 997
… …
982 1036
983 if ($self->{bg}) { 1037 if ($self->{bg}) {
984 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
985 1039
986 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
987 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
988 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
989 1043
990 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
991 glVertex 0 , 0; 1045 glVertex 0 , 0;
992 glVertex 0 , $h; 1046 glVertex 0 , $h;
993 glVertex $w, $h; 1047 glVertex $w, $h;
… …
1006 1060
1007our @ISA = CFClient::UI::Bin::; 1061our @ISA = CFClient::UI::Bin::;
1008 1062
1009use CFClient::OpenGL; 1063use CFClient::OpenGL;
1010 1064
1011my @tex = 1065my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1;
1068
1069my @border =
1012 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1013 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1014 1072
1015sub new { 1073sub new {
1016 my $class = shift; 1074 my ($class, %arg) = @_;
1075
1076 my $title = delete $arg{title};
1017 1077
1018 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
1019 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
1020 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
1021 border => 0.6, 1081 border => 0.6,
1022 is_toplevel => 1,
1023 can_events => 1, 1082 can_events => 1,
1024 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
1025 ); 1086 );
1026 1087
1027 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title} = new CFClient::UI::Label
1028 align => 0, 1089 align => 0,
1029 valign => 1, 1090 valign => 1,
1030 text => $self->{title}, 1091 text => $title,
1031 fontsize => $self->{border}; 1092 fontsize => $self->{border}
1093 if defined $title;
1032 1094
1033 $self 1095 $self
1096}
1097
1098sub add {
1099 my ($self, @widgets) = @_;
1100
1101 $self->SUPER::add (@widgets);
1102 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1034} 1103}
1035 1104
1036sub border { 1105sub border {
1037 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
1038} 1107}
1039 1108
1040sub size_request { 1109sub size_request {
1041 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title}->size_request
1113 if $self->{title};
1042 1114
1043 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
1044 1116
1045 ( 1117 (
1046 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
1049} 1121}
1050 1122
1051sub size_allocate { 1123sub size_allocate {
1052 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
1053 1125
1126 if ($self->{title}) {
1127 $self->{title}{w} = $w;
1128 $self->{title}{h} = $h;
1129 $self->{title}->size_allocate ($w, $h);
1130 }
1131
1132 my $border = $self->border;
1133
1054 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
1055 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
1056 1136
1057 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1058 if $self->{title};
1059
1060 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
1061} 1138}
1062 1139
1063sub button_down { 1140sub button_down {
1064 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
1065 1142
… …
1081 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
1082 1159
1083 my $dx = $ev->{x} - $ox; 1160 my $dx = $ev->{x} - $ox;
1084 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
1085 1162
1086 $self->{user_x} = $wx + $dx * $mx;
1087 $self->{user_y} = $wy + $dy * $my;
1088 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1089 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1090 $self->move ($self->{user_x}, $self->{user_y}); 1165
1091 $self->check_size; 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1167 $self->realloc;
1092 }; 1168 };
1093 1169
1094 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1095 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1096 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1098 $self->{motion} = sub { 1174 $self->{motion} = sub {
1099 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1100 1176
1101 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1102 1178
1103 $self->{user_x} = $bx + $x - $ox; 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1104 $self->{user_y} = $by + $y - $oy; 1180 # HACK: the next line is required to enforce placement
1105 1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1106 $self->move ($self->{user_x}, $self->{user_y});
1107 $self->update;
1108 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
1109 } 1187 1
1110} 1188}
1111 1189
1112sub button_up { 1190sub button_up {
1113 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
1114 1192
1115 delete $self->{motion}; 1193 !!delete $self->{motion}
1116} 1194}
1117 1195
1118sub mouse_motion { 1196sub mouse_motion {
1119 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
1120 1198
1121 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
1122} 1202}
1123 1203
1124sub _draw { 1204sub _draw {
1125 my ($self) = @_; 1205 my ($self) = @_;
1126 1206
1207 my $child = $self->{children}[0];
1208
1127 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
1128 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
1129 1211
1130 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
1131 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1132 1214
1133 my $border = $self->border; 1215 my $border = $self->border;
1134 1216
1135 glColor @{ $self->{border_bg} }; 1217 glColor @{ $self->{border_bg} };
1136 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1218 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1137 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1138 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1139 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1140 1222
1141 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1142 my $bg = $tex[0]; 1224 glColor @{ $self->{bg} };
1143 1225
1144 # TODO: repeat texture not scale 1226 # TODO: repeat texture not scale
1227 # solve this better(?)
1145 my $rep_x = $cw / $bg->{w}; 1228 $bg->{s} = $cw / $bg->{w};
1146 my $rep_y = $ch / $bg->{h}; 1229 $bg->{t} = $ch / $bg->{h};
1147
1148 glColor @{ $self->{bg} };
1149
1150 $bg->{s} = $rep_x;
1151 $bg->{t} = $rep_y;
1152 $bg->{wrap_mode} = 1;
1153 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1154 } 1231 }
1155 1232
1156 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1157 1234
1158 $self->{title}->draw if $self->{title};
1159
1160 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw;
1240 }
1161} 1241}
1162 1242
1163############################################################################# 1243#############################################################################
1164 1244
1165package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
1187 my ($self, $x, $y, $child) = @_; 1267 my ($self, $x, $y, $child) = @_;
1188 1268
1189 $child->set_parent ($self); 1269 $child->set_parent ($self);
1190 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1191 1271
1192 $self->check_size (1); 1272 $self->realloc;
1193} 1273}
1194 1274
1195# TODO: move to container class maybe? send children a signal on removal? 1275# TODO: move to container class maybe? send children a signal on removal?
1196sub clear { 1276sub clear {
1197 my ($self) = @_; 1277 my ($self) = @_;
… …
1202 for (@children) { 1282 for (@children) {
1203 delete $_->{parent}; 1283 delete $_->{parent};
1204 $_->hide; 1284 $_->hide;
1205 } 1285 }
1206 1286
1207 $self->check_size (1); 1287 $self->realloc;
1208 $self->update;
1209} 1288}
1210 1289
1211sub get_wh { 1290sub get_wh {
1212 my ($self) = @_; 1291 my ($self) = @_;
1213 1292
… …
1421 ellipsise => 3, # end 1500 ellipsise => 3, # end
1422 layout => (new CFClient::Layout), 1501 layout => (new CFClient::Layout),
1423 fontsize => 1, 1502 fontsize => 1,
1424 align => -1, 1503 align => -1,
1425 valign => -1, 1504 valign => -1,
1426 padding => 2, 1505 padding_x => 2,
1506 padding_y => 2,
1427 can_events => 0, 1507 can_events => 0,
1428 %arg 1508 %arg
1429 ); 1509 );
1430 1510
1431 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1467 $self->{text} = "T$text"; 1547 $self->{text} = "T$text";
1468 1548
1469 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1549 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1470 $self->{layout}->set_text ($text); 1550 $self->{layout}->set_text ($text);
1471 1551
1552 $self->realloc;
1472 $self->update; 1553 $self->update;
1473 $self->check_size;
1474} 1554}
1475 1555
1476sub set_markup { 1556sub set_markup {
1477 my ($self, $markup) = @_; 1557 my ($self, $markup) = @_;
1478 1558
… …
1482 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1562 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483 1563
1484 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1564 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1485 $self->{layout}->set_markup ($markup); 1565 $self->{layout}->set_markup ($markup);
1486 1566
1567 $self->realloc;
1487 $self->update; 1568 $self->update;
1488 $self->check_size;
1489} 1569}
1490 1570
1491sub size_request { 1571sub size_request {
1492 my ($self) = @_; 1572 my ($self) = @_;
1493 1573
… …
1507 1587
1508 $w = List::Util::max $w, $w2; 1588 $w = List::Util::max $w, $w2;
1509 $h = List::Util::max $h, $h2; 1589 $h = List::Util::max $h, $h2;
1510 } 1590 }
1511 1591
1512 ( 1592 ($w, $h)
1513 $w + $self->{padding} * 2,
1514 $h + $self->{padding} * 2,
1515 )
1516} 1593}
1517 1594
1518sub size_allocate { 1595sub size_allocate {
1519 my ($self, $w, $h) = @_; 1596 my ($self, $w, $h) = @_;
1520 1597
1598 delete $self->{ox};
1599
1521 delete $self->{texture}; 1600 delete $self->{texture}
1601 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1522} 1602}
1523 1603
1524sub set_fontsize { 1604sub set_fontsize {
1525 my ($self, $fontsize) = @_; 1605 my ($self, $fontsize) = @_;
1526 1606
1527 $self->{fontsize} = $fontsize; 1607 $self->{fontsize} = $fontsize;
1528 delete $self->{texture}; 1608 delete $self->{texture};
1529 1609
1530 $self->update; 1610 $self->realloc;
1531 $self->check_size;
1532} 1611}
1533 1612
1534sub _draw { 1613sub _draw {
1535 my ($self) = @_; 1614 my ($self) = @_;
1536 1615
… …
1542 $self->{layout}->set_width ($self->{w}); 1621 $self->{layout}->set_width ($self->{w});
1543 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1622 $self->{layout}->set_ellipsise ($self->{ellipsise});
1544 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1623 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1545 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1546 1625
1547 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1626 new_from_layout CFClient::Texture $self->{layout}
1627 };
1548 1628
1629 unless (exists $self->{ox}) {
1549 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1630 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1550 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1631 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1551 : ($self->{w} - $tex->{w}) * 0.5); 1632 : ($self->{w} - $tex->{w}) * 0.5);
1552 1633
1553 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1634 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1554 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1635 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1555 : ($self->{h} - $tex->{h}) * 0.5); 1636 : ($self->{h} - $tex->{h}) * 0.5);
1556
1557 $tex
1558 }; 1637 };
1559 1638
1560 glEnable GL_TEXTURE_2D; 1639 glEnable GL_TEXTURE_2D;
1561 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1640 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1562 1641
1642 glColor_premultiply @{$self->{fg}}
1563 if ($tex->{format} == GL_ALPHA) { 1643 if $tex->{format} == GL_ALPHA;
1564 glColor @{$self->{fg}}; 1644
1565 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1566 } else {
1567 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1645 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1568 }
1569 1646
1570 glDisable GL_TEXTURE_2D; 1647 glDisable GL_TEXTURE_2D;
1571} 1648}
1572 1649
1573############################################################################# 1650#############################################################################
… …
1600 1677
1601 delete $self->{cur_h}; 1678 delete $self->{cur_h};
1602 1679
1603 return if $self->{text} eq $text; 1680 return if $self->{text} eq $text;
1604 1681
1605 delete $self->{texture};
1606
1607 $self->{last_activity} = $::NOW; 1682 $self->{last_activity} = $::NOW;
1608 $self->{text} = $text; 1683 $self->{text} = $text;
1609 1684
1610 $text =~ s/./*/g if $self->{hidden}; 1685 $text =~ s/./*/g if $self->{hidden};
1611 $self->{layout}->set_text ("$text "); 1686 $self->{layout}->set_text ("$text ");
1612 1687
1613 $self->_emit (changed => $self->{text}); 1688 $self->_emit (changed => $self->{text});
1689 $self->update;
1614} 1690}
1615 1691
1616sub set_text { 1692sub set_text {
1617 my ($self, $text) = @_; 1693 my ($self, $text) = @_;
1618 1694
1619 $self->{cursor} = length $text; 1695 $self->{cursor} = length $text;
1620 $self->_set_text ($text); 1696 $self->_set_text ($text);
1621 $self->update; 1697
1622 $self->check_size; 1698 $self->realloc;
1623} 1699}
1624 1700
1625sub get_text { 1701sub get_text {
1626 $_[0]{text} 1702 $_[0]{text}
1627} 1703}
… …
1657 $self->{cursor} = length $text; 1733 $self->{cursor} = length $text;
1658 } elsif ($uni == 27) { 1734 } elsif ($uni == 27) {
1659 $self->_emit ('escape'); 1735 $self->_emit ('escape');
1660 } elsif ($uni) { 1736 } elsif ($uni) {
1661 substr $text, $self->{cursor}++, 0, chr $uni; 1737 substr $text, $self->{cursor}++, 0, chr $uni;
1738 } else {
1739 return 0;
1662 } 1740 }
1663 1741
1664 $self->_set_text ($text); 1742 $self->_set_text ($text);
1665 $self->update; 1743
1666 $self->check_size; 1744 $self->realloc;
1745
1746 1
1667} 1747}
1668 1748
1669sub focus_in { 1749sub focus_in {
1670 my ($self) = @_; 1750 my ($self) = @_;
1671 1751
… …
1686 utf8::encode $text; 1766 utf8::encode $text;
1687 $self->{cursor} = length substr $text, 0, $idx; 1767 $self->{cursor} = length substr $text, 0, $idx;
1688 1768
1689 $self->_set_text ($self->{text}); 1769 $self->_set_text ($self->{text});
1690 $self->update; 1770 $self->update;
1771
1772 1
1691} 1773}
1692 1774
1693sub mouse_motion { 1775sub mouse_motion {
1694 my ($self, $ev, $x, $y) = @_; 1776 my ($self, $ev, $x, $y) = @_;
1695# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1777# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1778
1779 0
1696} 1780}
1697 1781
1698sub _draw { 1782sub _draw {
1699 my ($self) = @_; 1783 my ($self) = @_;
1700 1784
1701 local $self->{fg} = $self->{fg}; 1785 local $self->{fg} = $self->{fg};
1702 1786
1703 if ($FOCUS == $self) { 1787 if ($FOCUS == $self) {
1704 glColor @{$self->{active_bg}}; 1788 glColor_premultiply @{$self->{active_bg}};
1705 $self->{fg} = $self->{active_fg}; 1789 $self->{fg} = $self->{active_fg};
1706 } else { 1790 } else {
1707 glColor @{$self->{bg}}; 1791 glColor_premultiply @{$self->{bg}};
1708 } 1792 }
1709 1793
1710 glEnable GL_BLEND; 1794 glEnable GL_BLEND;
1711 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1795 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1712 glBegin GL_QUADS; 1796 glBegin GL_QUADS;
1713 glVertex 0 , 0; 1797 glVertex 0 , 0;
1714 glVertex 0 , $self->{h}; 1798 glVertex 0 , $self->{h};
1715 glVertex $self->{w}, $self->{h}; 1799 glVertex $self->{w}, $self->{h};
1716 glVertex $self->{w}, 0; 1800 glVertex $self->{w}, 0;
… …
1777 } else { 1861 } else {
1778 $self->set_text ($self->{history_saveback}); 1862 $self->set_text ($self->{history_saveback});
1779 } 1863 }
1780 1864
1781 } else { 1865 } else {
1782 $self->SUPER::key_down ($ev); 1866 return $self->SUPER::key_down ($ev)
1867 }
1868
1783 } 1869 1
1784
1785} 1870}
1786 1871
1787############################################################################# 1872#############################################################################
1788 1873
1789package CFClient::UI::Button; 1874package CFClient::UI::Button;
… …
1798 1883
1799sub new { 1884sub new {
1800 my $class = shift; 1885 my $class = shift;
1801 1886
1802 $class->SUPER::new ( 1887 $class->SUPER::new (
1803 padding => 4, 1888 padding_x => 4,
1889 padding_y => 4,
1804 fg => [1, 1, 1], 1890 fg => [1, 1, 1],
1805 active_fg => [0, 0, 1], 1891 active_fg => [0, 0, 1],
1806 can_hover => 1, 1892 can_hover => 1,
1807 align => 0, 1893 align => 0,
1808 valign => 0, 1894 valign => 0,
… …
1817 my ($self, $ev, $x, $y) = @_; 1903 my ($self, $ev, $x, $y) = @_;
1818 1904
1819 $self->emit ("activate") 1905 $self->emit ("activate")
1820 if $x >= 0 && $x < $self->{w} 1906 if $x >= 0 && $x < $self->{w}
1821 && $y >= 0 && $y < $self->{h}; 1907 && $y >= 0 && $y < $self->{h};
1908
1909 1
1822} 1910}
1823 1911
1824sub _draw { 1912sub _draw {
1825 my ($self) = @_; 1913 my ($self) = @_;
1826 1914
1827 local $self->{fg} = $self->{fg}; 1915 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1828
1829 if ($GRAB == $self) {
1830 $self->{fg} = $self->{active_fg};
1831 }
1832 1916
1833 glEnable GL_TEXTURE_2D; 1917 glEnable GL_TEXTURE_2D;
1834 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1835 glColor 0, 0, 0, 1; 1919 glColor 0, 0, 0, 1;
1836 1920
… …
1855 1939
1856sub new { 1940sub new {
1857 my $class = shift; 1941 my $class = shift;
1858 1942
1859 $class->SUPER::new ( 1943 $class->SUPER::new (
1860 padding => 2, 1944 padding_x => 2,
1945 padding_y => 2,
1861 fg => [1, 1, 1], 1946 fg => [1, 1, 1],
1862 active_fg => [1, 1, 0], 1947 active_fg => [1, 1, 0],
1863 bg => [0, 0, 0, 0.2], 1948 bg => [0, 0, 0, 0.2],
1864 active_bg => [1, 1, 1, 0.5], 1949 active_bg => [1, 1, 1, 0.5],
1865 state => 0, 1950 state => 0,
… …
1869} 1954}
1870 1955
1871sub size_request { 1956sub size_request {
1872 my ($self) = @_; 1957 my ($self) = @_;
1873 1958
1874 ($self->{padding} * 2 + 6) x 2 1959 (6) x 2
1875} 1960}
1876 1961
1877sub button_down { 1962sub button_down {
1878 my ($self, $ev, $x, $y) = @_; 1963 my ($self, $ev, $x, $y) = @_;
1879 1964
1880 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1965 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1881 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1966 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1882 $self->{state} = !$self->{state}; 1967 $self->{state} = !$self->{state};
1883 $self->_emit (changed => $self->{state}); 1968 $self->_emit (changed => $self->{state});
1969 } else {
1970 return 0
1971 }
1972
1884 } 1973 1
1885} 1974}
1886 1975
1887sub _draw { 1976sub _draw {
1888 my ($self) = @_; 1977 my ($self) = @_;
1889 1978
1890 $self->SUPER::_draw; 1979 $self->SUPER::_draw;
1891 1980
1892 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1981 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1893 1982
1894 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1983 my ($w, $h) = @$self{qw(w h)};
1984
1985 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1895 1986
1896 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1987 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1897 1988
1898 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1989 my $tex = $self->{state} ? $tex[1] : $tex[0];
1899 1990
… …
2054 2145
2055 my $h1 = $self->{h} * (1 - $ycut1); 2146 my $h1 = $self->{h} * (1 - $ycut1);
2056 my $h2 = $self->{h} * (1 - $ycut2); 2147 my $h2 = $self->{h} * (1 - $ycut2);
2057 2148
2058 glEnable GL_BLEND; 2149 glEnable GL_BLEND;
2059 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2150 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2151 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2060 glEnable GL_TEXTURE_2D; 2152 glEnable GL_TEXTURE_2D;
2061 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2153 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2062 2154
2063 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2155 glBindTexture GL_TEXTURE_2D, $t1->{name};
2064 glBegin GL_QUADS; 2156 glBegin GL_QUADS;
… …
2164 fg => [1, 1, 1], 2256 fg => [1, 1, 1],
2165 active_fg => [0, 0, 0], 2257 active_fg => [0, 0, 0],
2166 bg => [0, 0, 0, 0.2], 2258 bg => [0, 0, 0, 0.2],
2167 active_bg => [1, 1, 1, 0.5], 2259 active_bg => [1, 1, 1, 0.5],
2168 range => [0, 0, 100, 10, 0], 2260 range => [0, 0, 100, 10, 0],
2169 req_w => $::WIDTH / 80, 2261 min_w => $::WIDTH / 80,
2170 req_h => $::WIDTH / 80, 2262 min_h => $::WIDTH / 80,
2171 vertical => 0, 2263 vertical => 0,
2172 can_hover => 1, 2264 can_hover => 1,
2173 inner_pad => 0.02, 2265 inner_pad => 0.02,
2174 @_ 2266 @_
2175 ); 2267 );
… …
2178 $self->update; 2270 $self->update;
2179 2271
2180 $self 2272 $self
2181} 2273}
2182 2274
2275sub changed { }
2276
2183sub set_range { 2277sub set_range {
2184 my ($self, $range) = @_; 2278 my ($self, $range) = @_;
2185 2279
2186 ($range, $self->{range}) = ($self->{range}, $range); 2280 ($range, $self->{range}) = ($self->{range}, $range);
2187 2281
… …
2213} 2307}
2214 2308
2215sub size_request { 2309sub size_request {
2216 my ($self) = @_; 2310 my ($self) = @_;
2217 2311
2218 my $w = $self->{req_w}; 2312 ($self->{req_w}, $self->{req_h})
2219 my $h = $self->{req_h};
2220
2221 $self->{vertical} ? ($h, $w) : ($w, $h)
2222} 2313}
2223 2314
2224sub button_down { 2315sub button_down {
2225 my ($self, $ev, $x, $y) = @_; 2316 my ($self, $ev, $x, $y) = @_;
2226 2317
2227 $self->SUPER::button_down ($ev, $x, $y); 2318 $self->SUPER::button_down ($ev, $x, $y);
2228 2319
2229 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2320 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2230 2321
2231 $self->mouse_motion ($ev, $x, $y); 2322 $self->mouse_motion ($ev, $x, $y)
2232} 2323}
2233 2324
2234sub mouse_motion { 2325sub mouse_motion {
2235 my ($self, $ev, $x, $y) = @_; 2326 my ($self, $ev, $x, $y) = @_;
2236 2327
… …
2240 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2331 my (undef, $lo, $hi, $page) = @{$self->{range}};
2241 2332
2242 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2333 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2243 2334
2244 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2335 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2336 } else {
2337 return 0;
2338 }
2339
2245 } 2340 1
2246} 2341}
2247 2342
2248sub update { 2343sub update {
2249 my ($self) = @_; 2344 my ($self) = @_;
2250 2345
2251 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2346 delete $self->{knob_w};
2347 $self->SUPER::update;
2348}
2349
2350sub _draw {
2351 my ($self) = @_;
2352
2353 unless ($self->{knob_w}) {
2252 $self->set_value ($self->{range}[0]); 2354 $self->set_value ($self->{range}[0]);
2253 2355
2254 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2356 my ($value, $lo, $hi, $page) = @{$self->{range}};
2255 my $range = ($hi - $page - $lo) || 1e-100; 2357 my $range = ($hi - $page - $lo) || 1e-100;
2256 2358
… …
2262 $value = ($value - $lo) / $range; 2364 $value = ($value - $lo) / $range;
2263 $value = $value * $self->{scale} + $self->{offset}; 2365 $value = $value * $self->{scale} + $self->{offset};
2264 2366
2265 $self->{knob_x} = $value - $knob_w * 0.5; 2367 $self->{knob_x} = $value - $knob_w * 0.5;
2266 $self->{knob_w} = $knob_w; 2368 $self->{knob_w} = $knob_w;
2267 }); 2369 }
2268
2269 $self->SUPER::update;
2270}
2271
2272sub _draw {
2273 my ($self) = @_;
2274 2370
2275 $self->SUPER::_draw (); 2371 $self->SUPER::_draw ();
2276 2372
2277 glScale $self->{w}, $self->{h}; 2373 glScale $self->{w}, $self->{h};
2278 2374
… …
2472 2568
2473 delete $self->{texture}; 2569 delete $self->{texture};
2474 } 2570 }
2475 2571
2476 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2477 glClearColor 0.5, 0.5, 0.5, 0; 2573 glClearColor 0, 0, 0, 0;
2478 glClear GL_COLOR_BUFFER_BIT; 2574 glClear GL_COLOR_BUFFER_BIT;
2479 2575
2480 my $top = int $self->{children}[1]{range}[0]; 2576 my $top = int $self->{children}[1]{range}[0];
2481 2577
2482 my $y0 = $top; 2578 my $y0 = $top;
… …
2517sub _draw { 2613sub _draw {
2518 my ($self) = @_; 2614 my ($self) = @_;
2519 2615
2520 glEnable GL_TEXTURE_2D; 2616 glEnable GL_TEXTURE_2D;
2521 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2522 glColor 1, 1, 1, 1; 2618 glColor 0, 0, 0, 1;
2523 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2619 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2524 glDisable GL_TEXTURE_2D; 2620 glDisable GL_TEXTURE_2D;
2525 2621
2526 $self->{children}[1]->draw; 2622 $self->{children}[1]->draw;
2527 2623
2528} 2624}
… …
2611} 2707}
2612 2708
2613sub set_tooltip_from { 2709sub set_tooltip_from {
2614 my ($self, $widget) = @_; 2710 my ($self, $widget) = @_;
2615 2711
2712 my $tooltip = $widget->{tooltip};
2713
2714 if ($ENV{CFPLUS_DEBUG} & 2) {
2715 $tooltip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}";
2719 }
2720
2616 $self->add (new CFClient::UI::Label 2721 $self->add (new CFClient::UI::Label
2617 markup => $widget->{tooltip}, 2722 markup => $tooltip,
2618 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2619 fontsize => 0.8, 2724 fontsize => 0.8,
2620 fg => [0, 0, 0, 1], 2725 fg => [0, 0, 0, 1],
2621 ellipsise => 0, 2726 ellipsise => 0,
2622 font => ($widget->{tooltip_font} || $::FONT_PROP), 2727 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2633 2738
2634sub size_allocate { 2739sub size_allocate {
2635 my ($self, $w, $h) = @_; 2740 my ($self, $w, $h) = @_;
2636 2741
2637 $self->SUPER::size_allocate ($w - 4, $h - 4); 2742 $self->SUPER::size_allocate ($w - 4, $h - 4);
2743}
2744
2745sub visibility_change {
2746 my ($self, $visible) = @_;
2747
2748 return unless $visible;
2749
2750 $self->{root}->on_post_alloc ("move_$self" => sub {
2751 my $widget = $self->{owner}
2752 or return;
2753
2754 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755
2756 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757 if $x + $self->{w} > $::WIDTH;
2758
2759 $self->move_abs ($x, $y);
2760 });
2638} 2761}
2639 2762
2640sub _draw { 2763sub _draw {
2641 my ($self) = @_; 2764 my ($self) = @_;
2642 2765
… …
2659 glVertex $w, $h; 2782 glVertex $w, $h;
2660 glVertex $w, 0; 2783 glVertex $w, 0;
2661 glEnd; 2784 glEnd;
2662 2785
2663 glTranslate 2 - 0.375, 2 - 0.375; 2786 glTranslate 2 - 0.375, 2 - 0.375;
2787
2664 $self->SUPER::_draw; 2788 $self->SUPER::_draw;
2665} 2789}
2666 2790
2667############################################################################# 2791#############################################################################
2668 2792
… …
2727 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2728 2852
2729 if ($tex) { 2853 if ($tex) {
2730 glEnable GL_TEXTURE_2D; 2854 glEnable GL_TEXTURE_2D;
2731 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2732 glColor 1, 1, 1, 1; 2856 glColor 0, 0, 0, 1;
2733 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2734 glDisable GL_TEXTURE_2D; 2858 glDisable GL_TEXTURE_2D;
2735 } 2859 }
2736} 2860}
2737 2861
… …
2744 $self->SUPER::DESTROY; 2868 $self->SUPER::DESTROY;
2745} 2869}
2746 2870
2747############################################################################# 2871#############################################################################
2748 2872
2749package CFClient::UI::Inventory; 2873package CFClient::UI::Buttonbar;
2750 2874
2751our @ISA = CFClient::UI::ScrolledWindow::; 2875our @ISA = CFClient::UI::HBox::;
2752 2876
2753sub new { 2877# TODO: should actualyl wrap buttons and other goodies.
2754 my $class = shift;
2755
2756 my $self = $class->SUPER::new (
2757 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2758 @_,
2759 );
2760
2761 $self
2762}
2763
2764sub set_items {
2765 my ($self, $items) = @_;
2766
2767 $self->{scrolled}->clear;
2768 return unless $items;
2769
2770 my @items = sort {
2771 ($a->{type} <=> $b->{type})
2772 or ($a->{name} cmp $b->{name})
2773 } @$items;
2774
2775 $self->{real_items} = \@items;
2776
2777 my $row = 0;
2778 for my $item (@items) {
2779 CFClient::Item::update_widgets $item;
2780
2781 $self->{scrolled}->add (0, $row, $item->{face_widget});
2782 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2783 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2784
2785 $row++;
2786 }
2787}
2788 2878
2789############################################################################# 2879#############################################################################
2790 2880
2791package CFClient::UI::Menu; 2881package CFClient::UI::Menu;
2792 2882
… …
2833 # maybe save $GRAB? must be careful about events... 2923 # maybe save $GRAB? must be careful about events...
2834 $GRAB = $self; 2924 $GRAB = $self;
2835 $self->{button} = $ev->{button}; 2925 $self->{button} = $ev->{button};
2836 2926
2837 $self->show; 2927 $self->show;
2838 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2928 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2839} 2929}
2840 2930
2841sub mouse_motion { 2931sub mouse_motion {
2842 my ($self, $ev, $x, $y) = @_; 2932 my ($self, $ev, $x, $y) = @_;
2843 2933
2844 # TODO: should use vbox->find_widget or so 2934 # TODO: should use vbox->find_widget or so
2845 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2846 $self->{hover} = $self->{item}{$HOVER}; 2936 $self->{hover} = $self->{item}{$HOVER};
2937
2938 0
2847} 2939}
2848 2940
2849sub button_up { 2941sub button_up {
2850 my ($self, $ev, $x, $y) = @_; 2942 my ($self, $ev, $x, $y) = @_;
2851 2943
… …
2853 undef $GRAB; 2945 undef $GRAB;
2854 $self->hide; 2946 $self->hide;
2855 2947
2856 $self->_emit ("popdown"); 2948 $self->_emit ("popdown");
2857 $self->{hover}[1]->() if $self->{hover}; 2949 $self->{hover}[1]->() if $self->{hover};
2950 } else {
2951 return 0
2952 }
2953
2858 } 2954 1
2859} 2955}
2860 2956
2861############################################################################# 2957#############################################################################
2862 2958
2863package CFClient::UI::Statusbox; 2959package CFClient::UI::Multiplexer;
2864 2960
2865our @ISA = CFClient::UI::VBox::; 2961our @ISA = CFClient::UI::Container::;
2866 2962
2867sub new { 2963sub new {
2868 my $class = shift; 2964 my $class = shift;
2869 2965
2870 $class->SUPER::new ( 2966 my $self = $class->SUPER::new (
2967 @_,
2968 );
2969
2970 $self->{current} = $self->{children}[0]
2971 if @{ $self->{children} };
2972
2973 $self
2974}
2975
2976sub add {
2977 my ($self, @widgets) = @_;
2978
2979 $self->SUPER::add (@widgets);
2980
2981 $self->{current} = $self->{children}[0]
2982 if @{ $self->{children} };
2983}
2984
2985sub set_current_page {
2986 my ($self, $page_or_widget) = @_;
2987
2988 my $widget = ref $page_or_widget
2989 ? $page_or_widget
2990 : $self->{children}[$page_or_widget];
2991
2992 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994
2995 $self->_emit (page_changed => $self->{current});
2996
2997 $self->realloc;
2998}
2999
3000sub visible_children {
3001 $_[0]{current}
3002}
3003
3004sub size_request {
3005 my ($self) = @_;
3006
3007 $self->{current}->size_request
3008}
3009
3010sub size_allocate {
3011 my ($self, $w, $h) = @_;
3012
3013 $self->{current}->configure (0, 0, $w, $h);
3014}
3015
3016sub _draw {
3017 my ($self) = @_;
3018
3019 $self->{current}->draw;
3020}
3021
3022#############################################################################
3023
3024package CFClient::UI::Notebook;
3025
3026our @ISA = CFClient::UI::VBox::;
3027
3028sub new {
3029 my $class = shift;
3030
3031 my $self = $class->SUPER::new (
3032 buttonbar => (new CFClient::UI::Buttonbar),
3033 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3034 # filter => # will be put between multiplexer and $self
3035 @_,
3036 );
3037
3038 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3039 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3040
3041 $self
3042}
3043
3044sub add {
3045 my ($self, $title, $widget, $tooltip) = @_;
3046
3047 Scalar::Util::weaken $self;
3048
3049 $self->{buttonbar}->add (new CFClient::UI::Button
3050 markup => $title,
3051 tooltip => $tooltip,
3052 on_activate => sub { $self->set_current_page ($widget) },
3053 );
3054
3055 $self->{multiplexer}->add ($widget);
3056}
3057
3058sub set_current_page {
3059 my ($self, $page) = @_;
3060
3061 $self->{multiplexer}->set_current_page ($page);
3062 $self->_emit (page_changed => $self->{multiplexer}{current});
3063}
3064
3065#############################################################################
3066
3067package CFClient::UI::Statusbox;
3068
3069our @ISA = CFClient::UI::VBox::;
3070
3071sub new {
3072 my $class = shift;
3073
3074 my $self = $class->SUPER::new (
2871 fontsize => 0.8, 3075 fontsize => 0.8,
2872 @_, 3076 @_,
2873 ) 3077 );
3078
3079 Scalar::Util::weaken (my $this = $self);
3080
3081 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3082
3083 $self
2874} 3084}
2875 3085
2876sub reorder { 3086sub reorder {
2877 my ($self) = @_; 3087 my ($self) = @_;
2878 my $NOW = time; 3088 my $NOW = Time::HiRes::time;
3089
3090 # freeze display when hovering over any label
3091 return if $CFClient::UI::TOOLTIP->{owner}
3092 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3093 values %{ $self->{item} };
2879 3094
2880 while (my ($k, $v) = each %{ $self->{item} }) { 3095 while (my ($k, $v) = each %{ $self->{item} }) {
2881 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3096 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2882 } 3097 }
2883 3098
… …
2886 my @items = sort { 3101 my @items = sort {
2887 $a->{pri} <=> $b->{pri} 3102 $a->{pri} <=> $b->{pri}
2888 or $b->{id} <=> $a->{id} 3103 or $b->{id} <=> $a->{id}
2889 } values %{ $self->{item} }; 3104 } values %{ $self->{item} };
2890 3105
3106 $self->{timer}->interval (1);
3107
2891 my $count = 10 + 1; 3108 my $count = 10 + 1;
2892 for my $item (@items) { 3109 for my $item (@items) {
2893 last unless --$count; 3110 last unless --$count;
2894 3111
2895 push @widgets, $item->{label} ||= do { 3112 my $label = $item->{label} ||= do {
2896 # TODO: doesn't handle markup well (read as: at all) 3113 # TODO: doesn't handle markup well (read as: at all)
2897 my $short = $item->{count} > 1 3114 my $short = $item->{count} > 1
2898 ? "<b>$item->{count} ×</b> $item->{text}" 3115 ? "<b>$item->{count} ×</b> $item->{text}"
2899 : $item->{text}; 3116 : $item->{text};
2900 3117
… …
2908 tooltip => $item->{tooltip}, 3125 tooltip => $item->{tooltip},
2909 tooltip_font => $::FONT_PROP, 3126 tooltip_font => $::FONT_PROP,
2910 tooltip_width => 0.67, 3127 tooltip_width => 0.67,
2911 fontsize => $item->{fontsize} || $self->{fontsize}, 3128 fontsize => $item->{fontsize} || $self->{fontsize},
2912 max_w => $::WIDTH * 0.44, 3129 max_w => $::WIDTH * 0.44,
2913 fg => $item->{fg}, 3130 fg => [@{ $item->{fg} }],
2914 can_events => 1, 3131 can_events => 1,
2915 can_hover => 1 3132 can_hover => 1
2916 }; 3133 };
3134
3135 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3136 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3137 $label->update;
3138 $label->set_max_size (undef, $label->{req_h} * $diff)
3139 if $diff < 1;
3140 $self->{timer}->interval (1/30);
3141 } else {
3142 $label->{fg}[3] = $item->{fg}[3] || 1;
3143 }
3144
3145 push @widgets, $label;
2917 } 3146 }
2918 3147
2919 $self->clear; 3148 $self->clear;
2920 $self->SUPER::add (reverse @widgets); 3149 $self->SUPER::add (reverse @widgets);
2921} 3150}
… …
2926 $text =~ s/^\s+//; 3155 $text =~ s/^\s+//;
2927 $text =~ s/\s+$//; 3156 $text =~ s/\s+$//;
2928 3157
2929 return unless $text; 3158 return unless $text;
2930 3159
2931 my $timeout = time + ((delete $arg{timeout}) || 60); 3160 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2932 3161
2933 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3162 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2934 3163
2935 if (my $item = $self->{item}{$group}) { 3164 if (my $item = $self->{item}{$group}) {
2936 if ($item->{text} eq $text) { 3165 if ($item->{text} eq $text) {
… …
2966 3195
2967 $self->reorder; 3196 $self->reorder;
2968 $self->SUPER::reconfigure; 3197 $self->SUPER::reconfigure;
2969} 3198}
2970 3199
3200sub DESTROY {
3201 my ($self) = @_;
3202
3203 $self->{timer}->cancel;
3204
3205 $self->SUPER::DESTROY;
3206}
3207
2971############################################################################# 3208#############################################################################
2972 3209
2973package CFClient::UI::Root; 3210package CFClient::UI::Inventory;
2974 3211
2975our @ISA = CFClient::UI::Container::; 3212our @ISA = CFClient::UI::ScrolledWindow::;
2976
2977use CFClient::OpenGL;
2978 3213
2979sub new { 3214sub new {
2980 my $class = shift; 3215 my $class = shift;
2981 3216
2982 $class->SUPER::new ( 3217 my $self = $class->SUPER::new (
3218 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3219 @_,
3220 );
3221
3222 $self
3223}
3224
3225sub set_items {
3226 my ($self, $items) = @_;
3227
3228 $self->{child}->clear;
3229 return unless $items;
3230
3231 my @items = sort {
3232 ($a->{type} <=> $b->{type})
3233 or ($a->{name} cmp $b->{name})
3234 } @$items;
3235
3236 $self->{real_items} = \@items;
3237
3238 my $row = 0;
3239 for my $item (@items) {
3240 CFClient::Item::update_widgets $item;
3241
3242 $self->{child}->add (0, $row, $item->{face_widget});
3243 $self->{child}->add (1, $row, $item->{desc_widget});
3244 $self->{child}->add (2, $row, $item->{weight_widget});
3245
3246 $row++;
3247 }
3248}
3249
3250#############################################################################
3251
3252package CFClient::UI::BindEditor;
3253
3254our @ISA = CFClient::UI::FancyFrame::;
3255
3256sub new {
3257 my $class = shift;
3258
3259 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3260
3261 $self->add (my $vb = new CFClient::UI::VBox);
3262
3263
3264 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3265 text => "start recording",
3266 tooltip => "Start/Stops recording of actions."
3267 ."All subsequent actions after the recording started will be captured."
3268 ."The actions are displayed after the record was stopped."
3269 ."To bind the action you have to click on the 'Bind' button",
3270 on_activate => sub {
3271 unless ($self->{recording}) {
3272 $self->start;
3273 } else {
3274 $self->stop;
3275 }
3276 });
3277
3278 $vb->add (new CFClient::UI::Label text => "Actions:");
3279 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3280
3281 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3282 $vb->add (my $hb = new CFClient::UI::HBox);
3283 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3284 $hb->add (new CFClient::UI::Button
3285 text => "bind",
3286 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3287 on_activate => sub {
3288 $self->ask_for_bind;
3289 });
3290
3291 $vb->add (my $hb = new CFClient::UI::HBox);
3292 $hb->add (new CFClient::UI::Button
3293 text => "ok",
3294 expand => 1,
3295 tooltip => "This closes the binding editor and saves the binding",
3296 on_activate => sub {
3297 $self->hide;
3298 $self->commit;
3299 });
3300
3301 $hb->add (new CFClient::UI::Button
3302 text => "cancel",
3303 expand => 1,
3304 tooltip => "This closes the binding editor without saving",
3305 on_activate => sub {
3306 $self->hide;
3307 $self->{binding_cancel}->()
3308 if $self->{binding_cancel};
3309 });
3310
3311 $self->update_binding_widgets;
3312
3313 $self
3314}
3315
3316sub commit {
3317 my ($self) = @_;
3318 my ($mod, $sym, $cmds) = $self->get_binding;
3319 if ($sym != 0 && @$cmds > 0) {
3320 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3321 ."'. Don't forget 'Save Config'!");
3322 $self->{binding_change}->($mod, $sym, $cmds)
3323 if $self->{binding_change};
3324 } else {
3325 $::STATUSBOX->add ("No action bound, no key or action specified!");
3326 $self->{binding_cancel}->()
3327 if $self->{binding_cancel};
3328 }
3329}
3330
3331sub start {
3332 my ($self) = @_;
3333
3334 $self->{rec_btn}->set_text ("stop recording");
3335 $self->{recording} = 1;
3336 $self->clear_command_list;
3337 $::CONN->start_record if $::CONN;
3338}
3339
3340sub stop {
3341 my ($self) = @_;
3342
3343 $self->{rec_btn}->set_text ("start recording");
3344 $self->{recording} = 0;
3345
3346 my $rec;
3347 $rec = $::CONN->stop_record if $::CONN;
3348 return unless ref $rec eq 'ARRAY';
3349 $self->set_command_list ($rec);
3350}
3351
3352
3353sub ask_for_bind_and_commit {
3354 my ($self) = @_;
3355 $self->ask_for_bind (1);
3356}
3357
3358sub ask_for_bind {
3359 my ($self, $commit) = @_;
3360
3361 CFClient::Binder::open_binding_dialog (sub {
3362 my ($mod, $sym) = @_;
3363 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3364 $self->update_binding_widgets;
3365 $self->commit if $commit;
3366 });
3367}
3368
3369# $mod and $sym are the modifiers and key symbol
3370# $cmds is a array ref of strings (the commands)
3371# $cb is the callback that is executed on OK
3372# $ccb is the callback that is executed on CANCEL and
3373# when the binding was unsuccessful on OK
3374sub set_binding {
3375 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3376
3377 $self->clear_command_list;
3378 $self->{recording} = 0;
3379 $self->{rec_btn}->set_text ("start recording");
3380
3381 $self->{binding} = [$mod, $sym];
3382 $self->{commands} = $cmds;
3383
3384 $self->{binding_change} = $cb;
3385 $self->{binding_cancel} = $ccb;
3386
3387 $self->update_binding_widgets;
3388}
3389
3390# this is a shortcut method that asks for a binding
3391# and then just binds it.
3392sub do_quick_binding {
3393 my ($self, $cmds) = @_;
3394 $self->set_binding (undef, undef, $cmds, sub {
3395 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3396 });
3397 $self->ask_for_bind (1);
3398}
3399
3400sub update_binding_widgets {
3401 my ($self) = @_;
3402 my ($mod, $sym, $cmds) = $self->get_binding;
3403 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3404 $self->set_command_list ($cmds);
3405}
3406
3407sub get_binding {
3408 my ($self) = @_;
3409 return (
3410 $self->{binding}->[0],
3411 $self->{binding}->[1],
3412 [ grep { defined $_ } @{$self->{commands}} ]
3413 );
3414}
3415
3416sub clear_command_list {
3417 my ($self) = @_;
3418 $self->{cmdbox}->clear ();
3419}
3420
3421sub set_command_list {
3422 my ($self, $cmds) = @_;
3423
3424 $self->{cmdbox}->clear ();
3425 $self->{commands} = $cmds;
3426
3427 my $idx = 0;
3428
3429 for (@$cmds) {
3430 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3431
3432 my $i = $idx;
3433 $hb->add (new CFClient::UI::Label text => $_);
3434 $hb->add (new CFClient::UI::Button
3435 text => "delete",
3436 tooltip => "Deletes the action from the record",
3437 on_activate => sub {
3438 $self->{cmdbox}->remove ($hb);
3439 $cmds->[$i] = undef;
3440 });
3441
3442
3443 $idx++
3444 }
3445}
3446
3447#############################################################################
3448
3449package CFClient::UI::SpellList;
3450
3451our @ISA = CFClient::UI::Table::;
3452
3453sub new {
3454 my $class = shift;
3455
3456 my $self = $class->SUPER::new (
3457 binding => [],
3458 commands => [],
3459 @_,
3460 )
3461}
3462
3463# XXX: Do sorting? Argl...
3464sub add_spell {
3465 my ($self, $spell) = @_;
3466 $self->{spells}->{$spell->{name}} = $spell;
3467
3468 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3469 face => $spell->{face},
3470 can_hover => 1,
3471 can_events => 1,
3472 tooltip => $spell->{message});
3473
3474 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3475 text => $spell->{name},
3476 can_hover => 1,
3477 can_events => 1,
3478 tooltip => $spell->{message},
3479 expand => 1);
3480
3481 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3482 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3483 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3484 expand => 1);
3485
3486 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3487 text => "bind to key",
3488 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3489}
3490
3491sub rebuild_spell_list {
3492 my ($self) = @_;
3493 $self->{tbl_idx} = 0;
3494 $self->add_spell ($_) for values %{$self->{spells}};
3495}
3496
3497sub remove_spell {
3498 my ($self, $spell) = @_;
3499 delete $self->{spells}->{$spell->{name}};
3500 $self->rebuild_spell_list;
3501}
3502
3503#############################################################################
3504
3505package CFClient::UI::Root;
3506
3507our @ISA = CFClient::UI::Container::;
3508
3509use List::Util qw(min max);
3510
3511use CFClient::OpenGL;
3512
3513sub new {
3514 my $class = shift;
3515
3516 my $self = $class->SUPER::new (
2983 visible => 1, 3517 visible => 1,
2984 @_, 3518 @_,
2985 ) 3519 );
2986}
2987 3520
2988sub configure { 3521 Scalar::Util::weaken ($self->{root} = $self);
2989 my ($self, $x, $y, $w, $h) = @_;
2990 3522
2991 $self->{w} = $w; 3523 $self
2992 $self->{h} = $h;
2993}
2994
2995sub check_size {
2996 my ($self) = @_;
2997
2998 $self->size_allocate ($self->{w}, $self->{h})
2999 if $self->{w};
3000} 3524}
3001 3525
3002sub size_request { 3526sub size_request {
3003 my ($self) = @_; 3527 my ($self) = @_;
3004 3528
3005 ($self->{w}, $self->{h}) 3529 ($self->{w}, $self->{h})
3530}
3531
3532sub _to_pixel {
3533 my ($coord, $size, $max) = @_;
3534
3535 $coord =
3536 $coord eq "center" ? ($max - $size) * 0.5
3537 : $coord eq "max" ? $max
3538 : $coord;
3539
3540 $coord = 0 if $coord < 0;
3541 $coord = $max - $size if $coord > $max - $size;
3542
3543 int $coord + 0.5
3006} 3544}
3007 3545
3008sub size_allocate { 3546sub size_allocate {
3009 my ($self, $w, $h) = @_; 3547 my ($self, $w, $h) = @_;
3010 3548
3011 for my $child ($self->children) { 3549 for my $child ($self->children) {
3012 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3550 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3013 3551
3014 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3552 $X = $child->{force_x} if exists $child->{force_x};
3015 if exists $child->{req_x}; 3553 $Y = $child->{force_y} if exists $child->{force_y};
3016 3554
3017 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3555 $X = _to_pixel $X, $W, $self->{w};
3018 if exists $child->{req_y}; 3556 $Y = _to_pixel $Y, $H, $self->{h};
3019
3020 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3021
3022 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3023 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3024 3557
3025 $child->configure ($X, $Y, $W, $H); 3558 $child->configure ($X, $Y, $W, $H);
3026 } 3559 }
3027} 3560}
3028 3561
… …
3039} 3572}
3040 3573
3041sub update { 3574sub update {
3042 my ($self) = @_; 3575 my ($self) = @_;
3043 3576
3044 $self->check_size;
3045 $::WANT_REFRESH++; 3577 $::WANT_REFRESH++;
3046} 3578}
3047 3579
3048sub add { 3580sub add {
3049 my ($self, @children) = @_; 3581 my ($self, @children) = @_;
3050 3582
3051 for my $child (@children) {
3052 $child->{is_toplevel} = 1; 3583 $_->{is_toplevel} = 1
3053 3584 for @children;
3054 # integerise window positions
3055 $child->{x} = int $child->{x};
3056 $child->{y} = int $child->{y};
3057 }
3058 3585
3059 $self->SUPER::add (@children); 3586 $self->SUPER::add (@children);
3060
3061 for (my @widgets = @children; my $w = pop @widgets; ) {
3062 push @widgets, $w->children;
3063 $w->set_visible;
3064 }
3065
3066} 3587}
3067 3588
3068sub remove { 3589sub remove {
3069 my ($self, @children) = @_; 3590 my ($self, @children) = @_;
3070 3591
3071 $self->SUPER::remove (@children); 3592 $self->SUPER::remove (@children);
3593
3594 delete $self->{is_toplevel}
3595 for @children;
3072 3596
3073 while (@children) { 3597 while (@children) {
3074 my $w = pop @children; 3598 my $w = pop @children;
3075 push @children, $w->children; 3599 push @children, $w->children;
3076 $w->set_invisible; 3600 $w->set_invisible;
… …
3095 while ($self->{refresh_hook}) { 3619 while ($self->{refresh_hook}) {
3096 $_->() 3620 $_->()
3097 for values %{delete $self->{refresh_hook}}; 3621 for values %{delete $self->{refresh_hook}};
3098 } 3622 }
3099 3623
3100 if ($self->{check_size}) { 3624 if ($self->{realloc}) {
3625 my %queue;
3101 my @queue; 3626 my @queue;
3627 my $widget;
3102 3628
3629 outer:
3103 while () { 3630 while () {
3104 if ($self->{check_size}) { 3631 if (my $realloc = delete $self->{realloc}) {
3105 #TODO use array-of-depth approach 3632 for $widget (values %$realloc) {
3633 $widget->{visible} or next; # do not resize invisible widgets
3106 3634
3107 @queue = sort { $a->{visible} <=> $b->{visible} } 3635 $queue{$widget+0}++ and next; # duplicates are common
3108 @queue, values %{delete $self->{check_size}}; 3636
3637 push @{ $queue[$widget->{visible}] }, $widget;
3638 }
3109 } 3639 }
3110 3640
3641 while () {
3642 @queue or last outer;
3643
3111 my $widget = pop @queue || last; 3644 $widget = pop @{ $queue[-1] || [] }
3112 3645 and last;
3113 defined $widget->{visible} or last; # do not resize invisible widgets
3114
3115 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3116 ? @$widget{qw(def_w def_h)}
3117 : $widget->size_request;
3118
3119 if (delete $widget->{force_alloc}
3120 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3121 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3122 3646
3647 pop @queue;
3648 }
3649
3650 delete $queue{$widget+0};
3651
3652 my ($w, $h) = $widget->size_request;
3653
3654 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3655 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3656
3657 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3658 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3659
3660 $w = $widget->{force_w} if exists $widget->{force_w};
3661 $h = $widget->{force_h} if exists $widget->{force_h};
3662
3663 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3664 || delete $widget->{force_realloc}) {
3123 $widget->{req_w} = $w; 3665 $widget->{req_w} = $w;
3124 $widget->{req_h} = $h; 3666 $widget->{req_h} = $h;
3125 3667
3126 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3668 $self->{size_alloc}{$widget+0} = $widget;
3127 3669
3128 $widget->{parent}->check_size
3129 if $widget->{parent}; 3670 if (my $parent = $widget->{parent}) {
3671 $self->{realloc}{$parent+0} = $parent
3672 unless $queue{$parent+0};
3673
3674 $parent->{force_size_alloc} = 1;
3675 $self->{size_alloc}{$parent+0} = $parent;
3676 }
3130 } 3677 }
3678
3679 delete $self->{realloc}{$widget+0};
3131 } 3680 }
3132 } 3681 }
3133 3682
3134 while (my $size_alloc = delete $self->{size_alloc}) { 3683 while (my $size_alloc = delete $self->{size_alloc}) {
3135 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible}, 3684 my @queue = sort { $b->{visible} <=> $a->{visible} }
3136 values %$size_alloc; 3685 values %$size_alloc;
3137 3686
3138 while () { 3687 while () {
3139 my ($widget, $w, $h) = @{ pop @queue or last }; 3688 my $widget = pop @queue || last;
3689
3690 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3140 3691
3141 $w = 0 if $w < 0; 3692 $w = 0 if $w < 0;
3142 $h = 0 if $h < 0; 3693 $h = 0 if $h < 0;
3143 3694
3695 $w = int $w + 0.5;
3696 $h = int $h + 0.5;
3697
3698 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3699 $widget->{old_w} = $widget->{w};
3700 $widget->{old_h} = $widget->{h};
3701
3144 $widget->{w} = $w; 3702 $widget->{w} = $w;
3145 $widget->{h} = $h; 3703 $widget->{h} = $h;
3704
3146 $widget->emit (size_allocate => $w, $h); 3705 $widget->emit (size_allocate => $w, $h);
3706 }
3147 } 3707 }
3148 } 3708 }
3149 3709
3150 while ($self->{post_alloc_hook}) { 3710 while ($self->{post_alloc_hook}) {
3151 $_->() 3711 $_->()
3152 for values %{delete $self->{post_alloc_hook}}; 3712 for values %{delete $self->{post_alloc_hook}};
3153 } 3713 }
3714
3154 3715
3155 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3716 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3156 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3717 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3157 glClear GL_COLOR_BUFFER_BIT; 3718 glClear GL_COLOR_BUFFER_BIT;
3158 3719
… …
3160 glLoadIdentity; 3721 glLoadIdentity;
3161 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3722 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3162 glMatrixMode GL_MODELVIEW; 3723 glMatrixMode GL_MODELVIEW;
3163 glLoadIdentity; 3724 glLoadIdentity;
3164 3725
3726 {
3727 package CFClient::UI::Base;
3728
3729 ($draw_x, $draw_y, $draw_w, $draw_h) =
3730 (0, 0, $self->{w}, $self->{h});
3731 }
3732
3165 $self->_draw; 3733 $self->_draw;
3166} 3734}
3167 3735
3168############################################################################# 3736#############################################################################
3169 3737

Diff Legend

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