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.301 by elmex, Mon Jun 12 12:28:06 2006 UTC vs.
Revision 1.312 by root, Fri Jun 23 23:54:30 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
… …
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
… …
1001 # todo: overwrite size_allocate of child 1002 # todo: overwrite size_allocate of child
1002 my $child = $self->{vp}->child; 1003 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004} 1005}
1005 1006
1006sub size_allocate { 1007sub invoke_size_allocate {
1007 my ($self, $w, $h) = @_; 1008 my ($self, $w, $h) = @_;
1008
1009 $self->SUPER::size_allocate ($w, $h);
1010 1009
1011 my $child = $self->{vp}->child; 1010 my $child = $self->{vp}->child;
1012 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012
1013 $self->SUPER::invoke_size_allocate ($w, $h)
1013} 1014}
1014 1015
1015#TODO# update range on size_allocate depending on child 1016#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll 1017# update viewport offset on scroll
1017 1018
… …
1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 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); 1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073 1074
1074sub new { 1075sub new {
1075 my ($class, %arg) = @_; 1076 my ($class, %arg) = @_;
1076
1077 my $title = delete $arg{title};
1078 1077
1079 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
1080 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
1081 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
1082 border => 0.6, 1081 border => 0.6,
… …
1084 min_w => 16, 1083 min_w => 16,
1085 min_h => 16, 1084 min_h => 16,
1086 %arg, 1085 %arg,
1087 ); 1086 );
1088 1087
1089 $self->{title} = new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
1090 align => 0, 1089 align => 0,
1091 valign => 1, 1090 valign => 1,
1092 text => $title, 1091 text => $self->{title},
1093 fontsize => $self->{border} 1092 fontsize => $self->{border},
1094 if defined $title; 1093 if exists $self->{title};
1094
1095 if ($self->{has_close_button}) {
1096 $self->{close_button} =
1097 new CFClient::UI::ImageButton
1098 path => 'x1_close.png',
1099 on_activate => sub { $self->hide };
1100
1101 $self->CFClient::UI::Container::add ($self->{close_button});
1102 }
1095 1103
1096 $self 1104 $self
1097} 1105}
1098 1106
1099sub add { 1107sub add {
1100 my ($self, @widgets) = @_; 1108 my ($self, @widgets) = @_;
1101 1109
1102 $self->SUPER::add (@widgets); 1110 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104} 1113}
1105 1114
1106sub border { 1115sub border {
1107 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
1108} 1117}
1109 1118
1110sub size_request { 1119sub size_request {
1111 my ($self) = @_; 1120 my ($self) = @_;
1112 1121
1113 $self->{title}->size_request 1122 $self->{title_widget}->size_request
1114 if $self->{title}; 1123 if $self->{title_widget};
1124
1125 $self->{close_button}->size_request
1126 if $self->{close_button};
1115 1127
1116 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
1117 1129
1118 ( 1130 (
1119 $w + $self->border * 2, 1131 $w + $self->border * 2,
1120 $h + $self->border * 2, 1132 $h + $self->border * 2,
1121 ) 1133 )
1122} 1134}
1123 1135
1124sub size_allocate { 1136sub invoke_size_allocate {
1125 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
1126 1138
1127 if ($self->{title}) { 1139 if ($self->{title_widget}) {
1128 $self->{title}{w} = $w; 1140 $self->{title_widget}{w} = $w;
1129 $self->{title}{h} = $h; 1141 $self->{title_widget}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h); 1142 $self->{title_widget}->invoke_size_allocate ($w, $h);
1131 } 1143 }
1132 1144
1133 my $border = $self->border; 1145 my $border = $self->border;
1134 1146
1135 $h -= List::Util::max 0, $border * 2; 1147 $h -= List::Util::max 0, $border * 2;
1136 $w -= List::Util::max 0, $border * 2; 1148 $w -= List::Util::max 0, $border * 2;
1137 1149
1138 $self->child->configure ($border, $border, $w, $h); 1150 $self->child->configure ($border, $border, $w, $h);
1139}
1140 1151
1152 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_button};
1154
1155 1
1156}
1157
1141sub button_down { 1158sub invoke_button_down {
1142 my ($self, $ev, $x, $y) = @_; 1159 my ($self, $ev, $x, $y) = @_;
1143 1160
1144 my ($w, $h) = @$self{qw(w h)}; 1161 my ($w, $h) = @$self{qw(w h)};
1145 my $border = $self->border; 1162 my $border = $self->border;
1146 1163
… …
1177 1194
1178 ($x, $y) = ($ev->{x}, $ev->{y}); 1195 ($x, $y) = ($ev->{x}, $ev->{y});
1179 1196
1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1197 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement 1198 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1199 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183 }; 1200 };
1184 } else { 1201 } else {
1185 return 0; 1202 return 0;
1186 } 1203 }
1187 1204
1188 1 1205 1
1189} 1206}
1190 1207
1191sub button_up { 1208sub invoke_button_up {
1192 my ($self, $ev, $x, $y) = @_; 1209 my ($self, $ev, $x, $y) = @_;
1193 1210
1194 !!delete $self->{motion} 1211 ! ! delete $self->{motion}
1195} 1212}
1196 1213
1197sub mouse_motion { 1214sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_; 1215 my ($self, $ev, $x, $y) = @_;
1199 1216
1200 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1217 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201 1218
1202 !!$self->{motion} 1219 ! ! $self->{motion}
1203} 1220}
1204 1221
1205sub _draw { 1222sub _draw {
1206 my ($self) = @_; 1223 my ($self) = @_;
1207 1224
… …
1233 1250
1234 glDisable GL_TEXTURE_2D; 1251 glDisable GL_TEXTURE_2D;
1235 1252
1236 $child->draw; 1253 $child->draw;
1237 1254
1238 if ($self->{title}) { 1255 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1256 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1257 $self->{title_widget}->_draw;
1258
1259 glTranslate 0, - ($border - $self->{h});
1241 } 1260 }
1261
1262 $self->{close_button}->draw
1263 if $self->{close_button};
1242} 1264}
1243 1265
1244############################################################################# 1266#############################################################################
1245 1267
1246package CFClient::UI::Table; 1268package CFClient::UI::Table;
… …
1269 1291
1270 $child->set_parent ($self); 1292 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child; 1293 $self->{children}[$y][$x] = $child;
1272 1294
1273 $self->realloc; 1295 $self->realloc;
1296}
1297
1298sub remove {
1299 my ($self, $child) = @_;
1300
1301 # TODO: not yet implemented
1274} 1302}
1275 1303
1276# TODO: move to container class maybe? send children a signal on removal? 1304# TODO: move to container class maybe? send children a signal on removal?
1277sub clear { 1305sub clear {
1278 my ($self) = @_; 1306 my ($self) = @_;
… …
1319 (sum @$ws), 1347 (sum @$ws),
1320 (sum @$hs), 1348 (sum @$hs),
1321 ) 1349 )
1322} 1350}
1323 1351
1324sub size_allocate { 1352sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1353 my ($self, $w, $h) = @_;
1326 1354
1327 my ($ws, $hs) = $self->get_wh; 1355 my ($ws, $hs) = $self->get_wh;
1328 1356
1329 my $req_w = (sum @$ws) || 1; 1357 my $req_w = (sum @$ws) || 1;
… …
1361 } 1389 }
1362 1390
1363 $y += $row_h; 1391 $y += $row_h;
1364 } 1392 }
1365 1393
1394 1
1366} 1395}
1367 1396
1368sub find_widget { 1397sub find_widget {
1369 my ($self, $x, $y) = @_; 1398 my ($self, $x, $y) = @_;
1370 1399
… …
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1437 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 ) 1438 )
1410} 1439}
1411 1440
1412sub size_allocate { 1441sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1442 my ($self, $w, $h) = @_;
1414 1443
1415 my $space = $self->{vertical} ? $h : $w; 1444 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1445 my @children = $self->visible_children;
1417 1446
1418 my @req; 1447 my @req;
1419 1448
1420 if ($self->{homogeneous}) { 1449 if ($self->{homogeneous}) {
1421 @req = ($space / (@$children || 1)) x @$children; 1450 @req = ($space / (@children || 1)) x @children;
1422 } else { 1451 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1452 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424 my $req = List::Util::sum @req; 1453 my $req = List::Util::sum @req;
1425 1454
1426 if ($req > $space) { 1455 if ($req > $space) {
1427 # ah well, not enough space 1456 # ah well, not enough space
1428 $_ *= $space / $req for @req; 1457 $_ *= $space / $req for @req;
1429 } else { 1458 } else {
1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1459 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431 1460
1432 $space = ($space - $req) / $expand; # remaining space to give away 1461 $space = ($space - $req) / $expand; # remaining space to give away
1433 1462
1434 $req[$_] += $space * $children->[$_]{expand} 1463 $req[$_] += $space * $children[$_]{expand}
1435 for 0 .. $#$children; 1464 for 0 .. $#children;
1436 } 1465 }
1437 } 1466 }
1438 1467
1439 CFClient::UI::harmonize \@req; 1468 CFClient::UI::harmonize \@req;
1440 1469
1441 my $pos = 0; 1470 my $pos = 0;
1442 for (0 .. $#$children) { 1471 for (0 .. $#children) {
1443 my $alloc = $req[$_]; 1472 my $alloc = $req[$_];
1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1473 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445 1474
1446 $pos += $alloc; 1475 $pos += $alloc;
1447 } 1476 }
1448 1477
1449 1 1478 1
… …
1604 }; 1633 };
1605 1634
1606 @{ $self->{size_req} } 1635 @{ $self->{size_req} }
1607} 1636}
1608 1637
1638sub baseline_shift {
1639 $_[0]{layout}->descent
1640}
1641
1609sub size_allocate { 1642sub invoke_size_allocate {
1610 my ($self, $w, $h) = @_; 1643 my ($self, $w, $h) = @_;
1611 1644
1612 delete $self->{ox}; 1645 delete $self->{ox};
1613 1646
1614 delete $self->{texture} 1647 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1648 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1649
1650 1
1616} 1651}
1617 1652
1618sub set_fontsize { 1653sub set_fontsize {
1619 my ($self, $fontsize) = @_; 1654 my ($self, $fontsize) = @_;
1620 1655
… …
1713 1748
1714 $text =~ s/./*/g if $self->{hidden}; 1749 $text =~ s/./*/g if $self->{hidden};
1715 $self->{layout}->set_text ("$text "); 1750 $self->{layout}->set_text ("$text ");
1716 delete $self->{size_req}; 1751 delete $self->{size_req};
1717 1752
1718 $self->_emit (changed => $self->{text}); 1753 $self->emit (changed => $self->{text});
1719 1754
1720 $self->realloc; 1755 $self->realloc;
1721 $self->update; 1756 $self->update;
1722} 1757}
1723 1758
… …
1738 my ($w, $h) = $self->SUPER::size_request; 1773 my ($w, $h) = $self->SUPER::size_request;
1739 1774
1740 ($w + 1, $h) # add 1 for cursor 1775 ($w + 1, $h) # add 1 for cursor
1741} 1776}
1742 1777
1743sub key_down { 1778sub invoke_key_down {
1744 my ($self, $ev) = @_; 1779 my ($self, $ev) = @_;
1745 1780
1746 my $mod = $ev->{mod}; 1781 my $mod = $ev->{mod};
1747 my $sym = $ev->{sym}; 1782 my $sym = $ev->{sym};
1748 my $uni = $ev->{unicode}; 1783 my $uni = $ev->{unicode};
… …
1760 } elsif ($sym == CFClient::SDLK_HOME) { 1795 } elsif ($sym == CFClient::SDLK_HOME) {
1761 $self->{cursor} = 0; 1796 $self->{cursor} = 0;
1762 } elsif ($sym == CFClient::SDLK_END) { 1797 } elsif ($sym == CFClient::SDLK_END) {
1763 $self->{cursor} = length $text; 1798 $self->{cursor} = length $text;
1764 } elsif ($uni == 27) { 1799 } elsif ($uni == 27) {
1765 $self->_emit ('escape'); 1800 $self->emit ('escape');
1766 } elsif ($uni) { 1801 } elsif ($uni) {
1767 substr $text, $self->{cursor}++, 0, chr $uni; 1802 substr $text, $self->{cursor}++, 0, chr $uni;
1768 } else { 1803 } else {
1769 return 0; 1804 return 0;
1770 } 1805 }
… …
1774 $self->realloc; 1809 $self->realloc;
1775 1810
1776 1 1811 1
1777} 1812}
1778 1813
1779sub focus_in { 1814sub invoke_focus_in {
1780 my ($self) = @_; 1815 my ($self) = @_;
1781 1816
1782 $self->{last_activity} = $::NOW; 1817 $self->{last_activity} = $::NOW;
1783 1818
1784 $self->SUPER::focus_in; 1819 $self->SUPER::invoke_focus_in
1785} 1820}
1786 1821
1787sub button_down { 1822sub invoke_button_down {
1788 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1789 1824
1790 $self->SUPER::button_down ($ev, $x, $y); 1825 $self->SUPER::invoke_button_down ($ev, $x, $y);
1791 1826
1792 my $idx = $self->{layout}->xy_to_index ($x, $y); 1827 my $idx = $self->{layout}->xy_to_index ($x, $y);
1793 1828
1794 # byte-index to char-index 1829 # byte-index to char-index
1795 my $text = $self->{text}; 1830 my $text = $self->{text};
… …
1800 $self->update; 1835 $self->update;
1801 1836
1802 1 1837 1
1803} 1838}
1804 1839
1805sub mouse_motion { 1840sub invoke_mouse_motion {
1806 my ($self, $ev, $x, $y) = @_; 1841 my ($self, $ev, $x, $y) = @_;
1807# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1842# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1808 1843
1809 0 1844 1
1810} 1845}
1811 1846
1812sub _draw { 1847sub _draw {
1813 my ($self) = @_; 1848 my ($self) = @_;
1814 1849
… …
1855 1890
1856our @ISA = CFClient::UI::EntryBase::; 1891our @ISA = CFClient::UI::EntryBase::;
1857 1892
1858use CFClient::OpenGL; 1893use CFClient::OpenGL;
1859 1894
1860sub key_down { 1895sub invoke_key_down {
1861 my ($self, $ev) = @_; 1896 my ($self, $ev) = @_;
1862 1897
1863 my $sym = $ev->{sym}; 1898 my $sym = $ev->{sym};
1864 1899
1865 if ($sym == 13) { 1900 if ($sym == 13) {
1866 unshift @{$self->{history}}, 1901 unshift @{$self->{history}},
1867 my $txt = $self->get_text; 1902 my $txt = $self->get_text;
1903
1868 $self->{history_pointer} = -1; 1904 $self->{history_pointer} = -1;
1869 $self->{history_saveback} = ''; 1905 $self->{history_saveback} = '';
1870 $self->_emit (activate => $txt); 1906 $self->emit (activate => $txt);
1871 $self->update; 1907 $self->update;
1872 1908
1873 } elsif ($sym == CFClient::SDLK_UP) { 1909 } elsif ($sym == CFClient::SDLK_UP) {
1874 if ($self->{history_pointer} < 0) { 1910 if ($self->{history_pointer} < 0) {
1875 $self->{history_saveback} = $self->get_text; 1911 $self->{history_saveback} = $self->get_text;
… …
1891 } else { 1927 } else {
1892 $self->set_text ($self->{history_saveback}); 1928 $self->set_text ($self->{history_saveback});
1893 } 1929 }
1894 1930
1895 } else { 1931 } else {
1896 return $self->SUPER::key_down ($ev) 1932 return $self->SUPER::invoke_key_down ($ev)
1897 } 1933 }
1898 1934
1899 1 1935 1
1900} 1936}
1901 1937
… …
1925 can_events => 1, 1961 can_events => 1,
1926 @_ 1962 @_
1927 ) 1963 )
1928} 1964}
1929 1965
1930sub activate { }
1931
1932sub button_up { 1966sub invoke_button_up {
1933 my ($self, $ev, $x, $y) = @_; 1967 my ($self, $ev, $x, $y) = @_;
1934 1968
1935 $self->emit ("activate") 1969 $self->emit ("activate")
1936 if $x >= 0 && $x < $self->{w} 1970 if $x >= 0 && $x < $self->{w}
1937 && $y >= 0 && $y < $self->{h}; 1971 && $y >= 0 && $y < $self->{h};
… …
1951 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1985 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1952 1986
1953 glDisable GL_TEXTURE_2D; 1987 glDisable GL_TEXTURE_2D;
1954 1988
1955 $self->SUPER::_draw; 1989 $self->SUPER::_draw;
1990}
1991
1992#############################################################################
1993
1994package CFClient::UI::ImageButton;
1995
1996our @ISA = CFClient::UI::Image::;
1997
1998use CFClient::OpenGL;
1999
2000my %textures;
2001
2002sub new {
2003 my $class = shift;
2004
2005 my $self = $class->SUPER::new (
2006 padding_x => 4,
2007 padding_y => 4,
2008 fg => [1, 1, 1],
2009 active_fg => [0, 0, 1],
2010 can_hover => 1,
2011 align => 0,
2012 valign => 0,
2013 can_events => 1,
2014 @_
2015 );
2016}
2017
2018sub invoke_button_up {
2019 my ($self, $ev, $x, $y) = @_;
2020
2021 $self->emit ("activate")
2022 if $x >= 0 && $x < $self->{w}
2023 && $y >= 0 && $y < $self->{h};
2024
2025 1
1956} 2026}
1957 2027
1958############################################################################# 2028#############################################################################
1959 2029
1960package CFClient::UI::CheckBox; 2030package CFClient::UI::CheckBox;
… …
1987 my ($self) = @_; 2057 my ($self) = @_;
1988 2058
1989 (6) x 2 2059 (6) x 2
1990} 2060}
1991 2061
1992sub button_down { 2062sub invoke_button_down {
1993 my ($self, $ev, $x, $y) = @_; 2063 my ($self, $ev, $x, $y) = @_;
1994 2064
1995 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2065 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1996 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2066 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1997 $self->{state} = !$self->{state}; 2067 $self->{state} = !$self->{state};
1998 $self->_emit (changed => $self->{state}); 2068 $self->emit (changed => $self->{state});
1999 } else { 2069 } else {
2000 return 0 2070 return 0
2001 } 2071 }
2002 2072
2003 1 2073 1
… …
2028package CFClient::UI::Image; 2098package CFClient::UI::Image;
2029 2099
2030our @ISA = CFClient::UI::Base::; 2100our @ISA = CFClient::UI::Base::;
2031 2101
2032use CFClient::OpenGL; 2102use CFClient::OpenGL;
2033use Carp qw/confess/;
2034 2103
2035our %loaded_images; 2104our %texture_cache;
2036 2105
2037sub new { 2106sub new {
2038 my $class = shift; 2107 my $class = shift;
2039 2108
2040 my $self = $class->SUPER::new (can_events => 0, @_); 2109 my $self = $class->SUPER::new (
2110 can_events => 0,
2111 @_,
2112 );
2041 2113
2042 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2114 $self->{path}
2115 or Carp::croak "required attribute 'path' not set";
2043 2116
2044 $loaded_images{$self->{image}} ||= 2117 $self->{tex} = $texture_cache{$self->{path}} ||=
2045 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2118 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2046 2119
2047 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2120 Scalar::Util::weaken $texture_cache{$self->{path}};
2048 2121
2049 Scalar::Util::weaken $loaded_images{$self->{image}}; 2122 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2050
2051 $self->{aspect} = $tex->{w} / $tex->{h};
2052 2123
2053 $self 2124 $self
2054} 2125}
2055 2126
2056sub size_request { 2127sub size_request {
2057 my ($self) = @_; 2128 my ($self) = @_;
2058 2129
2059 ($self->{tex}->{w}, $self->{tex}->{h}) 2130 ($self->{tex}{w}, $self->{tex}{h})
2060} 2131}
2061 2132
2062sub _draw { 2133sub _draw {
2063 my ($self) = @_; 2134 my ($self) = @_;
2064 2135
… …
2300 $self->update; 2371 $self->update;
2301 2372
2302 $self 2373 $self
2303} 2374}
2304 2375
2305sub changed { }
2306
2307sub set_range { 2376sub set_range {
2308 my ($self, $range) = @_; 2377 my ($self, $range) = @_;
2309 2378
2310 ($range, $self->{range}) = ($self->{range}, $range); 2379 ($range, $self->{range}) = ($self->{range}, $range);
2311 2380
… …
2331 if $unit; 2400 if $unit;
2332 2401
2333 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2402 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2334 2403
2335 if ($value != $old_value) { 2404 if ($value != $old_value) {
2336 $self->_emit (changed => $value); 2405 $self->emit (changed => $value);
2337 $self->update; 2406 $self->update;
2338 } 2407 }
2339} 2408}
2340 2409
2341sub size_request { 2410sub size_request {
2342 my ($self) = @_; 2411 my ($self) = @_;
2343 2412
2344 ($self->{req_w}, $self->{req_h}) 2413 ($self->{req_w}, $self->{req_h})
2345} 2414}
2346 2415
2347sub button_down { 2416sub invoke_button_down {
2348 my ($self, $ev, $x, $y) = @_; 2417 my ($self, $ev, $x, $y) = @_;
2349 2418
2350 $self->SUPER::button_down ($ev, $x, $y); 2419 $self->SUPER::invoke_button_down ($ev, $x, $y);
2351 2420
2352 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2421 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2353 2422
2354 $self->mouse_motion ($ev, $x, $y) 2423 $self->invoke_mouse_motion ($ev, $x, $y)
2355} 2424}
2356 2425
2357sub mouse_motion { 2426sub invoke_mouse_motion {
2358 my ($self, $ev, $x, $y) = @_; 2427 my ($self, $ev, $x, $y) = @_;
2359 2428
2360 if ($GRAB == $self) { 2429 if ($GRAB == $self) {
2361 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2430 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2362 2431
… …
2504 2573
2505 $self->{fontsize} = $fontsize; 2574 $self->{fontsize} = $fontsize;
2506 $self->reflow; 2575 $self->reflow;
2507} 2576}
2508 2577
2578sub size_request {
2579 my ($self) = @_;
2580
2581 my ($empty, $slider) = @{ $self->{children} };
2582
2583 local $self->{children} = [$empty, $slider];
2584 $self->SUPER::size_request
2585}
2586
2509sub size_allocate { 2587sub invoke_size_allocate {
2510 my ($self, $w, $h) = @_; 2588 my ($self, $w, $h) = @_;
2511 2589
2512 $self->SUPER::size_allocate ($w, $h); 2590 my ($empty, $slider, @other) = @{ $self->{children} };
2591 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2513 2592
2514 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2593 $self->{layout}->set_font ($self->{font}) if $self->{font};
2515 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2594 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2516 $self->{layout}->set_width ($self->{children}[0]{w}); 2595 $self->{layout}->set_width ($empty->{w});
2517 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2596 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2518 2597
2519 $self->reflow; 2598 $self->reflow;
2520}
2521 2599
2522sub text_size { 2600 local $self->{children} = [$empty, $slider];
2523 my ($self, $text, $indent) = @_; 2601 $self->SUPER::invoke_size_allocate ($w, $h)
2602}
2603
2604sub get_layout {
2605 my ($self, $para) = @_;
2524 2606
2525 my $layout = $self->{layout}; 2607 my $layout = $self->{layout};
2526 2608
2609 $layout->set_font ($self->{font}) if $self->{font};
2610 $layout->set_foreground (@{$para->{fg}});
2527 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2611 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2528 $layout->set_width ($self->{children}[0]{w} - $indent); 2612 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2529 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2613 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2530 $layout->set_markup ($text); 2614 $layout->set_markup ($para->{markup});
2615
2616 $layout->set_shapes (
2617 map
2618 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2619 @{$para->{widget}}
2531 2620 );
2621
2532 $layout->size 2622 $layout
2533} 2623}
2534 2624
2535sub reflow { 2625sub reflow {
2536 my ($self) = @_; 2626 my ($self) = @_;
2537 2627
… …
2546 $self->{children}[1]->set_value ($offset); 2636 $self->{children}[1]->set_value ($offset);
2547} 2637}
2548 2638
2549sub clear { 2639sub clear {
2550 my ($self) = @_; 2640 my ($self) = @_;
2641
2642 my (undef, undef, @other) = @{ $self->{children} };
2643 $self->remove ($_) for @other;
2551 2644
2552 $self->{par} = []; 2645 $self->{par} = [];
2553 $self->{height} = 0; 2646 $self->{height} = 0;
2554 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2647 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2555} 2648}
2556 2649
2557sub add_paragraph { 2650sub add_paragraph {
2558 my ($self, $color, $text, $indent) = @_; 2651 my ($self, $color, $para, $indent) = @_;
2559 2652
2560 for my $line (split /\n/, $text) { 2653 my ($text, @w) = ref $para ? @$para : $para;
2561 my ($w, $h) = $self->text_size ($line); 2654
2562 $self->{height} += $h; 2655 $para = {
2563 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2656 w => 1e10,
2657 wrapped => 1,
2658 fg => $color,
2659 indent => $indent,
2660 markup => $text,
2661 widget => \@w,
2564 } 2662 };
2565 2663
2566 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2664 $self->add (@w) if @w;
2665 push @{$self->{par}}, $para;
2666
2667 $self->{need_reflow}++;
2668 $self->update;
2669}
2670
2671sub scroll_to_bottom {
2672 my ($self) = @_;
2673
2674 $self->{scroll_to_bottom} = 1;
2675 $self->update;
2567} 2676}
2568 2677
2569sub update { 2678sub update {
2570 my ($self) = @_; 2679 my ($self) = @_;
2571 2680
… …
2579 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2688 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2580 2689
2581 if (delete $self->{need_reflow}) { 2690 if (delete $self->{need_reflow}) {
2582 my $height = 0; 2691 my $height = 0;
2583 2692
2584 my $layout = $self->{layout};
2585
2586 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2587
2588 for (@{$self->{par}}) { 2693 for my $para (@{$self->{par}}) {
2589 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2694 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2590 $layout->set_width ($W - $_->[3]); 2695 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; 2696 my ($w, $h) = $layout->size;
2594 $_->[0] = $w + $_->[3]; 2697
2595 $_->[1] = $h; 2698 $para->{w} = $w + $para->{indent};
2699 $para->{h} = $h;
2700 $para->{wrapped} = $layout->has_wrapped;
2596 } 2701 }
2597 2702
2598 $height += $_->[1]; 2703 $height += $para->{h};
2599 } 2704 }
2600 2705
2601 $self->{height} = $height; 2706 $self->{height} = $height;
2602 2707
2603 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2708 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2604 2709
2605 delete $self->{texture}; 2710 delete $self->{texture};
2711 }
2712
2713 if (delete $self->{scroll_to_bottom}) {
2714 $self->{children}[1]->set_value (1e10);
2606 } 2715 }
2607 2716
2608 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2717 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2609 glClearColor 0, 0, 0, 0; 2718 glClearColor 0, 0, 0, 0;
2610 glClear GL_COLOR_BUFFER_BIT; 2719 glClear GL_COLOR_BUFFER_BIT;
… …
2614 my $y0 = $top; 2723 my $y0 = $top;
2615 my $y1 = $top + $H; 2724 my $y1 = $top + $H;
2616 2725
2617 my $y = 0; 2726 my $y = 0;
2618 2727
2619 my $layout = $self->{layout};
2620
2621 $layout->set_font ($self->{font}) if $self->{font};
2622
2623 glEnable GL_BLEND; 2728 glEnable GL_BLEND;
2624 #TODO# not correct in windows where rgba is forced off 2729 #TODO# not correct in windows where rgba is forced off
2625 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2730 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2626 2731
2627 for my $par (@{$self->{par}}) { 2732 for my $para (@{$self->{par}}) {
2628 my $h = $par->[1]; 2733 my $h = $para->{h};
2629 2734
2630 if ($y0 < $y + $h && $y < $y1) { 2735 if ($y0 < $y + $h && $y < $y1) {
2631 $layout->set_foreground (@{ $par->[2] }); 2736
2632 $layout->set_width ($W - $par->[3]); 2737 my $layout = $self->get_layout ($para);
2633 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2634 $layout->set_markup ($par->[4]);
2635 2738
2636 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2739 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2637 2740
2638 glRasterPos $par->[3], $y - $y0; 2741 glRasterPos $para->{indent}, $y - $y0;
2639 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2742 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2743
2744 if (my @w = @{ $para->{widget} }) {
2745 my @s = $layout->get_shapes;
2746
2747 for (@w) {
2748 my ($dx, $dy) = splice @s, 0, 2, ();
2749
2750 $_->{x} = $dx + $para->{indent};
2751 $_->{y} = $dy + $y - $y0;
2752
2753 $_->draw;
2754 }
2755 }
2640 } 2756 }
2641 2757
2642 $y += $h; 2758 $y += $h;
2643 } 2759 }
2644 2760
2645 glDisable GL_BLEND; 2761 glDisable GL_BLEND;
2646 }; 2762 };
2647 }); 2763 });
2764}
2765
2766sub reconfigure {
2767 my ($self) = @_;
2768
2769 $self->SUPER::reconfigure;
2770
2771 $_->{w} = 1e10 for @{ $self->{par} };
2772 $self->reflow;
2648} 2773}
2649 2774
2650sub _draw { 2775sub _draw {
2651 my ($self) = @_; 2776 my ($self) = @_;
2652 2777
… …
2655 glColor 0, 0, 0, 1; 2780 glColor 0, 0, 0, 1;
2656 $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});
2657 glDisable GL_TEXTURE_2D; 2782 glDisable GL_TEXTURE_2D;
2658 2783
2659 $self->{children}[1]->draw; 2784 $self->{children}[1]->draw;
2660
2661} 2785}
2662 2786
2663############################################################################# 2787#############################################################################
2664 2788
2665package CFClient::UI::Animator; 2789package CFClient::UI::Animator;
… …
2774 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2898 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2775 2899
2776 ($w + 4, $h + 4) 2900 ($w + 4, $h + 4)
2777} 2901}
2778 2902
2779sub size_allocate { 2903sub invoke_size_allocate {
2780 my ($self, $w, $h) = @_; 2904 my ($self, $w, $h) = @_;
2781 2905
2782 $self->SUPER::size_allocate ($w - 4, $h - 4); 2906 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2783} 2907}
2784 2908
2785sub visibility_change { 2909sub invoke_visibility_change {
2786 my ($self, $visible) = @_; 2910 my ($self, $visible) = @_;
2787 2911
2788 return unless $visible; 2912 return unless $visible;
2789 2913
2790 $self->{root}->on_post_alloc ("move_$self" => sub { 2914 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2897 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3021 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2898 glDisable GL_TEXTURE_2D; 3022 glDisable GL_TEXTURE_2D;
2899 } 3023 }
2900} 3024}
2901 3025
2902sub DESTROY { 3026sub destroy {
2903 my ($self) = @_; 3027 my ($self) = @_;
2904 3028
2905 $self->{timer}->cancel 3029 $self->{timer}->cancel
2906 if $self->{timer}; 3030 if $self->{timer};
2907 3031
2908 $self->SUPER::DESTROY; 3032 $self->SUPER::destroy;
2909} 3033}
2910 3034
2911############################################################################# 3035#############################################################################
2912 3036
2913package CFClient::UI::Buttonbar; 3037package CFClient::UI::Buttonbar;
… …
2957 3081
2958# 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)
2959sub popup { 3083sub popup {
2960 my ($self, $ev) = @_; 3084 my ($self, $ev) = @_;
2961 3085
2962 $self->_emit ("popdown"); 3086 $self->emit ("popdown");
2963 3087
2964 # maybe save $GRAB? must be careful about events... 3088 # maybe save $GRAB? must be careful about events...
2965 $GRAB = $self; 3089 $GRAB = $self;
2966 $self->{button} = $ev->{button}; 3090 $self->{button} = $ev->{button};
2967 3091
2968 $self->show; 3092 $self->show;
2969 $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);
2970} 3094}
2971 3095
2972sub mouse_motion { 3096sub invoke_mouse_motion {
2973 my ($self, $ev, $x, $y) = @_; 3097 my ($self, $ev, $x, $y) = @_;
2974 3098
2975 # TODO: should use vbox->find_widget or so 3099 # TODO: should use vbox->find_widget or so
2976 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3100 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2977 $self->{hover} = $self->{item}{$HOVER}; 3101 $self->{hover} = $self->{item}{$HOVER};
2978 3102
2979 0 3103 0
2980} 3104}
2981 3105
2982sub button_up { 3106sub invoke_button_up {
2983 my ($self, $ev, $x, $y) = @_; 3107 my ($self, $ev, $x, $y) = @_;
2984 3108
2985 if ($ev->{button} == $self->{button}) { 3109 if ($ev->{button} == $self->{button}) {
2986 undef $GRAB; 3110 undef $GRAB;
2987 $self->hide; 3111 $self->hide;
2988 3112
2989 $self->_emit ("popdown"); 3113 $self->emit ("popdown");
2990 $self->{hover}[1]->() if $self->{hover}; 3114 $self->{hover}[1]->() if $self->{hover};
2991 } else { 3115 } else {
2992 return 0 3116 return 0
2993 } 3117 }
2994 3118
… …
3031 : $self->{children}[$page_or_widget]; 3155 : $self->{children}[$page_or_widget];
3032 3156
3033 $self->{current} = $widget; 3157 $self->{current} = $widget;
3034 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3158 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3035 3159
3036 $self->_emit (page_changed => $self->{current}); 3160 $self->emit (page_changed => $self->{current});
3037 3161
3038 $self->realloc; 3162 $self->realloc;
3039} 3163}
3040 3164
3041sub visible_children { 3165sub visible_children {
… …
3046 my ($self) = @_; 3170 my ($self) = @_;
3047 3171
3048 $self->{current}->size_request 3172 $self->{current}->size_request
3049} 3173}
3050 3174
3051sub size_allocate { 3175sub invoke_size_allocate {
3052 my ($self, $w, $h) = @_; 3176 my ($self, $w, $h) = @_;
3053 3177
3054 $self->{current}->configure (0, 0, $w, $h); 3178 $self->{current}->configure (0, 0, $w, $h);
3179
3180 1
3055} 3181}
3056 3182
3057sub _draw { 3183sub _draw {
3058 my ($self) = @_; 3184 my ($self) = @_;
3059 3185
… …
3098 3224
3099sub set_current_page { 3225sub set_current_page {
3100 my ($self, $page) = @_; 3226 my ($self, $page) = @_;
3101 3227
3102 $self->{multiplexer}->set_current_page ($page); 3228 $self->{multiplexer}->set_current_page ($page);
3103 $self->_emit (page_changed => $self->{multiplexer}{current}); 3229 $self->emit (page_changed => $self->{multiplexer}{current});
3104} 3230}
3105 3231
3106############################################################################# 3232#############################################################################
3107 3233
3108package CFClient::UI::Combobox; 3234package CFClient::UI::Combobox;
… …
3123 $self->_set_value ($self->{value}); 3249 $self->_set_value ($self->{value});
3124 3250
3125 $self 3251 $self
3126} 3252}
3127 3253
3128sub button_down { 3254sub invoke_button_down {
3129 my ($self, $ev) = @_; 3255 my ($self, $ev) = @_;
3130 3256
3131 my @menu_items; 3257 my @menu_items;
3132 3258
3133 for (@{ $self->{options} }) { 3259 for (@{ $self->{options} }) {
… …
3154 my ($self, $value) = @_; 3280 my ($self, $value) = @_;
3155 3281
3156 return unless $self->{value} ne $value; 3282 return unless $self->{value} ne $value;
3157 3283
3158 $self->_set_value ($value); 3284 $self->_set_value ($value);
3159 $self->_emit (changed => $value); 3285 $self->emit (changed => $value);
3160} 3286}
3161 3287
3162############################################################################# 3288#############################################################################
3163 3289
3164package CFClient::UI::Statusbox; 3290package CFClient::UI::Statusbox;
… …
3292 3418
3293 $self->reorder; 3419 $self->reorder;
3294 $self->SUPER::reconfigure; 3420 $self->SUPER::reconfigure;
3295} 3421}
3296 3422
3297sub DESTROY { 3423sub destroy {
3298 my ($self) = @_; 3424 my ($self) = @_;
3299 3425
3300 $self->{timer}->cancel; 3426 $self->{timer}->cancel;
3301 3427
3302 $self->SUPER::DESTROY; 3428 $self->SUPER::destroy;
3303} 3429}
3304 3430
3305############################################################################# 3431#############################################################################
3306 3432
3307package CFClient::UI::Inventory; 3433package CFClient::UI::Inventory;
… …
3408 $self->update_binding_widgets; 3534 $self->update_binding_widgets;
3409 3535
3410 $self 3536 $self
3411} 3537}
3412 3538
3539sub cfg_bind {
3540 my ($self, $mod, $sym, $cmds) = @_;
3541 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3542 ::update_bindings ();
3543}
3544
3545sub cfg_unbind {
3546 my ($self, $mod, $sym, $cmds) = @_;
3547 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3548 ::update_bindings ();
3549}
3550
3413sub commit { 3551sub commit {
3414 my ($self) = @_; 3552 my ($self) = @_;
3415 my ($mod, $sym, $cmds) = $self->get_binding; 3553 my ($mod, $sym, $cmds) = $self->get_binding;
3416 if ($sym != 0 && @$cmds > 0) { 3554 if ($sym != 0 && @$cmds > 0) {
3417 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym) 3555 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
… …
3451 my ($self) = @_; 3589 my ($self) = @_;
3452 $self->ask_for_bind (1); 3590 $self->ask_for_bind (1);
3453} 3591}
3454 3592
3455sub ask_for_bind { 3593sub ask_for_bind {
3456 my ($self, $commit) = @_; 3594 my ($self, $commit, $end_cb) = @_;
3457 3595
3458 CFClient::Binder::open_binding_dialog (sub { 3596 CFClient::Binder::open_binding_dialog (sub {
3459 my ($mod, $sym) = @_; 3597 my ($mod, $sym) = @_;
3460 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak? 3598 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3461 $self->update_binding_widgets; 3599 $self->update_binding_widgets;
3462 $self->commit if $commit; 3600 $self->commit if $commit;
3601 $end_cb->() if $end_cb;
3463 }); 3602 });
3464} 3603}
3465 3604
3466# $mod and $sym are the modifiers and key symbol 3605# $mod and $sym are the modifiers and key symbol
3467# $cmds is a array ref of strings (the commands) 3606# $cmds is a array ref of strings (the commands)
… …
3485} 3624}
3486 3625
3487# this is a shortcut method that asks for a binding 3626# this is a shortcut method that asks for a binding
3488# and then just binds it. 3627# and then just binds it.
3489sub do_quick_binding { 3628sub do_quick_binding {
3490 my ($self, $cmds) = @_; 3629 my ($self, $cmds, $end_cb) = @_;
3491 $self->set_binding (undef, undef, $cmds, sub { 3630 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3492 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3493 });
3494 $self->ask_for_bind (1); 3631 $self->ask_for_bind (1, $end_cb);
3495} 3632}
3496 3633
3497sub update_binding_widgets { 3634sub update_binding_widgets {
3498 my ($self) = @_; 3635 my ($self) = @_;
3499 my ($mod, $sym, $cmds) = $self->get_binding; 3636 my ($mod, $sym, $cmds) = $self->get_binding;
… …
3573sub rebuild_spell_list { 3710sub rebuild_spell_list {
3574 my ($self) = @_; 3711 my ($self) = @_;
3575 3712
3576 $CFClient::UI::ROOT->on_refresh ($self => sub { 3713 $CFClient::UI::ROOT->on_refresh ($self => sub {
3577 $self->clear; 3714 $self->clear;
3715
3716 return unless $::CONN;
3578 3717
3579 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME); 3718 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3580 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL); 3719 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3581 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL); 3720 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3582 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP); 3721 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
… …
3702 $coord = $max - $size if $coord > $max - $size; 3841 $coord = $max - $size if $coord > $max - $size;
3703 3842
3704 int $coord + 0.5 3843 int $coord + 0.5
3705} 3844}
3706 3845
3707sub size_allocate { 3846sub invoke_size_allocate {
3708 my ($self, $w, $h) = @_; 3847 my ($self, $w, $h) = @_;
3709 3848
3710 for my $child ($self->children) { 3849 for my $child ($self->children) {
3711 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3850 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3712 3851
… …
3716 $X = _to_pixel $X, $W, $self->{w}; 3855 $X = _to_pixel $X, $W, $self->{w};
3717 $Y = _to_pixel $Y, $H, $self->{h}; 3856 $Y = _to_pixel $Y, $H, $self->{h};
3718 3857
3719 $child->configure ($X, $Y, $W, $H); 3858 $child->configure ($X, $Y, $W, $H);
3720 } 3859 }
3860
3861 1
3721} 3862}
3722 3863
3723sub coord2local { 3864sub coord2local {
3724 my ($self, $x, $y) = @_; 3865 my ($self, $x, $y) = @_;
3725 3866

Diff Legend

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