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.229 by root, Wed May 24 21:49:58 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) = @_;
… …
144 157
145 $_->update 158 $_->update
146 for @widgets; 159 for @widgets;
147} 160}
148 161
162sub reconfigure_widgets {
163 # make a copy, otherwise C<for> complains about freed values.
164 my @widgets = values %WIDGET;
165
166 $_->reconfigure
167 for @widgets;
168}
169
149# call when resolution changes etc. 170# call when resolution changes etc.
150sub rescale_widgets { 171sub rescale_widgets {
151 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
152 173
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 174 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 if ($widget->{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
158 $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.]+$/;
159 $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};
160 $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};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $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.]+$/;
163 $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};
164 $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};
165 $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
166 } 189 }
167
168 $widget->reconfigure;
169 } 190 }
191
192 reconfigure_widgets;
170} 193}
171 194
172############################################################################# 195#############################################################################
173 196
174package CFClient::UI::Base; 197package CFClient::UI::Base;
… …
179 202
180sub new { 203sub new {
181 my $class = shift; 204 my $class = shift;
182 205
183 my $self = bless { 206 my $self = bless {
184 x => 0, 207 x => "center",
185 y => 0, 208 y => "center",
186 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
187 can_events => 1, 212 can_events => 1,
188 @_ 213 @_
189 }, $class; 214 }, $class;
190 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
191 for (keys %$self) { 218 for (keys %$self) {
192 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
194 } 221 }
195 } 222 }
196 223
197 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 }
198 235
199 $self 236 $self
200} 237}
201 238
202sub destroy { 239sub destroy {
… …
206 %$self = (); 243 %$self = ();
207} 244}
208 245
209sub show { 246sub show {
210 my ($self) = @_; 247 my ($self) = @_;
248
211 return if $self->{parent}; 249 return if $self->{parent};
212 250
213 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
214} 252}
215 253
216sub show_centered { 254sub set_visible {
217 my ($self) = @_; 255 my ($self) = @_;
256
218 return if $self->{parent}; 257 return if $self->{visible};
219 258
220 $self->show; 259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
221 261
222 $CFClient::UI::ROOT->on_post_alloc ( 262 $self->emit (visibility_change => 1);
223 "centered $self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 },
226 );
227}
228 263
229sub hide { 264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
267}
268
269sub set_invisible {
230 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};
231 278
232 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
233 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
234 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
235 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
236 if $self->{parent}; 313 if $self->{parent};
237} 314}
238 315
239sub move { 316sub move_abs {
240 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
241 318
242 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
243 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
244 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
245 322
246 $self->update; 323 $self->update;
247} 324}
248 325
249sub set_size { 326sub set_size {
250 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
251 328
252 $self->{user_w} = $w; 329 $self->{force_w} = $w;
253 $self->{user_h} = $h; 330 $self->{force_h} = $h;
254 331
255 $self->check_size; 332 $self->realloc;
256} 333}
257 334
258sub size_request { 335sub size_request {
259 require Carp; 336 require Carp;
260 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
262 339
263sub configure { 340sub configure {
264 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
265 342
266 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
267 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
268 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
269 348
270 # use alignment to adjust x, y 349 # use alignment to adjust x, y
271 350
272 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
273 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
274
275 ($w, $h) = ($w2, $h2);
276 } 353 }
277 354
278 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
279 $self->{x} = $x; 356 $self->{x} = $x;
280 $self->{y} = $y; 357 $self->{y} = $y;
281 $self->update; 358 $self->update;
282 } 359 }
283 360
284 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
285 $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;
286 } 368 }
287} 369}
288 370
289sub size_allocate { 371sub size_allocate {
290 # nothing to be done 372 # nothing to be done
291} 373}
292 374
293sub reconfigure {
294 my ($self) = @_;
295
296 $self->check_size (1);
297 $self->update;
298}
299
300sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
301} 381}
302 382
303sub set_max_size { 383sub set_max_size {
304 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
305 385
… …
307 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
308} 388}
309 389
310sub set_tooltip { 390sub set_tooltip {
311 my ($self, $tooltip) = @_; 391 my ($self, $tooltip) = @_;
392
393 $tooltip =~ s/^\s+//;
394 $tooltip =~ s/\s+$//;
395
396 return if $self->{tooltip} eq $tooltip;
312 397
313 $self->{tooltip} = $tooltip; 398 $self->{tooltip} = $tooltip;
314 399
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 400 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner}; 401 delete $CFClient::UI::TOOLTIP->{owner};
… …
338 return if $FOCUS == $self; 423 return if $FOCUS == $self;
339 return unless $self->{can_focus}; 424 return unless $self->{can_focus};
340 425
341 my $focus = $FOCUS; $FOCUS = $self; 426 my $focus = $FOCUS; $FOCUS = $self;
342 427
343 $self->emit (focus_in => $focus); 428 $self->_emit (focus_in => $focus);
344 429
345 $focus->update if $focus; 430 $focus->update if $focus;
346 $FOCUS->update; 431 $FOCUS->update;
347} 432}
348 433
… …
351 436
352 return unless $FOCUS == $self; 437 return unless $FOCUS == $self;
353 438
354 my $focus = $FOCUS; undef $FOCUS; 439 my $focus = $FOCUS; undef $FOCUS;
355 440
356 $self->emit (focus_out => $focus); 441 $self->_emit (focus_out => $focus);
357 442
358 $focus->update if $focus; #? 443 $focus->update if $focus; #?
359}
360 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447}
448
361sub mouse_motion { } 449sub mouse_motion { 0 }
362sub button_up { } 450sub button_up { 0 }
363sub key_down { } 451sub key_down { 0 }
364sub key_up { } 452sub key_up { 0 }
365 453
366sub button_down { 454sub button_down {
367 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
368 456
369 $self->focus_in; 457 $self->focus_in;
370}
371 458
372sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
373sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
374sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
375sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
376sub 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
377 535
378sub draw { 536sub draw {
379 my ($self) = @_; 537 my ($self) = @_;
380 538
381 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);
382 550
383 glPushMatrix; 551 glPushMatrix;
384 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
385 $self->_draw; 553 $self->_draw;
386 glPopMatrix; 554 glPopMatrix;
… …
398 glVertex $x , $y + $self->{h}; 566 glVertex $x , $y + $self->{h};
399 glEnd; 567 glEnd;
400 glDisable GL_BLEND; 568 glDisable GL_BLEND;
401 } 569 }
402 570
403 if ($ENV{PCLIENT_DEBUG}) { 571 if ($ENV{CFPLUS_DEBUG} & 1) {
404 glPushMatrix; 572 glPushMatrix;
405 glColor 1, 1, 0, 1; 573 glColor 1, 1, 0, 1;
406 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407 glBegin GL_LINE_LOOP; 575 glBegin GL_LINE_LOOP;
408 glVertex 0 , 0; 576 glVertex 0 , 0;
409 glVertex $self->{w}, 0; 577 glVertex $self->{w} - 1, 0;
410 glVertex $self->{w}, $self->{h}; 578 glVertex $self->{w} - 1, $self->{h} - 1;
411 glVertex 0 , $self->{h}; 579 glVertex 0 , $self->{h} - 1;
412 glEnd; 580 glEnd;
413 glPopMatrix; 581 glPopMatrix;
414 #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;
415 } 583 }
416} 584}
417 585
418sub _draw { 586sub _draw {
419 my ($self) = @_; 587 my ($self) = @_;
420 588
421 warn "no draw defined for $self\n"; 589 warn "no draw defined for $self\n";
422}
423
424sub find_widget {
425 my ($self, $x, $y) = @_;
426
427 return () unless $self->{can_events};
428
429 return $self
430 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
431 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
432
433 ()
434}
435
436sub set_parent {
437 my ($self, $parent) = @_;
438
439 Scalar::Util::weaken ($self->{parent} = $parent);
440
441 # TODO: req_w _does_change after ->reconfigure
442 $self->check_size
443 unless exists $self->{req_w};
444
445 $self->show;
446}
447
448sub check_size {
449 my ($self, $forced) = @_;
450
451 $self->{force_alloc} = 1 if $forced;
452 $CFClient::UI::ROOT->{check_size}{$self} = $self;
453}
454
455sub update {
456 my ($self) = @_;
457
458 $self->{parent}->update
459 if $self->{parent};
460}
461
462sub connect {
463 my ($self, $signal, $cb) = @_;
464
465 push @{ $self->{signal_cb}{$signal} }, $cb;
466}
467
468sub emit {
469 my ($self, $signal, @args) = @_;
470
471 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
472} 590}
473 591
474sub DESTROY { 592sub DESTROY {
475 my ($self) = @_; 593 my ($self) = @_;
476 594
… …
534 my ($class, %arg) = @_; 652 my ($class, %arg) = @_;
535 $class->SUPER::new (can_events => 0, %arg); 653 $class->SUPER::new (can_events => 0, %arg);
536} 654}
537 655
538sub size_request { 656sub size_request {
539 (0, 0) 657 my ($self) = @_;
658
659 ($self->{w} + 0, $self->{h} + 0)
540} 660}
541 661
542sub draw { } 662sub draw { }
543 663
544############################################################################# 664#############################################################################
… …
548our @ISA = CFClient::UI::Base::; 668our @ISA = CFClient::UI::Base::;
549 669
550sub new { 670sub new {
551 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
552 672
553 my $children = delete $arg{children} || []; 673 my $children = delete $arg{children};
554 674
555 my $self = $class->SUPER::new ( 675 my $self = $class->SUPER::new (
556 children => [], 676 children => [],
557 can_events => 0, 677 can_events => 0,
558 %arg, 678 %arg,
559 ); 679 );
680
560 $self->add ($_) for @$children; 681 $self->add (@$children)
682 if $children;
561 683
562 $self 684 $self
563} 685}
564 686
565sub add { 687sub add {
… …
573 $self->{children} = [ 695 $self->{children} = [
574 sort { $a->{z} <=> $b->{z} } 696 sort { $a->{z} <=> $b->{z} }
575 @{$self->{children}}, @widgets 697 @{$self->{children}}, @widgets
576 ]; 698 ];
577 699
578 $self->check_size (1); 700 $self->realloc;
579 $self->update;
580} 701}
581 702
582sub children { 703sub children {
583 @{ $_[0]{children} } 704 @{ $_[0]{children} }
584} 705}
… …
589 delete $child->{parent}; 710 delete $child->{parent};
590 $child->hide; 711 $child->hide;
591 712
592 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 713 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593 714
594 $self->check_size; 715 $self->realloc;
595 $self->update;
596} 716}
597 717
598sub clear { 718sub clear {
599 my ($self) = @_; 719 my ($self) = @_;
600 720
… …
604 for (@$children) { 724 for (@$children) {
605 delete $_->{parent}; 725 delete $_->{parent};
606 $_->hide; 726 $_->hide;
607 } 727 }
608 728
609 $self->check_size; 729 $self->realloc;
610 $self->update;
611} 730}
612 731
613sub find_widget { 732sub find_widget {
614 my ($self, $x, $y) = @_; 733 my ($self, $x, $y) = @_;
615 734
616 $x -= $self->{x}; 735 $x -= $self->{x};
617 $y -= $self->{y}; 736 $y -= $self->{y};
618 737
619 my $res; 738 my $res;
620 739
621 for (reverse @{ $self->{children} }) { 740 for (reverse $self->visible_children) {
622 $res = $_->find_widget ($x, $y) 741 $res = $_->find_widget ($x, $y)
623 and return $res; 742 and return $res;
624 } 743 }
625 744
626 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
675 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
676} 795}
677 796
678############################################################################# 797#############################################################################
679 798
799# back-buffered drawing area
800
680package CFClient::UI::Window; 801package CFClient::UI::Window;
681 802
682our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
683 804
684use CFClient::OpenGL; 805use CFClient::OpenGL;
… …
702 $self->SUPER::size_allocate ($w, $h); 823 $self->SUPER::size_allocate ($w, $h);
703 $self->update; 824 $self->update;
704} 825}
705 826
706sub _render { 827sub _render {
828 my ($self) = @_;
829
707 $_[0]{children}[0]->draw; 830 $self->{children}[0]->draw;
708} 831}
709 832
710sub render_child { 833sub render_child {
711 my ($self) = @_; 834 my ($self) = @_;
712 835
713 $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 {
714 glClearColor 0, 0, 0, 0; 837 glClearColor 0, 0, 0, 0;
715 glClear GL_COLOR_BUFFER_BIT; 838 glClear GL_COLOR_BUFFER_BIT;
716 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
717 $self->_render; 847 $self->_render;
718 }; 848 };
719} 849}
720 850
721sub _draw { 851sub _draw {
722 my ($self) = @_; 852 my ($self) = @_;
723 853
724 my ($w, $h) = ($self->w, $self->h); 854 my ($w, $h) = @$self{qw(w h)};
725 855
726 my $tex = $self->{texture} 856 my $tex = $self->{texture}
727 or return; 857 or return;
728 858
729 glEnable GL_TEXTURE_2D; 859 glEnable GL_TEXTURE_2D;
… …
739 869
740package CFClient::UI::ViewPort; 870package CFClient::UI::ViewPort;
741 871
742our @ISA = CFClient::UI::Window::; 872our @ISA = CFClient::UI::Window::;
743 873
874sub new {
875 my $class = shift;
876
877 $class->SUPER::new (
878 scroll_x => 0,
879 scroll_y => 1,
880 @_,
881 )
882}
883
744sub size_request { 884sub size_request {
745 my ($self) = @_; 885 my ($self) = @_;
746 886
747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 887 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
748 888
749 @$self{qw(child_w child_h)} 889 $w = 10 if $self->{scroll_x};
890 $h = 10 if $self->{scroll_y};
891
892 ($w, $h)
750} 893}
751 894
752sub size_allocate { 895sub size_allocate {
753 my ($self, $w, $h) = @_; 896 my ($self, $w, $h) = @_;
754 897
755 my ($cw, $ch) = @$self{qw(child_w child_h)}; 898 my $child = $self->child;
756# $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
757 $self->child->configure (0, 0, $cw, $ch); 903 $self->child->configure (0, 0, $w, $h);
758 $self->update; 904 $self->update;
759} 905}
760 906
761sub set_offset { 907sub set_offset {
762 my ($self, $x, $y) = @_; 908 my ($self, $x, $y) = @_;
… …
796} 942}
797 943
798sub _render { 944sub _render {
799 my ($self) = @_; 945 my ($self) = @_;
800 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
801 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
802 951
803 $self->SUPER::_render; 952 $self->SUPER::_render;
804} 953}
805 954
… …
808package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
809 958
810our @ISA = CFClient::UI::HBox::; 959our @ISA = CFClient::UI::HBox::;
811 960
812sub new { 961sub new {
813 my $class = shift; 962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
814 965
815 my $self; 966 my $self;
816 967
817 my $slider = new CFClient::UI::Slider 968 my $slider = new CFClient::UI::Slider
818 vertical => 1, 969 vertical => 1,
819 range => [0, 0, 1, 0.01], # HACK fix 970 range => [0, 0, 1, 0.01], # HACK fix
820 connect_changed => sub { 971 on_changed => sub {
821 $self->{vp}->set_offset (0, $_[1]); 972 $self->{vp}->set_offset (0, $_[1]);
822 }, 973 },
823 ; 974 ;
824 975
825 $self = $class->SUPER::new ( 976 $self = $class->SUPER::new (
826 vp => (new CFClient::UI::ViewPort expand => 1), 977 vp => (new CFClient::UI::ViewPort expand => 1),
827 slider => $slider, 978 slider => $slider,
828 @_, 979 %arg,
829 ); 980 );
830 981
831 $self->{vp}->add ($self->{scrolled});
832 $self->add ($self->{vp});
833 $self->add ($self->{slider}); 982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
834 984
835 $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]);
836} 1002}
837 1003
838sub size_allocate { 1004sub size_allocate {
839 my ($self, $w, $h) = @_; 1005 my ($self, $w, $h) = @_;
840 1006
… …
893 1059
894our @ISA = CFClient::UI::Bin::; 1060our @ISA = CFClient::UI::Bin::;
895 1061
896use CFClient::OpenGL; 1062use CFClient::OpenGL;
897 1063
898my @tex = 1064my $bg =
1065 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1066 mipmap => 1, wrap => 1;
1067
1068my @border =
899 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
900 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);
901 1071
902sub new { 1072sub new {
903 my $class = shift; 1073 my ($class, %arg) = @_;
904 1074
905 # TODO: user_x, user_y, overwrite moveto? 1075 my $title = delete $arg{title};
906 1076
907 my $self = $class->SUPER::new ( 1077 my $self = $class->SUPER::new (
908 bg => [1, 1, 1, 1], 1078 bg => [1, 1, 1, 1],
909 border_bg => [1, 1, 1, 1], 1079 border_bg => [1, 1, 1, 1],
910 border => 0.6, 1080 border => 0.6,
911 toplevel => 1,
912 can_events => 1, 1081 can_events => 1,
913 @_ 1082 min_w => 16,
1083 min_h => 16,
1084 %arg,
914 ); 1085 );
915 1086
916 $self->{title} &&= new CFClient::UI::Label 1087 $self->{title} = new CFClient::UI::Label
917 align => 0, 1088 align => 0,
918 valign => 1, 1089 valign => 1,
919 text => $self->{title}, 1090 text => $title,
920 fontsize => $self->{border}; 1091 fontsize => $self->{border}
1092 if defined $title;
921 1093
922 $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};
923} 1102}
924 1103
925sub border { 1104sub border {
926 int $_[0]{border} * $::FONTSIZE 1105 int $_[0]{border} * $::FONTSIZE
927} 1106}
928 1107
929sub size_request { 1108sub size_request {
930 my ($self) = @_; 1109 my ($self) = @_;
1110
1111 $self->{title}->size_request
1112 if $self->{title};
931 1113
932 my ($w, $h) = $self->SUPER::size_request; 1114 my ($w, $h) = $self->SUPER::size_request;
933 1115
934 ( 1116 (
935 $w + $self->border * 2, 1117 $w + $self->border * 2,
… …
938} 1120}
939 1121
940sub size_allocate { 1122sub size_allocate {
941 my ($self, $w, $h) = @_; 1123 my ($self, $w, $h) = @_;
942 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
943 $h -= List::Util::max 0, $self->border * 2; 1133 $h -= List::Util::max 0, $border * 2;
944 $w -= List::Util::max 0, $self->border * 2; 1134 $w -= List::Util::max 0, $border * 2;
945 1135
946 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
947 if $self->{title};
948
949 $self->child->configure ($self->border, $self->border, $w, $h); 1136 $self->child->configure ($border, $border, $w, $h);
950} 1137}
951 1138
952sub button_down { 1139sub button_down {
953 my ($self, $ev, $x, $y) = @_; 1140 my ($self, $ev, $x, $y) = @_;
954 1141
… …
970 my ($ev, $x, $y) = @_; 1157 my ($ev, $x, $y) = @_;
971 1158
972 my $dx = $ev->{x} - $ox; 1159 my $dx = $ev->{x} - $ox;
973 my $dy = $ev->{y} - $oy; 1160 my $dy = $ev->{y} - $oy;
974 1161
975 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1162 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
976 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1163 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1164
977 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1165 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
978 $self->check_size; 1166 $self->realloc;
979 }; 1167 };
980 1168
981 } elsif ($lr ^ $td) { 1169 } elsif ($lr ^ $td) {
982 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1170 my ($ox, $oy) = ($ev->{x}, $ev->{y});
983 my ($bx, $by) = ($self->{x}, $self->{y}); 1171 my ($bx, $by) = ($self->{x}, $self->{y});
… …
985 $self->{motion} = sub { 1173 $self->{motion} = sub {
986 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
987 1175
988 ($x, $y) = ($ev->{x}, $ev->{y}); 1176 ($x, $y) = ($ev->{x}, $ev->{y});
989 1177
990 $self->move ($bx + $x - $ox, $by + $y - $oy); 1178 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
991 $self->update; 1179 # HACK: the next line is required to enforce placement
1180 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
992 }; 1181 };
1182 } else {
1183 return 0;
1184 }
1185
993 } 1186 1
994} 1187}
995 1188
996sub button_up { 1189sub button_up {
997 my ($self, $ev, $x, $y) = @_; 1190 my ($self, $ev, $x, $y) = @_;
998 1191
999 delete $self->{motion}; 1192 !!delete $self->{motion}
1000} 1193}
1001 1194
1002sub mouse_motion { 1195sub mouse_motion {
1003 my ($self, $ev, $x, $y) = @_; 1196 my ($self, $ev, $x, $y) = @_;
1004 1197
1005 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1198 $self->{motion}->($ev, $x, $y) if $self->{motion};
1199
1200 !!$self->{motion}
1006} 1201}
1007 1202
1008sub _draw { 1203sub _draw {
1009 my ($self) = @_; 1204 my ($self) = @_;
1010 1205
1206 my $child = $self->{children}[0];
1207
1011 my ($w, $h ) = ($self->{w}, $self->{h}); 1208 my ($w, $h ) = ($self->{w}, $self->{h});
1012 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1209 my ($cw, $ch) = ($child->{w}, $child->{h});
1013 1210
1014 glEnable GL_TEXTURE_2D; 1211 glEnable GL_TEXTURE_2D;
1015 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1212 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1016 1213
1017 my $border = $self->border; 1214 my $border = $self->border;
1018 1215
1019 glColor @{ $self->{border_bg} }; 1216 glColor @{ $self->{border_bg} };
1020 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1217 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1021 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1218 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1022 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1219 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1023 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1220 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1024 1221
1025 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1222 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1026 my $bg = $tex[0]; 1223 glColor @{ $self->{bg} };
1027 1224
1028 # TODO: repeat texture not scale 1225 # TODO: repeat texture not scale
1226 # solve this better(?)
1029 my $rep_x = $cw / $bg->{w}; 1227 $bg->{s} = $cw / $bg->{w};
1030 my $rep_y = $ch / $bg->{h}; 1228 $bg->{t} = $ch / $bg->{h};
1031
1032 glColor @{ $self->{bg} };
1033
1034 $bg->{s} = $rep_x;
1035 $bg->{t} = $rep_y;
1036 $bg->{wrap_mode} = 1;
1037 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1229 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1038 } 1230 }
1039 1231
1040 glDisable GL_TEXTURE_2D; 1232 glDisable GL_TEXTURE_2D;
1041 1233
1042 $self->{title}->draw if $self->{title};
1043
1044 $self->child->draw; 1234 $child->draw;
1235
1236 if ($self->{title}) {
1237 glTranslate 0, $border - $self->{h};
1238 $self->{title}->_draw;
1239 }
1045} 1240}
1046 1241
1047############################################################################# 1242#############################################################################
1048 1243
1049package CFClient::UI::Table; 1244package CFClient::UI::Table;
… …
1057sub new { 1252sub new {
1058 my $class = shift; 1253 my $class = shift;
1059 1254
1060 $class->SUPER::new ( 1255 $class->SUPER::new (
1061 col_expand => [], 1256 col_expand => [],
1062 @_ 1257 @_,
1063 ) 1258 )
1259}
1260
1261sub children {
1262 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1064} 1263}
1065 1264
1066sub add { 1265sub add {
1067 my ($self, $x, $y, $child) = @_; 1266 my ($self, $x, $y, $child) = @_;
1068 1267
1069 $child->set_parent ($self); 1268 $child->set_parent ($self);
1070 $self->{children}[$y][$x] = $child; 1269 $self->{children}[$y][$x] = $child;
1071 1270
1072 $child->check_size; 1271 $self->realloc;
1073} 1272}
1074 1273
1075sub children {
1076 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1077}
1078
1079# 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?
1080sub clear { 1275sub clear {
1081 my ($self) = @_; 1276 my ($self) = @_;
1082 1277
1083 my @children = $self->children; 1278 my @children = $self->children;
1084 delete $self->{children}; 1279 delete $self->{children};
… …
1086 for (@children) { 1281 for (@children) {
1087 delete $_->{parent}; 1282 delete $_->{parent};
1088 $_->hide; 1283 $_->hide;
1089 } 1284 }
1090 1285
1091 $self->update; 1286 $self->realloc;
1092} 1287}
1093 1288
1094sub get_wh { 1289sub get_wh {
1095 my ($self) = @_; 1290 my ($self) = @_;
1096 1291
… …
1127sub size_allocate { 1322sub size_allocate {
1128 my ($self, $w, $h) = @_; 1323 my ($self, $w, $h) = @_;
1129 1324
1130 my ($ws, $hs) = $self->get_wh; 1325 my ($ws, $hs) = $self->get_wh;
1131 1326
1132 my $req_w = sum @$ws; 1327 my $req_w = (sum @$ws) || 1;
1133 my $req_h = sum @$hs; 1328 my $req_h = (sum @$hs) || 1;
1134 1329
1135 # TODO: nicer code && do row_expand 1330 # TODO: nicer code && do row_expand
1136 my @col_expand = @{$self->{col_expand}}; 1331 my @col_expand = @{$self->{col_expand}};
1137 @col_expand = (1) x @$ws unless @col_expand; 1332 @col_expand = (1) x @$ws unless @col_expand;
1138 my $col_expand = (sum @col_expand) || 1; 1333 my $col_expand = (sum @col_expand) || 1;
… …
1192 } 1387 }
1193} 1388}
1194 1389
1195############################################################################# 1390#############################################################################
1196 1391
1197package CFClient::UI::HBox; 1392package CFClient::UI::Box;
1198
1199# TODO: wrap into common Box base class
1200 1393
1201our @ISA = CFClient::UI::Container::; 1394our @ISA = CFClient::UI::Container::;
1202 1395
1203sub size_request { 1396sub size_request {
1204 my ($self) = @_; 1397 my ($self) = @_;
1205 1398
1206 my @alloc = map [$_->size_request], @{$self->{children}}; 1399 $self->{vertical}
1207 1400 ? (
1208 ( 1401 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1209 (List::Util::sum map $_->[0], @alloc), 1402 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1210 (List::Util::max map $_->[1], @alloc), 1403 )
1211 ) 1404 : (
1405 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1406 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1407 )
1212} 1408}
1213 1409
1214sub size_allocate { 1410sub size_allocate {
1215 my ($self, $w, $h) = @_; 1411 my ($self, $w, $h) = @_;
1216 1412
1217 ($h, $w) = ($w, $h); 1413 my $space = $self->{vertical} ? $h : $w;
1218
1219 my $children = $self->{children}; 1414 my $children = $self->{children};
1220 1415
1221 my @h = map $_->{req_w}, @$children; 1416 my @req;
1222 1417
1223 my $req_h = List::Util::sum @h; 1418 if ($self->{homogeneous}) {
1224 1419 @req = ($space / (@$children || 1)) x @$children;
1225 if ($req_h > $h) {
1226 # ah well, not enough space
1227 $_ *= $h / $req_h for @h;
1228 } 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 {
1229 my $exp = List::Util::sum map $_->{expand}, @$children; 1428 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1230 $exp ||= 1;
1231 1429
1430 $space = ($space - $req) / $expand; # remaining space to give away
1431
1432 $req[$_] += $space * $children->[$_]{expand}
1232 for (0 .. $#$children) { 1433 for 0 .. $#$children;
1233 my $child = $children->[$_];
1234
1235 my $alloc_h = $h[$_];
1236 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1237 $h[$_] = $alloc_h;
1238 } 1434 }
1239 } 1435 }
1240 1436
1241 CFClient::UI::harmonize \@h; 1437 CFClient::UI::harmonize \@req;
1242 1438
1243 my $y = 0; 1439 my $pos = 0;
1244 for (0 .. $#$children) { 1440 for (0 .. $#$children) {
1245 my $child = $children->[$_];
1246 my $h = $h[$_]; 1441 my $alloc = $req[$_];
1247 $child->configure ($y, 0, $h, $w); 1442 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1248 1443
1249 $y += $h; 1444 $pos += $alloc;
1250 } 1445 }
1251 1446
1252 1 1447 1
1253} 1448}
1254 1449
1255############################################################################# 1450#############################################################################
1256 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
1257package CFClient::UI::VBox; 1467package CFClient::UI::VBox;
1258 1468
1259# TODO: wrap into common Box base class
1260
1261our @ISA = CFClient::UI::Container::; 1469our @ISA = CFClient::UI::Box::;
1262 1470
1263sub size_request { 1471sub new {
1264 my ($self) = @_; 1472 my $class = shift;
1265 1473
1266 my @alloc = map [$_->size_request], @{$self->{children}}; 1474 $class->SUPER::new (
1267 1475 vertical => 1,
1268 ( 1476 @_,
1269 (List::Util::max map $_->[0], @alloc),
1270 (List::Util::sum map $_->[1], @alloc),
1271 ) 1477 )
1272}
1273
1274sub size_allocate {
1275 my ($self, $w, $h) = @_;
1276
1277 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1278
1279 my $children = $self->{children};
1280
1281 my @h = map $_->{req_h}, @$children;
1282
1283 my $req_h = List::Util::sum @h;
1284
1285 if ($req_h > $h) {
1286 # ah well, not enough space
1287 $_ *= $h / $req_h for @h;
1288 } else {
1289 my $exp = List::Util::sum map $_->{expand}, @$children;
1290 $exp ||= 1;
1291
1292 for (0 .. $#$children) {
1293 my $child = $children->[$_];
1294
1295 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1296 }
1297 }
1298
1299 CFClient::UI::harmonize \@h;
1300
1301 my $y = 0;
1302 for (0 .. $#$children) {
1303 my $child = $children->[$_];
1304 my $h = $h[$_];
1305 $child->configure (0, $y, $w, $h);
1306
1307 $y += $h;
1308 }
1309
1310 1
1311} 1478}
1312 1479
1313############################################################################# 1480#############################################################################
1314 1481
1315package CFClient::UI::Label; 1482package CFClient::UI::Label;
… …
1332 ellipsise => 3, # end 1499 ellipsise => 3, # end
1333 layout => (new CFClient::Layout), 1500 layout => (new CFClient::Layout),
1334 fontsize => 1, 1501 fontsize => 1,
1335 align => -1, 1502 align => -1,
1336 valign => -1, 1503 valign => -1,
1337 padding => 2, 1504 padding_x => 2,
1505 padding_y => 2,
1338 can_events => 0, 1506 can_events => 0,
1339 %arg 1507 %arg
1340 ); 1508 );
1341 1509
1342 if (exists $self->{template}) { 1510 if (exists $self->{template}) {
… …
1378 $self->{text} = "T$text"; 1546 $self->{text} = "T$text";
1379 1547
1380 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1548 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1381 $self->{layout}->set_text ($text); 1549 $self->{layout}->set_text ($text);
1382 1550
1551 $self->realloc;
1383 $self->update; 1552 $self->update;
1384 $self->check_size;
1385} 1553}
1386 1554
1387sub set_markup { 1555sub set_markup {
1388 my ($self, $markup) = @_; 1556 my ($self, $markup) = @_;
1389 1557
… …
1393 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1561 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1394 1562
1395 $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;
1396 $self->{layout}->set_markup ($markup); 1564 $self->{layout}->set_markup ($markup);
1397 1565
1566 $self->realloc;
1398 $self->update; 1567 $self->update;
1399 $self->check_size;
1400} 1568}
1401 1569
1402sub size_request { 1570sub size_request {
1403 my ($self) = @_; 1571 my ($self) = @_;
1404 1572
… …
1418 1586
1419 $w = List::Util::max $w, $w2; 1587 $w = List::Util::max $w, $w2;
1420 $h = List::Util::max $h, $h2; 1588 $h = List::Util::max $h, $h2;
1421 } 1589 }
1422 1590
1423 ( 1591 ($w, $h)
1424 $w + $self->{padding} * 2,
1425 $h + $self->{padding} * 2,
1426 )
1427} 1592}
1428 1593
1429sub size_allocate { 1594sub size_allocate {
1430 my ($self, $w, $h) = @_; 1595 my ($self, $w, $h) = @_;
1431 1596
1597 delete $self->{ox};
1598
1432 delete $self->{texture}; 1599 delete $self->{texture}
1600 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1433} 1601}
1434 1602
1435sub set_fontsize { 1603sub set_fontsize {
1436 my ($self, $fontsize) = @_; 1604 my ($self, $fontsize) = @_;
1437 1605
1438 $self->{fontsize} = $fontsize; 1606 $self->{fontsize} = $fontsize;
1439 delete $self->{texture}; 1607 delete $self->{texture};
1440 1608
1441 $self->update; 1609 $self->realloc;
1442 $self->check_size;
1443} 1610}
1444 1611
1445sub _draw { 1612sub _draw {
1446 my ($self) = @_; 1613 my ($self) = @_;
1447 1614
… …
1453 $self->{layout}->set_width ($self->{w}); 1620 $self->{layout}->set_width ($self->{w});
1454 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1621 $self->{layout}->set_ellipsise ($self->{ellipsise});
1455 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1622 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1456 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1623 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1457 1624
1458 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1625 new_from_layout CFClient::Texture $self->{layout}
1626 };
1459 1627
1628 unless (exists $self->{ox}) {
1460 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1629 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1461 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1630 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1462 : ($self->{w} - $tex->{w}) * 0.5); 1631 : ($self->{w} - $tex->{w}) * 0.5);
1463 1632
1464 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1633 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1465 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1634 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1466 : ($self->{h} - $tex->{h}) * 0.5); 1635 : ($self->{h} - $tex->{h}) * 0.5);
1467
1468 $tex
1469 }; 1636 };
1470 1637
1471 glEnable GL_TEXTURE_2D; 1638 glEnable GL_TEXTURE_2D;
1472 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1639 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1473 1640
… …
1511 1678
1512 delete $self->{cur_h}; 1679 delete $self->{cur_h};
1513 1680
1514 return if $self->{text} eq $text; 1681 return if $self->{text} eq $text;
1515 1682
1516 delete $self->{texture};
1517
1518 $self->{last_activity} = $::NOW; 1683 $self->{last_activity} = $::NOW;
1519 $self->{text} = $text; 1684 $self->{text} = $text;
1520 1685
1521 $text =~ s/./*/g if $self->{hidden}; 1686 $text =~ s/./*/g if $self->{hidden};
1522 $self->{layout}->set_text ("$text "); 1687 $self->{layout}->set_text ("$text ");
1523 1688
1524 $self->emit (changed => $self->{text}); 1689 $self->_emit (changed => $self->{text});
1690 $self->update;
1525} 1691}
1526 1692
1527sub set_text { 1693sub set_text {
1528 my ($self, $text) = @_; 1694 my ($self, $text) = @_;
1529 1695
1530 $self->{cursor} = length $text; 1696 $self->{cursor} = length $text;
1531 $self->_set_text ($text); 1697 $self->_set_text ($text);
1532 $self->update; 1698
1533 $self->check_size; 1699 $self->realloc;
1534} 1700}
1535 1701
1536sub get_text { 1702sub get_text {
1537 $_[0]{text} 1703 $_[0]{text}
1538} 1704}
… …
1541 my ($self) = @_; 1707 my ($self) = @_;
1542 1708
1543 my ($w, $h) = $self->SUPER::size_request; 1709 my ($w, $h) = $self->SUPER::size_request;
1544 1710
1545 ($w + 1, $h) # add 1 for cursor 1711 ($w + 1, $h) # add 1 for cursor
1546}
1547
1548sub size_allocate {
1549 my ($self, $w, $h) = @_;
1550
1551 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1552} 1712}
1553 1713
1554sub key_down { 1714sub key_down {
1555 my ($self, $ev) = @_; 1715 my ($self, $ev) = @_;
1556 1716
… …
1571 } elsif ($sym == CFClient::SDLK_HOME) { 1731 } elsif ($sym == CFClient::SDLK_HOME) {
1572 $self->{cursor} = 0; 1732 $self->{cursor} = 0;
1573 } elsif ($sym == CFClient::SDLK_END) { 1733 } elsif ($sym == CFClient::SDLK_END) {
1574 $self->{cursor} = length $text; 1734 $self->{cursor} = length $text;
1575 } elsif ($uni == 27) { 1735 } elsif ($uni == 27) {
1576 $self->emit ('escape'); 1736 $self->_emit ('escape');
1577 } elsif ($uni) { 1737 } elsif ($uni) {
1578 substr $text, $self->{cursor}++, 0, chr $uni; 1738 substr $text, $self->{cursor}++, 0, chr $uni;
1739 } else {
1740 return 0;
1579 } 1741 }
1580 1742
1581 $self->_set_text ($text); 1743 $self->_set_text ($text);
1582 $self->update; 1744
1583 $self->check_size; 1745 $self->realloc;
1746
1747 1
1584} 1748}
1585 1749
1586sub focus_in { 1750sub focus_in {
1587 my ($self) = @_; 1751 my ($self) = @_;
1588 1752
… …
1603 utf8::encode $text; 1767 utf8::encode $text;
1604 $self->{cursor} = length substr $text, 0, $idx; 1768 $self->{cursor} = length substr $text, 0, $idx;
1605 1769
1606 $self->_set_text ($self->{text}); 1770 $self->_set_text ($self->{text});
1607 $self->update; 1771 $self->update;
1772
1773 1
1608} 1774}
1609 1775
1610sub mouse_motion { 1776sub mouse_motion {
1611 my ($self, $ev, $x, $y) = @_; 1777 my ($self, $ev, $x, $y) = @_;
1612# 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
1613} 1781}
1614 1782
1615sub _draw { 1783sub _draw {
1616 my ($self) = @_; 1784 my ($self) = @_;
1617 1785
… …
1668 if ($sym == 13) { 1836 if ($sym == 13) {
1669 unshift @{$self->{history}}, 1837 unshift @{$self->{history}},
1670 my $txt = $self->get_text; 1838 my $txt = $self->get_text;
1671 $self->{history_pointer} = -1; 1839 $self->{history_pointer} = -1;
1672 $self->{history_saveback} = ''; 1840 $self->{history_saveback} = '';
1673 $self->emit (activate => $txt); 1841 $self->_emit (activate => $txt);
1674 $self->update; 1842 $self->update;
1675 1843
1676 } elsif ($sym == CFClient::SDLK_UP) { 1844 } elsif ($sym == CFClient::SDLK_UP) {
1677 if ($self->{history_pointer} < 0) { 1845 if ($self->{history_pointer} < 0) {
1678 $self->{history_saveback} = $self->get_text; 1846 $self->{history_saveback} = $self->get_text;
… …
1694 } else { 1862 } else {
1695 $self->set_text ($self->{history_saveback}); 1863 $self->set_text ($self->{history_saveback});
1696 } 1864 }
1697 1865
1698 } else { 1866 } else {
1699 $self->SUPER::key_down ($ev); 1867 return $self->SUPER::key_down ($ev)
1868 }
1869
1700 } 1870 1
1701
1702} 1871}
1703 1872
1704############################################################################# 1873#############################################################################
1705 1874
1706package CFClient::UI::Button; 1875package CFClient::UI::Button;
… …
1715 1884
1716sub new { 1885sub new {
1717 my $class = shift; 1886 my $class = shift;
1718 1887
1719 $class->SUPER::new ( 1888 $class->SUPER::new (
1720 padding => 4, 1889 padding_x => 4,
1890 padding_y => 4,
1721 fg => [1, 1, 1], 1891 fg => [1, 1, 1],
1722 active_fg => [0, 0, 1], 1892 active_fg => [0, 0, 1],
1723 can_hover => 1, 1893 can_hover => 1,
1724 align => 0, 1894 align => 0,
1725 valign => 0, 1895 valign => 0,
1726 can_events => 1, 1896 can_events => 1,
1727 @_ 1897 @_
1728 ) 1898 )
1729} 1899}
1730 1900
1901sub activate { }
1902
1731sub button_up { 1903sub button_up {
1732 my ($self, $ev, $x, $y) = @_; 1904 my ($self, $ev, $x, $y) = @_;
1733 1905
1906 $self->emit ("activate")
1734 if ($x >= 0 && $x < $self->{w} 1907 if $x >= 0 && $x < $self->{w}
1735 && $y >= 0 && $y < $self->{h}) { 1908 && $y >= 0 && $y < $self->{h};
1736 $self->emit ("activate"); 1909
1737 } 1910 1
1738} 1911}
1739 1912
1740sub _draw { 1913sub _draw {
1741 my ($self) = @_; 1914 my ($self) = @_;
1742 1915
… …
1771 1944
1772sub new { 1945sub new {
1773 my $class = shift; 1946 my $class = shift;
1774 1947
1775 $class->SUPER::new ( 1948 $class->SUPER::new (
1776 padding => 2, 1949 padding_x => 2,
1950 padding_y => 2,
1777 fg => [1, 1, 1], 1951 fg => [1, 1, 1],
1778 active_fg => [1, 1, 0], 1952 active_fg => [1, 1, 0],
1779 bg => [0, 0, 0, 0.2], 1953 bg => [0, 0, 0, 0.2],
1780 active_bg => [1, 1, 1, 0.5], 1954 active_bg => [1, 1, 1, 0.5],
1781 state => 0, 1955 state => 0,
… …
1785} 1959}
1786 1960
1787sub size_request { 1961sub size_request {
1788 my ($self) = @_; 1962 my ($self) = @_;
1789 1963
1790 ($self->{padding} * 2 + 6) x 2 1964 (6) x 2
1791} 1965}
1792 1966
1793sub button_down { 1967sub button_down {
1794 my ($self, $ev, $x, $y) = @_; 1968 my ($self, $ev, $x, $y) = @_;
1795 1969
1796 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1970 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1797 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1971 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1798 $self->{state} = !$self->{state}; 1972 $self->{state} = !$self->{state};
1799 $self->emit (changed => $self->{state}); 1973 $self->_emit (changed => $self->{state});
1974 } else {
1975 return 0
1976 }
1977
1800 } 1978 1
1801} 1979}
1802 1980
1803sub _draw { 1981sub _draw {
1804 my ($self) = @_; 1982 my ($self) = @_;
1805 1983
1806 $self->SUPER::_draw; 1984 $self->SUPER::_draw;
1807 1985
1808 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1986 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1809 1987
1810 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;
1811 1991
1812 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1992 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1813 1993
1814 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1994 my $tex = $self->{state} ? $tex[1] : $tex[0];
1815 1995
… …
2080 fg => [1, 1, 1], 2260 fg => [1, 1, 1],
2081 active_fg => [0, 0, 0], 2261 active_fg => [0, 0, 0],
2082 bg => [0, 0, 0, 0.2], 2262 bg => [0, 0, 0, 0.2],
2083 active_bg => [1, 1, 1, 0.5], 2263 active_bg => [1, 1, 1, 0.5],
2084 range => [0, 0, 100, 10, 0], 2264 range => [0, 0, 100, 10, 0],
2085 req_w => $::WIDTH / 80, 2265 min_w => $::WIDTH / 80,
2086 req_h => $::WIDTH / 80, 2266 min_h => $::WIDTH / 80,
2087 vertical => 0, 2267 vertical => 0,
2088 can_hover => 1, 2268 can_hover => 1,
2089 inner_pad => 0.02, 2269 inner_pad => 0.02,
2090 @_ 2270 @_
2091 ); 2271 );
… …
2094 $self->update; 2274 $self->update;
2095 2275
2096 $self 2276 $self
2097} 2277}
2098 2278
2279sub changed { }
2280
2099sub set_range { 2281sub set_range {
2100 my ($self, $range) = @_; 2282 my ($self, $range) = @_;
2101 2283
2102 $self->{range} = $range; 2284 ($range, $self->{range}) = ($self->{range}, $range);
2103 2285
2104 $self->update; 2286 $self->update
2287 if "@$range" ne "@{$self->{range}}";
2105} 2288}
2106 2289
2107sub set_value { 2290sub set_value {
2108 my ($self, $value) = @_; 2291 my ($self, $value) = @_;
2109 2292
… …
2120 if $unit; 2303 if $unit;
2121 2304
2122 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2305 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2123 2306
2124 if ($value != $old_value) { 2307 if ($value != $old_value) {
2125 $self->emit (changed => $value); 2308 $self->_emit (changed => $value);
2126 $self->update; 2309 $self->update;
2127 } 2310 }
2128} 2311}
2129 2312
2130sub size_request { 2313sub size_request {
2131 my ($self) = @_; 2314 my ($self) = @_;
2132 2315
2133 my $w = $self->{req_w}; 2316 ($self->{req_w}, $self->{req_h})
2134 my $h = $self->{req_h};
2135
2136 $self->{vertical} ? ($h, $w) : ($w, $h)
2137} 2317}
2138 2318
2139sub button_down { 2319sub button_down {
2140 my ($self, $ev, $x, $y) = @_; 2320 my ($self, $ev, $x, $y) = @_;
2141 2321
2142 $self->SUPER::button_down ($ev, $x, $y); 2322 $self->SUPER::button_down ($ev, $x, $y);
2143 2323
2144 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2324 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2145 2325
2146 $self->mouse_motion ($ev, $x, $y); 2326 $self->mouse_motion ($ev, $x, $y)
2147} 2327}
2148 2328
2149sub mouse_motion { 2329sub mouse_motion {
2150 my ($self, $ev, $x, $y) = @_; 2330 my ($self, $ev, $x, $y) = @_;
2151 2331
… …
2155 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2335 my (undef, $lo, $hi, $page) = @{$self->{range}};
2156 2336
2157 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2337 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2158 2338
2159 $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
2160 } 2344 1
2161} 2345}
2162 2346
2163sub update { 2347sub update {
2164 my ($self) = @_; 2348 my ($self) = @_;
2165 2349
2166 $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}) {
2167 $self->set_value ($self->{range}[0]); 2358 $self->set_value ($self->{range}[0]);
2168 2359
2169 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2360 my ($value, $lo, $hi, $page) = @{$self->{range}};
2170 my $range = ($hi - $page - $lo) || 1e-100; 2361 my $range = ($hi - $page - $lo) || 1e-100;
2171 2362
… …
2177 $value = ($value - $lo) / $range; 2368 $value = ($value - $lo) / $range;
2178 $value = $value * $self->{scale} + $self->{offset}; 2369 $value = $value * $self->{scale} + $self->{offset};
2179 2370
2180 $self->{knob_x} = $value - $knob_w * 0.5; 2371 $self->{knob_x} = $value - $knob_w * 0.5;
2181 $self->{knob_w} = $knob_w; 2372 $self->{knob_w} = $knob_w;
2182 }); 2373 }
2183
2184 $self->SUPER::update;
2185}
2186
2187sub _draw {
2188 my ($self) = @_;
2189 2374
2190 $self->SUPER::_draw (); 2375 $self->SUPER::_draw ();
2191 2376
2192 glScale $self->{w}, $self->{h}; 2377 glScale $self->{w}, $self->{h};
2193 2378
… …
2492 2677
2493sub new { 2678sub new {
2494 my $class = shift; 2679 my $class = shift;
2495 2680
2496 my $self = $class->SUPER::new ( 2681 my $self = $class->SUPER::new (
2497 state => 0, 2682 state => 0,
2498 connect_activate => \&toggle_flopper, 2683 on_activate => \&toggle_flopper,
2499 @_ 2684 @_
2500 ); 2685 );
2501 2686
2502 if ($self->{state}) {
2503 $self->{state} = 0;
2504 $self->toggle_flopper;
2505 }
2506
2507 $self 2687 $self
2508} 2688}
2509 2689
2510sub toggle_flopper { 2690sub toggle_flopper {
2511 my ($self) = @_; 2691 my ($self) = @_;
2512 2692
2513 # TODO: use animation 2693 $self->{other}->toggle_visibility;
2514 if ($self->{state} = !$self->{state}) {
2515 $CFClient::UI::ROOT->add ($self->{other});
2516 $self->{other}->move ($self->coord2global (0, $self->{h}));
2517 $self->emit ("open");
2518 } else {
2519 $CFClient::UI::ROOT->remove ($self->{other});
2520 $self->emit ("close");
2521 }
2522
2523 $self->emit (changed => $self->{state});
2524} 2694}
2525 2695
2526############################################################################# 2696#############################################################################
2527 2697
2528package CFClient::UI::Tooltip; 2698package CFClient::UI::Tooltip;
… …
2541} 2711}
2542 2712
2543sub set_tooltip_from { 2713sub set_tooltip_from {
2544 my ($self, $widget) = @_; 2714 my ($self, $widget) = @_;
2545 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
2546 $self->add (new CFClient::UI::Label 2725 $self->add (new CFClient::UI::Label
2547 markup => $widget->{tooltip}, 2726 markup => $tooltip,
2548 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2727 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2549 fontsize => 0.8, 2728 fontsize => 0.8,
2550 fg => [0, 0, 0, 1], 2729 fg => [0, 0, 0, 1],
2551 ellipsise => 0, 2730 ellipsise => 0,
2552 font => ($widget->{tooltip_font} || $::FONT_PROP), 2731 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2563 2742
2564sub size_allocate { 2743sub size_allocate {
2565 my ($self, $w, $h) = @_; 2744 my ($self, $w, $h) = @_;
2566 2745
2567 $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 });
2568} 2765}
2569 2766
2570sub _draw { 2767sub _draw {
2571 my ($self) = @_; 2768 my ($self) = @_;
2572 2769
… …
2589 glVertex $w, $h; 2786 glVertex $w, $h;
2590 glVertex $w, 0; 2787 glVertex $w, 0;
2591 glEnd; 2788 glEnd;
2592 2789
2593 glTranslate 2 - 0.375, 2 - 0.375; 2790 glTranslate 2 - 0.375, 2 - 0.375;
2791
2594 $self->SUPER::_draw; 2792 $self->SUPER::_draw;
2595} 2793}
2596 2794
2597############################################################################# 2795#############################################################################
2598 2796
… …
2604 2802
2605sub new { 2803sub new {
2606 my $class = shift; 2804 my $class = shift;
2607 2805
2608 my $self = $class->SUPER::new ( 2806 my $self = $class->SUPER::new (
2609 aspect => 1, 2807 aspect => 1,
2808 can_events => 0,
2610 @_, 2809 @_,
2611 ); 2810 );
2612 2811
2613 if ($self->{anim} && $self->{animspeed}) { 2812 if ($self->{anim} && $self->{animspeed}) {
2614 Scalar::Util::weaken (my $widget = $self); 2813 Scalar::Util::weaken (my $widget = $self);
… …
2673 $self->SUPER::DESTROY; 2872 $self->SUPER::DESTROY;
2674} 2873}
2675 2874
2676############################################################################# 2875#############################################################################
2677 2876
2678package CFClient::UI::InventoryItem; 2877package CFClient::UI::Buttonbar;
2679 2878
2680our @ISA = CFClient::UI::HBox::; 2879our @ISA = CFClient::UI::HBox::;
2681 2880
2682sub _item_to_desc { 2881# TODO: should actualyl wrap buttons and other goodies.
2683 my ($item) = @_;
2684
2685 my $desc =
2686 $item->{nrof} < 2
2687 ? $item->{name}
2688 : "$item->{nrof} × $item->{name_pl}";
2689
2690 $item->{flags} & Crossfire::Protocol::F_OPEN
2691 and $desc .= " (open)";
2692 $item->{flags} & Crossfire::Protocol::F_APPLIED
2693 and $desc .= " (applied)";
2694 $item->{flags} & Crossfire::Protocol::F_UNPAID
2695 and $desc .= " (unpaid)";
2696 $item->{flags} & Crossfire::Protocol::F_MAGIC
2697 and $desc .= " (magic)";
2698 $item->{flags} & Crossfire::Protocol::F_CURSED
2699 and $desc .= " (cursed)";
2700 $item->{flags} & Crossfire::Protocol::F_DAMNED
2701 and $desc .= " (damned)";
2702 $item->{flags} & Crossfire::Protocol::F_LOCKED
2703 and $desc .= " *";
2704
2705 $desc
2706}
2707
2708sub new {
2709 my $class = shift;
2710
2711 my %args = @_;
2712
2713 my $item = delete $args{item};
2714
2715 my $desc = _item_to_desc ($item);
2716
2717 my $self = $class->SUPER::new (
2718 can_hover => 1,
2719 can_events => 1,
2720 tooltip => ((CFClient::UI::Label::escape $desc)
2721 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2722 connect_button_down => sub {
2723 my ($self, $ev, $x, $y) = @_;
2724
2725 # todo: maybe put examine on 1? but should just be a tooltip :(
2726 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2727 my $targ = $::CONN->{player}{tag};
2728
2729 if ($item->{container} == $::CONN->{player}{tag}) {
2730 $targ = $main::OPENCONT;
2731 }
2732
2733 $::CONN->send ("move $targ $item->{tag} 0");
2734 } elsif ($ev->{button} == 1) {
2735 $::CONN->send ("examine $item->{tag}");
2736 } elsif ($ev->{button} == 2) {
2737 $::CONN->send ("apply $item->{tag}");
2738 } elsif ($ev->{button} == 3) {
2739 my @menu_items = (
2740 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2741 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2742 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2743 (
2744 $item->{flags} & Crossfire::Protocol::F_LOCKED
2745 ? (
2746 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2747 )
2748 : (
2749 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2750 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2751 )
2752 ),
2753 );
2754
2755 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2756 }
2757
2758 1
2759 },
2760 %args
2761 );
2762
2763
2764 $self->add (new CFClient::UI::Face
2765 can_events => 0,
2766 face => $item->{face},
2767 anim => $item->{anim},
2768 animspeed => $item->{animspeed},
2769 );
2770
2771 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2772
2773 $self->{item} = $item;
2774
2775 $self->update_item;
2776
2777 $self
2778}
2779
2780sub update_item {
2781 my ($self) = @_;
2782
2783 my $desc = _item_to_desc ($self->{item});
2784
2785 $self->{name_lbl}->set_text ($desc);
2786}
2787
2788#############################################################################
2789
2790package CFClient::UI::Inventory;
2791
2792our @ISA = CFClient::UI::ScrolledWindow::;
2793
2794sub new {
2795 my $class = shift;
2796
2797 my $self = $class->SUPER::new (
2798 scrolled => (new CFClient::UI::Table),
2799 @_,
2800 );
2801
2802 $self
2803}
2804
2805sub set_items {
2806 my ($self, $items) = @_;
2807
2808 $self->{scrolled}->clear;
2809 return unless $items;
2810
2811 my @items = sort {
2812 ($a->{type} <=> $b->{type})
2813 or ($a->{name} cmp $b->{name})
2814 } @$items;
2815
2816 $self->{real_items} = \@items;
2817
2818 for my $item (@items) {
2819 $item->{item} = $item;
2820 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2821 $item->update_item ();
2822 }
2823
2824 my $i = 0;
2825 for (@items) {
2826 $self->{scrolled}->add (0, $i, $_);
2827 my $nrof = $_->{item}->{nrof} || 1;
2828 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2829 }
2830
2831# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2832}
2833
2834sub size_request {
2835 my ($self) = @_;
2836 ($self->{req_w}, $self->{req_h});
2837}
2838 2882
2839############################################################################# 2883#############################################################################
2840 2884
2841package CFClient::UI::Menu; 2885package CFClient::UI::Menu;
2842 2886
… …
2876 2920
2877# 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)
2878sub popup { 2922sub popup {
2879 my ($self, $ev) = @_; 2923 my ($self, $ev) = @_;
2880 2924
2881 $self->emit ("popdown"); 2925 $self->_emit ("popdown");
2882 2926
2883 # maybe save $GRAB? must be careful about events... 2927 # maybe save $GRAB? must be careful about events...
2884 $GRAB = $self; 2928 $GRAB = $self;
2885 $self->{button} = $ev->{button}; 2929 $self->{button} = $ev->{button};
2886 2930
2887 $self->show; 2931 $self->show;
2888 $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);
2889} 2933}
2890 2934
2891sub mouse_motion { 2935sub mouse_motion {
2892 my ($self, $ev, $x, $y) = @_; 2936 my ($self, $ev, $x, $y) = @_;
2893 2937
2894 # TODO: should use vbox->find_widget or so 2938 # TODO: should use vbox->find_widget or so
2895 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2939 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2896 $self->{hover} = $self->{item}{$HOVER}; 2940 $self->{hover} = $self->{item}{$HOVER};
2941
2942 0
2897} 2943}
2898 2944
2899sub button_up { 2945sub button_up {
2900 my ($self, $ev, $x, $y) = @_; 2946 my ($self, $ev, $x, $y) = @_;
2901 2947
2902 if ($ev->{button} == $self->{button}) { 2948 if ($ev->{button} == $self->{button}) {
2903 undef $GRAB; 2949 undef $GRAB;
2904 $self->hide; 2950 $self->hide;
2905 2951
2906 $self->emit ("popdown"); 2952 $self->_emit ("popdown");
2907 $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 );
2908 } 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});
2909} 3067}
2910 3068
2911############################################################################# 3069#############################################################################
2912 3070
2913package CFClient::UI::Statusbox; 3071package CFClient::UI::Statusbox;
… …
2973sub add { 3131sub add {
2974 my ($self, $text, %arg) = @_; 3132 my ($self, $text, %arg) = @_;
2975 3133
2976 $text =~ s/^\s+//; 3134 $text =~ s/^\s+//;
2977 $text =~ s/\s+$//; 3135 $text =~ s/\s+$//;
3136
3137 return unless $text;
2978 3138
2979 my $timeout = time + ((delete $arg{timeout}) || 60); 3139 my $timeout = time + ((delete $arg{timeout}) || 60);
2980 3140
2981 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3141 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2982 3142
… …
3016 $self->SUPER::reconfigure; 3176 $self->SUPER::reconfigure;
3017} 3177}
3018 3178
3019############################################################################# 3179#############################################################################
3020 3180
3021package CFClient::UI::Root; 3181package CFClient::UI::Inventory;
3022 3182
3023our @ISA = CFClient::UI::Container::; 3183our @ISA = CFClient::UI::ScrolledWindow::;
3024
3025use CFClient::OpenGL;
3026 3184
3027sub new { 3185sub new {
3028 my $class = shift; 3186 my $class = shift;
3029 3187
3030 $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 => [],
3031 @_, 3430 @_,
3032 ) 3431 )
3033} 3432}
3034 3433
3035sub configure { 3434# XXX: Do sorting? Argl...
3036 my ($self, $x, $y, $w, $h) = @_; 3435sub add_spell {
3037
3038 $self->{w} = $w;
3039 $self->{h} = $h;
3040}
3041
3042sub check_size {
3043 my ($self) = @_; 3436 my ($self, $spell) = @_;
3437 $self->{spells}->{$spell->{name}} = $spell;
3044 3438
3045 $self->size_allocate ($self->{w}, $self->{h}) 3439 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3046 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
3047} 3493}
3048 3494
3049sub size_request { 3495sub size_request {
3050 my ($self) = @_; 3496 my ($self) = @_;
3051 3497
3052 ($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
3053} 3513}
3054 3514
3055sub size_allocate { 3515sub size_allocate {
3056 my ($self, $w, $h) = @_; 3516 my ($self, $w, $h) = @_;
3057 3517
3058 my $old_w = $self->{old_w}; $self->{old_w} = $w;
3059 my $old_h = $self->{old_h}; $self->{old_h} = $h;
3060
3061 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
3062 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
3063
3064 for my $child ($self->children) { 3518 for my $child ($self->children) {
3065 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)};
3066 3520
3067 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3521 $X = $child->{force_x} if exists $child->{force_x};
3068 if exists $child->{req_x}; 3522 $Y = $child->{force_y} if exists $child->{force_y};
3069 3523
3070 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3524 $X = _to_pixel $X, $W, $self->{w};
3071 if exists $child->{req_y}; 3525 $Y = _to_pixel $Y, $H, $self->{h};
3072
3073 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3074 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3075 3526
3076 $child->configure ($X, $Y, $W, $H); 3527 $child->configure ($X, $Y, $W, $H);
3077 } 3528 }
3078} 3529}
3079 3530
… …
3090} 3541}
3091 3542
3092sub update { 3543sub update {
3093 my ($self) = @_; 3544 my ($self) = @_;
3094 3545
3095 $self->check_size;
3096 $::WANT_REFRESH++; 3546 $::WANT_REFRESH++;
3097} 3547}
3098 3548
3099sub add { 3549sub add {
3100 my ($self, @children) = @_; 3550 my ($self, @children) = @_;
3101 3551
3102 for (my @widgets = @children; my $w = pop @widgets; ) {
3103 push @widgets, $w->children;
3104 $w->{root} = $self;
3105 $w->{visible} = 1;
3106 }
3107
3108 for my $child (@children) {
3109 $child->{toplevel} = 1; 3552 $_->{is_toplevel} = 1
3110 3553 for @children;
3111 # integerise window positions
3112 $child->{x} = int $child->{x};
3113 $child->{y} = int $child->{y};
3114 }
3115 3554
3116 $self->SUPER::add (@children); 3555 $self->SUPER::add (@children);
3117} 3556}
3118 3557
3119sub remove { 3558sub remove {
3120 my ($self, @children) = @_; 3559 my ($self, @children) = @_;
3121 3560
3122 $self->SUPER::remove (@children); 3561 $self->SUPER::remove (@children);
3562
3563 delete $self->{is_toplevel}
3564 for @children;
3123 3565
3124 while (@children) { 3566 while (@children) {
3125 my $w = pop @children; 3567 my $w = pop @children;
3126 push @children, $w->children; 3568 push @children, $w->children;
3127 delete $w->{visible}; 3569 $w->set_invisible;
3128 } 3570 }
3129} 3571}
3130 3572
3131sub on_refresh { 3573sub on_refresh {
3132 my ($self, $id, $cb) = @_; 3574 my ($self, $id, $cb) = @_;
… …
3146 while ($self->{refresh_hook}) { 3588 while ($self->{refresh_hook}) {
3147 $_->() 3589 $_->()
3148 for values %{delete $self->{refresh_hook}}; 3590 for values %{delete $self->{refresh_hook}};
3149 } 3591 }
3150 3592
3151 if ($self->{check_size}) { 3593 if ($self->{realloc}) {
3152 my @queue = ([], []); 3594 my %queue;
3595 my @queue;
3596 my $widget;
3153 3597
3154 for (;;) { 3598 outer:
3155 if ($self->{check_size}) { 3599 while () {
3156 # heuristic: check containers last 3600 if (my $realloc = delete $self->{realloc}) {
3157 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3601 for $widget (values %$realloc) {
3158 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 }
3159 } 3608 }
3160 3609
3161 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3610 while () {
3611 @queue or last outer;
3162 3612
3163 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3613 $widget = pop @{ $queue[-1] || [] }
3164 ? @$widget{qw(user_w user_h)} 3614 and last;
3165 : $widget->size_request;
3166
3167 if (delete $widget->{force_alloc}
3168 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3169 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3170 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}) {
3171 $widget->{req_w} = $w; 3631 $widget->{req_w} = $w;
3172 $widget->{req_h} = $h; 3632 $widget->{req_h} = $h;
3173 3633
3174 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3634 $self->{size_alloc}{$widget+0} = $widget;
3175 3635
3176 $widget->{parent}->check_size
3177 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 }
3178 } 3643 }
3644
3645 delete $self->{realloc}{$widget+0};
3179 } 3646 }
3180 } 3647 }
3181 3648
3182 while ($self->{size_alloc}) { 3649 while (my $size_alloc = delete $self->{size_alloc}) {
3183 for (values %{delete $self->{size_alloc}}) { 3650 my @queue = sort { $b->{visible} <=> $a->{visible} }
3184 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)};
3185 3657
3186 $w = 0 if $w < 0; 3658 $w = 0 if $w < 0;
3187 $h = 0 if $h < 0; 3659 $h = 0 if $h < 0;
3188 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
3189 $widget->{w} = $w; 3668 $widget->{w} = $w;
3190 $widget->{h} = $h; 3669 $widget->{h} = $h;
3191 $widget->size_allocate ($w, $h); 3670
3192 $widget->emit (size_allocate => $w, $h); 3671 $widget->emit (size_allocate => $w, $h);
3672 }
3193 } 3673 }
3194 } 3674 }
3195 3675
3196 while ($self->{post_alloc_hook}) { 3676 while ($self->{post_alloc_hook}) {
3197 $_->() 3677 $_->()
3198 for values %{delete $self->{post_alloc_hook}}; 3678 for values %{delete $self->{post_alloc_hook}};
3199 } 3679 }
3680
3200 3681
3201 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3682 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3202 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3683 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3203 glClear GL_COLOR_BUFFER_BIT; 3684 glClear GL_COLOR_BUFFER_BIT;
3204 3685
… …
3206 glLoadIdentity; 3687 glLoadIdentity;
3207 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3688 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3208 glMatrixMode GL_MODELVIEW; 3689 glMatrixMode GL_MODELVIEW;
3209 glLoadIdentity; 3690 glLoadIdentity;
3210 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
3211 $self->_draw; 3699 $self->_draw;
3212} 3700}
3213 3701
3214############################################################################# 3702#############################################################################
3215 3703

Diff Legend

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