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.184 by root, Wed May 3 19:56:05 2006 UTC vs.
Revision 1.193 by root, Wed May 10 21:12:26 2006 UTC

… …
232 $self->{y} = $y; 232 $self->{y} = $y;
233 $self->update; 233 $self->update;
234 } 234 }
235 235
236 if ($self->{w} != $w || $self->{h} != $h) { 236 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 237 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238 $self->{h} = $h;
239
240 $self->size_allocate ($w, $h);
241 $self->update;
242 $self->emit (size_allocate => $w, $h);
243 } 238 }
244} 239}
245 240
246sub size_allocate { 241sub size_allocate {
247 # nothing to be done 242 # nothing to be done
… …
255 my ($self) = @_; 250 my ($self) = @_;
256 251
257 $_->reconfigure 252 $_->reconfigure
258 for $self->children; 253 for $self->children;
259 254
260 $_->check_size; 255 $self->check_size;
256 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
257 $self->update;
261} 258}
262 259
263sub set_max_size { 260sub set_max_size {
264 my ($self, $w, $h) = @_; 261 my ($self, $w, $h) = @_;
265 262
266 delete $self->{max_w}; $self->{max_w} = $w if $w; 263 delete $self->{max_w}; $self->{max_w} = $w if $w;
267 delete $self->{max_h}; $self->{max_h} = $h if $h; 264 delete $self->{max_h}; $self->{max_h} = $h if $h;
268}
269
270# return top left coordinates
271sub _topleft {
272 my ($self, $x, $y) = @_;
273
274 $self->{parent}
275 or Carp::confess "no parent widget in _topleft\n";#d#
276
277 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
278} 265}
279 266
280# translate global coordinates to local coordinate system 267# translate global coordinates to local coordinate system
281sub coord2local { 268sub coord2local {
282 my ($self, $x, $y) = @_; 269 my ($self, $x, $y) = @_;
283 270
284 my ($X, $Y) = $self->_topleft; 271 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
285 ($x - $X, $y - $Y)
286} 272}
287 273
288# translate local coordinates to global coordinate system 274# translate local coordinates to global coordinate system
289sub coord2global { 275sub coord2global {
290 my ($self, $x, $y) = @_; 276 my ($self, $x, $y) = @_;
291 277
292 my ($X, $Y) = $self->_topleft; 278 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
293 ($x + $X, $y + $Y)
294} 279}
295 280
296sub focus_in { 281sub focus_in {
297 my ($self) = @_; 282 my ($self) = @_;
298 283
… …
396 381
397sub set_parent { 382sub set_parent {
398 my ($self, $parent) = @_; 383 my ($self, $parent) = @_;
399 384
400 Scalar::Util::weaken ($self->{parent} = $parent); 385 Scalar::Util::weaken ($self->{parent} = $parent);
386
387 $self->check_size
388 unless exists $self->{req_w};
401} 389}
402 390
403sub check_size { 391sub check_size {
404 my ($self) = @_; 392 my ($self) = @_;
405 393
406 $self->{parent} 394 $CFClient::UI::ROOT->{check_size}{$self} = $self;
407 or return 1;
408
409 my ($w, $h) = $self->{user_w} && $self->{user_h}
410 ? @$self{qw(user_w user_h)}
411 : $self->size_request;
412
413 if ($w != $self->{req_w} || $h != $self->{req_h}) {
414 $self->{req_w} = $w;
415 $self->{req_h} = $h;
416
417 $self->{parent}->check_size
418 or $self->size_allocate (
419 (List::Util::max $self->{w}, $w),
420 (List::Util::max $self->{h}, $h),
421 );
422
423 1
424 } else {
425 0
426 }
427} 395}
428 396
429sub update { 397sub update {
430 my ($self) = @_; 398 my ($self) = @_;
431 399
… …
528 496
529 $self 497 $self
530} 498}
531 499
532sub add { 500sub add {
533 my ($self, $child) = @_; 501 my ($self, @widgets) = @_;
534 502
535 $child->set_parent ($self); 503 $_->set_parent ($self)
504 for @widgets;
536 505
537 use sort 'stable'; 506 use sort 'stable';
538 507
539 $self->{children} = [ 508 $self->{children} = [
540 sort { $a->{z} <=> $b->{z} } 509 sort { $a->{z} <=> $b->{z} }
541 @{$self->{children}}, $child 510 @{$self->{children}}, @widgets
542 ]; 511 ];
543 512
544 $child->check_size; 513 $self->check_size;
545 $self->update; 514 $self->update;
546} 515}
547 516
548sub children { 517sub children {
549 @{ $_[0]{children} } 518 @{ $_[0]{children} }
… …
739 $self->{view_y} = int $y; 708 $self->{view_y} = int $y;
740 709
741 $self->update; 710 $self->update;
742} 711}
743 712
744# hmm, this does not work for topleft of $self... but we should not aks for that 713# hmm, this does not work for topleft of $self... but we should not ask for that
745sub _topleft { 714sub coord2local {
746 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
747 716
748 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y}) 717 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
718}
719
720sub coord2global {
721 my ($self, $x, $y) = @_;
722
723 $x = List::Util::min $self->{w}, $x - $self->{view_x};
724 $y = List::Util::min $self->{h}, $y - $self->{view_y};
725
726 $self->SUPER::coord2global ($x, $y)
749} 727}
750 728
751sub find_widget { 729sub find_widget {
752 my ($self, $x, $y) = @_; 730 my ($self, $x, $y) = @_;
753 731
… …
1234 ) 1212 )
1235} 1213}
1236 1214
1237sub size_allocate { 1215sub size_allocate {
1238 my ($self, $w, $h) = @_; 1216 my ($self, $w, $h) = @_;
1217
1218 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1239 1219
1240 my $children = $self->{children}; 1220 my $children = $self->{children};
1241 1221
1242 my @h = map $_->{req_h}, @$children; 1222 my @h = map $_->{req_h}, @$children;
1243 1223
… …
1322 1302
1323 delete $self->{texture}; 1303 delete $self->{texture};
1324 $self->SUPER::update; 1304 $self->SUPER::update;
1325} 1305}
1326 1306
1327sub reconfigure {
1328 my ($self) = @_;
1329
1330 delete $self->{texture};
1331}
1332
1333sub set_text { 1307sub set_text {
1334 my ($self, $text) = @_; 1308 my ($self, $text) = @_;
1335 1309
1336 return if $self->{text} eq "T$text"; 1310 return if $self->{text} eq "T$text";
1337 $self->{text} = "T$text"; 1311 $self->{text} = "T$text";
1338 1312
1339 $self->{layout}->set_text ($text); 1313 $self->{layout}->set_text ($text);
1340 1314
1341 delete $self->{texture};
1342 $self->update; 1315 $self->update;
1343 $self->check_size; 1316 $self->check_size;
1344} 1317}
1345 1318
1346sub set_markup { 1319sub set_markup {
… …
1349 return if $self->{text} eq "M$markup"; 1322 return if $self->{text} eq "M$markup";
1350 $self->{text} = "M$markup"; 1323 $self->{text} = "M$markup";
1351 1324
1352 $self->{layout}->set_markup ($markup); 1325 $self->{layout}->set_markup ($markup);
1353 1326
1354 delete $self->{texture};
1355 $self->update; 1327 $self->update;
1356 $self->check_size; 1328 $self->check_size;
1357} 1329}
1358 1330
1359sub size_request { 1331sub size_request {
… …
1390sub set_fontsize { 1362sub set_fontsize {
1391 my ($self, $fontsize) = @_; 1363 my ($self, $fontsize) = @_;
1392 1364
1393 $self->{fontsize} = $fontsize; 1365 $self->{fontsize} = $fontsize;
1394 delete $self->{texture}; 1366 delete $self->{texture};
1367
1368 $self->update;
1395 $self->check_size; 1369 $self->check_size;
1396 $self->update;
1397} 1370}
1398 1371
1399sub _draw { 1372sub _draw {
1400 my ($self) = @_; 1373 my ($self) = @_;
1401 1374
… …
2483} 2456}
2484 2457
2485sub _draw { 2458sub _draw {
2486 my ($self) = @_; 2459 my ($self) = @_;
2487 2460
2461 return unless $::CONN;#d# manage and cache textures differently
2488 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2462 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2489 2463
2490 # TODO animation 2464 # TODO animation
2491 if ($tex) { 2465 if ($tex) {
2492 glEnable GL_BLEND; 2466 glEnable GL_BLEND;
… …
2500 } 2474 }
2501} 2475}
2502 2476
2503############################################################################# 2477#############################################################################
2504 2478
2505package CFClient::UI::Menu; 2479package CFClient::UI::InventoryItem;
2506 2480
2507our @ISA = CFClient::UI::FancyFrame::; 2481our @ISA = CFClient::UI::HBox::;
2508
2509use CFClient::OpenGL;
2510 2482
2511sub new { 2483sub new {
2512 my $class = shift; 2484 my $class = shift;
2513 2485
2514 my $self = $class->SUPER::new (
2515 items => [],
2516 z => 100,
2517 @_,
2518 );
2519
2520 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2521
2522 for my $item (@{ $self->{items} }) {
2523 my ($widget, $cb) = @$item;
2524
2525 # handle various types of items, only text for now
2526 if (!ref $widget) {
2527 $widget = new CFClient::UI::Label
2528 can_hover => 1,
2529 can_events => 1,
2530 text => $widget;
2531 }
2532
2533 $self->{item}{$widget} = $item;
2534
2535 $self->{vbox}->add ($widget);
2536 }
2537
2538 $self
2539}
2540
2541# popup given the event (must be a mouse button down event currently)
2542sub popup {
2543 my ($self, $ev) = @_;
2544
2545 $self->emit ("popdown");
2546
2547 # maybe save $GRAB? must be careful about events...
2548 $GRAB = $self;
2549 $self->{button} = $ev->{button};
2550
2551 $self->show;
2552 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2553}
2554
2555sub mouse_motion {
2556 my ($self, $ev, $x, $y) = @_;
2557
2558 # TODO: should use vbox->find_widget or so
2559 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2560 $self->{hover} = $self->{item}{$HOVER};
2561}
2562
2563sub button_up {
2564 my ($self, $ev, $x, $y) = @_;
2565
2566 if ($ev->{button} == $self->{button}) {
2567 undef $GRAB;
2568 $self->hide;
2569
2570 $self->emit ("popdown");
2571 $self->{hover}[1]->() if $self->{hover};
2572 }
2573}
2574
2575#############################################################################
2576
2577package CFClient::UI::Root;
2578
2579our @ISA = CFClient::UI::Container::;
2580
2581use CFClient::OpenGL;
2582
2583sub check_size {
2584 my ($self) = @_;
2585
2586 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2587}
2588
2589sub size_request {
2590 ($::WIDTH, $::HEIGHT)
2591}
2592
2593sub configure {
2594 my ($self, $x, $y, $w, $h) = @_;
2595
2596 $self->SUPER::configure ($x, $y, $w, $h);
2597
2598 for my $child (@{$self->{children}}) {
2599 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2600
2601 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2602 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2603 $child->configure ($X, $Y, $W,$H);
2604 }
2605}
2606
2607sub _topleft {
2608 my ($self, $x, $y) = @_;
2609
2610 ($x, $y)
2611}
2612
2613sub update {
2614 my ($self) = @_;
2615
2616 $self->check_size;
2617 ::refresh ();
2618}
2619
2620sub add {
2621 my ($self, $child) = @_;
2622
2623 # integerize window positions
2624 $child->{x} = int $child->{x};
2625 $child->{y} = int $child->{y};
2626
2627 $self->SUPER::add ($child);
2628}
2629
2630sub on_refresh {
2631 my ($self, $id, $cb) = @_;
2632
2633 $self->{refresh_hook}{$id} = $cb;
2634}
2635
2636sub draw {
2637 my ($self) = @_;
2638
2639 while (my $rcb = delete $self->{refresh_hook}) {
2640 $_->() for values %$rcb;
2641 }
2642
2643 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2644 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2645 glClear GL_COLOR_BUFFER_BIT;
2646
2647 glMatrixMode GL_PROJECTION;
2648 glLoadIdentity;
2649 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2650 glMatrixMode GL_MODELVIEW;
2651 glLoadIdentity;
2652
2653 $self->_draw;
2654}
2655
2656#############################################################################
2657
2658package CFClient::UI::InventoryItem;
2659
2660our @ISA = CFClient::UI::HBox::;
2661
2662sub new {
2663 my $class = shift;
2664
2665 my %args = @_; 2486 my %args = @_;
2666 2487
2667 my $item = $args{item}; 2488 my $item = delete $args{item};
2668 2489
2669 my $desc = $item->{nrof} < 2 2490 my $desc = $item->{nrof} < 2
2670 ? $item->{name} 2491 ? $item->{name}
2671 : "$item->{nrof} $item->{name_pl}"; 2492 : "$item->{nrof} $item->{name_pl}";
2672 2493
… …
2701 2522
2702 1 2523 1
2703 }, 2524 },
2704 %args 2525 %args
2705 ); 2526 );
2527
2706 $self->add(new CFClient::UI::Face 2528 $self->add (new CFClient::UI::Face
2707 can_events => 0, 2529 can_events => 0,
2708 face => $item->{face}, 2530 face => $item->{face},
2709 anim => $item->{anim}, 2531 anim => $item->{anim},
2710 animspeed => $item->{animspeed}); 2532 animspeed => $item->{animspeed},
2533 );
2534
2711 $self->add(new CFClient::UI::Label 2535 $self->add (new CFClient::UI::Label
2712 can_events => 0, 2536 can_events => 0,
2713 text => $desc); 2537 text => $desc,
2538 );
2714 2539
2715 $self 2540 $self
2716} 2541}
2717 2542
2718############################################################################# 2543#############################################################################
… …
2745 for my $item (@items) { 2570 for my $item (@items) {
2746 my $desc = $item->{nrof} < 2 2571 my $desc = $item->{nrof} < 2
2747 ? $item->{name} 2572 ? $item->{name}
2748 : "$item->{nrof} $item->{name_pl}"; 2573 : "$item->{nrof} $item->{name_pl}";
2749 2574
2750 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); 2575 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2751 } 2576 }
2752 2577
2753# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2578# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2754} 2579}
2755 2580
2756sub size_request { 2581sub size_request {
2757 my ($self) = @_; 2582 my ($self) = @_;
2758 ($self->{req_w}, $self->{req_h}); 2583 ($self->{req_w}, $self->{req_h});
2584}
2585
2586#############################################################################
2587
2588package CFClient::UI::Menu;
2589
2590our @ISA = CFClient::UI::FancyFrame::;
2591
2592use CFClient::OpenGL;
2593
2594sub new {
2595 my $class = shift;
2596
2597 my $self = $class->SUPER::new (
2598 items => [],
2599 z => 100,
2600 @_,
2601 );
2602
2603 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2604
2605 for my $item (@{ $self->{items} }) {
2606 my ($widget, $cb) = @$item;
2607
2608 # handle various types of items, only text for now
2609 if (!ref $widget) {
2610 $widget = new CFClient::UI::Label
2611 can_hover => 1,
2612 can_events => 1,
2613 text => $widget;
2614 }
2615
2616 $self->{item}{$widget} = $item;
2617
2618 $self->{vbox}->add ($widget);
2619 }
2620
2621 $self
2622}
2623
2624# popup given the event (must be a mouse button down event currently)
2625sub popup {
2626 my ($self, $ev) = @_;
2627
2628 $self->emit ("popdown");
2629
2630 # maybe save $GRAB? must be careful about events...
2631 $GRAB = $self;
2632 $self->{button} = $ev->{button};
2633
2634 $self->show;
2635 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2636}
2637
2638sub mouse_motion {
2639 my ($self, $ev, $x, $y) = @_;
2640
2641 # TODO: should use vbox->find_widget or so
2642 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2643 $self->{hover} = $self->{item}{$HOVER};
2644}
2645
2646sub button_up {
2647 my ($self, $ev, $x, $y) = @_;
2648
2649 if ($ev->{button} == $self->{button}) {
2650 undef $GRAB;
2651 $self->hide;
2652
2653 $self->emit ("popdown");
2654 $self->{hover}[1]->() if $self->{hover};
2655 }
2656}
2657
2658#############################################################################
2659
2660package CFClient::UI::Root;
2661
2662our @ISA = CFClient::UI::Container::;
2663
2664use CFClient::OpenGL;
2665
2666sub new {
2667 my $class = shift;
2668
2669 $class->SUPER::new (
2670 @_,
2671 )
2672}
2673
2674sub configure {
2675 my ($self, $x, $y, $w, $h) = @_;
2676
2677 $self->{w} = $w;
2678 $self->{h} = $h;
2679}
2680
2681sub check_size {
2682 my ($self) = @_;
2683
2684 $self->size_allocate ($self->{w}, $self->{h})
2685 if $self->{w};
2686}
2687
2688sub size_request {
2689 my ($self) = @_;
2690
2691 ($self->{w}, $self->{h})
2692}
2693
2694sub size_allocate {
2695 my ($self, $w, $h) = @_;
2696
2697 my $old_w = $self->{old_w};
2698 my $old_h = $self->{old_h};
2699
2700 if ($old_w && $old_h) {
2701 for my $child ($self->children) {
2702 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2703 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2704 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2705 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2706 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2707 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2708 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2709 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2710 }
2711 }
2712
2713 for my $child ($self->children) {
2714 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2715
2716 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2717 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2718 $child->configure ($X, $Y, $W, $H);
2719 }
2720
2721 $self->{old_w} = $w;
2722 $self->{old_h} = $h;
2723}
2724
2725sub coord2local {
2726 my ($self, $x, $y) = @_;
2727
2728 ($x, $y)
2729}
2730
2731sub coord2global {
2732 my ($self, $x, $y) = @_;
2733
2734 ($x, $y)
2735}
2736
2737sub update {
2738 my ($self) = @_;
2739
2740 $self->check_size;
2741 $::WANT_REFRESH++;
2742}
2743
2744sub add {
2745 my ($self, $child) = @_;
2746
2747 # integerise window positions
2748 $child->{x} = int $child->{x};
2749 $child->{y} = int $child->{y};
2750
2751 $self->SUPER::add ($child);
2752}
2753
2754sub on_refresh {
2755 my ($self, $id, $cb) = @_;
2756
2757 $self->{refresh_hook}{$id} = $cb;
2758}
2759
2760sub draw {
2761 my ($self) = @_;
2762
2763 if ($self->{check_size}) {
2764 my @queue = ([], []);
2765
2766 for (;;) {
2767 if ($self->{check_size}) {
2768 # heuristic: check containers last
2769 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2770 for values %{delete $self->{check_size}}
2771 }
2772
2773 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2774
2775 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2776 ? @$widget{qw(user_w user_h)}
2777 : $widget->size_request;
2778
2779 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2780 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2781
2782 $widget->{req_w} = $w;
2783 $widget->{req_h} = $h;
2784
2785 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2786
2787 $widget->{parent}->check_size
2788 if $widget->{parent};
2789 }
2790 }
2791 }
2792
2793 while ($self->{size_alloc}) {
2794 for (values %{delete $self->{size_alloc}}) {
2795 my ($widget, $w, $h) = @$_;
2796
2797 $w = 0 if $w < 0;
2798 $h = 0 if $h < 0;
2799
2800 $widget->{w} = $w;
2801 $widget->{h} = $h;
2802 $widget->size_allocate ($w, $h);
2803 $widget->emit (size_allocate => $w, $h);
2804 }
2805 }
2806
2807 while ($self->{refresh_hook}) {
2808 $_->()
2809 for values %{delete $self->{refresh_hook}};
2810 }
2811
2812 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2813 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2814 glClear GL_COLOR_BUFFER_BIT;
2815
2816 glMatrixMode GL_PROJECTION;
2817 glLoadIdentity;
2818 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2819 glMatrixMode GL_MODELVIEW;
2820 glLoadIdentity;
2821
2822 $self->_draw;
2759} 2823}
2760 2824
2761############################################################################# 2825#############################################################################
2762 2826
2763package CFClient::UI; 2827package CFClient::UI;

Diff Legend

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