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.271 by root, Fri Jun 2 22:13:47 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 {
301} 376}
302 377
303sub set_max_size { 378sub set_max_size {
304 my ($self, $w, $h) = @_; 379 my ($self, $w, $h) = @_;
… …
307 delete $self->{max_h}; $self->{max_h} = $h if $h; 382 delete $self->{max_h}; $self->{max_h} = $h if $h;
308} 383}
309 384
310sub set_tooltip { 385sub set_tooltip {
311 my ($self, $tooltip) = @_; 386 my ($self, $tooltip) = @_;
387
388 $tooltip =~ s/^\s+//;
389 $tooltip =~ s/\s+$//;
390
391 return if $self->{tooltip} eq $tooltip;
312 392
313 $self->{tooltip} = $tooltip; 393 $self->{tooltip} = $tooltip;
314 394
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 395 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner}; 396 delete $CFClient::UI::TOOLTIP->{owner};
… …
338 return if $FOCUS == $self; 418 return if $FOCUS == $self;
339 return unless $self->{can_focus}; 419 return unless $self->{can_focus};
340 420
341 my $focus = $FOCUS; $FOCUS = $self; 421 my $focus = $FOCUS; $FOCUS = $self;
342 422
343 $self->emit (focus_in => $focus); 423 $self->_emit (focus_in => $focus);
344 424
345 $focus->update if $focus; 425 $focus->update if $focus;
346 $FOCUS->update; 426 $FOCUS->update;
347} 427}
348 428
… …
351 431
352 return unless $FOCUS == $self; 432 return unless $FOCUS == $self;
353 433
354 my $focus = $FOCUS; undef $FOCUS; 434 my $focus = $FOCUS; undef $FOCUS;
355 435
356 $self->emit (focus_out => $focus); 436 $self->_emit (focus_out => $focus);
357 437
358 $focus->update if $focus; #? 438 $focus->update if $focus; #?
359}
360 439
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
441 unless $FOCUS;
442}
443
361sub mouse_motion { } 444sub mouse_motion { 0 }
362sub button_up { } 445sub button_up { 0 }
363sub key_down { } 446sub key_down { 0 }
364sub key_up { } 447sub key_up { 0 }
365 448
366sub button_down { 449sub button_down {
367 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
368 451
369 $self->focus_in; 452 $self->focus_in;
370}
371 453
372sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454 0
373sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455}
374sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456
375sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub find_widget {
376sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 458 my ($self, $x, $y) = @_;
459
460 return () unless $self->{can_events};
461
462 return $self
463 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
464 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
465
466 ()
467}
468
469sub set_parent {
470 my ($self, $parent) = @_;
471
472 Scalar::Util::weaken ($self->{parent} = $parent);
473 $self->set_visible if $parent->{visible};
474}
475
476sub connect {
477 my ($self, $signal, $cb) = @_;
478
479 push @{ $self->{signal_cb}{$signal} }, $cb;
480}
481
482sub _emit {
483 my ($self, $signal, @args) = @_;
484
485 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486}
487
488sub emit {
489 my ($self, $signal, @args) = @_;
490
491 $self->_emit ($signal, @args)
492 || $self->$signal (@args);
493}
494
495sub visibility_change {
496 #my ($self, $visible) = @_;
497}
498
499sub realloc {
500 my ($self) = @_;
501
502 if ($self->{visible}) {
503 return if $self->{root}{realloc}{$self+0};
504
505 $self->{root}{realloc}{$self+0} = $self;
506 $self->{root}->update;
507 } else {
508 delete $self->{req_w};
509 delete $self->{req_h};
510 }
511}
512
513sub update {
514 my ($self) = @_;
515
516 $self->{parent}->update
517 if $self->{parent};
518}
519
520sub reconfigure {
521 my ($self) = @_;
522
523 $self->realloc;
524 $self->update;
525}
526
527# using global variables seems a bit hacky, but passing through all drawing
528# functions seems pointless.
529our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
377 530
378sub draw { 531sub draw {
379 my ($self) = @_; 532 my ($self) = @_;
380 533
381 return unless $self->{h} && $self->{w}; 534 return unless $self->{h} && $self->{w};
535
536 # update screen rectangle
537 local $draw_x = $draw_x + $self->{x};
538 local $draw_y = $draw_y + $self->{y};
539 local $draw_w = $draw_x + $self->{w};
540 local $draw_h = $draw_y + $self->{h};
541
542 # skip widgets that are entirely outside the drawing area
543 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
382 545
383 glPushMatrix; 546 glPushMatrix;
384 glTranslate $self->{x}, $self->{y}, 0; 547 glTranslate $self->{x}, $self->{y}, 0;
385 $self->_draw; 548 $self->_draw;
386 glPopMatrix; 549 glPopMatrix;
… …
398 glVertex $x , $y + $self->{h}; 561 glVertex $x , $y + $self->{h};
399 glEnd; 562 glEnd;
400 glDisable GL_BLEND; 563 glDisable GL_BLEND;
401 } 564 }
402 565
403 if ($ENV{PCLIENT_DEBUG}) { 566 if ($ENV{CFPLUS_DEBUG} & 1) {
404 glPushMatrix; 567 glPushMatrix;
405 glColor 1, 1, 0, 1; 568 glColor 1, 1, 0, 1;
406 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 569 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407 glBegin GL_LINE_LOOP; 570 glBegin GL_LINE_LOOP;
408 glVertex 0 , 0; 571 glVertex 0 , 0;
409 glVertex $self->{w}, 0; 572 glVertex $self->{w} - 1, 0;
410 glVertex $self->{w}, $self->{h}; 573 glVertex $self->{w} - 1, $self->{h} - 1;
411 glVertex 0 , $self->{h}; 574 glVertex 0 , $self->{h} - 1;
412 glEnd; 575 glEnd;
413 glPopMatrix; 576 glPopMatrix;
414 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 577 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
415 } 578 }
416} 579}
417 580
418sub _draw { 581sub _draw {
419 my ($self) = @_; 582 my ($self) = @_;
420 583
421 warn "no draw defined for $self\n"; 584 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} 585}
473 586
474sub DESTROY { 587sub DESTROY {
475 my ($self) = @_; 588 my ($self) = @_;
476 589
… …
534 my ($class, %arg) = @_; 647 my ($class, %arg) = @_;
535 $class->SUPER::new (can_events => 0, %arg); 648 $class->SUPER::new (can_events => 0, %arg);
536} 649}
537 650
538sub size_request { 651sub size_request {
539 (0, 0) 652 my ($self) = @_;
653
654 ($self->{w} + 0, $self->{h} + 0)
540} 655}
541 656
542sub draw { } 657sub draw { }
543 658
544############################################################################# 659#############################################################################
… …
573 $self->{children} = [ 688 $self->{children} = [
574 sort { $a->{z} <=> $b->{z} } 689 sort { $a->{z} <=> $b->{z} }
575 @{$self->{children}}, @widgets 690 @{$self->{children}}, @widgets
576 ]; 691 ];
577 692
578 $self->check_size (1); 693 $self->realloc;
579 $self->update;
580} 694}
581 695
582sub children { 696sub children {
583 @{ $_[0]{children} } 697 @{ $_[0]{children} }
584} 698}
… …
589 delete $child->{parent}; 703 delete $child->{parent};
590 $child->hide; 704 $child->hide;
591 705
592 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 706 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593 707
594 $self->check_size; 708 $self->realloc;
595 $self->update;
596} 709}
597 710
598sub clear { 711sub clear {
599 my ($self) = @_; 712 my ($self) = @_;
600 713
… …
604 for (@$children) { 717 for (@$children) {
605 delete $_->{parent}; 718 delete $_->{parent};
606 $_->hide; 719 $_->hide;
607 } 720 }
608 721
609 $self->check_size; 722 $self->realloc;
610 $self->update;
611} 723}
612 724
613sub find_widget { 725sub find_widget {
614 my ($self, $x, $y) = @_; 726 my ($self, $x, $y) = @_;
615 727
… …
702 $self->SUPER::size_allocate ($w, $h); 814 $self->SUPER::size_allocate ($w, $h);
703 $self->update; 815 $self->update;
704} 816}
705 817
706sub _render { 818sub _render {
819 my ($self) = @_;
820
707 $_[0]{children}[0]->draw; 821 $self->{children}[0]->draw;
708} 822}
709 823
710sub render_child { 824sub render_child {
711 my ($self) = @_; 825 my ($self) = @_;
712 826
713 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 827 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
714 glClearColor 0, 0, 0, 0; 828 glClearColor 0, 0, 0, 0;
715 glClear GL_COLOR_BUFFER_BIT; 829 glClear GL_COLOR_BUFFER_BIT;
716 830
831 {
832 package CFClient::UI::Base;
833
834 ($draw_x, $draw_y, $draw_w, $draw_h) =
835 (0, 0, $self->{w}, $self->{h});
836 }
837
717 $self->_render; 838 $self->_render;
718 }; 839 };
719} 840}
720 841
721sub _draw { 842sub _draw {
722 my ($self) = @_; 843 my ($self) = @_;
723 844
724 my ($w, $h) = ($self->w, $self->h); 845 my ($w, $h) = @$self{qw(w h)};
725 846
726 my $tex = $self->{texture} 847 my $tex = $self->{texture}
727 or return; 848 or return;
728 849
729 glEnable GL_TEXTURE_2D; 850 glEnable GL_TEXTURE_2D;
… …
739 860
740package CFClient::UI::ViewPort; 861package CFClient::UI::ViewPort;
741 862
742our @ISA = CFClient::UI::Window::; 863our @ISA = CFClient::UI::Window::;
743 864
865sub new {
866 my $class = shift;
867
868 $class->SUPER::new (
869 scroll_x => 0,
870 scroll_y => 1,
871 @_,
872 )
873}
874
744sub size_request { 875sub size_request {
745 my ($self) = @_; 876 my ($self) = @_;
746 877
747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 878 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
748 879
749 @$self{qw(child_w child_h)} 880 $w = 10 if $self->{scroll_x};
881 $h = 10 if $self->{scroll_y};
882
883 ($w, $h)
750} 884}
751 885
752sub size_allocate { 886sub size_allocate {
753 my ($self, $w, $h) = @_; 887 my ($self, $w, $h) = @_;
754 888
755 my ($cw, $ch) = @$self{qw(child_w child_h)}; 889 my $child = $self->child;
756# $w = $self->{w}; 890
891 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
892 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
893
757 $self->child->configure (0, 0, $cw, $ch); 894 $self->child->configure (0, 0, $w, $h);
758 $self->update; 895 $self->update;
759} 896}
760 897
761sub set_offset { 898sub set_offset {
762 my ($self, $x, $y) = @_; 899 my ($self, $x, $y) = @_;
… …
796} 933}
797 934
798sub _render { 935sub _render {
799 my ($self) = @_; 936 my ($self) = @_;
800 937
938 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
939 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
940
801 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 941 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
802 942
803 $self->SUPER::_render; 943 $self->SUPER::_render;
804} 944}
805 945
… …
813 my $class = shift; 953 my $class = shift;
814 954
815 my $self; 955 my $self;
816 956
817 my $slider = new CFClient::UI::Slider 957 my $slider = new CFClient::UI::Slider
818 vertical => 1, 958 vertical => 1,
819 range => [0, 0, 1, 0.01], # HACK fix 959 range => [0, 0, 1, 0.01], # HACK fix
820 connect_changed => sub { 960 on_changed => sub {
821 $self->{vp}->set_offset (0, $_[1]); 961 $self->{vp}->set_offset (0, $_[1]);
822 }, 962 },
823 ; 963 ;
824 964
825 $self = $class->SUPER::new ( 965 $self = $class->SUPER::new (
… …
831 $self->{vp}->add ($self->{scrolled}); 971 $self->{vp}->add ($self->{scrolled});
832 $self->add ($self->{vp}); 972 $self->add ($self->{vp});
833 $self->add ($self->{slider}); 973 $self->add ($self->{slider});
834 974
835 $self 975 $self
976}
977
978sub update {
979 my ($self) = @_;
980
981 $self->SUPER::update;
982
983 # todo: overwrite size_allocate of child
984 my $child = $self->{vp}->child;
985 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
836} 986}
837 987
838sub size_allocate { 988sub size_allocate {
839 my ($self, $w, $h) = @_; 989 my ($self, $w, $h) = @_;
840 990
… …
893 1043
894our @ISA = CFClient::UI::Bin::; 1044our @ISA = CFClient::UI::Bin::;
895 1045
896use CFClient::OpenGL; 1046use CFClient::OpenGL;
897 1047
898my @tex = 1048my $bg =
1049 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1050 mipmap => 1, wrap => 1;
1051
1052my @border =
899 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1053 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); 1054 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
901 1055
902sub new { 1056sub new {
903 my $class = shift; 1057 my ($class, %arg) = @_;
904 1058
905 # TODO: user_x, user_y, overwrite moveto? 1059 my $title = delete $arg{title};
906 1060
907 my $self = $class->SUPER::new ( 1061 my $self = $class->SUPER::new (
908 bg => [1, 1, 1, 1], 1062 bg => [1, 1, 1, 1],
909 border_bg => [1, 1, 1, 1], 1063 border_bg => [1, 1, 1, 1],
910 border => 0.6, 1064 border => 0.6,
911 toplevel => 1,
912 can_events => 1, 1065 can_events => 1,
913 @_ 1066 min_w => 16,
1067 min_h => 16,
1068 %arg,
914 ); 1069 );
915 1070
916 $self->{title} &&= new CFClient::UI::Label 1071 $self->{title} = new CFClient::UI::Label
917 align => 0, 1072 align => 0,
918 valign => 1, 1073 valign => 1,
919 text => $self->{title}, 1074 text => $title,
920 fontsize => $self->{border}; 1075 fontsize => $self->{border}
1076 if defined $title;
921 1077
922 $self 1078 $self
1079}
1080
1081sub add {
1082 my ($self, @widgets) = @_;
1083
1084 $self->SUPER::add (@widgets);
1085 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
923} 1086}
924 1087
925sub border { 1088sub border {
926 int $_[0]{border} * $::FONTSIZE 1089 int $_[0]{border} * $::FONTSIZE
927} 1090}
928 1091
929sub size_request { 1092sub size_request {
930 my ($self) = @_; 1093 my ($self) = @_;
1094
1095 $self->{title}->size_request
1096 if $self->{title};
931 1097
932 my ($w, $h) = $self->SUPER::size_request; 1098 my ($w, $h) = $self->SUPER::size_request;
933 1099
934 ( 1100 (
935 $w + $self->border * 2, 1101 $w + $self->border * 2,
… …
938} 1104}
939 1105
940sub size_allocate { 1106sub size_allocate {
941 my ($self, $w, $h) = @_; 1107 my ($self, $w, $h) = @_;
942 1108
1109 if ($self->{title}) {
1110 $self->{title}{w} = $w;
1111 $self->{title}{h} = $h;
1112 $self->{title}->size_allocate ($w, $h);
1113 }
1114
1115 my $border = $self->border;
1116
943 $h -= List::Util::max 0, $self->border * 2; 1117 $h -= List::Util::max 0, $border * 2;
944 $w -= List::Util::max 0, $self->border * 2; 1118 $w -= List::Util::max 0, $border * 2;
945 1119
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); 1120 $self->child->configure ($border, $border, $w, $h);
950} 1121}
951 1122
952sub button_down { 1123sub button_down {
953 my ($self, $ev, $x, $y) = @_; 1124 my ($self, $ev, $x, $y) = @_;
954 1125
… …
970 my ($ev, $x, $y) = @_; 1141 my ($ev, $x, $y) = @_;
971 1142
972 my $dx = $ev->{x} - $ox; 1143 my $dx = $ev->{x} - $ox;
973 my $dy = $ev->{y} - $oy; 1144 my $dy = $ev->{y} - $oy;
974 1145
975 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1146 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
976 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1147 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1148
1149 $self->realloc;
977 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1150 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
978 $self->check_size;
979 }; 1151 };
980 1152
981 } elsif ($lr ^ $td) { 1153 } elsif ($lr ^ $td) {
982 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1154 my ($ox, $oy) = ($ev->{x}, $ev->{y});
983 my ($bx, $by) = ($self->{x}, $self->{y}); 1155 my ($bx, $by) = ($self->{x}, $self->{y});
… …
985 $self->{motion} = sub { 1157 $self->{motion} = sub {
986 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
987 1159
988 ($x, $y) = ($ev->{x}, $ev->{y}); 1160 ($x, $y) = ($ev->{x}, $ev->{y});
989 1161
990 $self->move ($bx + $x - $ox, $by + $y - $oy); 1162 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
991 $self->update;
992 }; 1163 };
1164 } else {
1165 return 0;
1166 }
1167
993 } 1168 1
994} 1169}
995 1170
996sub button_up { 1171sub button_up {
997 my ($self, $ev, $x, $y) = @_; 1172 my ($self, $ev, $x, $y) = @_;
998 1173
999 delete $self->{motion}; 1174 !!delete $self->{motion}
1000} 1175}
1001 1176
1002sub mouse_motion { 1177sub mouse_motion {
1003 my ($self, $ev, $x, $y) = @_; 1178 my ($self, $ev, $x, $y) = @_;
1004 1179
1005 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1180 $self->{motion}->($ev, $x, $y) if $self->{motion};
1181
1182 !!$self->{motion}
1006} 1183}
1007 1184
1008sub _draw { 1185sub _draw {
1009 my ($self) = @_; 1186 my ($self) = @_;
1010 1187
1188 my $child = $self->{children}[0];
1189
1011 my ($w, $h ) = ($self->{w}, $self->{h}); 1190 my ($w, $h ) = ($self->{w}, $self->{h});
1012 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1191 my ($cw, $ch) = ($child->{w}, $child->{h});
1013 1192
1014 glEnable GL_TEXTURE_2D; 1193 glEnable GL_TEXTURE_2D;
1015 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1194 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1016 1195
1017 my $border = $self->border; 1196 my $border = $self->border;
1018 1197
1019 glColor @{ $self->{border_bg} }; 1198 glColor @{ $self->{border_bg} };
1020 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1199 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1021 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1200 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1022 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1201 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1023 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1202 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1024 1203
1025 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1204 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1026 my $bg = $tex[0]; 1205 glColor @{ $self->{bg} };
1027 1206
1028 # TODO: repeat texture not scale 1207 # TODO: repeat texture not scale
1208 # solve this better(?)
1029 my $rep_x = $cw / $bg->{w}; 1209 $bg->{s} = $cw / $bg->{w};
1030 my $rep_y = $ch / $bg->{h}; 1210 $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); 1211 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1038 } 1212 }
1039 1213
1040 glDisable GL_TEXTURE_2D; 1214 glDisable GL_TEXTURE_2D;
1041 1215
1042 $self->{title}->draw if $self->{title};
1043
1044 $self->child->draw; 1216 $child->draw;
1217
1218 if ($self->{title}) {
1219 glTranslate 0, $border - $self->{h};
1220 $self->{title}->_draw;
1221 }
1045} 1222}
1046 1223
1047############################################################################# 1224#############################################################################
1048 1225
1049package CFClient::UI::Table; 1226package CFClient::UI::Table;
… …
1057sub new { 1234sub new {
1058 my $class = shift; 1235 my $class = shift;
1059 1236
1060 $class->SUPER::new ( 1237 $class->SUPER::new (
1061 col_expand => [], 1238 col_expand => [],
1062 @_ 1239 @_,
1063 ) 1240 )
1241}
1242
1243sub children {
1244 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1064} 1245}
1065 1246
1066sub add { 1247sub add {
1067 my ($self, $x, $y, $child) = @_; 1248 my ($self, $x, $y, $child) = @_;
1068 1249
1069 $child->set_parent ($self); 1250 $child->set_parent ($self);
1070 $self->{children}[$y][$x] = $child; 1251 $self->{children}[$y][$x] = $child;
1071 1252
1072 $child->check_size; 1253 $self->realloc;
1073} 1254}
1074 1255
1075sub children {
1076 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1077}
1078
1079# TODO: move to container class maybe? send childs a signal on removal? 1256# TODO: move to container class maybe? send children a signal on removal?
1080sub clear { 1257sub clear {
1081 my ($self) = @_; 1258 my ($self) = @_;
1082 1259
1083 my @children = $self->children; 1260 my @children = $self->children;
1084 delete $self->{children}; 1261 delete $self->{children};
… …
1086 for (@children) { 1263 for (@children) {
1087 delete $_->{parent}; 1264 delete $_->{parent};
1088 $_->hide; 1265 $_->hide;
1089 } 1266 }
1090 1267
1091 $self->update; 1268 $self->realloc;
1092} 1269}
1093 1270
1094sub get_wh { 1271sub get_wh {
1095 my ($self) = @_; 1272 my ($self) = @_;
1096 1273
… …
1127sub size_allocate { 1304sub size_allocate {
1128 my ($self, $w, $h) = @_; 1305 my ($self, $w, $h) = @_;
1129 1306
1130 my ($ws, $hs) = $self->get_wh; 1307 my ($ws, $hs) = $self->get_wh;
1131 1308
1132 my $req_w = sum @$ws; 1309 my $req_w = (sum @$ws) || 1;
1133 my $req_h = sum @$hs; 1310 my $req_h = (sum @$hs) || 1;
1134 1311
1135 # TODO: nicer code && do row_expand 1312 # TODO: nicer code && do row_expand
1136 my @col_expand = @{$self->{col_expand}}; 1313 my @col_expand = @{$self->{col_expand}};
1137 @col_expand = (1) x @$ws unless @col_expand; 1314 @col_expand = (1) x @$ws unless @col_expand;
1138 my $col_expand = (sum @col_expand) || 1; 1315 my $col_expand = (sum @col_expand) || 1;
… …
1192 } 1369 }
1193} 1370}
1194 1371
1195############################################################################# 1372#############################################################################
1196 1373
1197package CFClient::UI::HBox; 1374package CFClient::UI::Box;
1198
1199# TODO: wrap into common Box base class
1200 1375
1201our @ISA = CFClient::UI::Container::; 1376our @ISA = CFClient::UI::Container::;
1202 1377
1203sub size_request { 1378sub size_request {
1204 my ($self) = @_; 1379 my ($self) = @_;
1205 1380
1206 my @alloc = map [$_->size_request], @{$self->{children}}; 1381 $self->{vertical}
1207 1382 ? (
1208 ( 1383 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1209 (List::Util::sum map $_->[0], @alloc), 1384 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1210 (List::Util::max map $_->[1], @alloc), 1385 )
1211 ) 1386 : (
1387 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1388 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1389 )
1212} 1390}
1213 1391
1214sub size_allocate { 1392sub size_allocate {
1215 my ($self, $w, $h) = @_; 1393 my ($self, $w, $h) = @_;
1216 1394
1217 ($h, $w) = ($w, $h); 1395 my $space = $self->{vertical} ? $h : $w;
1218
1219 my $children = $self->{children}; 1396 my $children = $self->{children};
1220 1397
1221 my @h = map $_->{req_w}, @$children; 1398 my @req;
1222 1399
1223 my $req_h = List::Util::sum @h; 1400 if ($self->{homogeneous}) {
1224 1401 @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 { 1402 } else {
1403 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1404 my $req = List::Util::sum @req;
1405
1406 if ($req > $space) {
1407 # ah well, not enough space
1408 $_ *= $space / $req for @req;
1409 } else {
1229 my $exp = List::Util::sum map $_->{expand}, @$children; 1410 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1230 $exp ||= 1;
1231 1411
1412 $space = ($space - $req) / $expand; # remaining space to give away
1413
1414 $req[$_] += $space * $children->[$_]{expand}
1232 for (0 .. $#$children) { 1415 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 } 1416 }
1239 } 1417 }
1240 1418
1241 CFClient::UI::harmonize \@h; 1419 CFClient::UI::harmonize \@req;
1242 1420
1243 my $y = 0; 1421 my $pos = 0;
1244 for (0 .. $#$children) { 1422 for (0 .. $#$children) {
1245 my $child = $children->[$_];
1246 my $h = $h[$_]; 1423 my $alloc = $req[$_];
1247 $child->configure ($y, 0, $h, $w); 1424 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1248 1425
1249 $y += $h; 1426 $pos += $alloc;
1250 } 1427 }
1251 1428
1252 1 1429 1
1253} 1430}
1254 1431
1255############################################################################# 1432#############################################################################
1256 1433
1434package CFClient::UI::HBox;
1435
1436our @ISA = CFClient::UI::Box::;
1437
1438sub new {
1439 my $class = shift;
1440
1441 $class->SUPER::new (
1442 vertical => 0,
1443 @_,
1444 )
1445}
1446
1447#############################################################################
1448
1257package CFClient::UI::VBox; 1449package CFClient::UI::VBox;
1258 1450
1259# TODO: wrap into common Box base class
1260
1261our @ISA = CFClient::UI::Container::; 1451our @ISA = CFClient::UI::Box::;
1262 1452
1263sub size_request { 1453sub new {
1264 my ($self) = @_; 1454 my $class = shift;
1265 1455
1266 my @alloc = map [$_->size_request], @{$self->{children}}; 1456 $class->SUPER::new (
1267 1457 vertical => 1,
1268 ( 1458 @_,
1269 (List::Util::max map $_->[0], @alloc),
1270 (List::Util::sum map $_->[1], @alloc),
1271 ) 1459 )
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} 1460}
1312 1461
1313############################################################################# 1462#############################################################################
1314 1463
1315package CFClient::UI::Label; 1464package CFClient::UI::Label;
… …
1332 ellipsise => 3, # end 1481 ellipsise => 3, # end
1333 layout => (new CFClient::Layout), 1482 layout => (new CFClient::Layout),
1334 fontsize => 1, 1483 fontsize => 1,
1335 align => -1, 1484 align => -1,
1336 valign => -1, 1485 valign => -1,
1337 padding => 2, 1486 padding_x => 2,
1487 padding_y => 2,
1338 can_events => 0, 1488 can_events => 0,
1339 %arg 1489 %arg
1340 ); 1490 );
1341 1491
1342 if (exists $self->{template}) { 1492 if (exists $self->{template}) {
… …
1378 $self->{text} = "T$text"; 1528 $self->{text} = "T$text";
1379 1529
1380 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1530 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1381 $self->{layout}->set_text ($text); 1531 $self->{layout}->set_text ($text);
1382 1532
1533 $self->realloc;
1383 $self->update; 1534 $self->update;
1384 $self->check_size;
1385} 1535}
1386 1536
1387sub set_markup { 1537sub set_markup {
1388 my ($self, $markup) = @_; 1538 my ($self, $markup) = @_;
1389 1539
… …
1393 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1543 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1394 1544
1395 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1545 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1396 $self->{layout}->set_markup ($markup); 1546 $self->{layout}->set_markup ($markup);
1397 1547
1548 $self->realloc;
1398 $self->update; 1549 $self->update;
1399 $self->check_size;
1400} 1550}
1401 1551
1402sub size_request { 1552sub size_request {
1403 my ($self) = @_; 1553 my ($self) = @_;
1404 1554
… …
1418 1568
1419 $w = List::Util::max $w, $w2; 1569 $w = List::Util::max $w, $w2;
1420 $h = List::Util::max $h, $h2; 1570 $h = List::Util::max $h, $h2;
1421 } 1571 }
1422 1572
1423 ( 1573 ($w, $h)
1424 $w + $self->{padding} * 2,
1425 $h + $self->{padding} * 2,
1426 )
1427} 1574}
1428 1575
1429sub size_allocate { 1576sub size_allocate {
1430 my ($self, $w, $h) = @_; 1577 my ($self, $w, $h) = @_;
1431 1578
1579 delete $self->{ox};
1580
1432 delete $self->{texture}; 1581 delete $self->{texture}
1582 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1433} 1583}
1434 1584
1435sub set_fontsize { 1585sub set_fontsize {
1436 my ($self, $fontsize) = @_; 1586 my ($self, $fontsize) = @_;
1437 1587
1438 $self->{fontsize} = $fontsize; 1588 $self->{fontsize} = $fontsize;
1439 delete $self->{texture}; 1589 delete $self->{texture};
1440 1590
1441 $self->update; 1591 $self->realloc;
1442 $self->check_size;
1443} 1592}
1444 1593
1445sub _draw { 1594sub _draw {
1446 my ($self) = @_; 1595 my ($self) = @_;
1447 1596
… …
1453 $self->{layout}->set_width ($self->{w}); 1602 $self->{layout}->set_width ($self->{w});
1454 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1603 $self->{layout}->set_ellipsise ($self->{ellipsise});
1455 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1604 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1456 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1605 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1457 1606
1458 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1607 new_from_layout CFClient::Texture $self->{layout}
1608 };
1459 1609
1610 unless (exists $self->{ox}) {
1460 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1611 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1461 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1612 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1462 : ($self->{w} - $tex->{w}) * 0.5); 1613 : ($self->{w} - $tex->{w}) * 0.5);
1463 1614
1464 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1615 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1465 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1616 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1466 : ($self->{h} - $tex->{h}) * 0.5); 1617 : ($self->{h} - $tex->{h}) * 0.5);
1467
1468 $tex
1469 }; 1618 };
1470 1619
1471 glEnable GL_TEXTURE_2D; 1620 glEnable GL_TEXTURE_2D;
1472 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1621 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1473 1622
… …
1519 $self->{text} = $text; 1668 $self->{text} = $text;
1520 1669
1521 $text =~ s/./*/g if $self->{hidden}; 1670 $text =~ s/./*/g if $self->{hidden};
1522 $self->{layout}->set_text ("$text "); 1671 $self->{layout}->set_text ("$text ");
1523 1672
1524 $self->emit (changed => $self->{text}); 1673 $self->_emit (changed => $self->{text});
1525} 1674}
1526 1675
1527sub set_text { 1676sub set_text {
1528 my ($self, $text) = @_; 1677 my ($self, $text) = @_;
1529 1678
1530 $self->{cursor} = length $text; 1679 $self->{cursor} = length $text;
1531 $self->_set_text ($text); 1680 $self->_set_text ($text);
1532 $self->update; 1681
1533 $self->check_size; 1682 $self->realloc;
1534} 1683}
1535 1684
1536sub get_text { 1685sub get_text {
1537 $_[0]{text} 1686 $_[0]{text}
1538} 1687}
… …
1541 my ($self) = @_; 1690 my ($self) = @_;
1542 1691
1543 my ($w, $h) = $self->SUPER::size_request; 1692 my ($w, $h) = $self->SUPER::size_request;
1544 1693
1545 ($w + 1, $h) # add 1 for cursor 1694 ($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} 1695}
1553 1696
1554sub key_down { 1697sub key_down {
1555 my ($self, $ev) = @_; 1698 my ($self, $ev) = @_;
1556 1699
… …
1571 } elsif ($sym == CFClient::SDLK_HOME) { 1714 } elsif ($sym == CFClient::SDLK_HOME) {
1572 $self->{cursor} = 0; 1715 $self->{cursor} = 0;
1573 } elsif ($sym == CFClient::SDLK_END) { 1716 } elsif ($sym == CFClient::SDLK_END) {
1574 $self->{cursor} = length $text; 1717 $self->{cursor} = length $text;
1575 } elsif ($uni == 27) { 1718 } elsif ($uni == 27) {
1576 $self->emit ('escape'); 1719 $self->_emit ('escape');
1577 } elsif ($uni) { 1720 } elsif ($uni) {
1578 substr $text, $self->{cursor}++, 0, chr $uni; 1721 substr $text, $self->{cursor}++, 0, chr $uni;
1722 } else {
1723 return 0;
1579 } 1724 }
1580 1725
1581 $self->_set_text ($text); 1726 $self->_set_text ($text);
1582 $self->update; 1727
1583 $self->check_size; 1728 $self->realloc;
1729
1730 1
1584} 1731}
1585 1732
1586sub focus_in { 1733sub focus_in {
1587 my ($self) = @_; 1734 my ($self) = @_;
1588 1735
… …
1603 utf8::encode $text; 1750 utf8::encode $text;
1604 $self->{cursor} = length substr $text, 0, $idx; 1751 $self->{cursor} = length substr $text, 0, $idx;
1605 1752
1606 $self->_set_text ($self->{text}); 1753 $self->_set_text ($self->{text});
1607 $self->update; 1754 $self->update;
1755
1756 1
1608} 1757}
1609 1758
1610sub mouse_motion { 1759sub mouse_motion {
1611 my ($self, $ev, $x, $y) = @_; 1760 my ($self, $ev, $x, $y) = @_;
1612# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1761# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1762
1763 0
1613} 1764}
1614 1765
1615sub _draw { 1766sub _draw {
1616 my ($self) = @_; 1767 my ($self) = @_;
1617 1768
… …
1668 if ($sym == 13) { 1819 if ($sym == 13) {
1669 unshift @{$self->{history}}, 1820 unshift @{$self->{history}},
1670 my $txt = $self->get_text; 1821 my $txt = $self->get_text;
1671 $self->{history_pointer} = -1; 1822 $self->{history_pointer} = -1;
1672 $self->{history_saveback} = ''; 1823 $self->{history_saveback} = '';
1673 $self->emit (activate => $txt); 1824 $self->_emit (activate => $txt);
1674 $self->update; 1825 $self->update;
1675 1826
1676 } elsif ($sym == CFClient::SDLK_UP) { 1827 } elsif ($sym == CFClient::SDLK_UP) {
1677 if ($self->{history_pointer} < 0) { 1828 if ($self->{history_pointer} < 0) {
1678 $self->{history_saveback} = $self->get_text; 1829 $self->{history_saveback} = $self->get_text;
… …
1694 } else { 1845 } else {
1695 $self->set_text ($self->{history_saveback}); 1846 $self->set_text ($self->{history_saveback});
1696 } 1847 }
1697 1848
1698 } else { 1849 } else {
1699 $self->SUPER::key_down ($ev); 1850 return $self->SUPER::key_down ($ev)
1851 }
1852
1700 } 1853 1
1701
1702} 1854}
1703 1855
1704############################################################################# 1856#############################################################################
1705 1857
1706package CFClient::UI::Button; 1858package CFClient::UI::Button;
… …
1715 1867
1716sub new { 1868sub new {
1717 my $class = shift; 1869 my $class = shift;
1718 1870
1719 $class->SUPER::new ( 1871 $class->SUPER::new (
1720 padding => 4, 1872 padding_x => 4,
1873 padding_y => 4,
1721 fg => [1, 1, 1], 1874 fg => [1, 1, 1],
1722 active_fg => [0, 0, 1], 1875 active_fg => [0, 0, 1],
1723 can_hover => 1, 1876 can_hover => 1,
1724 align => 0, 1877 align => 0,
1725 valign => 0, 1878 valign => 0,
1726 can_events => 1, 1879 can_events => 1,
1727 @_ 1880 @_
1728 ) 1881 )
1729} 1882}
1730 1883
1884sub activate { }
1885
1731sub button_up { 1886sub button_up {
1732 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1733 1888
1889 $self->emit ("activate")
1734 if ($x >= 0 && $x < $self->{w} 1890 if $x >= 0 && $x < $self->{w}
1735 && $y >= 0 && $y < $self->{h}) { 1891 && $y >= 0 && $y < $self->{h};
1736 $self->emit ("activate"); 1892
1737 } 1893 1
1738} 1894}
1739 1895
1740sub _draw { 1896sub _draw {
1741 my ($self) = @_; 1897 my ($self) = @_;
1742 1898
… …
1771 1927
1772sub new { 1928sub new {
1773 my $class = shift; 1929 my $class = shift;
1774 1930
1775 $class->SUPER::new ( 1931 $class->SUPER::new (
1776 padding => 2, 1932 padding_x => 2,
1933 padding_y => 2,
1777 fg => [1, 1, 1], 1934 fg => [1, 1, 1],
1778 active_fg => [1, 1, 0], 1935 active_fg => [1, 1, 0],
1779 bg => [0, 0, 0, 0.2], 1936 bg => [0, 0, 0, 0.2],
1780 active_bg => [1, 1, 1, 0.5], 1937 active_bg => [1, 1, 1, 0.5],
1781 state => 0, 1938 state => 0,
… …
1785} 1942}
1786 1943
1787sub size_request { 1944sub size_request {
1788 my ($self) = @_; 1945 my ($self) = @_;
1789 1946
1790 ($self->{padding} * 2 + 6) x 2 1947 (6) x 2
1791} 1948}
1792 1949
1793sub button_down { 1950sub button_down {
1794 my ($self, $ev, $x, $y) = @_; 1951 my ($self, $ev, $x, $y) = @_;
1795 1952
1796 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1953 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1797 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1954 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1798 $self->{state} = !$self->{state}; 1955 $self->{state} = !$self->{state};
1799 $self->emit (changed => $self->{state}); 1956 $self->_emit (changed => $self->{state});
1957 } else {
1958 return 0
1959 }
1960
1800 } 1961 1
1801} 1962}
1802 1963
1803sub _draw { 1964sub _draw {
1804 my ($self) = @_; 1965 my ($self) = @_;
1805 1966
1806 $self->SUPER::_draw; 1967 $self->SUPER::_draw;
1807 1968
1808 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1969 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1809 1970
1810 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1971 my ($w, $h) = @$self{qw(w h)};
1972
1973 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1811 1974
1812 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1975 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1813 1976
1814 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1977 my $tex = $self->{state} ? $tex[1] : $tex[0];
1815 1978
… …
2080 fg => [1, 1, 1], 2243 fg => [1, 1, 1],
2081 active_fg => [0, 0, 0], 2244 active_fg => [0, 0, 0],
2082 bg => [0, 0, 0, 0.2], 2245 bg => [0, 0, 0, 0.2],
2083 active_bg => [1, 1, 1, 0.5], 2246 active_bg => [1, 1, 1, 0.5],
2084 range => [0, 0, 100, 10, 0], 2247 range => [0, 0, 100, 10, 0],
2085 req_w => $::WIDTH / 80, 2248 min_w => $::WIDTH / 80,
2086 req_h => $::WIDTH / 80, 2249 min_h => $::WIDTH / 80,
2087 vertical => 0, 2250 vertical => 0,
2088 can_hover => 1, 2251 can_hover => 1,
2089 inner_pad => 0.02, 2252 inner_pad => 0.02,
2090 @_ 2253 @_
2091 ); 2254 );
… …
2094 $self->update; 2257 $self->update;
2095 2258
2096 $self 2259 $self
2097} 2260}
2098 2261
2262sub changed { }
2263
2099sub set_range { 2264sub set_range {
2100 my ($self, $range) = @_; 2265 my ($self, $range) = @_;
2101 2266
2102 $self->{range} = $range; 2267 ($range, $self->{range}) = ($self->{range}, $range);
2103 2268
2104 $self->update; 2269 $self->update
2270 if "@$range" ne "@{$self->{range}}";
2105} 2271}
2106 2272
2107sub set_value { 2273sub set_value {
2108 my ($self, $value) = @_; 2274 my ($self, $value) = @_;
2109 2275
… …
2120 if $unit; 2286 if $unit;
2121 2287
2122 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2288 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2123 2289
2124 if ($value != $old_value) { 2290 if ($value != $old_value) {
2125 $self->emit (changed => $value); 2291 $self->_emit (changed => $value);
2126 $self->update; 2292 $self->update;
2127 } 2293 }
2128} 2294}
2129 2295
2130sub size_request { 2296sub size_request {
2131 my ($self) = @_; 2297 my ($self) = @_;
2132 2298
2133 my $w = $self->{req_w}; 2299 ($self->{req_w}, $self->{req_h})
2134 my $h = $self->{req_h};
2135
2136 $self->{vertical} ? ($h, $w) : ($w, $h)
2137} 2300}
2138 2301
2139sub button_down { 2302sub button_down {
2140 my ($self, $ev, $x, $y) = @_; 2303 my ($self, $ev, $x, $y) = @_;
2141 2304
2142 $self->SUPER::button_down ($ev, $x, $y); 2305 $self->SUPER::button_down ($ev, $x, $y);
2143 2306
2144 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2307 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2145 2308
2146 $self->mouse_motion ($ev, $x, $y); 2309 $self->mouse_motion ($ev, $x, $y)
2147} 2310}
2148 2311
2149sub mouse_motion { 2312sub mouse_motion {
2150 my ($self, $ev, $x, $y) = @_; 2313 my ($self, $ev, $x, $y) = @_;
2151 2314
… …
2155 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2318 my (undef, $lo, $hi, $page) = @{$self->{range}};
2156 2319
2157 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2320 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2158 2321
2159 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2322 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2323 } else {
2324 return 0;
2325 }
2326
2160 } 2327 1
2161} 2328}
2162 2329
2163sub update { 2330sub update {
2164 my ($self) = @_; 2331 my ($self) = @_;
2165 2332
… …
2492 2659
2493sub new { 2660sub new {
2494 my $class = shift; 2661 my $class = shift;
2495 2662
2496 my $self = $class->SUPER::new ( 2663 my $self = $class->SUPER::new (
2497 state => 0, 2664 state => 0,
2498 connect_activate => \&toggle_flopper, 2665 on_activate => \&toggle_flopper,
2499 @_ 2666 @_
2500 ); 2667 );
2501 2668
2502 if ($self->{state}) {
2503 $self->{state} = 0;
2504 $self->toggle_flopper;
2505 }
2506
2507 $self 2669 $self
2508} 2670}
2509 2671
2510sub toggle_flopper { 2672sub toggle_flopper {
2511 my ($self) = @_; 2673 my ($self) = @_;
2512 2674
2513 # TODO: use animation 2675 $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} 2676}
2525 2677
2526############################################################################# 2678#############################################################################
2527 2679
2528package CFClient::UI::Tooltip; 2680package CFClient::UI::Tooltip;
… …
2541} 2693}
2542 2694
2543sub set_tooltip_from { 2695sub set_tooltip_from {
2544 my ($self, $widget) = @_; 2696 my ($self, $widget) = @_;
2545 2697
2698 my $tooltip = $widget->{tooltip};
2699
2700 if ($ENV{CFPLUS_DEBUG} & 2) {
2701 $tooltip .= "\n\n" . (ref $widget) . "\n"
2702 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2703 . "req $widget->{req_w} $widget->{req_h}\n"
2704 . "visible $widget->{visible}";
2705 }
2706
2546 $self->add (new CFClient::UI::Label 2707 $self->add (new CFClient::UI::Label
2547 markup => $widget->{tooltip}, 2708 markup => $tooltip,
2548 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2709 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2549 fontsize => 0.8, 2710 fontsize => 0.8,
2550 fg => [0, 0, 0, 1], 2711 fg => [0, 0, 0, 1],
2551 ellipsise => 0, 2712 ellipsise => 0,
2552 font => ($widget->{tooltip_font} || $::FONT_PROP), 2713 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2563 2724
2564sub size_allocate { 2725sub size_allocate {
2565 my ($self, $w, $h) = @_; 2726 my ($self, $w, $h) = @_;
2566 2727
2567 $self->SUPER::size_allocate ($w - 4, $h - 4); 2728 $self->SUPER::size_allocate ($w - 4, $h - 4);
2729}
2730
2731sub visibility_change {
2732 my ($self, $visible) = @_;
2733
2734 return unless $visible;
2735
2736 $self->{root}->on_post_alloc ("move_$self" => sub {
2737 my $widget = $self->{owner}
2738 or return;
2739
2740 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2741
2742 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2743 if $x + $self->{w} > $::WIDTH;
2744
2745 $self->move_abs ($x, $y);
2746 });
2568} 2747}
2569 2748
2570sub _draw { 2749sub _draw {
2571 my ($self) = @_; 2750 my ($self) = @_;
2572 2751
… …
2589 glVertex $w, $h; 2768 glVertex $w, $h;
2590 glVertex $w, 0; 2769 glVertex $w, 0;
2591 glEnd; 2770 glEnd;
2592 2771
2593 glTranslate 2 - 0.375, 2 - 0.375; 2772 glTranslate 2 - 0.375, 2 - 0.375;
2773
2594 $self->SUPER::_draw; 2774 $self->SUPER::_draw;
2595} 2775}
2596 2776
2597############################################################################# 2777#############################################################################
2598 2778
… …
2604 2784
2605sub new { 2785sub new {
2606 my $class = shift; 2786 my $class = shift;
2607 2787
2608 my $self = $class->SUPER::new ( 2788 my $self = $class->SUPER::new (
2609 aspect => 1, 2789 aspect => 1,
2790 can_events => 0,
2610 @_, 2791 @_,
2611 ); 2792 );
2612 2793
2613 if ($self->{anim} && $self->{animspeed}) { 2794 if ($self->{anim} && $self->{animspeed}) {
2614 Scalar::Util::weaken (my $widget = $self); 2795 Scalar::Util::weaken (my $widget = $self);
… …
2673 $self->SUPER::DESTROY; 2854 $self->SUPER::DESTROY;
2674} 2855}
2675 2856
2676############################################################################# 2857#############################################################################
2677 2858
2678package CFClient::UI::InventoryItem;
2679
2680our @ISA = CFClient::UI::HBox::;
2681
2682sub _item_to_desc {
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
2839#############################################################################
2840
2841package CFClient::UI::Menu; 2859package CFClient::UI::Menu;
2842 2860
2843our @ISA = CFClient::UI::FancyFrame::; 2861our @ISA = CFClient::UI::FancyFrame::;
2844 2862
2845use CFClient::OpenGL; 2863use CFClient::OpenGL;
… …
2876 2894
2877# popup given the event (must be a mouse button down event currently) 2895# popup given the event (must be a mouse button down event currently)
2878sub popup { 2896sub popup {
2879 my ($self, $ev) = @_; 2897 my ($self, $ev) = @_;
2880 2898
2881 $self->emit ("popdown"); 2899 $self->_emit ("popdown");
2882 2900
2883 # maybe save $GRAB? must be careful about events... 2901 # maybe save $GRAB? must be careful about events...
2884 $GRAB = $self; 2902 $GRAB = $self;
2885 $self->{button} = $ev->{button}; 2903 $self->{button} = $ev->{button};
2886 2904
2887 $self->show; 2905 $self->show;
2888 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2906 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2889} 2907}
2890 2908
2891sub mouse_motion { 2909sub mouse_motion {
2892 my ($self, $ev, $x, $y) = @_; 2910 my ($self, $ev, $x, $y) = @_;
2893 2911
2894 # TODO: should use vbox->find_widget or so 2912 # TODO: should use vbox->find_widget or so
2895 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2913 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2896 $self->{hover} = $self->{item}{$HOVER}; 2914 $self->{hover} = $self->{item}{$HOVER};
2915
2916 0
2897} 2917}
2898 2918
2899sub button_up { 2919sub button_up {
2900 my ($self, $ev, $x, $y) = @_; 2920 my ($self, $ev, $x, $y) = @_;
2901 2921
2902 if ($ev->{button} == $self->{button}) { 2922 if ($ev->{button} == $self->{button}) {
2903 undef $GRAB; 2923 undef $GRAB;
2904 $self->hide; 2924 $self->hide;
2905 2925
2906 $self->emit ("popdown"); 2926 $self->_emit ("popdown");
2907 $self->{hover}[1]->() if $self->{hover}; 2927 $self->{hover}[1]->() if $self->{hover};
2928 } else {
2929 return 0
2930 }
2931
2908 } 2932 1
2909} 2933}
2910 2934
2911############################################################################# 2935#############################################################################
2912 2936
2913package CFClient::UI::Statusbox; 2937package CFClient::UI::Statusbox;
… …
2973sub add { 2997sub add {
2974 my ($self, $text, %arg) = @_; 2998 my ($self, $text, %arg) = @_;
2975 2999
2976 $text =~ s/^\s+//; 3000 $text =~ s/^\s+//;
2977 $text =~ s/\s+$//; 3001 $text =~ s/\s+$//;
3002
3003 return unless $text;
2978 3004
2979 my $timeout = time + ((delete $arg{timeout}) || 60); 3005 my $timeout = time + ((delete $arg{timeout}) || 60);
2980 3006
2981 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3007 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2982 3008
… …
3016 $self->SUPER::reconfigure; 3042 $self->SUPER::reconfigure;
3017} 3043}
3018 3044
3019############################################################################# 3045#############################################################################
3020 3046
3021package CFClient::UI::Root; 3047package CFClient::UI::Inventory;
3022 3048
3023our @ISA = CFClient::UI::Container::; 3049our @ISA = CFClient::UI::ScrolledWindow::;
3024
3025use CFClient::OpenGL;
3026 3050
3027sub new { 3051sub new {
3028 my $class = shift; 3052 my $class = shift;
3029 3053
3030 $class->SUPER::new ( 3054 my $self = $class->SUPER::new (
3055 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3031 @_, 3056 @_,
3032 ) 3057 );
3033}
3034 3058
3035sub configure { 3059 $self
3060}
3061
3062sub set_items {
3063 my ($self, $items) = @_;
3064
3065 $self->{scrolled}->clear;
3066 return unless $items;
3067
3068 my @items = sort {
3069 ($a->{type} <=> $b->{type})
3070 or ($a->{name} cmp $b->{name})
3071 } @$items;
3072
3073 $self->{real_items} = \@items;
3074
3075 my $row = 0;
3076 for my $item (@items) {
3077 CFClient::Item::update_widgets $item;
3078
3079 $self->{scrolled}->add (0, $row, $item->{face_widget});
3080 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3081 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3082
3083 $row++;
3084 }
3085}
3086
3087#############################################################################
3088
3089package CFClient::UI::BindEditor;
3090
3091our @ISA = CFClient::UI::FancyFrame::;
3092
3093sub new {
3094 my $class = shift;
3095
3096 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3097
3098 $self->add (my $vb = new CFClient::UI::VBox);
3099
3100
3101 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3102 text => "start recording",
3103 tooltip => "Start/Stops recording of actions."
3104 ."All subsequent actions after the recording started will be captured."
3105 ."The actions are displayed after the record was stopped."
3106 ."To bind the action you have to click on the 'Bind' button",
3107 on_activate => sub {
3108 unless ($self->{recording}) {
3109 $self->start;
3110 } else {
3111 $self->stop;
3112 }
3113 });
3114
3115 $vb->add (new CFClient::UI::Label text => "Actions:");
3116 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3117
3118 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3119 $vb->add (my $hb = new CFClient::UI::HBox);
3120 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3121 $hb->add (new CFClient::UI::Button
3122 text => "bind",
3123 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3124 on_activate => sub {
3125 $self->ask_for_bind;
3126 });
3127
3128 $vb->add (my $hb = new CFClient::UI::HBox);
3129 $hb->add (new CFClient::UI::Button
3130 text => "ok",
3131 expand => 1,
3132 tooltip => "This closes the binding editor and saves the binding",
3133 on_activate => sub {
3134 $self->hide;
3135 $self->commit;
3136 });
3137
3138 $hb->add (new CFClient::UI::Button
3139 text => "cancel",
3140 expand => 1,
3141 tooltip => "This closes the binding editor without saving",
3142 on_activate => sub {
3143 $self->hide;
3144 $self->{binding_cancel}->()
3145 if $self->{binding_cancel};
3146 });
3147
3148 $self->update_binding_widgets;
3149
3150 $self
3151}
3152
3153sub commit {
3154 my ($self) = @_;
3155 my ($mod, $sym, $cmds) = $self->get_binding;
3156 if ($sym != 0 && @$cmds > 0) {
3157 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3158 ."'. Don't forget 'Save Config'!");
3159 $self->{binding_change}->($mod, $sym, $cmds)
3160 if $self->{binding_change};
3161 } else {
3162 $::STATUSBOX->add ("No action bound, no key or action specified!");
3163 $self->{binding_cancel}->()
3164 if $self->{binding_cancel};
3165 }
3166}
3167
3168sub start {
3169 my ($self) = @_;
3170
3171 $self->{rec_btn}->set_text ("stop recording");
3172 $self->{recording} = 1;
3173 $self->clear_command_list;
3174 $::CONN->start_record if $::CONN;
3175}
3176
3177sub stop {
3178 my ($self) = @_;
3179
3180 $self->{rec_btn}->set_text ("start recording");
3181 $self->{recording} = 0;
3182
3183 my $rec;
3184 $rec = $::CONN->stop_record if $::CONN;
3185 return unless ref $rec eq 'ARRAY';
3186 $self->set_command_list ($rec);
3187}
3188
3189
3190sub ask_for_bind_and_commit {
3191 my ($self) = @_;
3192 $self->ask_for_bind (1);
3193}
3194
3195sub ask_for_bind {
3196 my ($self, $commit) = @_;
3197
3198 CFClient::Binder::open_binding_dialog (sub {
3199 my ($mod, $sym) = @_;
3200 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3201 $self->update_binding_widgets;
3202 $self->commit if $commit;
3203 });
3204}
3205
3206# $mod and $sym are the modifiers and key symbol
3207# $cmds is a array ref of strings (the commands)
3208# $cb is the callback that is executed on OK
3209# $ccb is the callback that is executed on CANCEL and
3210# when the binding was unsuccessful on OK
3211sub set_binding {
3036 my ($self, $x, $y, $w, $h) = @_; 3212 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3037 3213
3038 $self->{w} = $w; 3214 $self->clear_command_list;
3039 $self->{h} = $h; 3215 $self->{recording} = 0;
3040} 3216 $self->{rec_btn}->set_text ("start recording");
3041 3217
3042sub check_size { 3218 $self->{binding} = [$mod, $sym];
3219 $self->{commands} = $cmds;
3220
3221 $self->{binding_change} = $cb;
3222 $self->{binding_cancel} = $ccb;
3223
3224 $self->update_binding_widgets;
3225}
3226
3227# this is a shortcut method that asks for a binding
3228# and then just binds it.
3229sub do_quick_binding {
3043 my ($self) = @_; 3230 my ($self, $cmds) = @_;
3231 $self->set_binding (undef, undef, $cmds, sub {
3232 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3233 });
3234 $self->ask_for_bind (1);
3235}
3044 3236
3045 $self->size_allocate ($self->{w}, $self->{h}) 3237sub update_binding_widgets {
3046 if $self->{w}; 3238 my ($self) = @_;
3239 my ($mod, $sym, $cmds) = $self->get_binding;
3240 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3241 $self->set_command_list ($cmds);
3242}
3243
3244sub get_binding {
3245 my ($self) = @_;
3246 return (
3247 $self->{binding}->[0],
3248 $self->{binding}->[1],
3249 [ grep { defined $_ } @{$self->{commands}} ]
3250 );
3251}
3252
3253sub clear_command_list {
3254 my ($self) = @_;
3255 $self->{cmdbox}->clear ();
3256}
3257
3258sub set_command_list {
3259 my ($self, $cmds) = @_;
3260
3261 $self->{cmdbox}->clear ();
3262 $self->{commands} = $cmds;
3263
3264 my $idx = 0;
3265
3266 for (@$cmds) {
3267 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3268
3269 my $i = $idx;
3270 $hb->add (new CFClient::UI::Label text => $_);
3271 $hb->add (new CFClient::UI::Button
3272 text => "delete",
3273 tooltip => "Deletes the action from the record",
3274 on_activate => sub {
3275 $self->{cmdbox}->remove ($hb);
3276 $cmds->[$i] = undef;
3277 });
3278
3279
3280 $idx++
3281 }
3282}
3283
3284#############################################################################
3285
3286package CFClient::UI::SpellList;
3287
3288our @ISA = CFClient::UI::FancyFrame::;
3289
3290sub new {
3291 my $class = shift;
3292
3293 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3294
3295 $self->add (new CFClient::UI::ScrolledWindow
3296 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3297
3298 $self;
3299}
3300
3301# XXX: Do sorting? Argl...
3302sub add_spell {
3303 my ($self, $spell) = @_;
3304 $self->{spells}->{$spell->{name}} = $spell;
3305
3306 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3307 face => $spell->{face},
3308 can_hover => 1,
3309 can_events => 1,
3310 tooltip => $spell->{message});
3311
3312 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3313 text => $spell->{name},
3314 can_hover => 1,
3315 can_events => 1,
3316 tooltip => $spell->{message},
3317 expand => 1);
3318
3319 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3320 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3321 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3322 expand => 1);
3323
3324 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3325 text => "bind to key",
3326 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3327}
3328
3329sub rebuild_spell_list {
3330 my ($self) = @_;
3331 $self->{tbl_idx} = 0;
3332 $self->add_spell ($_) for values %{$self->{spells}};
3333}
3334
3335sub remove_spell {
3336 my ($self, $spell) = @_;
3337 delete $self->{spells}->{$spell->{name}};
3338 $self->rebuild_spell_list;
3339}
3340
3341#############################################################################
3342
3343package CFClient::UI::Root;
3344
3345our @ISA = CFClient::UI::Container::;
3346
3347use CFClient::OpenGL;
3348
3349sub new {
3350 my $class = shift;
3351
3352 my $self = $class->SUPER::new (
3353 visible => 1,
3354 @_,
3355 );
3356
3357 Scalar::Util::weaken ($self->{root} = $self);
3358
3359 $self
3047} 3360}
3048 3361
3049sub size_request { 3362sub size_request {
3050 my ($self) = @_; 3363 my ($self) = @_;
3051 3364
3052 ($self->{w}, $self->{h}) 3365 ($self->{w}, $self->{h})
3366}
3367
3368sub _to_pixel {
3369 my ($coord, $size, $max) = @_;
3370
3371 $coord =
3372 $coord eq "center" ? ($max - $size) * 0.5
3373 : $coord eq "max" ? $max
3374 : $coord;
3375
3376 $coord = 0 if $coord < 0;
3377 $coord = $max - $size if $coord > $max - $size;
3378
3379 int $coord + 0.5
3053} 3380}
3054 3381
3055sub size_allocate { 3382sub size_allocate {
3056 my ($self, $w, $h) = @_; 3383 my ($self, $w, $h) = @_;
3057 3384
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) { 3385 for my $child ($self->children) {
3065 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3386 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3066 3387
3067 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3388 $X = $child->{force_x} if exists $child->{force_x};
3068 if exists $child->{req_x}; 3389 $Y = $child->{force_y} if exists $child->{force_y};
3069 3390
3070 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3391 $X = _to_pixel $X, $W, $self->{w};
3071 if exists $child->{req_y}; 3392 $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 3393
3076 $child->configure ($X, $Y, $W, $H); 3394 $child->configure ($X, $Y, $W, $H);
3077 } 3395 }
3078} 3396}
3079 3397
… …
3090} 3408}
3091 3409
3092sub update { 3410sub update {
3093 my ($self) = @_; 3411 my ($self) = @_;
3094 3412
3095 $self->check_size;
3096 $::WANT_REFRESH++; 3413 $::WANT_REFRESH++;
3097} 3414}
3098 3415
3099sub add { 3416sub add {
3100 my ($self, @children) = @_; 3417 my ($self, @children) = @_;
3101 3418
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; 3419 $_->{is_toplevel} = 1
3110 3420 for @children;
3111 # integerise window positions
3112 $child->{x} = int $child->{x};
3113 $child->{y} = int $child->{y};
3114 }
3115 3421
3116 $self->SUPER::add (@children); 3422 $self->SUPER::add (@children);
3117} 3423}
3118 3424
3119sub remove { 3425sub remove {
3120 my ($self, @children) = @_; 3426 my ($self, @children) = @_;
3121 3427
3122 $self->SUPER::remove (@children); 3428 $self->SUPER::remove (@children);
3429
3430 delete $self->{is_toplevel}
3431 for @children;
3123 3432
3124 while (@children) { 3433 while (@children) {
3125 my $w = pop @children; 3434 my $w = pop @children;
3126 push @children, $w->children; 3435 push @children, $w->children;
3127 delete $w->{visible}; 3436 $w->set_invisible;
3128 } 3437 }
3129} 3438}
3130 3439
3131sub on_refresh { 3440sub on_refresh {
3132 my ($self, $id, $cb) = @_; 3441 my ($self, $id, $cb) = @_;
… …
3146 while ($self->{refresh_hook}) { 3455 while ($self->{refresh_hook}) {
3147 $_->() 3456 $_->()
3148 for values %{delete $self->{refresh_hook}}; 3457 for values %{delete $self->{refresh_hook}};
3149 } 3458 }
3150 3459
3151 if ($self->{check_size}) { 3460 if ($self->{realloc}) {
3152 my @queue = ([], []); 3461 my %queue;
3462 my @queue;
3463 my $widget;
3153 3464
3154 for (;;) { 3465 outer:
3155 if ($self->{check_size}) { 3466 while () {
3156 # heuristic: check containers last 3467 if (my $realloc = delete $self->{realloc}) {
3157 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3468 for $widget (values %$realloc) {
3158 for values %{delete $self->{check_size}} 3469 $widget->{visible} or next; # do not resize invisible widgets
3470
3471 $queue{$widget+0}++ and next; # duplicates are common
3472
3473 push @{ $queue[$widget->{visible}] }, $widget;
3474 }
3159 } 3475 }
3160 3476
3161 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3477 while () {
3478 @queue or last outer;
3162 3479
3163 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3480 $widget = pop @{ $queue[-1] || [] }
3164 ? @$widget{qw(user_w user_h)} 3481 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 3482
3483 pop @queue;
3484 }
3485
3486 delete $queue{$widget+0};
3487
3488 my ($w, $h) = $widget->size_request;
3489
3490 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3491 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3492
3493 $w = $widget->{force_w} if exists $widget->{force_w};
3494 $h = $widget->{force_h} if exists $widget->{force_h};
3495
3496 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3497 || delete $widget->{force_realloc}) {
3171 $widget->{req_w} = $w; 3498 $widget->{req_w} = $w;
3172 $widget->{req_h} = $h; 3499 $widget->{req_h} = $h;
3173 3500
3174 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3501 $self->{size_alloc}{$widget+0} = $widget;
3175 3502
3176 $widget->{parent}->check_size
3177 if $widget->{parent}; 3503 if (my $parent = $widget->{parent}) {
3504 $self->{realloc}{$parent+0} = $parent
3505 unless $queue{$parent+0};
3506
3507 $parent->{force_size_alloc} = 1;
3508 $self->{size_alloc}{$parent+0} = $parent;
3509 }
3178 } 3510 }
3511
3512 delete $self->{realloc}{$widget+0};
3179 } 3513 }
3180 } 3514 }
3181 3515
3182 while ($self->{size_alloc}) { 3516 while (my $size_alloc = delete $self->{size_alloc}) {
3183 for (values %{delete $self->{size_alloc}}) { 3517 my @queue = sort { $b->{visible} <=> $a->{visible} }
3184 my ($widget, $w, $h) = @$_; 3518 values %$size_alloc;
3519
3520 while () {
3521 my $widget = pop @queue || last;
3522
3523 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3185 3524
3186 $w = 0 if $w < 0; 3525 $w = 0 if $w < 0;
3187 $h = 0 if $h < 0; 3526 $h = 0 if $h < 0;
3188 3527
3528 $w = int $w + 0.5;
3529 $h = int $h + 0.5;
3530
3531 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3532 $widget->{old_w} = $widget->{w};
3533 $widget->{old_h} = $widget->{h};
3534
3189 $widget->{w} = $w; 3535 $widget->{w} = $w;
3190 $widget->{h} = $h; 3536 $widget->{h} = $h;
3191 $widget->size_allocate ($w, $h); 3537
3192 $widget->emit (size_allocate => $w, $h); 3538 $widget->emit (size_allocate => $w, $h);
3539 }
3193 } 3540 }
3194 } 3541 }
3195 3542
3196 while ($self->{post_alloc_hook}) { 3543 while ($self->{post_alloc_hook}) {
3197 $_->() 3544 $_->()
3198 for values %{delete $self->{post_alloc_hook}}; 3545 for values %{delete $self->{post_alloc_hook}};
3199 } 3546 }
3547
3200 3548
3201 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3549 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3202 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3550 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3203 glClear GL_COLOR_BUFFER_BIT; 3551 glClear GL_COLOR_BUFFER_BIT;
3204 3552
… …
3206 glLoadIdentity; 3554 glLoadIdentity;
3207 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3555 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3208 glMatrixMode GL_MODELVIEW; 3556 glMatrixMode GL_MODELVIEW;
3209 glLoadIdentity; 3557 glLoadIdentity;
3210 3558
3559 {
3560 package CFClient::UI::Base;
3561
3562 ($draw_x, $draw_y, $draw_w, $draw_h) =
3563 (0, 0, $self->{w}, $self->{h});
3564 }
3565
3211 $self->_draw; 3566 $self->_draw;
3212} 3567}
3213 3568
3214############################################################################# 3569#############################################################################
3215 3570

Diff Legend

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