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.258 by root, Tue May 30 02:55:45 2006 UTC vs.
Revision 1.328 by root, Sat Jul 22 13:43:05 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show;
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48});
20 49
21sub get_layout { 50sub get_layout {
22 my $layout; 51 my $layout;
23 52
24 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 68 my ($layout) = @_;
40 69
41 $LAYOUT = $layout; 70 $LAYOUT = $layout;
42} 71}
43 72
44sub check_tooltip {
45 if (!$GRAB) {
46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
47 if (length $widget->{tooltip}) {
48
49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
52 $TOOLTIP->{owner} = $widget;
53
54 my $tip = $widget->{tooltip};
55
56 $tip = $tip->($widget) if CODE:: eq ref $tip;
57
58 $TOOLTIP->set_tooltip_from ($widget);
59 $TOOLTIP->show;
60 }
61
62 return;
63 }
64 }
65 }
66
67 $TOOLTIP->hide;
68 delete $TOOLTIP->{owner};
69}
70
71# class methods for events 73# class methods for events
72sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
73 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
74 if $FOCUS; 76 if $FOCUS;
75} 77}
… …
81 83
82sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
83 my ($ev) = @_; 85 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
85 87
88 warn "button down $ev->{button}\n";#d#
89
86 if (!$BUTTON_STATE) { 90 if (!$BUTTON_STATE) {
87 my $widget = $ROOT->find_widget ($x, $y); 91 my $widget = $ROOT->find_widget ($x, $y);
88 92
89 $GRAB = $widget; 93 $GRAB = $widget;
90 $GRAB->update if $GRAB; 94 $GRAB->update if $GRAB;
91 95
92 check_tooltip; 96 $TOOLTIP_WATCHER->cb->();
93 } 97 }
94 98
95 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 99 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
96 100
97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 101 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
112 if (!$BUTTON_STATE) { 116 if (!$BUTTON_STATE) {
113 my $grab = $GRAB; undef $GRAB; 117 my $grab = $GRAB; undef $GRAB;
114 $grab->update if $grab; 118 $grab->update if $grab;
115 $GRAB->update if $GRAB; 119 $GRAB->update if $GRAB;
116 120
117 check_tooltip; 121 $TOOLTIP_WATCHER->cb->();
118 } 122 }
119} 123}
120 124
121sub feed_sdl_motion_event { 125sub feed_sdl_motion_event {
122 my ($ev) = @_; 126 my ($ev) = @_;
… …
128 my $hover = $HOVER; $HOVER = $widget; 132 my $hover = $HOVER; $HOVER = $widget;
129 133
130 $hover->update if $hover && $hover->{can_hover}; 134 $hover->update if $hover && $hover->{can_hover};
131 $HOVER->update if $HOVER && $HOVER->{can_hover}; 135 $HOVER->update if $HOVER && $HOVER->{can_hover};
132 136
133 check_tooltip; 137 $TOOLTIP_WATCHER->start;
134 } 138 }
135 139
136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 140 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
137 if $HOVER; 141 if $HOVER;
138} 142}
… …
170sub rescale_widgets { 174sub rescale_widgets {
171 my ($sx, $sy) = @_; 175 my ($sx, $sy) = @_;
172 176
173 for my $widget (values %WIDGET) { 177 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) { 178 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 179 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 180 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177 181
178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 182 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 183 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w}; 184 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/; 185 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 186 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h}; 187 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184 188
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 189 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 190 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187 191
188 } 192 }
189 } 193 }
190 194
191 reconfigure_widgets; 195 reconfigure_widgets;
… …
219 $self->connect ($1 => delete $self->{$_}); 223 $self->connect ($1 => delete $self->{$_});
220 } 224 }
221 } 225 }
222 226
223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 227 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x}; 228 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y}; 229 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w}; 230 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h}; 231 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
228 232
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 233 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 234 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231 235
232 $self->show if $layout->{show}; 236 $self->show if $layout->{show};
… …
270 274
271 return unless $self->{visible}; 275 return unless $self->{visible};
272 276
273 $_->set_invisible for $self->children; 277 $_->set_invisible for $self->children;
274 278
279 delete $self->{visible};
275 delete $self->{root}; 280 delete $self->{root};
276 delete $self->{visible};
277 281
278 undef $GRAB if $GRAB == $self; 282 undef $GRAB if $GRAB == $self;
279 undef $HOVER if $HOVER == $self; 283 undef $HOVER if $HOVER == $self;
280 284
281 CFClient::UI::check_tooltip 285 $CFClient::UI::TOOLTIP_WATCHER->cb->()
282 if $TOOLTIP->{owner} == $self; 286 if $TOOLTIP->{owner} == $self;
283 287
284 $self->focus_out; 288 $self->emit ("focus_out");
285
286 $self->emit (visibility_change => 0); 289 $self->emit (visibility_change => 0);
287} 290}
288 291
289sub set_visibility { 292sub set_visibility {
290 my ($self, $visible) = @_; 293 my ($self, $visible) = @_;
… …
313} 316}
314 317
315sub move_abs { 318sub move_abs {
316 my ($self, $x, $y, $z) = @_; 319 my ($self, $x, $y, $z) = @_;
317 320
318 $self->{x} = List::Util::max 0, int $x; 321 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
319 $self->{y} = List::Util::max 0, int $y; 322 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
320 $self->{z} = $z if defined $z; 323 $self->{z} = $z if defined $z;
321 324
322 $self->update; 325 $self->update;
323} 326}
324 327
… …
332} 335}
333 336
334sub size_request { 337sub size_request {
335 require Carp; 338 require Carp;
336 Carp::confess "size_request is abstract"; 339 Carp::confess "size_request is abstract";
340}
341
342sub baseline_shift {
343 0
337} 344}
338 345
339sub configure { 346sub configure {
340 my ($self, $x, $y, $w, $h) = @_; 347 my ($self, $x, $y, $w, $h) = @_;
341 348
… …
355 $self->{x} = $x; 362 $self->{x} = $x;
356 $self->{y} = $y; 363 $self->{y} = $y;
357 $self->update; 364 $self->update;
358 } 365 }
359 366
360 if ($self->{w} != $w || $self->{h} != $h) { 367 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
361 return unless $self->{visible}; 368 return unless $self->{visible};
362 369
370 $self->{alloc_w} = $w;
371 $self->{alloc_h} = $h;
372
363 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 373 $self->{root}{size_alloc}{$self+0} = $self;
364 } 374 }
365}
366
367sub size_allocate {
368 # nothing to be done
369} 375}
370 376
371sub children { 377sub children {
378 # nop
379}
380
381sub visible_children {
382 $_[0]->children
372} 383}
373 384
374sub set_max_size { 385sub set_max_size {
375 my ($self, $w, $h) = @_; 386 my ($self, $w, $h) = @_;
376 387
377 delete $self->{max_w}; $self->{max_w} = $w if $w; 388 $self->{max_w} = int $w if defined $w;
378 delete $self->{max_h}; $self->{max_h} = $h if $h; 389 $self->{max_h} = int $h if defined $h;
390
391 $self->realloc;
379} 392}
380 393
381sub set_tooltip { 394sub set_tooltip {
382 my ($self, $tooltip) = @_; 395 my ($self, $tooltip) = @_;
383 396
… …
388 401
389 $self->{tooltip} = $tooltip; 402 $self->{tooltip} = $tooltip;
390 403
391 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 404 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
392 delete $CFClient::UI::TOOLTIP->{owner}; 405 delete $CFClient::UI::TOOLTIP->{owner};
393 CFClient::UI::check_tooltip; 406 $CFClient::UI::TOOLTIP_WATCHER->cb->();
394 } 407 }
395} 408}
396 409
397# translate global coordinates to local coordinate system 410# translate global coordinates to local coordinate system
398sub coord2local { 411sub coord2local {
… …
406 my ($self, $x, $y) = @_; 419 my ($self, $x, $y) = @_;
407 420
408 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 421 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
409} 422}
410 423
411sub focus_in { 424sub invoke_focus_in {
412 my ($self) = @_; 425 my ($self) = @_;
413 426
414 return if $FOCUS == $self; 427 return if $FOCUS == $self;
415 return unless $self->{can_focus}; 428 return unless $self->{can_focus};
416 429
417 my $focus = $FOCUS; $FOCUS = $self; 430 $FOCUS = $self;
418 431
419 $self->_emit (focus_in => $focus); 432 $self->update;
420 433
421 $focus->update if $focus; 434 0
422 $FOCUS->update;
423} 435}
424 436
425sub focus_out { 437sub invoke_focus_out {
426 my ($self) = @_; 438 my ($self) = @_;
427 439
428 return unless $FOCUS == $self; 440 return unless $FOCUS == $self;
429 441
430 my $focus = $FOCUS; undef $FOCUS; 442 undef $FOCUS;
431 443
432 $self->_emit (focus_out => $focus); 444 $self->update;
433 445
434 $focus->update if $focus; #?
435
436 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 446 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
437 unless $FOCUS; 447 unless $FOCUS;
438}
439 448
449 0
450}
451
452sub grab_focus {
453 my ($self) = @_;
454
455 $FOCUS->emit ("focus_out") if $FOCUS;
456 $self->emit ("focus_in");
457}
458
440sub mouse_motion { } 459sub invoke_mouse_motion { 0 }
441sub button_up { } 460sub invoke_button_up { 0 }
442sub key_down { } 461sub invoke_key_down { 0 }
443sub key_up { } 462sub invoke_key_up { 0 }
444 463
445sub button_down { 464sub invoke_button_down {
446 my ($self, $ev, $x, $y) = @_; 465 my ($self, $ev, $x, $y) = @_;
447 466
448 $self->focus_in; 467 $self->grab_focus;
449}
450 468
451sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 469 warn "button down $ev->{button} $x $y\n";#d#
452sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 470
453sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 471 0
454sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 472}
455sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 473
474sub connect {
475 my ($self, $signal, $cb) = @_;
476
477 push @{ $self->{signal_cb}{$signal} }, $cb;
478}
479
480sub emit {
481 my ($self, $signal, @args) = @_;
482
483 #d##TODO# stop propagating at first true, do not use sum
484 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
485 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
486 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
487}
456 488
457sub find_widget { 489sub find_widget {
458 my ($self, $x, $y) = @_; 490 my ($self, $x, $y) = @_;
459 491
460 return () unless $self->{can_events}; 492 return () unless $self->{can_events};
… …
471 503
472 Scalar::Util::weaken ($self->{parent} = $parent); 504 Scalar::Util::weaken ($self->{parent} = $parent);
473 $self->set_visible if $parent->{visible}; 505 $self->set_visible if $parent->{visible};
474} 506}
475 507
476sub connect {
477 my ($self, $signal, $cb) = @_;
478
479 push @{ $self->{signal_cb}{$signal} }, $cb;
480}
481
482sub _emit {
483 my ($self, $signal, @args) = @_;
484
485 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486}
487
488sub emit {
489 my ($self, $signal, @args) = @_;
490
491 $self->_emit ($signal, @args)
492 || $self->$signal (@args);
493}
494
495sub visibility_change {
496 #my ($self, $visible) = @_;
497}
498
499sub realloc { 508sub realloc {
500 my ($self) = @_; 509 my ($self) = @_;
501 510
502 if ($self->{visible}) { 511 if ($self->{visible}) {
503 return if $self->{root}{realloc}{$self}; 512 return if $self->{root}{realloc}{$self+0};
504 513
505 $self->{root}{realloc}{$self} = $self; 514 $self->{root}{realloc}{$self+0} = $self;
506 $self->{root}->update; 515 $self->{root}->update;
507 } else { 516 } else {
508 delete $self->{req_w}; 517 delete $self->{req_w};
518 delete $self->{req_h};
509 } 519 }
510} 520}
511 521
512sub update { 522sub update {
513 my ($self) = @_; 523 my ($self) = @_;
… …
521 531
522 $self->realloc; 532 $self->realloc;
523 $self->update; 533 $self->update;
524} 534}
525 535
536# using global variables seems a bit hacky, but passing through all drawing
537# functions seems pointless.
538our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
539
526sub draw { 540sub draw {
527 my ($self) = @_; 541 my ($self) = @_;
528 542
529 return unless $self->{h} && $self->{w}; 543 return unless $self->{h} && $self->{w};
544
545 # update screen rectangle
546 local $draw_x = $draw_x + $self->{x};
547 local $draw_y = $draw_y + $self->{y};
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);
530 552
531 glPushMatrix; 553 glPushMatrix;
532 glTranslate $self->{x}, $self->{y}, 0; 554 glTranslate $self->{x}, $self->{y}, 0;
533 $self->_draw;
534 glPopMatrix;
535 555
536 if ($self == $HOVER && $self->{can_hover}) { 556 if ($self == $HOVER && $self->{can_hover}) {
537 my ($x, $y) = @$self{qw(x y)};
538
539 glColor 1, 0.8, 0.5, 0.2; 557 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
540 glEnable GL_BLEND; 558 glEnable GL_BLEND;
541 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 559 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
542 glBegin GL_QUADS; 560 glBegin GL_QUADS;
543 glVertex $x , $y; 561 glVertex 0 , 0;
544 glVertex $x + $self->{w}, $y; 562 glVertex $self->{w}, 0;
545 glVertex $x + $self->{w}, $y + $self->{h}; 563 glVertex $self->{w}, $self->{h};
546 glVertex $x , $y + $self->{h}; 564 glVertex 0 , $self->{h};
547 glEnd; 565 glEnd;
548 glDisable GL_BLEND; 566 glDisable GL_BLEND;
549 } 567 }
550 568
551 if ($ENV{CFPLUS_DEBUG}) { 569 if ($ENV{CFPLUS_DEBUG} & 1) {
552 glPushMatrix; 570 glPushMatrix;
553 glColor 1, 1, 0, 1; 571 glColor 1, 1, 0, 1;
554 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 572 glTranslate 0.375, 0.375;
555 glBegin GL_LINE_LOOP; 573 glBegin GL_LINE_LOOP;
556 glVertex 0 , 0; 574 glVertex 0 , 0;
557 glVertex $self->{w} - 1, 0; 575 glVertex $self->{w} - 1, 0;
558 glVertex $self->{w} - 1, $self->{h} - 1; 576 glVertex $self->{w} - 1, $self->{h} - 1;
559 glVertex 0 , $self->{h} - 1; 577 glVertex 0 , $self->{h} - 1;
560 glEnd; 578 glEnd;
561 glPopMatrix; 579 glPopMatrix;
562 #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;
563 } 581 }
582
583 $self->_draw;
584 glPopMatrix;
564} 585}
565 586
566sub _draw { 587sub _draw {
567 my ($self) = @_; 588 my ($self) = @_;
568 589
… …
570} 591}
571 592
572sub DESTROY { 593sub DESTROY {
573 my ($self) = @_; 594 my ($self) = @_;
574 595
596 return if CFClient::in_destruct;
597
575 delete $WIDGET{$self+0}; 598 delete $WIDGET{$self+0};
576 #$self->deactivate; 599
600 eval { $self->destroy };
601 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
577} 602}
578 603
579############################################################################# 604#############################################################################
580 605
581package CFClient::UI::DrawBG; 606package CFClient::UI::DrawBG;
… …
606 631
607 if ($color && (@$color < 4 || $color->[3])) { 632 if ($color && (@$color < 4 || $color->[3])) {
608 my ($w, $h) = @$self{qw(w h)}; 633 my ($w, $h) = @$self{qw(w h)};
609 634
610 glEnable GL_BLEND; 635 glEnable GL_BLEND;
611 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 636 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
612 glColor @$color; 637 glColor_premultiply @$color;
613 638
614 glBegin GL_QUADS; 639 glBegin GL_QUADS;
615 glVertex 0 , 0; 640 glVertex 0 , 0;
616 glVertex 0 , $h; 641 glVertex 0 , $h;
617 glVertex $w, $h; 642 glVertex $w, $h;
… …
648our @ISA = CFClient::UI::Base::; 673our @ISA = CFClient::UI::Base::;
649 674
650sub new { 675sub new {
651 my ($class, %arg) = @_; 676 my ($class, %arg) = @_;
652 677
653 my $children = delete $arg{children} || []; 678 my $children = delete $arg{children};
654 679
655 my $self = $class->SUPER::new ( 680 my $self = $class->SUPER::new (
656 children => [], 681 children => [],
657 can_events => 0, 682 can_events => 0,
658 %arg, 683 %arg,
659 ); 684 );
685
660 $self->add ($_) for @$children; 686 $self->add (@$children)
687 if $children;
661 688
662 $self 689 $self
663} 690}
664 691
665sub add { 692sub add {
… …
713 $x -= $self->{x}; 740 $x -= $self->{x};
714 $y -= $self->{y}; 741 $y -= $self->{y};
715 742
716 my $res; 743 my $res;
717 744
718 for (reverse @{ $self->{children} }) { 745 for (reverse $self->visible_children) {
719 $res = $_->find_widget ($x, $y) 746 $res = $_->find_widget ($x, $y)
720 and return $res; 747 and return $res;
721 } 748 }
722 749
723 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 750 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
744} 771}
745 772
746sub add { 773sub add {
747 my ($self, $child) = @_; 774 my ($self, $child) = @_;
748 775
749 $self->{children} = []; 776 $self->SUPER::remove ($_) for @{ $self->{children} };
750
751 $self->SUPER::add ($child); 777 $self->SUPER::add ($child);
752} 778}
753 779
754sub remove { 780sub remove {
755 my ($self, $widget) = @_; 781 my ($self, $widget) = @_;
… …
764 790
765sub size_request { 791sub size_request {
766 $_[0]{children}[0]->size_request 792 $_[0]{children}[0]->size_request
767} 793}
768 794
769sub size_allocate { 795sub invoke_size_allocate {
770 my ($self, $w, $h, $changed) = @_; 796 my ($self, $w, $h) = @_;
771 797
772 $self->{children}[0]->configure (0, 0, $w, $h); 798 $self->{children}[0]->configure (0, 0, $w, $h);
799
800 1
773} 801}
774 802
775############################################################################# 803#############################################################################
804
805# back-buffered drawing area
776 806
777package CFClient::UI::Window; 807package CFClient::UI::Window;
778 808
779our @ISA = CFClient::UI::Bin::; 809our @ISA = CFClient::UI::Bin::;
780 810
… …
791 821
792 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 822 $ROOT->on_post_alloc ($self => sub { $self->render_child });
793 $self->SUPER::update; 823 $self->SUPER::update;
794} 824}
795 825
796sub size_allocate { 826sub invoke_size_allocate {
797 my ($self, $w, $h, $changed) = @_; 827 my ($self, $w, $h) = @_;
798 828
799 $self->SUPER::size_allocate ($w, $h, $changed);
800 $self->update 829 $self->update;
801 if $changed; 830
831 $self->SUPER::invoke_size_allocate ($w, $h)
802} 832}
803 833
804sub _render { 834sub _render {
835 my ($self) = @_;
836
805 $_[0]{children}[0]->draw; 837 $self->{children}[0]->draw;
806} 838}
807 839
808sub render_child { 840sub render_child {
809 my ($self) = @_; 841 my ($self) = @_;
810 842
811 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 843 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
812 glClearColor 0, 0, 0, 0; 844 glClearColor 0, 0, 0, 0;
813 glClear GL_COLOR_BUFFER_BIT; 845 glClear GL_COLOR_BUFFER_BIT;
814 846
847 {
848 package CFClient::UI::Base;
849
850 ($draw_x, $draw_y, $draw_w, $draw_h) =
851 (0, 0, $self->{w}, $self->{h});
852 }
853
815 $self->_render; 854 $self->_render;
816 }; 855 };
817} 856}
818 857
819sub _draw { 858sub _draw {
820 my ($self) = @_; 859 my ($self) = @_;
821 860
822 my ($w, $h) = ($self->w, $self->h); 861 my ($w, $h) = @$self{qw(w h)};
823 862
824 my $tex = $self->{texture} 863 my $tex = $self->{texture}
825 or return; 864 or return;
826 865
827 glEnable GL_TEXTURE_2D; 866 glEnable GL_TEXTURE_2D;
828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 867 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
829 glColor 1, 1, 1, 1; 868 glColor 0, 0, 0, 1;
830 869
831 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 870 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
832 871
833 glDisable GL_TEXTURE_2D; 872 glDisable GL_TEXTURE_2D;
834} 873}
… …
850} 889}
851 890
852sub size_request { 891sub size_request {
853 my ($self) = @_; 892 my ($self) = @_;
854 893
855 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 894 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
856 895
857 $w = 10 if $self->{scroll_x}; 896 $w = 10 if $self->{scroll_x};
858 $h = 10 if $self->{scroll_y}; 897 $h = 10 if $self->{scroll_y};
859 898
860 ($w, $h) 899 ($w, $h)
861} 900}
862 901
863sub size_allocate { 902sub invoke_size_allocate {
864 my ($self, $w, $h, $changed) = @_; 903 my ($self, $w, $h) = @_;
865 904
905 my $child = $self->child;
906
866 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 907 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
867 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 908 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
868 909
869 $self->child->configure (0, 0, $w, $h); 910 $self->child->configure (0, 0, $w, $h);
870 $self->update; 911 $self->update;
912
913 1
871} 914}
872 915
873sub set_offset { 916sub set_offset {
874 my ($self, $x, $y) = @_; 917 my ($self, $x, $y) = @_;
875 918
… …
908} 951}
909 952
910sub _render { 953sub _render {
911 my ($self) = @_; 954 my ($self) = @_;
912 955
956 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
957 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
958
913 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 959 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
914 960
915 $self->SUPER::_render; 961 $self->SUPER::_render;
916} 962}
917 963
… …
920package CFClient::UI::ScrolledWindow; 966package CFClient::UI::ScrolledWindow;
921 967
922our @ISA = CFClient::UI::HBox::; 968our @ISA = CFClient::UI::HBox::;
923 969
924sub new { 970sub new {
925 my $class = shift; 971 my ($class, %arg) = @_;
972
973 my $child = delete $arg{child};
926 974
927 my $self; 975 my $self;
928 976
929 my $slider = new CFClient::UI::Slider 977 my $slider = new CFClient::UI::Slider
930 vertical => 1, 978 vertical => 1,
… …
935 ; 983 ;
936 984
937 $self = $class->SUPER::new ( 985 $self = $class->SUPER::new (
938 vp => (new CFClient::UI::ViewPort expand => 1), 986 vp => (new CFClient::UI::ViewPort expand => 1),
939 slider => $slider, 987 slider => $slider,
940 @_, 988 %arg,
941 ); 989 );
942 990
943 $self->{vp}->add ($self->{scrolled});
944 $self->add ($self->{vp});
945 $self->add ($self->{slider}); 991 $self->SUPER::add ($self->{vp}, $self->{slider});
992 $self->add ($child) if $child;
946 993
947 $self 994 $self
948} 995}
949 996
997#TODO# update range on size_allocate depending on child
998
999sub add {
1000 my ($self, $widget) = @_;
1001
1002 $self->{vp}->add ($self->{child} = $widget);
1003}
1004
1005sub invoke_button_down {
1006 my ($self, $ev) = @_;
1007
1008 warn "button down $ev->{button}\n";#d#
1009
1010 0
1011}
1012
1013sub update_slider {
1014 my ($self) = @_;
1015
1016 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1017}
1018
950sub update { 1019sub update {
951 my ($self) = @_; 1020 my ($self) = @_;
952 1021
953 $self->SUPER::update; 1022 $self->SUPER::update;
954 1023
955 # todo: overwrite size_allocate of child 1024 $self->update_slider;
956 my $child = $self->{vp}->child;
957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958} 1025}
959 1026
960sub size_allocate { 1027sub invoke_size_allocate {
961 my ($self, $w, $h, $changed) = @_; 1028 my ($self, $w, $h) = @_;
962 1029
1030 $self->update_slider;
1031
963 $self->SUPER::size_allocate ($w, $h, $changed); 1032 $self->SUPER::invoke_size_allocate ($w, $h)
964
965 my $child = $self->{vp}->child;
966 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
967} 1033}
968
969#TODO# update range on size_allocate depending on child
970# update viewport offset on scroll
971 1034
972############################################################################# 1035#############################################################################
973 1036
974package CFClient::UI::Frame; 1037package CFClient::UI::Frame;
975 1038
… …
991 1054
992 if ($self->{bg}) { 1055 if ($self->{bg}) {
993 my ($w, $h) = @$self{qw(w h)}; 1056 my ($w, $h) = @$self{qw(w h)};
994 1057
995 glEnable GL_BLEND; 1058 glEnable GL_BLEND;
996 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1059 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
997 glColor @{ $self->{bg} }; 1060 glColor_premultiply @{ $self->{bg} };
998 1061
999 glBegin GL_QUADS; 1062 glBegin GL_QUADS;
1000 glVertex 0 , 0; 1063 glVertex 0 , 0;
1001 glVertex 0 , $h; 1064 glVertex 0 , $h;
1002 glVertex $w, $h; 1065 glVertex $w, $h;
… …
1024my @border = 1087my @border =
1025 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1088 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1026 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1089 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1027 1090
1028sub new { 1091sub new {
1029 my $class = shift; 1092 my ($class, %arg) = @_;
1030 1093
1031 my $self = $class->SUPER::new ( 1094 my $self = $class->SUPER::new (
1032 bg => [1, 1, 1, 1], 1095 bg => [1, 1, 1, 1],
1033 border_bg => [1, 1, 1, 1], 1096 border_bg => [1, 1, 1, 1],
1034 border => 0.6, 1097 border => 0.6,
1035 can_events => 1, 1098 can_events => 1,
1036 min_w => 16, 1099 min_w => 64,
1037 min_h => 16, 1100 min_h => 32,
1038 @_ 1101 %arg,
1039 ); 1102 );
1040 1103
1041 $self->{title} &&= new CFClient::UI::Label 1104 $self->{title_widget} = new CFClient::UI::Label
1042 align => 0, 1105 align => 0,
1043 valign => 1, 1106 valign => 1,
1044 text => $self->{title}, 1107 text => $self->{title},
1045 fontsize => $self->{border}; 1108 fontsize => $self->{border},
1109 if exists $self->{title};
1110
1111 if ($self->{has_close_button}) {
1112 $self->{close_button} =
1113 new CFClient::UI::ImageButton
1114 path => 'x1_close.png',
1115 on_activate => sub { $self->emit ("delete") };
1116
1117 $self->CFClient::UI::Container::add ($self->{close_button});
1118 }
1046 1119
1047 $self 1120 $self
1121}
1122
1123sub add {
1124 my ($self, @widgets) = @_;
1125
1126 $self->SUPER::add (@widgets);
1127 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1128 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1048} 1129}
1049 1130
1050sub border { 1131sub border {
1051 int $_[0]{border} * $::FONTSIZE 1132 int $_[0]{border} * $::FONTSIZE
1052} 1133}
1053 1134
1054sub size_request { 1135sub size_request {
1055 my ($self) = @_; 1136 my ($self) = @_;
1137
1138 $self->{title_widget}->size_request
1139 if $self->{title_widget};
1140
1141 $self->{close_button}->size_request
1142 if $self->{close_button};
1056 1143
1057 my ($w, $h) = $self->SUPER::size_request; 1144 my ($w, $h) = $self->SUPER::size_request;
1058 1145
1059 ( 1146 (
1060 $w + $self->border * 2, 1147 $w + $self->border * 2,
1061 $h + $self->border * 2, 1148 $h + $self->border * 2,
1062 ) 1149 )
1063} 1150}
1064 1151
1065sub size_allocate { 1152sub invoke_size_allocate {
1066 my ($self, $w, $h, $changed) = @_; 1153 my ($self, $w, $h) = @_;
1067 1154
1068 return unless $changed; 1155 if ($self->{title_widget}) {
1156 $self->{title_widget}{w} = $w;
1157 $self->{title_widget}{h} = $h;
1158 $self->{title_widget}->invoke_size_allocate ($w, $h);
1159 }
1069 1160
1161 my $border = $self->border;
1162
1070 $h -= List::Util::max 0, $self->border * 2; 1163 $h -= List::Util::max 0, $border * 2;
1071 $w -= List::Util::max 0, $self->border * 2; 1164 $w -= List::Util::max 0, $border * 2;
1072 1165
1073 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1074 if $self->{title};
1075
1076 $self->child->configure ($self->border, $self->border, $w, $h); 1166 $self->child->configure ($border, $border, $w, $h);
1077}
1078 1167
1168 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1169 if $self->{close_button};
1170
1171 1
1172}
1173
1174sub invoke_delete {
1175 my ($self) = @_;
1176
1177 $self->hide;
1178
1179 1
1180}
1181
1079sub button_down { 1182sub invoke_button_down {
1080 my ($self, $ev, $x, $y) = @_; 1183 my ($self, $ev, $x, $y) = @_;
1081 1184
1082 my ($w, $h) = @$self{qw(w h)}; 1185 my ($w, $h) = @$self{qw(w h)};
1083 my $border = $self->border; 1186 my $border = $self->border;
1084 1187
… …
1100 my $dy = $ev->{y} - $oy; 1203 my $dy = $ev->{y} - $oy;
1101 1204
1102 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1205 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1103 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1206 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1104 1207
1208 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1105 $self->realloc; 1209 $self->realloc;
1106 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1107 }; 1210 };
1108 1211
1109 } elsif ($lr ^ $td) { 1212 } elsif ($lr ^ $td) {
1110 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1213 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1111 my ($bx, $by) = ($self->{x}, $self->{y}); 1214 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1114 my ($ev, $x, $y) = @_; 1217 my ($ev, $x, $y) = @_;
1115 1218
1116 ($x, $y) = ($ev->{x}, $ev->{y}); 1219 ($x, $y) = ($ev->{x}, $ev->{y});
1117 1220
1118 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1221 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1222 # HACK: the next line is required to enforce placement
1223 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1119 }; 1224 };
1225 } else {
1226 return 0;
1227 }
1228
1120 } 1229 1
1121} 1230}
1122 1231
1123sub button_up { 1232sub invoke_button_up {
1124 my ($self, $ev, $x, $y) = @_; 1233 my ($self, $ev, $x, $y) = @_;
1125 1234
1126 delete $self->{motion}; 1235 ! ! delete $self->{motion}
1127} 1236}
1128 1237
1129sub mouse_motion { 1238sub invoke_mouse_motion {
1130 my ($self, $ev, $x, $y) = @_; 1239 my ($self, $ev, $x, $y) = @_;
1131 1240
1132 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1241 $self->{motion}->($ev, $x, $y) if $self->{motion};
1242
1243 ! ! $self->{motion}
1133} 1244}
1134 1245
1135sub _draw { 1246sub _draw {
1136 my ($self) = @_; 1247 my ($self) = @_;
1137 1248
1249 my $child = $self->{children}[0];
1250
1138 my ($w, $h ) = ($self->{w}, $self->{h}); 1251 my ($w, $h ) = ($self->{w}, $self->{h});
1139 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1252 my ($cw, $ch) = ($child->{w}, $child->{h});
1140 1253
1141 glEnable GL_TEXTURE_2D; 1254 glEnable GL_TEXTURE_2D;
1142 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1255 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1143 1256
1144 my $border = $self->border; 1257 my $border = $self->border;
… …
1159 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1272 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1160 } 1273 }
1161 1274
1162 glDisable GL_TEXTURE_2D; 1275 glDisable GL_TEXTURE_2D;
1163 1276
1164 $self->{title}->draw if $self->{title};
1165
1166 $self->child->draw; 1277 $child->draw;
1278
1279 if ($self->{title_widget}) {
1280 glTranslate 0, $border - $self->{h};
1281 $self->{title_widget}->_draw;
1282
1283 glTranslate 0, - ($border - $self->{h});
1284 }
1285
1286 $self->{close_button}->draw
1287 if $self->{close_button};
1167} 1288}
1168 1289
1169############################################################################# 1290#############################################################################
1170 1291
1171package CFClient::UI::Table; 1292package CFClient::UI::Table;
… …
1194 1315
1195 $child->set_parent ($self); 1316 $child->set_parent ($self);
1196 $self->{children}[$y][$x] = $child; 1317 $self->{children}[$y][$x] = $child;
1197 1318
1198 $self->realloc; 1319 $self->realloc;
1320}
1321
1322sub remove {
1323 my ($self, $child) = @_;
1324
1325 # TODO: not yet implemented
1199} 1326}
1200 1327
1201# TODO: move to container class maybe? send children a signal on removal? 1328# TODO: move to container class maybe? send children a signal on removal?
1202sub clear { 1329sub clear {
1203 my ($self) = @_; 1330 my ($self) = @_;
… …
1244 (sum @$ws), 1371 (sum @$ws),
1245 (sum @$hs), 1372 (sum @$hs),
1246 ) 1373 )
1247} 1374}
1248 1375
1249sub size_allocate { 1376sub invoke_size_allocate {
1250 my ($self, $w, $h, $changed) = @_; 1377 my ($self, $w, $h) = @_;
1251 1378
1252 my ($ws, $hs) = $self->get_wh; 1379 my ($ws, $hs) = $self->get_wh;
1253 1380
1254 my $req_w = (sum @$ws) || 1; 1381 my $req_w = (sum @$ws) || 1;
1255 my $req_h = (sum @$hs) || 1; 1382 my $req_h = (sum @$hs) || 1;
… …
1286 } 1413 }
1287 1414
1288 $y += $row_h; 1415 $y += $row_h;
1289 } 1416 }
1290 1417
1418 1
1291} 1419}
1292 1420
1293sub find_widget { 1421sub find_widget {
1294 my ($self, $x, $y) = @_; 1422 my ($self, $x, $y) = @_;
1295 1423
… …
1332 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1460 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1333 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1461 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1334 ) 1462 )
1335} 1463}
1336 1464
1337sub size_allocate { 1465sub invoke_size_allocate {
1338 my ($self, $w, $h, $changed) = @_; 1466 my ($self, $w, $h) = @_;
1339 1467
1340 my $space = $self->{vertical} ? $h : $w; 1468 my $space = $self->{vertical} ? $h : $w;
1341 my $children = $self->{children}; 1469 my @children = $self->visible_children;
1342 1470
1343 my @req; 1471 my @req;
1344 1472
1345 if ($self->{homogeneous}) { 1473 if ($self->{homogeneous}) {
1346 @req = ($space / (@$children || 1)) x @$children; 1474 @req = ($space / (@children || 1)) x @children;
1347 } else { 1475 } else {
1348 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1476 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1349 my $req = List::Util::sum @req; 1477 my $req = List::Util::sum @req;
1350 1478
1351 if ($req > $space) { 1479 if ($req > $space) {
1352 # ah well, not enough space 1480 # ah well, not enough space
1353 $_ *= $space / $req for @req; 1481 $_ *= $space / $req for @req;
1354 } else { 1482 } else {
1355 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1483 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1356 1484
1357 $space = ($space - $req) / $expand; # remaining space to give away 1485 $space = ($space - $req) / $expand; # remaining space to give away
1358 1486
1359 $req[$_] += $space * $children->[$_]{expand} 1487 $req[$_] += $space * $children[$_]{expand}
1360 for 0 .. $#$children; 1488 for 0 .. $#children;
1361 } 1489 }
1362 } 1490 }
1363 1491
1364 CFClient::UI::harmonize \@req; 1492 CFClient::UI::harmonize \@req;
1365 1493
1366 my $pos = 0; 1494 my $pos = 0;
1367 for (0 .. $#$children) { 1495 for (0 .. $#children) {
1368 my $alloc = $req[$_]; 1496 my $alloc = $req[$_];
1369 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1497 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1370 1498
1371 $pos += $alloc; 1499 $pos += $alloc;
1372 } 1500 }
1373 1501
1374 1 1502 1
… …
1464 1592
1465 delete $self->{texture}; 1593 delete $self->{texture};
1466 $self->SUPER::update; 1594 $self->SUPER::update;
1467} 1595}
1468 1596
1597sub realloc {
1598 my ($self) = @_;
1599
1600 delete $self->{ox};
1601 $self->SUPER::realloc;
1602}
1603
1469sub set_text { 1604sub set_text {
1470 my ($self, $text) = @_; 1605 my ($self, $text) = @_;
1471 1606
1472 return if $self->{text} eq "T$text"; 1607 return if $self->{text} eq "T$text";
1473 $self->{text} = "T$text"; 1608 $self->{text} = "T$text";
1474 1609
1475 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1476 $self->{layout}->set_text ($text); 1610 $self->{layout}->set_text ($text);
1477 1611
1612 delete $self->{size_req};
1478 $self->realloc; 1613 $self->realloc;
1479 $self->update; 1614 $self->update;
1480} 1615}
1481 1616
1482sub set_markup { 1617sub set_markup {
… …
1485 return if $self->{text} eq "M$markup"; 1620 return if $self->{text} eq "M$markup";
1486 $self->{text} = "M$markup"; 1621 $self->{text} = "M$markup";
1487 1622
1488 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1623 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1489 1624
1490 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1491 $self->{layout}->set_markup ($markup); 1625 $self->{layout}->set_markup ($markup);
1492 1626
1627 delete $self->{size_req};
1493 $self->realloc; 1628 $self->realloc;
1494 $self->update; 1629 $self->update;
1495} 1630}
1496 1631
1497sub size_request { 1632sub size_request {
1498 my ($self) = @_; 1633 my ($self) = @_;
1499 1634
1635 $self->{size_req} ||= do {
1500 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1636 $self->{layout}->set_font ($self->{font}) if $self->{font};
1501 $self->{layout}->set_width ($self->{max_w} || -1); 1637 $self->{layout}->set_width ($self->{max_w} || -1);
1502 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1638 $self->{layout}->set_ellipsise ($self->{ellipsise});
1503 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1639 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1504 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1640 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1505 1641
1506 my ($w, $h) = $self->{layout}->size; 1642 my ($w, $h) = $self->{layout}->size;
1507 1643
1508 if (exists $self->{template}) { 1644 if (exists $self->{template}) {
1509 $self->{template}->set_font ($self->{font}) if $self->{font}; 1645 $self->{template}->set_font ($self->{font}) if $self->{font};
1646 $self->{template}->set_width ($self->{max_w} || -1);
1510 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1647 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1511 1648
1512 my ($w2, $h2) = $self->{template}->size; 1649 my ($w2, $h2) = $self->{template}->size;
1513 1650
1514 $w = List::Util::max $w, $w2; 1651 $w = List::Util::max $w, $w2;
1515 $h = List::Util::max $h, $h2; 1652 $h = List::Util::max $h, $h2;
1653 }
1654
1655 [$w, $h]
1516 } 1656 };
1517 1657
1518 ($w, $h) 1658 @{ $self->{size_req} }
1519} 1659}
1520 1660
1661sub baseline_shift {
1662 $_[0]{layout}->descent
1663}
1664
1521sub size_allocate { 1665sub invoke_size_allocate {
1522 my ($self, $w, $h, $changed) = @_; 1666 my ($self, $w, $h) = @_;
1667
1668 delete $self->{ox};
1523 1669
1524 delete $self->{texture} 1670 delete $self->{texture}
1525 if $changed; 1671 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1672
1673 1
1526} 1674}
1527 1675
1528sub set_fontsize { 1676sub set_fontsize {
1529 my ($self, $fontsize) = @_; 1677 my ($self, $fontsize) = @_;
1530 1678
1531 $self->{fontsize} = $fontsize; 1679 $self->{fontsize} = $fontsize;
1680 delete $self->{size_req};
1532 delete $self->{texture}; 1681 delete $self->{texture};
1533 1682
1534 $self->realloc; 1683 $self->realloc;
1535} 1684}
1536 1685
1686sub reconfigure {
1687 my ($self) = @_;
1688
1689 delete $self->{size_req};
1690 delete $self->{texture};
1691
1692 $self->SUPER::reconfigure;
1693}
1694
1537sub _draw { 1695sub _draw {
1538 my ($self) = @_; 1696 my ($self) = @_;
1539 1697
1540 $self->SUPER::_draw; # draw background, if applicable 1698 $self->SUPER::_draw; # draw background, if applicable
1541 1699
1542 my $tex = $self->{texture} ||= do { 1700 my $size = $self->{texture} ||= do {
1543 $self->{layout}->set_foreground (@{$self->{fg}}); 1701 $self->{layout}->set_foreground (@{$self->{fg}});
1544 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1702 $self->{layout}->set_font ($self->{font}) if $self->{font};
1545 $self->{layout}->set_width ($self->{w}); 1703 $self->{layout}->set_width ($self->{w});
1546 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1704 $self->{layout}->set_ellipsise ($self->{ellipsise});
1547 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1705 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1548 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1706 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1549 1707
1550 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1708 [$self->{layout}->size]
1709 };
1551 1710
1711 unless (exists $self->{ox}) {
1552 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1712 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1553 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1713 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1554 : ($self->{w} - $tex->{w}) * 0.5); 1714 : ($self->{w} - $size->[0]) * 0.5);
1555 1715
1556 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1716 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1557 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1717 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1558 : ($self->{h} - $tex->{h}) * 0.5); 1718 : ($self->{h} - $size->[1]) * 0.5);
1559
1560 $tex
1561 }; 1719 };
1562 1720
1563 glEnable GL_TEXTURE_2D; 1721 my $w = List::Util::min $self->{w} + 4, $size->[0];
1564 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1722 my $h = List::Util::min $self->{h} + 2, $size->[1];
1565 1723
1566 if ($tex->{format} == GL_ALPHA) { 1724 $self->{layout}->render ($self->{ox}, $self->{oy});
1567 glColor @{$self->{fg}};
1568 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1569 } else {
1570 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1571 }
1572
1573 glDisable GL_TEXTURE_2D;
1574} 1725}
1575 1726
1576############################################################################# 1727#############################################################################
1577 1728
1578package CFClient::UI::EntryBase; 1729package CFClient::UI::EntryBase;
… …
1592 can_hover => 1, 1743 can_hover => 1,
1593 can_focus => 1, 1744 can_focus => 1,
1594 valign => 0, 1745 valign => 0,
1595 can_events => 1, 1746 can_events => 1,
1596 #text => ... 1747 #text => ...
1748 #hidden => "*",
1597 @_ 1749 @_
1598 ) 1750 )
1599} 1751}
1600 1752
1601sub _set_text { 1753sub _set_text {
… …
1603 1755
1604 delete $self->{cur_h}; 1756 delete $self->{cur_h};
1605 1757
1606 return if $self->{text} eq $text; 1758 return if $self->{text} eq $text;
1607 1759
1608 delete $self->{texture};
1609
1610 $self->{last_activity} = $::NOW; 1760 $self->{last_activity} = $::NOW;
1611 $self->{text} = $text; 1761 $self->{text} = $text;
1612 1762
1613 $text =~ s/./*/g if $self->{hidden}; 1763 $text =~ s/./*/g if $self->{hidden};
1614 $self->{layout}->set_text ("$text "); 1764 $self->{layout}->set_text ("$text ");
1765 delete $self->{size_req};
1615 1766
1616 $self->_emit (changed => $self->{text}); 1767 $self->emit (changed => $self->{text});
1768
1769 $self->realloc;
1770 $self->update;
1617} 1771}
1618 1772
1619sub set_text { 1773sub set_text {
1620 my ($self, $text) = @_; 1774 my ($self, $text) = @_;
1621 1775
1622 $self->{cursor} = length $text; 1776 $self->{cursor} = length $text;
1623 $self->_set_text ($text); 1777 $self->_set_text ($text);
1624
1625 $self->realloc;
1626} 1778}
1627 1779
1628sub get_text { 1780sub get_text {
1629 $_[0]{text} 1781 $_[0]{text}
1630} 1782}
… …
1635 my ($w, $h) = $self->SUPER::size_request; 1787 my ($w, $h) = $self->SUPER::size_request;
1636 1788
1637 ($w + 1, $h) # add 1 for cursor 1789 ($w + 1, $h) # add 1 for cursor
1638} 1790}
1639 1791
1640sub key_down { 1792sub invoke_key_down {
1641 my ($self, $ev) = @_; 1793 my ($self, $ev) = @_;
1642 1794
1643 my $mod = $ev->{mod}; 1795 my $mod = $ev->{mod};
1644 my $sym = $ev->{sym}; 1796 my $sym = $ev->{sym};
1645 my $uni = $ev->{unicode}; 1797 my $uni = $ev->{unicode};
… …
1657 } elsif ($sym == CFClient::SDLK_HOME) { 1809 } elsif ($sym == CFClient::SDLK_HOME) {
1658 $self->{cursor} = 0; 1810 $self->{cursor} = 0;
1659 } elsif ($sym == CFClient::SDLK_END) { 1811 } elsif ($sym == CFClient::SDLK_END) {
1660 $self->{cursor} = length $text; 1812 $self->{cursor} = length $text;
1661 } elsif ($uni == 27) { 1813 } elsif ($uni == 27) {
1662 $self->_emit ('escape'); 1814 $self->emit ('escape');
1663 } elsif ($uni) { 1815 } elsif ($uni) {
1664 substr $text, $self->{cursor}++, 0, chr $uni; 1816 substr $text, $self->{cursor}++, 0, chr $uni;
1817 } else {
1818 return 0;
1665 } 1819 }
1666 1820
1667 $self->_set_text ($text); 1821 $self->_set_text ($text);
1668 1822
1669 $self->realloc; 1823 $self->realloc;
1670}
1671 1824
1825 1
1826}
1827
1672sub focus_in { 1828sub invoke_focus_in {
1673 my ($self) = @_; 1829 my ($self) = @_;
1674 1830
1675 $self->{last_activity} = $::NOW; 1831 $self->{last_activity} = $::NOW;
1676 1832
1677 $self->SUPER::focus_in; 1833 $self->SUPER::invoke_focus_in
1678} 1834}
1679 1835
1680sub button_down { 1836sub invoke_button_down {
1681 my ($self, $ev, $x, $y) = @_; 1837 my ($self, $ev, $x, $y) = @_;
1682 1838
1683 $self->SUPER::button_down ($ev, $x, $y); 1839 $self->SUPER::invoke_button_down ($ev, $x, $y);
1684 1840
1685 my $idx = $self->{layout}->xy_to_index ($x, $y); 1841 my $idx = $self->{layout}->xy_to_index ($x, $y);
1686 1842
1687 # byte-index to char-index 1843 # byte-index to char-index
1688 my $text = $self->{text}; 1844 my $text = $self->{text};
1689 utf8::encode $text; 1845 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1690 $self->{cursor} = length substr $text, 0, $idx; 1846 $self->{cursor} = length $text;
1691 1847
1692 $self->_set_text ($self->{text}); 1848 $self->_set_text ($self->{text});
1693 $self->update; 1849 $self->update;
1850
1851 1
1694} 1852}
1695 1853
1696sub mouse_motion { 1854sub invoke_mouse_motion {
1697 my ($self, $ev, $x, $y) = @_; 1855 my ($self, $ev, $x, $y) = @_;
1698# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1856# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1857
1858 1
1699} 1859}
1700 1860
1701sub _draw { 1861sub _draw {
1702 my ($self) = @_; 1862 my ($self) = @_;
1703 1863
1704 local $self->{fg} = $self->{fg}; 1864 local $self->{fg} = $self->{fg};
1705 1865
1706 if ($FOCUS == $self) { 1866 if ($FOCUS == $self) {
1707 glColor @{$self->{active_bg}}; 1867 glColor_premultiply @{$self->{active_bg}};
1708 $self->{fg} = $self->{active_fg}; 1868 $self->{fg} = $self->{active_fg};
1709 } else { 1869 } else {
1710 glColor @{$self->{bg}}; 1870 glColor_premultiply @{$self->{bg}};
1711 } 1871 }
1712 1872
1713 glEnable GL_BLEND; 1873 glEnable GL_BLEND;
1714 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1874 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1715 glBegin GL_QUADS; 1875 glBegin GL_QUADS;
1716 glVertex 0 , 0; 1876 glVertex 0 , 0;
1717 glVertex 0 , $self->{h}; 1877 glVertex 0 , $self->{h};
1718 glVertex $self->{w}, $self->{h}; 1878 glVertex $self->{w}, $self->{h};
1719 glVertex $self->{w}, 0; 1879 glVertex $self->{w}, 0;
… …
1744 1904
1745our @ISA = CFClient::UI::EntryBase::; 1905our @ISA = CFClient::UI::EntryBase::;
1746 1906
1747use CFClient::OpenGL; 1907use CFClient::OpenGL;
1748 1908
1749sub key_down { 1909sub invoke_key_down {
1750 my ($self, $ev) = @_; 1910 my ($self, $ev) = @_;
1751 1911
1752 my $sym = $ev->{sym}; 1912 my $sym = $ev->{sym};
1753 1913
1754 if ($sym == 13) { 1914 if ($sym == 13) {
1755 unshift @{$self->{history}}, 1915 unshift @{$self->{history}},
1756 my $txt = $self->get_text; 1916 my $txt = $self->get_text;
1917
1757 $self->{history_pointer} = -1; 1918 $self->{history_pointer} = -1;
1758 $self->{history_saveback} = ''; 1919 $self->{history_saveback} = '';
1759 $self->_emit (activate => $txt); 1920 $self->emit (activate => $txt);
1760 $self->update; 1921 $self->update;
1761 1922
1762 } elsif ($sym == CFClient::SDLK_UP) { 1923 } elsif ($sym == CFClient::SDLK_UP) {
1763 if ($self->{history_pointer} < 0) { 1924 if ($self->{history_pointer} < 0) {
1764 $self->{history_saveback} = $self->get_text; 1925 $self->{history_saveback} = $self->get_text;
… …
1780 } else { 1941 } else {
1781 $self->set_text ($self->{history_saveback}); 1942 $self->set_text ($self->{history_saveback});
1782 } 1943 }
1783 1944
1784 } else { 1945 } else {
1785 $self->SUPER::key_down ($ev); 1946 return $self->SUPER::invoke_key_down ($ev)
1947 }
1948
1786 } 1949 1
1787
1788} 1950}
1789 1951
1790############################################################################# 1952#############################################################################
1791 1953
1792package CFClient::UI::Button; 1954package CFClient::UI::Button;
… …
1813 can_events => 1, 1975 can_events => 1,
1814 @_ 1976 @_
1815 ) 1977 )
1816} 1978}
1817 1979
1818sub activate { }
1819
1820sub button_up { 1980sub invoke_button_up {
1821 my ($self, $ev, $x, $y) = @_; 1981 my ($self, $ev, $x, $y) = @_;
1822 1982
1823 $self->emit ("activate") 1983 $self->emit ("activate")
1824 if $x >= 0 && $x < $self->{w} 1984 if $x >= 0 && $x < $self->{w}
1825 && $y >= 0 && $y < $self->{h}; 1985 && $y >= 0 && $y < $self->{h};
1986
1987 1
1826} 1988}
1827 1989
1828sub _draw { 1990sub _draw {
1829 my ($self) = @_; 1991 my ($self) = @_;
1830 1992
1831 local $self->{fg} = $self->{fg}; 1993 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1832
1833 if ($GRAB == $self) {
1834 $self->{fg} = $self->{active_fg};
1835 }
1836 1994
1837 glEnable GL_TEXTURE_2D; 1995 glEnable GL_TEXTURE_2D;
1838 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1996 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1839 glColor 0, 0, 0, 1; 1997 glColor 0, 0, 0, 1;
1840 1998
1841 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1999 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1842 2000
1843 glDisable GL_TEXTURE_2D; 2001 glDisable GL_TEXTURE_2D;
1844 2002
1845 $self->SUPER::_draw; 2003 $self->SUPER::_draw;
2004}
2005
2006#############################################################################
2007
2008package CFClient::UI::ImageButton;
2009
2010our @ISA = CFClient::UI::Image::;
2011
2012use CFClient::OpenGL;
2013
2014my %textures;
2015
2016sub new {
2017 my $class = shift;
2018
2019 my $self = $class->SUPER::new (
2020 padding_x => 4,
2021 padding_y => 4,
2022 fg => [1, 1, 1],
2023 active_fg => [0, 0, 1],
2024 can_hover => 1,
2025 align => 0,
2026 valign => 0,
2027 can_events => 1,
2028 @_
2029 );
2030}
2031
2032sub invoke_button_up {
2033 my ($self, $ev, $x, $y) = @_;
2034
2035 $self->emit ("activate")
2036 if $x >= 0 && $x < $self->{w}
2037 && $y >= 0 && $y < $self->{h};
2038
2039 1
1846} 2040}
1847 2041
1848############################################################################# 2042#############################################################################
1849 2043
1850package CFClient::UI::CheckBox; 2044package CFClient::UI::CheckBox;
… …
1877 my ($self) = @_; 2071 my ($self) = @_;
1878 2072
1879 (6) x 2 2073 (6) x 2
1880} 2074}
1881 2075
2076sub toggle {
2077 my ($self) = @_;
2078
2079 $self->{state} = !$self->{state};
2080 $self->emit (changed => $self->{state});
2081 $self->update;
2082}
2083
1882sub button_down { 2084sub invoke_button_down {
1883 my ($self, $ev, $x, $y) = @_; 2085 my ($self, $ev, $x, $y) = @_;
1884 2086
1885 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2087 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1886 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2088 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1887 $self->{state} = !$self->{state}; 2089 $self->toggle;
1888 $self->_emit (changed => $self->{state}); 2090 } else {
2091 return 0
2092 }
2093
1889 } 2094 1
1890} 2095}
1891 2096
1892sub _draw { 2097sub _draw {
1893 my ($self) = @_; 2098 my ($self) = @_;
1894 2099
… …
1914package CFClient::UI::Image; 2119package CFClient::UI::Image;
1915 2120
1916our @ISA = CFClient::UI::Base::; 2121our @ISA = CFClient::UI::Base::;
1917 2122
1918use CFClient::OpenGL; 2123use CFClient::OpenGL;
1919use Carp qw/confess/;
1920 2124
1921our %loaded_images; 2125our %texture_cache;
1922 2126
1923sub new { 2127sub new {
1924 my $class = shift; 2128 my $class = shift;
1925 2129
1926 my $self = $class->SUPER::new (can_events => 0, @_); 2130 my $self = $class->SUPER::new (
2131 can_events => 0,
2132 @_,
2133 );
1927 2134
1928 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2135 $self->{path} || $self->{tex}
2136 or Carp::croak "'path' or 'tex' attributes required";
1929 2137
1930 $loaded_images{$self->{image}} ||= 2138 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1931 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2139 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1932 2140
1933 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2141 Scalar::Util::weaken $texture_cache{$self->{path}};
1934 2142
1935 Scalar::Util::weaken $loaded_images{$self->{image}}; 2143 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1936
1937 $self->{aspect} = $tex->{w} / $tex->{h};
1938 2144
1939 $self 2145 $self
1940} 2146}
1941 2147
1942sub size_request { 2148sub size_request {
1943 my ($self) = @_; 2149 my ($self) = @_;
1944 2150
1945 ($self->{tex}->{w}, $self->{tex}->{h}) 2151 ($self->{tex}{w}, $self->{tex}{h})
1946} 2152}
1947 2153
1948sub _draw { 2154sub _draw {
1949 my ($self) = @_; 2155 my ($self) = @_;
1950 2156
… …
2059 my $ycut1 = max 0, min 1, $ycut; 2265 my $ycut1 = max 0, min 1, $ycut;
2060 my $ycut2 = max 0, min 1, $ycut - 1; 2266 my $ycut2 = max 0, min 1, $ycut - 1;
2061 2267
2062 my $h1 = $self->{h} * (1 - $ycut1); 2268 my $h1 = $self->{h} * (1 - $ycut1);
2063 my $h2 = $self->{h} * (1 - $ycut2); 2269 my $h2 = $self->{h} * (1 - $ycut2);
2270 my $h3 = $self->{h};
2271
2272 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2064 2273
2065 glEnable GL_BLEND; 2274 glEnable GL_BLEND;
2066 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2275 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2276 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2067 glEnable GL_TEXTURE_2D; 2277 glEnable GL_TEXTURE_2D;
2068 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2278 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2069 2279
2070 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2280 glBindTexture GL_TEXTURE_2D, $t1->{name};
2071 glBegin GL_QUADS; 2281 glBegin GL_QUADS;
… …
2086 2296
2087 if ($t3) { 2297 if ($t3) {
2088 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2298 glBindTexture GL_TEXTURE_2D, $t3->{name};
2089 glBegin GL_QUADS; 2299 glBegin GL_QUADS;
2090 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2300 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2091 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2301 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2092 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2302 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2093 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2303 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2094 glEnd; 2304 glEnd;
2095 } 2305 }
2096 2306
2097 glDisable GL_BLEND; 2307 glDisable GL_BLEND;
… …
2185 $self->update; 2395 $self->update;
2186 2396
2187 $self 2397 $self
2188} 2398}
2189 2399
2190sub changed { }
2191
2192sub set_range { 2400sub set_range {
2193 my ($self, $range) = @_; 2401 my ($self, $range) = @_;
2194 2402
2195 ($range, $self->{range}) = ($self->{range}, $range); 2403 ($range, $self->{range}) = ($self->{range}, $range);
2196 2404
2197 $self->update
2198 if "@$range" ne "@{$self->{range}}"; 2405 if ("@$range" ne "@{$self->{range}}") {
2406 $self->update;
2407 $self->set_value ($self->{range}[0]);
2408 }
2199} 2409}
2200 2410
2201sub set_value { 2411sub set_value {
2202 my ($self, $value) = @_; 2412 my ($self, $value) = @_;
2203 2413
… …
2214 if $unit; 2424 if $unit;
2215 2425
2216 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2426 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2217 2427
2218 if ($value != $old_value) { 2428 if ($value != $old_value) {
2219 $self->_emit (changed => $value); 2429 $self->emit (changed => $value);
2220 $self->update; 2430 $self->update;
2221 } 2431 }
2222} 2432}
2223 2433
2224sub size_request { 2434sub size_request {
2225 my ($self) = @_; 2435 my ($self) = @_;
2226 2436
2227 ($self->{req_w}, $self->{req_h}) 2437 ($self->{req_w}, $self->{req_h})
2228} 2438}
2229 2439
2230sub button_down { 2440sub invoke_button_down {
2231 my ($self, $ev, $x, $y) = @_; 2441 my ($self, $ev, $x, $y) = @_;
2232 2442
2233 $self->SUPER::button_down ($ev, $x, $y); 2443 $self->SUPER::invoke_button_down ($ev, $x, $y);
2234 2444
2235 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2445 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2236 2446
2237 $self->mouse_motion ($ev, $x, $y); 2447 $self->invoke_mouse_motion ($ev, $x, $y)
2238} 2448}
2239 2449
2240sub mouse_motion { 2450sub invoke_mouse_motion {
2241 my ($self, $ev, $x, $y) = @_; 2451 my ($self, $ev, $x, $y) = @_;
2242 2452
2243 if ($GRAB == $self) { 2453 if ($GRAB == $self) {
2244 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2454 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2245 2455
2246 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2456 my (undef, $lo, $hi, $page) = @{$self->{range}};
2247 2457
2248 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2458 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2249 2459
2250 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2460 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2461 } else {
2462 return 0;
2463 }
2464
2251 } 2465 1
2252} 2466}
2253 2467
2254sub update { 2468sub update {
2255 my ($self) = @_; 2469 my ($self) = @_;
2256 2470
2257 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2471 delete $self->{knob_w};
2472 $self->SUPER::update;
2473}
2474
2475sub _draw {
2476 my ($self) = @_;
2477
2478 unless ($self->{knob_w}) {
2258 $self->set_value ($self->{range}[0]); 2479 $self->set_value ($self->{range}[0]);
2259 2480
2260 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2481 my ($value, $lo, $hi, $page) = @{$self->{range}};
2261 my $range = ($hi - $page - $lo) || 1e-100; 2482 my $range = ($hi - $page - $lo) || 1e-100;
2262 2483
… …
2268 $value = ($value - $lo) / $range; 2489 $value = ($value - $lo) / $range;
2269 $value = $value * $self->{scale} + $self->{offset}; 2490 $value = $value * $self->{scale} + $self->{offset};
2270 2491
2271 $self->{knob_x} = $value - $knob_w * 0.5; 2492 $self->{knob_x} = $value - $knob_w * 0.5;
2272 $self->{knob_w} = $knob_w; 2493 $self->{knob_w} = $knob_w;
2273 }); 2494 }
2274
2275 $self->SUPER::update;
2276}
2277
2278sub _draw {
2279 my ($self) = @_;
2280 2495
2281 $self->SUPER::_draw (); 2496 $self->SUPER::_draw ();
2282 2497
2283 glScale $self->{w}, $self->{h}; 2498 glScale $self->{w}, $self->{h};
2284 2499
… …
2345sub set_range { shift->{slider}->set_range (@_) } 2560sub set_range { shift->{slider}->set_range (@_) }
2346sub set_value { shift->{slider}->set_value (@_) } 2561sub set_value { shift->{slider}->set_value (@_) }
2347 2562
2348############################################################################# 2563#############################################################################
2349 2564
2350package CFClient::UI::TextView; 2565package CFClient::UI::TextScroller;
2351 2566
2352our @ISA = CFClient::UI::HBox::; 2567our @ISA = CFClient::UI::HBox::;
2353 2568
2354use CFClient::OpenGL; 2569use CFClient::OpenGL;
2355 2570
… …
2357 my $class = shift; 2572 my $class = shift;
2358 2573
2359 my $self = $class->SUPER::new ( 2574 my $self = $class->SUPER::new (
2360 fontsize => 1, 2575 fontsize => 1,
2361 can_events => 0, 2576 can_events => 0,
2577 indent => 0,
2362 #font => default_font 2578 #font => default_font
2363 @_, 2579 @_,
2364 2580
2365 layout => (new CFClient::Layout 1), 2581 layout => (new CFClient::Layout),
2366 par => [], 2582 par => [],
2367 height => 0, 2583 height => 0,
2368 children => [ 2584 children => [
2369 (new CFClient::UI::Empty expand => 1), 2585 (new CFClient::UI::Empty expand => 1),
2370 (new CFClient::UI::Slider vertical => 1), 2586 (new CFClient::UI::Slider vertical => 1),
… …
2381 2597
2382 $self->{fontsize} = $fontsize; 2598 $self->{fontsize} = $fontsize;
2383 $self->reflow; 2599 $self->reflow;
2384} 2600}
2385 2601
2602sub size_request {
2603 my ($self) = @_;
2604
2605 my ($empty, $slider) = @{ $self->{children} };
2606
2607 local $self->{children} = [$empty, $slider];
2608 $self->SUPER::size_request
2609}
2610
2386sub size_allocate { 2611sub invoke_size_allocate {
2387 my ($self, $w, $h, $changed) = @_; 2612 my ($self, $w, $h) = @_;
2388 2613
2389 $self->SUPER::size_allocate ($w, $h, $changed); 2614 my ($empty, $slider, @other) = @{ $self->{children} };
2390 2615 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2391 return unless $changed;
2392 2616
2393 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2617 $self->{layout}->set_font ($self->{font}) if $self->{font};
2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395 $self->{layout}->set_width ($self->{children}[0]{w}); 2619 $self->{layout}->set_width ($empty->{w});
2620 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2396 2621
2397 $self->reflow; 2622 $self->reflow;
2398}
2399 2623
2400sub text_size { 2624 local $self->{children} = [$empty, $slider];
2401 my ($self, $text, $indent) = @_; 2625 $self->SUPER::invoke_size_allocate ($w, $h)
2626}
2627
2628sub get_layout {
2629 my ($self, $para) = @_;
2402 2630
2403 my $layout = $self->{layout}; 2631 my $layout = $self->{layout};
2404 2632
2633 $layout->set_font ($self->{font}) if $self->{font};
2634 $layout->set_foreground (@{$para->{fg}});
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2635 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406 $layout->set_width ($self->{children}[0]{w} - $indent); 2636 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2637 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2407 $layout->set_markup ($text); 2638 $layout->set_markup ($para->{markup});
2639
2640 $layout->set_shapes (
2641 map
2642 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2643 @{$para->{widget}}
2408 2644 );
2645
2409 $layout->size 2646 $layout
2410} 2647}
2411 2648
2412sub reflow { 2649sub reflow {
2413 my ($self) = @_; 2650 my ($self) = @_;
2414 2651
… …
2423 $self->{children}[1]->set_value ($offset); 2660 $self->{children}[1]->set_value ($offset);
2424} 2661}
2425 2662
2426sub clear { 2663sub clear {
2427 my ($self) = @_; 2664 my ($self) = @_;
2665
2666 my (undef, undef, @other) = @{ $self->{children} };
2667 $self->remove ($_) for @other;
2428 2668
2429 $self->{par} = []; 2669 $self->{par} = [];
2430 $self->{height} = 0; 2670 $self->{height} = 0;
2431 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2671 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2432} 2672}
2433 2673
2434sub add_paragraph { 2674sub add_paragraph {
2435 my ($self, $color, $text, $indent) = @_; 2675 my ($self, $color, $para, $indent) = @_;
2436 2676
2437 for my $line (split /\n/, $text) { 2677 my ($text, @w) = ref $para ? @$para : $para;
2438 my ($w, $h) = $self->text_size ($line); 2678
2439 $self->{height} += $h; 2679 $para = {
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2680 w => 1e10,
2681 wrapped => 1,
2682 fg => $color,
2683 indent => $indent,
2684 markup => $text,
2685 widget => \@w,
2441 } 2686 };
2442 2687
2443 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2688 $self->add (@w) if @w;
2689 push @{$self->{par}}, $para;
2690
2691 $self->{need_reflow}++;
2692 $self->update;
2693}
2694
2695sub scroll_to_bottom {
2696 my ($self) = @_;
2697
2698 $self->{scroll_to_bottom} = 1;
2699 $self->update;
2444} 2700}
2445 2701
2446sub update { 2702sub update {
2447 my ($self) = @_; 2703 my ($self) = @_;
2448 2704
… …
2450 2706
2451 return unless $self->{h} > 0; 2707 return unless $self->{h} > 0;
2452 2708
2453 delete $self->{texture}; 2709 delete $self->{texture};
2454 2710
2455 $ROOT->on_post_alloc ($self, sub { 2711 $ROOT->on_post_alloc ($self => sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2712 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457 2713
2458 if (delete $self->{need_reflow}) { 2714 if (delete $self->{need_reflow}) {
2459 my $height = 0; 2715 my $height = 0;
2460 2716
2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2465 for (@{$self->{par}}) { 2717 for my $para (@{$self->{par}}) {
2466 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2718 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2467 $layout->set_width ($W - $_->[3]); 2719 my $layout = $self->get_layout ($para);
2468 $layout->set_markup ($_->[4]);
2469 my ($w, $h) = $layout->size; 2720 my ($w, $h) = $layout->size;
2470 $_->[0] = $w + $_->[3]; 2721
2471 $_->[1] = $h; 2722 $para->{w} = $w + $para->{indent};
2723 $para->{h} = $h;
2724 $para->{wrapped} = $layout->has_wrapped;
2472 } 2725 }
2473 2726
2474 $height += $_->[1]; 2727 $height += $para->{h};
2475 } 2728 }
2476 2729
2477 $self->{height} = $height; 2730 $self->{height} = $height;
2478 2731
2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2732 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2480 2733
2481 delete $self->{texture}; 2734 delete $self->{texture};
2482 } 2735 }
2483 2736
2737 if (delete $self->{scroll_to_bottom}) {
2738 $self->{children}[1]->set_value (1e10);
2739 }
2740
2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2741 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2485 glClearColor 0.5, 0.5, 0.5, 0; 2742 glClearColor 0, 0, 0, 0;
2486 glClear GL_COLOR_BUFFER_BIT; 2743 glClear GL_COLOR_BUFFER_BIT;
2487 2744
2488 my $top = int $self->{children}[1]{range}[0]; 2745 my $top = int $self->{children}[1]{range}[0];
2489 2746
2490 my $y0 = $top; 2747 my $y0 = $top;
2491 my $y1 = $top + $H; 2748 my $y1 = $top + $H;
2492 2749
2493 my $y = 0; 2750 my $y = 0;
2494 2751
2495 my $layout = $self->{layout};
2496
2497 $layout->set_font ($self->{font}) if $self->{font};
2498
2499 glEnable GL_BLEND;
2500 #TODO# not correct in windows where rgba is forced off
2501 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2502
2503 for my $par (@{$self->{par}}) { 2752 for my $para (@{$self->{par}}) {
2504 my $h = $par->[1]; 2753 my $h = $para->{h};
2505 2754
2506 if ($y0 < $y + $h && $y < $y1) { 2755 if ($y0 < $y + $h && $y < $y1) {
2507 $layout->set_foreground (@{ $par->[2] });
2508 $layout->set_width ($W - $par->[3]);
2509 $layout->set_markup ($par->[4]);
2510 2756
2511 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2757 my $layout = $self->get_layout ($para);
2512 2758
2513 glRasterPos $par->[3], $y - $y0; 2759 $layout->render ($para->{indent}, $y - $y0);
2514 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2760
2761 if (my @w = @{ $para->{widget} }) {
2762 my @s = $layout->get_shapes;
2763
2764 for (@w) {
2765 my ($dx, $dy) = splice @s, 0, 2, ();
2766
2767 $_->{x} = $dx + $para->{indent};
2768 $_->{y} = $dy + $y - $y0;
2769
2770 $_->draw;
2771 }
2772 }
2515 } 2773 }
2516 2774
2517 $y += $h; 2775 $y += $h;
2518 } 2776 }
2519
2520 glDisable GL_BLEND;
2521 }; 2777 };
2522 }); 2778 });
2523} 2779}
2524 2780
2781sub reconfigure {
2782 my ($self) = @_;
2783
2784 $self->SUPER::reconfigure;
2785
2786 $_->{w} = 1e10 for @{ $self->{par} };
2787 $self->reflow;
2788}
2789
2525sub _draw { 2790sub _draw {
2526 my ($self) = @_; 2791 my ($self) = @_;
2527 2792
2528 glEnable GL_TEXTURE_2D; 2793 glEnable GL_TEXTURE_2D;
2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2794 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530 glColor 1, 1, 1, 1; 2795 glColor 0, 0, 0, 1;
2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2796 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2532 glDisable GL_TEXTURE_2D; 2797 glDisable GL_TEXTURE_2D;
2533 2798
2534 $self->{children}[1]->draw; 2799 $self->{children}[1]->draw;
2535
2536} 2800}
2537 2801
2538############################################################################# 2802#############################################################################
2539 2803
2540package CFClient::UI::Animator; 2804package CFClient::UI::Animator;
… …
2619} 2883}
2620 2884
2621sub set_tooltip_from { 2885sub set_tooltip_from {
2622 my ($self, $widget) = @_; 2886 my ($self, $widget) = @_;
2623 2887
2888 my $tooltip = $widget->{tooltip};
2889
2890 if ($ENV{CFPLUS_DEBUG} & 2) {
2891 $tooltip .= "\n\n" . (ref $widget) . "\n"
2892 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2893 . "req $widget->{req_w} $widget->{req_h}\n"
2894 . "visible $widget->{visible}";
2895 }
2896
2897 $tooltip =~ s/^\n+//;
2898 $tooltip =~ s/\n+$//;
2899
2624 $self->add (new CFClient::UI::Label 2900 $self->add (new CFClient::UI::Label
2625 markup => $widget->{tooltip}, 2901 markup => $tooltip,
2626 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2902 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2627 fontsize => 0.8, 2903 fontsize => 0.8,
2628 fg => [0, 0, 0, 1], 2904 fg => [0, 0, 0, 1],
2629 ellipsise => 0, 2905 ellipsise => 0,
2630 font => ($widget->{tooltip_font} || $::FONT_PROP), 2906 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2637 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2913 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2638 2914
2639 ($w + 4, $h + 4) 2915 ($w + 4, $h + 4)
2640} 2916}
2641 2917
2642sub size_allocate { 2918sub invoke_size_allocate {
2643 my ($self, $w, $h, $changed) = @_; 2919 my ($self, $w, $h) = @_;
2644 2920
2645 return unless $changed;
2646
2647 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2921 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2648} 2922}
2649 2923
2650sub visibility_change { 2924sub invoke_visibility_change {
2651 my ($self, $visible) = @_; 2925 my ($self, $visible) = @_;
2652 2926
2653 return unless $visible; 2927 return unless $visible;
2654 2928
2655 $self->{root}->on_post_alloc ("move_$self" => sub { 2929 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2657 or return; 2931 or return;
2658 2932
2659 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2933 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2660 2934
2661 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2935 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2662 if $x + $self->{w} > $::WIDTH; 2936 if $x + $self->{w} > $self->{root}{w};
2663 2937
2664 $self->move_abs ($x, $y); 2938 $self->move_abs ($x, $y);
2665 }); 2939 });
2666} 2940}
2667 2941
… …
2756 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3030 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2757 3031
2758 if ($tex) { 3032 if ($tex) {
2759 glEnable GL_TEXTURE_2D; 3033 glEnable GL_TEXTURE_2D;
2760 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3034 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2761 glColor 1, 1, 1, 1; 3035 glColor 0, 0, 0, 1;
2762 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3036 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2763 glDisable GL_TEXTURE_2D; 3037 glDisable GL_TEXTURE_2D;
2764 } 3038 }
2765} 3039}
2766 3040
2767sub DESTROY { 3041sub destroy {
2768 my ($self) = @_; 3042 my ($self) = @_;
2769 3043
2770 $self->{timer}->cancel 3044 $self->{timer}->cancel
2771 if $self->{timer}; 3045 if $self->{timer};
2772 3046
2773 $self->SUPER::DESTROY; 3047 $self->SUPER::destroy;
2774} 3048}
2775 3049
2776############################################################################# 3050#############################################################################
2777 3051
2778package CFClient::UI::Inventory; 3052package CFClient::UI::Buttonbar;
2779 3053
2780our @ISA = CFClient::UI::ScrolledWindow::; 3054our @ISA = CFClient::UI::HBox::;
2781 3055
2782sub new { 3056# TODO: should actualyl wrap buttons and other goodies.
2783 my $class = shift;
2784
2785 my $self = $class->SUPER::new (
2786 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2787 @_,
2788 );
2789
2790 $self
2791}
2792
2793sub set_items {
2794 my ($self, $items) = @_;
2795
2796 $self->{scrolled}->clear;
2797 return unless $items;
2798
2799 my @items = sort {
2800 ($a->{type} <=> $b->{type})
2801 or ($a->{name} cmp $b->{name})
2802 } @$items;
2803
2804 $self->{real_items} = \@items;
2805
2806 my $row = 0;
2807 for my $item (@items) {
2808 CFClient::Item::update_widgets $item;
2809
2810 $self->{scrolled}->add (0, $row, $item->{face_widget});
2811 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2812 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2813
2814 $row++;
2815 }
2816}
2817 3057
2818############################################################################# 3058#############################################################################
2819 3059
2820package CFClient::UI::Menu; 3060package CFClient::UI::Menu;
2821 3061
… …
2833 ); 3073 );
2834 3074
2835 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3075 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2836 3076
2837 for my $item (@{ $self->{items} }) { 3077 for my $item (@{ $self->{items} }) {
2838 my ($widget, $cb) = @$item; 3078 my ($widget, $cb, $tooltip) = @$item;
2839 3079
2840 # handle various types of items, only text for now 3080 # handle various types of items, only text for now
2841 if (!ref $widget) { 3081 if (!ref $widget) {
3082 if ($widget =~ /\t/) {
3083 my ($left, $right) = split /\t/, $widget, 2;
3084
3085 $widget = new CFClient::UI::HBox
3086 can_hover => 1,
3087 can_events => 1,
3088 tooltip => $tooltip,
3089 children => [
3090 (new CFClient::UI::Label markup => $left, expand => 1),
3091 (new CFClient::UI::Label markup => $right, align => +1),
3092 ],
3093 ;
3094
3095 } else {
2842 $widget = new CFClient::UI::Label 3096 $widget = new CFClient::UI::Label
2843 can_hover => 1, 3097 can_hover => 1,
2844 can_events => 1, 3098 can_events => 1,
2845 text => $widget; 3099 markup => $widget,
3100 tooltip => $tooltip;
3101 }
2846 } 3102 }
2847 3103
2848 $self->{item}{$widget} = $item; 3104 $self->{item}{$widget} = $item;
2849 3105
2850 $self->{vbox}->add ($widget); 3106 $self->{vbox}->add ($widget);
… …
2855 3111
2856# popup given the event (must be a mouse button down event currently) 3112# popup given the event (must be a mouse button down event currently)
2857sub popup { 3113sub popup {
2858 my ($self, $ev) = @_; 3114 my ($self, $ev) = @_;
2859 3115
2860 $self->_emit ("popdown"); 3116 $self->emit ("popdown");
2861 3117
2862 # maybe save $GRAB? must be careful about events... 3118 # maybe save $GRAB? must be careful about events...
2863 $GRAB = $self; 3119 $GRAB = $self;
2864 $self->{button} = $ev->{button}; 3120 $self->{button} = $ev->{button};
2865 3121
2866 $self->show; 3122 $self->show;
2867 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3123 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2868} 3124}
2869 3125
2870sub mouse_motion { 3126sub invoke_mouse_motion {
2871 my ($self, $ev, $x, $y) = @_; 3127 my ($self, $ev, $x, $y) = @_;
2872 3128
2873 # TODO: should use vbox->find_widget or so 3129 # TODO: should use vbox->find_widget or so
2874 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3130 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2875 $self->{hover} = $self->{item}{$HOVER}; 3131 $self->{hover} = $self->{item}{$HOVER};
2876}
2877 3132
3133 0
3134}
3135
2878sub button_up { 3136sub invoke_button_up {
2879 my ($self, $ev, $x, $y) = @_; 3137 my ($self, $ev, $x, $y) = @_;
2880 3138
2881 if ($ev->{button} == $self->{button}) { 3139 if ($ev->{button} == $self->{button}) {
2882 undef $GRAB; 3140 undef $GRAB;
2883 $self->hide; 3141 $self->hide;
2884 3142
2885 $self->_emit ("popdown"); 3143 $self->emit ("popdown");
2886 $self->{hover}[1]->() if $self->{hover}; 3144 $self->{hover}[1]->() if $self->{hover};
3145 } else {
3146 return 0
3147 }
3148
2887 } 3149 1
2888} 3150}
2889 3151
2890############################################################################# 3152#############################################################################
2891 3153
2892package CFClient::UI::Statusbox; 3154package CFClient::UI::Multiplexer;
2893 3155
2894our @ISA = CFClient::UI::VBox::; 3156our @ISA = CFClient::UI::Container::;
2895 3157
2896sub new { 3158sub new {
2897 my $class = shift; 3159 my $class = shift;
2898 3160
2899 $class->SUPER::new ( 3161 my $self = $class->SUPER::new (
3162 @_,
3163 );
3164
3165 $self->{current} = $self->{children}[0]
3166 if @{ $self->{children} };
3167
3168 $self
3169}
3170
3171sub add {
3172 my ($self, @widgets) = @_;
3173
3174 $self->SUPER::add (@widgets);
3175
3176 $self->{current} = $self->{children}[0]
3177 if @{ $self->{children} };
3178}
3179
3180sub get_current_page {
3181 my ($self) = @_;
3182
3183 $self->{current}
3184}
3185
3186sub set_current_page {
3187 my ($self, $page_or_widget) = @_;
3188
3189 my $widget = ref $page_or_widget
3190 ? $page_or_widget
3191 : $self->{children}[$page_or_widget];
3192
3193 $self->{current} = $widget;
3194 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3195
3196 $self->emit (page_changed => $self->{current});
3197
3198 $self->realloc;
3199}
3200
3201sub visible_children {
3202 $_[0]{current}
3203}
3204
3205sub size_request {
3206 my ($self) = @_;
3207
3208 $self->{current}->size_request
3209}
3210
3211sub invoke_size_allocate {
3212 my ($self, $w, $h) = @_;
3213
3214 $self->{current}->configure (0, 0, $w, $h);
3215
3216 1
3217}
3218
3219sub _draw {
3220 my ($self) = @_;
3221
3222 $self->{current}->draw;
3223}
3224
3225#############################################################################
3226
3227package CFClient::UI::Notebook;
3228
3229our @ISA = CFClient::UI::VBox::;
3230
3231sub new {
3232 my $class = shift;
3233
3234 my $self = $class->SUPER::new (
3235 buttonbar => (new CFClient::UI::Buttonbar),
3236 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3237 # filter => # will be put between multiplexer and $self
3238 @_,
3239 );
3240
3241 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3242 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3243
3244 $self
3245}
3246
3247sub add {
3248 my ($self, $title, $widget, $tooltip) = @_;
3249
3250 Scalar::Util::weaken $self;
3251
3252 $self->{buttonbar}->add (new CFClient::UI::Button
3253 markup => $title,
3254 tooltip => $tooltip,
3255 on_activate => sub { $self->set_current_page ($widget) },
3256 );
3257
3258 $self->{multiplexer}->add ($widget);
3259}
3260
3261sub get_current_page {
3262 my ($self) = @_;
3263
3264 $self->{multiplexer}->get_current_page
3265}
3266
3267sub set_current_page {
3268 my ($self, $page) = @_;
3269
3270 $self->{multiplexer}->set_current_page ($page);
3271 $self->emit (page_changed => $self->{multiplexer}{current});
3272}
3273
3274#############################################################################
3275
3276package CFClient::UI::Combobox;
3277
3278use utf8;
3279
3280our @ISA = CFClient::UI::Button::;
3281
3282sub new {
3283 my $class = shift;
3284
3285 my $self = $class->SUPER::new (
3286 options => [], # [value, title, longdesc], ...
3287 value => undef,
3288 @_,
3289 );
3290
3291 $self->_set_value ($self->{value});
3292
3293 $self
3294}
3295
3296sub invoke_button_down {
3297 my ($self, $ev) = @_;
3298
3299 my @menu_items;
3300
3301 for (@{ $self->{options} }) {
3302 my ($value, $title, $tooltip) = @$_;
3303
3304 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3305 }
3306
3307 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3308}
3309
3310sub _set_value {
3311 my ($self, $value) = @_;
3312
3313 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3314 or return;
3315
3316 $self->{value} = $item->[0];
3317 $self->set_markup ("$item->[1] ⇓");
3318 $self->set_tooltip ($item->[2]);
3319}
3320
3321sub set_value {
3322 my ($self, $value) = @_;
3323
3324 return unless $self->{value} ne $value;
3325
3326 $self->_set_value ($value);
3327 $self->emit (changed => $value);
3328}
3329
3330#############################################################################
3331
3332package CFClient::UI::Statusbox;
3333
3334our @ISA = CFClient::UI::VBox::;
3335
3336sub new {
3337 my $class = shift;
3338
3339 my $self = $class->SUPER::new (
2900 fontsize => 0.8, 3340 fontsize => 0.8,
2901 @_, 3341 @_,
2902 ) 3342 );
3343
3344 Scalar::Util::weaken (my $this = $self);
3345
3346 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3347
3348 $self
2903} 3349}
2904 3350
2905sub reorder { 3351sub reorder {
2906 my ($self) = @_; 3352 my ($self) = @_;
2907 my $NOW = time; 3353 my $NOW = Time::HiRes::time;
3354
3355 # freeze display when hovering over any label
3356 return if $CFClient::UI::TOOLTIP->{owner}
3357 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3358 values %{ $self->{item} };
2908 3359
2909 while (my ($k, $v) = each %{ $self->{item} }) { 3360 while (my ($k, $v) = each %{ $self->{item} }) {
2910 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3361 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2911 } 3362 }
2912 3363
… …
2915 my @items = sort { 3366 my @items = sort {
2916 $a->{pri} <=> $b->{pri} 3367 $a->{pri} <=> $b->{pri}
2917 or $b->{id} <=> $a->{id} 3368 or $b->{id} <=> $a->{id}
2918 } values %{ $self->{item} }; 3369 } values %{ $self->{item} };
2919 3370
3371 $self->{timer}->interval (1);
3372
2920 my $count = 10 + 1; 3373 my $count = 10 + 1;
2921 for my $item (@items) { 3374 for my $item (@items) {
2922 last unless --$count; 3375 last unless --$count;
2923 3376
2924 push @widgets, $item->{label} ||= do { 3377 my $label = $item->{label} ||= do {
2925 # TODO: doesn't handle markup well (read as: at all) 3378 # TODO: doesn't handle markup well (read as: at all)
2926 my $short = $item->{count} > 1 3379 my $short = $item->{count} > 1
2927 ? "<b>$item->{count} ×</b> $item->{text}" 3380 ? "<b>$item->{count} ×</b> $item->{text}"
2928 : $item->{text}; 3381 : $item->{text};
2929 3382
… …
2937 tooltip => $item->{tooltip}, 3390 tooltip => $item->{tooltip},
2938 tooltip_font => $::FONT_PROP, 3391 tooltip_font => $::FONT_PROP,
2939 tooltip_width => 0.67, 3392 tooltip_width => 0.67,
2940 fontsize => $item->{fontsize} || $self->{fontsize}, 3393 fontsize => $item->{fontsize} || $self->{fontsize},
2941 max_w => $::WIDTH * 0.44, 3394 max_w => $::WIDTH * 0.44,
2942 fg => $item->{fg}, 3395 fg => [@{ $item->{fg} }],
2943 can_events => 1, 3396 can_events => 1,
2944 can_hover => 1 3397 can_hover => 1
2945 }; 3398 };
3399
3400 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3401 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3402 $label->update;
3403 $label->set_max_size (undef, $label->{req_h} * $diff)
3404 if $diff < 1;
3405 $self->{timer}->interval (1/30);
3406 } else {
3407 $label->{fg}[3] = $item->{fg}[3] || 1;
3408 }
3409
3410 push @widgets, $label;
2946 } 3411 }
2947 3412
2948 $self->clear; 3413 $self->clear;
2949 $self->SUPER::add (reverse @widgets); 3414 $self->SUPER::add (reverse @widgets);
2950} 3415}
… …
2955 $text =~ s/^\s+//; 3420 $text =~ s/^\s+//;
2956 $text =~ s/\s+$//; 3421 $text =~ s/\s+$//;
2957 3422
2958 return unless $text; 3423 return unless $text;
2959 3424
2960 my $timeout = time + ((delete $arg{timeout}) || 60); 3425 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2961 3426
2962 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3427 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2963 3428
2964 if (my $item = $self->{item}{$group}) { 3429 if (my $item = $self->{item}{$group}) {
2965 if ($item->{text} eq $text) { 3430 if ($item->{text} eq $text) {
2966 $item->{count}++; 3431 $item->{count}++;
2967 } else { 3432 } else {
2968 $item->{count} = 1; 3433 $item->{count} = 1;
2969 $item->{text} = $item->{tooltip} = $text; 3434 $item->{text} = $item->{tooltip} = $text;
2970 } 3435 }
2971 $item->{id} = ++$self->{id}; 3436 $item->{id} += 0.2;#d#
2972 $item->{timeout} = $timeout; 3437 $item->{timeout} = $timeout;
2973 delete $item->{label}; 3438 delete $item->{label};
2974 } else { 3439 } else {
2975 $self->{item}{$group} = { 3440 $self->{item}{$group} = {
2976 id => ++$self->{id}, 3441 id => ++$self->{id},
… …
2982 count => 1, 3447 count => 1,
2983 %arg, 3448 %arg,
2984 }; 3449 };
2985 } 3450 }
2986 3451
3452 $ROOT->on_refresh (reorder => sub {
2987 $self->reorder; 3453 $self->reorder;
3454 });
2988} 3455}
2989 3456
2990sub reconfigure { 3457sub reconfigure {
2991 my ($self) = @_; 3458 my ($self) = @_;
2992 3459
… …
2995 3462
2996 $self->reorder; 3463 $self->reorder;
2997 $self->SUPER::reconfigure; 3464 $self->SUPER::reconfigure;
2998} 3465}
2999 3466
3467sub destroy {
3468 my ($self) = @_;
3469
3470 $self->{timer}->cancel;
3471
3472 $self->SUPER::destroy;
3473}
3474
3000############################################################################# 3475#############################################################################
3001 3476
3477package CFClient::UI::Inventory;
3478
3479our @ISA = CFClient::UI::Table::;
3480
3481sub new {
3482 my $class = shift;
3483
3484 my $self = $class->SUPER::new (
3485 col_expand => [0, 1, 0],
3486 @_,
3487 );
3488
3489 $self
3490}
3491
3492sub set_items {
3493 my ($self, $items) = @_;
3494
3495 $self->clear;
3496 return unless $items;
3497
3498 my @items = sort {
3499 ($a->{type} <=> $b->{type})
3500 or ($a->{name} cmp $b->{name})
3501 } values %$items;
3502
3503 $self->{real_items} = \@items;
3504
3505 my $row = 0;
3506 for my $item (@items) {
3507 CFClient::Item::update_widgets $item;
3508
3509 $self->add (0, $row, $item->{face_widget});
3510 $self->add (1, $row, $item->{desc_widget});
3511 $self->add (2, $row, $item->{weight_widget});
3512
3513 $row++;
3514 }
3515}
3516
3517#############################################################################
3518
3519package CFClient::UI::SpellList;
3520
3521our @ISA = CFClient::UI::Table::;
3522
3523sub new {
3524 my $class = shift;
3525
3526 my $self = $class->SUPER::new (
3527 binding => [],
3528 commands => [],
3529 @_,
3530 )
3531}
3532
3533my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3534
3535my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3536 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3537my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3538 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3539my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3540 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3541my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3542 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3543my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3544 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3545
3546sub rebuild_spell_list {
3547 my ($self) = @_;
3548
3549 $CFClient::UI::ROOT->on_refresh ($self => sub {
3550 $self->clear;
3551
3552 return unless $::CONN;
3553
3554 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3555 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3556 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3557 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3558 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3559
3560 my $row = 0;
3561
3562 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3563 my $spell = $self->{spell}{$_};
3564
3565 $row++;
3566
3567 my $spell_cb = sub {
3568 my ($widget, $ev) = @_;
3569
3570 if ($ev->{button} == 1) {
3571 $::CONN->user_send ("cast $spell->{name}");
3572 } elsif ($ev->{button} == 2) {
3573 $::CONN->user_send ("invoke $spell->{name}");
3574 } elsif ($ev->{button} == 3) {
3575 (new CFClient::UI::Menu
3576 items => [
3577 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3578 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3579 ],
3580 )->popup ($ev);
3581 } else {
3582 return 0;
3583 }
3584
3585 1
3586 };
3587
3588 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3589
3590 #TODO: add path info to tooltip
3591 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3592
3593 $self->add (0, $row, new CFClient::UI::Face
3594 face => $spell->{face},
3595 can_hover => 1,
3596 can_events => 1,
3597 tooltip => $tooltip,
3598 on_button_down => $spell_cb,
3599 );
3600
3601 $self->add (1, $row, new CFClient::UI::Label
3602 expand => 1,
3603 text => $spell->{name},
3604 can_hover => 1,
3605 can_events => 1,
3606 tooltip => $tooltip,
3607 on_button_down => $spell_cb,
3608 );
3609
3610 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3611 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3612 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3613 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3614 }
3615 });
3616}
3617
3618sub add_spell {
3619 my ($self, $spell) = @_;
3620
3621 $self->{spell}->{$spell->{name}} = $spell;
3622 $self->rebuild_spell_list;
3623}
3624
3625sub remove_spell {
3626 my ($self, $spell) = @_;
3627
3628 delete $self->{spell}->{$spell->{name}};
3629 $self->rebuild_spell_list;
3630}
3631
3632sub clear_spells {
3633 my ($self) = @_;
3634
3635 $self->{spell} = {};
3636 $self->rebuild_spell_list;
3637}
3638
3639#############################################################################
3640
3002package CFClient::UI::Root; 3641package CFClient::UI::Root;
3003 3642
3004our @ISA = CFClient::UI::Container::; 3643our @ISA = CFClient::UI::Container::;
3644
3645use List::Util qw(min max);
3005 3646
3006use CFClient::OpenGL; 3647use CFClient::OpenGL;
3007 3648
3008sub new { 3649sub new {
3009 my $class = shift; 3650 my $class = shift;
… …
3016 Scalar::Util::weaken ($self->{root} = $self); 3657 Scalar::Util::weaken ($self->{root} = $self);
3017 3658
3018 $self 3659 $self
3019} 3660}
3020 3661
3021sub configure {
3022 my ($self, $x, $y, $w, $h) = @_;
3023
3024 $self->{w} = $w;
3025 $self->{h} = $h;
3026}
3027
3028sub reconfigure {
3029 my ($self) = @_;
3030
3031 $self->SUPER::reconfigure;
3032
3033 $self->size_allocate ($self->{w}, $self->{h}, 1)
3034 if $self->{w};
3035}
3036
3037sub size_request { 3662sub size_request {
3038 my ($self) = @_; 3663 my ($self) = @_;
3039 3664
3040 ($self->{w}, $self->{h}) 3665 ($self->{w}, $self->{h})
3041} 3666}
… …
3052 $coord = $max - $size if $coord > $max - $size; 3677 $coord = $max - $size if $coord > $max - $size;
3053 3678
3054 int $coord + 0.5 3679 int $coord + 0.5
3055} 3680}
3056 3681
3057sub size_allocate { 3682sub invoke_size_allocate {
3058 my ($self, $w, $h, $changed) = @_; 3683 my ($self, $w, $h) = @_;
3059 3684
3060 for my $child ($self->children) { 3685 for my $child ($self->children) {
3061 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3686 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3062 3687
3063 $X = $child->{force_x} if exists $child->{force_x}; 3688 $X = $child->{force_x} if exists $child->{force_x};
… …
3066 $X = _to_pixel $X, $W, $self->{w}; 3691 $X = _to_pixel $X, $W, $self->{w};
3067 $Y = _to_pixel $Y, $H, $self->{h}; 3692 $Y = _to_pixel $Y, $H, $self->{h};
3068 3693
3069 $child->configure ($X, $Y, $W, $H); 3694 $child->configure ($X, $Y, $W, $H);
3070 } 3695 }
3696
3697 1
3071} 3698}
3072 3699
3073sub coord2local { 3700sub coord2local {
3074 my ($self, $x, $y) = @_; 3701 my ($self, $x, $y) = @_;
3075 3702
… …
3131 $_->() 3758 $_->()
3132 for values %{delete $self->{refresh_hook}}; 3759 for values %{delete $self->{refresh_hook}};
3133 } 3760 }
3134 3761
3135 if ($self->{realloc}) { 3762 if ($self->{realloc}) {
3763 my %queue;
3136 my @queue; 3764 my @queue;
3765 my $widget;
3137 3766
3767 outer:
3138 while () { 3768 while () {
3139 if ($self->{realloc}) { 3769 if (my $realloc = delete $self->{realloc}) {
3140 #TODO use array-of-depth approach 3770 for $widget (values %$realloc) {
3771 $widget->{visible} or next; # do not resize invisible widgets
3141 3772
3142 @queue = sort { $a->{visible} <=> $b->{visible} } 3773 $queue{$widget+0}++ and next; # duplicates are common
3143 @queue, values %{delete $self->{realloc}}; 3774
3775 push @{ $queue[$widget->{visible}] }, $widget;
3776 }
3144 } 3777 }
3145 3778
3779 while () {
3780 @queue or last outer;
3781
3146 my $widget = pop @queue || last; 3782 $widget = pop @{ $queue[-1] || [] }
3783 and last;
3784
3785 pop @queue;
3786 }
3147 3787
3148 $widget->{visible} or last; # do not resize invisible widgets 3788 delete $queue{$widget+0};
3149 3789
3150 my ($w, $h) = $widget->size_request; 3790 my ($w, $h) = $widget->size_request;
3151 3791
3152 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3792 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3153 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3793 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3794
3795 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3796 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3154 3797
3155 $w = $widget->{force_w} if exists $widget->{force_w}; 3798 $w = $widget->{force_w} if exists $widget->{force_w};
3156 $h = $widget->{force_h} if exists $widget->{force_h}; 3799 $h = $widget->{force_h} if exists $widget->{force_h};
3157 3800
3801 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3802 || delete $widget->{force_realloc}) {
3158 $widget->{req_w} = $w; 3803 $widget->{req_w} = $w;
3159 $widget->{req_h} = $h; 3804 $widget->{req_h} = $h;
3160 3805
3161 $self->{size_alloc}{$widget} = [$widget, undef, undef]; 3806 $self->{size_alloc}{$widget+0} = $widget;
3162 3807
3163 push @queue, $widget->{parent} 3808 if (my $parent = $widget->{parent}) {
3164 if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent}; 3809 $self->{realloc}{$parent+0} = $parent
3810 unless $queue{$parent+0};
3811
3812 $parent->{force_size_alloc} = 1;
3813 $self->{size_alloc}{$parent+0} = $parent;
3814 }
3815 }
3816
3817 delete $self->{realloc}{$widget+0};
3165 } 3818 }
3166 } 3819 }
3167 3820
3168 while (my $size_alloc = delete $self->{size_alloc}) { 3821 while (my $size_alloc = delete $self->{size_alloc}) {
3169 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible}, 3822 my @queue = sort { $b->{visible} <=> $a->{visible} }
3170 values %$size_alloc; 3823 values %$size_alloc;
3171 3824
3172 while () { 3825 while () {
3173 my ($widget, $w, $h) = @{ pop @queue or last }; 3826 my $widget = pop @queue || last;
3174 3827
3175 $w = $widget->{w} || $widget->{req_w} unless defined $w; 3828 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3176 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3177 3829
3178 $w = 0 if $w < 0; 3830 $w = 0 if $w < 0;
3179 $h = 0 if $h < 0; 3831 $h = 0 if $h < 0;
3180 3832
3833 $w = max $widget->{min_w}, $w;
3834 $h = max $widget->{min_h}, $h;
3835
3836 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3837 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3838
3181 $w = int $w + 0.5; 3839 $w = int $w + 0.5;
3182 $h = int $h + 0.5; 3840 $h = int $h + 0.5;
3183 3841
3184 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3842 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3843 $widget->{old_w} = $widget->{w};
3844 $widget->{old_h} = $widget->{h};
3185 3845
3186 $widget->{w} = $w; 3846 $widget->{w} = $w;
3187 $widget->{h} = $h; 3847 $widget->{h} = $h;
3188 3848
3189 $widget->emit (size_allocate => $w, $h, $changed); 3849 $widget->emit (size_allocate => $w, $h);
3850 }
3190 } 3851 }
3191 } 3852 }
3192 3853
3193 while ($self->{post_alloc_hook}) { 3854 while ($self->{post_alloc_hook}) {
3194 $_->() 3855 $_->()
3195 for values %{delete $self->{post_alloc_hook}}; 3856 for values %{delete $self->{post_alloc_hook}};
3196 } 3857 }
3858
3197 3859
3198 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3860 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3199 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3861 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3200 glClear GL_COLOR_BUFFER_BIT; 3862 glClear GL_COLOR_BUFFER_BIT;
3201 3863
… …
3203 glLoadIdentity; 3865 glLoadIdentity;
3204 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3866 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3205 glMatrixMode GL_MODELVIEW; 3867 glMatrixMode GL_MODELVIEW;
3206 glLoadIdentity; 3868 glLoadIdentity;
3207 3869
3870 {
3871 package CFClient::UI::Base;
3872
3873 ($draw_x, $draw_y, $draw_w, $draw_h) =
3874 (0, 0, $self->{w}, $self->{h});
3875 }
3876
3208 $self->_draw; 3877 $self->_draw;
3209} 3878}
3210 3879
3211############################################################################# 3880#############################################################################
3212 3881

Diff Legend

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