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.247 by root, Sun May 28 01:16:04 2006 UTC vs.
Revision 1.275 by root, Sat Jun 3 22:50:48 2006 UTC

… …
17our $BUTTON_STATE; 17our $BUTTON_STATE;
18 18
19our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20 20
21sub get_layout { 21sub get_layout {
22 my $layout;
23
22 for (grep { $_->{name} } values %WIDGET) { 24 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = { 25 my $win = $layout->{$_->{name}} = { };
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 }; 26
29 } 27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
30 31
31 return $LAYOUT; 32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
32} 36}
33 37
34sub set_layout { 38sub set_layout {
35 my ($layout) = @_; 39 my ($layout) = @_;
40
36 $LAYOUT = $layout; 41 $LAYOUT = $layout;
37} 42}
38 43
39sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
40 if (!$GRAB) { 47 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
45 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
46 54
47 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
48 56
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 58
51 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show; 60 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
62 } 61 }
63 62
64 return; 63 return;
65 } 64 }
66 } 65 }
… …
172sub rescale_widgets { 171sub rescale_widgets {
173 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
174 173
175 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
180 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
181 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
182 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
183 } 189 }
184 } 190 }
185 191
186 reconfigure_widgets; 192 reconfigure_widgets;
187} 193}
… …
196 202
197sub new { 203sub new {
198 my $class = shift; 204 my $class = shift;
199 205
200 my $self = bless { 206 my $self = bless {
201 x => 0, 207 x => "center",
202 y => 0, 208 y => "center",
203 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
204 can_events => 1, 212 can_events => 1,
205 @_ 213 @_
206 }, $class; 214 }, $class;
215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
207 217
208 for (keys %$self) { 218 for (keys %$self) {
209 if (/^on_(.*)$/) { 219 if (/^on_(.*)$/) {
210 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
211 } 221 }
212 } 222 }
213 223
214 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
215
216 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217 $self->{req_x} = $layout->{x} * $::WIDTH; 225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
218 $self->{req_y} = $layout->{y} * $::HEIGHT; 226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
219 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
220 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
221 } 234 }
222 235
223 $self 236 $self
224}
225
226sub toggle_visibility {
227 my ($self) = @_;
228
229 if ($self->{visible}) {
230 $self->hide;
231 } else {
232 $self->show;
233 }
234} 237}
235 238
236sub destroy { 239sub destroy {
237 my ($self) = @_; 240 my ($self) = @_;
238 241
… …
240 %$self = (); 243 %$self = ();
241} 244}
242 245
243sub show { 246sub show {
244 my ($self) = @_; 247 my ($self) = @_;
248
245 return if $self->{parent}; 249 return if $self->{parent};
246 250
247 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
248}
249
250sub center {
251 my ($self) = @_;
252
253 $CFClient::UI::ROOT->on_post_alloc (
254 "center_$self" => sub {
255 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
256 },
257 );
258
259 $self->update;
260} 252}
261 253
262sub set_visible { 254sub set_visible {
263 my ($self) = @_; 255 my ($self) = @_;
264 256
265 return if $self->{visible}; 257 return if $self->{visible};
266 258
267 $self->{root} = $self->{parent}{root}; 259 $self->{root} = $self->{parent}{root};
268 $self->{visible} = $self->{parent}{visible} + 1; 260 $self->{visible} = $self->{parent}{visible} + 1;
269 261
270 $self->emit (visibility_change => 1) 262 $self->emit (visibility_change => 1);
263
264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
271} 267}
272 268
273sub set_invisible { 269sub set_invisible {
274 my ($self) = @_; 270 my ($self) = @_;
275 271
276 return unless $self->{visible}; 272 return unless $self->{visible};
277 273
278 # broken show/hide model 274 $_->set_invisible for $self->children;
279 275
280 delete $self->{root}; 276 delete $self->{root};
281 delete $self->{visible}; 277 delete $self->{visible};
282 278
283 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
284 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
285 281
286 CFClient::UI::check_tooltip 282 CFClient::UI::check_tooltip
287 if $CFClient::UI::TOOLTIP->{owner} == $self; 283 if $TOOLTIP->{owner} == $self;
288 284
289 $self->focus_out; 285 $self->focus_out;
290 286
291 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
292} 305}
293 306
294sub hide { 307sub hide {
295 my ($self) = @_; 308 my ($self) = @_;
296 309
… …
298 311
299 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
300 if $self->{parent}; 313 if $self->{parent};
301} 314}
302 315
303sub move { 316sub move_abs {
304 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
305 318
306 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
307 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
308 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
309 322
310 $self->update; 323 $self->update;
311} 324}
312 325
313sub set_size { 326sub set_size {
314 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
315 328
316 $self->{def_w} = $w; 329 $self->{force_w} = $w;
317 $self->{def_h} = $h; 330 $self->{force_h} = $h;
318 331
319 $self->check_size; 332 $self->realloc;
320} 333}
321 334
322sub size_request { 335sub size_request {
323 require Carp; 336 require Carp;
324 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
326 339
327sub configure { 340sub configure {
328 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
329 342
330 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
331 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
332 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
333 348
334 # use alignment to adjust x, y 349 # use alignment to adjust x, y
335 350
336 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
337 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
338
339 ($w, $h) = ($w2, $h2);
340 } 353 }
341 354
342 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
343 $self->{x} = $x; 356 $self->{x} = $x;
344 $self->{y} = $y; 357 $self->{y} = $y;
345 $self->update; 358 $self->update;
346 } 359 }
347 360
348 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
349 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
350 } 368 }
351} 369}
352 370
353sub size_allocate { 371sub size_allocate {
354 # nothing to be done 372 # nothing to be done
355} 373}
356 374
357sub reconfigure {
358 my ($self) = @_;
359
360 $self->check_size (1);
361 $self->update;
362}
363
364sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
365} 381}
366 382
367sub set_max_size { 383sub set_max_size {
368 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
369 385
… …
428 444
429 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
430 unless $FOCUS; 446 unless $FOCUS;
431} 447}
432 448
433sub mouse_motion { } 449sub mouse_motion { 0 }
434sub button_up { } 450sub button_up { 0 }
435sub key_down { } 451sub key_down { 0 }
436sub key_up { } 452sub key_up { 0 }
437 453
438sub button_down { 454sub button_down {
439 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
440 456
441 $self->focus_in; 457 $self->focus_in;
442}
443 458
444sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
445sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
446sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
447sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
448sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 463 my ($self, $x, $y) = @_;
464
465 return () unless $self->{can_events};
466
467 return $self
468 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
469 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
470
471 ()
472}
473
474sub set_parent {
475 my ($self, $parent) = @_;
476
477 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502}
503
504sub realloc {
505 my ($self) = @_;
506
507 if ($self->{visible}) {
508 return if $self->{root}{realloc}{$self+0};
509
510 $self->{root}{realloc}{$self+0} = $self;
511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
516}
517
518sub update {
519 my ($self) = @_;
520
521 $self->{parent}->update
522 if $self->{parent};
523}
524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
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
449 535
450sub draw { 536sub draw {
451 my ($self) = @_; 537 my ($self) = @_;
452 538
453 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);
454 550
455 glPushMatrix; 551 glPushMatrix;
456 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
457 $self->_draw; 553 $self->_draw;
458 glPopMatrix; 554 glPopMatrix;
… …
470 glVertex $x , $y + $self->{h}; 566 glVertex $x , $y + $self->{h};
471 glEnd; 567 glEnd;
472 glDisable GL_BLEND; 568 glDisable GL_BLEND;
473 } 569 }
474 570
475 if ($ENV{PCLIENT_DEBUG}) { 571 if ($ENV{CFPLUS_DEBUG} & 1) {
476 glPushMatrix; 572 glPushMatrix;
477 glColor 1, 1, 0, 1; 573 glColor 1, 1, 0, 1;
478 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
479 glBegin GL_LINE_LOOP; 575 glBegin GL_LINE_LOOP;
480 glVertex 0 , 0; 576 glVertex 0 , 0;
… …
491 my ($self) = @_; 587 my ($self) = @_;
492 588
493 warn "no draw defined for $self\n"; 589 warn "no draw defined for $self\n";
494} 590}
495 591
496sub find_widget {
497 my ($self, $x, $y) = @_;
498
499 return () unless $self->{can_events};
500
501 return $self
502 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
503 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
504
505 ()
506}
507
508sub set_parent {
509 my ($self, $parent) = @_;
510
511 Scalar::Util::weaken ($self->{parent} = $parent);
512
513 $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
514
515 $self->check_size;
516}
517
518sub check_size {
519 my ($self, $forced) = @_;
520
521 $self->{force_alloc} = 1 if $forced;
522 $CFClient::UI::ROOT->{check_size}{$self} = $self;
523}
524
525sub update {
526 my ($self) = @_;
527
528 $self->{parent}->update
529 if $self->{parent};
530}
531
532sub connect {
533 my ($self, $signal, $cb) = @_;
534
535 push @{ $self->{signal_cb}{$signal} }, $cb;
536}
537
538sub _emit {
539 my ($self, $signal, @args) = @_;
540
541 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
542}
543
544sub emit {
545 my ($self, $signal, @args) = @_;
546
547 $self->_emit ($signal, @args)
548 || $self->$signal (@args);
549}
550
551sub visibility_change {
552 #my ($self, $visible) = @_;
553}
554
555sub DESTROY { 592sub DESTROY {
556 my ($self) = @_; 593 my ($self) = @_;
557 594
558 delete $WIDGET{$self+0}; 595 delete $WIDGET{$self+0};
559 #$self->deactivate; 596 #$self->deactivate;
… …
615 my ($class, %arg) = @_; 652 my ($class, %arg) = @_;
616 $class->SUPER::new (can_events => 0, %arg); 653 $class->SUPER::new (can_events => 0, %arg);
617} 654}
618 655
619sub size_request { 656sub size_request {
620 (0, 0) 657 my ($self) = @_;
658
659 ($self->{w} + 0, $self->{h} + 0)
621} 660}
622 661
623sub draw { } 662sub draw { }
624 663
625############################################################################# 664#############################################################################
… …
629our @ISA = CFClient::UI::Base::; 668our @ISA = CFClient::UI::Base::;
630 669
631sub new { 670sub new {
632 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
633 672
634 my $children = delete $arg{children} || []; 673 my $children = delete $arg{children};
635 674
636 my $self = $class->SUPER::new ( 675 my $self = $class->SUPER::new (
637 children => [], 676 children => [],
638 can_events => 0, 677 can_events => 0,
639 %arg, 678 %arg,
640 ); 679 );
680
641 $self->add ($_) for @$children; 681 $self->add (@$children)
682 if $children;
642 683
643 $self 684 $self
644} 685}
645 686
646sub add { 687sub add {
… …
654 $self->{children} = [ 695 $self->{children} = [
655 sort { $a->{z} <=> $b->{z} } 696 sort { $a->{z} <=> $b->{z} }
656 @{$self->{children}}, @widgets 697 @{$self->{children}}, @widgets
657 ]; 698 ];
658 699
659 $self->check_size (1); 700 $self->realloc;
660 $self->update;
661} 701}
662 702
663sub children { 703sub children {
664 @{ $_[0]{children} } 704 @{ $_[0]{children} }
665} 705}
… …
670 delete $child->{parent}; 710 delete $child->{parent};
671 $child->hide; 711 $child->hide;
672 712
673 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 713 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
674 714
675 $self->check_size (1); 715 $self->realloc;
676 $self->update;
677} 716}
678 717
679sub clear { 718sub clear {
680 my ($self) = @_; 719 my ($self) = @_;
681 720
… …
685 for (@$children) { 724 for (@$children) {
686 delete $_->{parent}; 725 delete $_->{parent};
687 $_->hide; 726 $_->hide;
688 } 727 }
689 728
690 $self->check_size; 729 $self->realloc;
691 $self->update;
692} 730}
693 731
694sub find_widget { 732sub find_widget {
695 my ($self, $x, $y) = @_; 733 my ($self, $x, $y) = @_;
696 734
697 $x -= $self->{x}; 735 $x -= $self->{x};
698 $y -= $self->{y}; 736 $y -= $self->{y};
699 737
700 my $res; 738 my $res;
701 739
702 for (reverse @{ $self->{children} }) { 740 for (reverse $self->visible_children) {
703 $res = $_->find_widget ($x, $y) 741 $res = $_->find_widget ($x, $y)
704 and return $res; 742 and return $res;
705 } 743 }
706 744
707 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
756 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
757} 795}
758 796
759############################################################################# 797#############################################################################
760 798
799# back-buffered drawing area
800
761package CFClient::UI::Window; 801package CFClient::UI::Window;
762 802
763our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
764 804
765use CFClient::OpenGL; 805use CFClient::OpenGL;
… …
783 $self->SUPER::size_allocate ($w, $h); 823 $self->SUPER::size_allocate ($w, $h);
784 $self->update; 824 $self->update;
785} 825}
786 826
787sub _render { 827sub _render {
828 my ($self) = @_;
829
788 $_[0]{children}[0]->draw; 830 $self->{children}[0]->draw;
789} 831}
790 832
791sub render_child { 833sub render_child {
792 my ($self) = @_; 834 my ($self) = @_;
793 835
794 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 836 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
795 glClearColor 0, 0, 0, 0; 837 glClearColor 0, 0, 0, 0;
796 glClear GL_COLOR_BUFFER_BIT; 838 glClear GL_COLOR_BUFFER_BIT;
797 839
840 {
841 package CFClient::UI::Base;
842
843 ($draw_x, $draw_y, $draw_w, $draw_h) =
844 (0, 0, $self->{w}, $self->{h});
845 }
846
798 $self->_render; 847 $self->_render;
799 }; 848 };
800} 849}
801 850
802sub _draw { 851sub _draw {
803 my ($self) = @_; 852 my ($self) = @_;
804 853
805 my ($w, $h) = ($self->w, $self->h); 854 my ($w, $h) = @$self{qw(w h)};
806 855
807 my $tex = $self->{texture} 856 my $tex = $self->{texture}
808 or return; 857 or return;
809 858
810 glEnable GL_TEXTURE_2D; 859 glEnable GL_TEXTURE_2D;
… …
833} 882}
834 883
835sub size_request { 884sub size_request {
836 my ($self) = @_; 885 my ($self) = @_;
837 886
838 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 887 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
839 888
840 $w = 10 if $self->{scroll_x}; 889 $w = 10 if $self->{scroll_x};
841 $h = 10 if $self->{scroll_y}; 890 $h = 10 if $self->{scroll_y};
842 891
843 ($w, $h) 892 ($w, $h)
844} 893}
845 894
846sub size_allocate { 895sub size_allocate {
847 my ($self, $w, $h) = @_; 896 my ($self, $w, $h) = @_;
848 897
898 my $child = $self->child;
899
849 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 900 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
850 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 901 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
851 902
852 $self->child->configure (0, 0, $w, $h); 903 $self->child->configure (0, 0, $w, $h);
853 $self->update; 904 $self->update;
854} 905}
855 906
… …
891} 942}
892 943
893sub _render { 944sub _render {
894 my ($self) = @_; 945 my ($self) = @_;
895 946
947 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
948 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
949
896 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
897 951
898 $self->SUPER::_render; 952 $self->SUPER::_render;
899} 953}
900 954
… …
903package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
904 958
905our @ISA = CFClient::UI::HBox::; 959our @ISA = CFClient::UI::HBox::;
906 960
907sub new { 961sub new {
908 my $class = shift; 962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
909 965
910 my $self; 966 my $self;
911 967
912 my $slider = new CFClient::UI::Slider 968 my $slider = new CFClient::UI::Slider
913 vertical => 1, 969 vertical => 1,
… …
918 ; 974 ;
919 975
920 $self = $class->SUPER::new ( 976 $self = $class->SUPER::new (
921 vp => (new CFClient::UI::ViewPort expand => 1), 977 vp => (new CFClient::UI::ViewPort expand => 1),
922 slider => $slider, 978 slider => $slider,
923 @_, 979 %arg,
924 ); 980 );
925 981
926 $self->{vp}->add ($self->{scrolled});
927 $self->add ($self->{vp});
928 $self->add ($self->{slider}); 982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
929 984
930 $self 985 $self
986}
987
988sub add {
989 my ($self, $widget) = @_;
990
991 $self->{vp}->add ($self->{child} = $widget);
931} 992}
932 993
933sub update { 994sub update {
934 my ($self) = @_; 995 my ($self) = @_;
935 996
… …
998 1059
999our @ISA = CFClient::UI::Bin::; 1060our @ISA = CFClient::UI::Bin::;
1000 1061
1001use CFClient::OpenGL; 1062use CFClient::OpenGL;
1002 1063
1003my @tex = 1064my $bg =
1065 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1066 mipmap => 1, wrap => 1;
1067
1068my @border =
1004 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1005 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1006 1071
1007sub new { 1072sub new {
1008 my $class = shift; 1073 my ($class, %arg) = @_;
1074
1075 my $title = delete $arg{title};
1009 1076
1010 my $self = $class->SUPER::new ( 1077 my $self = $class->SUPER::new (
1011 bg => [1, 1, 1, 1], 1078 bg => [1, 1, 1, 1],
1012 border_bg => [1, 1, 1, 1], 1079 border_bg => [1, 1, 1, 1],
1013 border => 0.6, 1080 border => 0.6,
1014 is_toplevel => 1,
1015 can_events => 1, 1081 can_events => 1,
1016 @_ 1082 min_w => 16,
1083 min_h => 16,
1084 %arg,
1017 ); 1085 );
1018 1086
1019 $self->{title} &&= new CFClient::UI::Label 1087 $self->{title} = new CFClient::UI::Label
1020 align => 0, 1088 align => 0,
1021 valign => 1, 1089 valign => 1,
1022 text => $self->{title}, 1090 text => $title,
1023 fontsize => $self->{border}; 1091 fontsize => $self->{border}
1092 if defined $title;
1024 1093
1025 $self 1094 $self
1095}
1096
1097sub add {
1098 my ($self, @widgets) = @_;
1099
1100 $self->SUPER::add (@widgets);
1101 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1026} 1102}
1027 1103
1028sub border { 1104sub border {
1029 int $_[0]{border} * $::FONTSIZE 1105 int $_[0]{border} * $::FONTSIZE
1030} 1106}
1031 1107
1032sub size_request { 1108sub size_request {
1033 my ($self) = @_; 1109 my ($self) = @_;
1110
1111 $self->{title}->size_request
1112 if $self->{title};
1034 1113
1035 my ($w, $h) = $self->SUPER::size_request; 1114 my ($w, $h) = $self->SUPER::size_request;
1036 1115
1037 ( 1116 (
1038 $w + $self->border * 2, 1117 $w + $self->border * 2,
… …
1041} 1120}
1042 1121
1043sub size_allocate { 1122sub size_allocate {
1044 my ($self, $w, $h) = @_; 1123 my ($self, $w, $h) = @_;
1045 1124
1125 if ($self->{title}) {
1126 $self->{title}{w} = $w;
1127 $self->{title}{h} = $h;
1128 $self->{title}->size_allocate ($w, $h);
1129 }
1130
1131 my $border = $self->border;
1132
1046 $h -= List::Util::max 0, $self->border * 2; 1133 $h -= List::Util::max 0, $border * 2;
1047 $w -= List::Util::max 0, $self->border * 2; 1134 $w -= List::Util::max 0, $border * 2;
1048 1135
1049 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1050 if $self->{title};
1051
1052 $self->child->configure ($self->border, $self->border, $w, $h); 1136 $self->child->configure ($border, $border, $w, $h);
1053} 1137}
1054 1138
1055sub button_down { 1139sub button_down {
1056 my ($self, $ev, $x, $y) = @_; 1140 my ($self, $ev, $x, $y) = @_;
1057 1141
… …
1073 my ($ev, $x, $y) = @_; 1157 my ($ev, $x, $y) = @_;
1074 1158
1075 my $dx = $ev->{x} - $ox; 1159 my $dx = $ev->{x} - $ox;
1076 my $dy = $ev->{y} - $oy; 1160 my $dy = $ev->{y} - $oy;
1077 1161
1078 $self->{user_x} = $wx + $dx * $mx;
1079 $self->{user_y} = $wy + $dy * $my;
1080 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1162 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1081 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1163 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1082 $self->move ($self->{user_x}, $self->{user_y}); 1164
1083 $self->check_size; 1165 $self->realloc;
1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1084 }; 1167 };
1085 1168
1086 } elsif ($lr ^ $td) { 1169 } elsif ($lr ^ $td) {
1087 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1170 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1088 my ($bx, $by) = ($self->{x}, $self->{y}); 1171 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1090 $self->{motion} = sub { 1173 $self->{motion} = sub {
1091 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
1092 1175
1093 ($x, $y) = ($ev->{x}, $ev->{y}); 1176 ($x, $y) = ($ev->{x}, $ev->{y});
1094 1177
1095 $self->{user_x} = $bx + $x - $ox; 1178 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1096 $self->{user_y} = $by + $y - $oy;
1097
1098 $self->move ($self->{user_x}, $self->{user_y});
1099 $self->update;
1100 }; 1179 };
1180 } else {
1181 return 0;
1182 }
1183
1101 } 1184 1
1102} 1185}
1103 1186
1104sub button_up { 1187sub button_up {
1105 my ($self, $ev, $x, $y) = @_; 1188 my ($self, $ev, $x, $y) = @_;
1106 1189
1107 delete $self->{motion}; 1190 !!delete $self->{motion}
1108} 1191}
1109 1192
1110sub mouse_motion { 1193sub mouse_motion {
1111 my ($self, $ev, $x, $y) = @_; 1194 my ($self, $ev, $x, $y) = @_;
1112 1195
1113 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1196 $self->{motion}->($ev, $x, $y) if $self->{motion};
1197
1198 !!$self->{motion}
1114} 1199}
1115 1200
1116sub _draw { 1201sub _draw {
1117 my ($self) = @_; 1202 my ($self) = @_;
1118 1203
1204 my $child = $self->{children}[0];
1205
1119 my ($w, $h ) = ($self->{w}, $self->{h}); 1206 my ($w, $h ) = ($self->{w}, $self->{h});
1120 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1207 my ($cw, $ch) = ($child->{w}, $child->{h});
1121 1208
1122 glEnable GL_TEXTURE_2D; 1209 glEnable GL_TEXTURE_2D;
1123 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1210 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1124 1211
1125 my $border = $self->border; 1212 my $border = $self->border;
1126 1213
1127 glColor @{ $self->{border_bg} }; 1214 glColor @{ $self->{border_bg} };
1128 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1215 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1129 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1216 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1130 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1217 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1131 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1218 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1132 1219
1133 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1220 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1134 my $bg = $tex[0]; 1221 glColor @{ $self->{bg} };
1135 1222
1136 # TODO: repeat texture not scale 1223 # TODO: repeat texture not scale
1224 # solve this better(?)
1137 my $rep_x = $cw / $bg->{w}; 1225 $bg->{s} = $cw / $bg->{w};
1138 my $rep_y = $ch / $bg->{h}; 1226 $bg->{t} = $ch / $bg->{h};
1139
1140 glColor @{ $self->{bg} };
1141
1142 $bg->{s} = $rep_x;
1143 $bg->{t} = $rep_y;
1144 $bg->{wrap_mode} = 1;
1145 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1227 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1146 } 1228 }
1147 1229
1148 glDisable GL_TEXTURE_2D; 1230 glDisable GL_TEXTURE_2D;
1149 1231
1150 $self->{title}->draw if $self->{title};
1151
1152 $self->child->draw; 1232 $child->draw;
1233
1234 if ($self->{title}) {
1235 glTranslate 0, $border - $self->{h};
1236 $self->{title}->_draw;
1237 }
1153} 1238}
1154 1239
1155############################################################################# 1240#############################################################################
1156 1241
1157package CFClient::UI::Table; 1242package CFClient::UI::Table;
… …
1179 my ($self, $x, $y, $child) = @_; 1264 my ($self, $x, $y, $child) = @_;
1180 1265
1181 $child->set_parent ($self); 1266 $child->set_parent ($self);
1182 $self->{children}[$y][$x] = $child; 1267 $self->{children}[$y][$x] = $child;
1183 1268
1184 $self->check_size (1); 1269 $self->realloc;
1185} 1270}
1186 1271
1187# TODO: move to container class maybe? send children a signal on removal? 1272# TODO: move to container class maybe? send children a signal on removal?
1188sub clear { 1273sub clear {
1189 my ($self) = @_; 1274 my ($self) = @_;
… …
1194 for (@children) { 1279 for (@children) {
1195 delete $_->{parent}; 1280 delete $_->{parent};
1196 $_->hide; 1281 $_->hide;
1197 } 1282 }
1198 1283
1199 $self->check_size (1); 1284 $self->realloc;
1200 $self->update;
1201} 1285}
1202 1286
1203sub get_wh { 1287sub get_wh {
1204 my ($self) = @_; 1288 my ($self) = @_;
1205 1289
… …
1413 ellipsise => 3, # end 1497 ellipsise => 3, # end
1414 layout => (new CFClient::Layout), 1498 layout => (new CFClient::Layout),
1415 fontsize => 1, 1499 fontsize => 1,
1416 align => -1, 1500 align => -1,
1417 valign => -1, 1501 valign => -1,
1418 padding => 2, 1502 padding_x => 2,
1503 padding_y => 2,
1419 can_events => 0, 1504 can_events => 0,
1420 %arg 1505 %arg
1421 ); 1506 );
1422 1507
1423 if (exists $self->{template}) { 1508 if (exists $self->{template}) {
… …
1459 $self->{text} = "T$text"; 1544 $self->{text} = "T$text";
1460 1545
1461 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1546 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1462 $self->{layout}->set_text ($text); 1547 $self->{layout}->set_text ($text);
1463 1548
1549 $self->realloc;
1464 $self->update; 1550 $self->update;
1465 $self->check_size;
1466} 1551}
1467 1552
1468sub set_markup { 1553sub set_markup {
1469 my ($self, $markup) = @_; 1554 my ($self, $markup) = @_;
1470 1555
… …
1474 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1559 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1475 1560
1476 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1561 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1477 $self->{layout}->set_markup ($markup); 1562 $self->{layout}->set_markup ($markup);
1478 1563
1564 $self->realloc;
1479 $self->update; 1565 $self->update;
1480 $self->check_size;
1481} 1566}
1482 1567
1483sub size_request { 1568sub size_request {
1484 my ($self) = @_; 1569 my ($self) = @_;
1485 1570
… …
1499 1584
1500 $w = List::Util::max $w, $w2; 1585 $w = List::Util::max $w, $w2;
1501 $h = List::Util::max $h, $h2; 1586 $h = List::Util::max $h, $h2;
1502 } 1587 }
1503 1588
1504 ( 1589 ($w, $h)
1505 $w + $self->{padding} * 2,
1506 $h + $self->{padding} * 2,
1507 )
1508} 1590}
1509 1591
1510sub size_allocate { 1592sub size_allocate {
1511 my ($self, $w, $h) = @_; 1593 my ($self, $w, $h) = @_;
1512 1594
1595 delete $self->{ox};
1596
1513 delete $self->{texture}; 1597 delete $self->{texture}
1598 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1514} 1599}
1515 1600
1516sub set_fontsize { 1601sub set_fontsize {
1517 my ($self, $fontsize) = @_; 1602 my ($self, $fontsize) = @_;
1518 1603
1519 $self->{fontsize} = $fontsize; 1604 $self->{fontsize} = $fontsize;
1520 delete $self->{texture}; 1605 delete $self->{texture};
1521 1606
1522 $self->update; 1607 $self->realloc;
1523 $self->check_size;
1524} 1608}
1525 1609
1526sub _draw { 1610sub _draw {
1527 my ($self) = @_; 1611 my ($self) = @_;
1528 1612
… …
1534 $self->{layout}->set_width ($self->{w}); 1618 $self->{layout}->set_width ($self->{w});
1535 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1619 $self->{layout}->set_ellipsise ($self->{ellipsise});
1536 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1620 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1537 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1621 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1538 1622
1539 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1623 new_from_layout CFClient::Texture $self->{layout}
1624 };
1540 1625
1626 unless (exists $self->{ox}) {
1541 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1627 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1542 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1628 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1543 : ($self->{w} - $tex->{w}) * 0.5); 1629 : ($self->{w} - $tex->{w}) * 0.5);
1544 1630
1545 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1631 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1546 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1632 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1547 : ($self->{h} - $tex->{h}) * 0.5); 1633 : ($self->{h} - $tex->{h}) * 0.5);
1548
1549 $tex
1550 }; 1634 };
1551 1635
1552 glEnable GL_TEXTURE_2D; 1636 glEnable GL_TEXTURE_2D;
1553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1637 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1554 1638
… …
1608sub set_text { 1692sub set_text {
1609 my ($self, $text) = @_; 1693 my ($self, $text) = @_;
1610 1694
1611 $self->{cursor} = length $text; 1695 $self->{cursor} = length $text;
1612 $self->_set_text ($text); 1696 $self->_set_text ($text);
1613 $self->update; 1697
1614 $self->check_size; 1698 $self->realloc;
1615} 1699}
1616 1700
1617sub get_text { 1701sub get_text {
1618 $_[0]{text} 1702 $_[0]{text}
1619} 1703}
… …
1649 $self->{cursor} = length $text; 1733 $self->{cursor} = length $text;
1650 } elsif ($uni == 27) { 1734 } elsif ($uni == 27) {
1651 $self->_emit ('escape'); 1735 $self->_emit ('escape');
1652 } elsif ($uni) { 1736 } elsif ($uni) {
1653 substr $text, $self->{cursor}++, 0, chr $uni; 1737 substr $text, $self->{cursor}++, 0, chr $uni;
1738 } else {
1739 return 0;
1654 } 1740 }
1655 1741
1656 $self->_set_text ($text); 1742 $self->_set_text ($text);
1657 $self->update; 1743
1658 $self->check_size; 1744 $self->realloc;
1745
1746 1
1659} 1747}
1660 1748
1661sub focus_in { 1749sub focus_in {
1662 my ($self) = @_; 1750 my ($self) = @_;
1663 1751
… …
1678 utf8::encode $text; 1766 utf8::encode $text;
1679 $self->{cursor} = length substr $text, 0, $idx; 1767 $self->{cursor} = length substr $text, 0, $idx;
1680 1768
1681 $self->_set_text ($self->{text}); 1769 $self->_set_text ($self->{text});
1682 $self->update; 1770 $self->update;
1771
1772 1
1683} 1773}
1684 1774
1685sub mouse_motion { 1775sub mouse_motion {
1686 my ($self, $ev, $x, $y) = @_; 1776 my ($self, $ev, $x, $y) = @_;
1687# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1777# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1778
1779 0
1688} 1780}
1689 1781
1690sub _draw { 1782sub _draw {
1691 my ($self) = @_; 1783 my ($self) = @_;
1692 1784
… …
1769 } else { 1861 } else {
1770 $self->set_text ($self->{history_saveback}); 1862 $self->set_text ($self->{history_saveback});
1771 } 1863 }
1772 1864
1773 } else { 1865 } else {
1774 $self->SUPER::key_down ($ev); 1866 return $self->SUPER::key_down ($ev)
1867 }
1868
1775 } 1869 1
1776
1777} 1870}
1778 1871
1779############################################################################# 1872#############################################################################
1780 1873
1781package CFClient::UI::Button; 1874package CFClient::UI::Button;
… …
1790 1883
1791sub new { 1884sub new {
1792 my $class = shift; 1885 my $class = shift;
1793 1886
1794 $class->SUPER::new ( 1887 $class->SUPER::new (
1795 padding => 4, 1888 padding_x => 4,
1889 padding_y => 4,
1796 fg => [1, 1, 1], 1890 fg => [1, 1, 1],
1797 active_fg => [0, 0, 1], 1891 active_fg => [0, 0, 1],
1798 can_hover => 1, 1892 can_hover => 1,
1799 align => 0, 1893 align => 0,
1800 valign => 0, 1894 valign => 0,
… …
1809 my ($self, $ev, $x, $y) = @_; 1903 my ($self, $ev, $x, $y) = @_;
1810 1904
1811 $self->emit ("activate") 1905 $self->emit ("activate")
1812 if $x >= 0 && $x < $self->{w} 1906 if $x >= 0 && $x < $self->{w}
1813 && $y >= 0 && $y < $self->{h}; 1907 && $y >= 0 && $y < $self->{h};
1908
1909 1
1814} 1910}
1815 1911
1816sub _draw { 1912sub _draw {
1817 my ($self) = @_; 1913 my ($self) = @_;
1818 1914
… …
1847 1943
1848sub new { 1944sub new {
1849 my $class = shift; 1945 my $class = shift;
1850 1946
1851 $class->SUPER::new ( 1947 $class->SUPER::new (
1852 padding => 2, 1948 padding_x => 2,
1949 padding_y => 2,
1853 fg => [1, 1, 1], 1950 fg => [1, 1, 1],
1854 active_fg => [1, 1, 0], 1951 active_fg => [1, 1, 0],
1855 bg => [0, 0, 0, 0.2], 1952 bg => [0, 0, 0, 0.2],
1856 active_bg => [1, 1, 1, 0.5], 1953 active_bg => [1, 1, 1, 0.5],
1857 state => 0, 1954 state => 0,
… …
1861} 1958}
1862 1959
1863sub size_request { 1960sub size_request {
1864 my ($self) = @_; 1961 my ($self) = @_;
1865 1962
1866 ($self->{padding} * 2 + 6) x 2 1963 (6) x 2
1867} 1964}
1868 1965
1869sub button_down { 1966sub button_down {
1870 my ($self, $ev, $x, $y) = @_; 1967 my ($self, $ev, $x, $y) = @_;
1871 1968
1872 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1969 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1873 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1970 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1874 $self->{state} = !$self->{state}; 1971 $self->{state} = !$self->{state};
1875 $self->_emit (changed => $self->{state}); 1972 $self->_emit (changed => $self->{state});
1973 } else {
1974 return 0
1975 }
1976
1876 } 1977 1
1877} 1978}
1878 1979
1879sub _draw { 1980sub _draw {
1880 my ($self) = @_; 1981 my ($self) = @_;
1881 1982
1882 $self->SUPER::_draw; 1983 $self->SUPER::_draw;
1883 1984
1884 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1985 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1885 1986
1886 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1987 my ($w, $h) = @$self{qw(w h)};
1988
1989 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1887 1990
1888 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1991 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1889 1992
1890 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1993 my $tex = $self->{state} ? $tex[1] : $tex[0];
1891 1994
… …
2156 fg => [1, 1, 1], 2259 fg => [1, 1, 1],
2157 active_fg => [0, 0, 0], 2260 active_fg => [0, 0, 0],
2158 bg => [0, 0, 0, 0.2], 2261 bg => [0, 0, 0, 0.2],
2159 active_bg => [1, 1, 1, 0.5], 2262 active_bg => [1, 1, 1, 0.5],
2160 range => [0, 0, 100, 10, 0], 2263 range => [0, 0, 100, 10, 0],
2161 req_w => $::WIDTH / 80, 2264 min_w => $::WIDTH / 80,
2162 req_h => $::WIDTH / 80, 2265 min_h => $::WIDTH / 80,
2163 vertical => 0, 2266 vertical => 0,
2164 can_hover => 1, 2267 can_hover => 1,
2165 inner_pad => 0.02, 2268 inner_pad => 0.02,
2166 @_ 2269 @_
2167 ); 2270 );
… …
2170 $self->update; 2273 $self->update;
2171 2274
2172 $self 2275 $self
2173} 2276}
2174 2277
2278sub changed { }
2279
2175sub set_range { 2280sub set_range {
2176 my ($self, $range) = @_; 2281 my ($self, $range) = @_;
2177 2282
2178 ($range, $self->{range}) = ($self->{range}, $range); 2283 ($range, $self->{range}) = ($self->{range}, $range);
2179 2284
… …
2205} 2310}
2206 2311
2207sub size_request { 2312sub size_request {
2208 my ($self) = @_; 2313 my ($self) = @_;
2209 2314
2210 my $w = $self->{req_w}; 2315 ($self->{req_w}, $self->{req_h})
2211 my $h = $self->{req_h};
2212
2213 $self->{vertical} ? ($h, $w) : ($w, $h)
2214} 2316}
2215 2317
2216sub button_down { 2318sub button_down {
2217 my ($self, $ev, $x, $y) = @_; 2319 my ($self, $ev, $x, $y) = @_;
2218 2320
2219 $self->SUPER::button_down ($ev, $x, $y); 2321 $self->SUPER::button_down ($ev, $x, $y);
2220 2322
2221 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2323 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2222 2324
2223 $self->mouse_motion ($ev, $x, $y); 2325 $self->mouse_motion ($ev, $x, $y)
2224} 2326}
2225 2327
2226sub mouse_motion { 2328sub mouse_motion {
2227 my ($self, $ev, $x, $y) = @_; 2329 my ($self, $ev, $x, $y) = @_;
2228 2330
… …
2232 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2334 my (undef, $lo, $hi, $page) = @{$self->{range}};
2233 2335
2234 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2336 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2235 2337
2236 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2338 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2339 } else {
2340 return 0;
2341 }
2342
2237 } 2343 1
2238} 2344}
2239 2345
2240sub update { 2346sub update {
2241 my ($self) = @_; 2347 my ($self) = @_;
2242 2348
2243 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2349 delete $self->{knob_w};
2350 $self->SUPER::update;
2351}
2352
2353sub _draw {
2354 my ($self) = @_;
2355
2356 unless ($self->{knob_w}) {
2244 $self->set_value ($self->{range}[0]); 2357 $self->set_value ($self->{range}[0]);
2245 2358
2246 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2359 my ($value, $lo, $hi, $page) = @{$self->{range}};
2247 my $range = ($hi - $page - $lo) || 1e-100; 2360 my $range = ($hi - $page - $lo) || 1e-100;
2248 2361
… …
2254 $value = ($value - $lo) / $range; 2367 $value = ($value - $lo) / $range;
2255 $value = $value * $self->{scale} + $self->{offset}; 2368 $value = $value * $self->{scale} + $self->{offset};
2256 2369
2257 $self->{knob_x} = $value - $knob_w * 0.5; 2370 $self->{knob_x} = $value - $knob_w * 0.5;
2258 $self->{knob_w} = $knob_w; 2371 $self->{knob_w} = $knob_w;
2259 }); 2372 }
2260
2261 $self->SUPER::update;
2262}
2263
2264sub _draw {
2265 my ($self) = @_;
2266 2373
2267 $self->SUPER::_draw (); 2374 $self->SUPER::_draw ();
2268 2375
2269 glScale $self->{w}, $self->{h}; 2376 glScale $self->{w}, $self->{h};
2270 2377
… …
2603} 2710}
2604 2711
2605sub set_tooltip_from { 2712sub set_tooltip_from {
2606 my ($self, $widget) = @_; 2713 my ($self, $widget) = @_;
2607 2714
2715 my $tooltip = $widget->{tooltip};
2716
2717 if ($ENV{CFPLUS_DEBUG} & 2) {
2718 $tooltip .= "\n\n" . (ref $widget) . "\n"
2719 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2720 . "req $widget->{req_w} $widget->{req_h}\n"
2721 . "visible $widget->{visible}";
2722 }
2723
2608 $self->add (new CFClient::UI::Label 2724 $self->add (new CFClient::UI::Label
2609 markup => $widget->{tooltip}, 2725 markup => $tooltip,
2610 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2726 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2611 fontsize => 0.8, 2727 fontsize => 0.8,
2612 fg => [0, 0, 0, 1], 2728 fg => [0, 0, 0, 1],
2613 ellipsise => 0, 2729 ellipsise => 0,
2614 font => ($widget->{tooltip_font} || $::FONT_PROP), 2730 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2625 2741
2626sub size_allocate { 2742sub size_allocate {
2627 my ($self, $w, $h) = @_; 2743 my ($self, $w, $h) = @_;
2628 2744
2629 $self->SUPER::size_allocate ($w - 4, $h - 4); 2745 $self->SUPER::size_allocate ($w - 4, $h - 4);
2746}
2747
2748sub visibility_change {
2749 my ($self, $visible) = @_;
2750
2751 return unless $visible;
2752
2753 $self->{root}->on_post_alloc ("move_$self" => sub {
2754 my $widget = $self->{owner}
2755 or return;
2756
2757 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2758
2759 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2760 if $x + $self->{w} > $::WIDTH;
2761
2762 $self->move_abs ($x, $y);
2763 });
2630} 2764}
2631 2765
2632sub _draw { 2766sub _draw {
2633 my ($self) = @_; 2767 my ($self) = @_;
2634 2768
… …
2651 glVertex $w, $h; 2785 glVertex $w, $h;
2652 glVertex $w, 0; 2786 glVertex $w, 0;
2653 glEnd; 2787 glEnd;
2654 2788
2655 glTranslate 2 - 0.375, 2 - 0.375; 2789 glTranslate 2 - 0.375, 2 - 0.375;
2790
2656 $self->SUPER::_draw; 2791 $self->SUPER::_draw;
2657} 2792}
2658 2793
2659############################################################################# 2794#############################################################################
2660 2795
… …
2736 $self->SUPER::DESTROY; 2871 $self->SUPER::DESTROY;
2737} 2872}
2738 2873
2739############################################################################# 2874#############################################################################
2740 2875
2741package CFClient::UI::Inventory; 2876package CFClient::UI::Buttonbar;
2742 2877
2743our @ISA = CFClient::UI::ScrolledWindow::; 2878our @ISA = CFClient::UI::HBox::;
2744 2879
2745sub new { 2880# TODO: should actualyl wrap buttons and other goodies.
2746 my $class = shift;
2747
2748 my $self = $class->SUPER::new (
2749 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2750 @_,
2751 );
2752
2753 $self
2754}
2755
2756sub set_items {
2757 my ($self, $items) = @_;
2758
2759 $self->{scrolled}->clear;
2760 return unless $items;
2761
2762 my @items = sort {
2763 ($a->{type} <=> $b->{type})
2764 or ($a->{name} cmp $b->{name})
2765 } @$items;
2766
2767 $self->{real_items} = \@items;
2768
2769 my $row = 0;
2770 for my $item (@items) {
2771 CFClient::Item::update_widgets $item;
2772
2773 $self->{scrolled}->add (0, $row, $item->{face_widget});
2774 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2775 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2776
2777 $row++;
2778 }
2779}
2780 2881
2781############################################################################# 2882#############################################################################
2782 2883
2783package CFClient::UI::Menu; 2884package CFClient::UI::Menu;
2784 2885
… …
2825 # maybe save $GRAB? must be careful about events... 2926 # maybe save $GRAB? must be careful about events...
2826 $GRAB = $self; 2927 $GRAB = $self;
2827 $self->{button} = $ev->{button}; 2928 $self->{button} = $ev->{button};
2828 2929
2829 $self->show; 2930 $self->show;
2830 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2931 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2831} 2932}
2832 2933
2833sub mouse_motion { 2934sub mouse_motion {
2834 my ($self, $ev, $x, $y) = @_; 2935 my ($self, $ev, $x, $y) = @_;
2835 2936
2836 # TODO: should use vbox->find_widget or so 2937 # TODO: should use vbox->find_widget or so
2837 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2938 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2838 $self->{hover} = $self->{item}{$HOVER}; 2939 $self->{hover} = $self->{item}{$HOVER};
2940
2941 0
2839} 2942}
2840 2943
2841sub button_up { 2944sub button_up {
2842 my ($self, $ev, $x, $y) = @_; 2945 my ($self, $ev, $x, $y) = @_;
2843 2946
… …
2845 undef $GRAB; 2948 undef $GRAB;
2846 $self->hide; 2949 $self->hide;
2847 2950
2848 $self->_emit ("popdown"); 2951 $self->_emit ("popdown");
2849 $self->{hover}[1]->() if $self->{hover}; 2952 $self->{hover}[1]->() if $self->{hover};
2953 } else {
2954 return 0
2955 }
2956
2957 1
2958}
2959
2960#############################################################################
2961
2962package CFClient::UI::Multiplexer;
2963
2964our @ISA = CFClient::UI::Container::;
2965
2966sub new {
2967 my $class = shift;
2968
2969 my $self = $class->SUPER::new (
2970 @_,
2971 );
2972
2973 $self->{current} = $self->{children}[0]
2974 if @{ $self->{children} };
2975
2976 $self
2977}
2978
2979sub add {
2980 my ($self, @widgets) = @_;
2981
2982 $self->SUPER::add (@widgets);
2983
2984 $self->{current} = $self->{children}[0]
2985 if @{ $self->{children} };
2986}
2987
2988sub set_current_page {
2989 my ($self, $page_or_widget) = @_;
2990
2991 my $widget = ref $page_or_widget
2992 ? $page_or_widget
2993 : $self->{children}[$page_or_widget];
2994
2995 $self->{current} = $widget;
2996 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2997
2998 $self->_emit (page_changed => $self->{current});
2999
3000 $self->realloc;
3001}
3002
3003sub visible_children {
3004 $_[0]{current}
3005}
3006
3007sub size_request {
3008 my ($self) = @_;
3009
3010 $self->{current}->size_request
3011}
3012
3013sub size_allocate {
3014 my ($self, $w, $h) = @_;
3015
3016 $self->{current}->configure (0, 0, $w, $h);
3017}
3018
3019sub _draw {
3020 my ($self) = @_;
3021
3022 $self->{current}->draw;
3023}
3024
3025#############################################################################
3026
3027package CFClient::UI::Notebook;
3028
3029our @ISA = CFClient::UI::VBox::;
3030
3031sub new {
3032 my $class = shift;
3033
3034 my $self = $class->SUPER::new (
3035 buttonbar => (new CFClient::UI::Buttonbar),
3036 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3037 # filter => # will be put between multiplexer and $self
3038 @_,
3039 );
2850 } 3040
3041 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3042 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3043
3044 $self
3045}
3046
3047sub add {
3048 my ($self, $title, $widget, $tooltip) = @_;
3049
3050 Scalar::Util::weaken $self;
3051
3052 $self->{buttonbar}->add (new CFClient::UI::Button
3053 markup => $title,
3054 tooltip => $tooltip,
3055 on_activate => sub { $self->set_current_page ($widget) },
3056 );
3057
3058 $self->{multiplexer}->add ($widget);
3059}
3060
3061sub set_current_page {
3062 my ($self, $page) = @_;
3063
3064 $self->{multiplexer}->set_current_page ($page);
3065 $self->_emit (page_changed => $self->{multiplexer}{current});
2851} 3066}
2852 3067
2853############################################################################# 3068#############################################################################
2854 3069
2855package CFClient::UI::Statusbox; 3070package CFClient::UI::Statusbox;
… …
2960 $self->SUPER::reconfigure; 3175 $self->SUPER::reconfigure;
2961} 3176}
2962 3177
2963############################################################################# 3178#############################################################################
2964 3179
2965package CFClient::UI::Root; 3180package CFClient::UI::Inventory;
2966 3181
2967our @ISA = CFClient::UI::Container::; 3182our @ISA = CFClient::UI::ScrolledWindow::;
2968
2969use CFClient::OpenGL;
2970 3183
2971sub new { 3184sub new {
2972 my $class = shift; 3185 my $class = shift;
2973 3186
2974 $class->SUPER::new ( 3187 my $self = $class->SUPER::new (
3188 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3189 @_,
3190 );
3191
3192 $self
3193}
3194
3195sub set_items {
3196 my ($self, $items) = @_;
3197
3198 $self->{child}->clear;
3199 return unless $items;
3200
3201 my @items = sort {
3202 ($a->{type} <=> $b->{type})
3203 or ($a->{name} cmp $b->{name})
3204 } @$items;
3205
3206 $self->{real_items} = \@items;
3207
3208 my $row = 0;
3209 for my $item (@items) {
3210 CFClient::Item::update_widgets $item;
3211
3212 $self->{child}->add (0, $row, $item->{face_widget});
3213 $self->{child}->add (1, $row, $item->{desc_widget});
3214 $self->{child}->add (2, $row, $item->{weight_widget});
3215
3216 $row++;
3217 }
3218}
3219
3220#############################################################################
3221
3222package CFClient::UI::BindEditor;
3223
3224our @ISA = CFClient::UI::FancyFrame::;
3225
3226sub new {
3227 my $class = shift;
3228
3229 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3230
3231 $self->add (my $vb = new CFClient::UI::VBox);
3232
3233
3234 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3235 text => "start recording",
3236 tooltip => "Start/Stops recording of actions."
3237 ."All subsequent actions after the recording started will be captured."
3238 ."The actions are displayed after the record was stopped."
3239 ."To bind the action you have to click on the 'Bind' button",
3240 on_activate => sub {
3241 unless ($self->{recording}) {
3242 $self->start;
3243 } else {
3244 $self->stop;
3245 }
3246 });
3247
3248 $vb->add (new CFClient::UI::Label text => "Actions:");
3249 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3250
3251 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3252 $vb->add (my $hb = new CFClient::UI::HBox);
3253 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3254 $hb->add (new CFClient::UI::Button
3255 text => "bind",
3256 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3257 on_activate => sub {
3258 $self->ask_for_bind;
3259 });
3260
3261 $vb->add (my $hb = new CFClient::UI::HBox);
3262 $hb->add (new CFClient::UI::Button
3263 text => "ok",
3264 expand => 1,
3265 tooltip => "This closes the binding editor and saves the binding",
3266 on_activate => sub {
3267 $self->hide;
3268 $self->commit;
3269 });
3270
3271 $hb->add (new CFClient::UI::Button
3272 text => "cancel",
3273 expand => 1,
3274 tooltip => "This closes the binding editor without saving",
3275 on_activate => sub {
3276 $self->hide;
3277 $self->{binding_cancel}->()
3278 if $self->{binding_cancel};
3279 });
3280
3281 $self->update_binding_widgets;
3282
3283 $self
3284}
3285
3286sub commit {
3287 my ($self) = @_;
3288 my ($mod, $sym, $cmds) = $self->get_binding;
3289 if ($sym != 0 && @$cmds > 0) {
3290 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3291 ."'. Don't forget 'Save Config'!");
3292 $self->{binding_change}->($mod, $sym, $cmds)
3293 if $self->{binding_change};
3294 } else {
3295 $::STATUSBOX->add ("No action bound, no key or action specified!");
3296 $self->{binding_cancel}->()
3297 if $self->{binding_cancel};
3298 }
3299}
3300
3301sub start {
3302 my ($self) = @_;
3303
3304 $self->{rec_btn}->set_text ("stop recording");
3305 $self->{recording} = 1;
3306 $self->clear_command_list;
3307 $::CONN->start_record if $::CONN;
3308}
3309
3310sub stop {
3311 my ($self) = @_;
3312
3313 $self->{rec_btn}->set_text ("start recording");
3314 $self->{recording} = 0;
3315
3316 my $rec;
3317 $rec = $::CONN->stop_record if $::CONN;
3318 return unless ref $rec eq 'ARRAY';
3319 $self->set_command_list ($rec);
3320}
3321
3322
3323sub ask_for_bind_and_commit {
3324 my ($self) = @_;
3325 $self->ask_for_bind (1);
3326}
3327
3328sub ask_for_bind {
3329 my ($self, $commit) = @_;
3330
3331 CFClient::Binder::open_binding_dialog (sub {
3332 my ($mod, $sym) = @_;
3333 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3334 $self->update_binding_widgets;
3335 $self->commit if $commit;
3336 });
3337}
3338
3339# $mod and $sym are the modifiers and key symbol
3340# $cmds is a array ref of strings (the commands)
3341# $cb is the callback that is executed on OK
3342# $ccb is the callback that is executed on CANCEL and
3343# when the binding was unsuccessful on OK
3344sub set_binding {
3345 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3346
3347 $self->clear_command_list;
3348 $self->{recording} = 0;
3349 $self->{rec_btn}->set_text ("start recording");
3350
3351 $self->{binding} = [$mod, $sym];
3352 $self->{commands} = $cmds;
3353
3354 $self->{binding_change} = $cb;
3355 $self->{binding_cancel} = $ccb;
3356
3357 $self->update_binding_widgets;
3358}
3359
3360# this is a shortcut method that asks for a binding
3361# and then just binds it.
3362sub do_quick_binding {
3363 my ($self, $cmds) = @_;
3364 $self->set_binding (undef, undef, $cmds, sub {
3365 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3366 });
3367 $self->ask_for_bind (1);
3368}
3369
3370sub update_binding_widgets {
3371 my ($self) = @_;
3372 my ($mod, $sym, $cmds) = $self->get_binding;
3373 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3374 $self->set_command_list ($cmds);
3375}
3376
3377sub get_binding {
3378 my ($self) = @_;
3379 return (
3380 $self->{binding}->[0],
3381 $self->{binding}->[1],
3382 [ grep { defined $_ } @{$self->{commands}} ]
3383 );
3384}
3385
3386sub clear_command_list {
3387 my ($self) = @_;
3388 $self->{cmdbox}->clear ();
3389}
3390
3391sub set_command_list {
3392 my ($self, $cmds) = @_;
3393
3394 $self->{cmdbox}->clear ();
3395 $self->{commands} = $cmds;
3396
3397 my $idx = 0;
3398
3399 for (@$cmds) {
3400 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3401
3402 my $i = $idx;
3403 $hb->add (new CFClient::UI::Label text => $_);
3404 $hb->add (new CFClient::UI::Button
3405 text => "delete",
3406 tooltip => "Deletes the action from the record",
3407 on_activate => sub {
3408 $self->{cmdbox}->remove ($hb);
3409 $cmds->[$i] = undef;
3410 });
3411
3412
3413 $idx++
3414 }
3415}
3416
3417#############################################################################
3418
3419package CFClient::UI::SpellList;
3420
3421our @ISA = CFClient::UI::Table::;
3422
3423sub new {
3424 my $class = shift;
3425
3426 my $self = $class->SUPER::new (
3427 binding => [],
3428 commands => [],
3429 @_,
3430 )
3431}
3432
3433# XXX: Do sorting? Argl...
3434sub add_spell {
3435 my ($self, $spell) = @_;
3436 $self->{spells}->{$spell->{name}} = $spell;
3437
3438 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3439 face => $spell->{face},
3440 can_hover => 1,
3441 can_events => 1,
3442 tooltip => $spell->{message});
3443
3444 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3445 text => $spell->{name},
3446 can_hover => 1,
3447 can_events => 1,
3448 tooltip => $spell->{message},
3449 expand => 1);
3450
3451 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3452 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3453 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3454 expand => 1);
3455
3456 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3457 text => "bind to key",
3458 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3459}
3460
3461sub rebuild_spell_list {
3462 my ($self) = @_;
3463 $self->{tbl_idx} = 0;
3464 $self->add_spell ($_) for values %{$self->{spells}};
3465}
3466
3467sub remove_spell {
3468 my ($self, $spell) = @_;
3469 delete $self->{spells}->{$spell->{name}};
3470 $self->rebuild_spell_list;
3471}
3472
3473#############################################################################
3474
3475package CFClient::UI::Root;
3476
3477our @ISA = CFClient::UI::Container::;
3478
3479use CFClient::OpenGL;
3480
3481sub new {
3482 my $class = shift;
3483
3484 my $self = $class->SUPER::new (
2975 visible => 1, 3485 visible => 1,
2976 @_, 3486 @_,
2977 ) 3487 );
2978}
2979 3488
2980sub configure { 3489 Scalar::Util::weaken ($self->{root} = $self);
2981 my ($self, $x, $y, $w, $h) = @_;
2982 3490
2983 $self->{w} = $w; 3491 $self
2984 $self->{h} = $h;
2985}
2986
2987sub check_size {
2988 my ($self) = @_;
2989
2990 $self->size_allocate ($self->{w}, $self->{h})
2991 if $self->{w};
2992} 3492}
2993 3493
2994sub size_request { 3494sub size_request {
2995 my ($self) = @_; 3495 my ($self) = @_;
2996 3496
2997 ($self->{w}, $self->{h}) 3497 ($self->{w}, $self->{h})
3498}
3499
3500sub _to_pixel {
3501 my ($coord, $size, $max) = @_;
3502
3503 $coord =
3504 $coord eq "center" ? ($max - $size) * 0.5
3505 : $coord eq "max" ? $max
3506 : $coord;
3507
3508 $coord = 0 if $coord < 0;
3509 $coord = $max - $size if $coord > $max - $size;
3510
3511 int $coord + 0.5
2998} 3512}
2999 3513
3000sub size_allocate { 3514sub size_allocate {
3001 my ($self, $w, $h) = @_; 3515 my ($self, $w, $h) = @_;
3002 3516
3003 for my $child ($self->children) { 3517 for my $child ($self->children) {
3004 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3518 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3005 3519
3006 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3520 $X = $child->{force_x} if exists $child->{force_x};
3007 if exists $child->{req_x}; 3521 $Y = $child->{force_y} if exists $child->{force_y};
3008 3522
3009 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3523 $X = _to_pixel $X, $W, $self->{w};
3010 if exists $child->{req_y}; 3524 $Y = _to_pixel $Y, $H, $self->{h};
3011
3012 delete @$child{qw(req_x req_y)};
3013
3014 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3015 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3016 3525
3017 $child->configure ($X, $Y, $W, $H); 3526 $child->configure ($X, $Y, $W, $H);
3018 } 3527 }
3019} 3528}
3020 3529
… …
3031} 3540}
3032 3541
3033sub update { 3542sub update {
3034 my ($self) = @_; 3543 my ($self) = @_;
3035 3544
3036 $self->check_size;
3037 $::WANT_REFRESH++; 3545 $::WANT_REFRESH++;
3038} 3546}
3039 3547
3040sub add { 3548sub add {
3041 my ($self, @children) = @_; 3549 my ($self, @children) = @_;
3042 3550
3043 for my $child (@children) {
3044 $child->{is_toplevel} = 1; 3551 $_->{is_toplevel} = 1
3045 3552 for @children;
3046 # integerise window positions
3047 $child->{x} = int $child->{x};
3048 $child->{y} = int $child->{y};
3049 }
3050 3553
3051 $self->SUPER::add (@children); 3554 $self->SUPER::add (@children);
3052
3053 for (my @widgets = @children; my $w = pop @widgets; ) {
3054 push @widgets, $w->children;
3055 $w->set_visible;
3056 }
3057
3058} 3555}
3059 3556
3060sub remove { 3557sub remove {
3061 my ($self, @children) = @_; 3558 my ($self, @children) = @_;
3062 3559
3063 $self->SUPER::remove (@children); 3560 $self->SUPER::remove (@children);
3561
3562 delete $self->{is_toplevel}
3563 for @children;
3064 3564
3065 while (@children) { 3565 while (@children) {
3066 my $w = pop @children; 3566 my $w = pop @children;
3067 push @children, $w->children; 3567 push @children, $w->children;
3068 $w->set_invisible; 3568 $w->set_invisible;
… …
3087 while ($self->{refresh_hook}) { 3587 while ($self->{refresh_hook}) {
3088 $_->() 3588 $_->()
3089 for values %{delete $self->{refresh_hook}}; 3589 for values %{delete $self->{refresh_hook}};
3090 } 3590 }
3091 3591
3092 if ($self->{check_size}) { 3592 if ($self->{realloc}) {
3593 my %queue;
3093 my @queue; 3594 my @queue;
3595 my $widget;
3094 3596
3095 for (;;) { 3597 outer:
3096 if ($self->{check_size}) { 3598 while () {
3097 #TODO use array-of-depth approach 3599 if (my $realloc = delete $self->{realloc}) {
3600 for $widget (values %$realloc) {
3601 $widget->{visible} or next; # do not resize invisible widgets
3098 3602
3099 @queue = sort { $a->{visible} <=> $b->{visible} } 3603 $queue{$widget+0}++ and next; # duplicates are common
3100 @queue, values %{delete $self->{check_size}}; 3604
3605 push @{ $queue[$widget->{visible}] }, $widget;
3606 }
3101 } 3607 }
3102 3608
3609 while () {
3610 @queue or last outer;
3611
3103 my $widget = pop @queue || last; 3612 $widget = pop @{ $queue[-1] || [] }
3104 3613 and last;
3105 defined $widget->{visible} or last; # do not resize invisible widgets
3106
3107 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3108 ? @$widget{qw(def_w def_h)}
3109 : $widget->size_request;
3110
3111 if (delete $widget->{force_alloc}
3112 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3113 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3114 3614
3615 pop @queue;
3616 }
3617
3618 delete $queue{$widget+0};
3619
3620 my ($w, $h) = $widget->size_request;
3621
3622 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3623 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3624
3625 $w = $widget->{force_w} if exists $widget->{force_w};
3626 $h = $widget->{force_h} if exists $widget->{force_h};
3627
3628 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3629 || delete $widget->{force_realloc}) {
3115 $widget->{req_w} = $w; 3630 $widget->{req_w} = $w;
3116 $widget->{req_h} = $h; 3631 $widget->{req_h} = $h;
3117 3632
3118 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3633 $self->{size_alloc}{$widget+0} = $widget;
3119 3634
3120 $widget->{parent}->check_size
3121 if $widget->{parent}; 3635 if (my $parent = $widget->{parent}) {
3636 $self->{realloc}{$parent+0} = $parent
3637 unless $queue{$parent+0};
3638
3639 $parent->{force_size_alloc} = 1;
3640 $self->{size_alloc}{$parent+0} = $parent;
3641 }
3122 } 3642 }
3643
3644 delete $self->{realloc}{$widget+0};
3123 } 3645 }
3124 } 3646 }
3125 3647
3126 while ($self->{size_alloc}) { 3648 while (my $size_alloc = delete $self->{size_alloc}) {
3127 for (values %{delete $self->{size_alloc}}) { 3649 my @queue = sort { $b->{visible} <=> $a->{visible} }
3128 my ($widget, $w, $h) = @$_; 3650 values %$size_alloc;
3651
3652 while () {
3653 my $widget = pop @queue || last;
3654
3655 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3129 3656
3130 $w = 0 if $w < 0; 3657 $w = 0 if $w < 0;
3131 $h = 0 if $h < 0; 3658 $h = 0 if $h < 0;
3132 3659
3660 $w = int $w + 0.5;
3661 $h = int $h + 0.5;
3662
3663 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3664 $widget->{old_w} = $widget->{w};
3665 $widget->{old_h} = $widget->{h};
3666
3133 $widget->{w} = $w; 3667 $widget->{w} = $w;
3134 $widget->{h} = $h; 3668 $widget->{h} = $h;
3669
3135 $widget->emit (size_allocate => $w, $h); 3670 $widget->emit (size_allocate => $w, $h);
3671 }
3136 } 3672 }
3137 } 3673 }
3138 3674
3139 while ($self->{post_alloc_hook}) { 3675 while ($self->{post_alloc_hook}) {
3140 $_->() 3676 $_->()
3141 for values %{delete $self->{post_alloc_hook}}; 3677 for values %{delete $self->{post_alloc_hook}};
3142 } 3678 }
3679
3143 3680
3144 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3681 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3145 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3682 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3146 glClear GL_COLOR_BUFFER_BIT; 3683 glClear GL_COLOR_BUFFER_BIT;
3147 3684
… …
3149 glLoadIdentity; 3686 glLoadIdentity;
3150 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3687 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3151 glMatrixMode GL_MODELVIEW; 3688 glMatrixMode GL_MODELVIEW;
3152 glLoadIdentity; 3689 glLoadIdentity;
3153 3690
3691 {
3692 package CFClient::UI::Base;
3693
3694 ($draw_x, $draw_y, $draw_w, $draw_h) =
3695 (0, 0, $self->{w}, $self->{h});
3696 }
3697
3154 $self->_draw; 3698 $self->_draw;
3155} 3699}
3156 3700
3157############################################################################# 3701#############################################################################
3158 3702

Diff Legend

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