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.296 by root, Wed Jun 7 05:48:53 2006 UTC vs.
Revision 1.310 by root, Fri Jun 23 20:28: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) = @_;
… …
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 path => '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->visible_children;
1417 1444
1418 my @req; 1445 my @req;
1419 1446
1420 if ($self->{homogeneous}) { 1447 if ($self->{homogeneous}) {
1421 @req = ($space / (@$children || 1)) x @$children; 1448 @req = ($space / (@children || 1)) x @children;
1422 } else { 1449 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1450 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424 my $req = List::Util::sum @req; 1451 my $req = List::Util::sum @req;
1425 1452
1426 if ($req > $space) { 1453 if ($req > $space) {
1427 # ah well, not enough space 1454 # ah well, not enough space
1428 $_ *= $space / $req for @req; 1455 $_ *= $space / $req for @req;
1429 } else { 1456 } else {
1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1457 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431 1458
1432 $space = ($space - $req) / $expand; # remaining space to give away 1459 $space = ($space - $req) / $expand; # remaining space to give away
1433 1460
1434 $req[$_] += $space * $children->[$_]{expand} 1461 $req[$_] += $space * $children[$_]{expand}
1435 for 0 .. $#$children; 1462 for 0 .. $#children;
1436 } 1463 }
1437 } 1464 }
1438 1465
1439 CFClient::UI::harmonize \@req; 1466 CFClient::UI::harmonize \@req;
1440 1467
1441 my $pos = 0; 1468 my $pos = 0;
1442 for (0 .. $#$children) { 1469 for (0 .. $#children) {
1443 my $alloc = $req[$_]; 1470 my $alloc = $req[$_];
1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1471 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445 1472
1446 $pos += $alloc; 1473 $pos += $alloc;
1447 } 1474 }
1448 1475
1449 1 1476 1
… …
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
… …
2028package CFClient::UI::Image; 2092package CFClient::UI::Image;
2029 2093
2030our @ISA = CFClient::UI::Base::; 2094our @ISA = CFClient::UI::Base::;
2031 2095
2032use CFClient::OpenGL; 2096use CFClient::OpenGL;
2033use Carp qw/confess/;
2034 2097
2035our %loaded_images; 2098our %texture_cache;
2036 2099
2037sub new { 2100sub new {
2038 my $class = shift; 2101 my $class = shift;
2039 2102
2040 my $self = $class->SUPER::new (can_events => 0, @_); 2103 my $self = $class->SUPER::new (
2104 can_events => 0,
2105 @_,
2106 );
2041 2107
2042 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2108 $self->{path}
2109 or Carp::croak "required attribute 'path' not set";
2043 2110
2044 $loaded_images{$self->{image}} ||= 2111 $self->{tex} = $texture_cache{$self->{path}} ||=
2045 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2112 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2046 2113
2047 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2114 Scalar::Util::weaken $texture_cache{$self->{path}};
2048 2115
2049 Scalar::Util::weaken $loaded_images{$self->{image}}; 2116 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2050
2051 $self->{aspect} = $tex->{w} / $tex->{h};
2052 2117
2053 $self 2118 $self
2054} 2119}
2055 2120
2056sub size_request { 2121sub size_request {
2057 my ($self) = @_; 2122 my ($self) = @_;
2058 2123
2059 ($self->{tex}->{w}, $self->{tex}->{h}) 2124 ($self->{tex}{w}, $self->{tex}{h})
2060} 2125}
2061 2126
2062sub _draw { 2127sub _draw {
2063 my ($self) = @_; 2128 my ($self) = @_;
2064 2129
… …
2300 $self->update; 2365 $self->update;
2301 2366
2302 $self 2367 $self
2303} 2368}
2304 2369
2305sub changed { }
2306
2307sub set_range { 2370sub set_range {
2308 my ($self, $range) = @_; 2371 my ($self, $range) = @_;
2309 2372
2310 ($range, $self->{range}) = ($self->{range}, $range); 2373 ($range, $self->{range}) = ($self->{range}, $range);
2311 2374
… …
2331 if $unit; 2394 if $unit;
2332 2395
2333 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2396 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2334 2397
2335 if ($value != $old_value) { 2398 if ($value != $old_value) {
2336 $self->_emit (changed => $value); 2399 $self->emit (changed => $value);
2337 $self->update; 2400 $self->update;
2338 } 2401 }
2339} 2402}
2340 2403
2341sub size_request { 2404sub size_request {
2342 my ($self) = @_; 2405 my ($self) = @_;
2343 2406
2344 ($self->{req_w}, $self->{req_h}) 2407 ($self->{req_w}, $self->{req_h})
2345} 2408}
2346 2409
2347sub button_down { 2410sub invoke_button_down {
2348 my ($self, $ev, $x, $y) = @_; 2411 my ($self, $ev, $x, $y) = @_;
2349 2412
2350 $self->SUPER::button_down ($ev, $x, $y); 2413 $self->SUPER::invoke_button_down ($ev, $x, $y);
2351 2414
2352 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2415 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2353 2416
2354 $self->mouse_motion ($ev, $x, $y) 2417 $self->invoke_mouse_motion ($ev, $x, $y)
2355} 2418}
2356 2419
2357sub mouse_motion { 2420sub invoke_mouse_motion {
2358 my ($self, $ev, $x, $y) = @_; 2421 my ($self, $ev, $x, $y) = @_;
2359 2422
2360 if ($GRAB == $self) { 2423 if ($GRAB == $self) {
2361 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2424 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2362 2425
… …
2467sub set_range { shift->{slider}->set_range (@_) } 2530sub set_range { shift->{slider}->set_range (@_) }
2468sub set_value { shift->{slider}->set_value (@_) } 2531sub set_value { shift->{slider}->set_value (@_) }
2469 2532
2470############################################################################# 2533#############################################################################
2471 2534
2472package CFClient::UI::TextView; 2535package CFClient::UI::TextScroller;
2473 2536
2474our @ISA = CFClient::UI::HBox::; 2537our @ISA = CFClient::UI::HBox::;
2475 2538
2476use CFClient::OpenGL; 2539use CFClient::OpenGL;
2477 2540
… …
2504 2567
2505 $self->{fontsize} = $fontsize; 2568 $self->{fontsize} = $fontsize;
2506 $self->reflow; 2569 $self->reflow;
2507} 2570}
2508 2571
2572sub visible_children {
2573 my ($self) = @_;
2574
2575 @{$self->{children}}[0,1]
2576}
2577
2509sub size_allocate { 2578sub invoke_size_allocate {
2510 my ($self, $w, $h) = @_; 2579 my ($self, $w, $h) = @_;
2511 2580
2512 $self->SUPER::size_allocate ($w, $h); 2581 my (undef, undef, @other) = @{ $self->{children} };
2582 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2513 2583
2514 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2584 $self->{layout}->set_font ($self->{font}) if $self->{font};
2515 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2585 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2516 $self->{layout}->set_width ($self->{children}[0]{w}); 2586 $self->{layout}->set_width ($self->{children}[0]{w});
2517 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2587 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2518 2588
2519 $self->reflow; 2589 $self->reflow;
2520}
2521 2590
2522sub text_size { 2591 $self->SUPER::invoke_size_allocate ($w, $h)
2523 my ($self, $text, $indent) = @_; 2592}
2593
2594sub get_layout {
2595 my ($self, $para) = @_;
2524 2596
2525 my $layout = $self->{layout}; 2597 my $layout = $self->{layout};
2526 2598
2599 $layout->set_font ($self->{font}) if $self->{font};
2527 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2600 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2528 $layout->set_width ($self->{children}[0]{w} - $indent); 2601 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2529 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2602 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2530 $layout->set_markup ($text); 2603 $layout->set_markup ($para->{markup});
2531 2604 $layout->set_shapes (map +($_->{req_w}, $_->{req_h}), @{$para->{widget}});
2605
2532 $layout->size 2606 $layout
2533} 2607}
2534 2608
2535sub reflow { 2609sub reflow {
2536 my ($self) = @_; 2610 my ($self) = @_;
2537 2611
… …
2546 $self->{children}[1]->set_value ($offset); 2620 $self->{children}[1]->set_value ($offset);
2547} 2621}
2548 2622
2549sub clear { 2623sub clear {
2550 my ($self) = @_; 2624 my ($self) = @_;
2625
2626 my (undef, undef, @other) = @{ $self->{children} };
2627 $self->remove ($_) for @other;
2551 2628
2552 $self->{par} = []; 2629 $self->{par} = [];
2553 $self->{height} = 0; 2630 $self->{height} = 0;
2554 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2631 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2555} 2632}
2556 2633
2557sub add_paragraph { 2634sub add_paragraph {
2558 my ($self, $color, $text, $indent) = @_; 2635 my ($self, $color, $para, $indent) = @_;
2559 2636
2560 for my $line (split /\n/, $text) { 2637 my ($text, @w) = ref $para ? @$para : $para;
2561 my ($w, $h) = $self->text_size ($line); 2638
2562 $self->{height} += $h; 2639 $para = {
2563 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2640 w => 1e10,
2641 wrapped => 1,
2642 fg => $color,
2643 indent => $indent,
2644 markup => $text,
2645 widget => \@w,
2564 } 2646 };
2565 2647
2566 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2648 $self->add (@w) if @w;
2649 push @{$self->{par}}, $para;
2650
2651 $self->{need_reflow}++;
2652 $self->update;
2653}
2654
2655sub scroll_to_bottom {
2656 my ($self) = @_;
2657
2658 $self->{scroll_to_bottom} = 1;
2659 $self->update;
2567} 2660}
2568 2661
2569sub update { 2662sub update {
2570 my ($self) = @_; 2663 my ($self) = @_;
2571 2664
… …
2579 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2672 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2580 2673
2581 if (delete $self->{need_reflow}) { 2674 if (delete $self->{need_reflow}) {
2582 my $height = 0; 2675 my $height = 0;
2583 2676
2584 my $layout = $self->{layout};
2585
2586 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2587
2588 for (@{$self->{par}}) { 2677 for my $para (@{$self->{par}}) {
2589 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2678 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2590 $layout->set_width ($W - $_->[3]); 2679 my $layout = $self->get_layout ($para);
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2592 $layout->set_markup ($_->[4]);
2593 my ($w, $h) = $layout->size; 2680 my ($w, $h) = $layout->size;
2594 $_->[0] = $w + $_->[3]; 2681
2682 $para->{w} = $w + $para->{indent};
2595 $_->[1] = $h; 2683 $para->{h} = $h;
2684 $para->{wrapped} = $layout->has_wrapped;
2596 } 2685 }
2597 2686
2598 $height += $_->[1]; 2687 $height += $para->{h};
2599 } 2688 }
2600 2689
2601 $self->{height} = $height; 2690 $self->{height} = $height;
2602 2691
2603 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2692 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2604 2693
2605 delete $self->{texture}; 2694 delete $self->{texture};
2695 }
2696
2697 if (delete $self->{scroll_to_bottom}) {
2698 $self->{children}[1]->set_value (1e10);
2606 } 2699 }
2607 2700
2608 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2701 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2609 glClearColor 0, 0, 0, 0; 2702 glClearColor 0, 0, 0, 0;
2610 glClear GL_COLOR_BUFFER_BIT; 2703 glClear GL_COLOR_BUFFER_BIT;
… …
2614 my $y0 = $top; 2707 my $y0 = $top;
2615 my $y1 = $top + $H; 2708 my $y1 = $top + $H;
2616 2709
2617 my $y = 0; 2710 my $y = 0;
2618 2711
2619 my $layout = $self->{layout};
2620
2621 $layout->set_font ($self->{font}) if $self->{font};
2622
2623 glEnable GL_BLEND; 2712 glEnable GL_BLEND;
2624 #TODO# not correct in windows where rgba is forced off 2713 #TODO# not correct in windows where rgba is forced off
2625 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2714 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2626 2715
2627 for my $par (@{$self->{par}}) { 2716 for my $para (@{$self->{par}}) {
2628 my $h = $par->[1]; 2717 my $h = $para->{h};
2629 2718
2630 if ($y0 < $y + $h && $y < $y1) { 2719 if ($y0 < $y + $h && $y < $y1) {
2631 $layout->set_foreground (@{ $par->[2] }); 2720
2632 $layout->set_width ($W - $par->[3]); 2721 my $layout = $self->get_layout ($para);
2633 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2634 $layout->set_markup ($par->[4]);
2635 2722
2636 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2723 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2637 2724
2638 glRasterPos $par->[3], $y - $y0; 2725 glRasterPos $para->{indent}, $y - $y0;
2639 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2726 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2727
2728 if (my @w = @{ $para->{widget} }) {
2729 my @s = $layout->get_shapes;
2730
2731 for (@w) {
2732 my ($dx, $dy) = splice @s, 0, 2, ();
2733
2734 $_->{x} = $dx + $para->{indent};
2735 $_->{y} = $dy + $y - $y0;
2736
2737 $_->draw;
2738 }
2739 }
2640 } 2740 }
2641 2741
2642 $y += $h; 2742 $y += $h;
2643 } 2743 }
2644 2744
2645 glDisable GL_BLEND; 2745 glDisable GL_BLEND;
2646 }; 2746 };
2647 }); 2747 });
2748}
2749
2750sub reconfigure {
2751 my ($self) = @_;
2752
2753 $self->SUPER::reconfigure;
2754
2755 $_->{w} = 1e10 for @{ $self->{par} };
2756 $self->reflow;
2648} 2757}
2649 2758
2650sub _draw { 2759sub _draw {
2651 my ($self) = @_; 2760 my ($self) = @_;
2652 2761
… …
2655 glColor 0, 0, 0, 1; 2764 glColor 0, 0, 0, 1;
2656 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2765 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2657 glDisable GL_TEXTURE_2D; 2766 glDisable GL_TEXTURE_2D;
2658 2767
2659 $self->{children}[1]->draw; 2768 $self->{children}[1]->draw;
2660
2661} 2769}
2662 2770
2663############################################################################# 2771#############################################################################
2664 2772
2665package CFClient::UI::Animator; 2773package CFClient::UI::Animator;
… …
2752 $tooltip .= "\n\n" . (ref $widget) . "\n" 2860 $tooltip .= "\n\n" . (ref $widget) . "\n"
2753 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2861 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2754 . "req $widget->{req_w} $widget->{req_h}\n" 2862 . "req $widget->{req_w} $widget->{req_h}\n"
2755 . "visible $widget->{visible}"; 2863 . "visible $widget->{visible}";
2756 } 2864 }
2865
2866 $tooltip =~ s/^\n+//;
2867 $tooltip =~ s/\n+$//;
2757 2868
2758 $self->add (new CFClient::UI::Label 2869 $self->add (new CFClient::UI::Label
2759 markup => $tooltip, 2870 markup => $tooltip,
2760 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2871 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2761 fontsize => 0.8, 2872 fontsize => 0.8,
… …
2771 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2882 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2772 2883
2773 ($w + 4, $h + 4) 2884 ($w + 4, $h + 4)
2774} 2885}
2775 2886
2776sub size_allocate { 2887sub invoke_size_allocate {
2777 my ($self, $w, $h) = @_; 2888 my ($self, $w, $h) = @_;
2778 2889
2779 $self->SUPER::size_allocate ($w - 4, $h - 4); 2890 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2780} 2891}
2781 2892
2782sub visibility_change { 2893sub invoke_visibility_change {
2783 my ($self, $visible) = @_; 2894 my ($self, $visible) = @_;
2784 2895
2785 return unless $visible; 2896 return unless $visible;
2786 2897
2787 $self->{root}->on_post_alloc ("move_$self" => sub { 2898 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2894 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3005 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2895 glDisable GL_TEXTURE_2D; 3006 glDisable GL_TEXTURE_2D;
2896 } 3007 }
2897} 3008}
2898 3009
2899sub DESTROY { 3010sub destroy {
2900 my ($self) = @_; 3011 my ($self) = @_;
2901 3012
2902 $self->{timer}->cancel 3013 $self->{timer}->cancel
2903 if $self->{timer}; 3014 if $self->{timer};
2904 3015
2905 $self->SUPER::DESTROY; 3016 $self->SUPER::destroy;
2906} 3017}
2907 3018
2908############################################################################# 3019#############################################################################
2909 3020
2910package CFClient::UI::Buttonbar; 3021package CFClient::UI::Buttonbar;
… …
2938 # handle various types of items, only text for now 3049 # handle various types of items, only text for now
2939 if (!ref $widget) { 3050 if (!ref $widget) {
2940 $widget = new CFClient::UI::Label 3051 $widget = new CFClient::UI::Label
2941 can_hover => 1, 3052 can_hover => 1,
2942 can_events => 1, 3053 can_events => 1,
2943 text => $widget, 3054 markup => $widget,
2944 tooltip => $tooltip 3055 tooltip => $tooltip
2945 } 3056 }
2946 3057
2947 $self->{item}{$widget} = $item; 3058 $self->{item}{$widget} = $item;
2948 3059
… …
2954 3065
2955# popup given the event (must be a mouse button down event currently) 3066# popup given the event (must be a mouse button down event currently)
2956sub popup { 3067sub popup {
2957 my ($self, $ev) = @_; 3068 my ($self, $ev) = @_;
2958 3069
2959 $self->_emit ("popdown"); 3070 $self->emit ("popdown");
2960 3071
2961 # maybe save $GRAB? must be careful about events... 3072 # maybe save $GRAB? must be careful about events...
2962 $GRAB = $self; 3073 $GRAB = $self;
2963 $self->{button} = $ev->{button}; 3074 $self->{button} = $ev->{button};
2964 3075
2965 $self->show; 3076 $self->show;
2966 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3077 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2967} 3078}
2968 3079
2969sub mouse_motion { 3080sub invoke_mouse_motion {
2970 my ($self, $ev, $x, $y) = @_; 3081 my ($self, $ev, $x, $y) = @_;
2971 3082
2972 # TODO: should use vbox->find_widget or so 3083 # TODO: should use vbox->find_widget or so
2973 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3084 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2974 $self->{hover} = $self->{item}{$HOVER}; 3085 $self->{hover} = $self->{item}{$HOVER};
2975 3086
2976 0 3087 0
2977} 3088}
2978 3089
2979sub button_up { 3090sub invoke_button_up {
2980 my ($self, $ev, $x, $y) = @_; 3091 my ($self, $ev, $x, $y) = @_;
2981 3092
2982 if ($ev->{button} == $self->{button}) { 3093 if ($ev->{button} == $self->{button}) {
2983 undef $GRAB; 3094 undef $GRAB;
2984 $self->hide; 3095 $self->hide;
2985 3096
2986 $self->_emit ("popdown"); 3097 $self->emit ("popdown");
2987 $self->{hover}[1]->() if $self->{hover}; 3098 $self->{hover}[1]->() if $self->{hover};
2988 } else { 3099 } else {
2989 return 0 3100 return 0
2990 } 3101 }
2991 3102
… …
3028 : $self->{children}[$page_or_widget]; 3139 : $self->{children}[$page_or_widget];
3029 3140
3030 $self->{current} = $widget; 3141 $self->{current} = $widget;
3031 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3142 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3032 3143
3033 $self->_emit (page_changed => $self->{current}); 3144 $self->emit (page_changed => $self->{current});
3034 3145
3035 $self->realloc; 3146 $self->realloc;
3036} 3147}
3037 3148
3038sub visible_children { 3149sub visible_children {
… …
3043 my ($self) = @_; 3154 my ($self) = @_;
3044 3155
3045 $self->{current}->size_request 3156 $self->{current}->size_request
3046} 3157}
3047 3158
3048sub size_allocate { 3159sub invoke_size_allocate {
3049 my ($self, $w, $h) = @_; 3160 my ($self, $w, $h) = @_;
3050 3161
3051 $self->{current}->configure (0, 0, $w, $h); 3162 $self->{current}->configure (0, 0, $w, $h);
3163
3164 1
3052} 3165}
3053 3166
3054sub _draw { 3167sub _draw {
3055 my ($self) = @_; 3168 my ($self) = @_;
3056 3169
… …
3095 3208
3096sub set_current_page { 3209sub set_current_page {
3097 my ($self, $page) = @_; 3210 my ($self, $page) = @_;
3098 3211
3099 $self->{multiplexer}->set_current_page ($page); 3212 $self->{multiplexer}->set_current_page ($page);
3100 $self->_emit (page_changed => $self->{multiplexer}{current}); 3213 $self->emit (page_changed => $self->{multiplexer}{current});
3101} 3214}
3102 3215
3103############################################################################# 3216#############################################################################
3104 3217
3105package CFClient::UI::Combobox; 3218package CFClient::UI::Combobox;
… …
3110 3223
3111sub new { 3224sub new {
3112 my $class = shift; 3225 my $class = shift;
3113 3226
3114 my $self = $class->SUPER::new ( 3227 my $self = $class->SUPER::new (
3115 options => [], # [title, value, tooltip], ... 3228 options => [], # [value, title, longdesc], ...
3116 value => undef, 3229 value => undef,
3117 @_, 3230 @_,
3118 ); 3231 );
3119 3232
3120 $self->_set_value ($self->{value}); 3233 $self->_set_value ($self->{value});
3121 3234
3122 $self 3235 $self
3123} 3236}
3124 3237
3125sub button_down { 3238sub invoke_button_down {
3126 my ($self, $ev) = @_; 3239 my ($self, $ev) = @_;
3127 3240
3128 my @menu_items; 3241 my @menu_items;
3129 3242
3130 for (@{ $self->{options} }) { 3243 for (@{ $self->{options} }) {
3131 my ($title, $value, $tooltip) = @$_; 3244 my ($value, $title, $tooltip) = @$_;
3132 3245
3133 push @menu_items, [$tooltip, sub { $self->set_value ($value) }]; 3246 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3134 } 3247 }
3135 3248
3136 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3249 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3137} 3250}
3138 3251
3139sub _set_value { 3252sub _set_value {
3140 my ($self, $value) = @_; 3253 my ($self, $value) = @_;
3141 3254
3142 my ($item) = grep $_->[1] eq $value, @{ $self->{options} } 3255 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3143 or return; 3256 or return;
3144 3257
3145 $self->{value} = $item->[1]; 3258 $self->{value} = $item->[0];
3146 $self->set_markup ("$item->[0] ⇓"); 3259 $self->set_markup ("$item->[1] ⇓");
3147 $self->set_tooltip ($item->[2]); 3260 $self->set_tooltip ($item->[2]);
3148} 3261}
3149 3262
3150sub set_value { 3263sub set_value {
3151 my ($self, $value) = @_; 3264 my ($self, $value) = @_;
3152 3265
3153 return unless $self->{value} ne $value; 3266 return unless $self->{value} ne $value;
3154 3267
3155 $self->_set_value ($value); 3268 $self->_set_value ($value);
3156 $self->_emit (changed => $value); 3269 $self->emit (changed => $value);
3157} 3270}
3158 3271
3159############################################################################# 3272#############################################################################
3160 3273
3161package CFClient::UI::Statusbox; 3274package CFClient::UI::Statusbox;
… …
3260 $item->{count}++; 3373 $item->{count}++;
3261 } else { 3374 } else {
3262 $item->{count} = 1; 3375 $item->{count} = 1;
3263 $item->{text} = $item->{tooltip} = $text; 3376 $item->{text} = $item->{tooltip} = $text;
3264 } 3377 }
3265 $item->{id} = ++$self->{id}; 3378 $item->{id} += 0.2;#d#
3266 $item->{timeout} = $timeout; 3379 $item->{timeout} = $timeout;
3267 delete $item->{label}; 3380 delete $item->{label};
3268 } else { 3381 } else {
3269 $self->{item}{$group} = { 3382 $self->{item}{$group} = {
3270 id => ++$self->{id}, 3383 id => ++$self->{id},
… …
3289 3402
3290 $self->reorder; 3403 $self->reorder;
3291 $self->SUPER::reconfigure; 3404 $self->SUPER::reconfigure;
3292} 3405}
3293 3406
3294sub DESTROY { 3407sub destroy {
3295 my ($self) = @_; 3408 my ($self) = @_;
3296 3409
3297 $self->{timer}->cancel; 3410 $self->{timer}->cancel;
3298 3411
3299 $self->SUPER::DESTROY; 3412 $self->SUPER::destroy;
3300} 3413}
3301 3414
3302############################################################################# 3415#############################################################################
3303 3416
3304package CFClient::UI::Inventory; 3417package CFClient::UI::Inventory;
… …
3405 $self->update_binding_widgets; 3518 $self->update_binding_widgets;
3406 3519
3407 $self 3520 $self
3408} 3521}
3409 3522
3523sub cfg_bind {
3524 my ($self, $mod, $sym, $cmds) = @_;
3525 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3526 ::update_bindings ();
3527}
3528
3529sub cfg_unbind {
3530 my ($self, $mod, $sym, $cmds) = @_;
3531 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3532 ::update_bindings ();
3533}
3534
3410sub commit { 3535sub commit {
3411 my ($self) = @_; 3536 my ($self) = @_;
3412 my ($mod, $sym, $cmds) = $self->get_binding; 3537 my ($mod, $sym, $cmds) = $self->get_binding;
3413 if ($sym != 0 && @$cmds > 0) { 3538 if ($sym != 0 && @$cmds > 0) {
3414 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym) 3539 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
… …
3448 my ($self) = @_; 3573 my ($self) = @_;
3449 $self->ask_for_bind (1); 3574 $self->ask_for_bind (1);
3450} 3575}
3451 3576
3452sub ask_for_bind { 3577sub ask_for_bind {
3453 my ($self, $commit) = @_; 3578 my ($self, $commit, $end_cb) = @_;
3454 3579
3455 CFClient::Binder::open_binding_dialog (sub { 3580 CFClient::Binder::open_binding_dialog (sub {
3456 my ($mod, $sym) = @_; 3581 my ($mod, $sym) = @_;
3457 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak? 3582 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3458 $self->update_binding_widgets; 3583 $self->update_binding_widgets;
3459 $self->commit if $commit; 3584 $self->commit if $commit;
3585 $end_cb->() if $end_cb;
3460 }); 3586 });
3461} 3587}
3462 3588
3463# $mod and $sym are the modifiers and key symbol 3589# $mod and $sym are the modifiers and key symbol
3464# $cmds is a array ref of strings (the commands) 3590# $cmds is a array ref of strings (the commands)
… …
3482} 3608}
3483 3609
3484# this is a shortcut method that asks for a binding 3610# this is a shortcut method that asks for a binding
3485# and then just binds it. 3611# and then just binds it.
3486sub do_quick_binding { 3612sub do_quick_binding {
3487 my ($self, $cmds) = @_; 3613 my ($self, $cmds, $end_cb) = @_;
3488 $self->set_binding (undef, undef, $cmds, sub { 3614 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3489 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3490 });
3491 $self->ask_for_bind (1); 3615 $self->ask_for_bind (1, $end_cb);
3492} 3616}
3493 3617
3494sub update_binding_widgets { 3618sub update_binding_widgets {
3495 my ($self) = @_; 3619 my ($self) = @_;
3496 my ($mod, $sym, $cmds) = $self->get_binding; 3620 my ($mod, $sym, $cmds) = $self->get_binding;
… …
3552 commands => [], 3676 commands => [],
3553 @_, 3677 @_,
3554 ) 3678 )
3555} 3679}
3556 3680
3681my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3682
3683my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3684 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3685my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3686 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3557my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip => 3687my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3558 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell."); 3688 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3559my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip => 3689my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3560 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation."); 3690 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3561my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip => 3691my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3562 "<b>Damage</b>. The amount of damage the spell deals when it hits."); 3692 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3563 3693
3564sub rebuild_spell_list { 3694sub rebuild_spell_list {
3565 my ($self) = @_; 3695 my ($self) = @_;
3566 3696
3567 $CFClient::UI::ROOT->on_refresh ($self => sub { 3697 $CFClient::UI::ROOT->on_refresh ($self => sub {
3568 $self->clear; 3698 $self->clear;
3569 3699
3700 return unless $::CONN;
3701
3570 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name"); 3702 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3703 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3571 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL); 3704 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3572 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP); 3705 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3573 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG); 3706 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3574 3707
3575 my $row = 0; 3708 my $row = 0;
3576 3709
3577 for (sort { $a cmp $b } keys %{ $self->{spell} }) { 3710 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3578 my $spell = $self->{spell}{$_}; 3711 my $spell = $self->{spell}{$_};
3579 3712
3580 $row++; 3713 $row++;
3714
3715 my $spell_cb = sub {
3716 my ($widget, $ev) = @_;
3717
3718 if ($ev->{button} == 1) {
3719 $::CONN->user_send ("cast $spell->{name}");
3720 } elsif ($ev->{button} == 2) {
3721 $::CONN->user_send ("invoke $spell->{name}");
3722 } elsif ($ev->{button} == 3) {
3723 (new CFClient::UI::Menu
3724 items => [
3725 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3726 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3727 ],
3728 )->popup ($ev);
3729 } else {
3730 return 0;
3731 }
3732
3733 1
3734 };
3735
3736 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3737
3738 #TODO: add path info to tooltip
3739 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3581 3740
3582 $self->add (0, $row, new CFClient::UI::Face 3741 $self->add (0, $row, new CFClient::UI::Face
3583 face => $spell->{face}, 3742 face => $spell->{face},
3584 can_hover => 1, 3743 can_hover => 1,
3585 can_events => 1, 3744 can_events => 1,
3586 tooltip => $spell->{message}, 3745 tooltip => $tooltip,
3746 on_button_down => $spell_cb,
3587 ); 3747 );
3588 3748
3589 $self->add (1, $row, new CFClient::UI::Label 3749 $self->add (1, $row, new CFClient::UI::Label
3590 expand => 1, 3750 expand => 1,
3591 text => $spell->{name}, 3751 text => $spell->{name},
3592 can_hover => 1, 3752 can_hover => 1,
3593 can_events => 1, 3753 can_events => 1,
3594 tooltip => $spell->{message}, 3754 tooltip => $tooltip,
3755 on_button_down => $spell_cb,
3595 ); 3756 );
3596 3757
3758 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3597 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL); 3759 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3598 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP); 3760 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3599 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG); 3761 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3600
3601 # TODO: should be done via popup
3602 $self->add (5, $row, new CFClient::UI::Button
3603 text => "bind",
3604 tooltip => "bind spell readying (cast command) to key",
3605 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3606 );
3607 } 3762 }
3608 }); 3763 });
3609} 3764}
3610 3765
3611sub add_spell { 3766sub add_spell {
… …
3617 3772
3618sub remove_spell { 3773sub remove_spell {
3619 my ($self, $spell) = @_; 3774 my ($self, $spell) = @_;
3620 3775
3621 delete $self->{spell}->{$spell->{name}}; 3776 delete $self->{spell}->{$spell->{name}};
3777 $self->rebuild_spell_list;
3778}
3779
3780sub clear_spells {
3781 my ($self) = @_;
3782
3783 $self->{spell} = {};
3622 $self->rebuild_spell_list; 3784 $self->rebuild_spell_list;
3623} 3785}
3624 3786
3625############################################################################# 3787#############################################################################
3626 3788
… …
3663 $coord = $max - $size if $coord > $max - $size; 3825 $coord = $max - $size if $coord > $max - $size;
3664 3826
3665 int $coord + 0.5 3827 int $coord + 0.5
3666} 3828}
3667 3829
3668sub size_allocate { 3830sub invoke_size_allocate {
3669 my ($self, $w, $h) = @_; 3831 my ($self, $w, $h) = @_;
3670 3832
3671 for my $child ($self->children) { 3833 for my $child ($self->children) {
3672 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3834 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3673 3835
… …
3677 $X = _to_pixel $X, $W, $self->{w}; 3839 $X = _to_pixel $X, $W, $self->{w};
3678 $Y = _to_pixel $Y, $H, $self->{h}; 3840 $Y = _to_pixel $Y, $H, $self->{h};
3679 3841
3680 $child->configure ($X, $Y, $W, $H); 3842 $child->configure ($X, $Y, $W, $H);
3681 } 3843 }
3844
3845 1
3682} 3846}
3683 3847
3684sub coord2local { 3848sub coord2local {
3685 my ($self, $x, $y) = @_; 3849 my ($self, $x, $y) = @_;
3686 3850

Diff Legend

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