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.230 by root, Wed May 24 21:59:54 2006 UTC vs.
Revision 1.277 by root, Sun Jun 4 00:21:52 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
18 20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
19sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
20 if (!$GRAB) { 47 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
25 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
26 54
27 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
28 56
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 58
31 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 60 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 61 }
43 62
44 return; 63 return;
45 } 64 }
46 } 65 }
… …
50 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
51} 70}
52 71
53# class methods for events 72# class methods for events
54sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 75 if $FOCUS;
57} 76}
58 77
59sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 80 if $FOCUS;
62} 81}
63 82
64sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
65 my ($ev) = @_; 84 my ($ev) = @_;
… …
74 check_tooltip; 93 check_tooltip;
75 } 94 }
76 95
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 97
79 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 100}
84 101
85sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
86 my ($ev) = @_; 103 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
88 105
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 107
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 109
93 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 112
98 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 115 $grab->update if $grab;
101 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 133
119 check_tooltip; 134 check_tooltip;
120 } 135 }
121 136
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 138 if $HOVER;
126} 139}
127 140
128# convert position array to integers 141# convert position array to integers
129sub harmonize { 142sub harmonize {
130 my ($vals) = @_; 143 my ($vals) = @_;
… …
158sub rescale_widgets { 171sub rescale_widgets {
159 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
160 173
161 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
162 if ($widget->{is_toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
163 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
164 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
165 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
166 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
167 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
168 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
169 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
170 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
171 } 189 }
172 } 190 }
173 191
174 reconfigure_widgets; 192 reconfigure_widgets;
175} 193}
… …
184 202
185sub new { 203sub new {
186 my $class = shift; 204 my $class = shift;
187 205
188 my $self = bless { 206 my $self = bless {
189 x => 0, 207 x => "center",
190 y => 0, 208 y => "center",
191 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
192 can_events => 1, 212 can_events => 1,
193 @_ 213 @_
194 }, $class; 214 }, $class;
195 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
196 for (keys %$self) { 218 for (keys %$self) {
197 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
198 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
199 } 221 }
200 } 222 }
201 223
202 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
203 235
204 $self 236 $self
205} 237}
206 238
207sub destroy { 239sub destroy {
… …
211 %$self = (); 243 %$self = ();
212} 244}
213 245
214sub show { 246sub show {
215 my ($self) = @_; 247 my ($self) = @_;
248
216 return if $self->{parent}; 249 return if $self->{parent};
217 250
218 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
219} 252}
220 253
221sub show_centered { 254sub set_visible {
222 my ($self) = @_; 255 my ($self) = @_;
256
223 return if $self->{parent}; 257 return if $self->{visible};
224 258
225 $self->show; 259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
226 261
227 $CFClient::UI::ROOT->on_post_alloc ( 262 $self->emit (visibility_change => 1);
228 "centered $self" => sub {
229 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
230 },
231 );
232}
233 263
234sub hide { 264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
267}
268
269sub set_invisible {
235 my ($self) = @_; 270 my ($self) = @_;
271
272 return unless $self->{visible};
273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
277 delete $self->{visible};
236 278
237 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
238 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
239 281
282 CFClient::UI::check_tooltip
283 if $TOOLTIP->{owner} == $self;
284
285 $self->focus_out;
286
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
305}
306
307sub hide {
308 my ($self) = @_;
309
310 $self->set_invisible;
311
240 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
241 if $self->{parent}; 313 if $self->{parent};
242} 314}
243 315
244sub move { 316sub move_abs {
245 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
246 318
247 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
248 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
249 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
250 322
251 $self->update; 323 $self->update;
252} 324}
253 325
254sub set_size { 326sub set_size {
255 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
256 328
257 $self->{user_w} = $w; 329 $self->{force_w} = $w;
258 $self->{user_h} = $h; 330 $self->{force_h} = $h;
259 331
260 $self->check_size; 332 $self->realloc;
261} 333}
262 334
263sub size_request { 335sub size_request {
264 require Carp; 336 require Carp;
265 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
267 339
268sub configure { 340sub configure {
269 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
270 342
271 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
272 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
273 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
274 348
275 # use alignment to adjust x, y 349 # use alignment to adjust x, y
276 350
277 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
278 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
279
280 ($w, $h) = ($w2, $h2);
281 } 353 }
282 354
283 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
284 $self->{x} = $x; 356 $self->{x} = $x;
285 $self->{y} = $y; 357 $self->{y} = $y;
286 $self->update; 358 $self->update;
287 } 359 }
288 360
289 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
290 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
291 } 368 }
292} 369}
293 370
294sub size_allocate { 371sub size_allocate {
295 # nothing to be done 372 # nothing to be done
296} 373}
297 374
298sub reconfigure {
299 my ($self) = @_;
300
301 $self->check_size (1);
302 $self->update;
303}
304
305sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
306} 381}
307 382
308sub set_max_size { 383sub set_max_size {
309 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
310 385
… …
312 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
313} 388}
314 389
315sub set_tooltip { 390sub set_tooltip {
316 my ($self, $tooltip) = @_; 391 my ($self, $tooltip) = @_;
392
393 $tooltip =~ s/^\s+//;
394 $tooltip =~ s/\s+$//;
395
396 return if $self->{tooltip} eq $tooltip;
317 397
318 $self->{tooltip} = $tooltip; 398 $self->{tooltip} = $tooltip;
319 399
320 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 400 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
321 delete $CFClient::UI::TOOLTIP->{owner}; 401 delete $CFClient::UI::TOOLTIP->{owner};
… …
343 return if $FOCUS == $self; 423 return if $FOCUS == $self;
344 return unless $self->{can_focus}; 424 return unless $self->{can_focus};
345 425
346 my $focus = $FOCUS; $FOCUS = $self; 426 my $focus = $FOCUS; $FOCUS = $self;
347 427
348 $self->emit (focus_in => $focus); 428 $self->_emit (focus_in => $focus);
349 429
350 $focus->update if $focus; 430 $focus->update if $focus;
351 $FOCUS->update; 431 $FOCUS->update;
352} 432}
353 433
… …
356 436
357 return unless $FOCUS == $self; 437 return unless $FOCUS == $self;
358 438
359 my $focus = $FOCUS; undef $FOCUS; 439 my $focus = $FOCUS; undef $FOCUS;
360 440
361 $self->emit (focus_out => $focus); 441 $self->_emit (focus_out => $focus);
362 442
363 $focus->update if $focus; #? 443 $focus->update if $focus; #?
364}
365 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447}
448
366sub mouse_motion { } 449sub mouse_motion { 0 }
367sub button_up { } 450sub button_up { 0 }
368sub key_down { } 451sub key_down { 0 }
369sub key_up { } 452sub key_up { 0 }
370 453
371sub button_down { 454sub button_down {
372 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
373 456
374 $self->focus_in; 457 $self->focus_in;
375}
376 458
377sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
378sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
379sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
380sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
381sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 463 my ($self, $x, $y) = @_;
464
465 return () unless $self->{can_events};
466
467 return $self
468 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
469 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
470
471 ()
472}
473
474sub set_parent {
475 my ($self, $parent) = @_;
476
477 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502}
503
504sub realloc {
505 my ($self) = @_;
506
507 if ($self->{visible}) {
508 return if $self->{root}{realloc}{$self+0};
509
510 $self->{root}{realloc}{$self+0} = $self;
511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
516}
517
518sub update {
519 my ($self) = @_;
520
521 $self->{parent}->update
522 if $self->{parent};
523}
524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
382 535
383sub draw { 536sub draw {
384 my ($self) = @_; 537 my ($self) = @_;
385 538
386 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
387 550
388 glPushMatrix; 551 glPushMatrix;
389 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
390 $self->_draw; 553 $self->_draw;
391 glPopMatrix; 554 glPopMatrix;
… …
403 glVertex $x , $y + $self->{h}; 566 glVertex $x , $y + $self->{h};
404 glEnd; 567 glEnd;
405 glDisable GL_BLEND; 568 glDisable GL_BLEND;
406 } 569 }
407 570
408 if ($ENV{PCLIENT_DEBUG}) { 571 if ($ENV{CFPLUS_DEBUG} & 1) {
409 glPushMatrix; 572 glPushMatrix;
410 glColor 1, 1, 0, 1; 573 glColor 1, 1, 0, 1;
411 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
412 glBegin GL_LINE_LOOP; 575 glBegin GL_LINE_LOOP;
413 glVertex 0 , 0; 576 glVertex 0 , 0;
414 glVertex $self->{w}, 0; 577 glVertex $self->{w} - 1, 0;
415 glVertex $self->{w}, $self->{h}; 578 glVertex $self->{w} - 1, $self->{h} - 1;
416 glVertex 0 , $self->{h}; 579 glVertex 0 , $self->{h} - 1;
417 glEnd; 580 glEnd;
418 glPopMatrix; 581 glPopMatrix;
419 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 582 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
420 } 583 }
421} 584}
422 585
423sub _draw { 586sub _draw {
424 my ($self) = @_; 587 my ($self) = @_;
425 588
426 warn "no draw defined for $self\n"; 589 warn "no draw defined for $self\n";
427}
428
429sub find_widget {
430 my ($self, $x, $y) = @_;
431
432 return () unless $self->{can_events};
433
434 return $self
435 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
436 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
437
438 ()
439}
440
441sub set_parent {
442 my ($self, $parent) = @_;
443
444 Scalar::Util::weaken ($self->{parent} = $parent);
445
446 # TODO: req_w _does_change after ->reconfigure
447 $self->check_size
448 unless exists $self->{req_w};
449
450 $self->show;
451}
452
453sub check_size {
454 my ($self, $forced) = @_;
455
456 $self->{force_alloc} = 1 if $forced;
457 $CFClient::UI::ROOT->{check_size}{$self} = $self;
458}
459
460sub update {
461 my ($self) = @_;
462
463 $self->{parent}->update
464 if $self->{parent};
465}
466
467sub connect {
468 my ($self, $signal, $cb) = @_;
469
470 push @{ $self->{signal_cb}{$signal} }, $cb;
471}
472
473sub emit {
474 my ($self, $signal, @args) = @_;
475
476 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
477} 590}
478 591
479sub DESTROY { 592sub DESTROY {
480 my ($self) = @_; 593 my ($self) = @_;
481 594
… …
539 my ($class, %arg) = @_; 652 my ($class, %arg) = @_;
540 $class->SUPER::new (can_events => 0, %arg); 653 $class->SUPER::new (can_events => 0, %arg);
541} 654}
542 655
543sub size_request { 656sub size_request {
544 (0, 0) 657 my ($self) = @_;
658
659 ($self->{w} + 0, $self->{h} + 0)
545} 660}
546 661
547sub draw { } 662sub draw { }
548 663
549############################################################################# 664#############################################################################
… …
553our @ISA = CFClient::UI::Base::; 668our @ISA = CFClient::UI::Base::;
554 669
555sub new { 670sub new {
556 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
557 672
558 my $children = delete $arg{children} || []; 673 my $children = delete $arg{children};
559 674
560 my $self = $class->SUPER::new ( 675 my $self = $class->SUPER::new (
561 children => [], 676 children => [],
562 can_events => 0, 677 can_events => 0,
563 %arg, 678 %arg,
564 ); 679 );
680
565 $self->add ($_) for @$children; 681 $self->add (@$children)
682 if $children;
566 683
567 $self 684 $self
568} 685}
569 686
570sub add { 687sub add {
… …
578 $self->{children} = [ 695 $self->{children} = [
579 sort { $a->{z} <=> $b->{z} } 696 sort { $a->{z} <=> $b->{z} }
580 @{$self->{children}}, @widgets 697 @{$self->{children}}, @widgets
581 ]; 698 ];
582 699
583 $self->check_size (1); 700 $self->realloc;
584 $self->update;
585} 701}
586 702
587sub children { 703sub children {
588 @{ $_[0]{children} } 704 @{ $_[0]{children} }
589} 705}
… …
594 delete $child->{parent}; 710 delete $child->{parent};
595 $child->hide; 711 $child->hide;
596 712
597 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 713 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
598 714
599 $self->check_size; 715 $self->realloc;
600 $self->update;
601} 716}
602 717
603sub clear { 718sub clear {
604 my ($self) = @_; 719 my ($self) = @_;
605 720
… …
609 for (@$children) { 724 for (@$children) {
610 delete $_->{parent}; 725 delete $_->{parent};
611 $_->hide; 726 $_->hide;
612 } 727 }
613 728
614 $self->check_size; 729 $self->realloc;
615 $self->update;
616} 730}
617 731
618sub find_widget { 732sub find_widget {
619 my ($self, $x, $y) = @_; 733 my ($self, $x, $y) = @_;
620 734
621 $x -= $self->{x}; 735 $x -= $self->{x};
622 $y -= $self->{y}; 736 $y -= $self->{y};
623 737
624 my $res; 738 my $res;
625 739
626 for (reverse @{ $self->{children} }) { 740 for (reverse $self->visible_children) {
627 $res = $_->find_widget ($x, $y) 741 $res = $_->find_widget ($x, $y)
628 and return $res; 742 and return $res;
629 } 743 }
630 744
631 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
680 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
681} 795}
682 796
683############################################################################# 797#############################################################################
684 798
799# back-buffered drawing area
800
685package CFClient::UI::Window; 801package CFClient::UI::Window;
686 802
687our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
688 804
689use CFClient::OpenGL; 805use CFClient::OpenGL;
… …
707 $self->SUPER::size_allocate ($w, $h); 823 $self->SUPER::size_allocate ($w, $h);
708 $self->update; 824 $self->update;
709} 825}
710 826
711sub _render { 827sub _render {
828 my ($self) = @_;
829
712 $_[0]{children}[0]->draw; 830 $self->{children}[0]->draw;
713} 831}
714 832
715sub render_child { 833sub render_child {
716 my ($self) = @_; 834 my ($self) = @_;
717 835
718 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 836 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
719 glClearColor 0, 0, 0, 0; 837 glClearColor 0, 0, 0, 0;
720 glClear GL_COLOR_BUFFER_BIT; 838 glClear GL_COLOR_BUFFER_BIT;
721 839
840 {
841 package CFClient::UI::Base;
842
843 ($draw_x, $draw_y, $draw_w, $draw_h) =
844 (0, 0, $self->{w}, $self->{h});
845 }
846
722 $self->_render; 847 $self->_render;
723 }; 848 };
724} 849}
725 850
726sub _draw { 851sub _draw {
727 my ($self) = @_; 852 my ($self) = @_;
728 853
729 my ($w, $h) = ($self->w, $self->h); 854 my ($w, $h) = @$self{qw(w h)};
730 855
731 my $tex = $self->{texture} 856 my $tex = $self->{texture}
732 or return; 857 or return;
733 858
734 glEnable GL_TEXTURE_2D; 859 glEnable GL_TEXTURE_2D;
… …
744 869
745package CFClient::UI::ViewPort; 870package CFClient::UI::ViewPort;
746 871
747our @ISA = CFClient::UI::Window::; 872our @ISA = CFClient::UI::Window::;
748 873
874sub new {
875 my $class = shift;
876
877 $class->SUPER::new (
878 scroll_x => 0,
879 scroll_y => 1,
880 @_,
881 )
882}
883
749sub size_request { 884sub size_request {
750 my ($self) = @_; 885 my ($self) = @_;
751 886
752 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 887 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
753 888
754 @$self{qw(child_w child_h)} 889 $w = 10 if $self->{scroll_x};
890 $h = 10 if $self->{scroll_y};
891
892 ($w, $h)
755} 893}
756 894
757sub size_allocate { 895sub size_allocate {
758 my ($self, $w, $h) = @_; 896 my ($self, $w, $h) = @_;
759 897
760 my ($cw, $ch) = @$self{qw(child_w child_h)}; 898 my $child = $self->child;
761# $w = $self->{w}; 899
900 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
901 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
902
762 $self->child->configure (0, 0, $cw, $ch); 903 $self->child->configure (0, 0, $w, $h);
763 $self->update; 904 $self->update;
764} 905}
765 906
766sub set_offset { 907sub set_offset {
767 my ($self, $x, $y) = @_; 908 my ($self, $x, $y) = @_;
… …
801} 942}
802 943
803sub _render { 944sub _render {
804 my ($self) = @_; 945 my ($self) = @_;
805 946
947 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
948 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
949
806 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
807 951
808 $self->SUPER::_render; 952 $self->SUPER::_render;
809} 953}
810 954
… …
813package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
814 958
815our @ISA = CFClient::UI::HBox::; 959our @ISA = CFClient::UI::HBox::;
816 960
817sub new { 961sub new {
818 my $class = shift; 962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
819 965
820 my $self; 966 my $self;
821 967
822 my $slider = new CFClient::UI::Slider 968 my $slider = new CFClient::UI::Slider
823 vertical => 1, 969 vertical => 1,
824 range => [0, 0, 1, 0.01], # HACK fix 970 range => [0, 0, 1, 0.01], # HACK fix
825 connect_changed => sub { 971 on_changed => sub {
826 $self->{vp}->set_offset (0, $_[1]); 972 $self->{vp}->set_offset (0, $_[1]);
827 }, 973 },
828 ; 974 ;
829 975
830 $self = $class->SUPER::new ( 976 $self = $class->SUPER::new (
831 vp => (new CFClient::UI::ViewPort expand => 1), 977 vp => (new CFClient::UI::ViewPort expand => 1),
832 slider => $slider, 978 slider => $slider,
833 @_, 979 %arg,
834 ); 980 );
835 981
836 $self->{vp}->add ($self->{scrolled});
837 $self->add ($self->{vp});
838 $self->add ($self->{slider}); 982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
839 984
840 $self 985 $self
986}
987
988sub add {
989 my ($self, $widget) = @_;
990
991 $self->{vp}->add ($self->{child} = $widget);
992}
993
994sub update {
995 my ($self) = @_;
996
997 $self->SUPER::update;
998
999 # todo: overwrite size_allocate of child
1000 my $child = $self->{vp}->child;
1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
841} 1002}
842 1003
843sub size_allocate { 1004sub size_allocate {
844 my ($self, $w, $h) = @_; 1005 my ($self, $w, $h) = @_;
845 1006
… …
898 1059
899our @ISA = CFClient::UI::Bin::; 1060our @ISA = CFClient::UI::Bin::;
900 1061
901use CFClient::OpenGL; 1062use CFClient::OpenGL;
902 1063
903my @tex = 1064my $bg =
1065 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1066 mipmap => 1, wrap => 1;
1067
1068my @border =
904 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
905 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
906 1071
907sub new { 1072sub new {
908 my $class = shift; 1073 my ($class, %arg) = @_;
909 1074
910 # TODO: user_x, user_y, overwrite moveto? 1075 my $title = delete $arg{title};
911 1076
912 my $self = $class->SUPER::new ( 1077 my $self = $class->SUPER::new (
913 bg => [1, 1, 1, 1], 1078 bg => [1, 1, 1, 1],
914 border_bg => [1, 1, 1, 1], 1079 border_bg => [1, 1, 1, 1],
915 border => 0.6, 1080 border => 0.6,
916 is_toplevel => 1,
917 can_events => 1, 1081 can_events => 1,
918 @_ 1082 min_w => 16,
1083 min_h => 16,
1084 %arg,
919 ); 1085 );
920 1086
921 $self->{title} &&= new CFClient::UI::Label 1087 $self->{title} = new CFClient::UI::Label
922 align => 0, 1088 align => 0,
923 valign => 1, 1089 valign => 1,
924 text => $self->{title}, 1090 text => $title,
925 fontsize => $self->{border}; 1091 fontsize => $self->{border}
1092 if defined $title;
926 1093
927 $self 1094 $self
1095}
1096
1097sub add {
1098 my ($self, @widgets) = @_;
1099
1100 $self->SUPER::add (@widgets);
1101 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
928} 1102}
929 1103
930sub border { 1104sub border {
931 int $_[0]{border} * $::FONTSIZE 1105 int $_[0]{border} * $::FONTSIZE
932} 1106}
933 1107
934sub size_request { 1108sub size_request {
935 my ($self) = @_; 1109 my ($self) = @_;
1110
1111 $self->{title}->size_request
1112 if $self->{title};
936 1113
937 my ($w, $h) = $self->SUPER::size_request; 1114 my ($w, $h) = $self->SUPER::size_request;
938 1115
939 ( 1116 (
940 $w + $self->border * 2, 1117 $w + $self->border * 2,
… …
943} 1120}
944 1121
945sub size_allocate { 1122sub size_allocate {
946 my ($self, $w, $h) = @_; 1123 my ($self, $w, $h) = @_;
947 1124
1125 if ($self->{title}) {
1126 $self->{title}{w} = $w;
1127 $self->{title}{h} = $h;
1128 $self->{title}->size_allocate ($w, $h);
1129 }
1130
1131 my $border = $self->border;
1132
948 $h -= List::Util::max 0, $self->border * 2; 1133 $h -= List::Util::max 0, $border * 2;
949 $w -= List::Util::max 0, $self->border * 2; 1134 $w -= List::Util::max 0, $border * 2;
950 1135
951 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
952 if $self->{title};
953
954 $self->child->configure ($self->border, $self->border, $w, $h); 1136 $self->child->configure ($border, $border, $w, $h);
955} 1137}
956 1138
957sub button_down { 1139sub button_down {
958 my ($self, $ev, $x, $y) = @_; 1140 my ($self, $ev, $x, $y) = @_;
959 1141
… …
975 my ($ev, $x, $y) = @_; 1157 my ($ev, $x, $y) = @_;
976 1158
977 my $dx = $ev->{x} - $ox; 1159 my $dx = $ev->{x} - $ox;
978 my $dy = $ev->{y} - $oy; 1160 my $dy = $ev->{y} - $oy;
979 1161
980 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1162 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
981 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1163 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1164
982 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1165 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
983 $self->check_size; 1166 $self->realloc;
984 }; 1167 };
985 1168
986 } elsif ($lr ^ $td) { 1169 } elsif ($lr ^ $td) {
987 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1170 my ($ox, $oy) = ($ev->{x}, $ev->{y});
988 my ($bx, $by) = ($self->{x}, $self->{y}); 1171 my ($bx, $by) = ($self->{x}, $self->{y});
… …
990 $self->{motion} = sub { 1173 $self->{motion} = sub {
991 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
992 1175
993 ($x, $y) = ($ev->{x}, $ev->{y}); 1176 ($x, $y) = ($ev->{x}, $ev->{y});
994 1177
995 $self->move ($bx + $x - $ox, $by + $y - $oy); 1178 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
996 $self->update; 1179 # HACK: the next line is required to enforce placement
1180 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
997 }; 1181 };
1182 } else {
1183 return 0;
1184 }
1185
998 } 1186 1
999} 1187}
1000 1188
1001sub button_up { 1189sub button_up {
1002 my ($self, $ev, $x, $y) = @_; 1190 my ($self, $ev, $x, $y) = @_;
1003 1191
1004 delete $self->{motion}; 1192 !!delete $self->{motion}
1005} 1193}
1006 1194
1007sub mouse_motion { 1195sub mouse_motion {
1008 my ($self, $ev, $x, $y) = @_; 1196 my ($self, $ev, $x, $y) = @_;
1009 1197
1010 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1198 $self->{motion}->($ev, $x, $y) if $self->{motion};
1199
1200 !!$self->{motion}
1011} 1201}
1012 1202
1013sub _draw { 1203sub _draw {
1014 my ($self) = @_; 1204 my ($self) = @_;
1015 1205
1206 my $child = $self->{children}[0];
1207
1016 my ($w, $h ) = ($self->{w}, $self->{h}); 1208 my ($w, $h ) = ($self->{w}, $self->{h});
1017 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1209 my ($cw, $ch) = ($child->{w}, $child->{h});
1018 1210
1019 glEnable GL_TEXTURE_2D; 1211 glEnable GL_TEXTURE_2D;
1020 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1212 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1021 1213
1022 my $border = $self->border; 1214 my $border = $self->border;
1023 1215
1024 glColor @{ $self->{border_bg} }; 1216 glColor @{ $self->{border_bg} };
1025 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1217 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1026 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1218 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1027 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1219 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1028 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1220 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1029 1221
1030 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1222 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1031 my $bg = $tex[0]; 1223 glColor @{ $self->{bg} };
1032 1224
1033 # TODO: repeat texture not scale 1225 # TODO: repeat texture not scale
1226 # solve this better(?)
1034 my $rep_x = $cw / $bg->{w}; 1227 $bg->{s} = $cw / $bg->{w};
1035 my $rep_y = $ch / $bg->{h}; 1228 $bg->{t} = $ch / $bg->{h};
1036
1037 glColor @{ $self->{bg} };
1038
1039 $bg->{s} = $rep_x;
1040 $bg->{t} = $rep_y;
1041 $bg->{wrap_mode} = 1;
1042 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1229 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1043 } 1230 }
1044 1231
1045 glDisable GL_TEXTURE_2D; 1232 glDisable GL_TEXTURE_2D;
1046 1233
1047 $self->{title}->draw if $self->{title};
1048
1049 $self->child->draw; 1234 $child->draw;
1235
1236 if ($self->{title}) {
1237 glTranslate 0, $border - $self->{h};
1238 $self->{title}->_draw;
1239 }
1050} 1240}
1051 1241
1052############################################################################# 1242#############################################################################
1053 1243
1054package CFClient::UI::Table; 1244package CFClient::UI::Table;
… …
1062sub new { 1252sub new {
1063 my $class = shift; 1253 my $class = shift;
1064 1254
1065 $class->SUPER::new ( 1255 $class->SUPER::new (
1066 col_expand => [], 1256 col_expand => [],
1067 @_ 1257 @_,
1068 ) 1258 )
1259}
1260
1261sub children {
1262 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1069} 1263}
1070 1264
1071sub add { 1265sub add {
1072 my ($self, $x, $y, $child) = @_; 1266 my ($self, $x, $y, $child) = @_;
1073 1267
1074 $child->set_parent ($self); 1268 $child->set_parent ($self);
1075 $self->{children}[$y][$x] = $child; 1269 $self->{children}[$y][$x] = $child;
1076 1270
1077 $child->check_size; 1271 $self->realloc;
1078} 1272}
1079 1273
1080sub children {
1081 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1082}
1083
1084# TODO: move to container class maybe? send childs a signal on removal? 1274# TODO: move to container class maybe? send children a signal on removal?
1085sub clear { 1275sub clear {
1086 my ($self) = @_; 1276 my ($self) = @_;
1087 1277
1088 my @children = $self->children; 1278 my @children = $self->children;
1089 delete $self->{children}; 1279 delete $self->{children};
… …
1091 for (@children) { 1281 for (@children) {
1092 delete $_->{parent}; 1282 delete $_->{parent};
1093 $_->hide; 1283 $_->hide;
1094 } 1284 }
1095 1285
1096 $self->update; 1286 $self->realloc;
1097} 1287}
1098 1288
1099sub get_wh { 1289sub get_wh {
1100 my ($self) = @_; 1290 my ($self) = @_;
1101 1291
… …
1132sub size_allocate { 1322sub size_allocate {
1133 my ($self, $w, $h) = @_; 1323 my ($self, $w, $h) = @_;
1134 1324
1135 my ($ws, $hs) = $self->get_wh; 1325 my ($ws, $hs) = $self->get_wh;
1136 1326
1137 my $req_w = sum @$ws; 1327 my $req_w = (sum @$ws) || 1;
1138 my $req_h = sum @$hs; 1328 my $req_h = (sum @$hs) || 1;
1139 1329
1140 # TODO: nicer code && do row_expand 1330 # TODO: nicer code && do row_expand
1141 my @col_expand = @{$self->{col_expand}}; 1331 my @col_expand = @{$self->{col_expand}};
1142 @col_expand = (1) x @$ws unless @col_expand; 1332 @col_expand = (1) x @$ws unless @col_expand;
1143 my $col_expand = (sum @col_expand) || 1; 1333 my $col_expand = (sum @col_expand) || 1;
… …
1197 } 1387 }
1198} 1388}
1199 1389
1200############################################################################# 1390#############################################################################
1201 1391
1202package CFClient::UI::HBox; 1392package CFClient::UI::Box;
1203
1204# TODO: wrap into common Box base class
1205 1393
1206our @ISA = CFClient::UI::Container::; 1394our @ISA = CFClient::UI::Container::;
1207 1395
1208sub size_request { 1396sub size_request {
1209 my ($self) = @_; 1397 my ($self) = @_;
1210 1398
1211 my @alloc = map [$_->size_request], @{$self->{children}}; 1399 $self->{vertical}
1212 1400 ? (
1213 ( 1401 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1214 (List::Util::sum map $_->[0], @alloc), 1402 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1215 (List::Util::max map $_->[1], @alloc), 1403 )
1216 ) 1404 : (
1405 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1406 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1407 )
1217} 1408}
1218 1409
1219sub size_allocate { 1410sub size_allocate {
1220 my ($self, $w, $h) = @_; 1411 my ($self, $w, $h) = @_;
1221 1412
1222 ($h, $w) = ($w, $h); 1413 my $space = $self->{vertical} ? $h : $w;
1223
1224 my $children = $self->{children}; 1414 my $children = $self->{children};
1225 1415
1226 my @h = map $_->{req_w}, @$children; 1416 my @req;
1227 1417
1228 my $req_h = List::Util::sum @h; 1418 if ($self->{homogeneous}) {
1229 1419 @req = ($space / (@$children || 1)) x @$children;
1230 if ($req_h > $h) {
1231 # ah well, not enough space
1232 $_ *= $h / $req_h for @h;
1233 } else { 1420 } else {
1421 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1422 my $req = List::Util::sum @req;
1423
1424 if ($req > $space) {
1425 # ah well, not enough space
1426 $_ *= $space / $req for @req;
1427 } else {
1234 my $exp = List::Util::sum map $_->{expand}, @$children; 1428 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1235 $exp ||= 1;
1236 1429
1430 $space = ($space - $req) / $expand; # remaining space to give away
1431
1432 $req[$_] += $space * $children->[$_]{expand}
1237 for (0 .. $#$children) { 1433 for 0 .. $#$children;
1238 my $child = $children->[$_];
1239
1240 my $alloc_h = $h[$_];
1241 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1242 $h[$_] = $alloc_h;
1243 } 1434 }
1244 } 1435 }
1245 1436
1246 CFClient::UI::harmonize \@h; 1437 CFClient::UI::harmonize \@req;
1247 1438
1248 my $y = 0; 1439 my $pos = 0;
1249 for (0 .. $#$children) { 1440 for (0 .. $#$children) {
1250 my $child = $children->[$_];
1251 my $h = $h[$_]; 1441 my $alloc = $req[$_];
1252 $child->configure ($y, 0, $h, $w); 1442 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1253 1443
1254 $y += $h; 1444 $pos += $alloc;
1255 } 1445 }
1256 1446
1257 1 1447 1
1258} 1448}
1259 1449
1260############################################################################# 1450#############################################################################
1261 1451
1452package CFClient::UI::HBox;
1453
1454our @ISA = CFClient::UI::Box::;
1455
1456sub new {
1457 my $class = shift;
1458
1459 $class->SUPER::new (
1460 vertical => 0,
1461 @_,
1462 )
1463}
1464
1465#############################################################################
1466
1262package CFClient::UI::VBox; 1467package CFClient::UI::VBox;
1263 1468
1264# TODO: wrap into common Box base class
1265
1266our @ISA = CFClient::UI::Container::; 1469our @ISA = CFClient::UI::Box::;
1267 1470
1268sub size_request { 1471sub new {
1269 my ($self) = @_; 1472 my $class = shift;
1270 1473
1271 my @alloc = map [$_->size_request], @{$self->{children}}; 1474 $class->SUPER::new (
1272 1475 vertical => 1,
1273 ( 1476 @_,
1274 (List::Util::max map $_->[0], @alloc),
1275 (List::Util::sum map $_->[1], @alloc),
1276 ) 1477 )
1277}
1278
1279sub size_allocate {
1280 my ($self, $w, $h) = @_;
1281
1282 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1283
1284 my $children = $self->{children};
1285
1286 my @h = map $_->{req_h}, @$children;
1287
1288 my $req_h = List::Util::sum @h;
1289
1290 if ($req_h > $h) {
1291 # ah well, not enough space
1292 $_ *= $h / $req_h for @h;
1293 } else {
1294 my $exp = List::Util::sum map $_->{expand}, @$children;
1295 $exp ||= 1;
1296
1297 for (0 .. $#$children) {
1298 my $child = $children->[$_];
1299
1300 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1301 }
1302 }
1303
1304 CFClient::UI::harmonize \@h;
1305
1306 my $y = 0;
1307 for (0 .. $#$children) {
1308 my $child = $children->[$_];
1309 my $h = $h[$_];
1310 $child->configure (0, $y, $w, $h);
1311
1312 $y += $h;
1313 }
1314
1315 1
1316} 1478}
1317 1479
1318############################################################################# 1480#############################################################################
1319 1481
1320package CFClient::UI::Label; 1482package CFClient::UI::Label;
… …
1337 ellipsise => 3, # end 1499 ellipsise => 3, # end
1338 layout => (new CFClient::Layout), 1500 layout => (new CFClient::Layout),
1339 fontsize => 1, 1501 fontsize => 1,
1340 align => -1, 1502 align => -1,
1341 valign => -1, 1503 valign => -1,
1342 padding => 2, 1504 padding_x => 2,
1505 padding_y => 2,
1343 can_events => 0, 1506 can_events => 0,
1344 %arg 1507 %arg
1345 ); 1508 );
1346 1509
1347 if (exists $self->{template}) { 1510 if (exists $self->{template}) {
… …
1383 $self->{text} = "T$text"; 1546 $self->{text} = "T$text";
1384 1547
1385 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1548 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1386 $self->{layout}->set_text ($text); 1549 $self->{layout}->set_text ($text);
1387 1550
1551 $self->realloc;
1388 $self->update; 1552 $self->update;
1389 $self->check_size;
1390} 1553}
1391 1554
1392sub set_markup { 1555sub set_markup {
1393 my ($self, $markup) = @_; 1556 my ($self, $markup) = @_;
1394 1557
… …
1398 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1561 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1399 1562
1400 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1563 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1401 $self->{layout}->set_markup ($markup); 1564 $self->{layout}->set_markup ($markup);
1402 1565
1566 $self->realloc;
1403 $self->update; 1567 $self->update;
1404 $self->check_size;
1405} 1568}
1406 1569
1407sub size_request { 1570sub size_request {
1408 my ($self) = @_; 1571 my ($self) = @_;
1409 1572
… …
1423 1586
1424 $w = List::Util::max $w, $w2; 1587 $w = List::Util::max $w, $w2;
1425 $h = List::Util::max $h, $h2; 1588 $h = List::Util::max $h, $h2;
1426 } 1589 }
1427 1590
1428 ( 1591 ($w, $h)
1429 $w + $self->{padding} * 2,
1430 $h + $self->{padding} * 2,
1431 )
1432} 1592}
1433 1593
1434sub size_allocate { 1594sub size_allocate {
1435 my ($self, $w, $h) = @_; 1595 my ($self, $w, $h) = @_;
1436 1596
1597 delete $self->{ox};
1598
1437 delete $self->{texture}; 1599 delete $self->{texture}
1600 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1438} 1601}
1439 1602
1440sub set_fontsize { 1603sub set_fontsize {
1441 my ($self, $fontsize) = @_; 1604 my ($self, $fontsize) = @_;
1442 1605
1443 $self->{fontsize} = $fontsize; 1606 $self->{fontsize} = $fontsize;
1444 delete $self->{texture}; 1607 delete $self->{texture};
1445 1608
1446 $self->update; 1609 $self->realloc;
1447 $self->check_size;
1448} 1610}
1449 1611
1450sub _draw { 1612sub _draw {
1451 my ($self) = @_; 1613 my ($self) = @_;
1452 1614
… …
1458 $self->{layout}->set_width ($self->{w}); 1620 $self->{layout}->set_width ($self->{w});
1459 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1621 $self->{layout}->set_ellipsise ($self->{ellipsise});
1460 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1622 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1461 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1623 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1462 1624
1463 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1625 new_from_layout CFClient::Texture $self->{layout}
1626 };
1464 1627
1628 unless (exists $self->{ox}) {
1465 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1629 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1466 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1630 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1467 : ($self->{w} - $tex->{w}) * 0.5); 1631 : ($self->{w} - $tex->{w}) * 0.5);
1468 1632
1469 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1633 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1470 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1634 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1471 : ($self->{h} - $tex->{h}) * 0.5); 1635 : ($self->{h} - $tex->{h}) * 0.5);
1472
1473 $tex
1474 }; 1636 };
1475 1637
1476 glEnable GL_TEXTURE_2D; 1638 glEnable GL_TEXTURE_2D;
1477 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1639 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1478 1640
… …
1516 1678
1517 delete $self->{cur_h}; 1679 delete $self->{cur_h};
1518 1680
1519 return if $self->{text} eq $text; 1681 return if $self->{text} eq $text;
1520 1682
1521 delete $self->{texture};
1522
1523 $self->{last_activity} = $::NOW; 1683 $self->{last_activity} = $::NOW;
1524 $self->{text} = $text; 1684 $self->{text} = $text;
1525 1685
1526 $text =~ s/./*/g if $self->{hidden}; 1686 $text =~ s/./*/g if $self->{hidden};
1527 $self->{layout}->set_text ("$text "); 1687 $self->{layout}->set_text ("$text ");
1528 1688
1529 $self->emit (changed => $self->{text}); 1689 $self->_emit (changed => $self->{text});
1690 $self->update;
1530} 1691}
1531 1692
1532sub set_text { 1693sub set_text {
1533 my ($self, $text) = @_; 1694 my ($self, $text) = @_;
1534 1695
1535 $self->{cursor} = length $text; 1696 $self->{cursor} = length $text;
1536 $self->_set_text ($text); 1697 $self->_set_text ($text);
1537 $self->update; 1698
1538 $self->check_size; 1699 $self->realloc;
1539} 1700}
1540 1701
1541sub get_text { 1702sub get_text {
1542 $_[0]{text} 1703 $_[0]{text}
1543} 1704}
… …
1546 my ($self) = @_; 1707 my ($self) = @_;
1547 1708
1548 my ($w, $h) = $self->SUPER::size_request; 1709 my ($w, $h) = $self->SUPER::size_request;
1549 1710
1550 ($w + 1, $h) # add 1 for cursor 1711 ($w + 1, $h) # add 1 for cursor
1551}
1552
1553sub size_allocate {
1554 my ($self, $w, $h) = @_;
1555
1556 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1557} 1712}
1558 1713
1559sub key_down { 1714sub key_down {
1560 my ($self, $ev) = @_; 1715 my ($self, $ev) = @_;
1561 1716
… …
1576 } elsif ($sym == CFClient::SDLK_HOME) { 1731 } elsif ($sym == CFClient::SDLK_HOME) {
1577 $self->{cursor} = 0; 1732 $self->{cursor} = 0;
1578 } elsif ($sym == CFClient::SDLK_END) { 1733 } elsif ($sym == CFClient::SDLK_END) {
1579 $self->{cursor} = length $text; 1734 $self->{cursor} = length $text;
1580 } elsif ($uni == 27) { 1735 } elsif ($uni == 27) {
1581 $self->emit ('escape'); 1736 $self->_emit ('escape');
1582 } elsif ($uni) { 1737 } elsif ($uni) {
1583 substr $text, $self->{cursor}++, 0, chr $uni; 1738 substr $text, $self->{cursor}++, 0, chr $uni;
1739 } else {
1740 return 0;
1584 } 1741 }
1585 1742
1586 $self->_set_text ($text); 1743 $self->_set_text ($text);
1587 $self->update; 1744
1588 $self->check_size; 1745 $self->realloc;
1746
1747 1
1589} 1748}
1590 1749
1591sub focus_in { 1750sub focus_in {
1592 my ($self) = @_; 1751 my ($self) = @_;
1593 1752
… …
1608 utf8::encode $text; 1767 utf8::encode $text;
1609 $self->{cursor} = length substr $text, 0, $idx; 1768 $self->{cursor} = length substr $text, 0, $idx;
1610 1769
1611 $self->_set_text ($self->{text}); 1770 $self->_set_text ($self->{text});
1612 $self->update; 1771 $self->update;
1772
1773 1
1613} 1774}
1614 1775
1615sub mouse_motion { 1776sub mouse_motion {
1616 my ($self, $ev, $x, $y) = @_; 1777 my ($self, $ev, $x, $y) = @_;
1617# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1778# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1779
1780 0
1618} 1781}
1619 1782
1620sub _draw { 1783sub _draw {
1621 my ($self) = @_; 1784 my ($self) = @_;
1622 1785
… …
1673 if ($sym == 13) { 1836 if ($sym == 13) {
1674 unshift @{$self->{history}}, 1837 unshift @{$self->{history}},
1675 my $txt = $self->get_text; 1838 my $txt = $self->get_text;
1676 $self->{history_pointer} = -1; 1839 $self->{history_pointer} = -1;
1677 $self->{history_saveback} = ''; 1840 $self->{history_saveback} = '';
1678 $self->emit (activate => $txt); 1841 $self->_emit (activate => $txt);
1679 $self->update; 1842 $self->update;
1680 1843
1681 } elsif ($sym == CFClient::SDLK_UP) { 1844 } elsif ($sym == CFClient::SDLK_UP) {
1682 if ($self->{history_pointer} < 0) { 1845 if ($self->{history_pointer} < 0) {
1683 $self->{history_saveback} = $self->get_text; 1846 $self->{history_saveback} = $self->get_text;
… …
1699 } else { 1862 } else {
1700 $self->set_text ($self->{history_saveback}); 1863 $self->set_text ($self->{history_saveback});
1701 } 1864 }
1702 1865
1703 } else { 1866 } else {
1704 $self->SUPER::key_down ($ev); 1867 return $self->SUPER::key_down ($ev)
1868 }
1869
1705 } 1870 1
1706
1707} 1871}
1708 1872
1709############################################################################# 1873#############################################################################
1710 1874
1711package CFClient::UI::Button; 1875package CFClient::UI::Button;
… …
1720 1884
1721sub new { 1885sub new {
1722 my $class = shift; 1886 my $class = shift;
1723 1887
1724 $class->SUPER::new ( 1888 $class->SUPER::new (
1725 padding => 4, 1889 padding_x => 4,
1890 padding_y => 4,
1726 fg => [1, 1, 1], 1891 fg => [1, 1, 1],
1727 active_fg => [0, 0, 1], 1892 active_fg => [0, 0, 1],
1728 can_hover => 1, 1893 can_hover => 1,
1729 align => 0, 1894 align => 0,
1730 valign => 0, 1895 valign => 0,
1731 can_events => 1, 1896 can_events => 1,
1732 @_ 1897 @_
1733 ) 1898 )
1734} 1899}
1735 1900
1901sub activate { }
1902
1736sub button_up { 1903sub button_up {
1737 my ($self, $ev, $x, $y) = @_; 1904 my ($self, $ev, $x, $y) = @_;
1738 1905
1906 $self->emit ("activate")
1739 if ($x >= 0 && $x < $self->{w} 1907 if $x >= 0 && $x < $self->{w}
1740 && $y >= 0 && $y < $self->{h}) { 1908 && $y >= 0 && $y < $self->{h};
1741 $self->emit ("activate"); 1909
1742 } 1910 1
1743} 1911}
1744 1912
1745sub _draw { 1913sub _draw {
1746 my ($self) = @_; 1914 my ($self) = @_;
1747 1915
… …
1776 1944
1777sub new { 1945sub new {
1778 my $class = shift; 1946 my $class = shift;
1779 1947
1780 $class->SUPER::new ( 1948 $class->SUPER::new (
1781 padding => 2, 1949 padding_x => 2,
1950 padding_y => 2,
1782 fg => [1, 1, 1], 1951 fg => [1, 1, 1],
1783 active_fg => [1, 1, 0], 1952 active_fg => [1, 1, 0],
1784 bg => [0, 0, 0, 0.2], 1953 bg => [0, 0, 0, 0.2],
1785 active_bg => [1, 1, 1, 0.5], 1954 active_bg => [1, 1, 1, 0.5],
1786 state => 0, 1955 state => 0,
… …
1790} 1959}
1791 1960
1792sub size_request { 1961sub size_request {
1793 my ($self) = @_; 1962 my ($self) = @_;
1794 1963
1795 ($self->{padding} * 2 + 6) x 2 1964 (6) x 2
1796} 1965}
1797 1966
1798sub button_down { 1967sub button_down {
1799 my ($self, $ev, $x, $y) = @_; 1968 my ($self, $ev, $x, $y) = @_;
1800 1969
1801 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1970 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1802 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1971 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1803 $self->{state} = !$self->{state}; 1972 $self->{state} = !$self->{state};
1804 $self->emit (changed => $self->{state}); 1973 $self->_emit (changed => $self->{state});
1974 } else {
1975 return 0
1976 }
1977
1805 } 1978 1
1806} 1979}
1807 1980
1808sub _draw { 1981sub _draw {
1809 my ($self) = @_; 1982 my ($self) = @_;
1810 1983
1811 $self->SUPER::_draw; 1984 $self->SUPER::_draw;
1812 1985
1813 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1986 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1814 1987
1815 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1988 my ($w, $h) = @$self{qw(w h)};
1989
1990 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1816 1991
1817 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1992 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1818 1993
1819 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1994 my $tex = $self->{state} ? $tex[1] : $tex[0];
1820 1995
… …
2085 fg => [1, 1, 1], 2260 fg => [1, 1, 1],
2086 active_fg => [0, 0, 0], 2261 active_fg => [0, 0, 0],
2087 bg => [0, 0, 0, 0.2], 2262 bg => [0, 0, 0, 0.2],
2088 active_bg => [1, 1, 1, 0.5], 2263 active_bg => [1, 1, 1, 0.5],
2089 range => [0, 0, 100, 10, 0], 2264 range => [0, 0, 100, 10, 0],
2090 req_w => $::WIDTH / 80, 2265 min_w => $::WIDTH / 80,
2091 req_h => $::WIDTH / 80, 2266 min_h => $::WIDTH / 80,
2092 vertical => 0, 2267 vertical => 0,
2093 can_hover => 1, 2268 can_hover => 1,
2094 inner_pad => 0.02, 2269 inner_pad => 0.02,
2095 @_ 2270 @_
2096 ); 2271 );
… …
2099 $self->update; 2274 $self->update;
2100 2275
2101 $self 2276 $self
2102} 2277}
2103 2278
2279sub changed { }
2280
2104sub set_range { 2281sub set_range {
2105 my ($self, $range) = @_; 2282 my ($self, $range) = @_;
2106 2283
2107 $self->{range} = $range; 2284 ($range, $self->{range}) = ($self->{range}, $range);
2108 2285
2109 $self->update; 2286 $self->update
2287 if "@$range" ne "@{$self->{range}}";
2110} 2288}
2111 2289
2112sub set_value { 2290sub set_value {
2113 my ($self, $value) = @_; 2291 my ($self, $value) = @_;
2114 2292
… …
2125 if $unit; 2303 if $unit;
2126 2304
2127 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2305 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2128 2306
2129 if ($value != $old_value) { 2307 if ($value != $old_value) {
2130 $self->emit (changed => $value); 2308 $self->_emit (changed => $value);
2131 $self->update; 2309 $self->update;
2132 } 2310 }
2133} 2311}
2134 2312
2135sub size_request { 2313sub size_request {
2136 my ($self) = @_; 2314 my ($self) = @_;
2137 2315
2138 my $w = $self->{req_w}; 2316 ($self->{req_w}, $self->{req_h})
2139 my $h = $self->{req_h};
2140
2141 $self->{vertical} ? ($h, $w) : ($w, $h)
2142} 2317}
2143 2318
2144sub button_down { 2319sub button_down {
2145 my ($self, $ev, $x, $y) = @_; 2320 my ($self, $ev, $x, $y) = @_;
2146 2321
2147 $self->SUPER::button_down ($ev, $x, $y); 2322 $self->SUPER::button_down ($ev, $x, $y);
2148 2323
2149 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2324 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2150 2325
2151 $self->mouse_motion ($ev, $x, $y); 2326 $self->mouse_motion ($ev, $x, $y)
2152} 2327}
2153 2328
2154sub mouse_motion { 2329sub mouse_motion {
2155 my ($self, $ev, $x, $y) = @_; 2330 my ($self, $ev, $x, $y) = @_;
2156 2331
… …
2160 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2335 my (undef, $lo, $hi, $page) = @{$self->{range}};
2161 2336
2162 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2337 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2163 2338
2164 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2339 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2340 } else {
2341 return 0;
2342 }
2343
2165 } 2344 1
2166} 2345}
2167 2346
2168sub update { 2347sub update {
2169 my ($self) = @_; 2348 my ($self) = @_;
2170 2349
2171 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2350 delete $self->{knob_w};
2351 $self->SUPER::update;
2352}
2353
2354sub _draw {
2355 my ($self) = @_;
2356
2357 unless ($self->{knob_w}) {
2172 $self->set_value ($self->{range}[0]); 2358 $self->set_value ($self->{range}[0]);
2173 2359
2174 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2360 my ($value, $lo, $hi, $page) = @{$self->{range}};
2175 my $range = ($hi - $page - $lo) || 1e-100; 2361 my $range = ($hi - $page - $lo) || 1e-100;
2176 2362
… …
2182 $value = ($value - $lo) / $range; 2368 $value = ($value - $lo) / $range;
2183 $value = $value * $self->{scale} + $self->{offset}; 2369 $value = $value * $self->{scale} + $self->{offset};
2184 2370
2185 $self->{knob_x} = $value - $knob_w * 0.5; 2371 $self->{knob_x} = $value - $knob_w * 0.5;
2186 $self->{knob_w} = $knob_w; 2372 $self->{knob_w} = $knob_w;
2187 }); 2373 }
2188
2189 $self->SUPER::update;
2190}
2191
2192sub _draw {
2193 my ($self) = @_;
2194 2374
2195 $self->SUPER::_draw (); 2375 $self->SUPER::_draw ();
2196 2376
2197 glScale $self->{w}, $self->{h}; 2377 glScale $self->{w}, $self->{h};
2198 2378
… …
2497 2677
2498sub new { 2678sub new {
2499 my $class = shift; 2679 my $class = shift;
2500 2680
2501 my $self = $class->SUPER::new ( 2681 my $self = $class->SUPER::new (
2502 state => 0, 2682 state => 0,
2503 connect_activate => \&toggle_flopper, 2683 on_activate => \&toggle_flopper,
2504 @_ 2684 @_
2505 ); 2685 );
2506 2686
2507 if ($self->{state}) {
2508 $self->{state} = 0;
2509 $self->toggle_flopper;
2510 }
2511
2512 $self 2687 $self
2513} 2688}
2514 2689
2515sub toggle_flopper { 2690sub toggle_flopper {
2516 my ($self) = @_; 2691 my ($self) = @_;
2517 2692
2518 # TODO: use animation 2693 $self->{other}->toggle_visibility;
2519 if ($self->{state} = !$self->{state}) {
2520 $CFClient::UI::ROOT->add ($self->{other});
2521 $self->{other}->move ($self->coord2global (0, $self->{h}));
2522 $self->emit ("open");
2523 } else {
2524 $CFClient::UI::ROOT->remove ($self->{other});
2525 $self->emit ("close");
2526 }
2527
2528 $self->emit (changed => $self->{state});
2529} 2694}
2530 2695
2531############################################################################# 2696#############################################################################
2532 2697
2533package CFClient::UI::Tooltip; 2698package CFClient::UI::Tooltip;
… …
2546} 2711}
2547 2712
2548sub set_tooltip_from { 2713sub set_tooltip_from {
2549 my ($self, $widget) = @_; 2714 my ($self, $widget) = @_;
2550 2715
2716 my $tooltip = $widget->{tooltip};
2717
2718 if ($ENV{CFPLUS_DEBUG} & 2) {
2719 $tooltip .= "\n\n" . (ref $widget) . "\n"
2720 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2721 . "req $widget->{req_w} $widget->{req_h}\n"
2722 . "visible $widget->{visible}";
2723 }
2724
2551 $self->add (new CFClient::UI::Label 2725 $self->add (new CFClient::UI::Label
2552 markup => $widget->{tooltip}, 2726 markup => $tooltip,
2553 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2727 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2554 fontsize => 0.8, 2728 fontsize => 0.8,
2555 fg => [0, 0, 0, 1], 2729 fg => [0, 0, 0, 1],
2556 ellipsise => 0, 2730 ellipsise => 0,
2557 font => ($widget->{tooltip_font} || $::FONT_PROP), 2731 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2568 2742
2569sub size_allocate { 2743sub size_allocate {
2570 my ($self, $w, $h) = @_; 2744 my ($self, $w, $h) = @_;
2571 2745
2572 $self->SUPER::size_allocate ($w - 4, $h - 4); 2746 $self->SUPER::size_allocate ($w - 4, $h - 4);
2747}
2748
2749sub visibility_change {
2750 my ($self, $visible) = @_;
2751
2752 return unless $visible;
2753
2754 $self->{root}->on_post_alloc ("move_$self" => sub {
2755 my $widget = $self->{owner}
2756 or return;
2757
2758 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2759
2760 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2761 if $x + $self->{w} > $::WIDTH;
2762
2763 $self->move_abs ($x, $y);
2764 });
2573} 2765}
2574 2766
2575sub _draw { 2767sub _draw {
2576 my ($self) = @_; 2768 my ($self) = @_;
2577 2769
… …
2594 glVertex $w, $h; 2786 glVertex $w, $h;
2595 glVertex $w, 0; 2787 glVertex $w, 0;
2596 glEnd; 2788 glEnd;
2597 2789
2598 glTranslate 2 - 0.375, 2 - 0.375; 2790 glTranslate 2 - 0.375, 2 - 0.375;
2791
2599 $self->SUPER::_draw; 2792 $self->SUPER::_draw;
2600} 2793}
2601 2794
2602############################################################################# 2795#############################################################################
2603 2796
… …
2609 2802
2610sub new { 2803sub new {
2611 my $class = shift; 2804 my $class = shift;
2612 2805
2613 my $self = $class->SUPER::new ( 2806 my $self = $class->SUPER::new (
2614 aspect => 1, 2807 aspect => 1,
2808 can_events => 0,
2615 @_, 2809 @_,
2616 ); 2810 );
2617 2811
2618 if ($self->{anim} && $self->{animspeed}) { 2812 if ($self->{anim} && $self->{animspeed}) {
2619 Scalar::Util::weaken (my $widget = $self); 2813 Scalar::Util::weaken (my $widget = $self);
… …
2678 $self->SUPER::DESTROY; 2872 $self->SUPER::DESTROY;
2679} 2873}
2680 2874
2681############################################################################# 2875#############################################################################
2682 2876
2683package CFClient::UI::InventoryItem; 2877package CFClient::UI::Buttonbar;
2684 2878
2685our @ISA = CFClient::UI::HBox::; 2879our @ISA = CFClient::UI::HBox::;
2686 2880
2687sub _item_to_desc { 2881# TODO: should actualyl wrap buttons and other goodies.
2688 my ($item) = @_;
2689
2690 my $desc =
2691 $item->{nrof} < 2
2692 ? $item->{name}
2693 : "$item->{nrof} × $item->{name_pl}";
2694
2695 $item->{flags} & Crossfire::Protocol::F_OPEN
2696 and $desc .= " (open)";
2697 $item->{flags} & Crossfire::Protocol::F_APPLIED
2698 and $desc .= " (applied)";
2699 $item->{flags} & Crossfire::Protocol::F_UNPAID
2700 and $desc .= " (unpaid)";
2701 $item->{flags} & Crossfire::Protocol::F_MAGIC
2702 and $desc .= " (magic)";
2703 $item->{flags} & Crossfire::Protocol::F_CURSED
2704 and $desc .= " (cursed)";
2705 $item->{flags} & Crossfire::Protocol::F_DAMNED
2706 and $desc .= " (damned)";
2707 $item->{flags} & Crossfire::Protocol::F_LOCKED
2708 and $desc .= " *";
2709
2710 $desc
2711}
2712
2713sub new {
2714 my $class = shift;
2715
2716 my %args = @_;
2717
2718 my $item = delete $args{item};
2719
2720 my $desc = _item_to_desc ($item);
2721
2722 my $self = $class->SUPER::new (
2723 can_hover => 1,
2724 can_events => 1,
2725 tooltip => ((CFClient::UI::Label::escape $desc)
2726 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2727 connect_button_down => sub {
2728 my ($self, $ev, $x, $y) = @_;
2729
2730 # todo: maybe put examine on 1? but should just be a tooltip :(
2731 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2732 my $targ = $::CONN->{player}{tag};
2733
2734 if ($item->{container} == $::CONN->{player}{tag}) {
2735 $targ = $main::OPENCONT;
2736 }
2737
2738 $::CONN->send ("move $targ $item->{tag} 0");
2739 } elsif ($ev->{button} == 1) {
2740 $::CONN->send ("examine $item->{tag}");
2741 } elsif ($ev->{button} == 2) {
2742 $::CONN->send ("apply $item->{tag}");
2743 } elsif ($ev->{button} == 3) {
2744 my @menu_items = (
2745 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2746 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2747 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2748 (
2749 $item->{flags} & Crossfire::Protocol::F_LOCKED
2750 ? (
2751 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2752 )
2753 : (
2754 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2755 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2756 )
2757 ),
2758 );
2759
2760 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2761 }
2762
2763 1
2764 },
2765 %args
2766 );
2767
2768
2769 $self->add (new CFClient::UI::Face
2770 can_events => 0,
2771 face => $item->{face},
2772 anim => $item->{anim},
2773 animspeed => $item->{animspeed},
2774 );
2775
2776 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2777
2778 $self->{item} = $item;
2779
2780 $self->update_item;
2781
2782 $self
2783}
2784
2785sub update_item {
2786 my ($self) = @_;
2787
2788 my $desc = _item_to_desc ($self->{item});
2789
2790 $self->{name_lbl}->set_text ($desc);
2791}
2792
2793#############################################################################
2794
2795package CFClient::UI::Inventory;
2796
2797our @ISA = CFClient::UI::ScrolledWindow::;
2798
2799sub new {
2800 my $class = shift;
2801
2802 my $self = $class->SUPER::new (
2803 scrolled => (new CFClient::UI::Table),
2804 @_,
2805 );
2806
2807 $self
2808}
2809
2810sub set_items {
2811 my ($self, $items) = @_;
2812
2813 $self->{scrolled}->clear;
2814 return unless $items;
2815
2816 my @items = sort {
2817 ($a->{type} <=> $b->{type})
2818 or ($a->{name} cmp $b->{name})
2819 } @$items;
2820
2821 $self->{real_items} = \@items;
2822
2823 for my $item (@items) {
2824 $item->{item} = $item;
2825 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2826 $item->update_item ();
2827 }
2828
2829 my $i = 0;
2830 for (@items) {
2831 $self->{scrolled}->add (0, $i, $_);
2832 my $nrof = $_->{item}->{nrof} || 1;
2833 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2834 }
2835
2836# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2837}
2838
2839sub size_request {
2840 my ($self) = @_;
2841 ($self->{req_w}, $self->{req_h});
2842}
2843 2882
2844############################################################################# 2883#############################################################################
2845 2884
2846package CFClient::UI::Menu; 2885package CFClient::UI::Menu;
2847 2886
… …
2881 2920
2882# popup given the event (must be a mouse button down event currently) 2921# popup given the event (must be a mouse button down event currently)
2883sub popup { 2922sub popup {
2884 my ($self, $ev) = @_; 2923 my ($self, $ev) = @_;
2885 2924
2886 $self->emit ("popdown"); 2925 $self->_emit ("popdown");
2887 2926
2888 # maybe save $GRAB? must be careful about events... 2927 # maybe save $GRAB? must be careful about events...
2889 $GRAB = $self; 2928 $GRAB = $self;
2890 $self->{button} = $ev->{button}; 2929 $self->{button} = $ev->{button};
2891 2930
2892 $self->show; 2931 $self->show;
2893 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2932 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2894} 2933}
2895 2934
2896sub mouse_motion { 2935sub mouse_motion {
2897 my ($self, $ev, $x, $y) = @_; 2936 my ($self, $ev, $x, $y) = @_;
2898 2937
2899 # TODO: should use vbox->find_widget or so 2938 # TODO: should use vbox->find_widget or so
2900 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2939 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2901 $self->{hover} = $self->{item}{$HOVER}; 2940 $self->{hover} = $self->{item}{$HOVER};
2941
2942 0
2902} 2943}
2903 2944
2904sub button_up { 2945sub button_up {
2905 my ($self, $ev, $x, $y) = @_; 2946 my ($self, $ev, $x, $y) = @_;
2906 2947
2907 if ($ev->{button} == $self->{button}) { 2948 if ($ev->{button} == $self->{button}) {
2908 undef $GRAB; 2949 undef $GRAB;
2909 $self->hide; 2950 $self->hide;
2910 2951
2911 $self->emit ("popdown"); 2952 $self->_emit ("popdown");
2912 $self->{hover}[1]->() if $self->{hover}; 2953 $self->{hover}[1]->() if $self->{hover};
2954 } else {
2955 return 0
2956 }
2957
2958 1
2959}
2960
2961#############################################################################
2962
2963package CFClient::UI::Multiplexer;
2964
2965our @ISA = CFClient::UI::Container::;
2966
2967sub new {
2968 my $class = shift;
2969
2970 my $self = $class->SUPER::new (
2971 @_,
2972 );
2973
2974 $self->{current} = $self->{children}[0]
2975 if @{ $self->{children} };
2976
2977 $self
2978}
2979
2980sub add {
2981 my ($self, @widgets) = @_;
2982
2983 $self->SUPER::add (@widgets);
2984
2985 $self->{current} = $self->{children}[0]
2986 if @{ $self->{children} };
2987}
2988
2989sub set_current_page {
2990 my ($self, $page_or_widget) = @_;
2991
2992 my $widget = ref $page_or_widget
2993 ? $page_or_widget
2994 : $self->{children}[$page_or_widget];
2995
2996 $self->{current} = $widget;
2997 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2998
2999 $self->_emit (page_changed => $self->{current});
3000
3001 $self->realloc;
3002}
3003
3004sub visible_children {
3005 $_[0]{current}
3006}
3007
3008sub size_request {
3009 my ($self) = @_;
3010
3011 $self->{current}->size_request
3012}
3013
3014sub size_allocate {
3015 my ($self, $w, $h) = @_;
3016
3017 $self->{current}->configure (0, 0, $w, $h);
3018}
3019
3020sub _draw {
3021 my ($self) = @_;
3022
3023 $self->{current}->draw;
3024}
3025
3026#############################################################################
3027
3028package CFClient::UI::Notebook;
3029
3030our @ISA = CFClient::UI::VBox::;
3031
3032sub new {
3033 my $class = shift;
3034
3035 my $self = $class->SUPER::new (
3036 buttonbar => (new CFClient::UI::Buttonbar),
3037 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3038 # filter => # will be put between multiplexer and $self
3039 @_,
3040 );
2913 } 3041
3042 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3043 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3044
3045 $self
3046}
3047
3048sub add {
3049 my ($self, $title, $widget, $tooltip) = @_;
3050
3051 Scalar::Util::weaken $self;
3052
3053 $self->{buttonbar}->add (new CFClient::UI::Button
3054 markup => $title,
3055 tooltip => $tooltip,
3056 on_activate => sub { $self->set_current_page ($widget) },
3057 );
3058
3059 $self->{multiplexer}->add ($widget);
3060}
3061
3062sub set_current_page {
3063 my ($self, $page) = @_;
3064
3065 $self->{multiplexer}->set_current_page ($page);
3066 $self->_emit (page_changed => $self->{multiplexer}{current});
2914} 3067}
2915 3068
2916############################################################################# 3069#############################################################################
2917 3070
2918package CFClient::UI::Statusbox; 3071package CFClient::UI::Statusbox;
… …
2978sub add { 3131sub add {
2979 my ($self, $text, %arg) = @_; 3132 my ($self, $text, %arg) = @_;
2980 3133
2981 $text =~ s/^\s+//; 3134 $text =~ s/^\s+//;
2982 $text =~ s/\s+$//; 3135 $text =~ s/\s+$//;
3136
3137 return unless $text;
2983 3138
2984 my $timeout = time + ((delete $arg{timeout}) || 60); 3139 my $timeout = time + ((delete $arg{timeout}) || 60);
2985 3140
2986 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3141 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2987 3142
… …
3021 $self->SUPER::reconfigure; 3176 $self->SUPER::reconfigure;
3022} 3177}
3023 3178
3024############################################################################# 3179#############################################################################
3025 3180
3026package CFClient::UI::Root; 3181package CFClient::UI::Inventory;
3027 3182
3028our @ISA = CFClient::UI::Container::; 3183our @ISA = CFClient::UI::ScrolledWindow::;
3029
3030use CFClient::OpenGL;
3031 3184
3032sub new { 3185sub new {
3033 my $class = shift; 3186 my $class = shift;
3034 3187
3035 $class->SUPER::new ( 3188 my $self = $class->SUPER::new (
3189 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3190 @_,
3191 );
3192
3193 $self
3194}
3195
3196sub set_items {
3197 my ($self, $items) = @_;
3198
3199 $self->{child}->clear;
3200 return unless $items;
3201
3202 my @items = sort {
3203 ($a->{type} <=> $b->{type})
3204 or ($a->{name} cmp $b->{name})
3205 } @$items;
3206
3207 $self->{real_items} = \@items;
3208
3209 my $row = 0;
3210 for my $item (@items) {
3211 CFClient::Item::update_widgets $item;
3212
3213 $self->{child}->add (0, $row, $item->{face_widget});
3214 $self->{child}->add (1, $row, $item->{desc_widget});
3215 $self->{child}->add (2, $row, $item->{weight_widget});
3216
3217 $row++;
3218 }
3219}
3220
3221#############################################################################
3222
3223package CFClient::UI::BindEditor;
3224
3225our @ISA = CFClient::UI::FancyFrame::;
3226
3227sub new {
3228 my $class = shift;
3229
3230 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3231
3232 $self->add (my $vb = new CFClient::UI::VBox);
3233
3234
3235 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3236 text => "start recording",
3237 tooltip => "Start/Stops recording of actions."
3238 ."All subsequent actions after the recording started will be captured."
3239 ."The actions are displayed after the record was stopped."
3240 ."To bind the action you have to click on the 'Bind' button",
3241 on_activate => sub {
3242 unless ($self->{recording}) {
3243 $self->start;
3244 } else {
3245 $self->stop;
3246 }
3247 });
3248
3249 $vb->add (new CFClient::UI::Label text => "Actions:");
3250 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3251
3252 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3253 $vb->add (my $hb = new CFClient::UI::HBox);
3254 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3255 $hb->add (new CFClient::UI::Button
3256 text => "bind",
3257 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3258 on_activate => sub {
3259 $self->ask_for_bind;
3260 });
3261
3262 $vb->add (my $hb = new CFClient::UI::HBox);
3263 $hb->add (new CFClient::UI::Button
3264 text => "ok",
3265 expand => 1,
3266 tooltip => "This closes the binding editor and saves the binding",
3267 on_activate => sub {
3268 $self->hide;
3269 $self->commit;
3270 });
3271
3272 $hb->add (new CFClient::UI::Button
3273 text => "cancel",
3274 expand => 1,
3275 tooltip => "This closes the binding editor without saving",
3276 on_activate => sub {
3277 $self->hide;
3278 $self->{binding_cancel}->()
3279 if $self->{binding_cancel};
3280 });
3281
3282 $self->update_binding_widgets;
3283
3284 $self
3285}
3286
3287sub commit {
3288 my ($self) = @_;
3289 my ($mod, $sym, $cmds) = $self->get_binding;
3290 if ($sym != 0 && @$cmds > 0) {
3291 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3292 ."'. Don't forget 'Save Config'!");
3293 $self->{binding_change}->($mod, $sym, $cmds)
3294 if $self->{binding_change};
3295 } else {
3296 $::STATUSBOX->add ("No action bound, no key or action specified!");
3297 $self->{binding_cancel}->()
3298 if $self->{binding_cancel};
3299 }
3300}
3301
3302sub start {
3303 my ($self) = @_;
3304
3305 $self->{rec_btn}->set_text ("stop recording");
3306 $self->{recording} = 1;
3307 $self->clear_command_list;
3308 $::CONN->start_record if $::CONN;
3309}
3310
3311sub stop {
3312 my ($self) = @_;
3313
3314 $self->{rec_btn}->set_text ("start recording");
3315 $self->{recording} = 0;
3316
3317 my $rec;
3318 $rec = $::CONN->stop_record if $::CONN;
3319 return unless ref $rec eq 'ARRAY';
3320 $self->set_command_list ($rec);
3321}
3322
3323
3324sub ask_for_bind_and_commit {
3325 my ($self) = @_;
3326 $self->ask_for_bind (1);
3327}
3328
3329sub ask_for_bind {
3330 my ($self, $commit) = @_;
3331
3332 CFClient::Binder::open_binding_dialog (sub {
3333 my ($mod, $sym) = @_;
3334 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3335 $self->update_binding_widgets;
3336 $self->commit if $commit;
3337 });
3338}
3339
3340# $mod and $sym are the modifiers and key symbol
3341# $cmds is a array ref of strings (the commands)
3342# $cb is the callback that is executed on OK
3343# $ccb is the callback that is executed on CANCEL and
3344# when the binding was unsuccessful on OK
3345sub set_binding {
3346 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3347
3348 $self->clear_command_list;
3349 $self->{recording} = 0;
3350 $self->{rec_btn}->set_text ("start recording");
3351
3352 $self->{binding} = [$mod, $sym];
3353 $self->{commands} = $cmds;
3354
3355 $self->{binding_change} = $cb;
3356 $self->{binding_cancel} = $ccb;
3357
3358 $self->update_binding_widgets;
3359}
3360
3361# this is a shortcut method that asks for a binding
3362# and then just binds it.
3363sub do_quick_binding {
3364 my ($self, $cmds) = @_;
3365 $self->set_binding (undef, undef, $cmds, sub {
3366 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3367 });
3368 $self->ask_for_bind (1);
3369}
3370
3371sub update_binding_widgets {
3372 my ($self) = @_;
3373 my ($mod, $sym, $cmds) = $self->get_binding;
3374 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3375 $self->set_command_list ($cmds);
3376}
3377
3378sub get_binding {
3379 my ($self) = @_;
3380 return (
3381 $self->{binding}->[0],
3382 $self->{binding}->[1],
3383 [ grep { defined $_ } @{$self->{commands}} ]
3384 );
3385}
3386
3387sub clear_command_list {
3388 my ($self) = @_;
3389 $self->{cmdbox}->clear ();
3390}
3391
3392sub set_command_list {
3393 my ($self, $cmds) = @_;
3394
3395 $self->{cmdbox}->clear ();
3396 $self->{commands} = $cmds;
3397
3398 my $idx = 0;
3399
3400 for (@$cmds) {
3401 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3402
3403 my $i = $idx;
3404 $hb->add (new CFClient::UI::Label text => $_);
3405 $hb->add (new CFClient::UI::Button
3406 text => "delete",
3407 tooltip => "Deletes the action from the record",
3408 on_activate => sub {
3409 $self->{cmdbox}->remove ($hb);
3410 $cmds->[$i] = undef;
3411 });
3412
3413
3414 $idx++
3415 }
3416}
3417
3418#############################################################################
3419
3420package CFClient::UI::SpellList;
3421
3422our @ISA = CFClient::UI::Table::;
3423
3424sub new {
3425 my $class = shift;
3426
3427 my $self = $class->SUPER::new (
3428 binding => [],
3429 commands => [],
3036 @_, 3430 @_,
3037 ) 3431 )
3038} 3432}
3039 3433
3040sub configure { 3434# XXX: Do sorting? Argl...
3041 my ($self, $x, $y, $w, $h) = @_; 3435sub add_spell {
3042
3043 $self->{w} = $w;
3044 $self->{h} = $h;
3045}
3046
3047sub check_size {
3048 my ($self) = @_; 3436 my ($self, $spell) = @_;
3437 $self->{spells}->{$spell->{name}} = $spell;
3049 3438
3050 $self->size_allocate ($self->{w}, $self->{h}) 3439 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3051 if $self->{w}; 3440 face => $spell->{face},
3441 can_hover => 1,
3442 can_events => 1,
3443 tooltip => $spell->{message});
3444
3445 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3446 text => $spell->{name},
3447 can_hover => 1,
3448 can_events => 1,
3449 tooltip => $spell->{message},
3450 expand => 1);
3451
3452 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3453 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3454 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3455 expand => 1);
3456
3457 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3458 text => "bind to key",
3459 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3460}
3461
3462sub rebuild_spell_list {
3463 my ($self) = @_;
3464 $self->{tbl_idx} = 0;
3465 $self->add_spell ($_) for values %{$self->{spells}};
3466}
3467
3468sub remove_spell {
3469 my ($self, $spell) = @_;
3470 delete $self->{spells}->{$spell->{name}};
3471 $self->rebuild_spell_list;
3472}
3473
3474#############################################################################
3475
3476package CFClient::UI::Root;
3477
3478our @ISA = CFClient::UI::Container::;
3479
3480use CFClient::OpenGL;
3481
3482sub new {
3483 my $class = shift;
3484
3485 my $self = $class->SUPER::new (
3486 visible => 1,
3487 @_,
3488 );
3489
3490 Scalar::Util::weaken ($self->{root} = $self);
3491
3492 $self
3052} 3493}
3053 3494
3054sub size_request { 3495sub size_request {
3055 my ($self) = @_; 3496 my ($self) = @_;
3056 3497
3057 ($self->{w}, $self->{h}) 3498 ($self->{w}, $self->{h})
3499}
3500
3501sub _to_pixel {
3502 my ($coord, $size, $max) = @_;
3503
3504 $coord =
3505 $coord eq "center" ? ($max - $size) * 0.5
3506 : $coord eq "max" ? $max
3507 : $coord;
3508
3509 $coord = 0 if $coord < 0;
3510 $coord = $max - $size if $coord > $max - $size;
3511
3512 int $coord + 0.5
3058} 3513}
3059 3514
3060sub size_allocate { 3515sub size_allocate {
3061 my ($self, $w, $h) = @_; 3516 my ($self, $w, $h) = @_;
3062 3517
3063 for my $child ($self->children) { 3518 for my $child ($self->children) {
3064 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3519 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3065 3520
3066 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3521 $X = $child->{force_x} if exists $child->{force_x};
3067 if exists $child->{req_x}; 3522 $Y = $child->{force_y} if exists $child->{force_y};
3068 3523
3069 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3524 $X = _to_pixel $X, $W, $self->{w};
3070 if exists $child->{req_y}; 3525 $Y = _to_pixel $Y, $H, $self->{h};
3071
3072 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3073 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3074 3526
3075 $child->configure ($X, $Y, $W, $H); 3527 $child->configure ($X, $Y, $W, $H);
3076 } 3528 }
3077} 3529}
3078 3530
… …
3089} 3541}
3090 3542
3091sub update { 3543sub update {
3092 my ($self) = @_; 3544 my ($self) = @_;
3093 3545
3094 $self->check_size;
3095 $::WANT_REFRESH++; 3546 $::WANT_REFRESH++;
3096} 3547}
3097 3548
3098sub add { 3549sub add {
3099 my ($self, @children) = @_; 3550 my ($self, @children) = @_;
3100 3551
3101 for (my @widgets = @children; my $w = pop @widgets; ) {
3102 push @widgets, $w->children;
3103 $w->{root} = $self;
3104 $w->{visible} = 1;
3105 }
3106
3107 for my $child (@children) {
3108 $child->{is_toplevel} = 1; 3552 $_->{is_toplevel} = 1
3109 3553 for @children;
3110 # integerise window positions
3111 $child->{x} = int $child->{x};
3112 $child->{y} = int $child->{y};
3113 }
3114 3554
3115 $self->SUPER::add (@children); 3555 $self->SUPER::add (@children);
3116} 3556}
3117 3557
3118sub remove { 3558sub remove {
3119 my ($self, @children) = @_; 3559 my ($self, @children) = @_;
3120 3560
3121 $self->SUPER::remove (@children); 3561 $self->SUPER::remove (@children);
3562
3563 delete $self->{is_toplevel}
3564 for @children;
3122 3565
3123 while (@children) { 3566 while (@children) {
3124 my $w = pop @children; 3567 my $w = pop @children;
3125 push @children, $w->children; 3568 push @children, $w->children;
3126 delete $w->{visible}; 3569 $w->set_invisible;
3127 } 3570 }
3128} 3571}
3129 3572
3130sub on_refresh { 3573sub on_refresh {
3131 my ($self, $id, $cb) = @_; 3574 my ($self, $id, $cb) = @_;
… …
3145 while ($self->{refresh_hook}) { 3588 while ($self->{refresh_hook}) {
3146 $_->() 3589 $_->()
3147 for values %{delete $self->{refresh_hook}}; 3590 for values %{delete $self->{refresh_hook}};
3148 } 3591 }
3149 3592
3150 if ($self->{check_size}) { 3593 if ($self->{realloc}) {
3151 my @queue = ([], []); 3594 my %queue;
3595 my @queue;
3596 my $widget;
3152 3597
3153 for (;;) { 3598 outer:
3154 if ($self->{check_size}) { 3599 while () {
3155 # heuristic: check containers last 3600 if (my $realloc = delete $self->{realloc}) {
3156 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3601 for $widget (values %$realloc) {
3157 for values %{delete $self->{check_size}} 3602 $widget->{visible} or next; # do not resize invisible widgets
3603
3604 $queue{$widget+0}++ and next; # duplicates are common
3605
3606 push @{ $queue[$widget->{visible}] }, $widget;
3607 }
3158 } 3608 }
3159 3609
3160 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3610 while () {
3611 @queue or last outer;
3161 3612
3162 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3613 $widget = pop @{ $queue[-1] || [] }
3163 ? @$widget{qw(user_w user_h)} 3614 and last;
3164 : $widget->size_request;
3165
3166 if (delete $widget->{force_alloc}
3167 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3168 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3169 3615
3616 pop @queue;
3617 }
3618
3619 delete $queue{$widget+0};
3620
3621 my ($w, $h) = $widget->size_request;
3622
3623 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3624 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3625
3626 $w = $widget->{force_w} if exists $widget->{force_w};
3627 $h = $widget->{force_h} if exists $widget->{force_h};
3628
3629 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3630 || delete $widget->{force_realloc}) {
3170 $widget->{req_w} = $w; 3631 $widget->{req_w} = $w;
3171 $widget->{req_h} = $h; 3632 $widget->{req_h} = $h;
3172 3633
3173 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3634 $self->{size_alloc}{$widget+0} = $widget;
3174 3635
3175 $widget->{parent}->check_size
3176 if $widget->{parent}; 3636 if (my $parent = $widget->{parent}) {
3637 $self->{realloc}{$parent+0} = $parent
3638 unless $queue{$parent+0};
3639
3640 $parent->{force_size_alloc} = 1;
3641 $self->{size_alloc}{$parent+0} = $parent;
3642 }
3177 } 3643 }
3644
3645 delete $self->{realloc}{$widget+0};
3178 } 3646 }
3179 } 3647 }
3180 3648
3181 while ($self->{size_alloc}) { 3649 while (my $size_alloc = delete $self->{size_alloc}) {
3182 for (values %{delete $self->{size_alloc}}) { 3650 my @queue = sort { $b->{visible} <=> $a->{visible} }
3183 my ($widget, $w, $h) = @$_; 3651 values %$size_alloc;
3652
3653 while () {
3654 my $widget = pop @queue || last;
3655
3656 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3184 3657
3185 $w = 0 if $w < 0; 3658 $w = 0 if $w < 0;
3186 $h = 0 if $h < 0; 3659 $h = 0 if $h < 0;
3187 3660
3661 $w = int $w + 0.5;
3662 $h = int $h + 0.5;
3663
3664 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3665 $widget->{old_w} = $widget->{w};
3666 $widget->{old_h} = $widget->{h};
3667
3188 $widget->{w} = $w; 3668 $widget->{w} = $w;
3189 $widget->{h} = $h; 3669 $widget->{h} = $h;
3190 $widget->size_allocate ($w, $h); 3670
3191 $widget->emit (size_allocate => $w, $h); 3671 $widget->emit (size_allocate => $w, $h);
3672 }
3192 } 3673 }
3193 } 3674 }
3194 3675
3195 while ($self->{post_alloc_hook}) { 3676 while ($self->{post_alloc_hook}) {
3196 $_->() 3677 $_->()
3197 for values %{delete $self->{post_alloc_hook}}; 3678 for values %{delete $self->{post_alloc_hook}};
3198 } 3679 }
3680
3199 3681
3200 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3682 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3683 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3202 glClear GL_COLOR_BUFFER_BIT; 3684 glClear GL_COLOR_BUFFER_BIT;
3203 3685
… …
3205 glLoadIdentity; 3687 glLoadIdentity;
3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3688 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3207 glMatrixMode GL_MODELVIEW; 3689 glMatrixMode GL_MODELVIEW;
3208 glLoadIdentity; 3690 glLoadIdentity;
3209 3691
3692 {
3693 package CFClient::UI::Base;
3694
3695 ($draw_x, $draw_y, $draw_w, $draw_h) =
3696 (0, 0, $self->{w}, $self->{h});
3697 }
3698
3210 $self->_draw; 3699 $self->_draw;
3211} 3700}
3212 3701
3213############################################################################# 3702#############################################################################
3214 3703

Diff Legend

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