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.328 by root, Sat Jul 22 13:43:05 2006 UTC vs.
Revision 1.333 by root, Sun Jul 23 11:09:58 2006 UTC

… …
79sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 80 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 81 if $FOCUS;
82} 82}
83 83
84sub check_hover {
85 my ($widget) = @_;
86
87 if ($widget != $HOVER) {
88 my $hover = $HOVER; $HOVER = $widget;
89
90 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover};
92
93 $TOOLTIP_WATCHER->start;
94 }
95}
96
84sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
85 my ($ev) = @_; 98 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
87 100
88 warn "button down $ev->{button}\n";#d#
89
90 if (!$BUTTON_STATE) { 101 unless ($BUTTON_STATE) {
91 my $widget = $ROOT->find_widget ($x, $y); 102 my $widget = $ROOT->find_widget ($x, $y);
92 103
93 $GRAB = $widget; 104 $GRAB = $widget;
94 $GRAB->update if $GRAB; 105 $GRAB->update if $GRAB;
95 106
96 $TOOLTIP_WATCHER->cb->(); 107 $TOOLTIP_WATCHER->cb->();
97 } 108 }
98 109
99 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 110 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
100 111
101 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 112 if ($GRAB) {
102 if $GRAB; 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel
115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9;
117 $GRAB->emit (mouse_wheel => $ev);
118 } else {
119 $GRAB->emit (button_down => $ev)
120 }
121 }
103} 122}
104 123
105sub feed_sdl_button_up_event { 124sub feed_sdl_button_up_event {
106 my ($ev) = @_; 125 my ($ev) = @_;
107 my ($x, $y) = ($ev->{x}, $ev->{y});
108 126
109 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 127 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
110 128
111 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 129 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
112 130
113 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 131 $GRAB->emit (button_up => $ev)
114 if $GRAB; 132 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
115 133
116 if (!$BUTTON_STATE) { 134 unless ($BUTTON_STATE) {
117 my $grab = $GRAB; undef $GRAB; 135 my $grab = $GRAB; undef $GRAB;
118 $grab->update if $grab; 136 $grab->update if $grab;
119 $GRAB->update if $GRAB; 137 $GRAB->update if $GRAB;
120 138
139 check_hover $widget;
121 $TOOLTIP_WATCHER->cb->(); 140 $TOOLTIP_WATCHER->cb->();
122 } 141 }
123} 142}
124 143
125sub feed_sdl_motion_event { 144sub feed_sdl_motion_event {
126 my ($ev) = @_; 145 my ($ev) = @_;
127 my ($x, $y) = ($ev->{x}, $ev->{y}); 146 my ($x, $y) = ($ev->{x}, $ev->{y});
128 147
129 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 148 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
130 149
131 if ($widget != $HOVER) { 150 check_hover $widget;
132 my $hover = $HOVER; $HOVER = $widget;
133 151
134 $hover->update if $hover && $hover->{can_hover}; 152 $HOVER->emit (mouse_motion => $ev)
135 $HOVER->update if $HOVER && $HOVER->{can_hover};
136
137 $TOOLTIP_WATCHER->start;
138 }
139
140 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
141 if $HOVER; 153 if $HOVER;
142} 154}
143 155
144# convert position array to integers 156# convert position array to integers
145sub harmonize { 157sub harmonize {
… …
191 203
192 } 204 }
193 } 205 }
194 206
195 reconfigure_widgets; 207 reconfigure_widgets;
208}
209
210#############################################################################
211
212package CFClient::UI::Event;
213
214sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
196} 216}
197 217
198############################################################################# 218#############################################################################
199 219
200package CFClient::UI::Base; 220package CFClient::UI::Base;
… …
409 429
410# translate global coordinates to local coordinate system 430# translate global coordinates to local coordinate system
411sub coord2local { 431sub coord2local {
412 my ($self, $x, $y) = @_; 432 my ($self, $x, $y) = @_;
413 433
434 Carp::confess unless $self->{parent};#d#
435
414 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 436 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
415} 437}
416 438
417# translate local coordinates to global coordinate system 439# translate local coordinates to global coordinate system
418sub coord2global { 440sub coord2global {
419 my ($self, $x, $y) = @_; 441 my ($self, $x, $y) = @_;
442
443 Carp::confess unless $self->{parent};#d#
420 444
421 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 445 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
422} 446}
423 447
424sub invoke_focus_in { 448sub invoke_focus_in {
… …
458 482
459sub invoke_mouse_motion { 0 } 483sub invoke_mouse_motion { 0 }
460sub invoke_button_up { 0 } 484sub invoke_button_up { 0 }
461sub invoke_key_down { 0 } 485sub invoke_key_down { 0 }
462sub invoke_key_up { 0 } 486sub invoke_key_up { 0 }
487sub invoke_mouse_wheel { 0 }
463 488
464sub invoke_button_down { 489sub invoke_button_down {
465 my ($self, $ev, $x, $y) = @_; 490 my ($self, $ev, $x, $y) = @_;
466 491
467 $self->grab_focus; 492 $self->grab_focus;
468 493
469 warn "button down $ev->{button} $x $y\n";#d#
470
471 0 494 0
472} 495}
473 496
474sub connect { 497sub connect {
475 my ($self, $signal, $cb) = @_; 498 my ($self, $signal, $cb) = @_;
476 499
477 push @{ $self->{signal_cb}{$signal} }, $cb; 500 push @{ $self->{signal_cb}{$signal} }, $cb;
501
502 defined wantarray and CFClient::guard {
503 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504 @{ $self->{signal_cb}{$signal} };
505 }
478} 506}
507
508my %has_coords = (
509 button_down => 1,
510 button_up => 1,
511 mouse_motion => 1,
512 mouse_wheel => 1,
513);
479 514
480sub emit { 515sub emit {
481 my ($self, $signal, @args) = @_; 516 my ($self, $signal, @args) = @_;
482 517
518 # I do not really like this solution, but I dislike duplication
519 # and needlessly verbose code, too.
520 my @append
521 = $has_coords{$signal}
522 ? $args[0]->xy ($self)
523 : ();
524
525 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
526
483 #d##TODO# stop propagating at first true, do not use sum 527 #d##TODO# stop propagating at first true, do not use sum
484 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 528 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
485 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 529 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
486 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 530 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
487} 531}
488 532
489sub find_widget { 533sub find_widget {
490 my ($self, $x, $y) = @_; 534 my ($self, $x, $y) = @_;
491 535
… …
687 if $children; 731 if $children;
688 732
689 $self 733 $self
690} 734}
691 735
736sub realloc {
737 my ($self) = @_;
738
739 $self->{force_realloc} = 1;
740 $self->{force_size_alloc} = 1;
741 $self->SUPER::realloc;
742}
743
692sub add { 744sub add {
693 my ($self, @widgets) = @_; 745 my ($self, @widgets) = @_;
694 746
695 $_->set_parent ($self) 747 $_->set_parent ($self)
696 for @widgets; 748 for @widgets;
… …
981 $self->{vp}->set_offset (0, $_[1]); 1033 $self->{vp}->set_offset (0, $_[1]);
982 }, 1034 },
983 ; 1035 ;
984 1036
985 $self = $class->SUPER::new ( 1037 $self = $class->SUPER::new (
986 vp => (new CFClient::UI::ViewPort expand => 1), 1038 vp => (new CFClient::UI::ViewPort expand => 1),
1039 can_events => 1,
987 slider => $slider, 1040 slider => $slider,
988 %arg, 1041 %arg,
989 ); 1042 );
990 1043
991 $self->SUPER::add ($self->{vp}, $self->{slider}); 1044 $self->SUPER::add ($self->{vp}, $self->{slider});
992 $self->add ($child) if $child; 1045 $self->add ($child) if $child;
… …
1000 my ($self, $widget) = @_; 1053 my ($self, $widget) = @_;
1001 1054
1002 $self->{vp}->add ($self->{child} = $widget); 1055 $self->{vp}->add ($self->{child} = $widget);
1003} 1056}
1004 1057
1005sub invoke_button_down { 1058sub invoke_mouse_wheel {
1006 my ($self, $ev) = @_; 1059 my ($self, $ev) = @_;
1007 1060
1008 warn "button down $ev->{button}\n";#d# 1061 return 0 unless $ev->{dy}; # only vertical movements
1062
1063 $self->{slider}->emit (mouse_wheel => $ev);
1064
1009 1065 1
1010 0
1011} 1066}
1012 1067
1013sub update_slider { 1068sub update_slider {
1014 my ($self) = @_; 1069 my ($self) = @_;
1015 1070
… …
1309sub children { 1364sub children {
1310 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1365 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1311} 1366}
1312 1367
1313sub add { 1368sub add {
1314 my ($self, $x, $y, $child) = @_; 1369 my ($self) = shift;
1315 1370
1371 while (@_) {
1372 my ($x, $y, $child) = splice @_, 0, 3, ();
1316 $child->set_parent ($self); 1373 $child->set_parent ($self);
1317 $self->{children}[$y][$x] = $child; 1374 $self->{children}[$y][$x] = $child;
1375 }
1318 1376
1377 $self->{force_realloc} = 1;
1378 $self->{force_size_alloc} = 1;
1319 $self->realloc; 1379 $self->realloc;
1320} 1380}
1321 1381
1322sub remove { 1382sub remove {
1323 my ($self, $child) = @_; 1383 my ($self, $child) = @_;
… …
2463 } 2523 }
2464 2524
2465 1 2525 1
2466} 2526}
2467 2527
2528sub invoke_mouse_wheel {
2529 my ($self, $ev) = @_;
2530
2531 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2532
2533 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2534
2535 ! ! $delta
2536}
2537
2468sub update { 2538sub update {
2469 my ($self) = @_; 2539 my ($self) = @_;
2470 2540
2471 delete $self->{knob_w}; 2541 delete $self->{knob_w};
2472 $self->SUPER::update; 2542 $self->SUPER::update;
… …
2571sub new { 2641sub new {
2572 my $class = shift; 2642 my $class = shift;
2573 2643
2574 my $self = $class->SUPER::new ( 2644 my $self = $class->SUPER::new (
2575 fontsize => 1, 2645 fontsize => 1,
2576 can_events => 0, 2646 can_events => 1,
2577 indent => 0, 2647 indent => 0,
2578 #font => default_font 2648 #font => default_font
2579 @_, 2649 @_,
2580 2650
2581 layout => (new CFClient::Layout), 2651 layout => (new CFClient::Layout),
… …
2623 2693
2624 local $self->{children} = [$empty, $slider]; 2694 local $self->{children} = [$empty, $slider];
2625 $self->SUPER::invoke_size_allocate ($w, $h) 2695 $self->SUPER::invoke_size_allocate ($w, $h)
2626} 2696}
2627 2697
2698sub invoke_mouse_wheel {
2699 my ($self, $ev) = @_;
2700
2701 return 0 unless $ev->{dy}; # only vertical movements
2702
2703 $self->{children}[1]->emit (mouse_wheel => $ev);
2704
2705 1
2706}
2707
2628sub get_layout { 2708sub get_layout {
2629 my ($self, $para) = @_; 2709 my ($self, $para) = @_;
2630 2710
2631 my $layout = $self->{layout}; 2711 my $layout = $self->{layout};
2632 2712
… …
2928 3008
2929 $self->{root}->on_post_alloc ("move_$self" => sub { 3009 $self->{root}->on_post_alloc ("move_$self" => sub {
2930 my $widget = $self->{owner} 3010 my $widget = $self->{owner}
2931 or return; 3011 or return;
2932 3012
3013 if ($widget->{visible}) {
2933 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3014 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2934 3015
2935 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3016 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2936 if $x + $self->{w} > $self->{root}{w}; 3017 if $x + $self->{w} > $self->{root}{w};
2937 3018
2938 $self->move_abs ($x, $y); 3019 $self->move_abs ($x, $y);
3020 } else {
3021 $self->hide;
3022 }
2939 }); 3023 });
2940} 3024}
2941 3025
2942sub _draw { 3026sub _draw {
2943 my ($self) = @_; 3027 my ($self) = @_;
… …
3481sub new { 3565sub new {
3482 my $class = shift; 3566 my $class = shift;
3483 3567
3484 my $self = $class->SUPER::new ( 3568 my $self = $class->SUPER::new (
3485 col_expand => [0, 1, 0], 3569 col_expand => [0, 1, 0],
3570 items => [],
3486 @_, 3571 @_,
3487 ); 3572 );
3488 3573
3574 $self->set_sort_order (undef);
3575
3489 $self 3576 $self
3577}
3578
3579sub update_items {
3580 my ($self) = @_;
3581
3582 $self->clear;
3583
3584 my @item = $self->{sort}->(@{ $self->{items} });
3585
3586 my @adds;
3587 my $row = 0;
3588 for my $item ($self->{sort}->(@{ $self->{items} })) {
3589 CFClient::Item::update_widgets $item;
3590
3591 push @adds, 0, $row, $item->{face_widget};
3592 push @adds, 1, $row, $item->{desc_widget};
3593 push @adds, 2, $row, $item->{weight_widget};
3594
3595 $row++;
3596 }
3597
3598 $self->add (@adds);
3599}
3600
3601sub set_sort_order {
3602 my ($self, $order) = @_;
3603
3604 $self->{sort} = $order ||= sub {
3605 sort {
3606 $a->{type} <=> $b->{type}
3607 or $a->{name} cmp $b->{name}
3608 } @_
3609 };
3610
3611 $self->update_items;
3490} 3612}
3491 3613
3492sub set_items { 3614sub set_items {
3493 my ($self, $items) = @_; 3615 my ($self, $items) = @_;
3494 3616
3495 $self->clear; 3617 $self->{items} = [$items ? values %$items : ()];
3496 return unless $items; 3618 $self->update_items;
3497
3498 my @items = sort {
3499 ($a->{type} <=> $b->{type})
3500 or ($a->{name} cmp $b->{name})
3501 } values %$items;
3502
3503 $self->{real_items} = \@items;
3504
3505 my $row = 0;
3506 for my $item (@items) {
3507 CFClient::Item::update_widgets $item;
3508
3509 $self->add (0, $row, $item->{face_widget});
3510 $self->add (1, $row, $item->{desc_widget});
3511 $self->add (2, $row, $item->{weight_widget});
3512
3513 $row++;
3514 }
3515} 3619}
3516 3620
3517############################################################################# 3621#############################################################################
3518 3622
3519package CFClient::UI::SpellList; 3623package CFClient::UI::SpellList;

Diff Legend

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