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

Diff Legend

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