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.288 by root, Mon Jun 5 21:14:40 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
… …
525 if $self->{parent}; 518 if $self->{parent};
526} 519}
527 520
528sub reconfigure { 521sub reconfigure {
529 my ($self) = @_; 522 my ($self) = @_;
530
531 # some widgets cache req_w and req_h
532 delete $self->{req_w};
533 delete $self->{req_h};
534 523
535 $self->realloc; 524 $self->realloc;
536 $self->update; 525 $self->update;
537} 526}
538 527
… …
597 586
598sub DESTROY { 587sub DESTROY {
599 my ($self) = @_; 588 my ($self) = @_;
600 589
601 delete $WIDGET{$self+0}; 590 delete $WIDGET{$self+0};
602 #$self->deactivate; 591
592 eval { $self->destroy };
593 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
603} 594}
604 595
605############################################################################# 596#############################################################################
606 597
607package CFClient::UI::DrawBG; 598package CFClient::UI::DrawBG;
… …
772} 763}
773 764
774sub add { 765sub add {
775 my ($self, $child) = @_; 766 my ($self, $child) = @_;
776 767
777 $self->{children} = []; 768 $self->SUPER::remove ($_) for @{ $self->{children} };
778
779 $self->SUPER::add ($child); 769 $self->SUPER::add ($child);
780} 770}
781 771
782sub remove { 772sub remove {
783 my ($self, $widget) = @_; 773 my ($self, $widget) = @_;
… …
792 782
793sub size_request { 783sub size_request {
794 $_[0]{children}[0]->size_request 784 $_[0]{children}[0]->size_request
795} 785}
796 786
797sub size_allocate { 787sub invoke_size_allocate {
798 my ($self, $w, $h) = @_; 788 my ($self, $w, $h) = @_;
799 789
800 $self->{children}[0]->configure (0, 0, $w, $h); 790 $self->{children}[0]->configure (0, 0, $w, $h);
791
792 1
801} 793}
802 794
803############################################################################# 795#############################################################################
804 796
805# back-buffered drawing area 797# back-buffered drawing area
… …
821 813
822 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 814 $ROOT->on_post_alloc ($self => sub { $self->render_child });
823 $self->SUPER::update; 815 $self->SUPER::update;
824} 816}
825 817
826sub size_allocate { 818sub invoke_size_allocate {
827 my ($self, $w, $h) = @_; 819 my ($self, $w, $h) = @_;
828 820
829 $self->SUPER::size_allocate ($w, $h);
830 $self->update; 821 $self->update;
822
823 $self->SUPER::invoke_size_allocate ($w, $h)
831} 824}
832 825
833sub _render { 826sub _render {
834 my ($self) = @_; 827 my ($self) = @_;
835 828
… …
896 $h = 10 if $self->{scroll_y}; 889 $h = 10 if $self->{scroll_y};
897 890
898 ($w, $h) 891 ($w, $h)
899} 892}
900 893
901sub size_allocate { 894sub invoke_size_allocate {
902 my ($self, $w, $h) = @_; 895 my ($self, $w, $h) = @_;
903 896
904 my $child = $self->child; 897 my $child = $self->child;
905 898
906 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 899 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
907 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 900 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
908 901
909 $self->child->configure (0, 0, $w, $h); 902 $self->child->configure (0, 0, $w, $h);
910 $self->update; 903 $self->update;
904
905 1
911} 906}
912 907
913sub set_offset { 908sub set_offset {
914 my ($self, $x, $y) = @_; 909 my ($self, $x, $y) = @_;
915 910
… …
1005 # todo: overwrite size_allocate of child 1000 # todo: overwrite size_allocate of child
1006 my $child = $self->{vp}->child; 1001 my $child = $self->{vp}->child;
1007 $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]);
1008} 1003}
1009 1004
1010sub size_allocate { 1005sub invoke_size_allocate {
1011 my ($self, $w, $h) = @_; 1006 my ($self, $w, $h) = @_;
1012
1013 $self->SUPER::size_allocate ($w, $h);
1014 1007
1015 my $child = $self->{vp}->child; 1008 my $child = $self->{vp}->child;
1016 $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)
1017} 1012}
1018 1013
1019#TODO# update range on size_allocate depending on child 1014#TODO# update range on size_allocate depending on child
1020# update viewport offset on scroll 1015# update viewport offset on scroll
1021 1016
… …
1075 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1076 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);
1077 1072
1078sub new { 1073sub new {
1079 my ($class, %arg) = @_; 1074 my ($class, %arg) = @_;
1080
1081 my $title = delete $arg{title};
1082 1075
1083 my $self = $class->SUPER::new ( 1076 my $self = $class->SUPER::new (
1084 bg => [1, 1, 1, 1], 1077 bg => [1, 1, 1, 1],
1085 border_bg => [1, 1, 1, 1], 1078 border_bg => [1, 1, 1, 1],
1086 border => 0.6, 1079 border => 0.6,
… …
1088 min_w => 16, 1081 min_w => 16,
1089 min_h => 16, 1082 min_h => 16,
1090 %arg, 1083 %arg,
1091 ); 1084 );
1092 1085
1093 $self->{title} = new CFClient::UI::Label 1086 $self->{title_widget} = new CFClient::UI::Label
1094 align => 0, 1087 align => 0,
1095 valign => 1, 1088 valign => 1,
1096 text => $title, 1089 text => $self->{title},
1097 fontsize => $self->{border} 1090 fontsize => $self->{border},
1098 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 }
1099 1101
1100 $self 1102 $self
1101} 1103}
1102 1104
1103sub add { 1105sub add {
1104 my ($self, @widgets) = @_; 1106 my ($self, @widgets) = @_;
1105 1107
1106 $self->SUPER::add (@widgets); 1108 $self->SUPER::add (@widgets);
1109 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1107 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1110 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1108} 1111}
1109 1112
1110sub border { 1113sub border {
1111 int $_[0]{border} * $::FONTSIZE 1114 int $_[0]{border} * $::FONTSIZE
1112} 1115}
1113 1116
1114sub size_request { 1117sub size_request {
1115 my ($self) = @_; 1118 my ($self) = @_;
1116 1119
1117 $self->{title}->size_request 1120 $self->{title_widget}->size_request
1118 if $self->{title}; 1121 if $self->{title_widget};
1122
1123 $self->{close_button}->size_request
1124 if $self->{close_button};
1119 1125
1120 my ($w, $h) = $self->SUPER::size_request; 1126 my ($w, $h) = $self->SUPER::size_request;
1121 1127
1122 ( 1128 (
1123 $w + $self->border * 2, 1129 $w + $self->border * 2,
1124 $h + $self->border * 2, 1130 $h + $self->border * 2,
1125 ) 1131 )
1126} 1132}
1127 1133
1128sub size_allocate { 1134sub invoke_size_allocate {
1129 my ($self, $w, $h) = @_; 1135 my ($self, $w, $h) = @_;
1130 1136
1131 if ($self->{title}) { 1137 if ($self->{title_widget}) {
1132 $self->{title}{w} = $w; 1138 $self->{title_widget}{w} = $w;
1133 $self->{title}{h} = $h; 1139 $self->{title_widget}{h} = $h;
1134 $self->{title}->size_allocate ($w, $h); 1140 $self->{title_widget}->invoke_size_allocate ($w, $h);
1135 } 1141 }
1136 1142
1137 my $border = $self->border; 1143 my $border = $self->border;
1138 1144
1139 $h -= List::Util::max 0, $border * 2; 1145 $h -= List::Util::max 0, $border * 2;
1140 $w -= List::Util::max 0, $border * 2; 1146 $w -= List::Util::max 0, $border * 2;
1141 1147
1142 $self->child->configure ($border, $border, $w, $h); 1148 $self->child->configure ($border, $border, $w, $h);
1143}
1144 1149
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button};
1152
1153 1
1154}
1155
1145sub button_down { 1156sub invoke_button_down {
1146 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
1147 1158
1148 my ($w, $h) = @$self{qw(w h)}; 1159 my ($w, $h) = @$self{qw(w h)};
1149 my $border = $self->border; 1160 my $border = $self->border;
1150 1161
… …
1181 1192
1182 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
1183 1194
1184 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1185 # HACK: the next line is required to enforce placement 1196 # HACK: the next line is required to enforce placement
1186 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1197 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1187 }; 1198 };
1188 } else { 1199 } else {
1189 return 0; 1200 return 0;
1190 } 1201 }
1191 1202
1192 1 1203 1
1193} 1204}
1194 1205
1195sub button_up { 1206sub invoke_button_up {
1196 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
1197 1208
1198 !!delete $self->{motion} 1209 ! ! delete $self->{motion}
1199} 1210}
1200 1211
1201sub mouse_motion { 1212sub invoke_mouse_motion {
1202 my ($self, $ev, $x, $y) = @_; 1213 my ($self, $ev, $x, $y) = @_;
1203 1214
1204 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1215 $self->{motion}->($ev, $x, $y) if $self->{motion};
1205 1216
1206 !!$self->{motion} 1217 ! ! $self->{motion}
1207} 1218}
1208 1219
1209sub _draw { 1220sub _draw {
1210 my ($self) = @_; 1221 my ($self) = @_;
1211 1222
… …
1237 1248
1238 glDisable GL_TEXTURE_2D; 1249 glDisable GL_TEXTURE_2D;
1239 1250
1240 $child->draw; 1251 $child->draw;
1241 1252
1242 if ($self->{title}) { 1253 if ($self->{title_widget}) {
1243 glTranslate 0, $border - $self->{h}; 1254 glTranslate 0, $border - $self->{h};
1244 $self->{title}->_draw; 1255 $self->{title_widget}->_draw;
1256
1257 glTranslate 0, - ($border - $self->{h});
1245 } 1258 }
1259
1260 $self->{close_button}->draw
1261 if $self->{close_button};
1246} 1262}
1247 1263
1248############################################################################# 1264#############################################################################
1249 1265
1250package CFClient::UI::Table; 1266package CFClient::UI::Table;
… …
1273 1289
1274 $child->set_parent ($self); 1290 $child->set_parent ($self);
1275 $self->{children}[$y][$x] = $child; 1291 $self->{children}[$y][$x] = $child;
1276 1292
1277 $self->realloc; 1293 $self->realloc;
1294}
1295
1296sub remove {
1297 my ($self, $child) = @_;
1298
1299 # TODO: not yet implemented
1278} 1300}
1279 1301
1280# 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?
1281sub clear { 1303sub clear {
1282 my ($self) = @_; 1304 my ($self) = @_;
… …
1323 (sum @$ws), 1345 (sum @$ws),
1324 (sum @$hs), 1346 (sum @$hs),
1325 ) 1347 )
1326} 1348}
1327 1349
1328sub size_allocate { 1350sub invoke_size_allocate {
1329 my ($self, $w, $h) = @_; 1351 my ($self, $w, $h) = @_;
1330 1352
1331 my ($ws, $hs) = $self->get_wh; 1353 my ($ws, $hs) = $self->get_wh;
1332 1354
1333 my $req_w = (sum @$ws) || 1; 1355 my $req_w = (sum @$ws) || 1;
… …
1365 } 1387 }
1366 1388
1367 $y += $row_h; 1389 $y += $row_h;
1368 } 1390 }
1369 1391
1392 1
1370} 1393}
1371 1394
1372sub find_widget { 1395sub find_widget {
1373 my ($self, $x, $y) = @_; 1396 my ($self, $x, $y) = @_;
1374 1397
… …
1411 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1434 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1412 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1435 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1413 ) 1436 )
1414} 1437}
1415 1438
1416sub size_allocate { 1439sub invoke_size_allocate {
1417 my ($self, $w, $h) = @_; 1440 my ($self, $w, $h) = @_;
1418 1441
1419 my $space = $self->{vertical} ? $h : $w; 1442 my $space = $self->{vertical} ? $h : $w;
1420 my $children = $self->{children}; 1443 my $children = $self->{children};
1421 1444
… …
1559 $self->{text} = "T$text"; 1582 $self->{text} = "T$text";
1560 1583
1561 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1562 $self->{layout}->set_text ($text); 1585 $self->{layout}->set_text ($text);
1563 1586
1564 delete $self->{req_h}; 1587 delete $self->{size_req};
1565 $self->realloc; 1588 $self->realloc;
1566 $self->update; 1589 $self->update;
1567} 1590}
1568 1591
1569sub set_markup { 1592sub set_markup {
… …
1575 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1598 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1576 1599
1577 $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;
1578 $self->{layout}->set_markup ($markup); 1601 $self->{layout}->set_markup ($markup);
1579 1602
1580 delete $self->{req_h}; 1603 delete $self->{size_req};
1581 $self->realloc; 1604 $self->realloc;
1582 $self->update; 1605 $self->update;
1583} 1606}
1584 1607
1585sub size_request { 1608sub size_request {
1586 my ($self) = @_; 1609 my ($self) = @_;
1587 1610
1588 if (exists $self->{req_h}) { 1611 $self->{size_req} ||= do {
1589 @$self{qw(req_w req_h)}
1590 } else {
1591 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1612 $self->{layout}->set_font ($self->{font}) if $self->{font};
1592 $self->{layout}->set_width ($self->{max_w} || -1); 1613 $self->{layout}->set_width ($self->{max_w} || -1);
1593 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1614 $self->{layout}->set_ellipsise ($self->{ellipsise});
1594 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1615 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1595 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1616 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
… …
1604 1625
1605 $w = List::Util::max $w, $w2; 1626 $w = List::Util::max $w, $w2;
1606 $h = List::Util::max $h, $h2; 1627 $h = List::Util::max $h, $h2;
1607 } 1628 }
1608 1629
1609 ($w, $h) 1630 [$w, $h]
1610 } 1631 };
1611}
1612 1632
1633 @{ $self->{size_req} }
1634}
1635
1613sub size_allocate { 1636sub invoke_size_allocate {
1614 my ($self, $w, $h) = @_; 1637 my ($self, $w, $h) = @_;
1615 1638
1616 delete $self->{ox}; 1639 delete $self->{ox};
1617 1640
1618 delete $self->{texture} 1641 delete $self->{texture}
1619 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
1620} 1645}
1621 1646
1622sub set_fontsize { 1647sub set_fontsize {
1623 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1624 1649
1625 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1626 delete $self->{texture}; 1651 delete $self->{texture};
1627 1652
1628 $self->realloc; 1653 $self->realloc;
1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1629} 1662}
1630 1663
1631sub _draw { 1664sub _draw {
1632 my ($self) = @_; 1665 my ($self) = @_;
1633 1666
… …
1654 : ($self->{h} - $tex->{h}) * 0.5); 1687 : ($self->{h} - $tex->{h}) * 0.5);
1655 }; 1688 };
1656 1689
1657 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1658 1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1694
1659 if ($tex->{format} == GL_ALPHA) { 1695 if ($tex->{format} == GL_ALPHA) {
1660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1661 glColor @{$self->{fg}}; 1697 glColor @{$self->{fg}};
1662 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1663 } else { 1699 } else {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1665 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1666 } 1702 }
1667 1703
1668 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1669} 1705}
1670 1706
… …
1687 can_hover => 1, 1723 can_hover => 1,
1688 can_focus => 1, 1724 can_focus => 1,
1689 valign => 0, 1725 valign => 0,
1690 can_events => 1, 1726 can_events => 1,
1691 #text => ... 1727 #text => ...
1728 #hidden => "*",
1692 @_ 1729 @_
1693 ) 1730 )
1694} 1731}
1695 1732
1696sub _set_text { 1733sub _set_text {
… …
1703 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1704 $self->{text} = $text; 1741 $self->{text} = $text;
1705 1742
1706 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1707 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1708 delete $self->{req_h}; 1745 delete $self->{size_req};
1709 1746
1710 $self->_emit (changed => $self->{text}); 1747 $self->emit (changed => $self->{text});
1711 1748
1712 $self->realloc; 1749 $self->realloc;
1713 $self->update; 1750 $self->update;
1714} 1751}
1715 1752
… …
1730 my ($w, $h) = $self->SUPER::size_request; 1767 my ($w, $h) = $self->SUPER::size_request;
1731 1768
1732 ($w + 1, $h) # add 1 for cursor 1769 ($w + 1, $h) # add 1 for cursor
1733} 1770}
1734 1771
1735sub key_down { 1772sub invoke_key_down {
1736 my ($self, $ev) = @_; 1773 my ($self, $ev) = @_;
1737 1774
1738 my $mod = $ev->{mod}; 1775 my $mod = $ev->{mod};
1739 my $sym = $ev->{sym}; 1776 my $sym = $ev->{sym};
1740 my $uni = $ev->{unicode}; 1777 my $uni = $ev->{unicode};
… …
1752 } elsif ($sym == CFClient::SDLK_HOME) { 1789 } elsif ($sym == CFClient::SDLK_HOME) {
1753 $self->{cursor} = 0; 1790 $self->{cursor} = 0;
1754 } elsif ($sym == CFClient::SDLK_END) { 1791 } elsif ($sym == CFClient::SDLK_END) {
1755 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1756 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1757 $self->_emit ('escape'); 1794 $self->emit ('escape');
1758 } elsif ($uni) { 1795 } elsif ($uni) {
1759 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1760 } else { 1797 } else {
1761 return 0; 1798 return 0;
1762 } 1799 }
… …
1766 $self->realloc; 1803 $self->realloc;
1767 1804
1768 1 1805 1
1769} 1806}
1770 1807
1771sub focus_in { 1808sub invoke_focus_in {
1772 my ($self) = @_; 1809 my ($self) = @_;
1773 1810
1774 $self->{last_activity} = $::NOW; 1811 $self->{last_activity} = $::NOW;
1775 1812
1776 $self->SUPER::focus_in; 1813 $self->SUPER::invoke_focus_in
1777} 1814}
1778 1815
1779sub button_down { 1816sub invoke_button_down {
1780 my ($self, $ev, $x, $y) = @_; 1817 my ($self, $ev, $x, $y) = @_;
1781 1818
1782 $self->SUPER::button_down ($ev, $x, $y); 1819 $self->SUPER::invoke_button_down ($ev, $x, $y);
1783 1820
1784 my $idx = $self->{layout}->xy_to_index ($x, $y); 1821 my $idx = $self->{layout}->xy_to_index ($x, $y);
1785 1822
1786 # byte-index to char-index 1823 # byte-index to char-index
1787 my $text = $self->{text}; 1824 my $text = $self->{text};
… …
1792 $self->update; 1829 $self->update;
1793 1830
1794 1 1831 1
1795} 1832}
1796 1833
1797sub mouse_motion { 1834sub invoke_mouse_motion {
1798 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1799# 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#
1800 1837
1801 0 1838 1
1802} 1839}
1803 1840
1804sub _draw { 1841sub _draw {
1805 my ($self) = @_; 1842 my ($self) = @_;
1806 1843
… …
1847 1884
1848our @ISA = CFClient::UI::EntryBase::; 1885our @ISA = CFClient::UI::EntryBase::;
1849 1886
1850use CFClient::OpenGL; 1887use CFClient::OpenGL;
1851 1888
1852sub key_down { 1889sub invoke_key_down {
1853 my ($self, $ev) = @_; 1890 my ($self, $ev) = @_;
1854 1891
1855 my $sym = $ev->{sym}; 1892 my $sym = $ev->{sym};
1856 1893
1857 if ($sym == 13) { 1894 if ($sym == 13) {
1858 unshift @{$self->{history}}, 1895 unshift @{$self->{history}},
1859 my $txt = $self->get_text; 1896 my $txt = $self->get_text;
1897
1860 $self->{history_pointer} = -1; 1898 $self->{history_pointer} = -1;
1861 $self->{history_saveback} = ''; 1899 $self->{history_saveback} = '';
1862 $self->_emit (activate => $txt); 1900 $self->emit (activate => $txt);
1863 $self->update; 1901 $self->update;
1864 1902
1865 } elsif ($sym == CFClient::SDLK_UP) { 1903 } elsif ($sym == CFClient::SDLK_UP) {
1866 if ($self->{history_pointer} < 0) { 1904 if ($self->{history_pointer} < 0) {
1867 $self->{history_saveback} = $self->get_text; 1905 $self->{history_saveback} = $self->get_text;
… …
1883 } else { 1921 } else {
1884 $self->set_text ($self->{history_saveback}); 1922 $self->set_text ($self->{history_saveback});
1885 } 1923 }
1886 1924
1887 } else { 1925 } else {
1888 return $self->SUPER::key_down ($ev) 1926 return $self->SUPER::invoke_key_down ($ev)
1889 } 1927 }
1890 1928
1891 1 1929 1
1892} 1930}
1893 1931
… …
1917 can_events => 1, 1955 can_events => 1,
1918 @_ 1956 @_
1919 ) 1957 )
1920} 1958}
1921 1959
1922sub activate { }
1923
1924sub button_up { 1960sub invoke_button_up {
1925 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1926 1962
1927 $self->emit ("activate") 1963 $self->emit ("activate")
1928 if $x >= 0 && $x < $self->{w} 1964 if $x >= 0 && $x < $self->{w}
1929 && $y >= 0 && $y < $self->{h}; 1965 && $y >= 0 && $y < $self->{h};
… …
1943 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1979 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1944 1980
1945 glDisable GL_TEXTURE_2D; 1981 glDisable GL_TEXTURE_2D;
1946 1982
1947 $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
1948} 2020}
1949 2021
1950############################################################################# 2022#############################################################################
1951 2023
1952package CFClient::UI::CheckBox; 2024package CFClient::UI::CheckBox;
… …
1979 my ($self) = @_; 2051 my ($self) = @_;
1980 2052
1981 (6) x 2 2053 (6) x 2
1982} 2054}
1983 2055
1984sub button_down { 2056sub invoke_button_down {
1985 my ($self, $ev, $x, $y) = @_; 2057 my ($self, $ev, $x, $y) = @_;
1986 2058
1987 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1988 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1989 $self->{state} = !$self->{state}; 2061 $self->{state} = !$self->{state};
1990 $self->_emit (changed => $self->{state}); 2062 $self->emit (changed => $self->{state});
1991 } else { 2063 } else {
1992 return 0 2064 return 0
1993 } 2065 }
1994 2066
1995 1 2067 1
… …
2292 $self->update; 2364 $self->update;
2293 2365
2294 $self 2366 $self
2295} 2367}
2296 2368
2297sub changed { }
2298
2299sub set_range { 2369sub set_range {
2300 my ($self, $range) = @_; 2370 my ($self, $range) = @_;
2301 2371
2302 ($range, $self->{range}) = ($self->{range}, $range); 2372 ($range, $self->{range}) = ($self->{range}, $range);
2303 2373
2304 $self->update
2305 if "@$range" ne "@{$self->{range}}"; 2374 if ("@$range" ne "@{$self->{range}}") {
2375 $self->update;
2376 $self->set_value ($self->{range}[0]);
2377 }
2306} 2378}
2307 2379
2308sub set_value { 2380sub set_value {
2309 my ($self, $value) = @_; 2381 my ($self, $value) = @_;
2310 2382
… …
2321 if $unit; 2393 if $unit;
2322 2394
2323 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2395 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2324 2396
2325 if ($value != $old_value) { 2397 if ($value != $old_value) {
2326 $self->_emit (changed => $value); 2398 $self->emit (changed => $value);
2327 $self->update; 2399 $self->update;
2328 } 2400 }
2329} 2401}
2330 2402
2331sub size_request { 2403sub size_request {
2332 my ($self) = @_; 2404 my ($self) = @_;
2333 2405
2334 ($self->{req_w}, $self->{req_h}) 2406 ($self->{req_w}, $self->{req_h})
2335} 2407}
2336 2408
2337sub button_down { 2409sub invoke_button_down {
2338 my ($self, $ev, $x, $y) = @_; 2410 my ($self, $ev, $x, $y) = @_;
2339 2411
2340 $self->SUPER::button_down ($ev, $x, $y); 2412 $self->SUPER::invoke_button_down ($ev, $x, $y);
2341 2413
2342 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2414 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2343 2415
2344 $self->mouse_motion ($ev, $x, $y) 2416 $self->invoke_mouse_motion ($ev, $x, $y)
2345} 2417}
2346 2418
2347sub mouse_motion { 2419sub invoke_mouse_motion {
2348 my ($self, $ev, $x, $y) = @_; 2420 my ($self, $ev, $x, $y) = @_;
2349 2421
2350 if ($GRAB == $self) { 2422 if ($GRAB == $self) {
2351 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2423 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2352 2424
… …
2457sub set_range { shift->{slider}->set_range (@_) } 2529sub set_range { shift->{slider}->set_range (@_) }
2458sub set_value { shift->{slider}->set_value (@_) } 2530sub set_value { shift->{slider}->set_value (@_) }
2459 2531
2460############################################################################# 2532#############################################################################
2461 2533
2462package CFClient::UI::TextView; 2534package CFClient::UI::TextScroller;
2463 2535
2464our @ISA = CFClient::UI::HBox::; 2536our @ISA = CFClient::UI::HBox::;
2465 2537
2466use CFClient::OpenGL; 2538use CFClient::OpenGL;
2467 2539
… …
2469 my $class = shift; 2541 my $class = shift;
2470 2542
2471 my $self = $class->SUPER::new ( 2543 my $self = $class->SUPER::new (
2472 fontsize => 1, 2544 fontsize => 1,
2473 can_events => 0, 2545 can_events => 0,
2546 indent => 0,
2474 #font => default_font 2547 #font => default_font
2475 @_, 2548 @_,
2476 2549
2477 layout => (new CFClient::Layout 1), 2550 layout => (new CFClient::Layout 1),
2478 par => [], 2551 par => [],
… …
2493 2566
2494 $self->{fontsize} = $fontsize; 2567 $self->{fontsize} = $fontsize;
2495 $self->reflow; 2568 $self->reflow;
2496} 2569}
2497 2570
2498sub size_allocate { 2571sub invoke_size_allocate {
2499 my ($self, $w, $h) = @_; 2572 my ($self, $w, $h) = @_;
2500
2501 $self->SUPER::size_allocate ($w, $h);
2502 2573
2503 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2574 $self->{layout}->set_font ($self->{font}) if $self->{font};
2504 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2505 $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});
2506 2578
2507 $self->reflow; 2579 $self->reflow;
2580
2581 $self->SUPER::invoke_size_allocate ($w, $h)
2508} 2582}
2509 2583
2510sub text_size { 2584sub text_size {
2511 my ($self, $text, $indent) = @_; 2585 my ($self, $text, $indent) = @_;
2512 2586
2513 my $layout = $self->{layout}; 2587 my $layout = $self->{layout};
2514 2588
2515 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2589 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2516 $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});
2517 $layout->set_markup ($text); 2592 $layout->set_markup ($text);
2518 2593
2519 $layout->size 2594 $layout->size
2520} 2595}
2521 2596
… …
2560 2635
2561 return unless $self->{h} > 0; 2636 return unless $self->{h} > 0;
2562 2637
2563 delete $self->{texture}; 2638 delete $self->{texture};
2564 2639
2565 $ROOT->on_post_alloc ($self, sub { 2640 $ROOT->on_post_alloc ($self => sub {
2566 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2641 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2567 2642
2568 if (delete $self->{need_reflow}) { 2643 if (delete $self->{need_reflow}) {
2569 my $height = 0; 2644 my $height = 0;
2570 2645
… …
2573 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2648 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2574 2649
2575 for (@{$self->{par}}) { 2650 for (@{$self->{par}}) {
2576 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2651 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2577 $layout->set_width ($W - $_->[3]); 2652 $layout->set_width ($W - $_->[3]);
2653 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2578 $layout->set_markup ($_->[4]); 2654 $layout->set_markup ($_->[4]);
2579 my ($w, $h) = $layout->size; 2655 my ($w, $h) = $layout->size;
2580 $_->[0] = $w + $_->[3]; 2656 $_->[0] = $w + $_->[3];
2581 $_->[1] = $h; 2657 $_->[1] = $h;
2582 } 2658 }
… …
2585 } 2661 }
2586 2662
2587 $self->{height} = $height; 2663 $self->{height} = $height;
2588 2664
2589 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2665 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2590 2666
2591 delete $self->{texture}; 2667 delete $self->{texture};
2592 } 2668 }
2593 2669
2594 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2670 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2595 glClearColor 0, 0, 0, 0; 2671 glClearColor 0, 0, 0, 0;
… …
2614 my $h = $par->[1]; 2690 my $h = $par->[1];
2615 2691
2616 if ($y0 < $y + $h && $y < $y1) { 2692 if ($y0 < $y + $h && $y < $y1) {
2617 $layout->set_foreground (@{ $par->[2] }); 2693 $layout->set_foreground (@{ $par->[2] });
2618 $layout->set_width ($W - $par->[3]); 2694 $layout->set_width ($W - $par->[3]);
2695 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2619 $layout->set_markup ($par->[4]); 2696 $layout->set_markup ($par->[4]);
2620 2697
2621 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2698 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2622 2699
2623 glRasterPos $par->[3], $y - $y0; 2700 glRasterPos $par->[3], $y - $y0;
… …
2737 $tooltip .= "\n\n" . (ref $widget) . "\n" 2814 $tooltip .= "\n\n" . (ref $widget) . "\n"
2738 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2815 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2739 . "req $widget->{req_w} $widget->{req_h}\n" 2816 . "req $widget->{req_w} $widget->{req_h}\n"
2740 . "visible $widget->{visible}"; 2817 . "visible $widget->{visible}";
2741 } 2818 }
2819
2820 $tooltip =~ s/^\n+//;
2821 $tooltip =~ s/\n+$//;
2742 2822
2743 $self->add (new CFClient::UI::Label 2823 $self->add (new CFClient::UI::Label
2744 markup => $tooltip, 2824 markup => $tooltip,
2745 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2825 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2746 fontsize => 0.8, 2826 fontsize => 0.8,
… …
2756 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2836 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2757 2837
2758 ($w + 4, $h + 4) 2838 ($w + 4, $h + 4)
2759} 2839}
2760 2840
2761sub size_allocate { 2841sub invoke_size_allocate {
2762 my ($self, $w, $h) = @_; 2842 my ($self, $w, $h) = @_;
2763 2843
2764 $self->SUPER::size_allocate ($w - 4, $h - 4); 2844 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2765} 2845}
2766 2846
2767sub visibility_change { 2847sub invoke_visibility_change {
2768 my ($self, $visible) = @_; 2848 my ($self, $visible) = @_;
2769 2849
2770 return unless $visible; 2850 return unless $visible;
2771 2851
2772 $self->{root}->on_post_alloc ("move_$self" => sub { 2852 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2774 or return; 2854 or return;
2775 2855
2776 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2856 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2777 2857
2778 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2858 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2779 if $x + $self->{w} > $::WIDTH; 2859 if $x + $self->{w} > $self->{root}{w};
2780 2860
2781 $self->move_abs ($x, $y); 2861 $self->move_abs ($x, $y);
2782 }); 2862 });
2783} 2863}
2784 2864
… …
2879 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2959 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2880 glDisable GL_TEXTURE_2D; 2960 glDisable GL_TEXTURE_2D;
2881 } 2961 }
2882} 2962}
2883 2963
2884sub DESTROY { 2964sub destroy {
2885 my ($self) = @_; 2965 my ($self) = @_;
2886 2966
2887 $self->{timer}->cancel 2967 $self->{timer}->cancel
2888 if $self->{timer}; 2968 if $self->{timer};
2889 2969
2890 $self->SUPER::DESTROY; 2970 $self->SUPER::destroy;
2891} 2971}
2892 2972
2893############################################################################# 2973#############################################################################
2894 2974
2895package CFClient::UI::Buttonbar; 2975package CFClient::UI::Buttonbar;
… …
2916 ); 2996 );
2917 2997
2918 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2998 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2919 2999
2920 for my $item (@{ $self->{items} }) { 3000 for my $item (@{ $self->{items} }) {
2921 my ($widget, $cb) = @$item; 3001 my ($widget, $cb, $tooltip) = @$item;
2922 3002
2923 # handle various types of items, only text for now 3003 # handle various types of items, only text for now
2924 if (!ref $widget) { 3004 if (!ref $widget) {
2925 $widget = new CFClient::UI::Label 3005 $widget = new CFClient::UI::Label
2926 can_hover => 1, 3006 can_hover => 1,
2927 can_events => 1, 3007 can_events => 1,
2928 text => $widget; 3008 markup => $widget,
3009 tooltip => $tooltip
2929 } 3010 }
2930 3011
2931 $self->{item}{$widget} = $item; 3012 $self->{item}{$widget} = $item;
2932 3013
2933 $self->{vbox}->add ($widget); 3014 $self->{vbox}->add ($widget);
… …
2938 3019
2939# 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)
2940sub popup { 3021sub popup {
2941 my ($self, $ev) = @_; 3022 my ($self, $ev) = @_;
2942 3023
2943 $self->_emit ("popdown"); 3024 $self->emit ("popdown");
2944 3025
2945 # maybe save $GRAB? must be careful about events... 3026 # maybe save $GRAB? must be careful about events...
2946 $GRAB = $self; 3027 $GRAB = $self;
2947 $self->{button} = $ev->{button}; 3028 $self->{button} = $ev->{button};
2948 3029
2949 $self->show; 3030 $self->show;
2950 $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);
2951} 3032}
2952 3033
2953sub mouse_motion { 3034sub invoke_mouse_motion {
2954 my ($self, $ev, $x, $y) = @_; 3035 my ($self, $ev, $x, $y) = @_;
2955 3036
2956 # TODO: should use vbox->find_widget or so 3037 # TODO: should use vbox->find_widget or so
2957 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3038 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2958 $self->{hover} = $self->{item}{$HOVER}; 3039 $self->{hover} = $self->{item}{$HOVER};
2959 3040
2960 0 3041 0
2961} 3042}
2962 3043
2963sub button_up { 3044sub invoke_button_up {
2964 my ($self, $ev, $x, $y) = @_; 3045 my ($self, $ev, $x, $y) = @_;
2965 3046
2966 if ($ev->{button} == $self->{button}) { 3047 if ($ev->{button} == $self->{button}) {
2967 undef $GRAB; 3048 undef $GRAB;
2968 $self->hide; 3049 $self->hide;
2969 3050
2970 $self->_emit ("popdown"); 3051 $self->emit ("popdown");
2971 $self->{hover}[1]->() if $self->{hover}; 3052 $self->{hover}[1]->() if $self->{hover};
2972 } else { 3053 } else {
2973 return 0 3054 return 0
2974 } 3055 }
2975 3056
… …
3012 : $self->{children}[$page_or_widget]; 3093 : $self->{children}[$page_or_widget];
3013 3094
3014 $self->{current} = $widget; 3095 $self->{current} = $widget;
3015 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3096 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3016 3097
3017 $self->_emit (page_changed => $self->{current}); 3098 $self->emit (page_changed => $self->{current});
3018 3099
3019 $self->realloc; 3100 $self->realloc;
3020} 3101}
3021 3102
3022sub visible_children { 3103sub visible_children {
… …
3027 my ($self) = @_; 3108 my ($self) = @_;
3028 3109
3029 $self->{current}->size_request 3110 $self->{current}->size_request
3030} 3111}
3031 3112
3032sub size_allocate { 3113sub invoke_size_allocate {
3033 my ($self, $w, $h) = @_; 3114 my ($self, $w, $h) = @_;
3034 3115
3035 $self->{current}->configure (0, 0, $w, $h); 3116 $self->{current}->configure (0, 0, $w, $h);
3117
3118 1
3036} 3119}
3037 3120
3038sub _draw { 3121sub _draw {
3039 my ($self) = @_; 3122 my ($self) = @_;
3040 3123
… …
3079 3162
3080sub set_current_page { 3163sub set_current_page {
3081 my ($self, $page) = @_; 3164 my ($self, $page) = @_;
3082 3165
3083 $self->{multiplexer}->set_current_page ($page); 3166 $self->{multiplexer}->set_current_page ($page);
3084 $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);
3085} 3224}
3086 3225
3087############################################################################# 3226#############################################################################
3088 3227
3089package CFClient::UI::Statusbox; 3228package CFClient::UI::Statusbox;
… …
3188 $item->{count}++; 3327 $item->{count}++;
3189 } else { 3328 } else {
3190 $item->{count} = 1; 3329 $item->{count} = 1;
3191 $item->{text} = $item->{tooltip} = $text; 3330 $item->{text} = $item->{tooltip} = $text;
3192 } 3331 }
3193 $item->{id} = ++$self->{id}; 3332 $item->{id} += 0.2;#d#
3194 $item->{timeout} = $timeout; 3333 $item->{timeout} = $timeout;
3195 delete $item->{label}; 3334 delete $item->{label};
3196 } else { 3335 } else {
3197 $self->{item}{$group} = { 3336 $self->{item}{$group} = {
3198 id => ++$self->{id}, 3337 id => ++$self->{id},
… …
3217 3356
3218 $self->reorder; 3357 $self->reorder;
3219 $self->SUPER::reconfigure; 3358 $self->SUPER::reconfigure;
3220} 3359}
3221 3360
3222sub DESTROY { 3361sub destroy {
3223 my ($self) = @_; 3362 my ($self) = @_;
3224 3363
3225 $self->{timer}->cancel; 3364 $self->{timer}->cancel;
3226 3365
3227 $self->SUPER::DESTROY; 3366 $self->SUPER::destroy;
3228} 3367}
3229 3368
3230############################################################################# 3369#############################################################################
3231 3370
3232package CFClient::UI::Inventory; 3371package CFClient::UI::Inventory;
… …
3376 my ($self) = @_; 3515 my ($self) = @_;
3377 $self->ask_for_bind (1); 3516 $self->ask_for_bind (1);
3378} 3517}
3379 3518
3380sub ask_for_bind { 3519sub ask_for_bind {
3381 my ($self, $commit) = @_; 3520 my ($self, $commit, $end_cb) = @_;
3382 3521
3383 CFClient::Binder::open_binding_dialog (sub { 3522 CFClient::Binder::open_binding_dialog (sub {
3384 my ($mod, $sym) = @_; 3523 my ($mod, $sym) = @_;
3385 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak? 3524 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3386 $self->update_binding_widgets; 3525 $self->update_binding_widgets;
3387 $self->commit if $commit; 3526 $self->commit if $commit;
3527 $end_cb->() if $end_cb;
3388 }); 3528 });
3389} 3529}
3390 3530
3391# $mod and $sym are the modifiers and key symbol 3531# $mod and $sym are the modifiers and key symbol
3392# $cmds is a array ref of strings (the commands) 3532# $cmds is a array ref of strings (the commands)
… …
3410} 3550}
3411 3551
3412# this is a shortcut method that asks for a binding 3552# this is a shortcut method that asks for a binding
3413# and then just binds it. 3553# and then just binds it.
3414sub do_quick_binding { 3554sub do_quick_binding {
3415 my ($self, $cmds) = @_; 3555 my ($self, $cmds, $end_cb) = @_;
3416 $self->set_binding (undef, undef, $cmds, sub { 3556 $self->set_binding (undef, undef, $cmds, sub {
3417 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2]; 3557 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3418 }); 3558 });
3419 $self->ask_for_bind (1); 3559 $self->ask_for_bind (1, $end_cb);
3420} 3560}
3421 3561
3422sub update_binding_widgets { 3562sub update_binding_widgets {
3423 my ($self) = @_; 3563 my ($self) = @_;
3424 my ($mod, $sym, $cmds) = $self->get_binding; 3564 my ($mod, $sym, $cmds) = $self->get_binding;
… …
3480 commands => [], 3620 commands => [],
3481 @_, 3621 @_,
3482 ) 3622 )
3483} 3623}
3484 3624
3485# 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
3486sub add_spell { 3710sub add_spell {
3487 my ($self, $spell) = @_; 3711 my ($self, $spell) = @_;
3712
3488 $self->{spells}->{$spell->{name}} = $spell; 3713 $self->{spell}->{$spell->{name}} = $spell;
3489 3714 $self->rebuild_spell_list;
3490 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3491 face => $spell->{face},
3492 can_hover => 1,
3493 can_events => 1,
3494 tooltip => $spell->{message});
3495
3496 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3497 text => $spell->{name},
3498 can_hover => 1,
3499 can_events => 1,
3500 tooltip => $spell->{message},
3501 expand => 1);
3502
3503 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3504 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3505 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3506 expand => 1);
3507
3508 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3509 text => "bind to key",
3510 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3511}
3512
3513sub rebuild_spell_list {
3514 my ($self) = @_;
3515 $self->{tbl_idx} = 0;
3516 $self->add_spell ($_) for values %{$self->{spells}};
3517} 3715}
3518 3716
3519sub remove_spell { 3717sub remove_spell {
3520 my ($self, $spell) = @_; 3718 my ($self, $spell) = @_;
3719
3521 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} = {};
3522 $self->rebuild_spell_list; 3728 $self->rebuild_spell_list;
3523} 3729}
3524 3730
3525############################################################################# 3731#############################################################################
3526 3732
… …
3563 $coord = $max - $size if $coord > $max - $size; 3769 $coord = $max - $size if $coord > $max - $size;
3564 3770
3565 int $coord + 0.5 3771 int $coord + 0.5
3566} 3772}
3567 3773
3568sub size_allocate { 3774sub invoke_size_allocate {
3569 my ($self, $w, $h) = @_; 3775 my ($self, $w, $h) = @_;
3570 3776
3571 for my $child ($self->children) { 3777 for my $child ($self->children) {
3572 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)};
3573 3779
… …
3577 $X = _to_pixel $X, $W, $self->{w}; 3783 $X = _to_pixel $X, $W, $self->{w};
3578 $Y = _to_pixel $Y, $H, $self->{h}; 3784 $Y = _to_pixel $Y, $H, $self->{h};
3579 3785
3580 $child->configure ($X, $Y, $W, $H); 3786 $child->configure ($X, $Y, $W, $H);
3581 } 3787 }
3788
3789 1
3582} 3790}
3583 3791
3584sub coord2local { 3792sub coord2local {
3585 my ($self, $x, $y) = @_; 3793 my ($self, $x, $y) = @_;
3586 3794

Diff Legend

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