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.286 by root, Mon Jun 5 03:48:49 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
… …
1554 return if $self->{text} eq "T$text"; 1581 return if $self->{text} eq "T$text";
1555 $self->{text} = "T$text"; 1582 $self->{text} = "T$text";
1556 1583
1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558 $self->{layout}->set_text ($text); 1585 $self->{layout}->set_text ($text);
1586
1559 delete $self->{req_h}; 1587 delete $self->{size_req};
1560
1561 $self->realloc; 1588 $self->realloc;
1562 $self->update; 1589 $self->update;
1563} 1590}
1564 1591
1565sub set_markup { 1592sub set_markup {
… …
1570 1597
1571 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1598 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572 1599
1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1600 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1574 $self->{layout}->set_markup ($markup); 1601 $self->{layout}->set_markup ($markup);
1602
1575 delete $self->{req_h}; 1603 delete $self->{size_req};
1576
1577 $self->realloc; 1604 $self->realloc;
1578 $self->update; 1605 $self->update;
1579} 1606}
1580 1607
1581sub size_request { 1608sub size_request {
1582 my ($self) = @_; 1609 my ($self) = @_;
1583 1610
1584 if (exists $self->{req_h}) { 1611 $self->{size_req} ||= do {
1585 @$self{qw(req_w req_h)}
1586 } else {
1587 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1612 $self->{layout}->set_font ($self->{font}) if $self->{font};
1588 $self->{layout}->set_width ($self->{max_w} || -1); 1613 $self->{layout}->set_width ($self->{max_w} || -1);
1589 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1614 $self->{layout}->set_ellipsise ($self->{ellipsise});
1590 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1615 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1591 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1616 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
… …
1600 1625
1601 $w = List::Util::max $w, $w2; 1626 $w = List::Util::max $w, $w2;
1602 $h = List::Util::max $h, $h2; 1627 $h = List::Util::max $h, $h2;
1603 } 1628 }
1604 1629
1605 ($w, $h) 1630 [$w, $h]
1606 } 1631 };
1607}
1608 1632
1633 @{ $self->{size_req} }
1634}
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
1621 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1622 delete $self->{texture}; 1651 delete $self->{texture};
1623 1652
1624 $self->realloc; 1653 $self->realloc;
1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1625} 1662}
1626 1663
1627sub _draw { 1664sub _draw {
1628 my ($self) = @_; 1665 my ($self) = @_;
1629 1666
… …
1649 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1650 : ($self->{h} - $tex->{h}) * 0.5); 1687 : ($self->{h} - $tex->{h}) * 0.5);
1651 }; 1688 };
1652 1689
1653 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1654 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1655 1694
1656 if ($tex->{format} == GL_ALPHA) { 1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1657 glColor @{$self->{fg}}; 1697 glColor @{$self->{fg}};
1658 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1659 } else { 1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1660 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1661 } 1702 }
1662 1703
1663 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1664} 1705}
1665 1706
… …
1682 can_hover => 1, 1723 can_hover => 1,
1683 can_focus => 1, 1724 can_focus => 1,
1684 valign => 0, 1725 valign => 0,
1685 can_events => 1, 1726 can_events => 1,
1686 #text => ... 1727 #text => ...
1728 #hidden => "*",
1687 @_ 1729 @_
1688 ) 1730 )
1689} 1731}
1690 1732
1691sub _set_text { 1733sub _set_text {
… …
1698 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1699 $self->{text} = $text; 1741 $self->{text} = $text;
1700 1742
1701 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1702 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1703 delete $self->{req_h}; 1745 delete $self->{size_req};
1704 1746
1705 $self->_emit (changed => $self->{text}); 1747 $self->emit (changed => $self->{text});
1706 1748
1707 $self->realloc; 1749 $self->realloc;
1708 $self->update; 1750 $self->update;
1709} 1751}
1710 1752
… …
1725 my ($w, $h) = $self->SUPER::size_request; 1767 my ($w, $h) = $self->SUPER::size_request;
1726 1768
1727 ($w + 1, $h) # add 1 for cursor 1769 ($w + 1, $h) # add 1 for cursor
1728} 1770}
1729 1771
1730sub key_down { 1772sub invoke_key_down {
1731 my ($self, $ev) = @_; 1773 my ($self, $ev) = @_;
1732 1774
1733 my $mod = $ev->{mod}; 1775 my $mod = $ev->{mod};
1734 my $sym = $ev->{sym}; 1776 my $sym = $ev->{sym};
1735 my $uni = $ev->{unicode}; 1777 my $uni = $ev->{unicode};
… …
1747 } elsif ($sym == CFClient::SDLK_HOME) { 1789 } elsif ($sym == CFClient::SDLK_HOME) {
1748 $self->{cursor} = 0; 1790 $self->{cursor} = 0;
1749 } elsif ($sym == CFClient::SDLK_END) { 1791 } elsif ($sym == CFClient::SDLK_END) {
1750 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1751 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1752 $self->_emit ('escape'); 1794 $self->emit ('escape');
1753 } elsif ($uni) { 1795 } elsif ($uni) {
1754 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1755 } else { 1797 } else {
1756 return 0; 1798 return 0;
1757 } 1799 }
… …
1761 $self->realloc; 1803 $self->realloc;
1762 1804
1763 1 1805 1
1764} 1806}
1765 1807
1766sub focus_in { 1808sub invoke_focus_in {
1767 my ($self) = @_; 1809 my ($self) = @_;
1768 1810
1769 $self->{last_activity} = $::NOW; 1811 $self->{last_activity} = $::NOW;
1770 1812
1771 $self->SUPER::focus_in; 1813 $self->SUPER::invoke_focus_in
1772} 1814}
1773 1815
1774sub button_down { 1816sub invoke_button_down {
1775 my ($self, $ev, $x, $y) = @_; 1817 my ($self, $ev, $x, $y) = @_;
1776 1818
1777 $self->SUPER::button_down ($ev, $x, $y); 1819 $self->SUPER::invoke_button_down ($ev, $x, $y);
1778 1820
1779 my $idx = $self->{layout}->xy_to_index ($x, $y); 1821 my $idx = $self->{layout}->xy_to_index ($x, $y);
1780 1822
1781 # byte-index to char-index 1823 # byte-index to char-index
1782 my $text = $self->{text}; 1824 my $text = $self->{text};
… …
1787 $self->update; 1829 $self->update;
1788 1830
1789 1 1831 1
1790} 1832}
1791 1833
1792sub mouse_motion { 1834sub invoke_mouse_motion {
1793 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1794# 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#
1795 1837
1796 0 1838 1
1797} 1839}
1798 1840
1799sub _draw { 1841sub _draw {
1800 my ($self) = @_; 1842 my ($self) = @_;
1801 1843
… …
1842 1884
1843our @ISA = CFClient::UI::EntryBase::; 1885our @ISA = CFClient::UI::EntryBase::;
1844 1886
1845use CFClient::OpenGL; 1887use CFClient::OpenGL;
1846 1888
1847sub key_down { 1889sub invoke_key_down {
1848 my ($self, $ev) = @_; 1890 my ($self, $ev) = @_;
1849 1891
1850 my $sym = $ev->{sym}; 1892 my $sym = $ev->{sym};
1851 1893
1852 if ($sym == 13) { 1894 if ($sym == 13) {
1853 unshift @{$self->{history}}, 1895 unshift @{$self->{history}},
1854 my $txt = $self->get_text; 1896 my $txt = $self->get_text;
1897
1855 $self->{history_pointer} = -1; 1898 $self->{history_pointer} = -1;
1856 $self->{history_saveback} = ''; 1899 $self->{history_saveback} = '';
1857 $self->_emit (activate => $txt); 1900 $self->emit (activate => $txt);
1858 $self->update; 1901 $self->update;
1859 1902
1860 } elsif ($sym == CFClient::SDLK_UP) { 1903 } elsif ($sym == CFClient::SDLK_UP) {
1861 if ($self->{history_pointer} < 0) { 1904 if ($self->{history_pointer} < 0) {
1862 $self->{history_saveback} = $self->get_text; 1905 $self->{history_saveback} = $self->get_text;
… …
1878 } else { 1921 } else {
1879 $self->set_text ($self->{history_saveback}); 1922 $self->set_text ($self->{history_saveback});
1880 } 1923 }
1881 1924
1882 } else { 1925 } else {
1883 return $self->SUPER::key_down ($ev) 1926 return $self->SUPER::invoke_key_down ($ev)
1884 } 1927 }
1885 1928
1886 1 1929 1
1887} 1930}
1888 1931
… …
1912 can_events => 1, 1955 can_events => 1,
1913 @_ 1956 @_
1914 ) 1957 )
1915} 1958}
1916 1959
1917sub activate { }
1918
1919sub button_up { 1960sub invoke_button_up {
1920 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1921 1962
1922 $self->emit ("activate") 1963 $self->emit ("activate")
1923 if $x >= 0 && $x < $self->{w} 1964 if $x >= 0 && $x < $self->{w}
1924 && $y >= 0 && $y < $self->{h}; 1965 && $y >= 0 && $y < $self->{h};
… …
1938 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1979 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1939 1980
1940 glDisable GL_TEXTURE_2D; 1981 glDisable GL_TEXTURE_2D;
1941 1982
1942 $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
1943} 2020}
1944 2021
1945############################################################################# 2022#############################################################################
1946 2023
1947package CFClient::UI::CheckBox; 2024package CFClient::UI::CheckBox;
… …
1974 my ($self) = @_; 2051 my ($self) = @_;
1975 2052
1976 (6) x 2 2053 (6) x 2
1977} 2054}
1978 2055
1979sub button_down { 2056sub invoke_button_down {
1980 my ($self, $ev, $x, $y) = @_; 2057 my ($self, $ev, $x, $y) = @_;
1981 2058
1982 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1983 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1984 $self->{state} = !$self->{state}; 2061 $self->{state} = !$self->{state};
1985 $self->_emit (changed => $self->{state}); 2062 $self->emit (changed => $self->{state});
1986 } else { 2063 } else {
1987 return 0 2064 return 0
1988 } 2065 }
1989 2066
1990 1 2067 1
… …
2287 $self->update; 2364 $self->update;
2288 2365
2289 $self 2366 $self
2290} 2367}
2291 2368
2292sub changed { }
2293
2294sub set_range { 2369sub set_range {
2295 my ($self, $range) = @_; 2370 my ($self, $range) = @_;
2296 2371
2297 ($range, $self->{range}) = ($self->{range}, $range); 2372 ($range, $self->{range}) = ($self->{range}, $range);
2298 2373
2299 $self->update
2300 if "@$range" ne "@{$self->{range}}"; 2374 if ("@$range" ne "@{$self->{range}}") {
2375 $self->update;
2376 $self->set_value ($self->{range}[0]);
2377 }
2301} 2378}
2302 2379
2303sub set_value { 2380sub set_value {
2304 my ($self, $value) = @_; 2381 my ($self, $value) = @_;
2305 2382
… …
2316 if $unit; 2393 if $unit;
2317 2394
2318 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2395 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2319 2396
2320 if ($value != $old_value) { 2397 if ($value != $old_value) {
2321 $self->_emit (changed => $value); 2398 $self->emit (changed => $value);
2322 $self->update; 2399 $self->update;
2323 } 2400 }
2324} 2401}
2325 2402
2326sub size_request { 2403sub size_request {
2327 my ($self) = @_; 2404 my ($self) = @_;
2328 2405
2329 ($self->{req_w}, $self->{req_h}) 2406 ($self->{req_w}, $self->{req_h})
2330} 2407}
2331 2408
2332sub button_down { 2409sub invoke_button_down {
2333 my ($self, $ev, $x, $y) = @_; 2410 my ($self, $ev, $x, $y) = @_;
2334 2411
2335 $self->SUPER::button_down ($ev, $x, $y); 2412 $self->SUPER::invoke_button_down ($ev, $x, $y);
2336 2413
2337 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2414 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2338 2415
2339 $self->mouse_motion ($ev, $x, $y) 2416 $self->invoke_mouse_motion ($ev, $x, $y)
2340} 2417}
2341 2418
2342sub mouse_motion { 2419sub invoke_mouse_motion {
2343 my ($self, $ev, $x, $y) = @_; 2420 my ($self, $ev, $x, $y) = @_;
2344 2421
2345 if ($GRAB == $self) { 2422 if ($GRAB == $self) {
2346 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2423 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2347 2424
… …
2452sub set_range { shift->{slider}->set_range (@_) } 2529sub set_range { shift->{slider}->set_range (@_) }
2453sub set_value { shift->{slider}->set_value (@_) } 2530sub set_value { shift->{slider}->set_value (@_) }
2454 2531
2455############################################################################# 2532#############################################################################
2456 2533
2457package CFClient::UI::TextView; 2534package CFClient::UI::TextScroller;
2458 2535
2459our @ISA = CFClient::UI::HBox::; 2536our @ISA = CFClient::UI::HBox::;
2460 2537
2461use CFClient::OpenGL; 2538use CFClient::OpenGL;
2462 2539
… …
2464 my $class = shift; 2541 my $class = shift;
2465 2542
2466 my $self = $class->SUPER::new ( 2543 my $self = $class->SUPER::new (
2467 fontsize => 1, 2544 fontsize => 1,
2468 can_events => 0, 2545 can_events => 0,
2546 indent => 0,
2469 #font => default_font 2547 #font => default_font
2470 @_, 2548 @_,
2471 2549
2472 layout => (new CFClient::Layout 1), 2550 layout => (new CFClient::Layout 1),
2473 par => [], 2551 par => [],
… …
2488 2566
2489 $self->{fontsize} = $fontsize; 2567 $self->{fontsize} = $fontsize;
2490 $self->reflow; 2568 $self->reflow;
2491} 2569}
2492 2570
2493sub size_allocate { 2571sub invoke_size_allocate {
2494 my ($self, $w, $h) = @_; 2572 my ($self, $w, $h) = @_;
2495
2496 $self->SUPER::size_allocate ($w, $h);
2497 2573
2498 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2574 $self->{layout}->set_font ($self->{font}) if $self->{font};
2499 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2500 $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});
2501 2578
2502 $self->reflow; 2579 $self->reflow;
2580
2581 $self->SUPER::invoke_size_allocate ($w, $h)
2503} 2582}
2504 2583
2505sub text_size { 2584sub text_size {
2506 my ($self, $text, $indent) = @_; 2585 my ($self, $text, $indent) = @_;
2507 2586
2508 my $layout = $self->{layout}; 2587 my $layout = $self->{layout};
2509 2588
2510 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2589 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2511 $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});
2512 $layout->set_markup ($text); 2592 $layout->set_markup ($text);
2513 2593
2514 $layout->size 2594 $layout->size
2515} 2595}
2516 2596
… …
2555 2635
2556 return unless $self->{h} > 0; 2636 return unless $self->{h} > 0;
2557 2637
2558 delete $self->{texture}; 2638 delete $self->{texture};
2559 2639
2560 $ROOT->on_post_alloc ($self, sub { 2640 $ROOT->on_post_alloc ($self => sub {
2561 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2641 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2562 2642
2563 if (delete $self->{need_reflow}) { 2643 if (delete $self->{need_reflow}) {
2564 my $height = 0; 2644 my $height = 0;
2565 2645
… …
2568 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2648 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2569 2649
2570 for (@{$self->{par}}) { 2650 for (@{$self->{par}}) {
2571 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2651 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2572 $layout->set_width ($W - $_->[3]); 2652 $layout->set_width ($W - $_->[3]);
2653 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2573 $layout->set_markup ($_->[4]); 2654 $layout->set_markup ($_->[4]);
2574 my ($w, $h) = $layout->size; 2655 my ($w, $h) = $layout->size;
2575 $_->[0] = $w + $_->[3]; 2656 $_->[0] = $w + $_->[3];
2576 $_->[1] = $h; 2657 $_->[1] = $h;
2577 } 2658 }
… …
2580 } 2661 }
2581 2662
2582 $self->{height} = $height; 2663 $self->{height} = $height;
2583 2664
2584 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2665 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2585 2666
2586 delete $self->{texture}; 2667 delete $self->{texture};
2587 } 2668 }
2588 2669
2589 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2670 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2590 glClearColor 0, 0, 0, 0; 2671 glClearColor 0, 0, 0, 0;
… …
2609 my $h = $par->[1]; 2690 my $h = $par->[1];
2610 2691
2611 if ($y0 < $y + $h && $y < $y1) { 2692 if ($y0 < $y + $h && $y < $y1) {
2612 $layout->set_foreground (@{ $par->[2] }); 2693 $layout->set_foreground (@{ $par->[2] });
2613 $layout->set_width ($W - $par->[3]); 2694 $layout->set_width ($W - $par->[3]);
2695 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2614 $layout->set_markup ($par->[4]); 2696 $layout->set_markup ($par->[4]);
2615 2697
2616 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2698 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2617 2699
2618 glRasterPos $par->[3], $y - $y0; 2700 glRasterPos $par->[3], $y - $y0;
… …
2732 $tooltip .= "\n\n" . (ref $widget) . "\n" 2814 $tooltip .= "\n\n" . (ref $widget) . "\n"
2733 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2815 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2734 . "req $widget->{req_w} $widget->{req_h}\n" 2816 . "req $widget->{req_w} $widget->{req_h}\n"
2735 . "visible $widget->{visible}"; 2817 . "visible $widget->{visible}";
2736 } 2818 }
2819
2820 $tooltip =~ s/^\n+//;
2821 $tooltip =~ s/\n+$//;
2737 2822
2738 $self->add (new CFClient::UI::Label 2823 $self->add (new CFClient::UI::Label
2739 markup => $tooltip, 2824 markup => $tooltip,
2740 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2825 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2741 fontsize => 0.8, 2826 fontsize => 0.8,
… …
2751 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2836 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2752 2837
2753 ($w + 4, $h + 4) 2838 ($w + 4, $h + 4)
2754} 2839}
2755 2840
2756sub size_allocate { 2841sub invoke_size_allocate {
2757 my ($self, $w, $h) = @_; 2842 my ($self, $w, $h) = @_;
2758 2843
2759 $self->SUPER::size_allocate ($w - 4, $h - 4); 2844 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2760} 2845}
2761 2846
2762sub visibility_change { 2847sub invoke_visibility_change {
2763 my ($self, $visible) = @_; 2848 my ($self, $visible) = @_;
2764 2849
2765 return unless $visible; 2850 return unless $visible;
2766 2851
2767 $self->{root}->on_post_alloc ("move_$self" => sub { 2852 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2769 or return; 2854 or return;
2770 2855
2771 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2856 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2772 2857
2773 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2858 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2774 if $x + $self->{w} > $::WIDTH; 2859 if $x + $self->{w} > $self->{root}{w};
2775 2860
2776 $self->move_abs ($x, $y); 2861 $self->move_abs ($x, $y);
2777 }); 2862 });
2778} 2863}
2779 2864
… …
2874 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2959 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2875 glDisable GL_TEXTURE_2D; 2960 glDisable GL_TEXTURE_2D;
2876 } 2961 }
2877} 2962}
2878 2963
2879sub DESTROY { 2964sub destroy {
2880 my ($self) = @_; 2965 my ($self) = @_;
2881 2966
2882 $self->{timer}->cancel 2967 $self->{timer}->cancel
2883 if $self->{timer}; 2968 if $self->{timer};
2884 2969
2885 $self->SUPER::DESTROY; 2970 $self->SUPER::destroy;
2886} 2971}
2887 2972
2888############################################################################# 2973#############################################################################
2889 2974
2890package CFClient::UI::Buttonbar; 2975package CFClient::UI::Buttonbar;
… …
2911 ); 2996 );
2912 2997
2913 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2998 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2914 2999
2915 for my $item (@{ $self->{items} }) { 3000 for my $item (@{ $self->{items} }) {
2916 my ($widget, $cb) = @$item; 3001 my ($widget, $cb, $tooltip) = @$item;
2917 3002
2918 # handle various types of items, only text for now 3003 # handle various types of items, only text for now
2919 if (!ref $widget) { 3004 if (!ref $widget) {
2920 $widget = new CFClient::UI::Label 3005 $widget = new CFClient::UI::Label
2921 can_hover => 1, 3006 can_hover => 1,
2922 can_events => 1, 3007 can_events => 1,
2923 text => $widget; 3008 markup => $widget,
3009 tooltip => $tooltip
2924 } 3010 }
2925 3011
2926 $self->{item}{$widget} = $item; 3012 $self->{item}{$widget} = $item;
2927 3013
2928 $self->{vbox}->add ($widget); 3014 $self->{vbox}->add ($widget);
… …
2933 3019
2934# 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)
2935sub popup { 3021sub popup {
2936 my ($self, $ev) = @_; 3022 my ($self, $ev) = @_;
2937 3023
2938 $self->_emit ("popdown"); 3024 $self->emit ("popdown");
2939 3025
2940 # maybe save $GRAB? must be careful about events... 3026 # maybe save $GRAB? must be careful about events...
2941 $GRAB = $self; 3027 $GRAB = $self;
2942 $self->{button} = $ev->{button}; 3028 $self->{button} = $ev->{button};
2943 3029
2944 $self->show; 3030 $self->show;
2945 $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);
2946} 3032}
2947 3033
2948sub mouse_motion { 3034sub invoke_mouse_motion {
2949 my ($self, $ev, $x, $y) = @_; 3035 my ($self, $ev, $x, $y) = @_;
2950 3036
2951 # TODO: should use vbox->find_widget or so 3037 # TODO: should use vbox->find_widget or so
2952 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3038 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2953 $self->{hover} = $self->{item}{$HOVER}; 3039 $self->{hover} = $self->{item}{$HOVER};
2954 3040
2955 0 3041 0
2956} 3042}
2957 3043
2958sub button_up { 3044sub invoke_button_up {
2959 my ($self, $ev, $x, $y) = @_; 3045 my ($self, $ev, $x, $y) = @_;
2960 3046
2961 if ($ev->{button} == $self->{button}) { 3047 if ($ev->{button} == $self->{button}) {
2962 undef $GRAB; 3048 undef $GRAB;
2963 $self->hide; 3049 $self->hide;
2964 3050
2965 $self->_emit ("popdown"); 3051 $self->emit ("popdown");
2966 $self->{hover}[1]->() if $self->{hover}; 3052 $self->{hover}[1]->() if $self->{hover};
2967 } else { 3053 } else {
2968 return 0 3054 return 0
2969 } 3055 }
2970 3056
… …
3007 : $self->{children}[$page_or_widget]; 3093 : $self->{children}[$page_or_widget];
3008 3094
3009 $self->{current} = $widget; 3095 $self->{current} = $widget;
3010 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3096 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3011 3097
3012 $self->_emit (page_changed => $self->{current}); 3098 $self->emit (page_changed => $self->{current});
3013 3099
3014 $self->realloc; 3100 $self->realloc;
3015} 3101}
3016 3102
3017sub visible_children { 3103sub visible_children {
… …
3022 my ($self) = @_; 3108 my ($self) = @_;
3023 3109
3024 $self->{current}->size_request 3110 $self->{current}->size_request
3025} 3111}
3026 3112
3027sub size_allocate { 3113sub invoke_size_allocate {
3028 my ($self, $w, $h) = @_; 3114 my ($self, $w, $h) = @_;
3029 3115
3030 $self->{current}->configure (0, 0, $w, $h); 3116 $self->{current}->configure (0, 0, $w, $h);
3117
3118 1
3031} 3119}
3032 3120
3033sub _draw { 3121sub _draw {
3034 my ($self) = @_; 3122 my ($self) = @_;
3035 3123
… …
3074 3162
3075sub set_current_page { 3163sub set_current_page {
3076 my ($self, $page) = @_; 3164 my ($self, $page) = @_;
3077 3165
3078 $self->{multiplexer}->set_current_page ($page); 3166 $self->{multiplexer}->set_current_page ($page);
3079 $self->_emit (page_changed => $self->{multiplexer}{current}); 3167 $self->emit (page_changed => $self->{multiplexer}{current});
3168}
3169
3170#############################################################################
3171
3172package CFClient::UI::Combobox;
3173
3174use utf8;
3175
3176our @ISA = CFClient::UI::Button::;
3177
3178sub new {
3179 my $class = shift;
3180
3181 my $self = $class->SUPER::new (
3182 options => [], # [value, title, longdesc], ...
3183 value => undef,
3184 @_,
3185 );
3186
3187 $self->_set_value ($self->{value});
3188
3189 $self
3190}
3191
3192sub invoke_button_down {
3193 my ($self, $ev) = @_;
3194
3195 my @menu_items;
3196
3197 for (@{ $self->{options} }) {
3198 my ($value, $title, $tooltip) = @$_;
3199
3200 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3201 }
3202
3203 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3204}
3205
3206sub _set_value {
3207 my ($self, $value) = @_;
3208
3209 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3210 or return;
3211
3212 $self->{value} = $item->[0];
3213 $self->set_markup ("$item->[1] ⇓");
3214 $self->set_tooltip ($item->[2]);
3215}
3216
3217sub set_value {
3218 my ($self, $value) = @_;
3219
3220 return unless $self->{value} ne $value;
3221
3222 $self->_set_value ($value);
3223 $self->emit (changed => $value);
3080} 3224}
3081 3225
3082############################################################################# 3226#############################################################################
3083 3227
3084package CFClient::UI::Statusbox; 3228package CFClient::UI::Statusbox;
… …
3183 $item->{count}++; 3327 $item->{count}++;
3184 } else { 3328 } else {
3185 $item->{count} = 1; 3329 $item->{count} = 1;
3186 $item->{text} = $item->{tooltip} = $text; 3330 $item->{text} = $item->{tooltip} = $text;
3187 } 3331 }
3188 $item->{id} = ++$self->{id}; 3332 $item->{id} += 0.2;#d#
3189 $item->{timeout} = $timeout; 3333 $item->{timeout} = $timeout;
3190 delete $item->{label}; 3334 delete $item->{label};
3191 } else { 3335 } else {
3192 $self->{item}{$group} = { 3336 $self->{item}{$group} = {
3193 id => ++$self->{id}, 3337 id => ++$self->{id},
… …
3212 3356
3213 $self->reorder; 3357 $self->reorder;
3214 $self->SUPER::reconfigure; 3358 $self->SUPER::reconfigure;
3215} 3359}
3216 3360
3217sub DESTROY { 3361sub destroy {
3218 my ($self) = @_; 3362 my ($self) = @_;
3219 3363
3220 $self->{timer}->cancel; 3364 $self->{timer}->cancel;
3221 3365
3222 $self->SUPER::DESTROY; 3366 $self->SUPER::destroy;
3223} 3367}
3224 3368
3225############################################################################# 3369#############################################################################
3226 3370
3227package CFClient::UI::Inventory; 3371package CFClient::UI::Inventory;
… …
3371 my ($self) = @_; 3515 my ($self) = @_;
3372 $self->ask_for_bind (1); 3516 $self->ask_for_bind (1);
3373} 3517}
3374 3518
3375sub ask_for_bind { 3519sub ask_for_bind {
3376 my ($self, $commit) = @_; 3520 my ($self, $commit, $end_cb) = @_;
3377 3521
3378 CFClient::Binder::open_binding_dialog (sub { 3522 CFClient::Binder::open_binding_dialog (sub {
3379 my ($mod, $sym) = @_; 3523 my ($mod, $sym) = @_;
3380 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak? 3524 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3381 $self->update_binding_widgets; 3525 $self->update_binding_widgets;
3382 $self->commit if $commit; 3526 $self->commit if $commit;
3527 $end_cb->() if $end_cb;
3383 }); 3528 });
3384} 3529}
3385 3530
3386# $mod and $sym are the modifiers and key symbol 3531# $mod and $sym are the modifiers and key symbol
3387# $cmds is a array ref of strings (the commands) 3532# $cmds is a array ref of strings (the commands)
… …
3405} 3550}
3406 3551
3407# this is a shortcut method that asks for a binding 3552# this is a shortcut method that asks for a binding
3408# and then just binds it. 3553# and then just binds it.
3409sub do_quick_binding { 3554sub do_quick_binding {
3410 my ($self, $cmds) = @_; 3555 my ($self, $cmds, $end_cb) = @_;
3411 $self->set_binding (undef, undef, $cmds, sub { 3556 $self->set_binding (undef, undef, $cmds, sub {
3412 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2]; 3557 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3413 }); 3558 });
3414 $self->ask_for_bind (1); 3559 $self->ask_for_bind (1, $end_cb);
3415} 3560}
3416 3561
3417sub update_binding_widgets { 3562sub update_binding_widgets {
3418 my ($self) = @_; 3563 my ($self) = @_;
3419 my ($mod, $sym, $cmds) = $self->get_binding; 3564 my ($mod, $sym, $cmds) = $self->get_binding;
… …
3475 commands => [], 3620 commands => [],
3476 @_, 3621 @_,
3477 ) 3622 )
3478} 3623}
3479 3624
3480# XXX: Do sorting? Argl... 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");
3631my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3632 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3633my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3634 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3635my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3636 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3637
3638sub rebuild_spell_list {
3639 my ($self) = @_;
3640
3641 $CFClient::UI::ROOT->on_refresh ($self => sub {
3642 $self->clear;
3643
3644 return unless $::CONN;
3645
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);
3648 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3649 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3650 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3651
3652 my $row = 0;
3653
3654 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3655 my $spell = $self->{spell}{$_};
3656
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});
3684
3685 $self->add (0, $row, new CFClient::UI::Face
3686 face => $spell->{face},
3687 can_hover => 1,
3688 can_events => 1,
3689 tooltip => $tooltip,
3690 on_button_down => $spell_cb,
3691 );
3692
3693 $self->add (1, $row, new CFClient::UI::Label
3694 expand => 1,
3695 text => $spell->{name},
3696 can_hover => 1,
3697 can_events => 1,
3698 tooltip => $tooltip,
3699 on_button_down => $spell_cb,
3700 );
3701
3702 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3703 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3704 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3705 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3706 }
3707 });
3708}
3709
3481sub add_spell { 3710sub add_spell {
3482 my ($self, $spell) = @_; 3711 my ($self, $spell) = @_;
3712
3483 $self->{spells}->{$spell->{name}} = $spell; 3713 $self->{spell}->{$spell->{name}} = $spell;
3484 3714 $self->rebuild_spell_list;
3485 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3486 face => $spell->{face},
3487 can_hover => 1,
3488 can_events => 1,
3489 tooltip => $spell->{message});
3490
3491 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3492 text => $spell->{name},
3493 can_hover => 1,
3494 can_events => 1,
3495 tooltip => $spell->{message},
3496 expand => 1);
3497
3498 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3499 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3500 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3501 expand => 1);
3502
3503 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3504 text => "bind to key",
3505 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3506}
3507
3508sub rebuild_spell_list {
3509 my ($self) = @_;
3510 $self->{tbl_idx} = 0;
3511 $self->add_spell ($_) for values %{$self->{spells}};
3512} 3715}
3513 3716
3514sub remove_spell { 3717sub remove_spell {
3515 my ($self, $spell) = @_; 3718 my ($self, $spell) = @_;
3719
3516 delete $self->{spells}->{$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} = {};
3517 $self->rebuild_spell_list; 3728 $self->rebuild_spell_list;
3518} 3729}
3519 3730
3520############################################################################# 3731#############################################################################
3521 3732
… …
3558 $coord = $max - $size if $coord > $max - $size; 3769 $coord = $max - $size if $coord > $max - $size;
3559 3770
3560 int $coord + 0.5 3771 int $coord + 0.5
3561} 3772}
3562 3773
3563sub size_allocate { 3774sub invoke_size_allocate {
3564 my ($self, $w, $h) = @_; 3775 my ($self, $w, $h) = @_;
3565 3776
3566 for my $child ($self->children) { 3777 for my $child ($self->children) {
3567 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)};
3568 3779
… …
3572 $X = _to_pixel $X, $W, $self->{w}; 3783 $X = _to_pixel $X, $W, $self->{w};
3573 $Y = _to_pixel $Y, $H, $self->{h}; 3784 $Y = _to_pixel $Y, $H, $self->{h};
3574 3785
3575 $child->configure ($X, $Y, $W, $H); 3786 $child->configure ($X, $Y, $W, $H);
3576 } 3787 }
3788
3789 1
3577} 3790}
3578 3791
3579sub coord2local { 3792sub coord2local {
3580 my ($self, $x, $y) = @_; 3793 my ($self, $x, $y) = @_;
3581 3794

Diff Legend

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