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.294 by root, Tue Jun 6 03:19:26 2006 UTC vs.
Revision 1.320 by root, Tue Jul 4 23:23:32 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
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 $FOCUS = $self;
430 429
431 $self->_emit (focus_in => $focus); 430 $self->update;
432 431
433 $focus->update if $focus; 432 0
434 $FOCUS->update;
435} 433}
436 434
437sub focus_out { 435sub invoke_focus_out {
438 my ($self) = @_; 436 my ($self) = @_;
439 437
440 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
441 439
442 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
443 441
444 $self->_emit (focus_out => $focus); 442 $self->update;
445 443
446 $focus->update if $focus; #?
447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 444 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449 unless $FOCUS; 445 unless $FOCUS;
450}
451 446
447 0
448}
449
450sub grab_focus {
451 my ($self) = @_;
452
453 $FOCUS->emit ("focus_out") if $FOCUS;
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
542 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
543 540
544 # update screen rectangle 541 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x}; 542 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y}; 543 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549 544
550 # skip widgets that are entirely outside the drawing area 545 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553 548
593 588
594sub DESTROY { 589sub DESTROY {
595 my ($self) = @_; 590 my ($self) = @_;
596 591
597 delete $WIDGET{$self+0}; 592 delete $WIDGET{$self+0};
598 #$self->deactivate; 593
594 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
599} 596}
600 597
601############################################################################# 598#############################################################################
602 599
603package CFClient::UI::DrawBG; 600package CFClient::UI::DrawBG;
768} 765}
769 766
770sub add { 767sub add {
771 my ($self, $child) = @_; 768 my ($self, $child) = @_;
772 769
773 $self->{children} = []; 770 $self->SUPER::remove ($_) for @{ $self->{children} };
774
775 $self->SUPER::add ($child); 771 $self->SUPER::add ($child);
776} 772}
777 773
778sub remove { 774sub remove {
779 my ($self, $widget) = @_; 775 my ($self, $widget) = @_;
788 784
789sub size_request { 785sub size_request {
790 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
791} 787}
792 788
793sub size_allocate { 789sub invoke_size_allocate {
794 my ($self, $w, $h) = @_; 790 my ($self, $w, $h) = @_;
795 791
796 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
797} 795}
798 796
799############################################################################# 797#############################################################################
800 798
801# back-buffered drawing area 799# back-buffered drawing area
817 815
818 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
819 $self->SUPER::update; 817 $self->SUPER::update;
820} 818}
821 819
822sub size_allocate { 820sub invoke_size_allocate {
823 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
824 822
825 $self->SUPER::size_allocate ($w, $h);
826 $self->update; 823 $self->update;
824
825 $self->SUPER::invoke_size_allocate ($w, $h)
827} 826}
828 827
829sub _render { 828sub _render {
830 my ($self) = @_; 829 my ($self) = @_;
831 830
892 $h = 10 if $self->{scroll_y}; 891 $h = 10 if $self->{scroll_y};
893 892
894 ($w, $h) 893 ($w, $h)
895} 894}
896 895
897sub size_allocate { 896sub invoke_size_allocate {
898 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
899 898
900 my $child = $self->child; 899 my $child = $self->child;
901 900
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904 903
905 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
906 $self->update; 905 $self->update;
906
907 1
907} 908}
908 909
909sub set_offset { 910sub set_offset {
910 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
911 912
985 $self->add ($child) if $child; 986 $self->add ($child) if $child;
986 987
987 $self 988 $self
988} 989}
989 990
991#TODO# update range on size_allocate depending on child
992
990sub add { 993sub add {
991 my ($self, $widget) = @_; 994 my ($self, $widget) = @_;
992 995
993 $self->{vp}->add ($self->{child} = $widget); 996 $self->{vp}->add ($self->{child} = $widget);
994} 997}
995 998
999sub update_slider {
1000 my ($self) = @_;
1001
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003}
1004
996sub update { 1005sub update {
997 my ($self) = @_; 1006 my ($self) = @_;
998 1007
999 $self->SUPER::update; 1008 $self->SUPER::update;
1000 1009
1001 # todo: overwrite size_allocate of child 1010 $self->update_slider;
1002 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004} 1011}
1005 1012
1006sub size_allocate { 1013sub invoke_size_allocate {
1007 my ($self, $w, $h) = @_; 1014 my ($self, $w, $h) = @_;
1008 1015
1016 $self->update_slider;
1017
1009 $self->SUPER::size_allocate ($w, $h); 1018 $self->SUPER::invoke_size_allocate ($w, $h)
1010
1011 my $child = $self->{vp}->child;
1012 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1013} 1019}
1014
1015#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll
1017 1020
1018############################################################################# 1021#############################################################################
1019 1022
1020package CFClient::UI::Frame; 1023package CFClient::UI::Frame;
1021 1024
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->emit ("delete") };
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;
1151
1152 $self->child->configure ($border, $border, $w, $h);
1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
1160sub invoke_delete {
1161 my ($self) = @_;
1162
1163 $self->hide;
1137 1164
1138 $self->child->configure ($border, $border, $w, $h); 1165 1
1139} 1166}
1140 1167
1141sub button_down { 1168sub invoke_button_down {
1142 my ($self, $ev, $x, $y) = @_; 1169 my ($self, $ev, $x, $y) = @_;
1143 1170
1144 my ($w, $h) = @$self{qw(w h)}; 1171 my ($w, $h) = @$self{qw(w h)};
1145 my $border = $self->border; 1172 my $border = $self->border;
1146 1173
1177 1204
1178 ($x, $y) = ($ev->{x}, $ev->{y}); 1205 ($x, $y) = ($ev->{x}, $ev->{y});
1179 1206
1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1207 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement 1208 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1209 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183 }; 1210 };
1184 } else { 1211 } else {
1185 return 0; 1212 return 0;
1186 } 1213 }
1187 1214
1188 1 1215 1
1189} 1216}
1190 1217
1191sub button_up { 1218sub invoke_button_up {
1192 my ($self, $ev, $x, $y) = @_; 1219 my ($self, $ev, $x, $y) = @_;
1193 1220
1194 !!delete $self->{motion} 1221 ! ! delete $self->{motion}
1195} 1222}
1196 1223
1197sub mouse_motion { 1224sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_; 1225 my ($self, $ev, $x, $y) = @_;
1199 1226
1200 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1227 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201 1228
1202 !!$self->{motion} 1229 ! ! $self->{motion}
1203} 1230}
1204 1231
1205sub _draw { 1232sub _draw {
1206 my ($self) = @_; 1233 my ($self) = @_;
1207 1234
1233 1260
1234 glDisable GL_TEXTURE_2D; 1261 glDisable GL_TEXTURE_2D;
1235 1262
1236 $child->draw; 1263 $child->draw;
1237 1264
1238 if ($self->{title}) { 1265 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1266 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1267 $self->{title_widget}->_draw;
1268
1269 glTranslate 0, - ($border - $self->{h});
1241 } 1270 }
1271
1272 $self->{close_button}->draw
1273 if $self->{close_button};
1242} 1274}
1243 1275
1244############################################################################# 1276#############################################################################
1245 1277
1246package CFClient::UI::Table; 1278package CFClient::UI::Table;
1269 1301
1270 $child->set_parent ($self); 1302 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child; 1303 $self->{children}[$y][$x] = $child;
1272 1304
1273 $self->realloc; 1305 $self->realloc;
1306}
1307
1308sub remove {
1309 my ($self, $child) = @_;
1310
1311 # TODO: not yet implemented
1274} 1312}
1275 1313
1276# TODO: move to container class maybe? send children a signal on removal? 1314# TODO: move to container class maybe? send children a signal on removal?
1277sub clear { 1315sub clear {
1278 my ($self) = @_; 1316 my ($self) = @_;
1319 (sum @$ws), 1357 (sum @$ws),
1320 (sum @$hs), 1358 (sum @$hs),
1321 ) 1359 )
1322} 1360}
1323 1361
1324sub size_allocate { 1362sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1363 my ($self, $w, $h) = @_;
1326 1364
1327 my ($ws, $hs) = $self->get_wh; 1365 my ($ws, $hs) = $self->get_wh;
1328 1366
1329 my $req_w = (sum @$ws) || 1; 1367 my $req_w = (sum @$ws) || 1;
1361 } 1399 }
1362 1400
1363 $y += $row_h; 1401 $y += $row_h;
1364 } 1402 }
1365 1403
1404 1
1366} 1405}
1367 1406
1368sub find_widget { 1407sub find_widget {
1369 my ($self, $x, $y) = @_; 1408 my ($self, $x, $y) = @_;
1370 1409
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1446 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1447 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 ) 1448 )
1410} 1449}
1411 1450
1412sub size_allocate { 1451sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1452 my ($self, $w, $h) = @_;
1414 1453
1415 my $space = $self->{vertical} ? $h : $w; 1454 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1455 my @children = $self->visible_children;
1417 1456
1418 my @req; 1457 my @req;
1419 1458
1420 if ($self->{homogeneous}) { 1459 if ($self->{homogeneous}) {
1421 @req = ($space / (@$children || 1)) x @$children; 1460 @req = ($space / (@children || 1)) x @children;
1422 } else { 1461 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1462 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424 my $req = List::Util::sum @req; 1463 my $req = List::Util::sum @req;
1425 1464
1426 if ($req > $space) { 1465 if ($req > $space) {
1427 # ah well, not enough space 1466 # ah well, not enough space
1428 $_ *= $space / $req for @req; 1467 $_ *= $space / $req for @req;
1429 } else { 1468 } else {
1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1469 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431 1470
1432 $space = ($space - $req) / $expand; # remaining space to give away 1471 $space = ($space - $req) / $expand; # remaining space to give away
1433 1472
1434 $req[$_] += $space * $children->[$_]{expand} 1473 $req[$_] += $space * $children[$_]{expand}
1435 for 0 .. $#$children; 1474 for 0 .. $#children;
1436 } 1475 }
1437 } 1476 }
1438 1477
1439 CFClient::UI::harmonize \@req; 1478 CFClient::UI::harmonize \@req;
1440 1479
1441 my $pos = 0; 1480 my $pos = 0;
1442 for (0 .. $#$children) { 1481 for (0 .. $#children) {
1443 my $alloc = $req[$_]; 1482 my $alloc = $req[$_];
1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1483 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445 1484
1446 $pos += $alloc; 1485 $pos += $alloc;
1447 } 1486 }
1448 1487
1449 1 1488 1
1497 #font => default_font 1536 #font => default_font
1498 #text => initial text 1537 #text => initial text
1499 #markup => initial narkup 1538 #markup => initial narkup
1500 #max_w => maximum pixel width 1539 #max_w => maximum pixel width
1501 ellipsise => 3, # end 1540 ellipsise => 3, # end
1502 layout => (new CFClient::Layout), 1541 layout => (new CFClient::Layout 2),
1503 fontsize => 1, 1542 fontsize => 1,
1504 align => -1, 1543 align => -1,
1505 valign => -1, 1544 valign => -1,
1506 padding_x => 2, 1545 padding_x => 2,
1507 padding_y => 2, 1546 padding_y => 2,
1508 can_events => 0, 1547 can_events => 0,
1509 %arg 1548 %arg
1510 ); 1549 );
1511 1550
1512 if (exists $self->{template}) { 1551 if (exists $self->{template}) {
1513 my $layout = new CFClient::Layout; 1552 my $layout = new CFClient::Layout 2;
1514 $layout->set_text (delete $self->{template}); 1553 $layout->set_text (delete $self->{template});
1515 $self->{template} = $layout; 1554 $self->{template} = $layout;
1516 } 1555 }
1517 1556
1518 if (exists $self->{markup}) { 1557 if (exists $self->{markup}) {
1552 my ($self, $text) = @_; 1591 my ($self, $text) = @_;
1553 1592
1554 return if $self->{text} eq "T$text"; 1593 return if $self->{text} eq "T$text";
1555 $self->{text} = "T$text"; 1594 $self->{text} = "T$text";
1556 1595
1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558 $self->{layout}->set_text ($text); 1596 $self->{layout}->set_text ($text);
1559 1597
1560 delete $self->{size_req}; 1598 delete $self->{size_req};
1561 $self->realloc; 1599 $self->realloc;
1562 $self->update; 1600 $self->update;
1568 return if $self->{text} eq "M$markup"; 1606 return if $self->{text} eq "M$markup";
1569 $self->{text} = "M$markup"; 1607 $self->{text} = "M$markup";
1570 1608
1571 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1609 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572 1610
1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1574 $self->{layout}->set_markup ($markup); 1611 $self->{layout}->set_markup ($markup);
1575 1612
1576 delete $self->{size_req}; 1613 delete $self->{size_req};
1577 $self->realloc; 1614 $self->realloc;
1578 $self->update; 1615 $self->update;
1604 }; 1641 };
1605 1642
1606 @{ $self->{size_req} } 1643 @{ $self->{size_req} }
1607} 1644}
1608 1645
1646sub baseline_shift {
1647 $_[0]{layout}->descent
1648}
1649
1609sub size_allocate { 1650sub invoke_size_allocate {
1610 my ($self, $w, $h) = @_; 1651 my ($self, $w, $h) = @_;
1611 1652
1612 delete $self->{ox}; 1653 delete $self->{ox};
1613 1654
1614 delete $self->{texture} 1655 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1656 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1657
1658 1
1616} 1659}
1617 1660
1618sub set_fontsize { 1661sub set_fontsize {
1619 my ($self, $fontsize) = @_; 1662 my ($self, $fontsize) = @_;
1620 1663
1621 $self->{fontsize} = $fontsize; 1664 $self->{fontsize} = $fontsize;
1665 delete $self->{size_req};
1622 delete $self->{texture}; 1666 delete $self->{texture};
1623 1667
1624 $self->realloc; 1668 $self->realloc;
1625} 1669}
1626 1670
1627sub reconfigure { 1671sub reconfigure {
1628 my ($self) = @_; 1672 my ($self) = @_;
1629 1673
1630 delete $self->{size_req}; 1674 delete $self->{size_req};
1675 delete $self->{texture};
1631 1676
1632 $self->SUPER::reconfigure; 1677 $self->SUPER::reconfigure;
1633} 1678}
1634 1679
1635sub _draw { 1680sub _draw {
1636 my ($self) = @_; 1681 my ($self) = @_;
1637 1682
1638 $self->SUPER::_draw; # draw background, if applicable 1683 $self->SUPER::_draw; # draw background, if applicable
1639 1684
1640 my $tex = $self->{texture} ||= do { 1685 my $size = $self->{texture} ||= do {
1641 $self->{layout}->set_foreground (@{$self->{fg}}); 1686 $self->{layout}->set_foreground (@{$self->{fg}});
1642 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1687 $self->{layout}->set_font ($self->{font}) if $self->{font};
1643 $self->{layout}->set_width ($self->{w}); 1688 $self->{layout}->set_width ($self->{w});
1644 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1689 $self->{layout}->set_ellipsise ($self->{ellipsise});
1645 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1690 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1646 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1691 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1647 1692
1648 new_from_layout CFClient::Texture $self->{layout} 1693 $self->{size_req}
1649 }; 1694 };
1650 1695
1651 unless (exists $self->{ox}) { 1696 unless (exists $self->{ox}) {
1652 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1697 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1653 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1698 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1654 : ($self->{w} - $tex->{w}) * 0.5); 1699 : ($self->{w} - $size->[0]) * 0.5);
1655 1700
1656 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1701 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1702 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1658 : ($self->{h} - $tex->{h}) * 0.5); 1703 : ($self->{h} - $size->[1]) * 0.5);
1659 }; 1704 };
1660 1705
1661 glEnable GL_TEXTURE_2D;
1662
1663 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1706 my $w = List::Util::min $self->{w} + 4, $size->[0];
1664 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1707 my $h = List::Util::min $self->{h} + 2, $size->[1];
1665 1708
1666 if ($tex->{format} == GL_ALPHA) { 1709 $self->{layout}->render ($self->{ox}, $self->{oy});
1667 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1668 glColor @{$self->{fg}};
1669 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1670 } else {
1671 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1672 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1673 }
1674
1675 glDisable GL_TEXTURE_2D;
1676} 1710}
1677 1711
1678############################################################################# 1712#############################################################################
1679 1713
1680package CFClient::UI::EntryBase; 1714package CFClient::UI::EntryBase;
1713 1747
1714 $text =~ s/./*/g if $self->{hidden}; 1748 $text =~ s/./*/g if $self->{hidden};
1715 $self->{layout}->set_text ("$text "); 1749 $self->{layout}->set_text ("$text ");
1716 delete $self->{size_req}; 1750 delete $self->{size_req};
1717 1751
1718 $self->_emit (changed => $self->{text}); 1752 $self->emit (changed => $self->{text});
1719 1753
1720 $self->realloc; 1754 $self->realloc;
1721 $self->update; 1755 $self->update;
1722} 1756}
1723 1757
1738 my ($w, $h) = $self->SUPER::size_request; 1772 my ($w, $h) = $self->SUPER::size_request;
1739 1773
1740 ($w + 1, $h) # add 1 for cursor 1774 ($w + 1, $h) # add 1 for cursor
1741} 1775}
1742 1776
1743sub key_down { 1777sub invoke_key_down {
1744 my ($self, $ev) = @_; 1778 my ($self, $ev) = @_;
1745 1779
1746 my $mod = $ev->{mod}; 1780 my $mod = $ev->{mod};
1747 my $sym = $ev->{sym}; 1781 my $sym = $ev->{sym};
1748 my $uni = $ev->{unicode}; 1782 my $uni = $ev->{unicode};
1760 } elsif ($sym == CFClient::SDLK_HOME) { 1794 } elsif ($sym == CFClient::SDLK_HOME) {
1761 $self->{cursor} = 0; 1795 $self->{cursor} = 0;
1762 } elsif ($sym == CFClient::SDLK_END) { 1796 } elsif ($sym == CFClient::SDLK_END) {
1763 $self->{cursor} = length $text; 1797 $self->{cursor} = length $text;
1764 } elsif ($uni == 27) { 1798 } elsif ($uni == 27) {
1765 $self->_emit ('escape'); 1799 $self->emit ('escape');
1766 } elsif ($uni) { 1800 } elsif ($uni) {
1767 substr $text, $self->{cursor}++, 0, chr $uni; 1801 substr $text, $self->{cursor}++, 0, chr $uni;
1768 } else { 1802 } else {
1769 return 0; 1803 return 0;
1770 } 1804 }
1774 $self->realloc; 1808 $self->realloc;
1775 1809
1776 1 1810 1
1777} 1811}
1778 1812
1779sub focus_in { 1813sub invoke_focus_in {
1780 my ($self) = @_; 1814 my ($self) = @_;
1781 1815
1782 $self->{last_activity} = $::NOW; 1816 $self->{last_activity} = $::NOW;
1783 1817
1784 $self->SUPER::focus_in; 1818 $self->SUPER::invoke_focus_in
1785} 1819}
1786 1820
1787sub button_down { 1821sub invoke_button_down {
1788 my ($self, $ev, $x, $y) = @_; 1822 my ($self, $ev, $x, $y) = @_;
1789 1823
1790 $self->SUPER::button_down ($ev, $x, $y); 1824 $self->SUPER::invoke_button_down ($ev, $x, $y);
1791 1825
1792 my $idx = $self->{layout}->xy_to_index ($x, $y); 1826 my $idx = $self->{layout}->xy_to_index ($x, $y);
1793 1827
1794 # byte-index to char-index 1828 # byte-index to char-index
1795 my $text = $self->{text}; 1829 my $text = $self->{text};
1800 $self->update; 1834 $self->update;
1801 1835
1802 1 1836 1
1803} 1837}
1804 1838
1805sub mouse_motion { 1839sub invoke_mouse_motion {
1806 my ($self, $ev, $x, $y) = @_; 1840 my ($self, $ev, $x, $y) = @_;
1807# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1841# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1808 1842
1809 0 1843 1
1810} 1844}
1811 1845
1812sub _draw { 1846sub _draw {
1813 my ($self) = @_; 1847 my ($self) = @_;
1814 1848
1855 1889
1856our @ISA = CFClient::UI::EntryBase::; 1890our @ISA = CFClient::UI::EntryBase::;
1857 1891
1858use CFClient::OpenGL; 1892use CFClient::OpenGL;
1859 1893
1860sub key_down { 1894sub invoke_key_down {
1861 my ($self, $ev) = @_; 1895 my ($self, $ev) = @_;
1862 1896
1863 my $sym = $ev->{sym}; 1897 my $sym = $ev->{sym};
1864 1898
1865 if ($sym == 13) { 1899 if ($sym == 13) {
1866 unshift @{$self->{history}}, 1900 unshift @{$self->{history}},
1867 my $txt = $self->get_text; 1901 my $txt = $self->get_text;
1902
1868 $self->{history_pointer} = -1; 1903 $self->{history_pointer} = -1;
1869 $self->{history_saveback} = ''; 1904 $self->{history_saveback} = '';
1870 $self->_emit (activate => $txt); 1905 $self->emit (activate => $txt);
1871 $self->update; 1906 $self->update;
1872 1907
1873 } elsif ($sym == CFClient::SDLK_UP) { 1908 } elsif ($sym == CFClient::SDLK_UP) {
1874 if ($self->{history_pointer} < 0) { 1909 if ($self->{history_pointer} < 0) {
1875 $self->{history_saveback} = $self->get_text; 1910 $self->{history_saveback} = $self->get_text;
1891 } else { 1926 } else {
1892 $self->set_text ($self->{history_saveback}); 1927 $self->set_text ($self->{history_saveback});
1893 } 1928 }
1894 1929
1895 } else { 1930 } else {
1896 return $self->SUPER::key_down ($ev) 1931 return $self->SUPER::invoke_key_down ($ev)
1897 } 1932 }
1898 1933
1899 1 1934 1
1900} 1935}
1901 1936
1925 can_events => 1, 1960 can_events => 1,
1926 @_ 1961 @_
1927 ) 1962 )
1928} 1963}
1929 1964
1930sub activate { }
1931
1932sub button_up { 1965sub invoke_button_up {
1933 my ($self, $ev, $x, $y) = @_; 1966 my ($self, $ev, $x, $y) = @_;
1934 1967
1935 $self->emit ("activate") 1968 $self->emit ("activate")
1936 if $x >= 0 && $x < $self->{w} 1969 if $x >= 0 && $x < $self->{w}
1937 && $y >= 0 && $y < $self->{h}; 1970 && $y >= 0 && $y < $self->{h};
1951 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1984 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1952 1985
1953 glDisable GL_TEXTURE_2D; 1986 glDisable GL_TEXTURE_2D;
1954 1987
1955 $self->SUPER::_draw; 1988 $self->SUPER::_draw;
1989}
1990
1991#############################################################################
1992
1993package CFClient::UI::ImageButton;
1994
1995our @ISA = CFClient::UI::Image::;
1996
1997use CFClient::OpenGL;
1998
1999my %textures;
2000
2001sub new {
2002 my $class = shift;
2003
2004 my $self = $class->SUPER::new (
2005 padding_x => 4,
2006 padding_y => 4,
2007 fg => [1, 1, 1],
2008 active_fg => [0, 0, 1],
2009 can_hover => 1,
2010 align => 0,
2011 valign => 0,
2012 can_events => 1,
2013 @_
2014 );
2015}
2016
2017sub invoke_button_up {
2018 my ($self, $ev, $x, $y) = @_;
2019
2020 $self->emit ("activate")
2021 if $x >= 0 && $x < $self->{w}
2022 && $y >= 0 && $y < $self->{h};
2023
2024 1
1956} 2025}
1957 2026
1958############################################################################# 2027#############################################################################
1959 2028
1960package CFClient::UI::CheckBox; 2029package CFClient::UI::CheckBox;
1987 my ($self) = @_; 2056 my ($self) = @_;
1988 2057
1989 (6) x 2 2058 (6) x 2
1990} 2059}
1991 2060
2061sub toggle {
2062 my ($self) = @_;
2063
2064 $self->{state} = !$self->{state};
2065 $self->emit (changed => $self->{state});
2066 $self->update;
2067}
2068
1992sub button_down { 2069sub invoke_button_down {
1993 my ($self, $ev, $x, $y) = @_; 2070 my ($self, $ev, $x, $y) = @_;
1994 2071
1995 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2072 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1996 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2073 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1997 $self->{state} = !$self->{state}; 2074 $self->toggle;
1998 $self->_emit (changed => $self->{state});
1999 } else { 2075 } else {
2000 return 0 2076 return 0
2001 } 2077 }
2002 2078
2003 1 2079 1
2028package CFClient::UI::Image; 2104package CFClient::UI::Image;
2029 2105
2030our @ISA = CFClient::UI::Base::; 2106our @ISA = CFClient::UI::Base::;
2031 2107
2032use CFClient::OpenGL; 2108use CFClient::OpenGL;
2033use Carp qw/confess/;
2034 2109
2035our %loaded_images; 2110our %texture_cache;
2036 2111
2037sub new { 2112sub new {
2038 my $class = shift; 2113 my $class = shift;
2039 2114
2040 my $self = $class->SUPER::new (can_events => 0, @_); 2115 my $self = $class->SUPER::new (
2116 can_events => 0,
2117 @_,
2118 );
2041 2119
2042 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2120 $self->{path}
2121 or Carp::croak "required attribute 'path' not set";
2043 2122
2044 $loaded_images{$self->{image}} ||= 2123 $self->{tex} = $texture_cache{$self->{path}} ||=
2045 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2124 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2046 2125
2047 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2126 Scalar::Util::weaken $texture_cache{$self->{path}};
2048 2127
2049 Scalar::Util::weaken $loaded_images{$self->{image}}; 2128 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2050
2051 $self->{aspect} = $tex->{w} / $tex->{h};
2052 2129
2053 $self 2130 $self
2054} 2131}
2055 2132
2056sub size_request { 2133sub size_request {
2057 my ($self) = @_; 2134 my ($self) = @_;
2058 2135
2059 ($self->{tex}->{w}, $self->{tex}->{h}) 2136 ($self->{tex}{w}, $self->{tex}{h})
2060} 2137}
2061 2138
2062sub _draw { 2139sub _draw {
2063 my ($self) = @_; 2140 my ($self) = @_;
2064 2141
2173 my $ycut1 = max 0, min 1, $ycut; 2250 my $ycut1 = max 0, min 1, $ycut;
2174 my $ycut2 = max 0, min 1, $ycut - 1; 2251 my $ycut2 = max 0, min 1, $ycut - 1;
2175 2252
2176 my $h1 = $self->{h} * (1 - $ycut1); 2253 my $h1 = $self->{h} * (1 - $ycut1);
2177 my $h2 = $self->{h} * (1 - $ycut2); 2254 my $h2 = $self->{h} * (1 - $ycut2);
2255 my $h3 = $self->{h};
2256
2257 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2178 2258
2179 glEnable GL_BLEND; 2259 glEnable GL_BLEND;
2180 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2260 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2181 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2261 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2182 glEnable GL_TEXTURE_2D; 2262 glEnable GL_TEXTURE_2D;
2201 2281
2202 if ($t3) { 2282 if ($t3) {
2203 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2283 glBindTexture GL_TEXTURE_2D, $t3->{name};
2204 glBegin GL_QUADS; 2284 glBegin GL_QUADS;
2205 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2285 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2206 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2286 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2207 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2287 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2208 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2288 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2209 glEnd; 2289 glEnd;
2210 } 2290 }
2211 2291
2212 glDisable GL_BLEND; 2292 glDisable GL_BLEND;
2300 $self->update; 2380 $self->update;
2301 2381
2302 $self 2382 $self
2303} 2383}
2304 2384
2305sub changed { }
2306
2307sub set_range { 2385sub set_range {
2308 my ($self, $range) = @_; 2386 my ($self, $range) = @_;
2309 2387
2310 ($range, $self->{range}) = ($self->{range}, $range); 2388 ($range, $self->{range}) = ($self->{range}, $range);
2311 2389
2312 $self->update
2313 if "@$range" ne "@{$self->{range}}"; 2390 if ("@$range" ne "@{$self->{range}}") {
2391 $self->update;
2392 $self->set_value ($self->{range}[0]);
2393 }
2314} 2394}
2315 2395
2316sub set_value { 2396sub set_value {
2317 my ($self, $value) = @_; 2397 my ($self, $value) = @_;
2318 2398
2329 if $unit; 2409 if $unit;
2330 2410
2331 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2411 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2332 2412
2333 if ($value != $old_value) { 2413 if ($value != $old_value) {
2334 $self->_emit (changed => $value); 2414 $self->emit (changed => $value);
2335 $self->update; 2415 $self->update;
2336 } 2416 }
2337} 2417}
2338 2418
2339sub size_request { 2419sub size_request {
2340 my ($self) = @_; 2420 my ($self) = @_;
2341 2421
2342 ($self->{req_w}, $self->{req_h}) 2422 ($self->{req_w}, $self->{req_h})
2343} 2423}
2344 2424
2345sub button_down { 2425sub invoke_button_down {
2346 my ($self, $ev, $x, $y) = @_; 2426 my ($self, $ev, $x, $y) = @_;
2347 2427
2348 $self->SUPER::button_down ($ev, $x, $y); 2428 $self->SUPER::invoke_button_down ($ev, $x, $y);
2349 2429
2350 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2430 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2351 2431
2352 $self->mouse_motion ($ev, $x, $y) 2432 $self->invoke_mouse_motion ($ev, $x, $y)
2353} 2433}
2354 2434
2355sub mouse_motion { 2435sub invoke_mouse_motion {
2356 my ($self, $ev, $x, $y) = @_; 2436 my ($self, $ev, $x, $y) = @_;
2357 2437
2358 if ($GRAB == $self) { 2438 if ($GRAB == $self) {
2359 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2439 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2360 2440
2465sub set_range { shift->{slider}->set_range (@_) } 2545sub set_range { shift->{slider}->set_range (@_) }
2466sub set_value { shift->{slider}->set_value (@_) } 2546sub set_value { shift->{slider}->set_value (@_) }
2467 2547
2468############################################################################# 2548#############################################################################
2469 2549
2470package CFClient::UI::TextView; 2550package CFClient::UI::TextScroller;
2471 2551
2472our @ISA = CFClient::UI::HBox::; 2552our @ISA = CFClient::UI::HBox::;
2473 2553
2474use CFClient::OpenGL; 2554use CFClient::OpenGL;
2475 2555
2481 can_events => 0, 2561 can_events => 0,
2482 indent => 0, 2562 indent => 0,
2483 #font => default_font 2563 #font => default_font
2484 @_, 2564 @_,
2485 2565
2486 layout => (new CFClient::Layout 1), 2566 layout => (new CFClient::Layout 2),
2487 par => [], 2567 par => [],
2488 height => 0, 2568 height => 0,
2489 children => [ 2569 children => [
2490 (new CFClient::UI::Empty expand => 1), 2570 (new CFClient::UI::Empty expand => 1),
2491 (new CFClient::UI::Slider vertical => 1), 2571 (new CFClient::UI::Slider vertical => 1),
2502 2582
2503 $self->{fontsize} = $fontsize; 2583 $self->{fontsize} = $fontsize;
2504 $self->reflow; 2584 $self->reflow;
2505} 2585}
2506 2586
2587sub size_request {
2588 my ($self) = @_;
2589
2590 my ($empty, $slider) = @{ $self->{children} };
2591
2592 local $self->{children} = [$empty, $slider];
2593 $self->SUPER::size_request
2594}
2595
2507sub size_allocate { 2596sub invoke_size_allocate {
2508 my ($self, $w, $h) = @_; 2597 my ($self, $w, $h) = @_;
2509 2598
2510 $self->SUPER::size_allocate ($w, $h); 2599 my ($empty, $slider, @other) = @{ $self->{children} };
2600 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2511 2601
2512 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2602 $self->{layout}->set_font ($self->{font}) if $self->{font};
2513 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2603 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2514 $self->{layout}->set_width ($self->{children}[0]{w}); 2604 $self->{layout}->set_width ($empty->{w});
2515 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2605 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2516 2606
2517 $self->reflow; 2607 $self->reflow;
2518}
2519 2608
2520sub text_size { 2609 local $self->{children} = [$empty, $slider];
2521 my ($self, $text, $indent) = @_; 2610 $self->SUPER::invoke_size_allocate ($w, $h)
2611}
2612
2613sub get_layout {
2614 my ($self, $para) = @_;
2522 2615
2523 my $layout = $self->{layout}; 2616 my $layout = $self->{layout};
2524 2617
2618 $layout->set_font ($self->{font}) if $self->{font};
2619 $layout->set_foreground (@{$para->{fg}});
2525 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2620 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2526 $layout->set_width ($self->{children}[0]{w} - $indent); 2621 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2527 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2622 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2528 $layout->set_markup ($text); 2623 $layout->set_markup ($para->{markup});
2624
2625 $layout->set_shapes (
2626 map
2627 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2628 @{$para->{widget}}
2529 2629 );
2630
2530 $layout->size 2631 $layout
2531} 2632}
2532 2633
2533sub reflow { 2634sub reflow {
2534 my ($self) = @_; 2635 my ($self) = @_;
2535 2636
2544 $self->{children}[1]->set_value ($offset); 2645 $self->{children}[1]->set_value ($offset);
2545} 2646}
2546 2647
2547sub clear { 2648sub clear {
2548 my ($self) = @_; 2649 my ($self) = @_;
2650
2651 my (undef, undef, @other) = @{ $self->{children} };
2652 $self->remove ($_) for @other;
2549 2653
2550 $self->{par} = []; 2654 $self->{par} = [];
2551 $self->{height} = 0; 2655 $self->{height} = 0;
2552 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2656 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2553} 2657}
2554 2658
2555sub add_paragraph { 2659sub add_paragraph {
2556 my ($self, $color, $text, $indent) = @_; 2660 my ($self, $color, $para, $indent) = @_;
2557 2661
2558 for my $line (split /\n/, $text) { 2662 my ($text, @w) = ref $para ? @$para : $para;
2559 my ($w, $h) = $self->text_size ($line); 2663
2560 $self->{height} += $h; 2664 $para = {
2561 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2665 w => 1e10,
2666 wrapped => 1,
2667 fg => $color,
2668 indent => $indent,
2669 markup => $text,
2670 widget => \@w,
2562 } 2671 };
2563 2672
2564 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2673 $self->add (@w) if @w;
2674 push @{$self->{par}}, $para;
2675
2676 $self->{need_reflow}++;
2677 $self->update;
2678}
2679
2680sub scroll_to_bottom {
2681 my ($self) = @_;
2682
2683 $self->{scroll_to_bottom} = 1;
2684 $self->update;
2565} 2685}
2566 2686
2567sub update { 2687sub update {
2568 my ($self) = @_; 2688 my ($self) = @_;
2569 2689
2571 2691
2572 return unless $self->{h} > 0; 2692 return unless $self->{h} > 0;
2573 2693
2574 delete $self->{texture}; 2694 delete $self->{texture};
2575 2695
2576 $ROOT->on_post_alloc ($self, sub { 2696 $ROOT->on_post_alloc ($self => sub {
2577 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2697 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2578 2698
2579 if (delete $self->{need_reflow}) { 2699 if (delete $self->{need_reflow}) {
2580 my $height = 0; 2700 my $height = 0;
2581 2701
2582 my $layout = $self->{layout};
2583
2584 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2585
2586 for (@{$self->{par}}) { 2702 for my $para (@{$self->{par}}) {
2587 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2703 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2588 $layout->set_width ($W - $_->[3]); 2704 my $layout = $self->get_layout ($para);
2589 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2590 $layout->set_markup ($_->[4]);
2591 my ($w, $h) = $layout->size; 2705 my ($w, $h) = $layout->size;
2592 $_->[0] = $w + $_->[3]; 2706
2593 $_->[1] = $h; 2707 $para->{w} = $w + $para->{indent};
2708 $para->{h} = $h;
2709 $para->{wrapped} = $layout->has_wrapped;
2594 } 2710 }
2595 2711
2596 $height += $_->[1]; 2712 $height += $para->{h};
2597 } 2713 }
2598 2714
2599 $self->{height} = $height; 2715 $self->{height} = $height;
2600 2716
2601 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2717 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2602 2718
2603 delete $self->{texture}; 2719 delete $self->{texture};
2720 }
2721
2722 if (delete $self->{scroll_to_bottom}) {
2723 $self->{children}[1]->set_value (1e10);
2604 } 2724 }
2605 2725
2606 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2726 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2607 glClearColor 0, 0, 0, 0; 2727 glClearColor 0, 0, 0, 0;
2608 glClear GL_COLOR_BUFFER_BIT; 2728 glClear GL_COLOR_BUFFER_BIT;
2612 my $y0 = $top; 2732 my $y0 = $top;
2613 my $y1 = $top + $H; 2733 my $y1 = $top + $H;
2614 2734
2615 my $y = 0; 2735 my $y = 0;
2616 2736
2617 my $layout = $self->{layout};
2618
2619 $layout->set_font ($self->{font}) if $self->{font};
2620
2621 glEnable GL_BLEND;
2622 #TODO# not correct in windows where rgba is forced off
2623 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2624
2625 for my $par (@{$self->{par}}) { 2737 for my $para (@{$self->{par}}) {
2626 my $h = $par->[1]; 2738 my $h = $para->{h};
2627 2739
2628 if ($y0 < $y + $h && $y < $y1) { 2740 if ($y0 < $y + $h && $y < $y1) {
2629 $layout->set_foreground (@{ $par->[2] });
2630 $layout->set_width ($W - $par->[3]);
2631 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2632 $layout->set_markup ($par->[4]);
2633 2741
2634 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2742 my $layout = $self->get_layout ($para);
2635 2743
2636 glRasterPos $par->[3], $y - $y0; 2744 $layout->render ($para->{indent}, $y - $y0);
2637 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2745
2746 if (my @w = @{ $para->{widget} }) {
2747 my @s = $layout->get_shapes;
2748
2749 for (@w) {
2750 my ($dx, $dy) = splice @s, 0, 2, ();
2751
2752 $_->{x} = $dx + $para->{indent};
2753 $_->{y} = $dy + $y - $y0;
2754
2755 $_->draw;
2756 }
2757 }
2638 } 2758 }
2639 2759
2640 $y += $h; 2760 $y += $h;
2641 } 2761 }
2642
2643 glDisable GL_BLEND;
2644 }; 2762 };
2645 }); 2763 });
2764}
2765
2766sub reconfigure {
2767 my ($self) = @_;
2768
2769 $self->SUPER::reconfigure;
2770
2771 $_->{w} = 1e10 for @{ $self->{par} };
2772 $self->reflow;
2646} 2773}
2647 2774
2648sub _draw { 2775sub _draw {
2649 my ($self) = @_; 2776 my ($self) = @_;
2650 2777
2653 glColor 0, 0, 0, 1; 2780 glColor 0, 0, 0, 1;
2654 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2781 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2655 glDisable GL_TEXTURE_2D; 2782 glDisable GL_TEXTURE_2D;
2656 2783
2657 $self->{children}[1]->draw; 2784 $self->{children}[1]->draw;
2658
2659} 2785}
2660 2786
2661############################################################################# 2787#############################################################################
2662 2788
2663package CFClient::UI::Animator; 2789package CFClient::UI::Animator;
2750 $tooltip .= "\n\n" . (ref $widget) . "\n" 2876 $tooltip .= "\n\n" . (ref $widget) . "\n"
2751 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2877 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2752 . "req $widget->{req_w} $widget->{req_h}\n" 2878 . "req $widget->{req_w} $widget->{req_h}\n"
2753 . "visible $widget->{visible}"; 2879 . "visible $widget->{visible}";
2754 } 2880 }
2881
2882 $tooltip =~ s/^\n+//;
2883 $tooltip =~ s/\n+$//;
2755 2884
2756 $self->add (new CFClient::UI::Label 2885 $self->add (new CFClient::UI::Label
2757 markup => $tooltip, 2886 markup => $tooltip,
2758 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2887 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2759 fontsize => 0.8, 2888 fontsize => 0.8,
2769 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2898 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2770 2899
2771 ($w + 4, $h + 4) 2900 ($w + 4, $h + 4)
2772} 2901}
2773 2902
2774sub size_allocate { 2903sub invoke_size_allocate {
2775 my ($self, $w, $h) = @_; 2904 my ($self, $w, $h) = @_;
2776 2905
2777 $self->SUPER::size_allocate ($w - 4, $h - 4); 2906 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2778} 2907}
2779 2908
2780sub visibility_change { 2909sub invoke_visibility_change {
2781 my ($self, $visible) = @_; 2910 my ($self, $visible) = @_;
2782 2911
2783 return unless $visible; 2912 return unless $visible;
2784 2913
2785 $self->{root}->on_post_alloc ("move_$self" => sub { 2914 $self->{root}->on_post_alloc ("move_$self" => sub {
2787 or return; 2916 or return;
2788 2917
2789 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2918 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2790 2919
2791 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2920 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2792 if $x + $self->{w} > $::WIDTH; 2921 if $x + $self->{w} > $self->{root}{w};
2793 2922
2794 $self->move_abs ($x, $y); 2923 $self->move_abs ($x, $y);
2795 }); 2924 });
2796} 2925}
2797 2926
2892 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3021 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2893 glDisable GL_TEXTURE_2D; 3022 glDisable GL_TEXTURE_2D;
2894 } 3023 }
2895} 3024}
2896 3025
2897sub DESTROY { 3026sub destroy {
2898 my ($self) = @_; 3027 my ($self) = @_;
2899 3028
2900 $self->{timer}->cancel 3029 $self->{timer}->cancel
2901 if $self->{timer}; 3030 if $self->{timer};
2902 3031
2903 $self->SUPER::DESTROY; 3032 $self->SUPER::destroy;
2904} 3033}
2905 3034
2906############################################################################# 3035#############################################################################
2907 3036
2908package CFClient::UI::Buttonbar; 3037package CFClient::UI::Buttonbar;
2936 # handle various types of items, only text for now 3065 # handle various types of items, only text for now
2937 if (!ref $widget) { 3066 if (!ref $widget) {
2938 $widget = new CFClient::UI::Label 3067 $widget = new CFClient::UI::Label
2939 can_hover => 1, 3068 can_hover => 1,
2940 can_events => 1, 3069 can_events => 1,
2941 text => $widget, 3070 markup => $widget,
2942 tooltip => $tooltip 3071 tooltip => $tooltip
2943 } 3072 }
2944 3073
2945 $self->{item}{$widget} = $item; 3074 $self->{item}{$widget} = $item;
2946 3075
2952 3081
2953# popup given the event (must be a mouse button down event currently) 3082# popup given the event (must be a mouse button down event currently)
2954sub popup { 3083sub popup {
2955 my ($self, $ev) = @_; 3084 my ($self, $ev) = @_;
2956 3085
2957 $self->_emit ("popdown"); 3086 $self->emit ("popdown");
2958 3087
2959 # maybe save $GRAB? must be careful about events... 3088 # maybe save $GRAB? must be careful about events...
2960 $GRAB = $self; 3089 $GRAB = $self;
2961 $self->{button} = $ev->{button}; 3090 $self->{button} = $ev->{button};
2962 3091
2963 $self->show; 3092 $self->show;
2964 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3093 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2965} 3094}
2966 3095
2967sub mouse_motion { 3096sub invoke_mouse_motion {
2968 my ($self, $ev, $x, $y) = @_; 3097 my ($self, $ev, $x, $y) = @_;
2969 3098
2970 # TODO: should use vbox->find_widget or so 3099 # TODO: should use vbox->find_widget or so
2971 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3100 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2972 $self->{hover} = $self->{item}{$HOVER}; 3101 $self->{hover} = $self->{item}{$HOVER};
2973 3102
2974 0 3103 0
2975} 3104}
2976 3105
2977sub button_up { 3106sub invoke_button_up {
2978 my ($self, $ev, $x, $y) = @_; 3107 my ($self, $ev, $x, $y) = @_;
2979 3108
2980 if ($ev->{button} == $self->{button}) { 3109 if ($ev->{button} == $self->{button}) {
2981 undef $GRAB; 3110 undef $GRAB;
2982 $self->hide; 3111 $self->hide;
2983 3112
2984 $self->_emit ("popdown"); 3113 $self->emit ("popdown");
2985 $self->{hover}[1]->() if $self->{hover}; 3114 $self->{hover}[1]->() if $self->{hover};
2986 } else { 3115 } else {
2987 return 0 3116 return 0
2988 } 3117 }
2989 3118
3016 3145
3017 $self->{current} = $self->{children}[0] 3146 $self->{current} = $self->{children}[0]
3018 if @{ $self->{children} }; 3147 if @{ $self->{children} };
3019} 3148}
3020 3149
3150sub get_current_page {
3151 my ($self) = @_;
3152
3153 $self->{current}
3154}
3155
3021sub set_current_page { 3156sub set_current_page {
3022 my ($self, $page_or_widget) = @_; 3157 my ($self, $page_or_widget) = @_;
3023 3158
3024 my $widget = ref $page_or_widget 3159 my $widget = ref $page_or_widget
3025 ? $page_or_widget 3160 ? $page_or_widget
3026 : $self->{children}[$page_or_widget]; 3161 : $self->{children}[$page_or_widget];
3027 3162
3028 $self->{current} = $widget; 3163 $self->{current} = $widget;
3029 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3164 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3030 3165
3031 $self->_emit (page_changed => $self->{current}); 3166 $self->emit (page_changed => $self->{current});
3032 3167
3033 $self->realloc; 3168 $self->realloc;
3034} 3169}
3035 3170
3036sub visible_children { 3171sub visible_children {
3041 my ($self) = @_; 3176 my ($self) = @_;
3042 3177
3043 $self->{current}->size_request 3178 $self->{current}->size_request
3044} 3179}
3045 3180
3046sub size_allocate { 3181sub invoke_size_allocate {
3047 my ($self, $w, $h) = @_; 3182 my ($self, $w, $h) = @_;
3048 3183
3049 $self->{current}->configure (0, 0, $w, $h); 3184 $self->{current}->configure (0, 0, $w, $h);
3185
3186 1
3050} 3187}
3051 3188
3052sub _draw { 3189sub _draw {
3053 my ($self) = @_; 3190 my ($self) = @_;
3054 3191
3089 ); 3226 );
3090 3227
3091 $self->{multiplexer}->add ($widget); 3228 $self->{multiplexer}->add ($widget);
3092} 3229}
3093 3230
3231sub get_current_page {
3232 my ($self) = @_;
3233
3234 $self->{multiplexer}->get_current_page
3235}
3236
3094sub set_current_page { 3237sub set_current_page {
3095 my ($self, $page) = @_; 3238 my ($self, $page) = @_;
3096 3239
3097 $self->{multiplexer}->set_current_page ($page); 3240 $self->{multiplexer}->set_current_page ($page);
3098 $self->_emit (page_changed => $self->{multiplexer}{current}); 3241 $self->emit (page_changed => $self->{multiplexer}{current});
3099} 3242}
3100 3243
3101############################################################################# 3244#############################################################################
3102 3245
3103package CFClient::UI::Combobox; 3246package CFClient::UI::Combobox;
3108 3251
3109sub new { 3252sub new {
3110 my $class = shift; 3253 my $class = shift;
3111 3254
3112 my $self = $class->SUPER::new ( 3255 my $self = $class->SUPER::new (
3113 options => [], # [title, value, tooltip], ... 3256 options => [], # [value, title, longdesc], ...
3114 value => undef, 3257 value => undef,
3115 @_, 3258 @_,
3116 ); 3259 );
3117 3260
3118 $self->_set_value ($self->{value}); 3261 $self->_set_value ($self->{value});
3119 3262
3120 $self 3263 $self
3121} 3264}
3122 3265
3123sub button_down { 3266sub invoke_button_down {
3124 my ($self, $ev) = @_; 3267 my ($self, $ev) = @_;
3125 3268
3126 my @menu_items; 3269 my @menu_items;
3127 3270
3128 for (@{ $self->{options} }) { 3271 for (@{ $self->{options} }) {
3129 my ($title, $value, $tooltip) = @$_; 3272 my ($value, $title, $tooltip) = @$_;
3130 3273
3131 push @menu_items, [$tooltip, sub { $self->set_value ($value) }]; 3274 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3132 } 3275 }
3133 3276
3134 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3277 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3135} 3278}
3136 3279
3137sub _set_value { 3280sub _set_value {
3138 my ($self, $value) = @_; 3281 my ($self, $value) = @_;
3139 3282
3140 my ($item) = grep $_->[1] eq $value, @{ $self->{options} } 3283 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3141 or return; 3284 or return;
3142 3285
3143 $self->{value} = $item->[1]; 3286 $self->{value} = $item->[0];
3144 $self->set_markup ("$item->[0] ⇓"); 3287 $self->set_markup ("$item->[1] ⇓");
3145 $self->set_tooltip ($item->[2]); 3288 $self->set_tooltip ($item->[2]);
3146} 3289}
3147 3290
3148sub set_value { 3291sub set_value {
3149 my ($self, $value) = @_; 3292 my ($self, $value) = @_;
3150 3293
3151 return unless $self->{value} ne $value; 3294 return unless $self->{value} ne $value;
3152 3295
3153 $self->_set_value ($value); 3296 $self->_set_value ($value);
3154 $self->_emit (changed => $value); 3297 $self->emit (changed => $value);
3155} 3298}
3156 3299
3157############################################################################# 3300#############################################################################
3158 3301
3159package CFClient::UI::Statusbox; 3302package CFClient::UI::Statusbox;
3258 $item->{count}++; 3401 $item->{count}++;
3259 } else { 3402 } else {
3260 $item->{count} = 1; 3403 $item->{count} = 1;
3261 $item->{text} = $item->{tooltip} = $text; 3404 $item->{text} = $item->{tooltip} = $text;
3262 } 3405 }
3263 $item->{id} = ++$self->{id}; 3406 $item->{id} += 0.2;#d#
3264 $item->{timeout} = $timeout; 3407 $item->{timeout} = $timeout;
3265 delete $item->{label}; 3408 delete $item->{label};
3266 } else { 3409 } else {
3267 $self->{item}{$group} = { 3410 $self->{item}{$group} = {
3268 id => ++$self->{id}, 3411 id => ++$self->{id},
3274 count => 1, 3417 count => 1,
3275 %arg, 3418 %arg,
3276 }; 3419 };
3277 } 3420 }
3278 3421
3422 $ROOT->on_refresh (reorder => sub {
3279 $self->reorder; 3423 $self->reorder;
3424 });
3280} 3425}
3281 3426
3282sub reconfigure { 3427sub reconfigure {
3283 my ($self) = @_; 3428 my ($self) = @_;
3284 3429
3287 3432
3288 $self->reorder; 3433 $self->reorder;
3289 $self->SUPER::reconfigure; 3434 $self->SUPER::reconfigure;
3290} 3435}
3291 3436
3292sub DESTROY { 3437sub destroy {
3293 my ($self) = @_; 3438 my ($self) = @_;
3294 3439
3295 $self->{timer}->cancel; 3440 $self->{timer}->cancel;
3296 3441
3297 $self->SUPER::DESTROY; 3442 $self->SUPER::destroy;
3298} 3443}
3299 3444
3300############################################################################# 3445#############################################################################
3301 3446
3302package CFClient::UI::Inventory; 3447package CFClient::UI::Inventory;
3303 3448
3304our @ISA = CFClient::UI::ScrolledWindow::; 3449our @ISA = CFClient::UI::Table::;
3305 3450
3306sub new { 3451sub new {
3307 my $class = shift; 3452 my $class = shift;
3308 3453
3309 my $self = $class->SUPER::new ( 3454 my $self = $class->SUPER::new (
3310 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3455 col_expand => [0, 1, 0],
3311 @_, 3456 @_,
3312 ); 3457 );
3313 3458
3314 $self 3459 $self
3315} 3460}
3316 3461
3317sub set_items { 3462sub set_items {
3318 my ($self, $items) = @_; 3463 my ($self, $items) = @_;
3319 3464
3320 $self->{child}->clear; 3465 $self->clear;
3321 return unless $items; 3466 return unless $items;
3322 3467
3323 my @items = sort { 3468 my @items = sort {
3324 ($a->{type} <=> $b->{type}) 3469 ($a->{type} <=> $b->{type})
3325 or ($a->{name} cmp $b->{name}) 3470 or ($a->{name} cmp $b->{name})
3326 } @$items; 3471 } values %$items;
3327 3472
3328 $self->{real_items} = \@items; 3473 $self->{real_items} = \@items;
3329 3474
3330 my $row = 0; 3475 my $row = 0;
3331 for my $item (@items) { 3476 for my $item (@items) {
3332 CFClient::Item::update_widgets $item; 3477 CFClient::Item::update_widgets $item;
3333 3478
3334 $self->{child}->add (0, $row, $item->{face_widget}); 3479 $self->add (0, $row, $item->{face_widget});
3335 $self->{child}->add (1, $row, $item->{desc_widget}); 3480 $self->add (1, $row, $item->{desc_widget});
3336 $self->{child}->add (2, $row, $item->{weight_widget}); 3481 $self->add (2, $row, $item->{weight_widget});
3337 3482
3338 $row++; 3483 $row++;
3339 }
3340}
3341
3342#############################################################################
3343
3344package CFClient::UI::BindEditor;
3345
3346our @ISA = CFClient::UI::FancyFrame::;
3347
3348sub new {
3349 my $class = shift;
3350
3351 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3352
3353 $self->add (my $vb = new CFClient::UI::VBox);
3354
3355
3356 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3357 text => "start recording",
3358 tooltip => "Start/Stops recording of actions."
3359 ."All subsequent actions after the recording started will be captured."
3360 ."The actions are displayed after the record was stopped."
3361 ."To bind the action you have to click on the 'Bind' button",
3362 on_activate => sub {
3363 unless ($self->{recording}) {
3364 $self->start;
3365 } else {
3366 $self->stop;
3367 }
3368 });
3369
3370 $vb->add (new CFClient::UI::Label text => "Actions:");
3371 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3372
3373 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3374 $vb->add (my $hb = new CFClient::UI::HBox);
3375 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3376 $hb->add (new CFClient::UI::Button
3377 text => "bind",
3378 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3379 on_activate => sub {
3380 $self->ask_for_bind;
3381 });
3382
3383 $vb->add (my $hb = new CFClient::UI::HBox);
3384 $hb->add (new CFClient::UI::Button
3385 text => "ok",
3386 expand => 1,
3387 tooltip => "This closes the binding editor and saves the binding",
3388 on_activate => sub {
3389 $self->hide;
3390 $self->commit;
3391 });
3392
3393 $hb->add (new CFClient::UI::Button
3394 text => "cancel",
3395 expand => 1,
3396 tooltip => "This closes the binding editor without saving",
3397 on_activate => sub {
3398 $self->hide;
3399 $self->{binding_cancel}->()
3400 if $self->{binding_cancel};
3401 });
3402
3403 $self->update_binding_widgets;
3404
3405 $self
3406}
3407
3408sub commit {
3409 my ($self) = @_;
3410 my ($mod, $sym, $cmds) = $self->get_binding;
3411 if ($sym != 0 && @$cmds > 0) {
3412 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3413 ."'. Don't forget 'Save Config'!");
3414 $self->{binding_change}->($mod, $sym, $cmds)
3415 if $self->{binding_change};
3416 } else {
3417 $::STATUSBOX->add ("No action bound, no key or action specified!");
3418 $self->{binding_cancel}->()
3419 if $self->{binding_cancel};
3420 }
3421}
3422
3423sub start {
3424 my ($self) = @_;
3425
3426 $self->{rec_btn}->set_text ("stop recording");
3427 $self->{recording} = 1;
3428 $self->clear_command_list;
3429 $::CONN->start_record if $::CONN;
3430}
3431
3432sub stop {
3433 my ($self) = @_;
3434
3435 $self->{rec_btn}->set_text ("start recording");
3436 $self->{recording} = 0;
3437
3438 my $rec;
3439 $rec = $::CONN->stop_record if $::CONN;
3440 return unless ref $rec eq 'ARRAY';
3441 $self->set_command_list ($rec);
3442}
3443
3444
3445sub ask_for_bind_and_commit {
3446 my ($self) = @_;
3447 $self->ask_for_bind (1);
3448}
3449
3450sub ask_for_bind {
3451 my ($self, $commit) = @_;
3452
3453 CFClient::Binder::open_binding_dialog (sub {
3454 my ($mod, $sym) = @_;
3455 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3456 $self->update_binding_widgets;
3457 $self->commit if $commit;
3458 });
3459}
3460
3461# $mod and $sym are the modifiers and key symbol
3462# $cmds is a array ref of strings (the commands)
3463# $cb is the callback that is executed on OK
3464# $ccb is the callback that is executed on CANCEL and
3465# when the binding was unsuccessful on OK
3466sub set_binding {
3467 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3468
3469 $self->clear_command_list;
3470 $self->{recording} = 0;
3471 $self->{rec_btn}->set_text ("start recording");
3472
3473 $self->{binding} = [$mod, $sym];
3474 $self->{commands} = $cmds;
3475
3476 $self->{binding_change} = $cb;
3477 $self->{binding_cancel} = $ccb;
3478
3479 $self->update_binding_widgets;
3480}
3481
3482# this is a shortcut method that asks for a binding
3483# and then just binds it.
3484sub do_quick_binding {
3485 my ($self, $cmds) = @_;
3486 $self->set_binding (undef, undef, $cmds, sub {
3487 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3488 });
3489 $self->ask_for_bind (1);
3490}
3491
3492sub update_binding_widgets {
3493 my ($self) = @_;
3494 my ($mod, $sym, $cmds) = $self->get_binding;
3495 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3496 $self->set_command_list ($cmds);
3497}
3498
3499sub get_binding {
3500 my ($self) = @_;
3501 return (
3502 $self->{binding}->[0],
3503 $self->{binding}->[1],
3504 [ grep { defined $_ } @{$self->{commands}} ]
3505 );
3506}
3507
3508sub clear_command_list {
3509 my ($self) = @_;
3510 $self->{cmdbox}->clear ();
3511}
3512
3513sub set_command_list {
3514 my ($self, $cmds) = @_;
3515
3516 $self->{cmdbox}->clear ();
3517 $self->{commands} = $cmds;
3518
3519 my $idx = 0;
3520
3521 for (@$cmds) {
3522 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3523
3524 my $i = $idx;
3525 $hb->add (new CFClient::UI::Label text => $_);
3526 $hb->add (new CFClient::UI::Button
3527 text => "delete",
3528 tooltip => "Deletes the action from the record",
3529 on_activate => sub {
3530 $self->{cmdbox}->remove ($hb);
3531 $cmds->[$i] = undef;
3532 });
3533
3534
3535 $idx++
3536 } 3484 }
3537} 3485}
3538 3486
3539############################################################################# 3487#############################################################################
3540 3488
3550 commands => [], 3498 commands => [],
3551 @_, 3499 @_,
3552 ) 3500 )
3553} 3501}
3554 3502
3503my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3504
3505my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3506 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3507my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3508 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3555my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip => 3509my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3556 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell."); 3510 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3557my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip => 3511my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3558 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation."); 3512 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3559my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip => 3513my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3560 "<b>Damage</b>. The amount of damage the spell deals when it hits."); 3514 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3561 3515
3562sub rebuild_spell_list { 3516sub rebuild_spell_list {
3563 my ($self) = @_; 3517 my ($self) = @_;
3564 3518
3565 $CFClient::UI::ROOT->on_refresh ($self => sub { 3519 $CFClient::UI::ROOT->on_refresh ($self => sub {
3566 $self->clear; 3520 $self->clear;
3567 3521
3522 return unless $::CONN;
3523
3568 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name"); 3524 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3525 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3569 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL); 3526 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3570 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP); 3527 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3571 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG); 3528 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3572 3529
3573 my $row = 0; 3530 my $row = 0;
3574 3531
3575 for (sort { $a cmp $b } keys %{ $self->{spell} }) { 3532 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3576 my $spell = $self->{spell}{$_}; 3533 my $spell = $self->{spell}{$_};
3577 3534
3578 $row++; 3535 $row++;
3536
3537 my $spell_cb = sub {
3538 my ($widget, $ev) = @_;
3539
3540 if ($ev->{button} == 1) {
3541 $::CONN->user_send ("cast $spell->{name}");
3542 } elsif ($ev->{button} == 2) {
3543 $::CONN->user_send ("invoke $spell->{name}");
3544 } elsif ($ev->{button} == 3) {
3545 (new CFClient::UI::Menu
3546 items => [
3547 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3548 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3549 ],
3550 )->popup ($ev);
3551 } else {
3552 return 0;
3553 }
3554
3555 1
3556 };
3557
3558 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3559
3560 #TODO: add path info to tooltip
3561 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3579 3562
3580 $self->add (0, $row, new CFClient::UI::Face 3563 $self->add (0, $row, new CFClient::UI::Face
3581 face => $spell->{face}, 3564 face => $spell->{face},
3582 can_hover => 1, 3565 can_hover => 1,
3583 can_events => 1, 3566 can_events => 1,
3584 tooltip => $spell->{message}, 3567 tooltip => $tooltip,
3568 on_button_down => $spell_cb,
3585 ); 3569 );
3586 3570
3587 $self->add (1, $row, new CFClient::UI::Label 3571 $self->add (1, $row, new CFClient::UI::Label
3588 expand => 1, 3572 expand => 1,
3589 text => $spell->{name}, 3573 text => $spell->{name},
3590 can_hover => 1, 3574 can_hover => 1,
3591 can_events => 1, 3575 can_events => 1,
3592 tooltip => $spell->{message}, 3576 tooltip => $tooltip,
3577 on_button_down => $spell_cb,
3593 ); 3578 );
3594 3579
3580 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3595 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL); 3581 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3596 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP); 3582 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3597 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG); 3583 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3598
3599 # TODO: should be done via popup
3600 $self->add (5, $row, new CFClient::UI::Button
3601 text => "bind",
3602 tooltip => "bind spell readying (cast command) to key",
3603 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3604 );
3605 } 3584 }
3606 }); 3585 });
3607} 3586}
3608 3587
3609sub add_spell { 3588sub add_spell {
3615 3594
3616sub remove_spell { 3595sub remove_spell {
3617 my ($self, $spell) = @_; 3596 my ($self, $spell) = @_;
3618 3597
3619 delete $self->{spell}->{$spell->{name}}; 3598 delete $self->{spell}->{$spell->{name}};
3599 $self->rebuild_spell_list;
3600}
3601
3602sub clear_spells {
3603 my ($self) = @_;
3604
3605 $self->{spell} = {};
3620 $self->rebuild_spell_list; 3606 $self->rebuild_spell_list;
3621} 3607}
3622 3608
3623############################################################################# 3609#############################################################################
3624 3610
3661 $coord = $max - $size if $coord > $max - $size; 3647 $coord = $max - $size if $coord > $max - $size;
3662 3648
3663 int $coord + 0.5 3649 int $coord + 0.5
3664} 3650}
3665 3651
3666sub size_allocate { 3652sub invoke_size_allocate {
3667 my ($self, $w, $h) = @_; 3653 my ($self, $w, $h) = @_;
3668 3654
3669 for my $child ($self->children) { 3655 for my $child ($self->children) {
3670 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3656 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3671 3657
3675 $X = _to_pixel $X, $W, $self->{w}; 3661 $X = _to_pixel $X, $W, $self->{w};
3676 $Y = _to_pixel $Y, $H, $self->{h}; 3662 $Y = _to_pixel $Y, $H, $self->{h};
3677 3663
3678 $child->configure ($X, $Y, $W, $H); 3664 $child->configure ($X, $Y, $W, $H);
3679 } 3665 }
3666
3667 1
3680} 3668}
3681 3669
3682sub coord2local { 3670sub coord2local {
3683 my ($self, $x, $y) = @_; 3671 my ($self, $x, $y) = @_;
3684 3672
3849 ($draw_x, $draw_y, $draw_w, $draw_h) = 3837 ($draw_x, $draw_y, $draw_w, $draw_h) =
3850 (0, 0, $self->{w}, $self->{h}); 3838 (0, 0, $self->{w}, $self->{h});
3851 } 3839 }
3852 3840
3853 $self->_draw; 3841 $self->_draw;
3842
3843 #TODO#d# display texture cache
3844 {
3845 glEnable GL_TEXTURE_2D;
3846 glBindTexture GL_TEXTURE_2D, 41;
3847 glColor 1, 1, 1, 1;
3848 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
3849 glEnable GL_BLEND;
3850 glBlendFunc GL_SRC_ALPHA, GL_ZERO;
3851 glBegin GL_QUADS;
3852 glTexCoord 0,1; glVertex 0,0;
3853 glTexCoord 1,1; glVertex 255,0;
3854 glTexCoord 1,0; glVertex 255,255;
3855 glTexCoord 0,0; glVertex 0,255;
3856 glEnd;
3857 glDisable GL_BLEND;
3858 glDisable GL_TEXTURE_2D;
3859 }
3860
3854} 3861}
3855 3862
3856############################################################################# 3863#############################################################################
3857 3864
3858package CFClient::UI; 3865package CFClient::UI;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines