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.291 by root, Tue Jun 6 02:55:50 2006 UTC vs.
Revision 1.308 by root, Mon Jun 19 05:18:14 2006 UTC

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

Diff Legend

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