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.277 by root, Sun Jun 4 00:21:52 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->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1166 $self->realloc;
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; 1179 # HACK: the next line is required to enforce placement
1097 1180 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1098 $self->move ($self->{user_x}, $self->{user_y});
1099 $self->update;
1100 }; 1181 };
1182 } else {
1183 return 0;
1184 }
1185
1101 } 1186 1
1102} 1187}
1103 1188
1104sub button_up { 1189sub button_up {
1105 my ($self, $ev, $x, $y) = @_; 1190 my ($self, $ev, $x, $y) = @_;
1106 1191
1107 delete $self->{motion}; 1192 !!delete $self->{motion}
1108} 1193}
1109 1194
1110sub mouse_motion { 1195sub mouse_motion {
1111 my ($self, $ev, $x, $y) = @_; 1196 my ($self, $ev, $x, $y) = @_;
1112 1197
1113 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1198 $self->{motion}->($ev, $x, $y) if $self->{motion};
1199
1200 !!$self->{motion}
1114} 1201}
1115 1202
1116sub _draw { 1203sub _draw {
1117 my ($self) = @_; 1204 my ($self) = @_;
1118 1205
1206 my $child = $self->{children}[0];
1207
1119 my ($w, $h ) = ($self->{w}, $self->{h}); 1208 my ($w, $h ) = ($self->{w}, $self->{h});
1120 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1209 my ($cw, $ch) = ($child->{w}, $child->{h});
1121 1210
1122 glEnable GL_TEXTURE_2D; 1211 glEnable GL_TEXTURE_2D;
1123 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1212 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1124 1213
1125 my $border = $self->border; 1214 my $border = $self->border;
1126 1215
1127 glColor @{ $self->{border_bg} }; 1216 glColor @{ $self->{border_bg} };
1128 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1217 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1129 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1218 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1130 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1219 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1131 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1220 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1132 1221
1133 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1222 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1134 my $bg = $tex[0]; 1223 glColor @{ $self->{bg} };
1135 1224
1136 # TODO: repeat texture not scale 1225 # TODO: repeat texture not scale
1226 # solve this better(?)
1137 my $rep_x = $cw / $bg->{w}; 1227 $bg->{s} = $cw / $bg->{w};
1138 my $rep_y = $ch / $bg->{h}; 1228 $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); 1229 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1146 } 1230 }
1147 1231
1148 glDisable GL_TEXTURE_2D; 1232 glDisable GL_TEXTURE_2D;
1149 1233
1150 $self->{title}->draw if $self->{title};
1151
1152 $self->child->draw; 1234 $child->draw;
1235
1236 if ($self->{title}) {
1237 glTranslate 0, $border - $self->{h};
1238 $self->{title}->_draw;
1239 }
1153} 1240}
1154 1241
1155############################################################################# 1242#############################################################################
1156 1243
1157package CFClient::UI::Table; 1244package CFClient::UI::Table;
… …
1179 my ($self, $x, $y, $child) = @_; 1266 my ($self, $x, $y, $child) = @_;
1180 1267
1181 $child->set_parent ($self); 1268 $child->set_parent ($self);
1182 $self->{children}[$y][$x] = $child; 1269 $self->{children}[$y][$x] = $child;
1183 1270
1184 $self->check_size (1); 1271 $self->realloc;
1185} 1272}
1186 1273
1187# TODO: move to container class maybe? send children a signal on removal? 1274# TODO: move to container class maybe? send children a signal on removal?
1188sub clear { 1275sub clear {
1189 my ($self) = @_; 1276 my ($self) = @_;
… …
1194 for (@children) { 1281 for (@children) {
1195 delete $_->{parent}; 1282 delete $_->{parent};
1196 $_->hide; 1283 $_->hide;
1197 } 1284 }
1198 1285
1199 $self->check_size (1); 1286 $self->realloc;
1200 $self->update;
1201} 1287}
1202 1288
1203sub get_wh { 1289sub get_wh {
1204 my ($self) = @_; 1290 my ($self) = @_;
1205 1291
… …
1413 ellipsise => 3, # end 1499 ellipsise => 3, # end
1414 layout => (new CFClient::Layout), 1500 layout => (new CFClient::Layout),
1415 fontsize => 1, 1501 fontsize => 1,
1416 align => -1, 1502 align => -1,
1417 valign => -1, 1503 valign => -1,
1418 padding => 2, 1504 padding_x => 2,
1505 padding_y => 2,
1419 can_events => 0, 1506 can_events => 0,
1420 %arg 1507 %arg
1421 ); 1508 );
1422 1509
1423 if (exists $self->{template}) { 1510 if (exists $self->{template}) {
… …
1459 $self->{text} = "T$text"; 1546 $self->{text} = "T$text";
1460 1547
1461 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1548 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1462 $self->{layout}->set_text ($text); 1549 $self->{layout}->set_text ($text);
1463 1550
1551 $self->realloc;
1464 $self->update; 1552 $self->update;
1465 $self->check_size;
1466} 1553}
1467 1554
1468sub set_markup { 1555sub set_markup {
1469 my ($self, $markup) = @_; 1556 my ($self, $markup) = @_;
1470 1557
… …
1474 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1561 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1475 1562
1476 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1563 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1477 $self->{layout}->set_markup ($markup); 1564 $self->{layout}->set_markup ($markup);
1478 1565
1566 $self->realloc;
1479 $self->update; 1567 $self->update;
1480 $self->check_size;
1481} 1568}
1482 1569
1483sub size_request { 1570sub size_request {
1484 my ($self) = @_; 1571 my ($self) = @_;
1485 1572
… …
1499 1586
1500 $w = List::Util::max $w, $w2; 1587 $w = List::Util::max $w, $w2;
1501 $h = List::Util::max $h, $h2; 1588 $h = List::Util::max $h, $h2;
1502 } 1589 }
1503 1590
1504 ( 1591 ($w, $h)
1505 $w + $self->{padding} * 2,
1506 $h + $self->{padding} * 2,
1507 )
1508} 1592}
1509 1593
1510sub size_allocate { 1594sub size_allocate {
1511 my ($self, $w, $h) = @_; 1595 my ($self, $w, $h) = @_;
1512 1596
1597 delete $self->{ox};
1598
1513 delete $self->{texture}; 1599 delete $self->{texture}
1600 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1514} 1601}
1515 1602
1516sub set_fontsize { 1603sub set_fontsize {
1517 my ($self, $fontsize) = @_; 1604 my ($self, $fontsize) = @_;
1518 1605
1519 $self->{fontsize} = $fontsize; 1606 $self->{fontsize} = $fontsize;
1520 delete $self->{texture}; 1607 delete $self->{texture};
1521 1608
1522 $self->update; 1609 $self->realloc;
1523 $self->check_size;
1524} 1610}
1525 1611
1526sub _draw { 1612sub _draw {
1527 my ($self) = @_; 1613 my ($self) = @_;
1528 1614
… …
1534 $self->{layout}->set_width ($self->{w}); 1620 $self->{layout}->set_width ($self->{w});
1535 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1621 $self->{layout}->set_ellipsise ($self->{ellipsise});
1536 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1622 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1537 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1623 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1538 1624
1539 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1625 new_from_layout CFClient::Texture $self->{layout}
1626 };
1540 1627
1628 unless (exists $self->{ox}) {
1541 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1629 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1542 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1630 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1543 : ($self->{w} - $tex->{w}) * 0.5); 1631 : ($self->{w} - $tex->{w}) * 0.5);
1544 1632
1545 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1633 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1546 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1634 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1547 : ($self->{h} - $tex->{h}) * 0.5); 1635 : ($self->{h} - $tex->{h}) * 0.5);
1548
1549 $tex
1550 }; 1636 };
1551 1637
1552 glEnable GL_TEXTURE_2D; 1638 glEnable GL_TEXTURE_2D;
1553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1639 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1554 1640
… …
1592 1678
1593 delete $self->{cur_h}; 1679 delete $self->{cur_h};
1594 1680
1595 return if $self->{text} eq $text; 1681 return if $self->{text} eq $text;
1596 1682
1597 delete $self->{texture};
1598
1599 $self->{last_activity} = $::NOW; 1683 $self->{last_activity} = $::NOW;
1600 $self->{text} = $text; 1684 $self->{text} = $text;
1601 1685
1602 $text =~ s/./*/g if $self->{hidden}; 1686 $text =~ s/./*/g if $self->{hidden};
1603 $self->{layout}->set_text ("$text "); 1687 $self->{layout}->set_text ("$text ");
1604 1688
1605 $self->_emit (changed => $self->{text}); 1689 $self->_emit (changed => $self->{text});
1690 $self->update;
1606} 1691}
1607 1692
1608sub set_text { 1693sub set_text {
1609 my ($self, $text) = @_; 1694 my ($self, $text) = @_;
1610 1695
1611 $self->{cursor} = length $text; 1696 $self->{cursor} = length $text;
1612 $self->_set_text ($text); 1697 $self->_set_text ($text);
1613 $self->update; 1698
1614 $self->check_size; 1699 $self->realloc;
1615} 1700}
1616 1701
1617sub get_text { 1702sub get_text {
1618 $_[0]{text} 1703 $_[0]{text}
1619} 1704}
… …
1649 $self->{cursor} = length $text; 1734 $self->{cursor} = length $text;
1650 } elsif ($uni == 27) { 1735 } elsif ($uni == 27) {
1651 $self->_emit ('escape'); 1736 $self->_emit ('escape');
1652 } elsif ($uni) { 1737 } elsif ($uni) {
1653 substr $text, $self->{cursor}++, 0, chr $uni; 1738 substr $text, $self->{cursor}++, 0, chr $uni;
1739 } else {
1740 return 0;
1654 } 1741 }
1655 1742
1656 $self->_set_text ($text); 1743 $self->_set_text ($text);
1657 $self->update; 1744
1658 $self->check_size; 1745 $self->realloc;
1746
1747 1
1659} 1748}
1660 1749
1661sub focus_in { 1750sub focus_in {
1662 my ($self) = @_; 1751 my ($self) = @_;
1663 1752
… …
1678 utf8::encode $text; 1767 utf8::encode $text;
1679 $self->{cursor} = length substr $text, 0, $idx; 1768 $self->{cursor} = length substr $text, 0, $idx;
1680 1769
1681 $self->_set_text ($self->{text}); 1770 $self->_set_text ($self->{text});
1682 $self->update; 1771 $self->update;
1772
1773 1
1683} 1774}
1684 1775
1685sub mouse_motion { 1776sub mouse_motion {
1686 my ($self, $ev, $x, $y) = @_; 1777 my ($self, $ev, $x, $y) = @_;
1687# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1778# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1779
1780 0
1688} 1781}
1689 1782
1690sub _draw { 1783sub _draw {
1691 my ($self) = @_; 1784 my ($self) = @_;
1692 1785
… …
1769 } else { 1862 } else {
1770 $self->set_text ($self->{history_saveback}); 1863 $self->set_text ($self->{history_saveback});
1771 } 1864 }
1772 1865
1773 } else { 1866 } else {
1774 $self->SUPER::key_down ($ev); 1867 return $self->SUPER::key_down ($ev)
1868 }
1869
1775 } 1870 1
1776
1777} 1871}
1778 1872
1779############################################################################# 1873#############################################################################
1780 1874
1781package CFClient::UI::Button; 1875package CFClient::UI::Button;
… …
1790 1884
1791sub new { 1885sub new {
1792 my $class = shift; 1886 my $class = shift;
1793 1887
1794 $class->SUPER::new ( 1888 $class->SUPER::new (
1795 padding => 4, 1889 padding_x => 4,
1890 padding_y => 4,
1796 fg => [1, 1, 1], 1891 fg => [1, 1, 1],
1797 active_fg => [0, 0, 1], 1892 active_fg => [0, 0, 1],
1798 can_hover => 1, 1893 can_hover => 1,
1799 align => 0, 1894 align => 0,
1800 valign => 0, 1895 valign => 0,
… …
1809 my ($self, $ev, $x, $y) = @_; 1904 my ($self, $ev, $x, $y) = @_;
1810 1905
1811 $self->emit ("activate") 1906 $self->emit ("activate")
1812 if $x >= 0 && $x < $self->{w} 1907 if $x >= 0 && $x < $self->{w}
1813 && $y >= 0 && $y < $self->{h}; 1908 && $y >= 0 && $y < $self->{h};
1909
1910 1
1814} 1911}
1815 1912
1816sub _draw { 1913sub _draw {
1817 my ($self) = @_; 1914 my ($self) = @_;
1818 1915
… …
1847 1944
1848sub new { 1945sub new {
1849 my $class = shift; 1946 my $class = shift;
1850 1947
1851 $class->SUPER::new ( 1948 $class->SUPER::new (
1852 padding => 2, 1949 padding_x => 2,
1950 padding_y => 2,
1853 fg => [1, 1, 1], 1951 fg => [1, 1, 1],
1854 active_fg => [1, 1, 0], 1952 active_fg => [1, 1, 0],
1855 bg => [0, 0, 0, 0.2], 1953 bg => [0, 0, 0, 0.2],
1856 active_bg => [1, 1, 1, 0.5], 1954 active_bg => [1, 1, 1, 0.5],
1857 state => 0, 1955 state => 0,
… …
1861} 1959}
1862 1960
1863sub size_request { 1961sub size_request {
1864 my ($self) = @_; 1962 my ($self) = @_;
1865 1963
1866 ($self->{padding} * 2 + 6) x 2 1964 (6) x 2
1867} 1965}
1868 1966
1869sub button_down { 1967sub button_down {
1870 my ($self, $ev, $x, $y) = @_; 1968 my ($self, $ev, $x, $y) = @_;
1871 1969
1872 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1970 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1873 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1971 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1874 $self->{state} = !$self->{state}; 1972 $self->{state} = !$self->{state};
1875 $self->_emit (changed => $self->{state}); 1973 $self->_emit (changed => $self->{state});
1974 } else {
1975 return 0
1976 }
1977
1876 } 1978 1
1877} 1979}
1878 1980
1879sub _draw { 1981sub _draw {
1880 my ($self) = @_; 1982 my ($self) = @_;
1881 1983
1882 $self->SUPER::_draw; 1984 $self->SUPER::_draw;
1883 1985
1884 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1986 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1885 1987
1886 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1988 my ($w, $h) = @$self{qw(w h)};
1989
1990 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1887 1991
1888 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1992 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1889 1993
1890 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1994 my $tex = $self->{state} ? $tex[1] : $tex[0];
1891 1995
… …
2156 fg => [1, 1, 1], 2260 fg => [1, 1, 1],
2157 active_fg => [0, 0, 0], 2261 active_fg => [0, 0, 0],
2158 bg => [0, 0, 0, 0.2], 2262 bg => [0, 0, 0, 0.2],
2159 active_bg => [1, 1, 1, 0.5], 2263 active_bg => [1, 1, 1, 0.5],
2160 range => [0, 0, 100, 10, 0], 2264 range => [0, 0, 100, 10, 0],
2161 req_w => $::WIDTH / 80, 2265 min_w => $::WIDTH / 80,
2162 req_h => $::WIDTH / 80, 2266 min_h => $::WIDTH / 80,
2163 vertical => 0, 2267 vertical => 0,
2164 can_hover => 1, 2268 can_hover => 1,
2165 inner_pad => 0.02, 2269 inner_pad => 0.02,
2166 @_ 2270 @_
2167 ); 2271 );
… …
2170 $self->update; 2274 $self->update;
2171 2275
2172 $self 2276 $self
2173} 2277}
2174 2278
2279sub changed { }
2280
2175sub set_range { 2281sub set_range {
2176 my ($self, $range) = @_; 2282 my ($self, $range) = @_;
2177 2283
2178 ($range, $self->{range}) = ($self->{range}, $range); 2284 ($range, $self->{range}) = ($self->{range}, $range);
2179 2285
… …
2205} 2311}
2206 2312
2207sub size_request { 2313sub size_request {
2208 my ($self) = @_; 2314 my ($self) = @_;
2209 2315
2210 my $w = $self->{req_w}; 2316 ($self->{req_w}, $self->{req_h})
2211 my $h = $self->{req_h};
2212
2213 $self->{vertical} ? ($h, $w) : ($w, $h)
2214} 2317}
2215 2318
2216sub button_down { 2319sub button_down {
2217 my ($self, $ev, $x, $y) = @_; 2320 my ($self, $ev, $x, $y) = @_;
2218 2321
2219 $self->SUPER::button_down ($ev, $x, $y); 2322 $self->SUPER::button_down ($ev, $x, $y);
2220 2323
2221 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2324 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2222 2325
2223 $self->mouse_motion ($ev, $x, $y); 2326 $self->mouse_motion ($ev, $x, $y)
2224} 2327}
2225 2328
2226sub mouse_motion { 2329sub mouse_motion {
2227 my ($self, $ev, $x, $y) = @_; 2330 my ($self, $ev, $x, $y) = @_;
2228 2331
… …
2232 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2335 my (undef, $lo, $hi, $page) = @{$self->{range}};
2233 2336
2234 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2337 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2235 2338
2236 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2339 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2340 } else {
2341 return 0;
2342 }
2343
2237 } 2344 1
2238} 2345}
2239 2346
2240sub update { 2347sub update {
2241 my ($self) = @_; 2348 my ($self) = @_;
2242 2349
2243 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2350 delete $self->{knob_w};
2351 $self->SUPER::update;
2352}
2353
2354sub _draw {
2355 my ($self) = @_;
2356
2357 unless ($self->{knob_w}) {
2244 $self->set_value ($self->{range}[0]); 2358 $self->set_value ($self->{range}[0]);
2245 2359
2246 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2360 my ($value, $lo, $hi, $page) = @{$self->{range}};
2247 my $range = ($hi - $page - $lo) || 1e-100; 2361 my $range = ($hi - $page - $lo) || 1e-100;
2248 2362
… …
2254 $value = ($value - $lo) / $range; 2368 $value = ($value - $lo) / $range;
2255 $value = $value * $self->{scale} + $self->{offset}; 2369 $value = $value * $self->{scale} + $self->{offset};
2256 2370
2257 $self->{knob_x} = $value - $knob_w * 0.5; 2371 $self->{knob_x} = $value - $knob_w * 0.5;
2258 $self->{knob_w} = $knob_w; 2372 $self->{knob_w} = $knob_w;
2259 }); 2373 }
2260
2261 $self->SUPER::update;
2262}
2263
2264sub _draw {
2265 my ($self) = @_;
2266 2374
2267 $self->SUPER::_draw (); 2375 $self->SUPER::_draw ();
2268 2376
2269 glScale $self->{w}, $self->{h}; 2377 glScale $self->{w}, $self->{h};
2270 2378
… …
2603} 2711}
2604 2712
2605sub set_tooltip_from { 2713sub set_tooltip_from {
2606 my ($self, $widget) = @_; 2714 my ($self, $widget) = @_;
2607 2715
2716 my $tooltip = $widget->{tooltip};
2717
2718 if ($ENV{CFPLUS_DEBUG} & 2) {
2719 $tooltip .= "\n\n" . (ref $widget) . "\n"
2720 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2721 . "req $widget->{req_w} $widget->{req_h}\n"
2722 . "visible $widget->{visible}";
2723 }
2724
2608 $self->add (new CFClient::UI::Label 2725 $self->add (new CFClient::UI::Label
2609 markup => $widget->{tooltip}, 2726 markup => $tooltip,
2610 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2727 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2611 fontsize => 0.8, 2728 fontsize => 0.8,
2612 fg => [0, 0, 0, 1], 2729 fg => [0, 0, 0, 1],
2613 ellipsise => 0, 2730 ellipsise => 0,
2614 font => ($widget->{tooltip_font} || $::FONT_PROP), 2731 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2625 2742
2626sub size_allocate { 2743sub size_allocate {
2627 my ($self, $w, $h) = @_; 2744 my ($self, $w, $h) = @_;
2628 2745
2629 $self->SUPER::size_allocate ($w - 4, $h - 4); 2746 $self->SUPER::size_allocate ($w - 4, $h - 4);
2747}
2748
2749sub visibility_change {
2750 my ($self, $visible) = @_;
2751
2752 return unless $visible;
2753
2754 $self->{root}->on_post_alloc ("move_$self" => sub {
2755 my $widget = $self->{owner}
2756 or return;
2757
2758 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2759
2760 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2761 if $x + $self->{w} > $::WIDTH;
2762
2763 $self->move_abs ($x, $y);
2764 });
2630} 2765}
2631 2766
2632sub _draw { 2767sub _draw {
2633 my ($self) = @_; 2768 my ($self) = @_;
2634 2769
… …
2651 glVertex $w, $h; 2786 glVertex $w, $h;
2652 glVertex $w, 0; 2787 glVertex $w, 0;
2653 glEnd; 2788 glEnd;
2654 2789
2655 glTranslate 2 - 0.375, 2 - 0.375; 2790 glTranslate 2 - 0.375, 2 - 0.375;
2791
2656 $self->SUPER::_draw; 2792 $self->SUPER::_draw;
2657} 2793}
2658 2794
2659############################################################################# 2795#############################################################################
2660 2796
… …
2736 $self->SUPER::DESTROY; 2872 $self->SUPER::DESTROY;
2737} 2873}
2738 2874
2739############################################################################# 2875#############################################################################
2740 2876
2741package CFClient::UI::Inventory; 2877package CFClient::UI::Buttonbar;
2742 2878
2743our @ISA = CFClient::UI::ScrolledWindow::; 2879our @ISA = CFClient::UI::HBox::;
2744 2880
2745sub new { 2881# 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 2882
2781############################################################################# 2883#############################################################################
2782 2884
2783package CFClient::UI::Menu; 2885package CFClient::UI::Menu;
2784 2886
… …
2825 # maybe save $GRAB? must be careful about events... 2927 # maybe save $GRAB? must be careful about events...
2826 $GRAB = $self; 2928 $GRAB = $self;
2827 $self->{button} = $ev->{button}; 2929 $self->{button} = $ev->{button};
2828 2930
2829 $self->show; 2931 $self->show;
2830 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2932 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2831} 2933}
2832 2934
2833sub mouse_motion { 2935sub mouse_motion {
2834 my ($self, $ev, $x, $y) = @_; 2936 my ($self, $ev, $x, $y) = @_;
2835 2937
2836 # TODO: should use vbox->find_widget or so 2938 # TODO: should use vbox->find_widget or so
2837 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2939 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2838 $self->{hover} = $self->{item}{$HOVER}; 2940 $self->{hover} = $self->{item}{$HOVER};
2941
2942 0
2839} 2943}
2840 2944
2841sub button_up { 2945sub button_up {
2842 my ($self, $ev, $x, $y) = @_; 2946 my ($self, $ev, $x, $y) = @_;
2843 2947
… …
2845 undef $GRAB; 2949 undef $GRAB;
2846 $self->hide; 2950 $self->hide;
2847 2951
2848 $self->_emit ("popdown"); 2952 $self->_emit ("popdown");
2849 $self->{hover}[1]->() if $self->{hover}; 2953 $self->{hover}[1]->() if $self->{hover};
2954 } else {
2955 return 0
2956 }
2957
2958 1
2959}
2960
2961#############################################################################
2962
2963package CFClient::UI::Multiplexer;
2964
2965our @ISA = CFClient::UI::Container::;
2966
2967sub new {
2968 my $class = shift;
2969
2970 my $self = $class->SUPER::new (
2971 @_,
2972 );
2973
2974 $self->{current} = $self->{children}[0]
2975 if @{ $self->{children} };
2976
2977 $self
2978}
2979
2980sub add {
2981 my ($self, @widgets) = @_;
2982
2983 $self->SUPER::add (@widgets);
2984
2985 $self->{current} = $self->{children}[0]
2986 if @{ $self->{children} };
2987}
2988
2989sub set_current_page {
2990 my ($self, $page_or_widget) = @_;
2991
2992 my $widget = ref $page_or_widget
2993 ? $page_or_widget
2994 : $self->{children}[$page_or_widget];
2995
2996 $self->{current} = $widget;
2997 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2998
2999 $self->_emit (page_changed => $self->{current});
3000
3001 $self->realloc;
3002}
3003
3004sub visible_children {
3005 $_[0]{current}
3006}
3007
3008sub size_request {
3009 my ($self) = @_;
3010
3011 $self->{current}->size_request
3012}
3013
3014sub size_allocate {
3015 my ($self, $w, $h) = @_;
3016
3017 $self->{current}->configure (0, 0, $w, $h);
3018}
3019
3020sub _draw {
3021 my ($self) = @_;
3022
3023 $self->{current}->draw;
3024}
3025
3026#############################################################################
3027
3028package CFClient::UI::Notebook;
3029
3030our @ISA = CFClient::UI::VBox::;
3031
3032sub new {
3033 my $class = shift;
3034
3035 my $self = $class->SUPER::new (
3036 buttonbar => (new CFClient::UI::Buttonbar),
3037 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3038 # filter => # will be put between multiplexer and $self
3039 @_,
3040 );
2850 } 3041
3042 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3043 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3044
3045 $self
3046}
3047
3048sub add {
3049 my ($self, $title, $widget, $tooltip) = @_;
3050
3051 Scalar::Util::weaken $self;
3052
3053 $self->{buttonbar}->add (new CFClient::UI::Button
3054 markup => $title,
3055 tooltip => $tooltip,
3056 on_activate => sub { $self->set_current_page ($widget) },
3057 );
3058
3059 $self->{multiplexer}->add ($widget);
3060}
3061
3062sub set_current_page {
3063 my ($self, $page) = @_;
3064
3065 $self->{multiplexer}->set_current_page ($page);
3066 $self->_emit (page_changed => $self->{multiplexer}{current});
2851} 3067}
2852 3068
2853############################################################################# 3069#############################################################################
2854 3070
2855package CFClient::UI::Statusbox; 3071package CFClient::UI::Statusbox;
… …
2960 $self->SUPER::reconfigure; 3176 $self->SUPER::reconfigure;
2961} 3177}
2962 3178
2963############################################################################# 3179#############################################################################
2964 3180
2965package CFClient::UI::Root; 3181package CFClient::UI::Inventory;
2966 3182
2967our @ISA = CFClient::UI::Container::; 3183our @ISA = CFClient::UI::ScrolledWindow::;
2968
2969use CFClient::OpenGL;
2970 3184
2971sub new { 3185sub new {
2972 my $class = shift; 3186 my $class = shift;
2973 3187
2974 $class->SUPER::new ( 3188 my $self = $class->SUPER::new (
3189 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3190 @_,
3191 );
3192
3193 $self
3194}
3195
3196sub set_items {
3197 my ($self, $items) = @_;
3198
3199 $self->{child}->clear;
3200 return unless $items;
3201
3202 my @items = sort {
3203 ($a->{type} <=> $b->{type})
3204 or ($a->{name} cmp $b->{name})
3205 } @$items;
3206
3207 $self->{real_items} = \@items;
3208
3209 my $row = 0;
3210 for my $item (@items) {
3211 CFClient::Item::update_widgets $item;
3212
3213 $self->{child}->add (0, $row, $item->{face_widget});
3214 $self->{child}->add (1, $row, $item->{desc_widget});
3215 $self->{child}->add (2, $row, $item->{weight_widget});
3216
3217 $row++;
3218 }
3219}
3220
3221#############################################################################
3222
3223package CFClient::UI::BindEditor;
3224
3225our @ISA = CFClient::UI::FancyFrame::;
3226
3227sub new {
3228 my $class = shift;
3229
3230 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3231
3232 $self->add (my $vb = new CFClient::UI::VBox);
3233
3234
3235 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3236 text => "start recording",
3237 tooltip => "Start/Stops recording of actions."
3238 ."All subsequent actions after the recording started will be captured."
3239 ."The actions are displayed after the record was stopped."
3240 ."To bind the action you have to click on the 'Bind' button",
3241 on_activate => sub {
3242 unless ($self->{recording}) {
3243 $self->start;
3244 } else {
3245 $self->stop;
3246 }
3247 });
3248
3249 $vb->add (new CFClient::UI::Label text => "Actions:");
3250 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3251
3252 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3253 $vb->add (my $hb = new CFClient::UI::HBox);
3254 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3255 $hb->add (new CFClient::UI::Button
3256 text => "bind",
3257 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3258 on_activate => sub {
3259 $self->ask_for_bind;
3260 });
3261
3262 $vb->add (my $hb = new CFClient::UI::HBox);
3263 $hb->add (new CFClient::UI::Button
3264 text => "ok",
3265 expand => 1,
3266 tooltip => "This closes the binding editor and saves the binding",
3267 on_activate => sub {
3268 $self->hide;
3269 $self->commit;
3270 });
3271
3272 $hb->add (new CFClient::UI::Button
3273 text => "cancel",
3274 expand => 1,
3275 tooltip => "This closes the binding editor without saving",
3276 on_activate => sub {
3277 $self->hide;
3278 $self->{binding_cancel}->()
3279 if $self->{binding_cancel};
3280 });
3281
3282 $self->update_binding_widgets;
3283
3284 $self
3285}
3286
3287sub commit {
3288 my ($self) = @_;
3289 my ($mod, $sym, $cmds) = $self->get_binding;
3290 if ($sym != 0 && @$cmds > 0) {
3291 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3292 ."'. Don't forget 'Save Config'!");
3293 $self->{binding_change}->($mod, $sym, $cmds)
3294 if $self->{binding_change};
3295 } else {
3296 $::STATUSBOX->add ("No action bound, no key or action specified!");
3297 $self->{binding_cancel}->()
3298 if $self->{binding_cancel};
3299 }
3300}
3301
3302sub start {
3303 my ($self) = @_;
3304
3305 $self->{rec_btn}->set_text ("stop recording");
3306 $self->{recording} = 1;
3307 $self->clear_command_list;
3308 $::CONN->start_record if $::CONN;
3309}
3310
3311sub stop {
3312 my ($self) = @_;
3313
3314 $self->{rec_btn}->set_text ("start recording");
3315 $self->{recording} = 0;
3316
3317 my $rec;
3318 $rec = $::CONN->stop_record if $::CONN;
3319 return unless ref $rec eq 'ARRAY';
3320 $self->set_command_list ($rec);
3321}
3322
3323
3324sub ask_for_bind_and_commit {
3325 my ($self) = @_;
3326 $self->ask_for_bind (1);
3327}
3328
3329sub ask_for_bind {
3330 my ($self, $commit) = @_;
3331
3332 CFClient::Binder::open_binding_dialog (sub {
3333 my ($mod, $sym) = @_;
3334 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3335 $self->update_binding_widgets;
3336 $self->commit if $commit;
3337 });
3338}
3339
3340# $mod and $sym are the modifiers and key symbol
3341# $cmds is a array ref of strings (the commands)
3342# $cb is the callback that is executed on OK
3343# $ccb is the callback that is executed on CANCEL and
3344# when the binding was unsuccessful on OK
3345sub set_binding {
3346 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3347
3348 $self->clear_command_list;
3349 $self->{recording} = 0;
3350 $self->{rec_btn}->set_text ("start recording");
3351
3352 $self->{binding} = [$mod, $sym];
3353 $self->{commands} = $cmds;
3354
3355 $self->{binding_change} = $cb;
3356 $self->{binding_cancel} = $ccb;
3357
3358 $self->update_binding_widgets;
3359}
3360
3361# this is a shortcut method that asks for a binding
3362# and then just binds it.
3363sub do_quick_binding {
3364 my ($self, $cmds) = @_;
3365 $self->set_binding (undef, undef, $cmds, sub {
3366 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3367 });
3368 $self->ask_for_bind (1);
3369}
3370
3371sub update_binding_widgets {
3372 my ($self) = @_;
3373 my ($mod, $sym, $cmds) = $self->get_binding;
3374 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3375 $self->set_command_list ($cmds);
3376}
3377
3378sub get_binding {
3379 my ($self) = @_;
3380 return (
3381 $self->{binding}->[0],
3382 $self->{binding}->[1],
3383 [ grep { defined $_ } @{$self->{commands}} ]
3384 );
3385}
3386
3387sub clear_command_list {
3388 my ($self) = @_;
3389 $self->{cmdbox}->clear ();
3390}
3391
3392sub set_command_list {
3393 my ($self, $cmds) = @_;
3394
3395 $self->{cmdbox}->clear ();
3396 $self->{commands} = $cmds;
3397
3398 my $idx = 0;
3399
3400 for (@$cmds) {
3401 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3402
3403 my $i = $idx;
3404 $hb->add (new CFClient::UI::Label text => $_);
3405 $hb->add (new CFClient::UI::Button
3406 text => "delete",
3407 tooltip => "Deletes the action from the record",
3408 on_activate => sub {
3409 $self->{cmdbox}->remove ($hb);
3410 $cmds->[$i] = undef;
3411 });
3412
3413
3414 $idx++
3415 }
3416}
3417
3418#############################################################################
3419
3420package CFClient::UI::SpellList;
3421
3422our @ISA = CFClient::UI::Table::;
3423
3424sub new {
3425 my $class = shift;
3426
3427 my $self = $class->SUPER::new (
3428 binding => [],
3429 commands => [],
3430 @_,
3431 )
3432}
3433
3434# XXX: Do sorting? Argl...
3435sub add_spell {
3436 my ($self, $spell) = @_;
3437 $self->{spells}->{$spell->{name}} = $spell;
3438
3439 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3440 face => $spell->{face},
3441 can_hover => 1,
3442 can_events => 1,
3443 tooltip => $spell->{message});
3444
3445 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3446 text => $spell->{name},
3447 can_hover => 1,
3448 can_events => 1,
3449 tooltip => $spell->{message},
3450 expand => 1);
3451
3452 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3453 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3454 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3455 expand => 1);
3456
3457 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3458 text => "bind to key",
3459 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3460}
3461
3462sub rebuild_spell_list {
3463 my ($self) = @_;
3464 $self->{tbl_idx} = 0;
3465 $self->add_spell ($_) for values %{$self->{spells}};
3466}
3467
3468sub remove_spell {
3469 my ($self, $spell) = @_;
3470 delete $self->{spells}->{$spell->{name}};
3471 $self->rebuild_spell_list;
3472}
3473
3474#############################################################################
3475
3476package CFClient::UI::Root;
3477
3478our @ISA = CFClient::UI::Container::;
3479
3480use CFClient::OpenGL;
3481
3482sub new {
3483 my $class = shift;
3484
3485 my $self = $class->SUPER::new (
2975 visible => 1, 3486 visible => 1,
2976 @_, 3487 @_,
2977 ) 3488 );
2978}
2979 3489
2980sub configure { 3490 Scalar::Util::weaken ($self->{root} = $self);
2981 my ($self, $x, $y, $w, $h) = @_;
2982 3491
2983 $self->{w} = $w; 3492 $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} 3493}
2993 3494
2994sub size_request { 3495sub size_request {
2995 my ($self) = @_; 3496 my ($self) = @_;
2996 3497
2997 ($self->{w}, $self->{h}) 3498 ($self->{w}, $self->{h})
3499}
3500
3501sub _to_pixel {
3502 my ($coord, $size, $max) = @_;
3503
3504 $coord =
3505 $coord eq "center" ? ($max - $size) * 0.5
3506 : $coord eq "max" ? $max
3507 : $coord;
3508
3509 $coord = 0 if $coord < 0;
3510 $coord = $max - $size if $coord > $max - $size;
3511
3512 int $coord + 0.5
2998} 3513}
2999 3514
3000sub size_allocate { 3515sub size_allocate {
3001 my ($self, $w, $h) = @_; 3516 my ($self, $w, $h) = @_;
3002 3517
3003 for my $child ($self->children) { 3518 for my $child ($self->children) {
3004 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3519 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3005 3520
3006 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3521 $X = $child->{force_x} if exists $child->{force_x};
3007 if exists $child->{req_x}; 3522 $Y = $child->{force_y} if exists $child->{force_y};
3008 3523
3009 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3524 $X = _to_pixel $X, $W, $self->{w};
3010 if exists $child->{req_y}; 3525 $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 3526
3017 $child->configure ($X, $Y, $W, $H); 3527 $child->configure ($X, $Y, $W, $H);
3018 } 3528 }
3019} 3529}
3020 3530
… …
3031} 3541}
3032 3542
3033sub update { 3543sub update {
3034 my ($self) = @_; 3544 my ($self) = @_;
3035 3545
3036 $self->check_size;
3037 $::WANT_REFRESH++; 3546 $::WANT_REFRESH++;
3038} 3547}
3039 3548
3040sub add { 3549sub add {
3041 my ($self, @children) = @_; 3550 my ($self, @children) = @_;
3042 3551
3043 for my $child (@children) {
3044 $child->{is_toplevel} = 1; 3552 $_->{is_toplevel} = 1
3045 3553 for @children;
3046 # integerise window positions
3047 $child->{x} = int $child->{x};
3048 $child->{y} = int $child->{y};
3049 }
3050 3554
3051 $self->SUPER::add (@children); 3555 $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} 3556}
3059 3557
3060sub remove { 3558sub remove {
3061 my ($self, @children) = @_; 3559 my ($self, @children) = @_;
3062 3560
3063 $self->SUPER::remove (@children); 3561 $self->SUPER::remove (@children);
3562
3563 delete $self->{is_toplevel}
3564 for @children;
3064 3565
3065 while (@children) { 3566 while (@children) {
3066 my $w = pop @children; 3567 my $w = pop @children;
3067 push @children, $w->children; 3568 push @children, $w->children;
3068 $w->set_invisible; 3569 $w->set_invisible;
… …
3087 while ($self->{refresh_hook}) { 3588 while ($self->{refresh_hook}) {
3088 $_->() 3589 $_->()
3089 for values %{delete $self->{refresh_hook}}; 3590 for values %{delete $self->{refresh_hook}};
3090 } 3591 }
3091 3592
3092 if ($self->{check_size}) { 3593 if ($self->{realloc}) {
3594 my %queue;
3093 my @queue; 3595 my @queue;
3596 my $widget;
3094 3597
3095 for (;;) { 3598 outer:
3096 if ($self->{check_size}) { 3599 while () {
3097 #TODO use array-of-depth approach 3600 if (my $realloc = delete $self->{realloc}) {
3601 for $widget (values %$realloc) {
3602 $widget->{visible} or next; # do not resize invisible widgets
3098 3603
3099 @queue = sort { $a->{visible} <=> $b->{visible} } 3604 $queue{$widget+0}++ and next; # duplicates are common
3100 @queue, values %{delete $self->{check_size}}; 3605
3606 push @{ $queue[$widget->{visible}] }, $widget;
3607 }
3101 } 3608 }
3102 3609
3610 while () {
3611 @queue or last outer;
3612
3103 my $widget = pop @queue || last; 3613 $widget = pop @{ $queue[-1] || [] }
3104 3614 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 3615
3616 pop @queue;
3617 }
3618
3619 delete $queue{$widget+0};
3620
3621 my ($w, $h) = $widget->size_request;
3622
3623 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3624 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3625
3626 $w = $widget->{force_w} if exists $widget->{force_w};
3627 $h = $widget->{force_h} if exists $widget->{force_h};
3628
3629 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3630 || delete $widget->{force_realloc}) {
3115 $widget->{req_w} = $w; 3631 $widget->{req_w} = $w;
3116 $widget->{req_h} = $h; 3632 $widget->{req_h} = $h;
3117 3633
3118 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3634 $self->{size_alloc}{$widget+0} = $widget;
3119 3635
3120 $widget->{parent}->check_size
3121 if $widget->{parent}; 3636 if (my $parent = $widget->{parent}) {
3637 $self->{realloc}{$parent+0} = $parent
3638 unless $queue{$parent+0};
3639
3640 $parent->{force_size_alloc} = 1;
3641 $self->{size_alloc}{$parent+0} = $parent;
3642 }
3122 } 3643 }
3644
3645 delete $self->{realloc}{$widget+0};
3123 } 3646 }
3124 } 3647 }
3125 3648
3126 while ($self->{size_alloc}) { 3649 while (my $size_alloc = delete $self->{size_alloc}) {
3127 for (values %{delete $self->{size_alloc}}) { 3650 my @queue = sort { $b->{visible} <=> $a->{visible} }
3128 my ($widget, $w, $h) = @$_; 3651 values %$size_alloc;
3652
3653 while () {
3654 my $widget = pop @queue || last;
3655
3656 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3129 3657
3130 $w = 0 if $w < 0; 3658 $w = 0 if $w < 0;
3131 $h = 0 if $h < 0; 3659 $h = 0 if $h < 0;
3132 3660
3661 $w = int $w + 0.5;
3662 $h = int $h + 0.5;
3663
3664 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3665 $widget->{old_w} = $widget->{w};
3666 $widget->{old_h} = $widget->{h};
3667
3133 $widget->{w} = $w; 3668 $widget->{w} = $w;
3134 $widget->{h} = $h; 3669 $widget->{h} = $h;
3670
3135 $widget->emit (size_allocate => $w, $h); 3671 $widget->emit (size_allocate => $w, $h);
3672 }
3136 } 3673 }
3137 } 3674 }
3138 3675
3139 while ($self->{post_alloc_hook}) { 3676 while ($self->{post_alloc_hook}) {
3140 $_->() 3677 $_->()
3141 for values %{delete $self->{post_alloc_hook}}; 3678 for values %{delete $self->{post_alloc_hook}};
3142 } 3679 }
3680
3143 3681
3144 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3682 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3145 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3683 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3146 glClear GL_COLOR_BUFFER_BIT; 3684 glClear GL_COLOR_BUFFER_BIT;
3147 3685
… …
3149 glLoadIdentity; 3687 glLoadIdentity;
3150 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3688 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3151 glMatrixMode GL_MODELVIEW; 3689 glMatrixMode GL_MODELVIEW;
3152 glLoadIdentity; 3690 glLoadIdentity;
3153 3691
3692 {
3693 package CFClient::UI::Base;
3694
3695 ($draw_x, $draw_y, $draw_w, $draw_h) =
3696 (0, 0, $self->{w}, $self->{h});
3697 }
3698
3154 $self->_draw; 3699 $self->_draw;
3155} 3700}
3156 3701
3157############################################################################# 3702#############################################################################
3158 3703

Diff Legend

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