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.299 by root, Wed Jun 7 07:17:37 2006 UTC vs.
Revision 1.303 by elmex, Tue Jun 13 10:28:38 2006 UTC

… …
272 272
273 return unless $self->{visible}; 273 return unless $self->{visible};
274 274
275 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
276 276
277 delete $self->{visible};
277 delete $self->{root}; 278 delete $self->{root};
278 delete $self->{visible};
279 279
280 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
282 282
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
… …
593 593
594sub DESTROY { 594sub DESTROY {
595 my ($self) = @_; 595 my ($self) = @_;
596 596
597 delete $WIDGET{$self+0}; 597 delete $WIDGET{$self+0};
598 #$self->deactivate; 598
599 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
599} 601}
600 602
601############################################################################# 603#############################################################################
602 604
603package CFClient::UI::DrawBG; 605package CFClient::UI::DrawBG;
… …
768} 770}
769 771
770sub add { 772sub add {
771 my ($self, $child) = @_; 773 my ($self, $child) = @_;
772 774
773 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
774
775 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
776} 777}
777 778
778sub remove { 779sub remove {
779 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
… …
1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073 1074
1074sub new { 1075sub new {
1075 my ($class, %arg) = @_; 1076 my ($class, %arg) = @_;
1076
1077 my $title = delete $arg{title};
1078 1077
1079 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
1080 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
1081 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
1082 border => 0.6, 1081 border => 0.6,
… …
1084 min_w => 16, 1083 min_w => 16,
1085 min_h => 16, 1084 min_h => 16,
1086 %arg, 1085 %arg,
1087 ); 1086 );
1088 1087
1089 $self->{title} = new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
1090 align => 0, 1089 align => 0,
1091 valign => 1, 1090 valign => 1,
1092 text => $title, 1091 text => $self->{title},
1093 fontsize => $self->{border} 1092 fontsize => $self->{border},
1094 if defined $title; 1093 if exists $self->{title};
1094
1095 unless ($self->{no_close_button}) {
1096 $self->{close_btn} =
1097 new CFClient::UI::ImageButton
1098 image => 'x1_close.png',
1099 on_activate => sub { $self->hide };
1100
1101 $self->CFClient::UI::Container::add ($self->{close_btn});
1102 }
1095 1103
1096 $self 1104 $self
1097} 1105}
1098 1106
1099sub add { 1107sub add {
1100 my ($self, @widgets) = @_; 1108 my ($self, @widgets) = @_;
1101 1109
1102 $self->SUPER::add (@widgets); 1110 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_btn}) if $self->{close_btn};
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104} 1113}
1105 1114
1106sub border { 1115sub border {
1107 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
1108} 1117}
1109 1118
1110sub size_request { 1119sub size_request {
1111 my ($self) = @_; 1120 my ($self) = @_;
1112 1121
1113 $self->{title}->size_request 1122 $self->{title_widget}->size_request
1114 if $self->{title}; 1123 if $self->{title_widget};
1124
1125 $self->{close_btn}->size_request
1126 if $self->{close_btn};
1115 1127
1116 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
1117 1129
1118 ( 1130 (
1119 $w + $self->border * 2, 1131 $w + $self->border * 2,
… …
1122} 1134}
1123 1135
1124sub size_allocate { 1136sub size_allocate {
1125 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
1126 1138
1127 if ($self->{title}) { 1139 if ($self->{title_widget}) {
1128 $self->{title}{w} = $w; 1140 $self->{title_widget}{w} = $w;
1129 $self->{title}{h} = $h; 1141 $self->{title_widget}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h); 1142 $self->{title_widget}->size_allocate ($w, $h);
1131 } 1143 }
1132 1144
1133 my $border = $self->border; 1145 my $border = $self->border;
1134 1146
1135 $h -= List::Util::max 0, $border * 2; 1147 $h -= List::Util::max 0, $border * 2;
1136 $w -= List::Util::max 0, $border * 2; 1148 $w -= List::Util::max 0, $border * 2;
1137 1149
1138 $self->child->configure ($border, $border, $w, $h); 1150 $self->child->configure ($border, $border, $w, $h);
1151
1152 $self->{close_btn}->configure ($self->{w} - (2 * $border), 0, $border, $border)
1153 if $self->{close_btn};
1139} 1154}
1140 1155
1141sub button_down { 1156sub button_down {
1142 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
1143 1158
… …
1189} 1204}
1190 1205
1191sub button_up { 1206sub button_up {
1192 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
1193 1208
1209 $self->{close_btn}->button_up ($ev, $x, $y)
1210 if $self->{close_btn};
1211
1194 !!delete $self->{motion} 1212 !!delete $self->{motion}
1195} 1213}
1196 1214
1197sub mouse_motion { 1215sub mouse_motion {
1198 my ($self, $ev, $x, $y) = @_; 1216 my ($self, $ev, $x, $y) = @_;
… …
1233 1251
1234 glDisable GL_TEXTURE_2D; 1252 glDisable GL_TEXTURE_2D;
1235 1253
1236 $child->draw; 1254 $child->draw;
1237 1255
1238 if ($self->{title}) { 1256 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1257 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1258 $self->{title_widget}->_draw;
1259
1260 glTranslate 0, - ($border - $self->{h});
1241 } 1261 }
1262
1263 $self->{close_btn}->draw
1264 if $self->{close_btn};
1242} 1265}
1243 1266
1244############################################################################# 1267#############################################################################
1245 1268
1246package CFClient::UI::Table; 1269package CFClient::UI::Table;
… …
1269 1292
1270 $child->set_parent ($self); 1293 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child; 1294 $self->{children}[$y][$x] = $child;
1272 1295
1273 $self->realloc; 1296 $self->realloc;
1297}
1298
1299sub remove {
1300 my ($self, $child) = @_;
1301
1302 # TODO: not yet implemented
1274} 1303}
1275 1304
1276# TODO: move to container class maybe? send children a signal on removal? 1305# TODO: move to container class maybe? send children a signal on removal?
1277sub clear { 1306sub clear {
1278 my ($self) = @_; 1307 my ($self) = @_;
… …
1955 $self->SUPER::_draw; 1984 $self->SUPER::_draw;
1956} 1985}
1957 1986
1958############################################################################# 1987#############################################################################
1959 1988
1989package CFClient::UI::ImageButton;
1990
1991our @ISA = CFClient::UI::Image::;
1992
1993use CFClient::OpenGL;
1994
1995my %textures;
1996
1997sub new {
1998 my $class = shift;
1999
2000 my $self = $class->SUPER::new (
2001 padding_x => 4,
2002 padding_y => 4,
2003 fg => [1, 1, 1],
2004 active_fg => [0, 0, 1],
2005 can_hover => 1,
2006 align => 0,
2007 valign => 0,
2008 can_events => 1,
2009 @_
2010 );
2011}
2012
2013sub activate { }
2014
2015sub button_up {
2016 my ($self, $ev, $x, $y) = @_;
2017
2018 $self->emit ("activate")
2019 if $x >= 0 && $x < $self->{w}
2020 && $y >= 0 && $y < $self->{h};
2021
2022 1
2023}
2024
2025#############################################################################
2026
1960package CFClient::UI::CheckBox; 2027package CFClient::UI::CheckBox;
1961 2028
1962our @ISA = CFClient::UI::DrawBG::; 2029our @ISA = CFClient::UI::DrawBG::;
1963 2030
1964my @tex = 2031my @tex =
… …
2897 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2964 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2898 glDisable GL_TEXTURE_2D; 2965 glDisable GL_TEXTURE_2D;
2899 } 2966 }
2900} 2967}
2901 2968
2902sub DESTROY { 2969sub destroy {
2903 my ($self) = @_; 2970 my ($self) = @_;
2904 2971
2905 $self->{timer}->cancel 2972 $self->{timer}->cancel
2906 if $self->{timer}; 2973 if $self->{timer};
2907 2974
2908 $self->SUPER::DESTROY; 2975 $self->SUPER::destroy;
2909} 2976}
2910 2977
2911############################################################################# 2978#############################################################################
2912 2979
2913package CFClient::UI::Buttonbar; 2980package CFClient::UI::Buttonbar;
… …
3263 $item->{count}++; 3330 $item->{count}++;
3264 } else { 3331 } else {
3265 $item->{count} = 1; 3332 $item->{count} = 1;
3266 $item->{text} = $item->{tooltip} = $text; 3333 $item->{text} = $item->{tooltip} = $text;
3267 } 3334 }
3268 $item->{id} = ++$self->{id}; 3335 $item->{id} += 0.2;#d#
3269 $item->{timeout} = $timeout; 3336 $item->{timeout} = $timeout;
3270 delete $item->{label}; 3337 delete $item->{label};
3271 } else { 3338 } else {
3272 $self->{item}{$group} = { 3339 $self->{item}{$group} = {
3273 id => ++$self->{id}, 3340 id => ++$self->{id},
… …
3292 3359
3293 $self->reorder; 3360 $self->reorder;
3294 $self->SUPER::reconfigure; 3361 $self->SUPER::reconfigure;
3295} 3362}
3296 3363
3297sub DESTROY { 3364sub destroy {
3298 my ($self) = @_; 3365 my ($self) = @_;
3299 3366
3300 $self->{timer}->cancel; 3367 $self->{timer}->cancel;
3301 3368
3302 $self->SUPER::DESTROY; 3369 $self->SUPER::destroy;
3303} 3370}
3304 3371
3305############################################################################# 3372#############################################################################
3306 3373
3307package CFClient::UI::Inventory; 3374package CFClient::UI::Inventory;
… …
3573sub rebuild_spell_list { 3640sub rebuild_spell_list {
3574 my ($self) = @_; 3641 my ($self) = @_;
3575 3642
3576 $CFClient::UI::ROOT->on_refresh ($self => sub { 3643 $CFClient::UI::ROOT->on_refresh ($self => sub {
3577 $self->clear; 3644 $self->clear;
3645
3646 return unless $::CONN;
3578 3647
3579 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME); 3648 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3580 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL); 3649 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3581 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL); 3650 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3582 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP); 3651 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
… …
3652 3721
3653 delete $self->{spell}->{$spell->{name}}; 3722 delete $self->{spell}->{$spell->{name}};
3654 $self->rebuild_spell_list; 3723 $self->rebuild_spell_list;
3655} 3724}
3656 3725
3726sub clear_spells {
3727 my ($self) = @_;
3728
3729 $self->{spell} = {};
3730 $self->rebuild_spell_list;
3731}
3732
3657############################################################################# 3733#############################################################################
3658 3734
3659package CFClient::UI::Root; 3735package CFClient::UI::Root;
3660 3736
3661our @ISA = CFClient::UI::Container::; 3737our @ISA = CFClient::UI::Container::;

Diff Legend

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