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.325 by root, Thu Jul 13 01:29:17 2006 UTC vs.
Revision 1.335 by root, Sun Jul 23 16:11:56 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 if (!$BUTTON_STATE) { 101 unless ($BUTTON_STATE) {
89 my $widget = $ROOT->find_widget ($x, $y); 102 my $widget = $ROOT->find_widget ($x, $y);
90 103
91 $GRAB = $widget; 104 $GRAB = $widget;
92 $GRAB->update if $GRAB; 105 $GRAB->update if $GRAB;
93 106
94 $TOOLTIP_WATCHER->cb->(); 107 $TOOLTIP_WATCHER->cb->();
95 } 108 }
96 109
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 110 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
98 111
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 112 if ($GRAB) {
100 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 }
101} 122}
102 123
103sub feed_sdl_button_up_event { 124sub feed_sdl_button_up_event {
104 my ($ev) = @_; 125 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 126
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 127 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 128
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 129 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 130
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 131 $GRAB->emit (button_up => $ev)
112 if $GRAB; 132 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 133
114 if (!$BUTTON_STATE) { 134 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 135 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 136 $grab->update if $grab;
117 $GRAB->update if $GRAB; 137 $GRAB->update if $GRAB;
118 138
139 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 140 $TOOLTIP_WATCHER->cb->();
120 } 141 }
121} 142}
122 143
123sub feed_sdl_motion_event { 144sub feed_sdl_motion_event {
124 my ($ev) = @_; 145 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 146 my ($x, $y) = ($ev->{x}, $ev->{y});
126 147
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 148 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 149
129 if ($widget != $HOVER) { 150 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 151
132 $hover->update if $hover && $hover->{can_hover}; 152 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 153 if $HOVER;
140} 154}
141 155
142# convert position array to integers 156# convert position array to integers
143sub harmonize { 157sub harmonize {
… …
189 203
190 } 204 }
191 } 205 }
192 206
193 reconfigure_widgets; 207 reconfigure_widgets;
208}
209
210#############################################################################
211
212package CFClient::UI::Event;
213
214sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
194} 216}
195 217
196############################################################################# 218#############################################################################
197 219
198package CFClient::UI::Base; 220package CFClient::UI::Base;
… …
407 429
408# translate global coordinates to local coordinate system 430# translate global coordinates to local coordinate system
409sub coord2local { 431sub coord2local {
410 my ($self, $x, $y) = @_; 432 my ($self, $x, $y) = @_;
411 433
434 Carp::confess unless $self->{parent};#d#
435
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 436 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 437}
414 438
415# translate local coordinates to global coordinate system 439# translate local coordinates to global coordinate system
416sub coord2global { 440sub coord2global {
417 my ($self, $x, $y) = @_; 441 my ($self, $x, $y) = @_;
418 442
443 Carp::confess unless $self->{parent};#d#
444
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 445 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 446}
421 447
422sub invoke_focus_in { 448sub invoke_focus_in {
423 my ($self) = @_; 449 my ($self) = @_;
… …
452 478
453 $FOCUS->emit ("focus_out") if $FOCUS; 479 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 480 $self->emit ("focus_in");
455} 481}
456 482
457sub invoke_mouse_motion { 1 } 483sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 484sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 485sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 486sub invoke_key_up { 0 }
487sub invoke_mouse_wheel { 0 }
461 488
462sub invoke_button_down { 489sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 490 my ($self, $ev, $x, $y) = @_;
464 491
465 $self->grab_focus; 492 $self->grab_focus;
466 493
467 1 494 0
468} 495}
469 496
470sub connect { 497sub connect {
471 my ($self, $signal, $cb) = @_; 498 my ($self, $signal, $cb) = @_;
472 499
473 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 }
474} 506}
507
508my %has_coords = (
509 button_down => 1,
510 button_up => 1,
511 mouse_motion => 1,
512 mouse_wheel => 1,
513);
475 514
476sub emit { 515sub emit {
477 my ($self, $signal, @args) = @_; 516 my ($self, $signal, @args) = @_;
478 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
479 #d##TODO# stop propagating at first true, do not use sum 527 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 528 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 529 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 530 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483} 531}
484 532
485sub find_widget { 533sub find_widget {
486 my ($self, $x, $y) = @_; 534 my ($self, $x, $y) = @_;
487 535
… …
683 if $children; 731 if $children;
684 732
685 $self 733 $self
686} 734}
687 735
736sub realloc {
737 my ($self) = @_;
738
739 $self->{force_realloc} = 1;
740 $self->{force_size_alloc} = 1;
741 $self->SUPER::realloc;
742}
743
688sub add { 744sub add {
689 my ($self, @widgets) = @_; 745 my ($self, @widgets) = @_;
690 746
691 $_->set_parent ($self) 747 $_->set_parent ($self)
692 for @widgets; 748 for @widgets;
… …
977 $self->{vp}->set_offset (0, $_[1]); 1033 $self->{vp}->set_offset (0, $_[1]);
978 }, 1034 },
979 ; 1035 ;
980 1036
981 $self = $class->SUPER::new ( 1037 $self = $class->SUPER::new (
982 vp => (new CFClient::UI::ViewPort expand => 1), 1038 vp => (new CFClient::UI::ViewPort expand => 1),
1039 can_events => 1,
983 slider => $slider, 1040 slider => $slider,
984 %arg, 1041 %arg,
985 ); 1042 );
986 1043
987 $self->SUPER::add ($self->{vp}, $self->{slider}); 1044 $self->SUPER::add ($self->{vp}, $self->{slider});
988 $self->add ($child) if $child; 1045 $self->add ($child) if $child;
… …
994 1051
995sub add { 1052sub add {
996 my ($self, $widget) = @_; 1053 my ($self, $widget) = @_;
997 1054
998 $self->{vp}->add ($self->{child} = $widget); 1055 $self->{vp}->add ($self->{child} = $widget);
1056}
1057
1058sub invoke_mouse_wheel {
1059 my ($self, $ev) = @_;
1060
1061 return 0 unless $ev->{dy}; # only vertical movements
1062
1063 $self->{slider}->emit (mouse_wheel => $ev);
1064
1065 1
999} 1066}
1000 1067
1001sub update_slider { 1068sub update_slider {
1002 my ($self) = @_; 1069 my ($self) = @_;
1003 1070
… …
1082 my $self = $class->SUPER::new ( 1149 my $self = $class->SUPER::new (
1083 bg => [1, 1, 1, 1], 1150 bg => [1, 1, 1, 1],
1084 border_bg => [1, 1, 1, 1], 1151 border_bg => [1, 1, 1, 1],
1085 border => 0.6, 1152 border => 0.6,
1086 can_events => 1, 1153 can_events => 1,
1087 min_w => 16, 1154 min_w => 64,
1088 min_h => 16, 1155 min_h => 32,
1089 %arg, 1156 %arg,
1090 ); 1157 );
1091 1158
1092 $self->{title_widget} = new CFClient::UI::Label 1159 $self->{title_widget} = new CFClient::UI::Label
1093 align => 0, 1160 align => 0,
… …
1297sub children { 1364sub children {
1298 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1365 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1299} 1366}
1300 1367
1301sub add { 1368sub add {
1302 my ($self, $x, $y, $child) = @_; 1369 my ($self) = shift;
1303 1370
1371 while (@_) {
1372 my ($x, $y, $child) = splice @_, 0, 3, ();
1304 $child->set_parent ($self); 1373 $child->set_parent ($self);
1305 $self->{children}[$y][$x] = $child; 1374 $self->{children}[$y][$x] = $child;
1375 }
1306 1376
1377 $self->{force_realloc} = 1;
1378 $self->{force_size_alloc} = 1;
1307 $self->realloc; 1379 $self->realloc;
1308} 1380}
1309 1381
1310sub remove { 1382sub remove {
1311 my ($self, $child) = @_; 1383 my ($self, $child) = @_;
… …
1563 } 1635 }
1564 1636
1565 $self 1637 $self
1566} 1638}
1567 1639
1568sub escape($) {
1569 local $_ = $_[0];
1570
1571 s/&/&amp;/g;
1572 s/>/&gt;/g;
1573 s/</&lt;/g;
1574
1575 $_
1576}
1577
1578sub update { 1640sub update {
1579 my ($self) = @_; 1641 my ($self) = @_;
1580 1642
1581 delete $self->{texture}; 1643 delete $self->{texture};
1582 $self->SUPER::update; 1644 $self->SUPER::update;
… …
2118 my $self = $class->SUPER::new ( 2180 my $self = $class->SUPER::new (
2119 can_events => 0, 2181 can_events => 0,
2120 @_, 2182 @_,
2121 ); 2183 );
2122 2184
2185 $self->{path} || $self->{tex}
2186 or Carp::croak "'path' or 'tex' attributes required";
2187
2188 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2189 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2190
2191 Scalar::Util::weaken $texture_cache{$self->{path}};
2192
2193 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2194
2195 $self
2196}
2197
2198sub STORABLE_freeze {
2199 my ($self, $cloning) = @_;
2200
2123 $self->{path} 2201 $self->{path}
2124 or Carp::croak "required attribute 'path' not set"; 2202 or die "cannot serialise CFClient::UI::Image on non-loadable images\n";
2125 2203
2126 $self->{tex} = $texture_cache{$self->{path}} ||= 2204 $self->{path}
2127 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; 2205}
2128 2206
2129 Scalar::Util::weaken $texture_cache{$self->{path}}; 2207sub STORABLE_attach {
2208 my ($self, $cloning, $path) = @_;
2130 2209
2131 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2210 $self->new (path => $path)
2132
2133 $self
2134} 2211}
2135 2212
2136sub size_request { 2213sub size_request {
2137 my ($self) = @_; 2214 my ($self) = @_;
2138 2215
… …
2154 } 2231 }
2155 2232
2156 glEnable GL_TEXTURE_2D; 2233 glEnable GL_TEXTURE_2D;
2157 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2234 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2158 2235
2159 $tex->draw_quad_alpha (0, 0, $w, $h); 2236 $tex->draw_quad (0, 0, $w, $h);
2160 2237
2161 glDisable GL_TEXTURE_2D; 2238 glDisable GL_TEXTURE_2D;
2162} 2239}
2163 2240
2164############################################################################# 2241#############################################################################
… …
2451 } 2528 }
2452 2529
2453 1 2530 1
2454} 2531}
2455 2532
2533sub invoke_mouse_wheel {
2534 my ($self, $ev) = @_;
2535
2536 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2537
2538 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2539
2540 ! ! $delta
2541}
2542
2456sub update { 2543sub update {
2457 my ($self) = @_; 2544 my ($self) = @_;
2458 2545
2459 delete $self->{knob_w}; 2546 delete $self->{knob_w};
2460 $self->SUPER::update; 2547 $self->SUPER::update;
… …
2559sub new { 2646sub new {
2560 my $class = shift; 2647 my $class = shift;
2561 2648
2562 my $self = $class->SUPER::new ( 2649 my $self = $class->SUPER::new (
2563 fontsize => 1, 2650 fontsize => 1,
2564 can_events => 0, 2651 can_events => 1,
2565 indent => 0, 2652 indent => 0,
2566 #font => default_font 2653 #font => default_font
2567 @_, 2654 @_,
2568 2655
2569 layout => (new CFClient::Layout), 2656 layout => (new CFClient::Layout),
… …
2611 2698
2612 local $self->{children} = [$empty, $slider]; 2699 local $self->{children} = [$empty, $slider];
2613 $self->SUPER::invoke_size_allocate ($w, $h) 2700 $self->SUPER::invoke_size_allocate ($w, $h)
2614} 2701}
2615 2702
2703sub invoke_mouse_wheel {
2704 my ($self, $ev) = @_;
2705
2706 return 0 unless $ev->{dy}; # only vertical movements
2707
2708 $self->{children}[1]->emit (mouse_wheel => $ev);
2709
2710 1
2711}
2712
2616sub get_layout { 2713sub get_layout {
2617 my ($self, $para) = @_; 2714 my ($self, $para) = @_;
2618 2715
2619 my $layout = $self->{layout}; 2716 my $layout = $self->{layout};
2620 2717
… …
2916 3013
2917 $self->{root}->on_post_alloc ("move_$self" => sub { 3014 $self->{root}->on_post_alloc ("move_$self" => sub {
2918 my $widget = $self->{owner} 3015 my $widget = $self->{owner}
2919 or return; 3016 or return;
2920 3017
3018 if ($widget->{visible}) {
2921 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3019 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2922 3020
2923 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3021 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2924 if $x + $self->{w} > $self->{root}{w}; 3022 if $x + $self->{w} > $self->{root}{w};
2925 3023
2926 $self->move_abs ($x, $y); 3024 $self->move_abs ($x, $y);
3025 } else {
3026 $self->hide;
3027 }
2927 }); 3028 });
2928} 3029}
2929 3030
2930sub _draw { 3031sub _draw {
2931 my ($self) = @_; 3032 my ($self) = @_;
… …
3469sub new { 3570sub new {
3470 my $class = shift; 3571 my $class = shift;
3471 3572
3472 my $self = $class->SUPER::new ( 3573 my $self = $class->SUPER::new (
3473 col_expand => [0, 1, 0], 3574 col_expand => [0, 1, 0],
3575 items => [],
3474 @_, 3576 @_,
3475 ); 3577 );
3476 3578
3579 $self->set_sort_order (undef);
3580
3477 $self 3581 $self
3582}
3583
3584sub update_items {
3585 my ($self) = @_;
3586
3587 $self->clear;
3588
3589 my @item = $self->{sort}->(@{ $self->{items} });
3590
3591 my @adds;
3592 my $row = 0;
3593 for my $item ($self->{sort}->(@{ $self->{items} })) {
3594 CFClient::Item::update_widgets $item;
3595
3596 push @adds, 0, $row, $item->{face_widget};
3597 push @adds, 1, $row, $item->{desc_widget};
3598 push @adds, 2, $row, $item->{weight_widget};
3599
3600 $row++;
3601 }
3602
3603 $self->add (@adds);
3604}
3605
3606sub set_sort_order {
3607 my ($self, $order) = @_;
3608
3609 $self->{sort} = $order ||= sub {
3610 sort {
3611 $a->{type} <=> $b->{type}
3612 or $a->{name} cmp $b->{name}
3613 } @_
3614 };
3615
3616 $self->update_items;
3478} 3617}
3479 3618
3480sub set_items { 3619sub set_items {
3481 my ($self, $items) = @_; 3620 my ($self, $items) = @_;
3482 3621
3483 $self->clear; 3622 $self->{items} = [$items ? values %$items : ()];
3484 return unless $items; 3623 $self->update_items;
3485
3486 my @items = sort {
3487 ($a->{type} <=> $b->{type})
3488 or ($a->{name} cmp $b->{name})
3489 } values %$items;
3490
3491 $self->{real_items} = \@items;
3492
3493 my $row = 0;
3494 for my $item (@items) {
3495 CFClient::Item::update_widgets $item;
3496
3497 $self->add (0, $row, $item->{face_widget});
3498 $self->add (1, $row, $item->{desc_widget});
3499 $self->add (2, $row, $item->{weight_widget});
3500
3501 $row++;
3502 }
3503} 3624}
3504 3625
3505############################################################################# 3626#############################################################################
3506 3627
3507package CFClient::UI::SpellList; 3628package CFClient::UI::SpellList;
… …
3816 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3937 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3817 3938
3818 $w = 0 if $w < 0; 3939 $w = 0 if $w < 0;
3819 $h = 0 if $h < 0; 3940 $h = 0 if $h < 0;
3820 3941
3942 $w = max $widget->{min_w}, $w;
3943 $h = max $widget->{min_h}, $h;
3944
3945 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3946 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3947
3821 $w = int $w + 0.5; 3948 $w = int $w + 0.5;
3822 $h = int $h + 0.5; 3949 $h = int $h + 0.5;
3823 3950
3824 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3951 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3825 $widget->{old_w} = $widget->{w}; 3952 $widget->{old_w} = $widget->{w};

Diff Legend

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