ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.296 by root, Wed Jun 7 05:48:53 2006 UTC vs.
Revision 1.311 by root, Fri Jun 23 22:35:16 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) = @_;
… …
334} 333}
335 334
336sub size_request { 335sub size_request {
337 require Carp; 336 require Carp;
338 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
338}
339
340sub baseline_shift {
341 0
339} 342}
340 343
341sub configure { 344sub configure {
342 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
343 346
… …
367 370
368 $self->{root}{size_alloc}{$self+0} = $self; 371 $self->{root}{size_alloc}{$self+0} = $self;
369 } 372 }
370} 373}
371 374
372sub size_allocate {
373 # nothing to be done
374}
375
376sub children { 375sub children {
377 # nop 376 # nop
378} 377}
379 378
380sub visible_children { 379sub visible_children {
… …
418 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
419 418
420 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421} 420}
422 421
423sub focus_in { 422sub invoke_focus_in {
424 my ($self) = @_; 423 my ($self) = @_;
425 424
426 return if $FOCUS == $self; 425 return if $FOCUS == $self;
427 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
428 427
429 my $focus = $FOCUS; $FOCUS = $self; 428 my $focus = $FOCUS; $FOCUS = $self;
430 429
431 $self->_emit (focus_in => $focus);
432
433 $focus->update if $focus; 430 $focus->update if $focus;
434 $FOCUS->update; 431 $FOCUS->update;
435}
436 432
433 0
434}
435
437sub focus_out { 436sub invoke_focus_out {
438 my ($self) = @_; 437 my ($self) = @_;
439 438
440 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
441 440
442 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
443 442
444 $self->_emit (focus_out => $focus);
445
446 $focus->update if $focus; #? 443 $focus->update if $focus; #?
447 444
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449 unless $FOCUS; 446 unless $FOCUS;
450}
451 447
448 0
449}
450
451sub grab_focus {
452 my ($self) = @_;
453
454 $self->emit ("focus_in");
455}
456
452sub mouse_motion { 0 } 457sub invoke_mouse_motion { 1 }
453sub button_up { 0 } 458sub invoke_button_up { 1 }
454sub key_down { 0 } 459sub invoke_key_down { 1 }
455sub key_up { 0 } 460sub invoke_key_up { 1 }
456 461
457sub button_down { 462sub invoke_button_down {
458 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
459 464
460 $self->focus_in; 465 $self->grab_focus;
461 466
462 0 467 1
468}
469
470sub connect {
471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
463} 483}
464 484
465sub find_widget { 485sub find_widget {
466 my ($self, $x, $y) = @_; 486 my ($self, $x, $y) = @_;
467 487
… …
477sub set_parent { 497sub set_parent {
478 my ($self, $parent) = @_; 498 my ($self, $parent) = @_;
479 499
480 Scalar::Util::weaken ($self->{parent} = $parent); 500 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible}; 501 $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} 502}
506 503
507sub realloc { 504sub realloc {
508 my ($self) = @_; 505 my ($self) = @_;
509 506
… …
593 590
594sub DESTROY { 591sub DESTROY {
595 my ($self) = @_; 592 my ($self) = @_;
596 593
597 delete $WIDGET{$self+0}; 594 delete $WIDGET{$self+0};
598 #$self->deactivate; 595
596 eval { $self->destroy };
597 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
599} 598}
600 599
601############################################################################# 600#############################################################################
602 601
603package CFClient::UI::DrawBG; 602package CFClient::UI::DrawBG;
… …
768} 767}
769 768
770sub add { 769sub add {
771 my ($self, $child) = @_; 770 my ($self, $child) = @_;
772 771
773 $self->{children} = []; 772 $self->SUPER::remove ($_) for @{ $self->{children} };
774
775 $self->SUPER::add ($child); 773 $self->SUPER::add ($child);
776} 774}
777 775
778sub remove { 776sub remove {
779 my ($self, $widget) = @_; 777 my ($self, $widget) = @_;
… …
788 786
789sub size_request { 787sub size_request {
790 $_[0]{children}[0]->size_request 788 $_[0]{children}[0]->size_request
791} 789}
792 790
793sub size_allocate { 791sub invoke_size_allocate {
794 my ($self, $w, $h) = @_; 792 my ($self, $w, $h) = @_;
795 793
796 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
795
796 1
797} 797}
798 798
799############################################################################# 799#############################################################################
800 800
801# back-buffered drawing area 801# back-buffered drawing area
… …
817 817
818 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 818 $ROOT->on_post_alloc ($self => sub { $self->render_child });
819 $self->SUPER::update; 819 $self->SUPER::update;
820} 820}
821 821
822sub size_allocate { 822sub invoke_size_allocate {
823 my ($self, $w, $h) = @_; 823 my ($self, $w, $h) = @_;
824 824
825 $self->SUPER::size_allocate ($w, $h);
826 $self->update; 825 $self->update;
826
827 $self->SUPER::invoke_size_allocate ($w, $h)
827} 828}
828 829
829sub _render { 830sub _render {
830 my ($self) = @_; 831 my ($self) = @_;
831 832
… …
892 $h = 10 if $self->{scroll_y}; 893 $h = 10 if $self->{scroll_y};
893 894
894 ($w, $h) 895 ($w, $h)
895} 896}
896 897
897sub size_allocate { 898sub invoke_size_allocate {
898 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
899 900
900 my $child = $self->child; 901 my $child = $self->child;
901 902
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904 905
905 $self->child->configure (0, 0, $w, $h); 906 $self->child->configure (0, 0, $w, $h);
906 $self->update; 907 $self->update;
908
909 1
907} 910}
908 911
909sub set_offset { 912sub set_offset {
910 my ($self, $x, $y) = @_; 913 my ($self, $x, $y) = @_;
911 914
… …
1001 # todo: overwrite size_allocate of child 1004 # todo: overwrite size_allocate of child
1002 my $child = $self->{vp}->child; 1005 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1006 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004} 1007}
1005 1008
1006sub size_allocate { 1009sub invoke_size_allocate {
1007 my ($self, $w, $h) = @_; 1010 my ($self, $w, $h) = @_;
1008
1009 $self->SUPER::size_allocate ($w, $h);
1010 1011
1011 my $child = $self->{vp}->child; 1012 my $child = $self->{vp}->child;
1012 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014
1015 $self->SUPER::invoke_size_allocate ($w, $h)
1013} 1016}
1014 1017
1015#TODO# update range on size_allocate depending on child 1018#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll 1019# update viewport offset on scroll
1017 1020
… …
1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1074 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); 1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073 1076
1074sub new { 1077sub new {
1075 my ($class, %arg) = @_; 1078 my ($class, %arg) = @_;
1076
1077 my $title = delete $arg{title};
1078 1079
1079 my $self = $class->SUPER::new ( 1080 my $self = $class->SUPER::new (
1080 bg => [1, 1, 1, 1], 1081 bg => [1, 1, 1, 1],
1081 border_bg => [1, 1, 1, 1], 1082 border_bg => [1, 1, 1, 1],
1082 border => 0.6, 1083 border => 0.6,
… …
1084 min_w => 16, 1085 min_w => 16,
1085 min_h => 16, 1086 min_h => 16,
1086 %arg, 1087 %arg,
1087 ); 1088 );
1088 1089
1089 $self->{title} = new CFClient::UI::Label 1090 $self->{title_widget} = new CFClient::UI::Label
1090 align => 0, 1091 align => 0,
1091 valign => 1, 1092 valign => 1,
1092 text => $title, 1093 text => $self->{title},
1093 fontsize => $self->{border} 1094 fontsize => $self->{border},
1094 if defined $title; 1095 if exists $self->{title};
1096
1097 if ($self->{has_close_button}) {
1098 $self->{close_button} =
1099 new CFClient::UI::ImageButton
1100 path => 'x1_close.png',
1101 on_activate => sub { $self->hide };
1102
1103 $self->CFClient::UI::Container::add ($self->{close_button});
1104 }
1095 1105
1096 $self 1106 $self
1097} 1107}
1098 1108
1099sub add { 1109sub add {
1100 my ($self, @widgets) = @_; 1110 my ($self, @widgets) = @_;
1101 1111
1102 $self->SUPER::add (@widgets); 1112 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104} 1115}
1105 1116
1106sub border { 1117sub border {
1107 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
1108} 1119}
1109 1120
1110sub size_request { 1121sub size_request {
1111 my ($self) = @_; 1122 my ($self) = @_;
1112 1123
1113 $self->{title}->size_request 1124 $self->{title_widget}->size_request
1114 if $self->{title}; 1125 if $self->{title_widget};
1126
1127 $self->{close_button}->size_request
1128 if $self->{close_button};
1115 1129
1116 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
1117 1131
1118 ( 1132 (
1119 $w + $self->border * 2, 1133 $w + $self->border * 2,
1120 $h + $self->border * 2, 1134 $h + $self->border * 2,
1121 ) 1135 )
1122} 1136}
1123 1137
1124sub size_allocate { 1138sub invoke_size_allocate {
1125 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
1126 1140
1127 if ($self->{title}) { 1141 if ($self->{title_widget}) {
1128 $self->{title}{w} = $w; 1142 $self->{title_widget}{w} = $w;
1129 $self->{title}{h} = $h; 1143 $self->{title_widget}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h); 1144 $self->{title_widget}->invoke_size_allocate ($w, $h);
1131 } 1145 }
1132 1146
1133 my $border = $self->border; 1147 my $border = $self->border;
1134 1148
1135 $h -= List::Util::max 0, $border * 2; 1149 $h -= List::Util::max 0, $border * 2;
1136 $w -= List::Util::max 0, $border * 2; 1150 $w -= List::Util::max 0, $border * 2;
1137 1151
1138 $self->child->configure ($border, $border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
1139}
1140 1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
1141sub button_down { 1160sub invoke_button_down {
1142 my ($self, $ev, $x, $y) = @_; 1161 my ($self, $ev, $x, $y) = @_;
1143 1162
1144 my ($w, $h) = @$self{qw(w h)}; 1163 my ($w, $h) = @$self{qw(w h)};
1145 my $border = $self->border; 1164 my $border = $self->border;
1146 1165
… …
1177 1196
1178 ($x, $y) = ($ev->{x}, $ev->{y}); 1197 ($x, $y) = ($ev->{x}, $ev->{y});
1179 1198
1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1199 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement 1200 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1201 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183 }; 1202 };
1184 } else { 1203 } else {
1185 return 0; 1204 return 0;
1186 } 1205 }
1187 1206
1188 1 1207 1
1189} 1208}
1190 1209
1191sub button_up { 1210sub invoke_button_up {
1192 my ($self, $ev, $x, $y) = @_; 1211 my ($self, $ev, $x, $y) = @_;
1193 1212
1194 !!delete $self->{motion} 1213 ! ! delete $self->{motion}
1195} 1214}
1196 1215
1197sub mouse_motion { 1216sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_; 1217 my ($self, $ev, $x, $y) = @_;
1199 1218
1200 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1219 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201 1220
1202 !!$self->{motion} 1221 ! ! $self->{motion}
1203} 1222}
1204 1223
1205sub _draw { 1224sub _draw {
1206 my ($self) = @_; 1225 my ($self) = @_;
1207 1226
… …
1233 1252
1234 glDisable GL_TEXTURE_2D; 1253 glDisable GL_TEXTURE_2D;
1235 1254
1236 $child->draw; 1255 $child->draw;
1237 1256
1238 if ($self->{title}) { 1257 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1258 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1259 $self->{title_widget}->_draw;
1260
1261 glTranslate 0, - ($border - $self->{h});
1241 } 1262 }
1263
1264 $self->{close_button}->draw
1265 if $self->{close_button};
1242} 1266}
1243 1267
1244############################################################################# 1268#############################################################################
1245 1269
1246package CFClient::UI::Table; 1270package CFClient::UI::Table;
… …
1269 1293
1270 $child->set_parent ($self); 1294 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child; 1295 $self->{children}[$y][$x] = $child;
1272 1296
1273 $self->realloc; 1297 $self->realloc;
1298}
1299
1300sub remove {
1301 my ($self, $child) = @_;
1302
1303 # TODO: not yet implemented
1274} 1304}
1275 1305
1276# TODO: move to container class maybe? send children a signal on removal? 1306# TODO: move to container class maybe? send children a signal on removal?
1277sub clear { 1307sub clear {
1278 my ($self) = @_; 1308 my ($self) = @_;
… …
1319 (sum @$ws), 1349 (sum @$ws),
1320 (sum @$hs), 1350 (sum @$hs),
1321 ) 1351 )
1322} 1352}
1323 1353
1324sub size_allocate { 1354sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1355 my ($self, $w, $h) = @_;
1326 1356
1327 my ($ws, $hs) = $self->get_wh; 1357 my ($ws, $hs) = $self->get_wh;
1328 1358
1329 my $req_w = (sum @$ws) || 1; 1359 my $req_w = (sum @$ws) || 1;
… …
1361 } 1391 }
1362 1392
1363 $y += $row_h; 1393 $y += $row_h;
1364 } 1394 }
1365 1395
1396 1
1366} 1397}
1367 1398
1368sub find_widget { 1399sub find_widget {
1369 my ($self, $x, $y) = @_; 1400 my ($self, $x, $y) = @_;
1370 1401
… …
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1438 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1439 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 ) 1440 )
1410} 1441}
1411 1442
1412sub size_allocate { 1443sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1444 my ($self, $w, $h) = @_;
1414 1445
1415 my $space = $self->{vertical} ? $h : $w; 1446 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1447 my @children = $self->visible_children;
1417 1448
1418 my @req; 1449 my @req;
1419 1450
1420 if ($self->{homogeneous}) { 1451 if ($self->{homogeneous}) {
1421 @req = ($space / (@$children || 1)) x @$children; 1452 @req = ($space / (@children || 1)) x @children;
1422 } else { 1453 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1454 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424 my $req = List::Util::sum @req; 1455 my $req = List::Util::sum @req;
1425 1456
1426 if ($req > $space) { 1457 if ($req > $space) {
1427 # ah well, not enough space 1458 # ah well, not enough space
1428 $_ *= $space / $req for @req; 1459 $_ *= $space / $req for @req;
1429 } else { 1460 } else {
1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1461 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431 1462
1432 $space = ($space - $req) / $expand; # remaining space to give away 1463 $space = ($space - $req) / $expand; # remaining space to give away
1433 1464
1434 $req[$_] += $space * $children->[$_]{expand} 1465 $req[$_] += $space * $children[$_]{expand}
1435 for 0 .. $#$children; 1466 for 0 .. $#children;
1436 } 1467 }
1437 } 1468 }
1438 1469
1439 CFClient::UI::harmonize \@req; 1470 CFClient::UI::harmonize \@req;
1440 1471
1441 my $pos = 0; 1472 my $pos = 0;
1442 for (0 .. $#$children) { 1473 for (0 .. $#children) {
1443 my $alloc = $req[$_]; 1474 my $alloc = $req[$_];
1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1475 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445 1476
1446 $pos += $alloc; 1477 $pos += $alloc;
1447 } 1478 }
1448 1479
1449 1 1480 1
… …
1604 }; 1635 };
1605 1636
1606 @{ $self->{size_req} } 1637 @{ $self->{size_req} }
1607} 1638}
1608 1639
1640sub baseline_shift {
1641 $_[0]{layout}->descent
1642}
1643
1609sub size_allocate { 1644sub invoke_size_allocate {
1610 my ($self, $w, $h) = @_; 1645 my ($self, $w, $h) = @_;
1611 1646
1612 delete $self->{ox}; 1647 delete $self->{ox};
1613 1648
1614 delete $self->{texture} 1649 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1650 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1651
1652 1
1616} 1653}
1617 1654
1618sub set_fontsize { 1655sub set_fontsize {
1619 my ($self, $fontsize) = @_; 1656 my ($self, $fontsize) = @_;
1620 1657
… …
1713 1750
1714 $text =~ s/./*/g if $self->{hidden}; 1751 $text =~ s/./*/g if $self->{hidden};
1715 $self->{layout}->set_text ("$text "); 1752 $self->{layout}->set_text ("$text ");
1716 delete $self->{size_req}; 1753 delete $self->{size_req};
1717 1754
1718 $self->_emit (changed => $self->{text}); 1755 $self->emit (changed => $self->{text});
1719 1756
1720 $self->realloc; 1757 $self->realloc;
1721 $self->update; 1758 $self->update;
1722} 1759}
1723 1760
… …
1738 my ($w, $h) = $self->SUPER::size_request; 1775 my ($w, $h) = $self->SUPER::size_request;
1739 1776
1740 ($w + 1, $h) # add 1 for cursor 1777 ($w + 1, $h) # add 1 for cursor
1741} 1778}
1742 1779
1743sub key_down { 1780sub invoke_key_down {
1744 my ($self, $ev) = @_; 1781 my ($self, $ev) = @_;
1745 1782
1746 my $mod = $ev->{mod}; 1783 my $mod = $ev->{mod};
1747 my $sym = $ev->{sym}; 1784 my $sym = $ev->{sym};
1748 my $uni = $ev->{unicode}; 1785 my $uni = $ev->{unicode};
… …
1760 } elsif ($sym == CFClient::SDLK_HOME) { 1797 } elsif ($sym == CFClient::SDLK_HOME) {
1761 $self->{cursor} = 0; 1798 $self->{cursor} = 0;
1762 } elsif ($sym == CFClient::SDLK_END) { 1799 } elsif ($sym == CFClient::SDLK_END) {
1763 $self->{cursor} = length $text; 1800 $self->{cursor} = length $text;
1764 } elsif ($uni == 27) { 1801 } elsif ($uni == 27) {
1765 $self->_emit ('escape'); 1802 $self->emit ('escape');
1766 } elsif ($uni) { 1803 } elsif ($uni) {
1767 substr $text, $self->{cursor}++, 0, chr $uni; 1804 substr $text, $self->{cursor}++, 0, chr $uni;
1768 } else { 1805 } else {
1769 return 0; 1806 return 0;
1770 } 1807 }
… …
1774 $self->realloc; 1811 $self->realloc;
1775 1812
1776 1 1813 1
1777} 1814}
1778 1815
1779sub focus_in { 1816sub invoke_focus_in {
1780 my ($self) = @_; 1817 my ($self) = @_;
1781 1818
1782 $self->{last_activity} = $::NOW; 1819 $self->{last_activity} = $::NOW;
1783 1820
1784 $self->SUPER::focus_in; 1821 $self->SUPER::invoke_focus_in
1785} 1822}
1786 1823
1787sub button_down { 1824sub invoke_button_down {
1788 my ($self, $ev, $x, $y) = @_; 1825 my ($self, $ev, $x, $y) = @_;
1789 1826
1790 $self->SUPER::button_down ($ev, $x, $y); 1827 $self->SUPER::invoke_button_down ($ev, $x, $y);
1791 1828
1792 my $idx = $self->{layout}->xy_to_index ($x, $y); 1829 my $idx = $self->{layout}->xy_to_index ($x, $y);
1793 1830
1794 # byte-index to char-index 1831 # byte-index to char-index
1795 my $text = $self->{text}; 1832 my $text = $self->{text};
… …
1800 $self->update; 1837 $self->update;
1801 1838
1802 1 1839 1
1803} 1840}
1804 1841
1805sub mouse_motion { 1842sub invoke_mouse_motion {
1806 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1807# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1844# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1808 1845
1809 0 1846 1
1810} 1847}
1811 1848
1812sub _draw { 1849sub _draw {
1813 my ($self) = @_; 1850 my ($self) = @_;
1814 1851
… …
1855 1892
1856our @ISA = CFClient::UI::EntryBase::; 1893our @ISA = CFClient::UI::EntryBase::;
1857 1894
1858use CFClient::OpenGL; 1895use CFClient::OpenGL;
1859 1896
1860sub key_down { 1897sub invoke_key_down {
1861 my ($self, $ev) = @_; 1898 my ($self, $ev) = @_;
1862 1899
1863 my $sym = $ev->{sym}; 1900 my $sym = $ev->{sym};
1864 1901
1865 if ($sym == 13) { 1902 if ($sym == 13) {
1866 unshift @{$self->{history}}, 1903 unshift @{$self->{history}},
1867 my $txt = $self->get_text; 1904 my $txt = $self->get_text;
1905
1868 $self->{history_pointer} = -1; 1906 $self->{history_pointer} = -1;
1869 $self->{history_saveback} = ''; 1907 $self->{history_saveback} = '';
1870 $self->_emit (activate => $txt); 1908 $self->emit (activate => $txt);
1871 $self->update; 1909 $self->update;
1872 1910
1873 } elsif ($sym == CFClient::SDLK_UP) { 1911 } elsif ($sym == CFClient::SDLK_UP) {
1874 if ($self->{history_pointer} < 0) { 1912 if ($self->{history_pointer} < 0) {
1875 $self->{history_saveback} = $self->get_text; 1913 $self->{history_saveback} = $self->get_text;
… …
1891 } else { 1929 } else {
1892 $self->set_text ($self->{history_saveback}); 1930 $self->set_text ($self->{history_saveback});
1893 } 1931 }
1894 1932
1895 } else { 1933 } else {
1896 return $self->SUPER::key_down ($ev) 1934 return $self->SUPER::invoke_key_down ($ev)
1897 } 1935 }
1898 1936
1899 1 1937 1
1900} 1938}
1901 1939
… …
1925 can_events => 1, 1963 can_events => 1,
1926 @_ 1964 @_
1927 ) 1965 )
1928} 1966}
1929 1967
1930sub activate { }
1931
1932sub button_up { 1968sub invoke_button_up {
1933 my ($self, $ev, $x, $y) = @_; 1969 my ($self, $ev, $x, $y) = @_;
1934 1970
1935 $self->emit ("activate") 1971 $self->emit ("activate")
1936 if $x >= 0 && $x < $self->{w} 1972 if $x >= 0 && $x < $self->{w}
1937 && $y >= 0 && $y < $self->{h}; 1973 && $y >= 0 && $y < $self->{h};
… …
1951 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1987 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1952 1988
1953 glDisable GL_TEXTURE_2D; 1989 glDisable GL_TEXTURE_2D;
1954 1990
1955 $self->SUPER::_draw; 1991 $self->SUPER::_draw;
1992}
1993
1994#############################################################################
1995
1996package CFClient::UI::ImageButton;
1997
1998our @ISA = CFClient::UI::Image::;
1999
2000use CFClient::OpenGL;
2001
2002my %textures;
2003
2004sub new {
2005 my $class = shift;
2006
2007 my $self = $class->SUPER::new (
2008 padding_x => 4,
2009 padding_y => 4,
2010 fg => [1, 1, 1],
2011 active_fg => [0, 0, 1],
2012 can_hover => 1,
2013 align => 0,
2014 valign => 0,
2015 can_events => 1,
2016 @_
2017 );
2018}
2019
2020sub invoke_button_up {
2021 my ($self, $ev, $x, $y) = @_;
2022
2023 $self->emit ("activate")
2024 if $x >= 0 && $x < $self->{w}
2025 && $y >= 0 && $y < $self->{h};
2026
2027 1
1956} 2028}
1957 2029
1958############################################################################# 2030#############################################################################
1959 2031
1960package CFClient::UI::CheckBox; 2032package CFClient::UI::CheckBox;
… …
1987 my ($self) = @_; 2059 my ($self) = @_;
1988 2060
1989 (6) x 2 2061 (6) x 2
1990} 2062}
1991 2063
1992sub button_down { 2064sub invoke_button_down {
1993 my ($self, $ev, $x, $y) = @_; 2065 my ($self, $ev, $x, $y) = @_;
1994 2066
1995 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1996 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1997 $self->{state} = !$self->{state}; 2069 $self->{state} = !$self->{state};
1998 $self->_emit (changed => $self->{state}); 2070 $self->emit (changed => $self->{state});
1999 } else { 2071 } else {
2000 return 0 2072 return 0
2001 } 2073 }
2002 2074
2003 1 2075 1
… …
2028package CFClient::UI::Image; 2100package CFClient::UI::Image;
2029 2101
2030our @ISA = CFClient::UI::Base::; 2102our @ISA = CFClient::UI::Base::;
2031 2103
2032use CFClient::OpenGL; 2104use CFClient::OpenGL;
2033use Carp qw/confess/;
2034 2105
2035our %loaded_images; 2106our %texture_cache;
2036 2107
2037sub new { 2108sub new {
2038 my $class = shift; 2109 my $class = shift;
2039 2110
2040 my $self = $class->SUPER::new (can_events => 0, @_); 2111 my $self = $class->SUPER::new (
2112 can_events => 0,
2113 @_,
2114 );
2041 2115
2042 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2116 $self->{path}
2117 or Carp::croak "required attribute 'path' not set";
2043 2118
2044 $loaded_images{$self->{image}} ||= 2119 $self->{tex} = $texture_cache{$self->{path}} ||=
2045 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2120 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2046 2121
2047 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2122 Scalar::Util::weaken $texture_cache{$self->{path}};
2048 2123
2049 Scalar::Util::weaken $loaded_images{$self->{image}}; 2124 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2050
2051 $self->{aspect} = $tex->{w} / $tex->{h};
2052 2125
2053 $self 2126 $self
2054} 2127}
2055 2128
2056sub size_request { 2129sub size_request {
2057 my ($self) = @_; 2130 my ($self) = @_;
2058 2131
2059 ($self->{tex}->{w}, $self->{tex}->{h}) 2132 ($self->{tex}{w}, $self->{tex}{h})
2060} 2133}
2061 2134
2062sub _draw { 2135sub _draw {
2063 my ($self) = @_; 2136 my ($self) = @_;
2064 2137
… …
2300 $self->update; 2373 $self->update;
2301 2374
2302 $self 2375 $self
2303} 2376}
2304 2377
2305sub changed { }
2306
2307sub set_range { 2378sub set_range {
2308 my ($self, $range) = @_; 2379 my ($self, $range) = @_;
2309 2380
2310 ($range, $self->{range}) = ($self->{range}, $range); 2381 ($range, $self->{range}) = ($self->{range}, $range);
2311 2382
… …
2331 if $unit; 2402 if $unit;
2332 2403
2333 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2404 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2334 2405
2335 if ($value != $old_value) { 2406 if ($value != $old_value) {
2336 $self->_emit (changed => $value); 2407 $self->emit (changed => $value);
2337 $self->update; 2408 $self->update;
2338 } 2409 }
2339} 2410}
2340 2411
2341sub size_request { 2412sub size_request {
2342 my ($self) = @_; 2413 my ($self) = @_;
2343 2414
2344 ($self->{req_w}, $self->{req_h}) 2415 ($self->{req_w}, $self->{req_h})
2345} 2416}
2346 2417
2347sub button_down { 2418sub invoke_button_down {
2348 my ($self, $ev, $x, $y) = @_; 2419 my ($self, $ev, $x, $y) = @_;
2349 2420
2350 $self->SUPER::button_down ($ev, $x, $y); 2421 $self->SUPER::invoke_button_down ($ev, $x, $y);
2351 2422
2352 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2423 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2353 2424
2354 $self->mouse_motion ($ev, $x, $y) 2425 $self->invoke_mouse_motion ($ev, $x, $y)
2355} 2426}
2356 2427
2357sub mouse_motion { 2428sub invoke_mouse_motion {
2358 my ($self, $ev, $x, $y) = @_; 2429 my ($self, $ev, $x, $y) = @_;
2359 2430
2360 if ($GRAB == $self) { 2431 if ($GRAB == $self) {
2361 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2432 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2362 2433
… …
2467sub set_range { shift->{slider}->set_range (@_) } 2538sub set_range { shift->{slider}->set_range (@_) }
2468sub set_value { shift->{slider}->set_value (@_) } 2539sub set_value { shift->{slider}->set_value (@_) }
2469 2540
2470############################################################################# 2541#############################################################################
2471 2542
2472package CFClient::UI::TextView; 2543package CFClient::UI::TextScroller;
2473 2544
2474our @ISA = CFClient::UI::HBox::; 2545our @ISA = CFClient::UI::HBox::;
2475 2546
2476use CFClient::OpenGL; 2547use CFClient::OpenGL;
2477 2548
… …
2504 2575
2505 $self->{fontsize} = $fontsize; 2576 $self->{fontsize} = $fontsize;
2506 $self->reflow; 2577 $self->reflow;
2507} 2578}
2508 2579
2580sub visible_children {
2581 my ($self) = @_;
2582
2583 @{$self->{children}}[0,1]
2584}
2585
2509sub size_allocate { 2586sub invoke_size_allocate {
2510 my ($self, $w, $h) = @_; 2587 my ($self, $w, $h) = @_;
2511 2588
2512 $self->SUPER::size_allocate ($w, $h); 2589 my ($empty, $slider, @other) = @{ $self->{children} };
2590 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2513 2591
2514 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2592 $self->{layout}->set_font ($self->{font}) if $self->{font};
2515 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2593 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2516 $self->{layout}->set_width ($self->{children}[0]{w}); 2594 $self->{layout}->set_width ($empty->{w});
2517 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2595 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2518 2596
2519 $self->reflow; 2597 $self->reflow;
2520}
2521 2598
2522sub text_size { 2599 $self->SUPER::invoke_size_allocate ($w, $h)
2523 my ($self, $text, $indent) = @_; 2600}
2601
2602sub get_layout {
2603 my ($self, $para) = @_;
2524 2604
2525 my $layout = $self->{layout}; 2605 my $layout = $self->{layout};
2526 2606
2607 $layout->set_font ($self->{font}) if $self->{font};
2608 $layout->set_foreground (@{$para->{fg}});
2527 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2609 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2528 $layout->set_width ($self->{children}[0]{w} - $indent); 2610 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2529 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2611 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2530 $layout->set_markup ($text); 2612 $layout->set_markup ($para->{markup});
2613
2614 $layout->set_shapes (
2615 map
2616 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2617 @{$para->{widget}}
2531 2618 );
2619
2532 $layout->size 2620 $layout
2533} 2621}
2534 2622
2535sub reflow { 2623sub reflow {
2536 my ($self) = @_; 2624 my ($self) = @_;
2537 2625
… …
2546 $self->{children}[1]->set_value ($offset); 2634 $self->{children}[1]->set_value ($offset);
2547} 2635}
2548 2636
2549sub clear { 2637sub clear {
2550 my ($self) = @_; 2638 my ($self) = @_;
2639
2640 my (undef, undef, @other) = @{ $self->{children} };
2641 $self->remove ($_) for @other;
2551 2642
2552 $self->{par} = []; 2643 $self->{par} = [];
2553 $self->{height} = 0; 2644 $self->{height} = 0;
2554 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2645 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2555} 2646}
2556 2647
2557sub add_paragraph { 2648sub add_paragraph {
2558 my ($self, $color, $text, $indent) = @_; 2649 my ($self, $color, $para, $indent) = @_;
2559 2650
2560 for my $line (split /\n/, $text) { 2651 my ($text, @w) = ref $para ? @$para : $para;
2561 my ($w, $h) = $self->text_size ($line); 2652
2562 $self->{height} += $h; 2653 $para = {
2563 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2654 w => 1e10,
2655 wrapped => 1,
2656 fg => $color,
2657 indent => $indent,
2658 markup => $text,
2659 widget => \@w,
2564 } 2660 };
2565 2661
2566 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2662 $self->add (@w) if @w;
2663 push @{$self->{par}}, $para;
2664
2665 $self->{need_reflow}++;
2666 $self->update;
2667}
2668
2669sub scroll_to_bottom {
2670 my ($self) = @_;
2671
2672 $self->{scroll_to_bottom} = 1;
2673 $self->update;
2567} 2674}
2568 2675
2569sub update { 2676sub update {
2570 my ($self) = @_; 2677 my ($self) = @_;
2571 2678
… …
2579 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2686 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2580 2687
2581 if (delete $self->{need_reflow}) { 2688 if (delete $self->{need_reflow}) {
2582 my $height = 0; 2689 my $height = 0;
2583 2690
2584 my $layout = $self->{layout};
2585
2586 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2587
2588 for (@{$self->{par}}) { 2691 for my $para (@{$self->{par}}) {
2589 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2692 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2590 $layout->set_width ($W - $_->[3]); 2693 my $layout = $self->get_layout ($para);
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2592 $layout->set_markup ($_->[4]);
2593 my ($w, $h) = $layout->size; 2694 my ($w, $h) = $layout->size;
2594 $_->[0] = $w + $_->[3]; 2695
2595 $_->[1] = $h; 2696 $para->{w} = $w + $para->{indent};
2697 $para->{h} = $h;
2698 $para->{wrapped} = $layout->has_wrapped;
2596 } 2699 }
2597 2700
2598 $height += $_->[1]; 2701 $height += $para->{h};
2599 } 2702 }
2600 2703
2601 $self->{height} = $height; 2704 $self->{height} = $height;
2602 2705
2603 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2706 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2604 2707
2605 delete $self->{texture}; 2708 delete $self->{texture};
2709 }
2710
2711 if (delete $self->{scroll_to_bottom}) {
2712 $self->{children}[1]->set_value (1e10);
2606 } 2713 }
2607 2714
2608 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2715 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2609 glClearColor 0, 0, 0, 0; 2716 glClearColor 0, 0, 0, 0;
2610 glClear GL_COLOR_BUFFER_BIT; 2717 glClear GL_COLOR_BUFFER_BIT;
… …
2614 my $y0 = $top; 2721 my $y0 = $top;
2615 my $y1 = $top + $H; 2722 my $y1 = $top + $H;
2616 2723
2617 my $y = 0; 2724 my $y = 0;
2618 2725
2619 my $layout = $self->{layout};
2620
2621 $layout->set_font ($self->{font}) if $self->{font};
2622
2623 glEnable GL_BLEND; 2726 glEnable GL_BLEND;
2624 #TODO# not correct in windows where rgba is forced off 2727 #TODO# not correct in windows where rgba is forced off
2625 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2728 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2626 2729
2627 for my $par (@{$self->{par}}) { 2730 for my $para (@{$self->{par}}) {
2628 my $h = $par->[1]; 2731 my $h = $para->{h};
2629 2732
2630 if ($y0 < $y + $h && $y < $y1) { 2733 if ($y0 < $y + $h && $y < $y1) {
2631 $layout->set_foreground (@{ $par->[2] }); 2734
2632 $layout->set_width ($W - $par->[3]); 2735 my $layout = $self->get_layout ($para);
2633 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2634 $layout->set_markup ($par->[4]);
2635 2736
2636 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2737 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2637 2738
2638 glRasterPos $par->[3], $y - $y0; 2739 glRasterPos $para->{indent}, $y - $y0;
2639 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2740 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2741
2742 if (my @w = @{ $para->{widget} }) {
2743 my @s = $layout->get_shapes;
2744
2745 for (@w) {
2746 my ($dx, $dy) = splice @s, 0, 2, ();
2747
2748 $_->{x} = $dx + $para->{indent};
2749 $_->{y} = $dy + $y - $y0;
2750
2751 $_->draw;
2752 }
2753 }
2640 } 2754 }
2641 2755
2642 $y += $h; 2756 $y += $h;
2643 } 2757 }
2644 2758
2645 glDisable GL_BLEND; 2759 glDisable GL_BLEND;
2646 }; 2760 };
2647 }); 2761 });
2762}
2763
2764sub reconfigure {
2765 my ($self) = @_;
2766
2767 $self->SUPER::reconfigure;
2768
2769 $_->{w} = 1e10 for @{ $self->{par} };
2770 $self->reflow;
2648} 2771}
2649 2772
2650sub _draw { 2773sub _draw {
2651 my ($self) = @_; 2774 my ($self) = @_;
2652 2775
… …
2655 glColor 0, 0, 0, 1; 2778 glColor 0, 0, 0, 1;
2656 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2779 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2657 glDisable GL_TEXTURE_2D; 2780 glDisable GL_TEXTURE_2D;
2658 2781
2659 $self->{children}[1]->draw; 2782 $self->{children}[1]->draw;
2660
2661} 2783}
2662 2784
2663############################################################################# 2785#############################################################################
2664 2786
2665package CFClient::UI::Animator; 2787package CFClient::UI::Animator;
… …
2752 $tooltip .= "\n\n" . (ref $widget) . "\n" 2874 $tooltip .= "\n\n" . (ref $widget) . "\n"
2753 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2875 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2754 . "req $widget->{req_w} $widget->{req_h}\n" 2876 . "req $widget->{req_w} $widget->{req_h}\n"
2755 . "visible $widget->{visible}"; 2877 . "visible $widget->{visible}";
2756 } 2878 }
2879
2880 $tooltip =~ s/^\n+//;
2881 $tooltip =~ s/\n+$//;
2757 2882
2758 $self->add (new CFClient::UI::Label 2883 $self->add (new CFClient::UI::Label
2759 markup => $tooltip, 2884 markup => $tooltip,
2760 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2885 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2761 fontsize => 0.8, 2886 fontsize => 0.8,
… …
2771 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2896 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2772 2897
2773 ($w + 4, $h + 4) 2898 ($w + 4, $h + 4)
2774} 2899}
2775 2900
2776sub size_allocate { 2901sub invoke_size_allocate {
2777 my ($self, $w, $h) = @_; 2902 my ($self, $w, $h) = @_;
2778 2903
2779 $self->SUPER::size_allocate ($w - 4, $h - 4); 2904 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2780} 2905}
2781 2906
2782sub visibility_change { 2907sub invoke_visibility_change {
2783 my ($self, $visible) = @_; 2908 my ($self, $visible) = @_;
2784 2909
2785 return unless $visible; 2910 return unless $visible;
2786 2911
2787 $self->{root}->on_post_alloc ("move_$self" => sub { 2912 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2894 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3019 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2895 glDisable GL_TEXTURE_2D; 3020 glDisable GL_TEXTURE_2D;
2896 } 3021 }
2897} 3022}
2898 3023
2899sub DESTROY { 3024sub destroy {
2900 my ($self) = @_; 3025 my ($self) = @_;
2901 3026
2902 $self->{timer}->cancel 3027 $self->{timer}->cancel
2903 if $self->{timer}; 3028 if $self->{timer};
2904 3029
2905 $self->SUPER::DESTROY; 3030 $self->SUPER::destroy;
2906} 3031}
2907 3032
2908############################################################################# 3033#############################################################################
2909 3034
2910package CFClient::UI::Buttonbar; 3035package CFClient::UI::Buttonbar;
… …
2938 # handle various types of items, only text for now 3063 # handle various types of items, only text for now
2939 if (!ref $widget) { 3064 if (!ref $widget) {
2940 $widget = new CFClient::UI::Label 3065 $widget = new CFClient::UI::Label
2941 can_hover => 1, 3066 can_hover => 1,
2942 can_events => 1, 3067 can_events => 1,
2943 text => $widget, 3068 markup => $widget,
2944 tooltip => $tooltip 3069 tooltip => $tooltip
2945 } 3070 }
2946 3071
2947 $self->{item}{$widget} = $item; 3072 $self->{item}{$widget} = $item;
2948 3073
… …
2954 3079
2955# popup given the event (must be a mouse button down event currently) 3080# popup given the event (must be a mouse button down event currently)
2956sub popup { 3081sub popup {
2957 my ($self, $ev) = @_; 3082 my ($self, $ev) = @_;
2958 3083
2959 $self->_emit ("popdown"); 3084 $self->emit ("popdown");
2960 3085
2961 # maybe save $GRAB? must be careful about events... 3086 # maybe save $GRAB? must be careful about events...
2962 $GRAB = $self; 3087 $GRAB = $self;
2963 $self->{button} = $ev->{button}; 3088 $self->{button} = $ev->{button};
2964 3089
2965 $self->show; 3090 $self->show;
2966 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3091 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2967} 3092}
2968 3093
2969sub mouse_motion { 3094sub invoke_mouse_motion {
2970 my ($self, $ev, $x, $y) = @_; 3095 my ($self, $ev, $x, $y) = @_;
2971 3096
2972 # TODO: should use vbox->find_widget or so 3097 # TODO: should use vbox->find_widget or so
2973 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3098 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2974 $self->{hover} = $self->{item}{$HOVER}; 3099 $self->{hover} = $self->{item}{$HOVER};
2975 3100
2976 0 3101 0
2977} 3102}
2978 3103
2979sub button_up { 3104sub invoke_button_up {
2980 my ($self, $ev, $x, $y) = @_; 3105 my ($self, $ev, $x, $y) = @_;
2981 3106
2982 if ($ev->{button} == $self->{button}) { 3107 if ($ev->{button} == $self->{button}) {
2983 undef $GRAB; 3108 undef $GRAB;
2984 $self->hide; 3109 $self->hide;
2985 3110
2986 $self->_emit ("popdown"); 3111 $self->emit ("popdown");
2987 $self->{hover}[1]->() if $self->{hover}; 3112 $self->{hover}[1]->() if $self->{hover};
2988 } else { 3113 } else {
2989 return 0 3114 return 0
2990 } 3115 }
2991 3116
… …
3028 : $self->{children}[$page_or_widget]; 3153 : $self->{children}[$page_or_widget];
3029 3154
3030 $self->{current} = $widget; 3155 $self->{current} = $widget;
3031 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3156 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3032 3157
3033 $self->_emit (page_changed => $self->{current}); 3158 $self->emit (page_changed => $self->{current});
3034 3159
3035 $self->realloc; 3160 $self->realloc;
3036} 3161}
3037 3162
3038sub visible_children { 3163sub visible_children {
… …
3043 my ($self) = @_; 3168 my ($self) = @_;
3044 3169
3045 $self->{current}->size_request 3170 $self->{current}->size_request
3046} 3171}
3047 3172
3048sub size_allocate { 3173sub invoke_size_allocate {
3049 my ($self, $w, $h) = @_; 3174 my ($self, $w, $h) = @_;
3050 3175
3051 $self->{current}->configure (0, 0, $w, $h); 3176 $self->{current}->configure (0, 0, $w, $h);
3177
3178 1
3052} 3179}
3053 3180
3054sub _draw { 3181sub _draw {
3055 my ($self) = @_; 3182 my ($self) = @_;
3056 3183
… …
3095 3222
3096sub set_current_page { 3223sub set_current_page {
3097 my ($self, $page) = @_; 3224 my ($self, $page) = @_;
3098 3225
3099 $self->{multiplexer}->set_current_page ($page); 3226 $self->{multiplexer}->set_current_page ($page);
3100 $self->_emit (page_changed => $self->{multiplexer}{current}); 3227 $self->emit (page_changed => $self->{multiplexer}{current});
3101} 3228}
3102 3229
3103############################################################################# 3230#############################################################################
3104 3231
3105package CFClient::UI::Combobox; 3232package CFClient::UI::Combobox;
… …
3110 3237
3111sub new { 3238sub new {
3112 my $class = shift; 3239 my $class = shift;
3113 3240
3114 my $self = $class->SUPER::new ( 3241 my $self = $class->SUPER::new (
3115 options => [], # [title, value, tooltip], ... 3242 options => [], # [value, title, longdesc], ...
3116 value => undef, 3243 value => undef,
3117 @_, 3244 @_,
3118 ); 3245 );
3119 3246
3120 $self->_set_value ($self->{value}); 3247 $self->_set_value ($self->{value});
3121 3248
3122 $self 3249 $self
3123} 3250}
3124 3251
3125sub button_down { 3252sub invoke_button_down {
3126 my ($self, $ev) = @_; 3253 my ($self, $ev) = @_;
3127 3254
3128 my @menu_items; 3255 my @menu_items;
3129 3256
3130 for (@{ $self->{options} }) { 3257 for (@{ $self->{options} }) {
3131 my ($title, $value, $tooltip) = @$_; 3258 my ($value, $title, $tooltip) = @$_;
3132 3259
3133 push @menu_items, [$tooltip, sub { $self->set_value ($value) }]; 3260 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3134 } 3261 }
3135 3262
3136 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3263 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3137} 3264}
3138 3265
3139sub _set_value { 3266sub _set_value {
3140 my ($self, $value) = @_; 3267 my ($self, $value) = @_;
3141 3268
3142 my ($item) = grep $_->[1] eq $value, @{ $self->{options} } 3269 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3143 or return; 3270 or return;
3144 3271
3145 $self->{value} = $item->[1]; 3272 $self->{value} = $item->[0];
3146 $self->set_markup ("$item->[0] ⇓"); 3273 $self->set_markup ("$item->[1] ⇓");
3147 $self->set_tooltip ($item->[2]); 3274 $self->set_tooltip ($item->[2]);
3148} 3275}
3149 3276
3150sub set_value { 3277sub set_value {
3151 my ($self, $value) = @_; 3278 my ($self, $value) = @_;
3152 3279
3153 return unless $self->{value} ne $value; 3280 return unless $self->{value} ne $value;
3154 3281
3155 $self->_set_value ($value); 3282 $self->_set_value ($value);
3156 $self->_emit (changed => $value); 3283 $self->emit (changed => $value);
3157} 3284}
3158 3285
3159############################################################################# 3286#############################################################################
3160 3287
3161package CFClient::UI::Statusbox; 3288package CFClient::UI::Statusbox;
… …
3260 $item->{count}++; 3387 $item->{count}++;
3261 } else { 3388 } else {
3262 $item->{count} = 1; 3389 $item->{count} = 1;
3263 $item->{text} = $item->{tooltip} = $text; 3390 $item->{text} = $item->{tooltip} = $text;
3264 } 3391 }
3265 $item->{id} = ++$self->{id}; 3392 $item->{id} += 0.2;#d#
3266 $item->{timeout} = $timeout; 3393 $item->{timeout} = $timeout;
3267 delete $item->{label}; 3394 delete $item->{label};
3268 } else { 3395 } else {
3269 $self->{item}{$group} = { 3396 $self->{item}{$group} = {
3270 id => ++$self->{id}, 3397 id => ++$self->{id},
… …
3289 3416
3290 $self->reorder; 3417 $self->reorder;
3291 $self->SUPER::reconfigure; 3418 $self->SUPER::reconfigure;
3292} 3419}
3293 3420
3294sub DESTROY { 3421sub destroy {
3295 my ($self) = @_; 3422 my ($self) = @_;
3296 3423
3297 $self->{timer}->cancel; 3424 $self->{timer}->cancel;
3298 3425
3299 $self->SUPER::DESTROY; 3426 $self->SUPER::destroy;
3300} 3427}
3301 3428
3302############################################################################# 3429#############################################################################
3303 3430
3304package CFClient::UI::Inventory; 3431package CFClient::UI::Inventory;
… …
3405 $self->update_binding_widgets; 3532 $self->update_binding_widgets;
3406 3533
3407 $self 3534 $self
3408} 3535}
3409 3536
3537sub cfg_bind {
3538 my ($self, $mod, $sym, $cmds) = @_;
3539 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3540 ::update_bindings ();
3541}
3542
3543sub cfg_unbind {
3544 my ($self, $mod, $sym, $cmds) = @_;
3545 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3546 ::update_bindings ();
3547}
3548
3410sub commit { 3549sub commit {
3411 my ($self) = @_; 3550 my ($self) = @_;
3412 my ($mod, $sym, $cmds) = $self->get_binding; 3551 my ($mod, $sym, $cmds) = $self->get_binding;
3413 if ($sym != 0 && @$cmds > 0) { 3552 if ($sym != 0 && @$cmds > 0) {
3414 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym) 3553 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
… …
3448 my ($self) = @_; 3587 my ($self) = @_;
3449 $self->ask_for_bind (1); 3588 $self->ask_for_bind (1);
3450} 3589}
3451 3590
3452sub ask_for_bind { 3591sub ask_for_bind {
3453 my ($self, $commit) = @_; 3592 my ($self, $commit, $end_cb) = @_;
3454 3593
3455 CFClient::Binder::open_binding_dialog (sub { 3594 CFClient::Binder::open_binding_dialog (sub {
3456 my ($mod, $sym) = @_; 3595 my ($mod, $sym) = @_;
3457 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak? 3596 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3458 $self->update_binding_widgets; 3597 $self->update_binding_widgets;
3459 $self->commit if $commit; 3598 $self->commit if $commit;
3599 $end_cb->() if $end_cb;
3460 }); 3600 });
3461} 3601}
3462 3602
3463# $mod and $sym are the modifiers and key symbol 3603# $mod and $sym are the modifiers and key symbol
3464# $cmds is a array ref of strings (the commands) 3604# $cmds is a array ref of strings (the commands)
… …
3482} 3622}
3483 3623
3484# this is a shortcut method that asks for a binding 3624# this is a shortcut method that asks for a binding
3485# and then just binds it. 3625# and then just binds it.
3486sub do_quick_binding { 3626sub do_quick_binding {
3487 my ($self, $cmds) = @_; 3627 my ($self, $cmds, $end_cb) = @_;
3488 $self->set_binding (undef, undef, $cmds, sub { 3628 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3489 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3490 });
3491 $self->ask_for_bind (1); 3629 $self->ask_for_bind (1, $end_cb);
3492} 3630}
3493 3631
3494sub update_binding_widgets { 3632sub update_binding_widgets {
3495 my ($self) = @_; 3633 my ($self) = @_;
3496 my ($mod, $sym, $cmds) = $self->get_binding; 3634 my ($mod, $sym, $cmds) = $self->get_binding;
… …
3552 commands => [], 3690 commands => [],
3553 @_, 3691 @_,
3554 ) 3692 )
3555} 3693}
3556 3694
3695my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3696
3697my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3698 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3699my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3700 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3557my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip => 3701my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3558 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell."); 3702 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3559my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip => 3703my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3560 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation."); 3704 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3561my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip => 3705my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3562 "<b>Damage</b>. The amount of damage the spell deals when it hits."); 3706 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3563 3707
3564sub rebuild_spell_list { 3708sub rebuild_spell_list {
3565 my ($self) = @_; 3709 my ($self) = @_;
3566 3710
3567 $CFClient::UI::ROOT->on_refresh ($self => sub { 3711 $CFClient::UI::ROOT->on_refresh ($self => sub {
3568 $self->clear; 3712 $self->clear;
3569 3713
3714 return unless $::CONN;
3715
3570 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name"); 3716 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3717 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3571 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL); 3718 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3572 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP); 3719 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3573 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG); 3720 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3574 3721
3575 my $row = 0; 3722 my $row = 0;
3576 3723
3577 for (sort { $a cmp $b } keys %{ $self->{spell} }) { 3724 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3578 my $spell = $self->{spell}{$_}; 3725 my $spell = $self->{spell}{$_};
3579 3726
3580 $row++; 3727 $row++;
3728
3729 my $spell_cb = sub {
3730 my ($widget, $ev) = @_;
3731
3732 if ($ev->{button} == 1) {
3733 $::CONN->user_send ("cast $spell->{name}");
3734 } elsif ($ev->{button} == 2) {
3735 $::CONN->user_send ("invoke $spell->{name}");
3736 } elsif ($ev->{button} == 3) {
3737 (new CFClient::UI::Menu
3738 items => [
3739 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3740 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3741 ],
3742 )->popup ($ev);
3743 } else {
3744 return 0;
3745 }
3746
3747 1
3748 };
3749
3750 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3751
3752 #TODO: add path info to tooltip
3753 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3581 3754
3582 $self->add (0, $row, new CFClient::UI::Face 3755 $self->add (0, $row, new CFClient::UI::Face
3583 face => $spell->{face}, 3756 face => $spell->{face},
3584 can_hover => 1, 3757 can_hover => 1,
3585 can_events => 1, 3758 can_events => 1,
3586 tooltip => $spell->{message}, 3759 tooltip => $tooltip,
3760 on_button_down => $spell_cb,
3587 ); 3761 );
3588 3762
3589 $self->add (1, $row, new CFClient::UI::Label 3763 $self->add (1, $row, new CFClient::UI::Label
3590 expand => 1, 3764 expand => 1,
3591 text => $spell->{name}, 3765 text => $spell->{name},
3592 can_hover => 1, 3766 can_hover => 1,
3593 can_events => 1, 3767 can_events => 1,
3594 tooltip => $spell->{message}, 3768 tooltip => $tooltip,
3769 on_button_down => $spell_cb,
3595 ); 3770 );
3596 3771
3772 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3597 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL); 3773 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3598 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP); 3774 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3599 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG); 3775 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3600
3601 # TODO: should be done via popup
3602 $self->add (5, $row, new CFClient::UI::Button
3603 text => "bind",
3604 tooltip => "bind spell readying (cast command) to key",
3605 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3606 );
3607 } 3776 }
3608 }); 3777 });
3609} 3778}
3610 3779
3611sub add_spell { 3780sub add_spell {
… …
3617 3786
3618sub remove_spell { 3787sub remove_spell {
3619 my ($self, $spell) = @_; 3788 my ($self, $spell) = @_;
3620 3789
3621 delete $self->{spell}->{$spell->{name}}; 3790 delete $self->{spell}->{$spell->{name}};
3791 $self->rebuild_spell_list;
3792}
3793
3794sub clear_spells {
3795 my ($self) = @_;
3796
3797 $self->{spell} = {};
3622 $self->rebuild_spell_list; 3798 $self->rebuild_spell_list;
3623} 3799}
3624 3800
3625############################################################################# 3801#############################################################################
3626 3802
… …
3663 $coord = $max - $size if $coord > $max - $size; 3839 $coord = $max - $size if $coord > $max - $size;
3664 3840
3665 int $coord + 0.5 3841 int $coord + 0.5
3666} 3842}
3667 3843
3668sub size_allocate { 3844sub invoke_size_allocate {
3669 my ($self, $w, $h) = @_; 3845 my ($self, $w, $h) = @_;
3670 3846
3671 for my $child ($self->children) { 3847 for my $child ($self->children) {
3672 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3848 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3673 3849
… …
3677 $X = _to_pixel $X, $W, $self->{w}; 3853 $X = _to_pixel $X, $W, $self->{w};
3678 $Y = _to_pixel $Y, $H, $self->{h}; 3854 $Y = _to_pixel $Y, $H, $self->{h};
3679 3855
3680 $child->configure ($X, $Y, $W, $H); 3856 $child->configure ($X, $Y, $W, $H);
3681 } 3857 }
3858
3859 1
3682} 3860}
3683 3861
3684sub coord2local { 3862sub coord2local {
3685 my ($self, $x, $y) = @_; 3863 my ($self, $x, $y) = @_;
3686 3864

Diff Legend

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