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.312 by root, Fri Jun 23 23:54:30 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}
… …
87 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
88 90
89 $GRAB = $widget; 91 $GRAB = $widget;
90 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
91 93
92 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
93 } 95 }
94 96
95 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
96 98
97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
112 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
113 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
114 $grab->update if $grab; 116 $grab->update if $grab;
115 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
116 118
117 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
118 } 120 }
119} 121}
120 122
121sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
122 my ($ev) = @_; 124 my ($ev) = @_;
… …
128 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
129 131
130 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
131 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
132 134
133 check_tooltip; 135 $TOOLTIP_WATCHER->start;
134 } 136 }
135 137
136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
137 if $HOVER; 139 if $HOVER;
138} 140}
… …
170sub rescale_widgets { 172sub rescale_widgets {
171 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
172 174
173 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177 179
178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 180 $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}; 181 $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}; 182 $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.]+$/; 183 $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}; 184 $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}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184 186
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187 189
188 } 190 }
189 } 191 }
190 192
191 reconfigure_widgets; 193 reconfigure_widgets;
… …
219 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
220 } 222 }
221 } 223 }
222 224
223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x}; 226 $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}; 227 $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}; 228 $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}; 229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
228 230
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231 233
232 $self->show if $layout->{show}; 234 $self->show if $layout->{show};
… …
270 272
271 return unless $self->{visible}; 273 return unless $self->{visible};
272 274
273 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
274 276
277 delete $self->{visible};
275 delete $self->{root}; 278 delete $self->{root};
276 delete $self->{visible};
277 279
278 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
279 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
280 282
281 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
282 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
283 285
284 $self->focus_out; 286 $self->emit ("focus_out");
285
286 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
287} 288}
288 289
289sub set_visibility { 290sub set_visibility {
290 my ($self, $visible) = @_; 291 my ($self, $visible) = @_;
… …
313} 314}
314 315
315sub move_abs { 316sub move_abs {
316 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
317 318
318 $self->{x} = List::Util::max 0, int $x; 319 $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; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
320 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
321 322
322 $self->update; 323 $self->update;
323} 324}
324 325
… …
332} 333}
333 334
334sub size_request { 335sub size_request {
335 require Carp; 336 require Carp;
336 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
338}
339
340sub baseline_shift {
341 0
337} 342}
338 343
339sub configure { 344sub configure {
340 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
341 346
… …
355 $self->{x} = $x; 360 $self->{x} = $x;
356 $self->{y} = $y; 361 $self->{y} = $y;
357 $self->update; 362 $self->update;
358 } 363 }
359 364
360 if ($self->{w} != $w || $self->{h} != $h) { 365 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
361 return unless $self->{visible}; 366 return unless $self->{visible};
362 367
368 $self->{alloc_w} = $w;
369 $self->{alloc_h} = $h;
370
363 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 371 $self->{root}{size_alloc}{$self+0} = $self;
364 } 372 }
365}
366
367sub size_allocate {
368 # nothing to be done
369} 373}
370 374
371sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
372} 381}
373 382
374sub set_max_size { 383sub set_max_size {
375 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
376 385
377 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
378 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
379} 390}
380 391
381sub set_tooltip { 392sub set_tooltip {
382 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
383 394
… …
388 399
389 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
390 401
391 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
392 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
393 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
394 } 405 }
395} 406}
396 407
397# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
398sub coord2local { 409sub coord2local {
… …
406 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
407 418
408 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
409} 420}
410 421
411sub focus_in { 422sub invoke_focus_in {
412 my ($self) = @_; 423 my ($self) = @_;
413 424
414 return if $FOCUS == $self; 425 return if $FOCUS == $self;
415 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
416 427
417 my $focus = $FOCUS; $FOCUS = $self; 428 my $focus = $FOCUS; $FOCUS = $self;
418 429
419 $self->_emit (focus_in => $focus);
420
421 $focus->update if $focus; 430 $focus->update if $focus;
422 $FOCUS->update; 431 $FOCUS->update;
423}
424 432
433 0
434}
435
425sub focus_out { 436sub invoke_focus_out {
426 my ($self) = @_; 437 my ($self) = @_;
427 438
428 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
429 440
430 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
431 442
432 $self->_emit (focus_out => $focus);
433
434 $focus->update if $focus; #? 443 $focus->update if $focus; #?
435 444
436 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
437 unless $FOCUS; 446 unless $FOCUS;
438}
439 447
448 0
449}
450
451sub grab_focus {
452 my ($self) = @_;
453
454 $self->emit ("focus_in");
455}
456
440sub mouse_motion { } 457sub invoke_mouse_motion { 1 }
441sub button_up { } 458sub invoke_button_up { 1 }
442sub key_down { } 459sub invoke_key_down { 1 }
443sub key_up { } 460sub invoke_key_up { 1 }
444 461
445sub button_down { 462sub invoke_button_down {
446 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
447 464
448 $self->focus_in; 465 $self->grab_focus;
449}
450 466
451sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 467 1
452sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 468}
453sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 469
454sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 470sub connect {
455sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483}
456 484
457sub find_widget { 485sub find_widget {
458 my ($self, $x, $y) = @_; 486 my ($self, $x, $y) = @_;
459 487
460 return () unless $self->{can_events}; 488 return () unless $self->{can_events};
… …
471 499
472 Scalar::Util::weaken ($self->{parent} = $parent); 500 Scalar::Util::weaken ($self->{parent} = $parent);
473 $self->set_visible if $parent->{visible}; 501 $self->set_visible if $parent->{visible};
474} 502}
475 503
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 { 504sub realloc {
500 my ($self) = @_; 505 my ($self) = @_;
501 506
502 if ($self->{visible}) { 507 if ($self->{visible}) {
503 return if $self->{root}{realloc}{$self}; 508 return if $self->{root}{realloc}{$self+0};
504 509
505 $self->{root}{realloc}{$self} = $self; 510 $self->{root}{realloc}{$self+0} = $self;
506 $self->{root}->update; 511 $self->{root}->update;
507 } else { 512 } else {
508 delete $self->{req_w}; 513 delete $self->{req_w};
514 delete $self->{req_h};
509 } 515 }
510} 516}
511 517
512sub update { 518sub update {
513 my ($self) = @_; 519 my ($self) = @_;
… …
521 527
522 $self->realloc; 528 $self->realloc;
523 $self->update; 529 $self->update;
524} 530}
525 531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
535
526sub draw { 536sub draw {
527 my ($self) = @_; 537 my ($self) = @_;
528 538
529 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544
545 # skip widgets that are entirely outside the drawing area
546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
530 548
531 glPushMatrix; 549 glPushMatrix;
532 glTranslate $self->{x}, $self->{y}, 0; 550 glTranslate $self->{x}, $self->{y}, 0;
533 $self->_draw;
534 glPopMatrix;
535 551
536 if ($self == $HOVER && $self->{can_hover}) { 552 if ($self == $HOVER && $self->{can_hover}) {
537 my ($x, $y) = @$self{qw(x y)};
538
539 glColor 1, 0.8, 0.5, 0.2; 553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
540 glEnable GL_BLEND; 554 glEnable GL_BLEND;
541 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
542 glBegin GL_QUADS; 556 glBegin GL_QUADS;
543 glVertex $x , $y; 557 glVertex 0 , 0;
544 glVertex $x + $self->{w}, $y; 558 glVertex $self->{w}, 0;
545 glVertex $x + $self->{w}, $y + $self->{h}; 559 glVertex $self->{w}, $self->{h};
546 glVertex $x , $y + $self->{h}; 560 glVertex 0 , $self->{h};
547 glEnd; 561 glEnd;
548 glDisable GL_BLEND; 562 glDisable GL_BLEND;
549 } 563 }
550 564
551 if ($ENV{CFPLUS_DEBUG}) { 565 if ($ENV{CFPLUS_DEBUG} & 1) {
552 glPushMatrix; 566 glPushMatrix;
553 glColor 1, 1, 0, 1; 567 glColor 1, 1, 0, 1;
554 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 568 glTranslate 0.375, 0.375;
555 glBegin GL_LINE_LOOP; 569 glBegin GL_LINE_LOOP;
556 glVertex 0 , 0; 570 glVertex 0 , 0;
557 glVertex $self->{w} - 1, 0; 571 glVertex $self->{w} - 1, 0;
558 glVertex $self->{w} - 1, $self->{h} - 1; 572 glVertex $self->{w} - 1, $self->{h} - 1;
559 glVertex 0 , $self->{h} - 1; 573 glVertex 0 , $self->{h} - 1;
560 glEnd; 574 glEnd;
561 glPopMatrix; 575 glPopMatrix;
562 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
563 } 577 }
578
579 $self->_draw;
580 glPopMatrix;
564} 581}
565 582
566sub _draw { 583sub _draw {
567 my ($self) = @_; 584 my ($self) = @_;
568 585
… …
571 588
572sub DESTROY { 589sub DESTROY {
573 my ($self) = @_; 590 my ($self) = @_;
574 591
575 delete $WIDGET{$self+0}; 592 delete $WIDGET{$self+0};
576 #$self->deactivate; 593
594 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
577} 596}
578 597
579############################################################################# 598#############################################################################
580 599
581package CFClient::UI::DrawBG; 600package CFClient::UI::DrawBG;
… …
606 625
607 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
608 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
609 628
610 glEnable GL_BLEND; 629 glEnable GL_BLEND;
611 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
612 glColor @$color; 631 glColor_premultiply @$color;
613 632
614 glBegin GL_QUADS; 633 glBegin GL_QUADS;
615 glVertex 0 , 0; 634 glVertex 0 , 0;
616 glVertex 0 , $h; 635 glVertex 0 , $h;
617 glVertex $w, $h; 636 glVertex $w, $h;
… …
648our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
649 668
650sub new { 669sub new {
651 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
652 671
653 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
654 673
655 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
656 children => [], 675 children => [],
657 can_events => 0, 676 can_events => 0,
658 %arg, 677 %arg,
659 ); 678 );
679
660 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
661 682
662 $self 683 $self
663} 684}
664 685
665sub add { 686sub add {
… …
713 $x -= $self->{x}; 734 $x -= $self->{x};
714 $y -= $self->{y}; 735 $y -= $self->{y};
715 736
716 my $res; 737 my $res;
717 738
718 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
719 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
720 and return $res; 741 and return $res;
721 } 742 }
722 743
723 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
744} 765}
745 766
746sub add { 767sub add {
747 my ($self, $child) = @_; 768 my ($self, $child) = @_;
748 769
749 $self->{children} = []; 770 $self->SUPER::remove ($_) for @{ $self->{children} };
750
751 $self->SUPER::add ($child); 771 $self->SUPER::add ($child);
752} 772}
753 773
754sub remove { 774sub remove {
755 my ($self, $widget) = @_; 775 my ($self, $widget) = @_;
… …
764 784
765sub size_request { 785sub size_request {
766 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
767} 787}
768 788
769sub size_allocate { 789sub invoke_size_allocate {
770 my ($self, $w, $h, $changed) = @_; 790 my ($self, $w, $h) = @_;
771 791
772 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
773} 795}
774 796
775############################################################################# 797#############################################################################
798
799# back-buffered drawing area
776 800
777package CFClient::UI::Window; 801package CFClient::UI::Window;
778 802
779our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
780 804
… …
791 815
792 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
793 $self->SUPER::update; 817 $self->SUPER::update;
794} 818}
795 819
796sub size_allocate { 820sub invoke_size_allocate {
797 my ($self, $w, $h, $changed) = @_; 821 my ($self, $w, $h) = @_;
798 822
799 $self->SUPER::size_allocate ($w, $h, $changed);
800 $self->update 823 $self->update;
801 if $changed; 824
825 $self->SUPER::invoke_size_allocate ($w, $h)
802} 826}
803 827
804sub _render { 828sub _render {
829 my ($self) = @_;
830
805 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
806} 832}
807 833
808sub render_child { 834sub render_child {
809 my ($self) = @_; 835 my ($self) = @_;
810 836
811 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
812 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
813 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
814 840
841 {
842 package CFClient::UI::Base;
843
844 ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h});
846 }
847
815 $self->_render; 848 $self->_render;
816 }; 849 };
817} 850}
818 851
819sub _draw { 852sub _draw {
820 my ($self) = @_; 853 my ($self) = @_;
821 854
822 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
823 856
824 my $tex = $self->{texture} 857 my $tex = $self->{texture}
825 or return; 858 or return;
826 859
827 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
829 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
830 863
831 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
832 865
833 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
834} 867}
… …
850} 883}
851 884
852sub size_request { 885sub size_request {
853 my ($self) = @_; 886 my ($self) = @_;
854 887
855 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
856 889
857 $w = 10 if $self->{scroll_x}; 890 $w = 10 if $self->{scroll_x};
858 $h = 10 if $self->{scroll_y}; 891 $h = 10 if $self->{scroll_y};
859 892
860 ($w, $h) 893 ($w, $h)
861} 894}
862 895
863sub size_allocate { 896sub invoke_size_allocate {
864 my ($self, $w, $h, $changed) = @_; 897 my ($self, $w, $h) = @_;
865 898
899 my $child = $self->child;
900
866 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
867 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
868 903
869 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
870 $self->update; 905 $self->update;
906
907 1
871} 908}
872 909
873sub set_offset { 910sub set_offset {
874 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
875 912
… …
908} 945}
909 946
910sub _render { 947sub _render {
911 my ($self) = @_; 948 my ($self) = @_;
912 949
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
952
913 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
914 954
915 $self->SUPER::_render; 955 $self->SUPER::_render;
916} 956}
917 957
… …
920package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
921 961
922our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
923 963
924sub new { 964sub new {
925 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
926 968
927 my $self; 969 my $self;
928 970
929 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
930 vertical => 1, 972 vertical => 1,
… …
935 ; 977 ;
936 978
937 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
938 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
939 slider => $slider, 981 slider => $slider,
940 @_, 982 %arg,
941 ); 983 );
942 984
943 $self->{vp}->add ($self->{scrolled});
944 $self->add ($self->{vp});
945 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
946 987
947 $self 988 $self
989}
990
991sub add {
992 my ($self, $widget) = @_;
993
994 $self->{vp}->add ($self->{child} = $widget);
948} 995}
949 996
950sub update { 997sub update {
951 my ($self) = @_; 998 my ($self) = @_;
952 999
… …
955 # todo: overwrite size_allocate of child 1002 # todo: overwrite size_allocate of child
956 my $child = $self->{vp}->child; 1003 my $child = $self->{vp}->child;
957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958} 1005}
959 1006
960sub size_allocate { 1007sub invoke_size_allocate {
961 my ($self, $w, $h, $changed) = @_; 1008 my ($self, $w, $h) = @_;
962
963 $self->SUPER::size_allocate ($w, $h, $changed);
964 1009
965 my $child = $self->{vp}->child; 1010 my $child = $self->{vp}->child;
966 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012
1013 $self->SUPER::invoke_size_allocate ($w, $h)
967} 1014}
968 1015
969#TODO# update range on size_allocate depending on child 1016#TODO# update range on size_allocate depending on child
970# update viewport offset on scroll 1017# update viewport offset on scroll
971 1018
… …
991 1038
992 if ($self->{bg}) { 1039 if ($self->{bg}) {
993 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
994 1041
995 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
996 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
997 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
998 1045
999 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
1000 glVertex 0 , 0; 1047 glVertex 0 , 0;
1001 glVertex 0 , $h; 1048 glVertex 0 , $h;
1002 glVertex $w, $h; 1049 glVertex $w, $h;
… …
1024my @border = 1071my @border =
1025 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 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); 1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1027 1074
1028sub new { 1075sub new {
1029 my $class = shift; 1076 my ($class, %arg) = @_;
1030 1077
1031 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
1032 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
1033 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
1034 border => 0.6, 1081 border => 0.6,
1035 can_events => 1, 1082 can_events => 1,
1036 min_w => 16, 1083 min_w => 16,
1037 min_h => 16, 1084 min_h => 16,
1038 @_ 1085 %arg,
1039 ); 1086 );
1040 1087
1041 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
1042 align => 0, 1089 align => 0,
1043 valign => 1, 1090 valign => 1,
1044 text => $self->{title}, 1091 text => $self->{title},
1045 fontsize => $self->{border}; 1092 fontsize => $self->{border},
1093 if exists $self->{title};
1094
1095 if ($self->{has_close_button}) {
1096 $self->{close_button} =
1097 new CFClient::UI::ImageButton
1098 path => 'x1_close.png',
1099 on_activate => sub { $self->hide };
1100
1101 $self->CFClient::UI::Container::add ($self->{close_button});
1102 }
1046 1103
1047 $self 1104 $self
1105}
1106
1107sub add {
1108 my ($self, @widgets) = @_;
1109
1110 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1048} 1113}
1049 1114
1050sub border { 1115sub border {
1051 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
1052} 1117}
1053 1118
1054sub size_request { 1119sub size_request {
1055 my ($self) = @_; 1120 my ($self) = @_;
1121
1122 $self->{title_widget}->size_request
1123 if $self->{title_widget};
1124
1125 $self->{close_button}->size_request
1126 if $self->{close_button};
1056 1127
1057 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
1058 1129
1059 ( 1130 (
1060 $w + $self->border * 2, 1131 $w + $self->border * 2,
1061 $h + $self->border * 2, 1132 $h + $self->border * 2,
1062 ) 1133 )
1063} 1134}
1064 1135
1065sub size_allocate { 1136sub invoke_size_allocate {
1066 my ($self, $w, $h, $changed) = @_; 1137 my ($self, $w, $h) = @_;
1067 1138
1068 return unless $changed; 1139 if ($self->{title_widget}) {
1140 $self->{title_widget}{w} = $w;
1141 $self->{title_widget}{h} = $h;
1142 $self->{title_widget}->invoke_size_allocate ($w, $h);
1143 }
1069 1144
1145 my $border = $self->border;
1146
1070 $h -= List::Util::max 0, $self->border * 2; 1147 $h -= List::Util::max 0, $border * 2;
1071 $w -= List::Util::max 0, $self->border * 2; 1148 $w -= List::Util::max 0, $border * 2;
1072 1149
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); 1150 $self->child->configure ($border, $border, $w, $h);
1077}
1078 1151
1152 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_button};
1154
1155 1
1156}
1157
1079sub button_down { 1158sub invoke_button_down {
1080 my ($self, $ev, $x, $y) = @_; 1159 my ($self, $ev, $x, $y) = @_;
1081 1160
1082 my ($w, $h) = @$self{qw(w h)}; 1161 my ($w, $h) = @$self{qw(w h)};
1083 my $border = $self->border; 1162 my $border = $self->border;
1084 1163
… …
1100 my $dy = $ev->{y} - $oy; 1179 my $dy = $ev->{y} - $oy;
1101 1180
1102 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1181 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1103 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1182 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1104 1183
1184 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1105 $self->realloc; 1185 $self->realloc;
1106 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1107 }; 1186 };
1108 1187
1109 } elsif ($lr ^ $td) { 1188 } elsif ($lr ^ $td) {
1110 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1189 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1111 my ($bx, $by) = ($self->{x}, $self->{y}); 1190 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1114 my ($ev, $x, $y) = @_; 1193 my ($ev, $x, $y) = @_;
1115 1194
1116 ($x, $y) = ($ev->{x}, $ev->{y}); 1195 ($x, $y) = ($ev->{x}, $ev->{y});
1117 1196
1118 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1197 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1198 # HACK: the next line is required to enforce placement
1199 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1119 }; 1200 };
1201 } else {
1202 return 0;
1203 }
1204
1120 } 1205 1
1121} 1206}
1122 1207
1123sub button_up { 1208sub invoke_button_up {
1124 my ($self, $ev, $x, $y) = @_; 1209 my ($self, $ev, $x, $y) = @_;
1125 1210
1126 delete $self->{motion}; 1211 ! ! delete $self->{motion}
1127} 1212}
1128 1213
1129sub mouse_motion { 1214sub invoke_mouse_motion {
1130 my ($self, $ev, $x, $y) = @_; 1215 my ($self, $ev, $x, $y) = @_;
1131 1216
1132 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1217 $self->{motion}->($ev, $x, $y) if $self->{motion};
1218
1219 ! ! $self->{motion}
1133} 1220}
1134 1221
1135sub _draw { 1222sub _draw {
1136 my ($self) = @_; 1223 my ($self) = @_;
1137 1224
1225 my $child = $self->{children}[0];
1226
1138 my ($w, $h ) = ($self->{w}, $self->{h}); 1227 my ($w, $h ) = ($self->{w}, $self->{h});
1139 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1228 my ($cw, $ch) = ($child->{w}, $child->{h});
1140 1229
1141 glEnable GL_TEXTURE_2D; 1230 glEnable GL_TEXTURE_2D;
1142 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1231 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1143 1232
1144 my $border = $self->border; 1233 my $border = $self->border;
… …
1159 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1248 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1160 } 1249 }
1161 1250
1162 glDisable GL_TEXTURE_2D; 1251 glDisable GL_TEXTURE_2D;
1163 1252
1164 $self->{title}->draw if $self->{title};
1165
1166 $self->child->draw; 1253 $child->draw;
1254
1255 if ($self->{title_widget}) {
1256 glTranslate 0, $border - $self->{h};
1257 $self->{title_widget}->_draw;
1258
1259 glTranslate 0, - ($border - $self->{h});
1260 }
1261
1262 $self->{close_button}->draw
1263 if $self->{close_button};
1167} 1264}
1168 1265
1169############################################################################# 1266#############################################################################
1170 1267
1171package CFClient::UI::Table; 1268package CFClient::UI::Table;
… …
1194 1291
1195 $child->set_parent ($self); 1292 $child->set_parent ($self);
1196 $self->{children}[$y][$x] = $child; 1293 $self->{children}[$y][$x] = $child;
1197 1294
1198 $self->realloc; 1295 $self->realloc;
1296}
1297
1298sub remove {
1299 my ($self, $child) = @_;
1300
1301 # TODO: not yet implemented
1199} 1302}
1200 1303
1201# TODO: move to container class maybe? send children a signal on removal? 1304# TODO: move to container class maybe? send children a signal on removal?
1202sub clear { 1305sub clear {
1203 my ($self) = @_; 1306 my ($self) = @_;
… …
1244 (sum @$ws), 1347 (sum @$ws),
1245 (sum @$hs), 1348 (sum @$hs),
1246 ) 1349 )
1247} 1350}
1248 1351
1249sub size_allocate { 1352sub invoke_size_allocate {
1250 my ($self, $w, $h, $changed) = @_; 1353 my ($self, $w, $h) = @_;
1251 1354
1252 my ($ws, $hs) = $self->get_wh; 1355 my ($ws, $hs) = $self->get_wh;
1253 1356
1254 my $req_w = (sum @$ws) || 1; 1357 my $req_w = (sum @$ws) || 1;
1255 my $req_h = (sum @$hs) || 1; 1358 my $req_h = (sum @$hs) || 1;
… …
1286 } 1389 }
1287 1390
1288 $y += $row_h; 1391 $y += $row_h;
1289 } 1392 }
1290 1393
1394 1
1291} 1395}
1292 1396
1293sub find_widget { 1397sub find_widget {
1294 my ($self, $x, $y) = @_; 1398 my ($self, $x, $y) = @_;
1295 1399
… …
1332 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1333 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1437 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1334 ) 1438 )
1335} 1439}
1336 1440
1337sub size_allocate { 1441sub invoke_size_allocate {
1338 my ($self, $w, $h, $changed) = @_; 1442 my ($self, $w, $h) = @_;
1339 1443
1340 my $space = $self->{vertical} ? $h : $w; 1444 my $space = $self->{vertical} ? $h : $w;
1341 my $children = $self->{children}; 1445 my @children = $self->visible_children;
1342 1446
1343 my @req; 1447 my @req;
1344 1448
1345 if ($self->{homogeneous}) { 1449 if ($self->{homogeneous}) {
1346 @req = ($space / (@$children || 1)) x @$children; 1450 @req = ($space / (@children || 1)) x @children;
1347 } else { 1451 } else {
1348 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1452 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1349 my $req = List::Util::sum @req; 1453 my $req = List::Util::sum @req;
1350 1454
1351 if ($req > $space) { 1455 if ($req > $space) {
1352 # ah well, not enough space 1456 # ah well, not enough space
1353 $_ *= $space / $req for @req; 1457 $_ *= $space / $req for @req;
1354 } else { 1458 } else {
1355 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1459 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1356 1460
1357 $space = ($space - $req) / $expand; # remaining space to give away 1461 $space = ($space - $req) / $expand; # remaining space to give away
1358 1462
1359 $req[$_] += $space * $children->[$_]{expand} 1463 $req[$_] += $space * $children[$_]{expand}
1360 for 0 .. $#$children; 1464 for 0 .. $#children;
1361 } 1465 }
1362 } 1466 }
1363 1467
1364 CFClient::UI::harmonize \@req; 1468 CFClient::UI::harmonize \@req;
1365 1469
1366 my $pos = 0; 1470 my $pos = 0;
1367 for (0 .. $#$children) { 1471 for (0 .. $#children) {
1368 my $alloc = $req[$_]; 1472 my $alloc = $req[$_];
1369 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1473 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1370 1474
1371 $pos += $alloc; 1475 $pos += $alloc;
1372 } 1476 }
1373 1477
1374 1 1478 1
… …
1464 1568
1465 delete $self->{texture}; 1569 delete $self->{texture};
1466 $self->SUPER::update; 1570 $self->SUPER::update;
1467} 1571}
1468 1572
1573sub realloc {
1574 my ($self) = @_;
1575
1576 delete $self->{ox};
1577 $self->SUPER::realloc;
1578}
1579
1469sub set_text { 1580sub set_text {
1470 my ($self, $text) = @_; 1581 my ($self, $text) = @_;
1471 1582
1472 return if $self->{text} eq "T$text"; 1583 return if $self->{text} eq "T$text";
1473 $self->{text} = "T$text"; 1584 $self->{text} = "T$text";
1474 1585
1475 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1476 $self->{layout}->set_text ($text); 1587 $self->{layout}->set_text ($text);
1477 1588
1589 delete $self->{size_req};
1478 $self->realloc; 1590 $self->realloc;
1479 $self->update; 1591 $self->update;
1480} 1592}
1481 1593
1482sub set_markup { 1594sub set_markup {
… …
1488 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1600 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1489 1601
1490 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1491 $self->{layout}->set_markup ($markup); 1603 $self->{layout}->set_markup ($markup);
1492 1604
1605 delete $self->{size_req};
1493 $self->realloc; 1606 $self->realloc;
1494 $self->update; 1607 $self->update;
1495} 1608}
1496 1609
1497sub size_request { 1610sub size_request {
1498 my ($self) = @_; 1611 my ($self) = @_;
1499 1612
1613 $self->{size_req} ||= do {
1500 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1614 $self->{layout}->set_font ($self->{font}) if $self->{font};
1501 $self->{layout}->set_width ($self->{max_w} || -1); 1615 $self->{layout}->set_width ($self->{max_w} || -1);
1502 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1616 $self->{layout}->set_ellipsise ($self->{ellipsise});
1503 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1617 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1504 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1505 1619
1506 my ($w, $h) = $self->{layout}->size; 1620 my ($w, $h) = $self->{layout}->size;
1507 1621
1508 if (exists $self->{template}) { 1622 if (exists $self->{template}) {
1509 $self->{template}->set_font ($self->{font}) if $self->{font}; 1623 $self->{template}->set_font ($self->{font}) if $self->{font};
1510 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1511 1625
1512 my ($w2, $h2) = $self->{template}->size; 1626 my ($w2, $h2) = $self->{template}->size;
1513 1627
1514 $w = List::Util::max $w, $w2; 1628 $w = List::Util::max $w, $w2;
1515 $h = List::Util::max $h, $h2; 1629 $h = List::Util::max $h, $h2;
1630 }
1631
1632 [$w, $h]
1516 } 1633 };
1517 1634
1518 ($w, $h) 1635 @{ $self->{size_req} }
1519} 1636}
1520 1637
1638sub baseline_shift {
1639 $_[0]{layout}->descent
1640}
1641
1521sub size_allocate { 1642sub invoke_size_allocate {
1522 my ($self, $w, $h, $changed) = @_; 1643 my ($self, $w, $h) = @_;
1644
1645 delete $self->{ox};
1523 1646
1524 delete $self->{texture} 1647 delete $self->{texture}
1525 if $changed; 1648 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1649
1650 1
1526} 1651}
1527 1652
1528sub set_fontsize { 1653sub set_fontsize {
1529 my ($self, $fontsize) = @_; 1654 my ($self, $fontsize) = @_;
1530 1655
1531 $self->{fontsize} = $fontsize; 1656 $self->{fontsize} = $fontsize;
1532 delete $self->{texture}; 1657 delete $self->{texture};
1533 1658
1534 $self->realloc; 1659 $self->realloc;
1660}
1661
1662sub reconfigure {
1663 my ($self) = @_;
1664
1665 delete $self->{size_req};
1666
1667 $self->SUPER::reconfigure;
1535} 1668}
1536 1669
1537sub _draw { 1670sub _draw {
1538 my ($self) = @_; 1671 my ($self) = @_;
1539 1672
… …
1545 $self->{layout}->set_width ($self->{w}); 1678 $self->{layout}->set_width ($self->{w});
1546 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1679 $self->{layout}->set_ellipsise ($self->{ellipsise});
1547 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1680 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1548 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1681 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1549 1682
1550 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1683 new_from_layout CFClient::Texture $self->{layout}
1684 };
1551 1685
1686 unless (exists $self->{ox}) {
1552 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1687 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1553 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1688 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1554 : ($self->{w} - $tex->{w}) * 0.5); 1689 : ($self->{w} - $tex->{w}) * 0.5);
1555 1690
1556 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1691 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1557 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1692 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1558 : ($self->{h} - $tex->{h}) * 0.5); 1693 : ($self->{h} - $tex->{h}) * 0.5);
1559
1560 $tex
1561 }; 1694 };
1562 1695
1563 glEnable GL_TEXTURE_2D; 1696 glEnable GL_TEXTURE_2D;
1564 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1697
1698 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1699 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1565 1700
1566 if ($tex->{format} == GL_ALPHA) { 1701 if ($tex->{format} == GL_ALPHA) {
1702 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1567 glColor @{$self->{fg}}; 1703 glColor @{$self->{fg}};
1568 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1704 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1569 } else { 1705 } else {
1706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1570 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1707 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1571 } 1708 }
1572 1709
1573 glDisable GL_TEXTURE_2D; 1710 glDisable GL_TEXTURE_2D;
1574} 1711}
1575 1712
… …
1592 can_hover => 1, 1729 can_hover => 1,
1593 can_focus => 1, 1730 can_focus => 1,
1594 valign => 0, 1731 valign => 0,
1595 can_events => 1, 1732 can_events => 1,
1596 #text => ... 1733 #text => ...
1734 #hidden => "*",
1597 @_ 1735 @_
1598 ) 1736 )
1599} 1737}
1600 1738
1601sub _set_text { 1739sub _set_text {
… …
1603 1741
1604 delete $self->{cur_h}; 1742 delete $self->{cur_h};
1605 1743
1606 return if $self->{text} eq $text; 1744 return if $self->{text} eq $text;
1607 1745
1608 delete $self->{texture};
1609
1610 $self->{last_activity} = $::NOW; 1746 $self->{last_activity} = $::NOW;
1611 $self->{text} = $text; 1747 $self->{text} = $text;
1612 1748
1613 $text =~ s/./*/g if $self->{hidden}; 1749 $text =~ s/./*/g if $self->{hidden};
1614 $self->{layout}->set_text ("$text "); 1750 $self->{layout}->set_text ("$text ");
1751 delete $self->{size_req};
1615 1752
1616 $self->_emit (changed => $self->{text}); 1753 $self->emit (changed => $self->{text});
1754
1755 $self->realloc;
1756 $self->update;
1617} 1757}
1618 1758
1619sub set_text { 1759sub set_text {
1620 my ($self, $text) = @_; 1760 my ($self, $text) = @_;
1621 1761
1622 $self->{cursor} = length $text; 1762 $self->{cursor} = length $text;
1623 $self->_set_text ($text); 1763 $self->_set_text ($text);
1624
1625 $self->realloc;
1626} 1764}
1627 1765
1628sub get_text { 1766sub get_text {
1629 $_[0]{text} 1767 $_[0]{text}
1630} 1768}
… …
1635 my ($w, $h) = $self->SUPER::size_request; 1773 my ($w, $h) = $self->SUPER::size_request;
1636 1774
1637 ($w + 1, $h) # add 1 for cursor 1775 ($w + 1, $h) # add 1 for cursor
1638} 1776}
1639 1777
1640sub key_down { 1778sub invoke_key_down {
1641 my ($self, $ev) = @_; 1779 my ($self, $ev) = @_;
1642 1780
1643 my $mod = $ev->{mod}; 1781 my $mod = $ev->{mod};
1644 my $sym = $ev->{sym}; 1782 my $sym = $ev->{sym};
1645 my $uni = $ev->{unicode}; 1783 my $uni = $ev->{unicode};
… …
1657 } elsif ($sym == CFClient::SDLK_HOME) { 1795 } elsif ($sym == CFClient::SDLK_HOME) {
1658 $self->{cursor} = 0; 1796 $self->{cursor} = 0;
1659 } elsif ($sym == CFClient::SDLK_END) { 1797 } elsif ($sym == CFClient::SDLK_END) {
1660 $self->{cursor} = length $text; 1798 $self->{cursor} = length $text;
1661 } elsif ($uni == 27) { 1799 } elsif ($uni == 27) {
1662 $self->_emit ('escape'); 1800 $self->emit ('escape');
1663 } elsif ($uni) { 1801 } elsif ($uni) {
1664 substr $text, $self->{cursor}++, 0, chr $uni; 1802 substr $text, $self->{cursor}++, 0, chr $uni;
1803 } else {
1804 return 0;
1665 } 1805 }
1666 1806
1667 $self->_set_text ($text); 1807 $self->_set_text ($text);
1668 1808
1669 $self->realloc; 1809 $self->realloc;
1670}
1671 1810
1811 1
1812}
1813
1672sub focus_in { 1814sub invoke_focus_in {
1673 my ($self) = @_; 1815 my ($self) = @_;
1674 1816
1675 $self->{last_activity} = $::NOW; 1817 $self->{last_activity} = $::NOW;
1676 1818
1677 $self->SUPER::focus_in; 1819 $self->SUPER::invoke_focus_in
1678} 1820}
1679 1821
1680sub button_down { 1822sub invoke_button_down {
1681 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1682 1824
1683 $self->SUPER::button_down ($ev, $x, $y); 1825 $self->SUPER::invoke_button_down ($ev, $x, $y);
1684 1826
1685 my $idx = $self->{layout}->xy_to_index ($x, $y); 1827 my $idx = $self->{layout}->xy_to_index ($x, $y);
1686 1828
1687 # byte-index to char-index 1829 # byte-index to char-index
1688 my $text = $self->{text}; 1830 my $text = $self->{text};
1689 utf8::encode $text; 1831 utf8::encode $text;
1690 $self->{cursor} = length substr $text, 0, $idx; 1832 $self->{cursor} = length substr $text, 0, $idx;
1691 1833
1692 $self->_set_text ($self->{text}); 1834 $self->_set_text ($self->{text});
1693 $self->update; 1835 $self->update;
1836
1837 1
1694} 1838}
1695 1839
1696sub mouse_motion { 1840sub invoke_mouse_motion {
1697 my ($self, $ev, $x, $y) = @_; 1841 my ($self, $ev, $x, $y) = @_;
1698# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1842# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1843
1844 1
1699} 1845}
1700 1846
1701sub _draw { 1847sub _draw {
1702 my ($self) = @_; 1848 my ($self) = @_;
1703 1849
1704 local $self->{fg} = $self->{fg}; 1850 local $self->{fg} = $self->{fg};
1705 1851
1706 if ($FOCUS == $self) { 1852 if ($FOCUS == $self) {
1707 glColor @{$self->{active_bg}}; 1853 glColor_premultiply @{$self->{active_bg}};
1708 $self->{fg} = $self->{active_fg}; 1854 $self->{fg} = $self->{active_fg};
1709 } else { 1855 } else {
1710 glColor @{$self->{bg}}; 1856 glColor_premultiply @{$self->{bg}};
1711 } 1857 }
1712 1858
1713 glEnable GL_BLEND; 1859 glEnable GL_BLEND;
1714 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1860 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1715 glBegin GL_QUADS; 1861 glBegin GL_QUADS;
1716 glVertex 0 , 0; 1862 glVertex 0 , 0;
1717 glVertex 0 , $self->{h}; 1863 glVertex 0 , $self->{h};
1718 glVertex $self->{w}, $self->{h}; 1864 glVertex $self->{w}, $self->{h};
1719 glVertex $self->{w}, 0; 1865 glVertex $self->{w}, 0;
… …
1744 1890
1745our @ISA = CFClient::UI::EntryBase::; 1891our @ISA = CFClient::UI::EntryBase::;
1746 1892
1747use CFClient::OpenGL; 1893use CFClient::OpenGL;
1748 1894
1749sub key_down { 1895sub invoke_key_down {
1750 my ($self, $ev) = @_; 1896 my ($self, $ev) = @_;
1751 1897
1752 my $sym = $ev->{sym}; 1898 my $sym = $ev->{sym};
1753 1899
1754 if ($sym == 13) { 1900 if ($sym == 13) {
1755 unshift @{$self->{history}}, 1901 unshift @{$self->{history}},
1756 my $txt = $self->get_text; 1902 my $txt = $self->get_text;
1903
1757 $self->{history_pointer} = -1; 1904 $self->{history_pointer} = -1;
1758 $self->{history_saveback} = ''; 1905 $self->{history_saveback} = '';
1759 $self->_emit (activate => $txt); 1906 $self->emit (activate => $txt);
1760 $self->update; 1907 $self->update;
1761 1908
1762 } elsif ($sym == CFClient::SDLK_UP) { 1909 } elsif ($sym == CFClient::SDLK_UP) {
1763 if ($self->{history_pointer} < 0) { 1910 if ($self->{history_pointer} < 0) {
1764 $self->{history_saveback} = $self->get_text; 1911 $self->{history_saveback} = $self->get_text;
… …
1780 } else { 1927 } else {
1781 $self->set_text ($self->{history_saveback}); 1928 $self->set_text ($self->{history_saveback});
1782 } 1929 }
1783 1930
1784 } else { 1931 } else {
1785 $self->SUPER::key_down ($ev); 1932 return $self->SUPER::invoke_key_down ($ev)
1933 }
1934
1786 } 1935 1
1787
1788} 1936}
1789 1937
1790############################################################################# 1938#############################################################################
1791 1939
1792package CFClient::UI::Button; 1940package CFClient::UI::Button;
… …
1813 can_events => 1, 1961 can_events => 1,
1814 @_ 1962 @_
1815 ) 1963 )
1816} 1964}
1817 1965
1818sub activate { }
1819
1820sub button_up { 1966sub invoke_button_up {
1821 my ($self, $ev, $x, $y) = @_; 1967 my ($self, $ev, $x, $y) = @_;
1822 1968
1823 $self->emit ("activate") 1969 $self->emit ("activate")
1824 if $x >= 0 && $x < $self->{w} 1970 if $x >= 0 && $x < $self->{w}
1825 && $y >= 0 && $y < $self->{h}; 1971 && $y >= 0 && $y < $self->{h};
1972
1973 1
1826} 1974}
1827 1975
1828sub _draw { 1976sub _draw {
1829 my ($self) = @_; 1977 my ($self) = @_;
1830 1978
1831 local $self->{fg} = $self->{fg}; 1979 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1832
1833 if ($GRAB == $self) {
1834 $self->{fg} = $self->{active_fg};
1835 }
1836 1980
1837 glEnable GL_TEXTURE_2D; 1981 glEnable GL_TEXTURE_2D;
1838 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1839 glColor 0, 0, 0, 1; 1983 glColor 0, 0, 0, 1;
1840 1984
1841 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1985 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1842 1986
1843 glDisable GL_TEXTURE_2D; 1987 glDisable GL_TEXTURE_2D;
1844 1988
1845 $self->SUPER::_draw; 1989 $self->SUPER::_draw;
1990}
1991
1992#############################################################################
1993
1994package CFClient::UI::ImageButton;
1995
1996our @ISA = CFClient::UI::Image::;
1997
1998use CFClient::OpenGL;
1999
2000my %textures;
2001
2002sub new {
2003 my $class = shift;
2004
2005 my $self = $class->SUPER::new (
2006 padding_x => 4,
2007 padding_y => 4,
2008 fg => [1, 1, 1],
2009 active_fg => [0, 0, 1],
2010 can_hover => 1,
2011 align => 0,
2012 valign => 0,
2013 can_events => 1,
2014 @_
2015 );
2016}
2017
2018sub invoke_button_up {
2019 my ($self, $ev, $x, $y) = @_;
2020
2021 $self->emit ("activate")
2022 if $x >= 0 && $x < $self->{w}
2023 && $y >= 0 && $y < $self->{h};
2024
2025 1
1846} 2026}
1847 2027
1848############################################################################# 2028#############################################################################
1849 2029
1850package CFClient::UI::CheckBox; 2030package CFClient::UI::CheckBox;
… …
1877 my ($self) = @_; 2057 my ($self) = @_;
1878 2058
1879 (6) x 2 2059 (6) x 2
1880} 2060}
1881 2061
1882sub button_down { 2062sub invoke_button_down {
1883 my ($self, $ev, $x, $y) = @_; 2063 my ($self, $ev, $x, $y) = @_;
1884 2064
1885 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2065 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1886 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2066 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1887 $self->{state} = !$self->{state}; 2067 $self->{state} = !$self->{state};
1888 $self->_emit (changed => $self->{state}); 2068 $self->emit (changed => $self->{state});
2069 } else {
2070 return 0
2071 }
2072
1889 } 2073 1
1890} 2074}
1891 2075
1892sub _draw { 2076sub _draw {
1893 my ($self) = @_; 2077 my ($self) = @_;
1894 2078
… …
1914package CFClient::UI::Image; 2098package CFClient::UI::Image;
1915 2099
1916our @ISA = CFClient::UI::Base::; 2100our @ISA = CFClient::UI::Base::;
1917 2101
1918use CFClient::OpenGL; 2102use CFClient::OpenGL;
1919use Carp qw/confess/;
1920 2103
1921our %loaded_images; 2104our %texture_cache;
1922 2105
1923sub new { 2106sub new {
1924 my $class = shift; 2107 my $class = shift;
1925 2108
1926 my $self = $class->SUPER::new (can_events => 0, @_); 2109 my $self = $class->SUPER::new (
2110 can_events => 0,
2111 @_,
2112 );
1927 2113
1928 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2114 $self->{path}
2115 or Carp::croak "required attribute 'path' not set";
1929 2116
1930 $loaded_images{$self->{image}} ||= 2117 $self->{tex} = $texture_cache{$self->{path}} ||=
1931 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2118 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1932 2119
1933 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2120 Scalar::Util::weaken $texture_cache{$self->{path}};
1934 2121
1935 Scalar::Util::weaken $loaded_images{$self->{image}}; 2122 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1936
1937 $self->{aspect} = $tex->{w} / $tex->{h};
1938 2123
1939 $self 2124 $self
1940} 2125}
1941 2126
1942sub size_request { 2127sub size_request {
1943 my ($self) = @_; 2128 my ($self) = @_;
1944 2129
1945 ($self->{tex}->{w}, $self->{tex}->{h}) 2130 ($self->{tex}{w}, $self->{tex}{h})
1946} 2131}
1947 2132
1948sub _draw { 2133sub _draw {
1949 my ($self) = @_; 2134 my ($self) = @_;
1950 2135
… …
2061 2246
2062 my $h1 = $self->{h} * (1 - $ycut1); 2247 my $h1 = $self->{h} * (1 - $ycut1);
2063 my $h2 = $self->{h} * (1 - $ycut2); 2248 my $h2 = $self->{h} * (1 - $ycut2);
2064 2249
2065 glEnable GL_BLEND; 2250 glEnable GL_BLEND;
2066 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2251 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2252 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2067 glEnable GL_TEXTURE_2D; 2253 glEnable GL_TEXTURE_2D;
2068 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2254 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2069 2255
2070 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2256 glBindTexture GL_TEXTURE_2D, $t1->{name};
2071 glBegin GL_QUADS; 2257 glBegin GL_QUADS;
… …
2185 $self->update; 2371 $self->update;
2186 2372
2187 $self 2373 $self
2188} 2374}
2189 2375
2190sub changed { }
2191
2192sub set_range { 2376sub set_range {
2193 my ($self, $range) = @_; 2377 my ($self, $range) = @_;
2194 2378
2195 ($range, $self->{range}) = ($self->{range}, $range); 2379 ($range, $self->{range}) = ($self->{range}, $range);
2196 2380
2197 $self->update
2198 if "@$range" ne "@{$self->{range}}"; 2381 if ("@$range" ne "@{$self->{range}}") {
2382 $self->update;
2383 $self->set_value ($self->{range}[0]);
2384 }
2199} 2385}
2200 2386
2201sub set_value { 2387sub set_value {
2202 my ($self, $value) = @_; 2388 my ($self, $value) = @_;
2203 2389
… …
2214 if $unit; 2400 if $unit;
2215 2401
2216 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2402 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2217 2403
2218 if ($value != $old_value) { 2404 if ($value != $old_value) {
2219 $self->_emit (changed => $value); 2405 $self->emit (changed => $value);
2220 $self->update; 2406 $self->update;
2221 } 2407 }
2222} 2408}
2223 2409
2224sub size_request { 2410sub size_request {
2225 my ($self) = @_; 2411 my ($self) = @_;
2226 2412
2227 ($self->{req_w}, $self->{req_h}) 2413 ($self->{req_w}, $self->{req_h})
2228} 2414}
2229 2415
2230sub button_down { 2416sub invoke_button_down {
2231 my ($self, $ev, $x, $y) = @_; 2417 my ($self, $ev, $x, $y) = @_;
2232 2418
2233 $self->SUPER::button_down ($ev, $x, $y); 2419 $self->SUPER::invoke_button_down ($ev, $x, $y);
2234 2420
2235 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2421 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2236 2422
2237 $self->mouse_motion ($ev, $x, $y); 2423 $self->invoke_mouse_motion ($ev, $x, $y)
2238} 2424}
2239 2425
2240sub mouse_motion { 2426sub invoke_mouse_motion {
2241 my ($self, $ev, $x, $y) = @_; 2427 my ($self, $ev, $x, $y) = @_;
2242 2428
2243 if ($GRAB == $self) { 2429 if ($GRAB == $self) {
2244 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2430 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2245 2431
2246 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2432 my (undef, $lo, $hi, $page) = @{$self->{range}};
2247 2433
2248 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2434 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2249 2435
2250 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2436 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2437 } else {
2438 return 0;
2439 }
2440
2251 } 2441 1
2252} 2442}
2253 2443
2254sub update { 2444sub update {
2255 my ($self) = @_; 2445 my ($self) = @_;
2256 2446
2257 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2447 delete $self->{knob_w};
2448 $self->SUPER::update;
2449}
2450
2451sub _draw {
2452 my ($self) = @_;
2453
2454 unless ($self->{knob_w}) {
2258 $self->set_value ($self->{range}[0]); 2455 $self->set_value ($self->{range}[0]);
2259 2456
2260 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2457 my ($value, $lo, $hi, $page) = @{$self->{range}};
2261 my $range = ($hi - $page - $lo) || 1e-100; 2458 my $range = ($hi - $page - $lo) || 1e-100;
2262 2459
… …
2268 $value = ($value - $lo) / $range; 2465 $value = ($value - $lo) / $range;
2269 $value = $value * $self->{scale} + $self->{offset}; 2466 $value = $value * $self->{scale} + $self->{offset};
2270 2467
2271 $self->{knob_x} = $value - $knob_w * 0.5; 2468 $self->{knob_x} = $value - $knob_w * 0.5;
2272 $self->{knob_w} = $knob_w; 2469 $self->{knob_w} = $knob_w;
2273 }); 2470 }
2274
2275 $self->SUPER::update;
2276}
2277
2278sub _draw {
2279 my ($self) = @_;
2280 2471
2281 $self->SUPER::_draw (); 2472 $self->SUPER::_draw ();
2282 2473
2283 glScale $self->{w}, $self->{h}; 2474 glScale $self->{w}, $self->{h};
2284 2475
… …
2345sub set_range { shift->{slider}->set_range (@_) } 2536sub set_range { shift->{slider}->set_range (@_) }
2346sub set_value { shift->{slider}->set_value (@_) } 2537sub set_value { shift->{slider}->set_value (@_) }
2347 2538
2348############################################################################# 2539#############################################################################
2349 2540
2350package CFClient::UI::TextView; 2541package CFClient::UI::TextScroller;
2351 2542
2352our @ISA = CFClient::UI::HBox::; 2543our @ISA = CFClient::UI::HBox::;
2353 2544
2354use CFClient::OpenGL; 2545use CFClient::OpenGL;
2355 2546
… …
2357 my $class = shift; 2548 my $class = shift;
2358 2549
2359 my $self = $class->SUPER::new ( 2550 my $self = $class->SUPER::new (
2360 fontsize => 1, 2551 fontsize => 1,
2361 can_events => 0, 2552 can_events => 0,
2553 indent => 0,
2362 #font => default_font 2554 #font => default_font
2363 @_, 2555 @_,
2364 2556
2365 layout => (new CFClient::Layout 1), 2557 layout => (new CFClient::Layout 1),
2366 par => [], 2558 par => [],
… …
2381 2573
2382 $self->{fontsize} = $fontsize; 2574 $self->{fontsize} = $fontsize;
2383 $self->reflow; 2575 $self->reflow;
2384} 2576}
2385 2577
2578sub size_request {
2579 my ($self) = @_;
2580
2581 my ($empty, $slider) = @{ $self->{children} };
2582
2583 local $self->{children} = [$empty, $slider];
2584 $self->SUPER::size_request
2585}
2586
2386sub size_allocate { 2587sub invoke_size_allocate {
2387 my ($self, $w, $h, $changed) = @_; 2588 my ($self, $w, $h) = @_;
2388 2589
2389 $self->SUPER::size_allocate ($w, $h, $changed); 2590 my ($empty, $slider, @other) = @{ $self->{children} };
2390 2591 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2391 return unless $changed;
2392 2592
2393 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2593 $self->{layout}->set_font ($self->{font}) if $self->{font};
2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2594 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395 $self->{layout}->set_width ($self->{children}[0]{w}); 2595 $self->{layout}->set_width ($empty->{w});
2596 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2396 2597
2397 $self->reflow; 2598 $self->reflow;
2398}
2399 2599
2400sub text_size { 2600 local $self->{children} = [$empty, $slider];
2401 my ($self, $text, $indent) = @_; 2601 $self->SUPER::invoke_size_allocate ($w, $h)
2602}
2603
2604sub get_layout {
2605 my ($self, $para) = @_;
2402 2606
2403 my $layout = $self->{layout}; 2607 my $layout = $self->{layout};
2404 2608
2609 $layout->set_font ($self->{font}) if $self->{font};
2610 $layout->set_foreground (@{$para->{fg}});
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2611 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406 $layout->set_width ($self->{children}[0]{w} - $indent); 2612 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2613 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2407 $layout->set_markup ($text); 2614 $layout->set_markup ($para->{markup});
2615
2616 $layout->set_shapes (
2617 map
2618 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2619 @{$para->{widget}}
2408 2620 );
2621
2409 $layout->size 2622 $layout
2410} 2623}
2411 2624
2412sub reflow { 2625sub reflow {
2413 my ($self) = @_; 2626 my ($self) = @_;
2414 2627
… …
2423 $self->{children}[1]->set_value ($offset); 2636 $self->{children}[1]->set_value ($offset);
2424} 2637}
2425 2638
2426sub clear { 2639sub clear {
2427 my ($self) = @_; 2640 my ($self) = @_;
2641
2642 my (undef, undef, @other) = @{ $self->{children} };
2643 $self->remove ($_) for @other;
2428 2644
2429 $self->{par} = []; 2645 $self->{par} = [];
2430 $self->{height} = 0; 2646 $self->{height} = 0;
2431 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2647 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2432} 2648}
2433 2649
2434sub add_paragraph { 2650sub add_paragraph {
2435 my ($self, $color, $text, $indent) = @_; 2651 my ($self, $color, $para, $indent) = @_;
2436 2652
2437 for my $line (split /\n/, $text) { 2653 my ($text, @w) = ref $para ? @$para : $para;
2438 my ($w, $h) = $self->text_size ($line); 2654
2439 $self->{height} += $h; 2655 $para = {
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2656 w => 1e10,
2657 wrapped => 1,
2658 fg => $color,
2659 indent => $indent,
2660 markup => $text,
2661 widget => \@w,
2441 } 2662 };
2442 2663
2443 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2664 $self->add (@w) if @w;
2665 push @{$self->{par}}, $para;
2666
2667 $self->{need_reflow}++;
2668 $self->update;
2669}
2670
2671sub scroll_to_bottom {
2672 my ($self) = @_;
2673
2674 $self->{scroll_to_bottom} = 1;
2675 $self->update;
2444} 2676}
2445 2677
2446sub update { 2678sub update {
2447 my ($self) = @_; 2679 my ($self) = @_;
2448 2680
… …
2450 2682
2451 return unless $self->{h} > 0; 2683 return unless $self->{h} > 0;
2452 2684
2453 delete $self->{texture}; 2685 delete $self->{texture};
2454 2686
2455 $ROOT->on_post_alloc ($self, sub { 2687 $ROOT->on_post_alloc ($self => sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2688 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457 2689
2458 if (delete $self->{need_reflow}) { 2690 if (delete $self->{need_reflow}) {
2459 my $height = 0; 2691 my $height = 0;
2460 2692
2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2465 for (@{$self->{par}}) { 2693 for my $para (@{$self->{par}}) {
2466 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2694 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2467 $layout->set_width ($W - $_->[3]); 2695 my $layout = $self->get_layout ($para);
2468 $layout->set_markup ($_->[4]);
2469 my ($w, $h) = $layout->size; 2696 my ($w, $h) = $layout->size;
2470 $_->[0] = $w + $_->[3]; 2697
2471 $_->[1] = $h; 2698 $para->{w} = $w + $para->{indent};
2699 $para->{h} = $h;
2700 $para->{wrapped} = $layout->has_wrapped;
2472 } 2701 }
2473 2702
2474 $height += $_->[1]; 2703 $height += $para->{h};
2475 } 2704 }
2476 2705
2477 $self->{height} = $height; 2706 $self->{height} = $height;
2478 2707
2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2708 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2480 2709
2481 delete $self->{texture}; 2710 delete $self->{texture};
2482 } 2711 }
2483 2712
2713 if (delete $self->{scroll_to_bottom}) {
2714 $self->{children}[1]->set_value (1e10);
2715 }
2716
2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2717 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2485 glClearColor 0.5, 0.5, 0.5, 0; 2718 glClearColor 0, 0, 0, 0;
2486 glClear GL_COLOR_BUFFER_BIT; 2719 glClear GL_COLOR_BUFFER_BIT;
2487 2720
2488 my $top = int $self->{children}[1]{range}[0]; 2721 my $top = int $self->{children}[1]{range}[0];
2489 2722
2490 my $y0 = $top; 2723 my $y0 = $top;
2491 my $y1 = $top + $H; 2724 my $y1 = $top + $H;
2492 2725
2493 my $y = 0; 2726 my $y = 0;
2494
2495 my $layout = $self->{layout};
2496
2497 $layout->set_font ($self->{font}) if $self->{font};
2498 2727
2499 glEnable GL_BLEND; 2728 glEnable GL_BLEND;
2500 #TODO# not correct in windows where rgba is forced off 2729 #TODO# not correct in windows where rgba is forced off
2501 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2730 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2502 2731
2503 for my $par (@{$self->{par}}) { 2732 for my $para (@{$self->{par}}) {
2504 my $h = $par->[1]; 2733 my $h = $para->{h};
2505 2734
2506 if ($y0 < $y + $h && $y < $y1) { 2735 if ($y0 < $y + $h && $y < $y1) {
2507 $layout->set_foreground (@{ $par->[2] }); 2736
2508 $layout->set_width ($W - $par->[3]); 2737 my $layout = $self->get_layout ($para);
2509 $layout->set_markup ($par->[4]);
2510 2738
2511 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2739 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2512 2740
2513 glRasterPos $par->[3], $y - $y0; 2741 glRasterPos $para->{indent}, $y - $y0;
2514 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2742 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2743
2744 if (my @w = @{ $para->{widget} }) {
2745 my @s = $layout->get_shapes;
2746
2747 for (@w) {
2748 my ($dx, $dy) = splice @s, 0, 2, ();
2749
2750 $_->{x} = $dx + $para->{indent};
2751 $_->{y} = $dy + $y - $y0;
2752
2753 $_->draw;
2754 }
2755 }
2515 } 2756 }
2516 2757
2517 $y += $h; 2758 $y += $h;
2518 } 2759 }
2519 2760
2520 glDisable GL_BLEND; 2761 glDisable GL_BLEND;
2521 }; 2762 };
2522 }); 2763 });
2523} 2764}
2524 2765
2766sub reconfigure {
2767 my ($self) = @_;
2768
2769 $self->SUPER::reconfigure;
2770
2771 $_->{w} = 1e10 for @{ $self->{par} };
2772 $self->reflow;
2773}
2774
2525sub _draw { 2775sub _draw {
2526 my ($self) = @_; 2776 my ($self) = @_;
2527 2777
2528 glEnable GL_TEXTURE_2D; 2778 glEnable GL_TEXTURE_2D;
2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2779 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530 glColor 1, 1, 1, 1; 2780 glColor 0, 0, 0, 1;
2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2781 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2532 glDisable GL_TEXTURE_2D; 2782 glDisable GL_TEXTURE_2D;
2533 2783
2534 $self->{children}[1]->draw; 2784 $self->{children}[1]->draw;
2535
2536} 2785}
2537 2786
2538############################################################################# 2787#############################################################################
2539 2788
2540package CFClient::UI::Animator; 2789package CFClient::UI::Animator;
… …
2619} 2868}
2620 2869
2621sub set_tooltip_from { 2870sub set_tooltip_from {
2622 my ($self, $widget) = @_; 2871 my ($self, $widget) = @_;
2623 2872
2873 my $tooltip = $widget->{tooltip};
2874
2875 if ($ENV{CFPLUS_DEBUG} & 2) {
2876 $tooltip .= "\n\n" . (ref $widget) . "\n"
2877 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2878 . "req $widget->{req_w} $widget->{req_h}\n"
2879 . "visible $widget->{visible}";
2880 }
2881
2882 $tooltip =~ s/^\n+//;
2883 $tooltip =~ s/\n+$//;
2884
2624 $self->add (new CFClient::UI::Label 2885 $self->add (new CFClient::UI::Label
2625 markup => $widget->{tooltip}, 2886 markup => $tooltip,
2626 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2887 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2627 fontsize => 0.8, 2888 fontsize => 0.8,
2628 fg => [0, 0, 0, 1], 2889 fg => [0, 0, 0, 1],
2629 ellipsise => 0, 2890 ellipsise => 0,
2630 font => ($widget->{tooltip_font} || $::FONT_PROP), 2891 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2637 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2898 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2638 2899
2639 ($w + 4, $h + 4) 2900 ($w + 4, $h + 4)
2640} 2901}
2641 2902
2642sub size_allocate { 2903sub invoke_size_allocate {
2643 my ($self, $w, $h, $changed) = @_; 2904 my ($self, $w, $h) = @_;
2644 2905
2645 return unless $changed;
2646
2647 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2906 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2648} 2907}
2649 2908
2650sub visibility_change { 2909sub invoke_visibility_change {
2651 my ($self, $visible) = @_; 2910 my ($self, $visible) = @_;
2652 2911
2653 return unless $visible; 2912 return unless $visible;
2654 2913
2655 $self->{root}->on_post_alloc ("move_$self" => sub { 2914 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2657 or return; 2916 or return;
2658 2917
2659 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2918 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2660 2919
2661 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2920 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2662 if $x + $self->{w} > $::WIDTH; 2921 if $x + $self->{w} > $self->{root}{w};
2663 2922
2664 $self->move_abs ($x, $y); 2923 $self->move_abs ($x, $y);
2665 }); 2924 });
2666} 2925}
2667 2926
… …
2756 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3015 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2757 3016
2758 if ($tex) { 3017 if ($tex) {
2759 glEnable GL_TEXTURE_2D; 3018 glEnable GL_TEXTURE_2D;
2760 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3019 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2761 glColor 1, 1, 1, 1; 3020 glColor 0, 0, 0, 1;
2762 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3021 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2763 glDisable GL_TEXTURE_2D; 3022 glDisable GL_TEXTURE_2D;
2764 } 3023 }
2765} 3024}
2766 3025
2767sub DESTROY { 3026sub destroy {
2768 my ($self) = @_; 3027 my ($self) = @_;
2769 3028
2770 $self->{timer}->cancel 3029 $self->{timer}->cancel
2771 if $self->{timer}; 3030 if $self->{timer};
2772 3031
2773 $self->SUPER::DESTROY; 3032 $self->SUPER::destroy;
2774} 3033}
2775 3034
2776############################################################################# 3035#############################################################################
2777 3036
2778package CFClient::UI::Inventory; 3037package CFClient::UI::Buttonbar;
2779 3038
2780our @ISA = CFClient::UI::ScrolledWindow::; 3039our @ISA = CFClient::UI::HBox::;
2781 3040
2782sub new { 3041# 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 3042
2818############################################################################# 3043#############################################################################
2819 3044
2820package CFClient::UI::Menu; 3045package CFClient::UI::Menu;
2821 3046
… …
2833 ); 3058 );
2834 3059
2835 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3060 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2836 3061
2837 for my $item (@{ $self->{items} }) { 3062 for my $item (@{ $self->{items} }) {
2838 my ($widget, $cb) = @$item; 3063 my ($widget, $cb, $tooltip) = @$item;
2839 3064
2840 # handle various types of items, only text for now 3065 # handle various types of items, only text for now
2841 if (!ref $widget) { 3066 if (!ref $widget) {
2842 $widget = new CFClient::UI::Label 3067 $widget = new CFClient::UI::Label
2843 can_hover => 1, 3068 can_hover => 1,
2844 can_events => 1, 3069 can_events => 1,
2845 text => $widget; 3070 markup => $widget,
3071 tooltip => $tooltip
2846 } 3072 }
2847 3073
2848 $self->{item}{$widget} = $item; 3074 $self->{item}{$widget} = $item;
2849 3075
2850 $self->{vbox}->add ($widget); 3076 $self->{vbox}->add ($widget);
… …
2855 3081
2856# popup given the event (must be a mouse button down event currently) 3082# popup given the event (must be a mouse button down event currently)
2857sub popup { 3083sub popup {
2858 my ($self, $ev) = @_; 3084 my ($self, $ev) = @_;
2859 3085
2860 $self->_emit ("popdown"); 3086 $self->emit ("popdown");
2861 3087
2862 # maybe save $GRAB? must be careful about events... 3088 # maybe save $GRAB? must be careful about events...
2863 $GRAB = $self; 3089 $GRAB = $self;
2864 $self->{button} = $ev->{button}; 3090 $self->{button} = $ev->{button};
2865 3091
2866 $self->show; 3092 $self->show;
2867 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3093 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2868} 3094}
2869 3095
2870sub mouse_motion { 3096sub invoke_mouse_motion {
2871 my ($self, $ev, $x, $y) = @_; 3097 my ($self, $ev, $x, $y) = @_;
2872 3098
2873 # TODO: should use vbox->find_widget or so 3099 # TODO: should use vbox->find_widget or so
2874 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3100 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2875 $self->{hover} = $self->{item}{$HOVER}; 3101 $self->{hover} = $self->{item}{$HOVER};
2876}
2877 3102
3103 0
3104}
3105
2878sub button_up { 3106sub invoke_button_up {
2879 my ($self, $ev, $x, $y) = @_; 3107 my ($self, $ev, $x, $y) = @_;
2880 3108
2881 if ($ev->{button} == $self->{button}) { 3109 if ($ev->{button} == $self->{button}) {
2882 undef $GRAB; 3110 undef $GRAB;
2883 $self->hide; 3111 $self->hide;
2884 3112
2885 $self->_emit ("popdown"); 3113 $self->emit ("popdown");
2886 $self->{hover}[1]->() if $self->{hover}; 3114 $self->{hover}[1]->() if $self->{hover};
3115 } else {
3116 return 0
3117 }
3118
2887 } 3119 1
2888} 3120}
2889 3121
2890############################################################################# 3122#############################################################################
2891 3123
2892package CFClient::UI::Statusbox; 3124package CFClient::UI::Multiplexer;
2893 3125
2894our @ISA = CFClient::UI::VBox::; 3126our @ISA = CFClient::UI::Container::;
2895 3127
2896sub new { 3128sub new {
2897 my $class = shift; 3129 my $class = shift;
2898 3130
2899 $class->SUPER::new ( 3131 my $self = $class->SUPER::new (
3132 @_,
3133 );
3134
3135 $self->{current} = $self->{children}[0]
3136 if @{ $self->{children} };
3137
3138 $self
3139}
3140
3141sub add {
3142 my ($self, @widgets) = @_;
3143
3144 $self->SUPER::add (@widgets);
3145
3146 $self->{current} = $self->{children}[0]
3147 if @{ $self->{children} };
3148}
3149
3150sub set_current_page {
3151 my ($self, $page_or_widget) = @_;
3152
3153 my $widget = ref $page_or_widget
3154 ? $page_or_widget
3155 : $self->{children}[$page_or_widget];
3156
3157 $self->{current} = $widget;
3158 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3159
3160 $self->emit (page_changed => $self->{current});
3161
3162 $self->realloc;
3163}
3164
3165sub visible_children {
3166 $_[0]{current}
3167}
3168
3169sub size_request {
3170 my ($self) = @_;
3171
3172 $self->{current}->size_request
3173}
3174
3175sub invoke_size_allocate {
3176 my ($self, $w, $h) = @_;
3177
3178 $self->{current}->configure (0, 0, $w, $h);
3179
3180 1
3181}
3182
3183sub _draw {
3184 my ($self) = @_;
3185
3186 $self->{current}->draw;
3187}
3188
3189#############################################################################
3190
3191package CFClient::UI::Notebook;
3192
3193our @ISA = CFClient::UI::VBox::;
3194
3195sub new {
3196 my $class = shift;
3197
3198 my $self = $class->SUPER::new (
3199 buttonbar => (new CFClient::UI::Buttonbar),
3200 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3201 # filter => # will be put between multiplexer and $self
3202 @_,
3203 );
3204
3205 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3206 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3207
3208 $self
3209}
3210
3211sub add {
3212 my ($self, $title, $widget, $tooltip) = @_;
3213
3214 Scalar::Util::weaken $self;
3215
3216 $self->{buttonbar}->add (new CFClient::UI::Button
3217 markup => $title,
3218 tooltip => $tooltip,
3219 on_activate => sub { $self->set_current_page ($widget) },
3220 );
3221
3222 $self->{multiplexer}->add ($widget);
3223}
3224
3225sub set_current_page {
3226 my ($self, $page) = @_;
3227
3228 $self->{multiplexer}->set_current_page ($page);
3229 $self->emit (page_changed => $self->{multiplexer}{current});
3230}
3231
3232#############################################################################
3233
3234package CFClient::UI::Combobox;
3235
3236use utf8;
3237
3238our @ISA = CFClient::UI::Button::;
3239
3240sub new {
3241 my $class = shift;
3242
3243 my $self = $class->SUPER::new (
3244 options => [], # [value, title, longdesc], ...
3245 value => undef,
3246 @_,
3247 );
3248
3249 $self->_set_value ($self->{value});
3250
3251 $self
3252}
3253
3254sub invoke_button_down {
3255 my ($self, $ev) = @_;
3256
3257 my @menu_items;
3258
3259 for (@{ $self->{options} }) {
3260 my ($value, $title, $tooltip) = @$_;
3261
3262 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3263 }
3264
3265 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3266}
3267
3268sub _set_value {
3269 my ($self, $value) = @_;
3270
3271 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3272 or return;
3273
3274 $self->{value} = $item->[0];
3275 $self->set_markup ("$item->[1] ⇓");
3276 $self->set_tooltip ($item->[2]);
3277}
3278
3279sub set_value {
3280 my ($self, $value) = @_;
3281
3282 return unless $self->{value} ne $value;
3283
3284 $self->_set_value ($value);
3285 $self->emit (changed => $value);
3286}
3287
3288#############################################################################
3289
3290package CFClient::UI::Statusbox;
3291
3292our @ISA = CFClient::UI::VBox::;
3293
3294sub new {
3295 my $class = shift;
3296
3297 my $self = $class->SUPER::new (
2900 fontsize => 0.8, 3298 fontsize => 0.8,
2901 @_, 3299 @_,
2902 ) 3300 );
3301
3302 Scalar::Util::weaken (my $this = $self);
3303
3304 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3305
3306 $self
2903} 3307}
2904 3308
2905sub reorder { 3309sub reorder {
2906 my ($self) = @_; 3310 my ($self) = @_;
2907 my $NOW = time; 3311 my $NOW = Time::HiRes::time;
3312
3313 # freeze display when hovering over any label
3314 return if $CFClient::UI::TOOLTIP->{owner}
3315 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3316 values %{ $self->{item} };
2908 3317
2909 while (my ($k, $v) = each %{ $self->{item} }) { 3318 while (my ($k, $v) = each %{ $self->{item} }) {
2910 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3319 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2911 } 3320 }
2912 3321
… …
2915 my @items = sort { 3324 my @items = sort {
2916 $a->{pri} <=> $b->{pri} 3325 $a->{pri} <=> $b->{pri}
2917 or $b->{id} <=> $a->{id} 3326 or $b->{id} <=> $a->{id}
2918 } values %{ $self->{item} }; 3327 } values %{ $self->{item} };
2919 3328
3329 $self->{timer}->interval (1);
3330
2920 my $count = 10 + 1; 3331 my $count = 10 + 1;
2921 for my $item (@items) { 3332 for my $item (@items) {
2922 last unless --$count; 3333 last unless --$count;
2923 3334
2924 push @widgets, $item->{label} ||= do { 3335 my $label = $item->{label} ||= do {
2925 # TODO: doesn't handle markup well (read as: at all) 3336 # TODO: doesn't handle markup well (read as: at all)
2926 my $short = $item->{count} > 1 3337 my $short = $item->{count} > 1
2927 ? "<b>$item->{count} ×</b> $item->{text}" 3338 ? "<b>$item->{count} ×</b> $item->{text}"
2928 : $item->{text}; 3339 : $item->{text};
2929 3340
… …
2937 tooltip => $item->{tooltip}, 3348 tooltip => $item->{tooltip},
2938 tooltip_font => $::FONT_PROP, 3349 tooltip_font => $::FONT_PROP,
2939 tooltip_width => 0.67, 3350 tooltip_width => 0.67,
2940 fontsize => $item->{fontsize} || $self->{fontsize}, 3351 fontsize => $item->{fontsize} || $self->{fontsize},
2941 max_w => $::WIDTH * 0.44, 3352 max_w => $::WIDTH * 0.44,
2942 fg => $item->{fg}, 3353 fg => [@{ $item->{fg} }],
2943 can_events => 1, 3354 can_events => 1,
2944 can_hover => 1 3355 can_hover => 1
2945 }; 3356 };
3357
3358 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3359 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3360 $label->update;
3361 $label->set_max_size (undef, $label->{req_h} * $diff)
3362 if $diff < 1;
3363 $self->{timer}->interval (1/30);
3364 } else {
3365 $label->{fg}[3] = $item->{fg}[3] || 1;
3366 }
3367
3368 push @widgets, $label;
2946 } 3369 }
2947 3370
2948 $self->clear; 3371 $self->clear;
2949 $self->SUPER::add (reverse @widgets); 3372 $self->SUPER::add (reverse @widgets);
2950} 3373}
… …
2955 $text =~ s/^\s+//; 3378 $text =~ s/^\s+//;
2956 $text =~ s/\s+$//; 3379 $text =~ s/\s+$//;
2957 3380
2958 return unless $text; 3381 return unless $text;
2959 3382
2960 my $timeout = time + ((delete $arg{timeout}) || 60); 3383 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2961 3384
2962 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3385 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2963 3386
2964 if (my $item = $self->{item}{$group}) { 3387 if (my $item = $self->{item}{$group}) {
2965 if ($item->{text} eq $text) { 3388 if ($item->{text} eq $text) {
2966 $item->{count}++; 3389 $item->{count}++;
2967 } else { 3390 } else {
2968 $item->{count} = 1; 3391 $item->{count} = 1;
2969 $item->{text} = $item->{tooltip} = $text; 3392 $item->{text} = $item->{tooltip} = $text;
2970 } 3393 }
2971 $item->{id} = ++$self->{id}; 3394 $item->{id} += 0.2;#d#
2972 $item->{timeout} = $timeout; 3395 $item->{timeout} = $timeout;
2973 delete $item->{label}; 3396 delete $item->{label};
2974 } else { 3397 } else {
2975 $self->{item}{$group} = { 3398 $self->{item}{$group} = {
2976 id => ++$self->{id}, 3399 id => ++$self->{id},
… …
2995 3418
2996 $self->reorder; 3419 $self->reorder;
2997 $self->SUPER::reconfigure; 3420 $self->SUPER::reconfigure;
2998} 3421}
2999 3422
3423sub destroy {
3424 my ($self) = @_;
3425
3426 $self->{timer}->cancel;
3427
3428 $self->SUPER::destroy;
3429}
3430
3000############################################################################# 3431#############################################################################
3001 3432
3433package CFClient::UI::Inventory;
3434
3435our @ISA = CFClient::UI::ScrolledWindow::;
3436
3437sub new {
3438 my $class = shift;
3439
3440 my $self = $class->SUPER::new (
3441 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3442 @_,
3443 );
3444
3445 $self
3446}
3447
3448sub set_items {
3449 my ($self, $items) = @_;
3450
3451 $self->{child}->clear;
3452 return unless $items;
3453
3454 my @items = sort {
3455 ($a->{type} <=> $b->{type})
3456 or ($a->{name} cmp $b->{name})
3457 } @$items;
3458
3459 $self->{real_items} = \@items;
3460
3461 my $row = 0;
3462 for my $item (@items) {
3463 CFClient::Item::update_widgets $item;
3464
3465 $self->{child}->add (0, $row, $item->{face_widget});
3466 $self->{child}->add (1, $row, $item->{desc_widget});
3467 $self->{child}->add (2, $row, $item->{weight_widget});
3468
3469 $row++;
3470 }
3471}
3472
3473#############################################################################
3474
3475package CFClient::UI::BindEditor;
3476
3477our @ISA = CFClient::UI::FancyFrame::;
3478
3479sub new {
3480 my $class = shift;
3481
3482 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3483
3484 $self->add (my $vb = new CFClient::UI::VBox);
3485
3486
3487 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3488 text => "start recording",
3489 tooltip => "Start/Stops recording of actions."
3490 ."All subsequent actions after the recording started will be captured."
3491 ."The actions are displayed after the record was stopped."
3492 ."To bind the action you have to click on the 'Bind' button",
3493 on_activate => sub {
3494 unless ($self->{recording}) {
3495 $self->start;
3496 } else {
3497 $self->stop;
3498 }
3499 });
3500
3501 $vb->add (new CFClient::UI::Label text => "Actions:");
3502 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3503
3504 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3505 $vb->add (my $hb = new CFClient::UI::HBox);
3506 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3507 $hb->add (new CFClient::UI::Button
3508 text => "bind",
3509 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3510 on_activate => sub {
3511 $self->ask_for_bind;
3512 });
3513
3514 $vb->add (my $hb = new CFClient::UI::HBox);
3515 $hb->add (new CFClient::UI::Button
3516 text => "ok",
3517 expand => 1,
3518 tooltip => "This closes the binding editor and saves the binding",
3519 on_activate => sub {
3520 $self->hide;
3521 $self->commit;
3522 });
3523
3524 $hb->add (new CFClient::UI::Button
3525 text => "cancel",
3526 expand => 1,
3527 tooltip => "This closes the binding editor without saving",
3528 on_activate => sub {
3529 $self->hide;
3530 $self->{binding_cancel}->()
3531 if $self->{binding_cancel};
3532 });
3533
3534 $self->update_binding_widgets;
3535
3536 $self
3537}
3538
3539sub cfg_bind {
3540 my ($self, $mod, $sym, $cmds) = @_;
3541 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3542 ::update_bindings ();
3543}
3544
3545sub cfg_unbind {
3546 my ($self, $mod, $sym, $cmds) = @_;
3547 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3548 ::update_bindings ();
3549}
3550
3551sub commit {
3552 my ($self) = @_;
3553 my ($mod, $sym, $cmds) = $self->get_binding;
3554 if ($sym != 0 && @$cmds > 0) {
3555 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3556 ."'. Don't forget 'Save Config'!");
3557 $self->{binding_change}->($mod, $sym, $cmds)
3558 if $self->{binding_change};
3559 } else {
3560 $::STATUSBOX->add ("No action bound, no key or action specified!");
3561 $self->{binding_cancel}->()
3562 if $self->{binding_cancel};
3563 }
3564}
3565
3566sub start {
3567 my ($self) = @_;
3568
3569 $self->{rec_btn}->set_text ("stop recording");
3570 $self->{recording} = 1;
3571 $self->clear_command_list;
3572 $::CONN->start_record if $::CONN;
3573}
3574
3575sub stop {
3576 my ($self) = @_;
3577
3578 $self->{rec_btn}->set_text ("start recording");
3579 $self->{recording} = 0;
3580
3581 my $rec;
3582 $rec = $::CONN->stop_record if $::CONN;
3583 return unless ref $rec eq 'ARRAY';
3584 $self->set_command_list ($rec);
3585}
3586
3587
3588sub ask_for_bind_and_commit {
3589 my ($self) = @_;
3590 $self->ask_for_bind (1);
3591}
3592
3593sub ask_for_bind {
3594 my ($self, $commit, $end_cb) = @_;
3595
3596 CFClient::Binder::open_binding_dialog (sub {
3597 my ($mod, $sym) = @_;
3598 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3599 $self->update_binding_widgets;
3600 $self->commit if $commit;
3601 $end_cb->() if $end_cb;
3602 });
3603}
3604
3605# $mod and $sym are the modifiers and key symbol
3606# $cmds is a array ref of strings (the commands)
3607# $cb is the callback that is executed on OK
3608# $ccb is the callback that is executed on CANCEL and
3609# when the binding was unsuccessful on OK
3610sub set_binding {
3611 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3612
3613 $self->clear_command_list;
3614 $self->{recording} = 0;
3615 $self->{rec_btn}->set_text ("start recording");
3616
3617 $self->{binding} = [$mod, $sym];
3618 $self->{commands} = $cmds;
3619
3620 $self->{binding_change} = $cb;
3621 $self->{binding_cancel} = $ccb;
3622
3623 $self->update_binding_widgets;
3624}
3625
3626# this is a shortcut method that asks for a binding
3627# and then just binds it.
3628sub do_quick_binding {
3629 my ($self, $cmds, $end_cb) = @_;
3630 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3631 $self->ask_for_bind (1, $end_cb);
3632}
3633
3634sub update_binding_widgets {
3635 my ($self) = @_;
3636 my ($mod, $sym, $cmds) = $self->get_binding;
3637 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3638 $self->set_command_list ($cmds);
3639}
3640
3641sub get_binding {
3642 my ($self) = @_;
3643 return (
3644 $self->{binding}->[0],
3645 $self->{binding}->[1],
3646 [ grep { defined $_ } @{$self->{commands}} ]
3647 );
3648}
3649
3650sub clear_command_list {
3651 my ($self) = @_;
3652 $self->{cmdbox}->clear ();
3653}
3654
3655sub set_command_list {
3656 my ($self, $cmds) = @_;
3657
3658 $self->{cmdbox}->clear ();
3659 $self->{commands} = $cmds;
3660
3661 my $idx = 0;
3662
3663 for (@$cmds) {
3664 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3665
3666 my $i = $idx;
3667 $hb->add (new CFClient::UI::Label text => $_);
3668 $hb->add (new CFClient::UI::Button
3669 text => "delete",
3670 tooltip => "Deletes the action from the record",
3671 on_activate => sub {
3672 $self->{cmdbox}->remove ($hb);
3673 $cmds->[$i] = undef;
3674 });
3675
3676
3677 $idx++
3678 }
3679}
3680
3681#############################################################################
3682
3683package CFClient::UI::SpellList;
3684
3685our @ISA = CFClient::UI::Table::;
3686
3687sub new {
3688 my $class = shift;
3689
3690 my $self = $class->SUPER::new (
3691 binding => [],
3692 commands => [],
3693 @_,
3694 )
3695}
3696
3697my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3698
3699my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3700 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3701my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3702 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3703my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3704 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3705my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3706 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3707my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3708 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3709
3710sub rebuild_spell_list {
3711 my ($self) = @_;
3712
3713 $CFClient::UI::ROOT->on_refresh ($self => sub {
3714 $self->clear;
3715
3716 return unless $::CONN;
3717
3718 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3719 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3720 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3721 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3722 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3723
3724 my $row = 0;
3725
3726 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3727 my $spell = $self->{spell}{$_};
3728
3729 $row++;
3730
3731 my $spell_cb = sub {
3732 my ($widget, $ev) = @_;
3733
3734 if ($ev->{button} == 1) {
3735 $::CONN->user_send ("cast $spell->{name}");
3736 } elsif ($ev->{button} == 2) {
3737 $::CONN->user_send ("invoke $spell->{name}");
3738 } elsif ($ev->{button} == 3) {
3739 (new CFClient::UI::Menu
3740 items => [
3741 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3742 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3743 ],
3744 )->popup ($ev);
3745 } else {
3746 return 0;
3747 }
3748
3749 1
3750 };
3751
3752 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3753
3754 #TODO: add path info to tooltip
3755 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3756
3757 $self->add (0, $row, new CFClient::UI::Face
3758 face => $spell->{face},
3759 can_hover => 1,
3760 can_events => 1,
3761 tooltip => $tooltip,
3762 on_button_down => $spell_cb,
3763 );
3764
3765 $self->add (1, $row, new CFClient::UI::Label
3766 expand => 1,
3767 text => $spell->{name},
3768 can_hover => 1,
3769 can_events => 1,
3770 tooltip => $tooltip,
3771 on_button_down => $spell_cb,
3772 );
3773
3774 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3775 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3776 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3777 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3778 }
3779 });
3780}
3781
3782sub add_spell {
3783 my ($self, $spell) = @_;
3784
3785 $self->{spell}->{$spell->{name}} = $spell;
3786 $self->rebuild_spell_list;
3787}
3788
3789sub remove_spell {
3790 my ($self, $spell) = @_;
3791
3792 delete $self->{spell}->{$spell->{name}};
3793 $self->rebuild_spell_list;
3794}
3795
3796sub clear_spells {
3797 my ($self) = @_;
3798
3799 $self->{spell} = {};
3800 $self->rebuild_spell_list;
3801}
3802
3803#############################################################################
3804
3002package CFClient::UI::Root; 3805package CFClient::UI::Root;
3003 3806
3004our @ISA = CFClient::UI::Container::; 3807our @ISA = CFClient::UI::Container::;
3808
3809use List::Util qw(min max);
3005 3810
3006use CFClient::OpenGL; 3811use CFClient::OpenGL;
3007 3812
3008sub new { 3813sub new {
3009 my $class = shift; 3814 my $class = shift;
… …
3016 Scalar::Util::weaken ($self->{root} = $self); 3821 Scalar::Util::weaken ($self->{root} = $self);
3017 3822
3018 $self 3823 $self
3019} 3824}
3020 3825
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 { 3826sub size_request {
3038 my ($self) = @_; 3827 my ($self) = @_;
3039 3828
3040 ($self->{w}, $self->{h}) 3829 ($self->{w}, $self->{h})
3041} 3830}
… …
3052 $coord = $max - $size if $coord > $max - $size; 3841 $coord = $max - $size if $coord > $max - $size;
3053 3842
3054 int $coord + 0.5 3843 int $coord + 0.5
3055} 3844}
3056 3845
3057sub size_allocate { 3846sub invoke_size_allocate {
3058 my ($self, $w, $h, $changed) = @_; 3847 my ($self, $w, $h) = @_;
3059 3848
3060 for my $child ($self->children) { 3849 for my $child ($self->children) {
3061 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3850 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3062 3851
3063 $X = $child->{force_x} if exists $child->{force_x}; 3852 $X = $child->{force_x} if exists $child->{force_x};
… …
3066 $X = _to_pixel $X, $W, $self->{w}; 3855 $X = _to_pixel $X, $W, $self->{w};
3067 $Y = _to_pixel $Y, $H, $self->{h}; 3856 $Y = _to_pixel $Y, $H, $self->{h};
3068 3857
3069 $child->configure ($X, $Y, $W, $H); 3858 $child->configure ($X, $Y, $W, $H);
3070 } 3859 }
3860
3861 1
3071} 3862}
3072 3863
3073sub coord2local { 3864sub coord2local {
3074 my ($self, $x, $y) = @_; 3865 my ($self, $x, $y) = @_;
3075 3866
… …
3131 $_->() 3922 $_->()
3132 for values %{delete $self->{refresh_hook}}; 3923 for values %{delete $self->{refresh_hook}};
3133 } 3924 }
3134 3925
3135 if ($self->{realloc}) { 3926 if ($self->{realloc}) {
3927 my %queue;
3136 my @queue; 3928 my @queue;
3929 my $widget;
3137 3930
3931 outer:
3138 while () { 3932 while () {
3139 if ($self->{realloc}) { 3933 if (my $realloc = delete $self->{realloc}) {
3140 #TODO use array-of-depth approach 3934 for $widget (values %$realloc) {
3935 $widget->{visible} or next; # do not resize invisible widgets
3141 3936
3142 @queue = sort { $a->{visible} <=> $b->{visible} } 3937 $queue{$widget+0}++ and next; # duplicates are common
3143 @queue, values %{delete $self->{realloc}}; 3938
3939 push @{ $queue[$widget->{visible}] }, $widget;
3940 }
3144 } 3941 }
3145 3942
3943 while () {
3944 @queue or last outer;
3945
3146 my $widget = pop @queue || last; 3946 $widget = pop @{ $queue[-1] || [] }
3947 and last;
3948
3949 pop @queue;
3950 }
3147 3951
3148 $widget->{visible} or last; # do not resize invisible widgets 3952 delete $queue{$widget+0};
3149 3953
3150 my ($w, $h) = $widget->size_request; 3954 my ($w, $h) = $widget->size_request;
3151 3955
3152 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3956 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3153 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3957 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3958
3959 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3960 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3154 3961
3155 $w = $widget->{force_w} if exists $widget->{force_w}; 3962 $w = $widget->{force_w} if exists $widget->{force_w};
3156 $h = $widget->{force_h} if exists $widget->{force_h}; 3963 $h = $widget->{force_h} if exists $widget->{force_h};
3157 3964
3965 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3966 || delete $widget->{force_realloc}) {
3158 $widget->{req_w} = $w; 3967 $widget->{req_w} = $w;
3159 $widget->{req_h} = $h; 3968 $widget->{req_h} = $h;
3160 3969
3161 $self->{size_alloc}{$widget} = [$widget, undef, undef]; 3970 $self->{size_alloc}{$widget+0} = $widget;
3162 3971
3163 push @queue, $widget->{parent} 3972 if (my $parent = $widget->{parent}) {
3164 if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent}; 3973 $self->{realloc}{$parent+0} = $parent
3974 unless $queue{$parent+0};
3975
3976 $parent->{force_size_alloc} = 1;
3977 $self->{size_alloc}{$parent+0} = $parent;
3978 }
3979 }
3980
3981 delete $self->{realloc}{$widget+0};
3165 } 3982 }
3166 } 3983 }
3167 3984
3168 while (my $size_alloc = delete $self->{size_alloc}) { 3985 while (my $size_alloc = delete $self->{size_alloc}) {
3169 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible}, 3986 my @queue = sort { $b->{visible} <=> $a->{visible} }
3170 values %$size_alloc; 3987 values %$size_alloc;
3171 3988
3172 while () { 3989 while () {
3173 my ($widget, $w, $h) = @{ pop @queue or last }; 3990 my $widget = pop @queue || last;
3174 3991
3175 $w = $widget->{w} || $widget->{req_w} unless defined $w; 3992 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3176 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3177 3993
3178 $w = 0 if $w < 0; 3994 $w = 0 if $w < 0;
3179 $h = 0 if $h < 0; 3995 $h = 0 if $h < 0;
3180 3996
3181 $w = int $w + 0.5; 3997 $w = int $w + 0.5;
3182 $h = int $h + 0.5; 3998 $h = int $h + 0.5;
3183 3999
3184 my $changed = $widget->{w} != $w || $widget->{h} != $h; 4000 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4001 $widget->{old_w} = $widget->{w};
4002 $widget->{old_h} = $widget->{h};
3185 4003
3186 $widget->{w} = $w; 4004 $widget->{w} = $w;
3187 $widget->{h} = $h; 4005 $widget->{h} = $h;
3188 4006
3189 $widget->emit (size_allocate => $w, $h, $changed); 4007 $widget->emit (size_allocate => $w, $h);
4008 }
3190 } 4009 }
3191 } 4010 }
3192 4011
3193 while ($self->{post_alloc_hook}) { 4012 while ($self->{post_alloc_hook}) {
3194 $_->() 4013 $_->()
3195 for values %{delete $self->{post_alloc_hook}}; 4014 for values %{delete $self->{post_alloc_hook}};
3196 } 4015 }
4016
3197 4017
3198 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4018 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3199 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4019 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3200 glClear GL_COLOR_BUFFER_BIT; 4020 glClear GL_COLOR_BUFFER_BIT;
3201 4021
… …
3203 glLoadIdentity; 4023 glLoadIdentity;
3204 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4024 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3205 glMatrixMode GL_MODELVIEW; 4025 glMatrixMode GL_MODELVIEW;
3206 glLoadIdentity; 4026 glLoadIdentity;
3207 4027
4028 {
4029 package CFClient::UI::Base;
4030
4031 ($draw_x, $draw_y, $draw_w, $draw_h) =
4032 (0, 0, $self->{w}, $self->{h});
4033 }
4034
3208 $self->_draw; 4035 $self->_draw;
3209} 4036}
3210 4037
3211############################################################################# 4038#############################################################################
3212 4039

Diff Legend

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