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.301 by elmex, Mon Jun 12 12:28:06 2006 UTC vs.
Revision 1.308 by root, Mon Jun 19 05:18:14 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->()
284 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
285 285
286 $self->focus_out; 286 $self->emit ("focus_out");
287
288 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
289} 288}
290 289
291sub set_visibility { 290sub set_visibility {
292 my ($self, $visible) = @_; 291 my ($self, $visible) = @_;
… …
367 366
368 $self->{root}{size_alloc}{$self+0} = $self; 367 $self->{root}{size_alloc}{$self+0} = $self;
369 } 368 }
370} 369}
371 370
372sub size_allocate {
373 # nothing to be done
374}
375
376sub children { 371sub children {
377 # nop 372 # nop
378} 373}
379 374
380sub visible_children { 375sub visible_children {
… …
418 my ($self, $x, $y) = @_; 413 my ($self, $x, $y) = @_;
419 414
420 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421} 416}
422 417
423sub focus_in { 418sub invoke_focus_in {
424 my ($self) = @_; 419 my ($self) = @_;
425 420
426 return if $FOCUS == $self; 421 return if $FOCUS == $self;
427 return unless $self->{can_focus}; 422 return unless $self->{can_focus};
428 423
429 my $focus = $FOCUS; $FOCUS = $self; 424 my $focus = $FOCUS; $FOCUS = $self;
430 425
431 $self->_emit (focus_in => $focus);
432
433 $focus->update if $focus; 426 $focus->update if $focus;
434 $FOCUS->update; 427 $FOCUS->update;
435}
436 428
429 0
430}
431
437sub focus_out { 432sub invoke_focus_out {
438 my ($self) = @_; 433 my ($self) = @_;
439 434
440 return unless $FOCUS == $self; 435 return unless $FOCUS == $self;
441 436
442 my $focus = $FOCUS; undef $FOCUS; 437 my $focus = $FOCUS; undef $FOCUS;
443 438
444 $self->_emit (focus_out => $focus);
445
446 $focus->update if $focus; #? 439 $focus->update if $focus; #?
447 440
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449 unless $FOCUS; 442 unless $FOCUS;
450}
451 443
444 0
445}
446
447sub grab_focus {
448 my ($self) = @_;
449
450 $self->emit ("focus_in");
451}
452
452sub mouse_motion { 0 } 453sub invoke_mouse_motion { 1 }
453sub button_up { 0 } 454sub invoke_button_up { 1 }
454sub key_down { 0 } 455sub invoke_key_down { 1 }
455sub key_up { 0 } 456sub invoke_key_up { 1 }
456 457
457sub button_down { 458sub invoke_button_down {
458 my ($self, $ev, $x, $y) = @_; 459 my ($self, $ev, $x, $y) = @_;
459 460
460 $self->focus_in; 461 $self->grab_focus;
461 462
462 0 463 1
464}
465
466sub connect {
467 my ($self, $signal, $cb) = @_;
468
469 push @{ $self->{signal_cb}{$signal} }, $cb;
470}
471
472sub emit {
473 my ($self, $signal, @args) = @_;
474
475 #d##TODO# stop propagating at first true, do not use sum
476 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
477 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
478 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
463} 479}
464 480
465sub find_widget { 481sub find_widget {
466 my ($self, $x, $y) = @_; 482 my ($self, $x, $y) = @_;
467 483
… …
477sub set_parent { 493sub set_parent {
478 my ($self, $parent) = @_; 494 my ($self, $parent) = @_;
479 495
480 Scalar::Util::weaken ($self->{parent} = $parent); 496 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible}; 497 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505} 498}
506 499
507sub realloc { 500sub realloc {
508 my ($self) = @_; 501 my ($self) = @_;
509 502
… …
593 586
594sub DESTROY { 587sub DESTROY {
595 my ($self) = @_; 588 my ($self) = @_;
596 589
597 delete $WIDGET{$self+0}; 590 delete $WIDGET{$self+0};
598 #$self->deactivate; 591
592 eval { $self->destroy };
593 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
599} 594}
600 595
601############################################################################# 596#############################################################################
602 597
603package CFClient::UI::DrawBG; 598package CFClient::UI::DrawBG;
… …
768} 763}
769 764
770sub add { 765sub add {
771 my ($self, $child) = @_; 766 my ($self, $child) = @_;
772 767
773 $self->{children} = []; 768 $self->SUPER::remove ($_) for @{ $self->{children} };
774
775 $self->SUPER::add ($child); 769 $self->SUPER::add ($child);
776} 770}
777 771
778sub remove { 772sub remove {
779 my ($self, $widget) = @_; 773 my ($self, $widget) = @_;
… …
788 782
789sub size_request { 783sub size_request {
790 $_[0]{children}[0]->size_request 784 $_[0]{children}[0]->size_request
791} 785}
792 786
793sub size_allocate { 787sub invoke_size_allocate {
794 my ($self, $w, $h) = @_; 788 my ($self, $w, $h) = @_;
795 789
796 $self->{children}[0]->configure (0, 0, $w, $h); 790 $self->{children}[0]->configure (0, 0, $w, $h);
791
792 1
797} 793}
798 794
799############################################################################# 795#############################################################################
800 796
801# back-buffered drawing area 797# back-buffered drawing area
… …
817 813
818 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 814 $ROOT->on_post_alloc ($self => sub { $self->render_child });
819 $self->SUPER::update; 815 $self->SUPER::update;
820} 816}
821 817
822sub size_allocate { 818sub invoke_size_allocate {
823 my ($self, $w, $h) = @_; 819 my ($self, $w, $h) = @_;
824 820
825 $self->SUPER::size_allocate ($w, $h);
826 $self->update; 821 $self->update;
822
823 $self->SUPER::invoke_size_allocate ($w, $h)
827} 824}
828 825
829sub _render { 826sub _render {
830 my ($self) = @_; 827 my ($self) = @_;
831 828
… …
892 $h = 10 if $self->{scroll_y}; 889 $h = 10 if $self->{scroll_y};
893 890
894 ($w, $h) 891 ($w, $h)
895} 892}
896 893
897sub size_allocate { 894sub invoke_size_allocate {
898 my ($self, $w, $h) = @_; 895 my ($self, $w, $h) = @_;
899 896
900 my $child = $self->child; 897 my $child = $self->child;
901 898
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 899 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 900 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904 901
905 $self->child->configure (0, 0, $w, $h); 902 $self->child->configure (0, 0, $w, $h);
906 $self->update; 903 $self->update;
904
905 1
907} 906}
908 907
909sub set_offset { 908sub set_offset {
910 my ($self, $x, $y) = @_; 909 my ($self, $x, $y) = @_;
911 910
… …
1001 # todo: overwrite size_allocate of child 1000 # todo: overwrite size_allocate of child
1002 my $child = $self->{vp}->child; 1001 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004} 1003}
1005 1004
1006sub size_allocate { 1005sub invoke_size_allocate {
1007 my ($self, $w, $h) = @_; 1006 my ($self, $w, $h) = @_;
1008
1009 $self->SUPER::size_allocate ($w, $h);
1010 1007
1011 my $child = $self->{vp}->child; 1008 my $child = $self->{vp}->child;
1012 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010
1011 $self->SUPER::invoke_size_allocate ($w, $h)
1013} 1012}
1014 1013
1015#TODO# update range on size_allocate depending on child 1014#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll 1015# update viewport offset on scroll
1017 1016
… …
1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 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); 1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073 1072
1074sub new { 1073sub new {
1075 my ($class, %arg) = @_; 1074 my ($class, %arg) = @_;
1076
1077 my $title = delete $arg{title};
1078 1075
1079 my $self = $class->SUPER::new ( 1076 my $self = $class->SUPER::new (
1080 bg => [1, 1, 1, 1], 1077 bg => [1, 1, 1, 1],
1081 border_bg => [1, 1, 1, 1], 1078 border_bg => [1, 1, 1, 1],
1082 border => 0.6, 1079 border => 0.6,
… …
1084 min_w => 16, 1081 min_w => 16,
1085 min_h => 16, 1082 min_h => 16,
1086 %arg, 1083 %arg,
1087 ); 1084 );
1088 1085
1089 $self->{title} = new CFClient::UI::Label 1086 $self->{title_widget} = new CFClient::UI::Label
1090 align => 0, 1087 align => 0,
1091 valign => 1, 1088 valign => 1,
1092 text => $title, 1089 text => $self->{title},
1093 fontsize => $self->{border} 1090 fontsize => $self->{border},
1094 if defined $title; 1091 if exists $self->{title};
1092
1093 if ($self->{has_close_button}) {
1094 $self->{close_button} =
1095 new CFClient::UI::ImageButton
1096 image => 'x1_close.png',
1097 on_activate => sub { $self->hide };
1098
1099 $self->CFClient::UI::Container::add ($self->{close_button});
1100 }
1095 1101
1096 $self 1102 $self
1097} 1103}
1098 1104
1099sub add { 1105sub add {
1100 my ($self, @widgets) = @_; 1106 my ($self, @widgets) = @_;
1101 1107
1102 $self->SUPER::add (@widgets); 1108 $self->SUPER::add (@widgets);
1109 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1110 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104} 1111}
1105 1112
1106sub border { 1113sub border {
1107 int $_[0]{border} * $::FONTSIZE 1114 int $_[0]{border} * $::FONTSIZE
1108} 1115}
1109 1116
1110sub size_request { 1117sub size_request {
1111 my ($self) = @_; 1118 my ($self) = @_;
1112 1119
1113 $self->{title}->size_request 1120 $self->{title_widget}->size_request
1114 if $self->{title}; 1121 if $self->{title_widget};
1122
1123 $self->{close_button}->size_request
1124 if $self->{close_button};
1115 1125
1116 my ($w, $h) = $self->SUPER::size_request; 1126 my ($w, $h) = $self->SUPER::size_request;
1117 1127
1118 ( 1128 (
1119 $w + $self->border * 2, 1129 $w + $self->border * 2,
1120 $h + $self->border * 2, 1130 $h + $self->border * 2,
1121 ) 1131 )
1122} 1132}
1123 1133
1124sub size_allocate { 1134sub invoke_size_allocate {
1125 my ($self, $w, $h) = @_; 1135 my ($self, $w, $h) = @_;
1126 1136
1127 if ($self->{title}) { 1137 if ($self->{title_widget}) {
1128 $self->{title}{w} = $w; 1138 $self->{title_widget}{w} = $w;
1129 $self->{title}{h} = $h; 1139 $self->{title_widget}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h); 1140 $self->{title_widget}->invoke_size_allocate ($w, $h);
1131 } 1141 }
1132 1142
1133 my $border = $self->border; 1143 my $border = $self->border;
1134 1144
1135 $h -= List::Util::max 0, $border * 2; 1145 $h -= List::Util::max 0, $border * 2;
1136 $w -= List::Util::max 0, $border * 2; 1146 $w -= List::Util::max 0, $border * 2;
1137 1147
1138 $self->child->configure ($border, $border, $w, $h); 1148 $self->child->configure ($border, $border, $w, $h);
1139}
1140 1149
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button};
1152
1153 1
1154}
1155
1141sub button_down { 1156sub invoke_button_down {
1142 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
1143 1158
1144 my ($w, $h) = @$self{qw(w h)}; 1159 my ($w, $h) = @$self{qw(w h)};
1145 my $border = $self->border; 1160 my $border = $self->border;
1146 1161
… …
1177 1192
1178 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
1179 1194
1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement 1196 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1197 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183 }; 1198 };
1184 } else { 1199 } else {
1185 return 0; 1200 return 0;
1186 } 1201 }
1187 1202
1188 1 1203 1
1189} 1204}
1190 1205
1191sub button_up { 1206sub invoke_button_up {
1192 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
1193 1208
1194 !!delete $self->{motion} 1209 ! ! delete $self->{motion}
1195} 1210}
1196 1211
1197sub mouse_motion { 1212sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_; 1213 my ($self, $ev, $x, $y) = @_;
1199 1214
1200 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1215 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201 1216
1202 !!$self->{motion} 1217 ! ! $self->{motion}
1203} 1218}
1204 1219
1205sub _draw { 1220sub _draw {
1206 my ($self) = @_; 1221 my ($self) = @_;
1207 1222
… …
1233 1248
1234 glDisable GL_TEXTURE_2D; 1249 glDisable GL_TEXTURE_2D;
1235 1250
1236 $child->draw; 1251 $child->draw;
1237 1252
1238 if ($self->{title}) { 1253 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1254 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1255 $self->{title_widget}->_draw;
1256
1257 glTranslate 0, - ($border - $self->{h});
1241 } 1258 }
1259
1260 $self->{close_button}->draw
1261 if $self->{close_button};
1242} 1262}
1243 1263
1244############################################################################# 1264#############################################################################
1245 1265
1246package CFClient::UI::Table; 1266package CFClient::UI::Table;
… …
1269 1289
1270 $child->set_parent ($self); 1290 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child; 1291 $self->{children}[$y][$x] = $child;
1272 1292
1273 $self->realloc; 1293 $self->realloc;
1294}
1295
1296sub remove {
1297 my ($self, $child) = @_;
1298
1299 # TODO: not yet implemented
1274} 1300}
1275 1301
1276# TODO: move to container class maybe? send children a signal on removal? 1302# TODO: move to container class maybe? send children a signal on removal?
1277sub clear { 1303sub clear {
1278 my ($self) = @_; 1304 my ($self) = @_;
… …
1319 (sum @$ws), 1345 (sum @$ws),
1320 (sum @$hs), 1346 (sum @$hs),
1321 ) 1347 )
1322} 1348}
1323 1349
1324sub size_allocate { 1350sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1351 my ($self, $w, $h) = @_;
1326 1352
1327 my ($ws, $hs) = $self->get_wh; 1353 my ($ws, $hs) = $self->get_wh;
1328 1354
1329 my $req_w = (sum @$ws) || 1; 1355 my $req_w = (sum @$ws) || 1;
… …
1361 } 1387 }
1362 1388
1363 $y += $row_h; 1389 $y += $row_h;
1364 } 1390 }
1365 1391
1392 1
1366} 1393}
1367 1394
1368sub find_widget { 1395sub find_widget {
1369 my ($self, $x, $y) = @_; 1396 my ($self, $x, $y) = @_;
1370 1397
… …
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1434 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1435 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 ) 1436 )
1410} 1437}
1411 1438
1412sub size_allocate { 1439sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1440 my ($self, $w, $h) = @_;
1414 1441
1415 my $space = $self->{vertical} ? $h : $w; 1442 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1443 my $children = $self->{children};
1417 1444
… …
1604 }; 1631 };
1605 1632
1606 @{ $self->{size_req} } 1633 @{ $self->{size_req} }
1607} 1634}
1608 1635
1609sub size_allocate { 1636sub invoke_size_allocate {
1610 my ($self, $w, $h) = @_; 1637 my ($self, $w, $h) = @_;
1611 1638
1612 delete $self->{ox}; 1639 delete $self->{ox};
1613 1640
1614 delete $self->{texture} 1641 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1642 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1643
1644 1
1616} 1645}
1617 1646
1618sub set_fontsize { 1647sub set_fontsize {
1619 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1620 1649
… …
1713 1742
1714 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1715 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1716 delete $self->{size_req}; 1745 delete $self->{size_req};
1717 1746
1718 $self->_emit (changed => $self->{text}); 1747 $self->emit (changed => $self->{text});
1719 1748
1720 $self->realloc; 1749 $self->realloc;
1721 $self->update; 1750 $self->update;
1722} 1751}
1723 1752
… …
1738 my ($w, $h) = $self->SUPER::size_request; 1767 my ($w, $h) = $self->SUPER::size_request;
1739 1768
1740 ($w + 1, $h) # add 1 for cursor 1769 ($w + 1, $h) # add 1 for cursor
1741} 1770}
1742 1771
1743sub key_down { 1772sub invoke_key_down {
1744 my ($self, $ev) = @_; 1773 my ($self, $ev) = @_;
1745 1774
1746 my $mod = $ev->{mod}; 1775 my $mod = $ev->{mod};
1747 my $sym = $ev->{sym}; 1776 my $sym = $ev->{sym};
1748 my $uni = $ev->{unicode}; 1777 my $uni = $ev->{unicode};
… …
1760 } elsif ($sym == CFClient::SDLK_HOME) { 1789 } elsif ($sym == CFClient::SDLK_HOME) {
1761 $self->{cursor} = 0; 1790 $self->{cursor} = 0;
1762 } elsif ($sym == CFClient::SDLK_END) { 1791 } elsif ($sym == CFClient::SDLK_END) {
1763 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1764 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1765 $self->_emit ('escape'); 1794 $self->emit ('escape');
1766 } elsif ($uni) { 1795 } elsif ($uni) {
1767 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1768 } else { 1797 } else {
1769 return 0; 1798 return 0;
1770 } 1799 }
… …
1774 $self->realloc; 1803 $self->realloc;
1775 1804
1776 1 1805 1
1777} 1806}
1778 1807
1779sub focus_in { 1808sub invoke_focus_in {
1780 my ($self) = @_; 1809 my ($self) = @_;
1781 1810
1782 $self->{last_activity} = $::NOW; 1811 $self->{last_activity} = $::NOW;
1783 1812
1784 $self->SUPER::focus_in; 1813 $self->SUPER::invoke_focus_in
1785} 1814}
1786 1815
1787sub button_down { 1816sub invoke_button_down {
1788 my ($self, $ev, $x, $y) = @_; 1817 my ($self, $ev, $x, $y) = @_;
1789 1818
1790 $self->SUPER::button_down ($ev, $x, $y); 1819 $self->SUPER::invoke_button_down ($ev, $x, $y);
1791 1820
1792 my $idx = $self->{layout}->xy_to_index ($x, $y); 1821 my $idx = $self->{layout}->xy_to_index ($x, $y);
1793 1822
1794 # byte-index to char-index 1823 # byte-index to char-index
1795 my $text = $self->{text}; 1824 my $text = $self->{text};
… …
1800 $self->update; 1829 $self->update;
1801 1830
1802 1 1831 1
1803} 1832}
1804 1833
1805sub mouse_motion { 1834sub invoke_mouse_motion {
1806 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1807# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1808 1837
1809 0 1838 1
1810} 1839}
1811 1840
1812sub _draw { 1841sub _draw {
1813 my ($self) = @_; 1842 my ($self) = @_;
1814 1843
… …
1855 1884
1856our @ISA = CFClient::UI::EntryBase::; 1885our @ISA = CFClient::UI::EntryBase::;
1857 1886
1858use CFClient::OpenGL; 1887use CFClient::OpenGL;
1859 1888
1860sub key_down { 1889sub invoke_key_down {
1861 my ($self, $ev) = @_; 1890 my ($self, $ev) = @_;
1862 1891
1863 my $sym = $ev->{sym}; 1892 my $sym = $ev->{sym};
1864 1893
1865 if ($sym == 13) { 1894 if ($sym == 13) {
1866 unshift @{$self->{history}}, 1895 unshift @{$self->{history}},
1867 my $txt = $self->get_text; 1896 my $txt = $self->get_text;
1897
1868 $self->{history_pointer} = -1; 1898 $self->{history_pointer} = -1;
1869 $self->{history_saveback} = ''; 1899 $self->{history_saveback} = '';
1870 $self->_emit (activate => $txt); 1900 $self->emit (activate => $txt);
1871 $self->update; 1901 $self->update;
1872 1902
1873 } elsif ($sym == CFClient::SDLK_UP) { 1903 } elsif ($sym == CFClient::SDLK_UP) {
1874 if ($self->{history_pointer} < 0) { 1904 if ($self->{history_pointer} < 0) {
1875 $self->{history_saveback} = $self->get_text; 1905 $self->{history_saveback} = $self->get_text;
… …
1891 } else { 1921 } else {
1892 $self->set_text ($self->{history_saveback}); 1922 $self->set_text ($self->{history_saveback});
1893 } 1923 }
1894 1924
1895 } else { 1925 } else {
1896 return $self->SUPER::key_down ($ev) 1926 return $self->SUPER::invoke_key_down ($ev)
1897 } 1927 }
1898 1928
1899 1 1929 1
1900} 1930}
1901 1931
… …
1925 can_events => 1, 1955 can_events => 1,
1926 @_ 1956 @_
1927 ) 1957 )
1928} 1958}
1929 1959
1930sub activate { }
1931
1932sub button_up { 1960sub invoke_button_up {
1933 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1934 1962
1935 $self->emit ("activate") 1963 $self->emit ("activate")
1936 if $x >= 0 && $x < $self->{w} 1964 if $x >= 0 && $x < $self->{w}
1937 && $y >= 0 && $y < $self->{h}; 1965 && $y >= 0 && $y < $self->{h};
… …
1951 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1979 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1952 1980
1953 glDisable GL_TEXTURE_2D; 1981 glDisable GL_TEXTURE_2D;
1954 1982
1955 $self->SUPER::_draw; 1983 $self->SUPER::_draw;
1984}
1985
1986#############################################################################
1987
1988package CFClient::UI::ImageButton;
1989
1990our @ISA = CFClient::UI::Image::;
1991
1992use CFClient::OpenGL;
1993
1994my %textures;
1995
1996sub new {
1997 my $class = shift;
1998
1999 my $self = $class->SUPER::new (
2000 padding_x => 4,
2001 padding_y => 4,
2002 fg => [1, 1, 1],
2003 active_fg => [0, 0, 1],
2004 can_hover => 1,
2005 align => 0,
2006 valign => 0,
2007 can_events => 1,
2008 @_
2009 );
2010}
2011
2012sub invoke_button_up {
2013 my ($self, $ev, $x, $y) = @_;
2014
2015 $self->emit ("activate")
2016 if $x >= 0 && $x < $self->{w}
2017 && $y >= 0 && $y < $self->{h};
2018
2019 1
1956} 2020}
1957 2021
1958############################################################################# 2022#############################################################################
1959 2023
1960package CFClient::UI::CheckBox; 2024package CFClient::UI::CheckBox;
… …
1987 my ($self) = @_; 2051 my ($self) = @_;
1988 2052
1989 (6) x 2 2053 (6) x 2
1990} 2054}
1991 2055
1992sub button_down { 2056sub invoke_button_down {
1993 my ($self, $ev, $x, $y) = @_; 2057 my ($self, $ev, $x, $y) = @_;
1994 2058
1995 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1996 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1997 $self->{state} = !$self->{state}; 2061 $self->{state} = !$self->{state};
1998 $self->_emit (changed => $self->{state}); 2062 $self->emit (changed => $self->{state});
1999 } else { 2063 } else {
2000 return 0 2064 return 0
2001 } 2065 }
2002 2066
2003 1 2067 1
… …
2300 $self->update; 2364 $self->update;
2301 2365
2302 $self 2366 $self
2303} 2367}
2304 2368
2305sub changed { }
2306
2307sub set_range { 2369sub set_range {
2308 my ($self, $range) = @_; 2370 my ($self, $range) = @_;
2309 2371
2310 ($range, $self->{range}) = ($self->{range}, $range); 2372 ($range, $self->{range}) = ($self->{range}, $range);
2311 2373
… …
2331 if $unit; 2393 if $unit;
2332 2394
2333 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2395 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2334 2396
2335 if ($value != $old_value) { 2397 if ($value != $old_value) {
2336 $self->_emit (changed => $value); 2398 $self->emit (changed => $value);
2337 $self->update; 2399 $self->update;
2338 } 2400 }
2339} 2401}
2340 2402
2341sub size_request { 2403sub size_request {
2342 my ($self) = @_; 2404 my ($self) = @_;
2343 2405
2344 ($self->{req_w}, $self->{req_h}) 2406 ($self->{req_w}, $self->{req_h})
2345} 2407}
2346 2408
2347sub button_down { 2409sub invoke_button_down {
2348 my ($self, $ev, $x, $y) = @_; 2410 my ($self, $ev, $x, $y) = @_;
2349 2411
2350 $self->SUPER::button_down ($ev, $x, $y); 2412 $self->SUPER::invoke_button_down ($ev, $x, $y);
2351 2413
2352 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2414 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2353 2415
2354 $self->mouse_motion ($ev, $x, $y) 2416 $self->invoke_mouse_motion ($ev, $x, $y)
2355} 2417}
2356 2418
2357sub mouse_motion { 2419sub invoke_mouse_motion {
2358 my ($self, $ev, $x, $y) = @_; 2420 my ($self, $ev, $x, $y) = @_;
2359 2421
2360 if ($GRAB == $self) { 2422 if ($GRAB == $self) {
2361 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2423 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2362 2424
… …
2504 2566
2505 $self->{fontsize} = $fontsize; 2567 $self->{fontsize} = $fontsize;
2506 $self->reflow; 2568 $self->reflow;
2507} 2569}
2508 2570
2509sub size_allocate { 2571sub invoke_size_allocate {
2510 my ($self, $w, $h) = @_; 2572 my ($self, $w, $h) = @_;
2511
2512 $self->SUPER::size_allocate ($w, $h);
2513 2573
2514 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2574 $self->{layout}->set_font ($self->{font}) if $self->{font};
2515 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2516 $self->{layout}->set_width ($self->{children}[0]{w}); 2576 $self->{layout}->set_width ($self->{children}[0]{w});
2517 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2577 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2518 2578
2519 $self->reflow; 2579 $self->reflow;
2580
2581 $self->SUPER::invoke_size_allocate ($w, $h)
2520} 2582}
2521 2583
2522sub text_size { 2584sub text_size {
2523 my ($self, $text, $indent) = @_; 2585 my ($self, $text, $indent) = @_;
2524 2586
… …
2774 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2836 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2775 2837
2776 ($w + 4, $h + 4) 2838 ($w + 4, $h + 4)
2777} 2839}
2778 2840
2779sub size_allocate { 2841sub invoke_size_allocate {
2780 my ($self, $w, $h) = @_; 2842 my ($self, $w, $h) = @_;
2781 2843
2782 $self->SUPER::size_allocate ($w - 4, $h - 4); 2844 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2783} 2845}
2784 2846
2785sub visibility_change { 2847sub invoke_visibility_change {
2786 my ($self, $visible) = @_; 2848 my ($self, $visible) = @_;
2787 2849
2788 return unless $visible; 2850 return unless $visible;
2789 2851
2790 $self->{root}->on_post_alloc ("move_$self" => sub { 2852 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2897 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2959 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2898 glDisable GL_TEXTURE_2D; 2960 glDisable GL_TEXTURE_2D;
2899 } 2961 }
2900} 2962}
2901 2963
2902sub DESTROY { 2964sub destroy {
2903 my ($self) = @_; 2965 my ($self) = @_;
2904 2966
2905 $self->{timer}->cancel 2967 $self->{timer}->cancel
2906 if $self->{timer}; 2968 if $self->{timer};
2907 2969
2908 $self->SUPER::DESTROY; 2970 $self->SUPER::destroy;
2909} 2971}
2910 2972
2911############################################################################# 2973#############################################################################
2912 2974
2913package CFClient::UI::Buttonbar; 2975package CFClient::UI::Buttonbar;
… …
2957 3019
2958# popup given the event (must be a mouse button down event currently) 3020# popup given the event (must be a mouse button down event currently)
2959sub popup { 3021sub popup {
2960 my ($self, $ev) = @_; 3022 my ($self, $ev) = @_;
2961 3023
2962 $self->_emit ("popdown"); 3024 $self->emit ("popdown");
2963 3025
2964 # maybe save $GRAB? must be careful about events... 3026 # maybe save $GRAB? must be careful about events...
2965 $GRAB = $self; 3027 $GRAB = $self;
2966 $self->{button} = $ev->{button}; 3028 $self->{button} = $ev->{button};
2967 3029
2968 $self->show; 3030 $self->show;
2969 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3031 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2970} 3032}
2971 3033
2972sub mouse_motion { 3034sub invoke_mouse_motion {
2973 my ($self, $ev, $x, $y) = @_; 3035 my ($self, $ev, $x, $y) = @_;
2974 3036
2975 # TODO: should use vbox->find_widget or so 3037 # TODO: should use vbox->find_widget or so
2976 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3038 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2977 $self->{hover} = $self->{item}{$HOVER}; 3039 $self->{hover} = $self->{item}{$HOVER};
2978 3040
2979 0 3041 0
2980} 3042}
2981 3043
2982sub button_up { 3044sub invoke_button_up {
2983 my ($self, $ev, $x, $y) = @_; 3045 my ($self, $ev, $x, $y) = @_;
2984 3046
2985 if ($ev->{button} == $self->{button}) { 3047 if ($ev->{button} == $self->{button}) {
2986 undef $GRAB; 3048 undef $GRAB;
2987 $self->hide; 3049 $self->hide;
2988 3050
2989 $self->_emit ("popdown"); 3051 $self->emit ("popdown");
2990 $self->{hover}[1]->() if $self->{hover}; 3052 $self->{hover}[1]->() if $self->{hover};
2991 } else { 3053 } else {
2992 return 0 3054 return 0
2993 } 3055 }
2994 3056
… …
3031 : $self->{children}[$page_or_widget]; 3093 : $self->{children}[$page_or_widget];
3032 3094
3033 $self->{current} = $widget; 3095 $self->{current} = $widget;
3034 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3096 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3035 3097
3036 $self->_emit (page_changed => $self->{current}); 3098 $self->emit (page_changed => $self->{current});
3037 3099
3038 $self->realloc; 3100 $self->realloc;
3039} 3101}
3040 3102
3041sub visible_children { 3103sub visible_children {
… …
3046 my ($self) = @_; 3108 my ($self) = @_;
3047 3109
3048 $self->{current}->size_request 3110 $self->{current}->size_request
3049} 3111}
3050 3112
3051sub size_allocate { 3113sub invoke_size_allocate {
3052 my ($self, $w, $h) = @_; 3114 my ($self, $w, $h) = @_;
3053 3115
3054 $self->{current}->configure (0, 0, $w, $h); 3116 $self->{current}->configure (0, 0, $w, $h);
3117
3118 1
3055} 3119}
3056 3120
3057sub _draw { 3121sub _draw {
3058 my ($self) = @_; 3122 my ($self) = @_;
3059 3123
… …
3098 3162
3099sub set_current_page { 3163sub set_current_page {
3100 my ($self, $page) = @_; 3164 my ($self, $page) = @_;
3101 3165
3102 $self->{multiplexer}->set_current_page ($page); 3166 $self->{multiplexer}->set_current_page ($page);
3103 $self->_emit (page_changed => $self->{multiplexer}{current}); 3167 $self->emit (page_changed => $self->{multiplexer}{current});
3104} 3168}
3105 3169
3106############################################################################# 3170#############################################################################
3107 3171
3108package CFClient::UI::Combobox; 3172package CFClient::UI::Combobox;
… …
3123 $self->_set_value ($self->{value}); 3187 $self->_set_value ($self->{value});
3124 3188
3125 $self 3189 $self
3126} 3190}
3127 3191
3128sub button_down { 3192sub invoke_button_down {
3129 my ($self, $ev) = @_; 3193 my ($self, $ev) = @_;
3130 3194
3131 my @menu_items; 3195 my @menu_items;
3132 3196
3133 for (@{ $self->{options} }) { 3197 for (@{ $self->{options} }) {
… …
3154 my ($self, $value) = @_; 3218 my ($self, $value) = @_;
3155 3219
3156 return unless $self->{value} ne $value; 3220 return unless $self->{value} ne $value;
3157 3221
3158 $self->_set_value ($value); 3222 $self->_set_value ($value);
3159 $self->_emit (changed => $value); 3223 $self->emit (changed => $value);
3160} 3224}
3161 3225
3162############################################################################# 3226#############################################################################
3163 3227
3164package CFClient::UI::Statusbox; 3228package CFClient::UI::Statusbox;
… …
3292 3356
3293 $self->reorder; 3357 $self->reorder;
3294 $self->SUPER::reconfigure; 3358 $self->SUPER::reconfigure;
3295} 3359}
3296 3360
3297sub DESTROY { 3361sub destroy {
3298 my ($self) = @_; 3362 my ($self) = @_;
3299 3363
3300 $self->{timer}->cancel; 3364 $self->{timer}->cancel;
3301 3365
3302 $self->SUPER::DESTROY; 3366 $self->SUPER::destroy;
3303} 3367}
3304 3368
3305############################################################################# 3369#############################################################################
3306 3370
3307package CFClient::UI::Inventory; 3371package CFClient::UI::Inventory;
… …
3451 my ($self) = @_; 3515 my ($self) = @_;
3452 $self->ask_for_bind (1); 3516 $self->ask_for_bind (1);
3453} 3517}
3454 3518
3455sub ask_for_bind { 3519sub ask_for_bind {
3456 my ($self, $commit) = @_; 3520 my ($self, $commit, $end_cb) = @_;
3457 3521
3458 CFClient::Binder::open_binding_dialog (sub { 3522 CFClient::Binder::open_binding_dialog (sub {
3459 my ($mod, $sym) = @_; 3523 my ($mod, $sym) = @_;
3460 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak? 3524 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3461 $self->update_binding_widgets; 3525 $self->update_binding_widgets;
3462 $self->commit if $commit; 3526 $self->commit if $commit;
3527 $end_cb->() if $end_cb;
3463 }); 3528 });
3464} 3529}
3465 3530
3466# $mod and $sym are the modifiers and key symbol 3531# $mod and $sym are the modifiers and key symbol
3467# $cmds is a array ref of strings (the commands) 3532# $cmds is a array ref of strings (the commands)
… …
3485} 3550}
3486 3551
3487# this is a shortcut method that asks for a binding 3552# this is a shortcut method that asks for a binding
3488# and then just binds it. 3553# and then just binds it.
3489sub do_quick_binding { 3554sub do_quick_binding {
3490 my ($self, $cmds) = @_; 3555 my ($self, $cmds, $end_cb) = @_;
3491 $self->set_binding (undef, undef, $cmds, sub { 3556 $self->set_binding (undef, undef, $cmds, sub {
3492 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2]; 3557 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3493 }); 3558 });
3494 $self->ask_for_bind (1); 3559 $self->ask_for_bind (1, $end_cb);
3495} 3560}
3496 3561
3497sub update_binding_widgets { 3562sub update_binding_widgets {
3498 my ($self) = @_; 3563 my ($self) = @_;
3499 my ($mod, $sym, $cmds) = $self->get_binding; 3564 my ($mod, $sym, $cmds) = $self->get_binding;
… …
3573sub rebuild_spell_list { 3638sub rebuild_spell_list {
3574 my ($self) = @_; 3639 my ($self) = @_;
3575 3640
3576 $CFClient::UI::ROOT->on_refresh ($self => sub { 3641 $CFClient::UI::ROOT->on_refresh ($self => sub {
3577 $self->clear; 3642 $self->clear;
3643
3644 return unless $::CONN;
3578 3645
3579 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME); 3646 $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); 3647 $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); 3648 $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); 3649 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
… …
3702 $coord = $max - $size if $coord > $max - $size; 3769 $coord = $max - $size if $coord > $max - $size;
3703 3770
3704 int $coord + 0.5 3771 int $coord + 0.5
3705} 3772}
3706 3773
3707sub size_allocate { 3774sub invoke_size_allocate {
3708 my ($self, $w, $h) = @_; 3775 my ($self, $w, $h) = @_;
3709 3776
3710 for my $child ($self->children) { 3777 for my $child ($self->children) {
3711 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3778 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3712 3779
… …
3716 $X = _to_pixel $X, $W, $self->{w}; 3783 $X = _to_pixel $X, $W, $self->{w};
3717 $Y = _to_pixel $Y, $H, $self->{h}; 3784 $Y = _to_pixel $Y, $H, $self->{h};
3718 3785
3719 $child->configure ($X, $Y, $W, $H); 3786 $child->configure ($X, $Y, $W, $H);
3720 } 3787 }
3788
3789 1
3721} 3790}
3722 3791
3723sub coord2local { 3792sub coord2local {
3724 my ($self, $x, $y) = @_; 3793 my ($self, $x, $y) = @_;
3725 3794

Diff Legend

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