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.256 by root, Tue May 30 01:42:16 2006 UTC vs.
Revision 1.328 by root, Sat Jul 22 13:43:05 2006 UTC

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

Diff Legend

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