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.290 by root, Mon Jun 5 22:30:35 2006 UTC vs.
Revision 1.307 by root, Sun Jun 18 19:13:20 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) = @_;
… …
315} 314}
316 315
317sub move_abs { 316sub move_abs {
318 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
319 318
320 $self->{x} = List::Util::max 0, int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
321 $self->{y} = List::Util::max 0, int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
322 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
323 322
324 $self->update; 323 $self->update;
325} 324}
326 325
… …
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 (List::Util::sum +(map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}), # before
476 ($self->can ("invoke_$signal") || sub { 1 })->($self, @args)) # closure
477 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
463} 478}
464 479
465sub find_widget { 480sub find_widget {
466 my ($self, $x, $y) = @_; 481 my ($self, $x, $y) = @_;
467 482
… …
477sub set_parent { 492sub set_parent {
478 my ($self, $parent) = @_; 493 my ($self, $parent) = @_;
479 494
480 Scalar::Util::weaken ($self->{parent} = $parent); 495 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible}; 496 $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} 497}
506 498
507sub realloc { 499sub realloc {
508 my ($self) = @_; 500 my ($self) = @_;
509 501
… …
593 585
594sub DESTROY { 586sub DESTROY {
595 my ($self) = @_; 587 my ($self) = @_;
596 588
597 delete $WIDGET{$self+0}; 589 delete $WIDGET{$self+0};
598 #$self->deactivate; 590
591 eval { $self->destroy };
592 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
599} 593}
600 594
601############################################################################# 595#############################################################################
602 596
603package CFClient::UI::DrawBG; 597package CFClient::UI::DrawBG;
… …
768} 762}
769 763
770sub add { 764sub add {
771 my ($self, $child) = @_; 765 my ($self, $child) = @_;
772 766
773 $self->{children} = []; 767 $self->SUPER::remove ($_) for @{ $self->{children} };
774
775 $self->SUPER::add ($child); 768 $self->SUPER::add ($child);
776} 769}
777 770
778sub remove { 771sub remove {
779 my ($self, $widget) = @_; 772 my ($self, $widget) = @_;
… …
788 781
789sub size_request { 782sub size_request {
790 $_[0]{children}[0]->size_request 783 $_[0]{children}[0]->size_request
791} 784}
792 785
793sub size_allocate { 786sub invoke_size_allocate {
794 my ($self, $w, $h) = @_; 787 my ($self, $w, $h) = @_;
795 788
796 $self->{children}[0]->configure (0, 0, $w, $h); 789 $self->{children}[0]->configure (0, 0, $w, $h);
790
791 1
797} 792}
798 793
799############################################################################# 794#############################################################################
800 795
801# back-buffered drawing area 796# back-buffered drawing area
… …
817 812
818 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 813 $ROOT->on_post_alloc ($self => sub { $self->render_child });
819 $self->SUPER::update; 814 $self->SUPER::update;
820} 815}
821 816
822sub size_allocate { 817sub invoke_size_allocate {
823 my ($self, $w, $h) = @_; 818 my ($self, $w, $h) = @_;
824 819
825 $self->SUPER::size_allocate ($w, $h);
826 $self->update; 820 $self->update;
821
822 $self->SUPER::invoke_size_allocate ($w, $h)
827} 823}
828 824
829sub _render { 825sub _render {
830 my ($self) = @_; 826 my ($self) = @_;
831 827
… …
892 $h = 10 if $self->{scroll_y}; 888 $h = 10 if $self->{scroll_y};
893 889
894 ($w, $h) 890 ($w, $h)
895} 891}
896 892
897sub size_allocate { 893sub invoke_size_allocate {
898 my ($self, $w, $h) = @_; 894 my ($self, $w, $h) = @_;
899 895
900 my $child = $self->child; 896 my $child = $self->child;
901 897
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904 900
905 $self->child->configure (0, 0, $w, $h); 901 $self->child->configure (0, 0, $w, $h);
906 $self->update; 902 $self->update;
903
904 1
907} 905}
908 906
909sub set_offset { 907sub set_offset {
910 my ($self, $x, $y) = @_; 908 my ($self, $x, $y) = @_;
911 909
… …
1001 # todo: overwrite size_allocate of child 999 # todo: overwrite size_allocate of child
1002 my $child = $self->{vp}->child; 1000 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004} 1002}
1005 1003
1006sub size_allocate { 1004sub invoke_size_allocate {
1007 my ($self, $w, $h) = @_; 1005 my ($self, $w, $h) = @_;
1008
1009 $self->SUPER::size_allocate ($w, $h);
1010 1006
1011 my $child = $self->{vp}->child; 1007 my $child = $self->{vp}->child;
1012 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1008 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009
1010 $self->SUPER::invoke_size_allocate ($w, $h)
1013} 1011}
1014 1012
1015#TODO# update range on size_allocate depending on child 1013#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll 1014# update viewport offset on scroll
1017 1015
… …
1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1069 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); 1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073 1071
1074sub new { 1072sub new {
1075 my ($class, %arg) = @_; 1073 my ($class, %arg) = @_;
1076
1077 my $title = delete $arg{title};
1078 1074
1079 my $self = $class->SUPER::new ( 1075 my $self = $class->SUPER::new (
1080 bg => [1, 1, 1, 1], 1076 bg => [1, 1, 1, 1],
1081 border_bg => [1, 1, 1, 1], 1077 border_bg => [1, 1, 1, 1],
1082 border => 0.6, 1078 border => 0.6,
… …
1084 min_w => 16, 1080 min_w => 16,
1085 min_h => 16, 1081 min_h => 16,
1086 %arg, 1082 %arg,
1087 ); 1083 );
1088 1084
1089 $self->{title} = new CFClient::UI::Label 1085 $self->{title_widget} = new CFClient::UI::Label
1090 align => 0, 1086 align => 0,
1091 valign => 1, 1087 valign => 1,
1092 text => $title, 1088 text => $self->{title},
1093 fontsize => $self->{border} 1089 fontsize => $self->{border},
1094 if defined $title; 1090 if exists $self->{title};
1091
1092 if ($self->{has_close_button}) {
1093 $self->{close_button} =
1094 new CFClient::UI::ImageButton
1095 image => 'x1_close.png',
1096 on_activate => sub { $self->hide };
1097
1098 $self->CFClient::UI::Container::add ($self->{close_button});
1099 }
1095 1100
1096 $self 1101 $self
1097} 1102}
1098 1103
1099sub add { 1104sub add {
1100 my ($self, @widgets) = @_; 1105 my ($self, @widgets) = @_;
1101 1106
1102 $self->SUPER::add (@widgets); 1107 $self->SUPER::add (@widgets);
1108 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1109 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104} 1110}
1105 1111
1106sub border { 1112sub border {
1107 int $_[0]{border} * $::FONTSIZE 1113 int $_[0]{border} * $::FONTSIZE
1108} 1114}
1109 1115
1110sub size_request { 1116sub size_request {
1111 my ($self) = @_; 1117 my ($self) = @_;
1112 1118
1113 $self->{title}->size_request 1119 $self->{title_widget}->size_request
1114 if $self->{title}; 1120 if $self->{title_widget};
1121
1122 $self->{close_button}->size_request
1123 if $self->{close_button};
1115 1124
1116 my ($w, $h) = $self->SUPER::size_request; 1125 my ($w, $h) = $self->SUPER::size_request;
1117 1126
1118 ( 1127 (
1119 $w + $self->border * 2, 1128 $w + $self->border * 2,
1120 $h + $self->border * 2, 1129 $h + $self->border * 2,
1121 ) 1130 )
1122} 1131}
1123 1132
1124sub size_allocate { 1133sub invoke_size_allocate {
1125 my ($self, $w, $h) = @_; 1134 my ($self, $w, $h) = @_;
1126 1135
1127 if ($self->{title}) { 1136 if ($self->{title_widget}) {
1128 $self->{title}{w} = $w; 1137 $self->{title_widget}{w} = $w;
1129 $self->{title}{h} = $h; 1138 $self->{title_widget}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h); 1139 $self->{title_widget}->invoke_size_allocate ($w, $h);
1131 } 1140 }
1132 1141
1133 my $border = $self->border; 1142 my $border = $self->border;
1134 1143
1135 $h -= List::Util::max 0, $border * 2; 1144 $h -= List::Util::max 0, $border * 2;
1136 $w -= List::Util::max 0, $border * 2; 1145 $w -= List::Util::max 0, $border * 2;
1137 1146
1138 $self->child->configure ($border, $border, $w, $h); 1147 $self->child->configure ($border, $border, $w, $h);
1139}
1140 1148
1149 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150 if $self->{close_button};
1151
1152 1
1153}
1154
1141sub button_down { 1155sub invoke_button_down {
1142 my ($self, $ev, $x, $y) = @_; 1156 my ($self, $ev, $x, $y) = @_;
1143 1157
1144 my ($w, $h) = @$self{qw(w h)}; 1158 my ($w, $h) = @$self{qw(w h)};
1145 my $border = $self->border; 1159 my $border = $self->border;
1146 1160
… …
1177 1191
1178 ($x, $y) = ($ev->{x}, $ev->{y}); 1192 ($x, $y) = ($ev->{x}, $ev->{y});
1179 1193
1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1194 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement 1195 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1196 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183 }; 1197 };
1184 } else { 1198 } else {
1185 return 0; 1199 return 0;
1186 } 1200 }
1187 1201
1188 1 1202 1
1189} 1203}
1190 1204
1191sub button_up { 1205sub invoke_button_up {
1192 my ($self, $ev, $x, $y) = @_; 1206 my ($self, $ev, $x, $y) = @_;
1193 1207
1194 !!delete $self->{motion} 1208 ! ! delete $self->{motion}
1195} 1209}
1196 1210
1197sub mouse_motion { 1211sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
1199 1213
1200 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1214 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201 1215
1202 !!$self->{motion} 1216 ! ! $self->{motion}
1203} 1217}
1204 1218
1205sub _draw { 1219sub _draw {
1206 my ($self) = @_; 1220 my ($self) = @_;
1207 1221
… …
1233 1247
1234 glDisable GL_TEXTURE_2D; 1248 glDisable GL_TEXTURE_2D;
1235 1249
1236 $child->draw; 1250 $child->draw;
1237 1251
1238 if ($self->{title}) { 1252 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1253 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1254 $self->{title_widget}->_draw;
1255
1256 glTranslate 0, - ($border - $self->{h});
1241 } 1257 }
1258
1259 $self->{close_button}->draw
1260 if $self->{close_button};
1242} 1261}
1243 1262
1244############################################################################# 1263#############################################################################
1245 1264
1246package CFClient::UI::Table; 1265package CFClient::UI::Table;
… …
1269 1288
1270 $child->set_parent ($self); 1289 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child; 1290 $self->{children}[$y][$x] = $child;
1272 1291
1273 $self->realloc; 1292 $self->realloc;
1293}
1294
1295sub remove {
1296 my ($self, $child) = @_;
1297
1298 # TODO: not yet implemented
1274} 1299}
1275 1300
1276# TODO: move to container class maybe? send children a signal on removal? 1301# TODO: move to container class maybe? send children a signal on removal?
1277sub clear { 1302sub clear {
1278 my ($self) = @_; 1303 my ($self) = @_;
… …
1319 (sum @$ws), 1344 (sum @$ws),
1320 (sum @$hs), 1345 (sum @$hs),
1321 ) 1346 )
1322} 1347}
1323 1348
1324sub size_allocate { 1349sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1350 my ($self, $w, $h) = @_;
1326 1351
1327 my ($ws, $hs) = $self->get_wh; 1352 my ($ws, $hs) = $self->get_wh;
1328 1353
1329 my $req_w = (sum @$ws) || 1; 1354 my $req_w = (sum @$ws) || 1;
… …
1361 } 1386 }
1362 1387
1363 $y += $row_h; 1388 $y += $row_h;
1364 } 1389 }
1365 1390
1391 1
1366} 1392}
1367 1393
1368sub find_widget { 1394sub find_widget {
1369 my ($self, $x, $y) = @_; 1395 my ($self, $x, $y) = @_;
1370 1396
… …
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1433 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1434 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 ) 1435 )
1410} 1436}
1411 1437
1412sub size_allocate { 1438sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1439 my ($self, $w, $h) = @_;
1414 1440
1415 my $space = $self->{vertical} ? $h : $w; 1441 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1442 my $children = $self->{children};
1417 1443
… …
1604 }; 1630 };
1605 1631
1606 @{ $self->{size_req} } 1632 @{ $self->{size_req} }
1607} 1633}
1608 1634
1609sub size_allocate { 1635sub invoke_size_allocate {
1610 my ($self, $w, $h) = @_; 1636 my ($self, $w, $h) = @_;
1611 1637
1612 delete $self->{ox}; 1638 delete $self->{ox};
1613 1639
1614 delete $self->{texture} 1640 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1641 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1642
1643 1
1616} 1644}
1617 1645
1618sub set_fontsize { 1646sub set_fontsize {
1619 my ($self, $fontsize) = @_; 1647 my ($self, $fontsize) = @_;
1620 1648
… …
1658 : ($self->{h} - $tex->{h}) * 0.5); 1686 : ($self->{h} - $tex->{h}) * 0.5);
1659 }; 1687 };
1660 1688
1661 glEnable GL_TEXTURE_2D; 1689 glEnable GL_TEXTURE_2D;
1662 1690
1691 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1692 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1693
1663 if ($tex->{format} == GL_ALPHA) { 1694 if ($tex->{format} == GL_ALPHA) {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1665 glColor @{$self->{fg}}; 1696 glColor @{$self->{fg}};
1666 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1697 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1667 } else { 1698 } else {
1668 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1699 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1669 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1700 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1670 } 1701 }
1671 1702
1672 glDisable GL_TEXTURE_2D; 1703 glDisable GL_TEXTURE_2D;
1673} 1704}
1674 1705
… …
1691 can_hover => 1, 1722 can_hover => 1,
1692 can_focus => 1, 1723 can_focus => 1,
1693 valign => 0, 1724 valign => 0,
1694 can_events => 1, 1725 can_events => 1,
1695 #text => ... 1726 #text => ...
1727 #hidden => "*",
1696 @_ 1728 @_
1697 ) 1729 )
1698} 1730}
1699 1731
1700sub _set_text { 1732sub _set_text {
… …
1709 1741
1710 $text =~ s/./*/g if $self->{hidden}; 1742 $text =~ s/./*/g if $self->{hidden};
1711 $self->{layout}->set_text ("$text "); 1743 $self->{layout}->set_text ("$text ");
1712 delete $self->{size_req}; 1744 delete $self->{size_req};
1713 1745
1714 $self->_emit (changed => $self->{text}); 1746 $self->emit (changed => $self->{text});
1715 1747
1716 $self->realloc; 1748 $self->realloc;
1717 $self->update; 1749 $self->update;
1718} 1750}
1719 1751
… …
1734 my ($w, $h) = $self->SUPER::size_request; 1766 my ($w, $h) = $self->SUPER::size_request;
1735 1767
1736 ($w + 1, $h) # add 1 for cursor 1768 ($w + 1, $h) # add 1 for cursor
1737} 1769}
1738 1770
1739sub key_down { 1771sub invoke_key_down {
1740 my ($self, $ev) = @_; 1772 my ($self, $ev) = @_;
1741 1773
1742 my $mod = $ev->{mod}; 1774 my $mod = $ev->{mod};
1743 my $sym = $ev->{sym}; 1775 my $sym = $ev->{sym};
1744 my $uni = $ev->{unicode}; 1776 my $uni = $ev->{unicode};
… …
1756 } elsif ($sym == CFClient::SDLK_HOME) { 1788 } elsif ($sym == CFClient::SDLK_HOME) {
1757 $self->{cursor} = 0; 1789 $self->{cursor} = 0;
1758 } elsif ($sym == CFClient::SDLK_END) { 1790 } elsif ($sym == CFClient::SDLK_END) {
1759 $self->{cursor} = length $text; 1791 $self->{cursor} = length $text;
1760 } elsif ($uni == 27) { 1792 } elsif ($uni == 27) {
1761 $self->_emit ('escape'); 1793 $self->emit ('escape');
1762 } elsif ($uni) { 1794 } elsif ($uni) {
1763 substr $text, $self->{cursor}++, 0, chr $uni; 1795 substr $text, $self->{cursor}++, 0, chr $uni;
1764 } else { 1796 } else {
1765 return 0; 1797 return 0;
1766 } 1798 }
… …
1770 $self->realloc; 1802 $self->realloc;
1771 1803
1772 1 1804 1
1773} 1805}
1774 1806
1775sub focus_in { 1807sub invoke_focus_in {
1776 my ($self) = @_; 1808 my ($self) = @_;
1777 1809
1778 $self->{last_activity} = $::NOW; 1810 $self->{last_activity} = $::NOW;
1779 1811
1780 $self->SUPER::focus_in; 1812 $self->SUPER::invoke_focus_in
1781} 1813}
1782 1814
1783sub button_down { 1815sub invoke_button_down {
1784 my ($self, $ev, $x, $y) = @_; 1816 my ($self, $ev, $x, $y) = @_;
1785 1817
1786 $self->SUPER::button_down ($ev, $x, $y); 1818 $self->SUPER::invoke_button_down ($ev, $x, $y);
1787 1819
1788 my $idx = $self->{layout}->xy_to_index ($x, $y); 1820 my $idx = $self->{layout}->xy_to_index ($x, $y);
1789 1821
1790 # byte-index to char-index 1822 # byte-index to char-index
1791 my $text = $self->{text}; 1823 my $text = $self->{text};
… …
1796 $self->update; 1828 $self->update;
1797 1829
1798 1 1830 1
1799} 1831}
1800 1832
1801sub mouse_motion { 1833sub invoke_mouse_motion {
1802 my ($self, $ev, $x, $y) = @_; 1834 my ($self, $ev, $x, $y) = @_;
1803# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1835# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1804 1836
1805 0 1837 1
1806} 1838}
1807 1839
1808sub _draw { 1840sub _draw {
1809 my ($self) = @_; 1841 my ($self) = @_;
1810 1842
… …
1851 1883
1852our @ISA = CFClient::UI::EntryBase::; 1884our @ISA = CFClient::UI::EntryBase::;
1853 1885
1854use CFClient::OpenGL; 1886use CFClient::OpenGL;
1855 1887
1856sub key_down { 1888sub invoke_key_down {
1857 my ($self, $ev) = @_; 1889 my ($self, $ev) = @_;
1858 1890
1859 my $sym = $ev->{sym}; 1891 my $sym = $ev->{sym};
1860 1892
1861 if ($sym == 13) { 1893 if ($sym == 13) {
1862 unshift @{$self->{history}}, 1894 unshift @{$self->{history}},
1863 my $txt = $self->get_text; 1895 my $txt = $self->get_text;
1896
1864 $self->{history_pointer} = -1; 1897 $self->{history_pointer} = -1;
1865 $self->{history_saveback} = ''; 1898 $self->{history_saveback} = '';
1866 $self->_emit (activate => $txt); 1899 $self->emit (activate => $txt);
1867 $self->update; 1900 $self->update;
1868 1901
1869 } elsif ($sym == CFClient::SDLK_UP) { 1902 } elsif ($sym == CFClient::SDLK_UP) {
1870 if ($self->{history_pointer} < 0) { 1903 if ($self->{history_pointer} < 0) {
1871 $self->{history_saveback} = $self->get_text; 1904 $self->{history_saveback} = $self->get_text;
… …
1887 } else { 1920 } else {
1888 $self->set_text ($self->{history_saveback}); 1921 $self->set_text ($self->{history_saveback});
1889 } 1922 }
1890 1923
1891 } else { 1924 } else {
1892 return $self->SUPER::key_down ($ev) 1925 return $self->SUPER::invoke_key_down ($ev)
1893 } 1926 }
1894 1927
1895 1 1928 1
1896} 1929}
1897 1930
… …
1921 can_events => 1, 1954 can_events => 1,
1922 @_ 1955 @_
1923 ) 1956 )
1924} 1957}
1925 1958
1926sub activate { }
1927
1928sub button_up { 1959sub invoke_button_up {
1929 my ($self, $ev, $x, $y) = @_; 1960 my ($self, $ev, $x, $y) = @_;
1930 1961
1931 $self->emit ("activate") 1962 $self->emit ("activate")
1932 if $x >= 0 && $x < $self->{w} 1963 if $x >= 0 && $x < $self->{w}
1933 && $y >= 0 && $y < $self->{h}; 1964 && $y >= 0 && $y < $self->{h};
… …
1947 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1978 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1948 1979
1949 glDisable GL_TEXTURE_2D; 1980 glDisable GL_TEXTURE_2D;
1950 1981
1951 $self->SUPER::_draw; 1982 $self->SUPER::_draw;
1983}
1984
1985#############################################################################
1986
1987package CFClient::UI::ImageButton;
1988
1989our @ISA = CFClient::UI::Image::;
1990
1991use CFClient::OpenGL;
1992
1993my %textures;
1994
1995sub new {
1996 my $class = shift;
1997
1998 my $self = $class->SUPER::new (
1999 padding_x => 4,
2000 padding_y => 4,
2001 fg => [1, 1, 1],
2002 active_fg => [0, 0, 1],
2003 can_hover => 1,
2004 align => 0,
2005 valign => 0,
2006 can_events => 1,
2007 @_
2008 );
2009}
2010
2011sub invoke_button_up {
2012 my ($self, $ev, $x, $y) = @_;
2013
2014 $self->emit ("activate")
2015 if $x >= 0 && $x < $self->{w}
2016 && $y >= 0 && $y < $self->{h};
2017
2018 1
1952} 2019}
1953 2020
1954############################################################################# 2021#############################################################################
1955 2022
1956package CFClient::UI::CheckBox; 2023package CFClient::UI::CheckBox;
… …
1983 my ($self) = @_; 2050 my ($self) = @_;
1984 2051
1985 (6) x 2 2052 (6) x 2
1986} 2053}
1987 2054
1988sub button_down { 2055sub invoke_button_down {
1989 my ($self, $ev, $x, $y) = @_; 2056 my ($self, $ev, $x, $y) = @_;
1990 2057
1991 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2058 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1992 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2059 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1993 $self->{state} = !$self->{state}; 2060 $self->{state} = !$self->{state};
1994 $self->_emit (changed => $self->{state}); 2061 $self->emit (changed => $self->{state});
1995 } else { 2062 } else {
1996 return 0 2063 return 0
1997 } 2064 }
1998 2065
1999 1 2066 1
… …
2296 $self->update; 2363 $self->update;
2297 2364
2298 $self 2365 $self
2299} 2366}
2300 2367
2301sub changed { }
2302
2303sub set_range { 2368sub set_range {
2304 my ($self, $range) = @_; 2369 my ($self, $range) = @_;
2305 2370
2306 ($range, $self->{range}) = ($self->{range}, $range); 2371 ($range, $self->{range}) = ($self->{range}, $range);
2307 2372
2308 $self->update
2309 if "@$range" ne "@{$self->{range}}"; 2373 if ("@$range" ne "@{$self->{range}}") {
2374 $self->update;
2375 $self->set_value ($self->{range}[0]);
2376 }
2310} 2377}
2311 2378
2312sub set_value { 2379sub set_value {
2313 my ($self, $value) = @_; 2380 my ($self, $value) = @_;
2314 2381
… …
2325 if $unit; 2392 if $unit;
2326 2393
2327 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2394 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2328 2395
2329 if ($value != $old_value) { 2396 if ($value != $old_value) {
2330 $self->_emit (changed => $value); 2397 $self->emit (changed => $value);
2331 $self->update; 2398 $self->update;
2332 } 2399 }
2333} 2400}
2334 2401
2335sub size_request { 2402sub size_request {
2336 my ($self) = @_; 2403 my ($self) = @_;
2337 2404
2338 ($self->{req_w}, $self->{req_h}) 2405 ($self->{req_w}, $self->{req_h})
2339} 2406}
2340 2407
2341sub button_down { 2408sub invoke_button_down {
2342 my ($self, $ev, $x, $y) = @_; 2409 my ($self, $ev, $x, $y) = @_;
2343 2410
2344 $self->SUPER::button_down ($ev, $x, $y); 2411 $self->SUPER::invoke_button_down ($ev, $x, $y);
2345 2412
2346 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2413 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2347 2414
2348 $self->mouse_motion ($ev, $x, $y) 2415 $self->invoke_mouse_motion ($ev, $x, $y)
2349} 2416}
2350 2417
2351sub mouse_motion { 2418sub invoke_mouse_motion {
2352 my ($self, $ev, $x, $y) = @_; 2419 my ($self, $ev, $x, $y) = @_;
2353 2420
2354 if ($GRAB == $self) { 2421 if ($GRAB == $self) {
2355 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2422 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2356 2423
… …
2461sub set_range { shift->{slider}->set_range (@_) } 2528sub set_range { shift->{slider}->set_range (@_) }
2462sub set_value { shift->{slider}->set_value (@_) } 2529sub set_value { shift->{slider}->set_value (@_) }
2463 2530
2464############################################################################# 2531#############################################################################
2465 2532
2466package CFClient::UI::TextView; 2533package CFClient::UI::TextScroller;
2467 2534
2468our @ISA = CFClient::UI::HBox::; 2535our @ISA = CFClient::UI::HBox::;
2469 2536
2470use CFClient::OpenGL; 2537use CFClient::OpenGL;
2471 2538
… …
2473 my $class = shift; 2540 my $class = shift;
2474 2541
2475 my $self = $class->SUPER::new ( 2542 my $self = $class->SUPER::new (
2476 fontsize => 1, 2543 fontsize => 1,
2477 can_events => 0, 2544 can_events => 0,
2545 indent => 0,
2478 #font => default_font 2546 #font => default_font
2479 @_, 2547 @_,
2480 2548
2481 layout => (new CFClient::Layout 1), 2549 layout => (new CFClient::Layout 1),
2482 par => [], 2550 par => [],
… …
2497 2565
2498 $self->{fontsize} = $fontsize; 2566 $self->{fontsize} = $fontsize;
2499 $self->reflow; 2567 $self->reflow;
2500} 2568}
2501 2569
2502sub size_allocate { 2570sub invoke_size_allocate {
2503 my ($self, $w, $h) = @_; 2571 my ($self, $w, $h) = @_;
2504
2505 $self->SUPER::size_allocate ($w, $h);
2506 2572
2507 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2573 $self->{layout}->set_font ($self->{font}) if $self->{font};
2508 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2574 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2509 $self->{layout}->set_width ($self->{children}[0]{w}); 2575 $self->{layout}->set_width ($self->{children}[0]{w});
2576 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2510 2577
2511 $self->reflow; 2578 $self->reflow;
2579
2580 $self->SUPER::invoke_size_allocate ($w, $h)
2512} 2581}
2513 2582
2514sub text_size { 2583sub text_size {
2515 my ($self, $text, $indent) = @_; 2584 my ($self, $text, $indent) = @_;
2516 2585
2517 my $layout = $self->{layout}; 2586 my $layout = $self->{layout};
2518 2587
2519 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2588 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2520 $layout->set_width ($self->{children}[0]{w} - $indent); 2589 $layout->set_width ($self->{children}[0]{w} - $indent);
2590 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2521 $layout->set_markup ($text); 2591 $layout->set_markup ($text);
2522 2592
2523 $layout->size 2593 $layout->size
2524} 2594}
2525 2595
… …
2564 2634
2565 return unless $self->{h} > 0; 2635 return unless $self->{h} > 0;
2566 2636
2567 delete $self->{texture}; 2637 delete $self->{texture};
2568 2638
2569 $ROOT->on_post_alloc ($self, sub { 2639 $ROOT->on_post_alloc ($self => sub {
2570 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2640 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2571 2641
2572 if (delete $self->{need_reflow}) { 2642 if (delete $self->{need_reflow}) {
2573 my $height = 0; 2643 my $height = 0;
2574 2644
… …
2577 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2647 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2578 2648
2579 for (@{$self->{par}}) { 2649 for (@{$self->{par}}) {
2580 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2650 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2581 $layout->set_width ($W - $_->[3]); 2651 $layout->set_width ($W - $_->[3]);
2652 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2582 $layout->set_markup ($_->[4]); 2653 $layout->set_markup ($_->[4]);
2583 my ($w, $h) = $layout->size; 2654 my ($w, $h) = $layout->size;
2584 $_->[0] = $w + $_->[3]; 2655 $_->[0] = $w + $_->[3];
2585 $_->[1] = $h; 2656 $_->[1] = $h;
2586 } 2657 }
… …
2589 } 2660 }
2590 2661
2591 $self->{height} = $height; 2662 $self->{height} = $height;
2592 2663
2593 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2664 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2594 2665
2595 delete $self->{texture}; 2666 delete $self->{texture};
2596 } 2667 }
2597 2668
2598 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2669 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2599 glClearColor 0, 0, 0, 0; 2670 glClearColor 0, 0, 0, 0;
… …
2618 my $h = $par->[1]; 2689 my $h = $par->[1];
2619 2690
2620 if ($y0 < $y + $h && $y < $y1) { 2691 if ($y0 < $y + $h && $y < $y1) {
2621 $layout->set_foreground (@{ $par->[2] }); 2692 $layout->set_foreground (@{ $par->[2] });
2622 $layout->set_width ($W - $par->[3]); 2693 $layout->set_width ($W - $par->[3]);
2694 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2623 $layout->set_markup ($par->[4]); 2695 $layout->set_markup ($par->[4]);
2624 2696
2625 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2697 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2626 2698
2627 glRasterPos $par->[3], $y - $y0; 2699 glRasterPos $par->[3], $y - $y0;
… …
2741 $tooltip .= "\n\n" . (ref $widget) . "\n" 2813 $tooltip .= "\n\n" . (ref $widget) . "\n"
2742 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2814 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2743 . "req $widget->{req_w} $widget->{req_h}\n" 2815 . "req $widget->{req_w} $widget->{req_h}\n"
2744 . "visible $widget->{visible}"; 2816 . "visible $widget->{visible}";
2745 } 2817 }
2818
2819 $tooltip =~ s/^\n+//;
2820 $tooltip =~ s/\n+$//;
2746 2821
2747 $self->add (new CFClient::UI::Label 2822 $self->add (new CFClient::UI::Label
2748 markup => $tooltip, 2823 markup => $tooltip,
2749 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2824 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2750 fontsize => 0.8, 2825 fontsize => 0.8,
… …
2760 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2835 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2761 2836
2762 ($w + 4, $h + 4) 2837 ($w + 4, $h + 4)
2763} 2838}
2764 2839
2765sub size_allocate { 2840sub invoke_size_allocate {
2766 my ($self, $w, $h) = @_; 2841 my ($self, $w, $h) = @_;
2767 2842
2768 $self->SUPER::size_allocate ($w - 4, $h - 4); 2843 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2769} 2844}
2770 2845
2771sub visibility_change { 2846sub invoke_visibility_change {
2772 my ($self, $visible) = @_; 2847 my ($self, $visible) = @_;
2773 2848
2774 return unless $visible; 2849 return unless $visible;
2775 2850
2776 $self->{root}->on_post_alloc ("move_$self" => sub { 2851 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2778 or return; 2853 or return;
2779 2854
2780 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2855 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2781 2856
2782 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2857 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2783 if $x + $self->{w} > $::WIDTH; 2858 if $x + $self->{w} > $self->{root}{w};
2784 2859
2785 $self->move_abs ($x, $y); 2860 $self->move_abs ($x, $y);
2786 }); 2861 });
2787} 2862}
2788 2863
… …
2883 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2958 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2884 glDisable GL_TEXTURE_2D; 2959 glDisable GL_TEXTURE_2D;
2885 } 2960 }
2886} 2961}
2887 2962
2888sub DESTROY { 2963sub destroy {
2889 my ($self) = @_; 2964 my ($self) = @_;
2890 2965
2891 $self->{timer}->cancel 2966 $self->{timer}->cancel
2892 if $self->{timer}; 2967 if $self->{timer};
2893 2968
2894 $self->SUPER::DESTROY; 2969 $self->SUPER::destroy;
2895} 2970}
2896 2971
2897############################################################################# 2972#############################################################################
2898 2973
2899package CFClient::UI::Buttonbar; 2974package CFClient::UI::Buttonbar;
… …
2920 ); 2995 );
2921 2996
2922 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2997 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2923 2998
2924 for my $item (@{ $self->{items} }) { 2999 for my $item (@{ $self->{items} }) {
2925 my ($widget, $cb) = @$item; 3000 my ($widget, $cb, $tooltip) = @$item;
2926 3001
2927 # handle various types of items, only text for now 3002 # handle various types of items, only text for now
2928 if (!ref $widget) { 3003 if (!ref $widget) {
2929 $widget = new CFClient::UI::Label 3004 $widget = new CFClient::UI::Label
2930 can_hover => 1, 3005 can_hover => 1,
2931 can_events => 1, 3006 can_events => 1,
2932 text => $widget; 3007 markup => $widget,
3008 tooltip => $tooltip
2933 } 3009 }
2934 3010
2935 $self->{item}{$widget} = $item; 3011 $self->{item}{$widget} = $item;
2936 3012
2937 $self->{vbox}->add ($widget); 3013 $self->{vbox}->add ($widget);
… …
2942 3018
2943# popup given the event (must be a mouse button down event currently) 3019# popup given the event (must be a mouse button down event currently)
2944sub popup { 3020sub popup {
2945 my ($self, $ev) = @_; 3021 my ($self, $ev) = @_;
2946 3022
2947 $self->_emit ("popdown"); 3023 $self->emit ("popdown");
2948 3024
2949 # maybe save $GRAB? must be careful about events... 3025 # maybe save $GRAB? must be careful about events...
2950 $GRAB = $self; 3026 $GRAB = $self;
2951 $self->{button} = $ev->{button}; 3027 $self->{button} = $ev->{button};
2952 3028
2953 $self->show; 3029 $self->show;
2954 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3030 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2955} 3031}
2956 3032
2957sub mouse_motion { 3033sub invoke_mouse_motion {
2958 my ($self, $ev, $x, $y) = @_; 3034 my ($self, $ev, $x, $y) = @_;
2959 3035
2960 # TODO: should use vbox->find_widget or so 3036 # TODO: should use vbox->find_widget or so
2961 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3037 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2962 $self->{hover} = $self->{item}{$HOVER}; 3038 $self->{hover} = $self->{item}{$HOVER};
2963 3039
2964 0 3040 0
2965} 3041}
2966 3042
2967sub button_up { 3043sub invoke_button_up {
2968 my ($self, $ev, $x, $y) = @_; 3044 my ($self, $ev, $x, $y) = @_;
2969 3045
2970 if ($ev->{button} == $self->{button}) { 3046 if ($ev->{button} == $self->{button}) {
2971 undef $GRAB; 3047 undef $GRAB;
2972 $self->hide; 3048 $self->hide;
2973 3049
2974 $self->_emit ("popdown"); 3050 $self->emit ("popdown");
2975 $self->{hover}[1]->() if $self->{hover}; 3051 $self->{hover}[1]->() if $self->{hover};
2976 } else { 3052 } else {
2977 return 0 3053 return 0
2978 } 3054 }
2979 3055
… …
3016 : $self->{children}[$page_or_widget]; 3092 : $self->{children}[$page_or_widget];
3017 3093
3018 $self->{current} = $widget; 3094 $self->{current} = $widget;
3019 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3095 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3020 3096
3021 $self->_emit (page_changed => $self->{current}); 3097 $self->emit (page_changed => $self->{current});
3022 3098
3023 $self->realloc; 3099 $self->realloc;
3024} 3100}
3025 3101
3026sub visible_children { 3102sub visible_children {
… …
3031 my ($self) = @_; 3107 my ($self) = @_;
3032 3108
3033 $self->{current}->size_request 3109 $self->{current}->size_request
3034} 3110}
3035 3111
3036sub size_allocate { 3112sub invoke_size_allocate {
3037 my ($self, $w, $h) = @_; 3113 my ($self, $w, $h) = @_;
3038 3114
3039 $self->{current}->configure (0, 0, $w, $h); 3115 $self->{current}->configure (0, 0, $w, $h);
3116
3117 1
3040} 3118}
3041 3119
3042sub _draw { 3120sub _draw {
3043 my ($self) = @_; 3121 my ($self) = @_;
3044 3122
… …
3083 3161
3084sub set_current_page { 3162sub set_current_page {
3085 my ($self, $page) = @_; 3163 my ($self, $page) = @_;
3086 3164
3087 $self->{multiplexer}->set_current_page ($page); 3165 $self->{multiplexer}->set_current_page ($page);
3088 $self->_emit (page_changed => $self->{multiplexer}{current}); 3166 $self->emit (page_changed => $self->{multiplexer}{current});
3167}
3168
3169#############################################################################
3170
3171package CFClient::UI::Combobox;
3172
3173use utf8;
3174
3175our @ISA = CFClient::UI::Button::;
3176
3177sub new {
3178 my $class = shift;
3179
3180 my $self = $class->SUPER::new (
3181 options => [], # [value, title, longdesc], ...
3182 value => undef,
3183 @_,
3184 );
3185
3186 $self->_set_value ($self->{value});
3187
3188 $self
3189}
3190
3191sub invoke_button_down {
3192 my ($self, $ev) = @_;
3193
3194 my @menu_items;
3195
3196 for (@{ $self->{options} }) {
3197 my ($value, $title, $tooltip) = @$_;
3198
3199 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3200 }
3201
3202 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3203}
3204
3205sub _set_value {
3206 my ($self, $value) = @_;
3207
3208 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3209 or return;
3210
3211 $self->{value} = $item->[0];
3212 $self->set_markup ("$item->[1] ⇓");
3213 $self->set_tooltip ($item->[2]);
3214}
3215
3216sub set_value {
3217 my ($self, $value) = @_;
3218
3219 return unless $self->{value} ne $value;
3220
3221 $self->_set_value ($value);
3222 $self->emit (changed => $value);
3089} 3223}
3090 3224
3091############################################################################# 3225#############################################################################
3092 3226
3093package CFClient::UI::Statusbox; 3227package CFClient::UI::Statusbox;
… …
3192 $item->{count}++; 3326 $item->{count}++;
3193 } else { 3327 } else {
3194 $item->{count} = 1; 3328 $item->{count} = 1;
3195 $item->{text} = $item->{tooltip} = $text; 3329 $item->{text} = $item->{tooltip} = $text;
3196 } 3330 }
3197 $item->{id} = ++$self->{id}; 3331 $item->{id} += 0.2;#d#
3198 $item->{timeout} = $timeout; 3332 $item->{timeout} = $timeout;
3199 delete $item->{label}; 3333 delete $item->{label};
3200 } else { 3334 } else {
3201 $self->{item}{$group} = { 3335 $self->{item}{$group} = {
3202 id => ++$self->{id}, 3336 id => ++$self->{id},
… …
3221 3355
3222 $self->reorder; 3356 $self->reorder;
3223 $self->SUPER::reconfigure; 3357 $self->SUPER::reconfigure;
3224} 3358}
3225 3359
3226sub DESTROY { 3360sub destroy {
3227 my ($self) = @_; 3361 my ($self) = @_;
3228 3362
3229 $self->{timer}->cancel; 3363 $self->{timer}->cancel;
3230 3364
3231 $self->SUPER::DESTROY; 3365 $self->SUPER::destroy;
3232} 3366}
3233 3367
3234############################################################################# 3368#############################################################################
3235 3369
3236package CFClient::UI::Inventory; 3370package CFClient::UI::Inventory;
… …
3380 my ($self) = @_; 3514 my ($self) = @_;
3381 $self->ask_for_bind (1); 3515 $self->ask_for_bind (1);
3382} 3516}
3383 3517
3384sub ask_for_bind { 3518sub ask_for_bind {
3385 my ($self, $commit) = @_; 3519 my ($self, $commit, $end_cb) = @_;
3386 3520
3387 CFClient::Binder::open_binding_dialog (sub { 3521 CFClient::Binder::open_binding_dialog (sub {
3388 my ($mod, $sym) = @_; 3522 my ($mod, $sym) = @_;
3389 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak? 3523 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3390 $self->update_binding_widgets; 3524 $self->update_binding_widgets;
3391 $self->commit if $commit; 3525 $self->commit if $commit;
3526 $end_cb->() if $end_cb;
3392 }); 3527 });
3393} 3528}
3394 3529
3395# $mod and $sym are the modifiers and key symbol 3530# $mod and $sym are the modifiers and key symbol
3396# $cmds is a array ref of strings (the commands) 3531# $cmds is a array ref of strings (the commands)
… …
3414} 3549}
3415 3550
3416# this is a shortcut method that asks for a binding 3551# this is a shortcut method that asks for a binding
3417# and then just binds it. 3552# and then just binds it.
3418sub do_quick_binding { 3553sub do_quick_binding {
3419 my ($self, $cmds) = @_; 3554 my ($self, $cmds, $end_cb) = @_;
3420 $self->set_binding (undef, undef, $cmds, sub { 3555 $self->set_binding (undef, undef, $cmds, sub {
3421 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2]; 3556 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3422 }); 3557 });
3423 $self->ask_for_bind (1); 3558 $self->ask_for_bind (1, $end_cb);
3424} 3559}
3425 3560
3426sub update_binding_widgets { 3561sub update_binding_widgets {
3427 my ($self) = @_; 3562 my ($self) = @_;
3428 my ($mod, $sym, $cmds) = $self->get_binding; 3563 my ($mod, $sym, $cmds) = $self->get_binding;
… …
3484 commands => [], 3619 commands => [],
3485 @_, 3620 @_,
3486 ) 3621 )
3487} 3622}
3488 3623
3624my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3625
3626my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3627 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3628my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3629 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3489my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip => 3630my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3490 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell."); 3631 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3491my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip => 3632my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3492 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation."); 3633 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3493my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip => 3634my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3494 "<b>Damage</b>. The amount of damage the spell deals when it hits."); 3635 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3495 3636
3496sub rebuild_spell_list { 3637sub rebuild_spell_list {
3497 my ($self) = @_; 3638 my ($self) = @_;
3498 3639
3499 $CFClient::UI::ROOT->on_refresh ($self => sub { 3640 $CFClient::UI::ROOT->on_refresh ($self => sub {
3500 $self->clear; 3641 $self->clear;
3501 3642
3643 return unless $::CONN;
3644
3502 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name"); 3645 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3646 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3503 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL); 3647 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3504 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP); 3648 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3505 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG); 3649 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3506 3650
3507 my $row = 0; 3651 my $row = 0;
3508 3652
3509 for (sort { $a cmp $b } keys %{ $self->{spell} }) { 3653 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3510 my $spell = $self->{spell}{$_}; 3654 my $spell = $self->{spell}{$_};
3511 3655
3512 $row++; 3656 $row++;
3657
3658 my $spell_cb = sub {
3659 my ($widget, $ev) = @_;
3660
3661 if ($ev->{button} == 1) {
3662 $::CONN->user_send ("cast $spell->{name}");
3663 } elsif ($ev->{button} == 2) {
3664 $::CONN->user_send ("invoke $spell->{name}");
3665 } elsif ($ev->{button} == 3) {
3666 (new CFClient::UI::Menu
3667 items => [
3668 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3669 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3670 ],
3671 )->popup ($ev);
3672 } else {
3673 return 0;
3674 }
3675
3676 1
3677 };
3678
3679 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3680
3681 #TODO: add path info to tooltip
3682 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3513 3683
3514 $self->add (0, $row, new CFClient::UI::Face 3684 $self->add (0, $row, new CFClient::UI::Face
3515 face => $spell->{face}, 3685 face => $spell->{face},
3516 can_hover => 1, 3686 can_hover => 1,
3517 can_events => 1, 3687 can_events => 1,
3518 tooltip => $spell->{message}, 3688 tooltip => $tooltip,
3689 on_button_down => $spell_cb,
3519 ); 3690 );
3520 3691
3521 $self->add (1, $row, new CFClient::UI::Label 3692 $self->add (1, $row, new CFClient::UI::Label
3522 expand => 1, 3693 expand => 1,
3523 text => $spell->{name}, 3694 text => $spell->{name},
3524 can_hover => 1, 3695 can_hover => 1,
3525 can_events => 1, 3696 can_events => 1,
3526 tooltip => $spell->{message}, 3697 tooltip => $tooltip,
3698 on_button_down => $spell_cb,
3527 ); 3699 );
3528 3700
3701 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3529 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL); 3702 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3530 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP); 3703 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3531 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG); 3704 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3532
3533 # TODO: should be done via popup
3534 $self->add (5, $row, new CFClient::UI::Button
3535 text => "bind",
3536 tooltip => "bind spell readying (cast command) to key",
3537 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3538 );
3539 } 3705 }
3540 }); 3706 });
3541} 3707}
3542 3708
3543sub add_spell { 3709sub add_spell {
… …
3549 3715
3550sub remove_spell { 3716sub remove_spell {
3551 my ($self, $spell) = @_; 3717 my ($self, $spell) = @_;
3552 3718
3553 delete $self->{spell}->{$spell->{name}}; 3719 delete $self->{spell}->{$spell->{name}};
3720 $self->rebuild_spell_list;
3721}
3722
3723sub clear_spells {
3724 my ($self) = @_;
3725
3726 $self->{spell} = {};
3554 $self->rebuild_spell_list; 3727 $self->rebuild_spell_list;
3555} 3728}
3556 3729
3557############################################################################# 3730#############################################################################
3558 3731
… …
3595 $coord = $max - $size if $coord > $max - $size; 3768 $coord = $max - $size if $coord > $max - $size;
3596 3769
3597 int $coord + 0.5 3770 int $coord + 0.5
3598} 3771}
3599 3772
3600sub size_allocate { 3773sub invoke_size_allocate {
3601 my ($self, $w, $h) = @_; 3774 my ($self, $w, $h) = @_;
3602 3775
3603 for my $child ($self->children) { 3776 for my $child ($self->children) {
3604 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3777 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3605 3778
… …
3609 $X = _to_pixel $X, $W, $self->{w}; 3782 $X = _to_pixel $X, $W, $self->{w};
3610 $Y = _to_pixel $Y, $H, $self->{h}; 3783 $Y = _to_pixel $Y, $H, $self->{h};
3611 3784
3612 $child->configure ($X, $Y, $W, $H); 3785 $child->configure ($X, $Y, $W, $H);
3613 } 3786 }
3787
3788 1
3614} 3789}
3615 3790
3616sub coord2local { 3791sub coord2local {
3617 my ($self, $x, $y) = @_; 3792 my ($self, $x, $y) = @_;
3618 3793

Diff Legend

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