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.228 by root, Wed May 24 03:52:54 2006 UTC vs.
Revision 1.270 by elmex, Fri Jun 2 09:02:49 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; #?
439
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
441 unless $FOCUS;
359} 442}
360 443
361sub mouse_motion { } 444sub mouse_motion { }
362sub button_up { } 445sub button_up { }
363sub key_down { } 446sub key_down { }
364sub key_up { } 447sub key_up { }
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} 453}
371 454
372sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 455sub find_widget {
373sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 456 my ($self, $x, $y) = @_;
374sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 457
375sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 458 return () unless $self->{can_events};
376sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 459
460 return $self
461 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
462 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
463
464 ()
465}
466
467sub set_parent {
468 my ($self, $parent) = @_;
469
470 Scalar::Util::weaken ($self->{parent} = $parent);
471 $self->set_visible if $parent->{visible};
472}
473
474sub connect {
475 my ($self, $signal, $cb) = @_;
476
477 push @{ $self->{signal_cb}{$signal} }, $cb;
478}
479
480sub _emit {
481 my ($self, $signal, @args) = @_;
482
483 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
484}
485
486sub emit {
487 my ($self, $signal, @args) = @_;
488
489 $self->_emit ($signal, @args)
490 || $self->$signal (@args);
491}
492
493sub visibility_change {
494 #my ($self, $visible) = @_;
495}
496
497sub realloc {
498 my ($self) = @_;
499
500 if ($self->{visible}) {
501 return if $self->{root}{realloc}{$self+0};
502
503 $self->{root}{realloc}{$self+0} = $self;
504 $self->{root}->update;
505 } else {
506 delete $self->{req_w};
507 delete $self->{req_h};
508 }
509}
510
511sub update {
512 my ($self) = @_;
513
514 $self->{parent}->update
515 if $self->{parent};
516}
517
518sub reconfigure {
519 my ($self) = @_;
520
521 $self->realloc;
522 $self->update;
523}
524
525# using global variables seems a bit hacky, but passing through all drawing
526# functions seems pointless.
527our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
377 528
378sub draw { 529sub draw {
379 my ($self) = @_; 530 my ($self) = @_;
380 531
381 return unless $self->{h} && $self->{w}; 532 return unless $self->{h} && $self->{w};
533
534 # update screen rectangle
535 local $draw_x = $draw_x + $self->{x};
536 local $draw_y = $draw_y + $self->{y};
537 local $draw_w = $draw_x + $self->{w};
538 local $draw_h = $draw_y + $self->{h};
539
540 # skip widgets that are entirely outside the drawing area
541 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
542 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
382 543
383 glPushMatrix; 544 glPushMatrix;
384 glTranslate $self->{x}, $self->{y}, 0; 545 glTranslate $self->{x}, $self->{y}, 0;
385 $self->_draw; 546 $self->_draw;
386 glPopMatrix; 547 glPopMatrix;
… …
398 glVertex $x , $y + $self->{h}; 559 glVertex $x , $y + $self->{h};
399 glEnd; 560 glEnd;
400 glDisable GL_BLEND; 561 glDisable GL_BLEND;
401 } 562 }
402 563
403 if ($ENV{PCLIENT_DEBUG}) { 564 if ($ENV{CFPLUS_DEBUG} & 1) {
404 glPushMatrix; 565 glPushMatrix;
405 glColor 1, 1, 0, 1; 566 glColor 1, 1, 0, 1;
406 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 567 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407 glBegin GL_LINE_LOOP; 568 glBegin GL_LINE_LOOP;
408 glVertex 0 , 0; 569 glVertex 0 , 0;
409 glVertex $self->{w}, 0; 570 glVertex $self->{w} - 1, 0;
410 glVertex $self->{w}, $self->{h}; 571 glVertex $self->{w} - 1, $self->{h} - 1;
411 glVertex 0 , $self->{h}; 572 glVertex 0 , $self->{h} - 1;
412 glEnd; 573 glEnd;
413 glPopMatrix; 574 glPopMatrix;
414 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 575 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
415 } 576 }
416} 577}
417 578
418sub _draw { 579sub _draw {
419 my ($self) = @_; 580 my ($self) = @_;
420 581
421 warn "no draw defined for $self\n"; 582 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} 583}
473 584
474sub DESTROY { 585sub DESTROY {
475 my ($self) = @_; 586 my ($self) = @_;
476 587
… …
534 my ($class, %arg) = @_; 645 my ($class, %arg) = @_;
535 $class->SUPER::new (can_events => 0, %arg); 646 $class->SUPER::new (can_events => 0, %arg);
536} 647}
537 648
538sub size_request { 649sub size_request {
539 (0, 0) 650 my ($self) = @_;
651
652 ($self->{w} + 0, $self->{h} + 0)
540} 653}
541 654
542sub draw { } 655sub draw { }
543 656
544############################################################################# 657#############################################################################
… …
573 $self->{children} = [ 686 $self->{children} = [
574 sort { $a->{z} <=> $b->{z} } 687 sort { $a->{z} <=> $b->{z} }
575 @{$self->{children}}, @widgets 688 @{$self->{children}}, @widgets
576 ]; 689 ];
577 690
578 $self->check_size (1); 691 $self->realloc;
579 $self->update;
580} 692}
581 693
582sub children { 694sub children {
583 @{ $_[0]{children} } 695 @{ $_[0]{children} }
584} 696}
… …
589 delete $child->{parent}; 701 delete $child->{parent};
590 $child->hide; 702 $child->hide;
591 703
592 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 704 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593 705
594 $self->check_size; 706 $self->realloc;
595 $self->update;
596} 707}
597 708
598sub clear { 709sub clear {
599 my ($self) = @_; 710 my ($self) = @_;
600 711
… …
604 for (@$children) { 715 for (@$children) {
605 delete $_->{parent}; 716 delete $_->{parent};
606 $_->hide; 717 $_->hide;
607 } 718 }
608 719
609 $self->check_size; 720 $self->realloc;
610 $self->update;
611} 721}
612 722
613sub find_widget { 723sub find_widget {
614 my ($self, $x, $y) = @_; 724 my ($self, $x, $y) = @_;
615 725
… …
702 $self->SUPER::size_allocate ($w, $h); 812 $self->SUPER::size_allocate ($w, $h);
703 $self->update; 813 $self->update;
704} 814}
705 815
706sub _render { 816sub _render {
817 my ($self) = @_;
818
707 $_[0]{children}[0]->draw; 819 $self->{children}[0]->draw;
708} 820}
709 821
710sub render_child { 822sub render_child {
711 my ($self) = @_; 823 my ($self) = @_;
712 824
713 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 825 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
714 glClearColor 0, 0, 0, 0; 826 glClearColor 0, 0, 0, 0;
715 glClear GL_COLOR_BUFFER_BIT; 827 glClear GL_COLOR_BUFFER_BIT;
716 828
829 {
830 package CFClient::UI::Base;
831
832 ($draw_x, $draw_y, $draw_w, $draw_h) =
833 (0, 0, $self->{w}, $self->{h});
834 }
835
717 $self->_render; 836 $self->_render;
718 }; 837 };
719} 838}
720 839
721sub _draw { 840sub _draw {
722 my ($self) = @_; 841 my ($self) = @_;
723 842
724 my ($w, $h) = ($self->w, $self->h); 843 my ($w, $h) = @$self{qw(w h)};
725 844
726 my $tex = $self->{texture} 845 my $tex = $self->{texture}
727 or return; 846 or return;
728 847
729 glEnable GL_TEXTURE_2D; 848 glEnable GL_TEXTURE_2D;
… …
739 858
740package CFClient::UI::ViewPort; 859package CFClient::UI::ViewPort;
741 860
742our @ISA = CFClient::UI::Window::; 861our @ISA = CFClient::UI::Window::;
743 862
863sub new {
864 my $class = shift;
865
866 $class->SUPER::new (
867 scroll_x => 0,
868 scroll_y => 1,
869 @_,
870 )
871}
872
744sub size_request { 873sub size_request {
745 my ($self) = @_; 874 my ($self) = @_;
746 875
747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 876 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
748 877
749 @$self{qw(child_w child_h)} 878 $w = 10 if $self->{scroll_x};
879 $h = 10 if $self->{scroll_y};
880
881 ($w, $h)
750} 882}
751 883
752sub size_allocate { 884sub size_allocate {
753 my ($self, $w, $h) = @_; 885 my ($self, $w, $h) = @_;
754 886
755 my ($cw, $ch) = @$self{qw(child_w child_h)}; 887 my $child = $self->child;
756# $w = $self->{w}; 888
889 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
890 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
891
757 $self->child->configure (0, 0, $cw, $ch); 892 $self->child->configure (0, 0, $w, $h);
758 $self->update; 893 $self->update;
759} 894}
760 895
761sub set_offset { 896sub set_offset {
762 my ($self, $x, $y) = @_; 897 my ($self, $x, $y) = @_;
… …
796} 931}
797 932
798sub _render { 933sub _render {
799 my ($self) = @_; 934 my ($self) = @_;
800 935
936 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
937 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
938
801 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 939 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
802 940
803 $self->SUPER::_render; 941 $self->SUPER::_render;
804} 942}
805 943
… …
813 my $class = shift; 951 my $class = shift;
814 952
815 my $self; 953 my $self;
816 954
817 my $slider = new CFClient::UI::Slider 955 my $slider = new CFClient::UI::Slider
818 vertical => 1, 956 vertical => 1,
819 range => [0, 0, 1, 0.01], # HACK fix 957 range => [0, 0, 1, 0.01], # HACK fix
820 connect_changed => sub { 958 on_changed => sub {
821 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 959 $self->{vp}->set_offset (0, $_[1]);
822 }, 960 },
823 ; 961 ;
824 962
825 $self = $class->SUPER::new ( 963 $self = $class->SUPER::new (
826 vp => (new CFClient::UI::ViewPort expand => 1), 964 vp => (new CFClient::UI::ViewPort expand => 1),
… …
831 $self->{vp}->add ($self->{scrolled}); 969 $self->{vp}->add ($self->{scrolled});
832 $self->add ($self->{vp}); 970 $self->add ($self->{vp});
833 $self->add ($self->{slider}); 971 $self->add ($self->{slider});
834 972
835 $self 973 $self
974}
975
976sub update {
977 my ($self) = @_;
978
979 $self->SUPER::update;
980
981 # todo: overwrite size_allocate of child
982 my $child = $self->{vp}->child;
983 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
984}
985
986sub size_allocate {
987 my ($self, $w, $h) = @_;
988
989 $self->SUPER::size_allocate ($w, $h);
990
991 my $child = $self->{vp}->child;
992 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
836} 993}
837 994
838#TODO# update range on size_allocate depending on child 995#TODO# update range on size_allocate depending on child
839# update viewport offset on scroll 996# update viewport offset on scroll
840 997
… …
884 1041
885our @ISA = CFClient::UI::Bin::; 1042our @ISA = CFClient::UI::Bin::;
886 1043
887use CFClient::OpenGL; 1044use CFClient::OpenGL;
888 1045
889my @tex = 1046my $bg =
1047 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1048 mipmap => 1, wrap => 1;
1049
1050my @border =
890 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1051 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
891 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1052 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
892 1053
893sub new { 1054sub new {
894 my $class = shift; 1055 my ($class, %arg) = @_;
895 1056
896 # TODO: user_x, user_y, overwrite moveto? 1057 my $title = delete $arg{title};
897 1058
898 my $self = $class->SUPER::new ( 1059 my $self = $class->SUPER::new (
899 bg => [1, 1, 1, 1], 1060 bg => [1, 1, 1, 1],
900 border_bg => [1, 1, 1, 1], 1061 border_bg => [1, 1, 1, 1],
901 border => 0.6, 1062 border => 0.6,
902 toplevel => 1,
903 can_events => 1, 1063 can_events => 1,
904 @_ 1064 min_w => 16,
1065 min_h => 16,
1066 %arg,
905 ); 1067 );
906 1068
907 $self->{title} &&= new CFClient::UI::Label 1069 $self->{title} = new CFClient::UI::Label
908 align => 0, 1070 align => 0,
909 valign => 1, 1071 valign => 1,
910 text => $self->{title}, 1072 text => $title,
911 fontsize => $self->{border}; 1073 fontsize => $self->{border}
1074 if defined $title;
912 1075
913 $self 1076 $self
1077}
1078
1079sub add {
1080 my ($self, @widgets) = @_;
1081
1082 $self->SUPER::add (@widgets);
1083 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
914} 1084}
915 1085
916sub border { 1086sub border {
917 int $_[0]{border} * $::FONTSIZE 1087 int $_[0]{border} * $::FONTSIZE
918} 1088}
919 1089
920sub size_request { 1090sub size_request {
921 my ($self) = @_; 1091 my ($self) = @_;
1092
1093 $self->{title}->size_request
1094 if $self->{title};
922 1095
923 my ($w, $h) = $self->SUPER::size_request; 1096 my ($w, $h) = $self->SUPER::size_request;
924 1097
925 ( 1098 (
926 $w + $self->border * 2, 1099 $w + $self->border * 2,
… …
929} 1102}
930 1103
931sub size_allocate { 1104sub size_allocate {
932 my ($self, $w, $h) = @_; 1105 my ($self, $w, $h) = @_;
933 1106
1107 if ($self->{title}) {
1108 $self->{title}{w} = $w;
1109 $self->{title}{h} = $h;
1110 $self->{title}->size_allocate ($w, $h);
1111 }
1112
1113 my $border = $self->border;
1114
934 $h -= List::Util::max 0, $self->border * 2; 1115 $h -= List::Util::max 0, $border * 2;
935 $w -= List::Util::max 0, $self->border * 2; 1116 $w -= List::Util::max 0, $border * 2;
936 1117
937 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
938 if $self->{title};
939
940 $self->child->configure ($self->border, $self->border, $w, $h); 1118 $self->child->configure ($border, $border, $w, $h);
941} 1119}
942 1120
943sub button_down { 1121sub button_down {
944 my ($self, $ev, $x, $y) = @_; 1122 my ($self, $ev, $x, $y) = @_;
945 1123
… …
961 my ($ev, $x, $y) = @_; 1139 my ($ev, $x, $y) = @_;
962 1140
963 my $dx = $ev->{x} - $ox; 1141 my $dx = $ev->{x} - $ox;
964 my $dy = $ev->{y} - $oy; 1142 my $dy = $ev->{y} - $oy;
965 1143
966 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1144 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
967 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1145 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1146
1147 $self->realloc;
968 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1148 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
969 $self->check_size;
970 }; 1149 };
971 1150
972 } elsif ($lr ^ $td) { 1151 } elsif ($lr ^ $td) {
973 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1152 my ($ox, $oy) = ($ev->{x}, $ev->{y});
974 my ($bx, $by) = ($self->{x}, $self->{y}); 1153 my ($bx, $by) = ($self->{x}, $self->{y});
… …
976 $self->{motion} = sub { 1155 $self->{motion} = sub {
977 my ($ev, $x, $y) = @_; 1156 my ($ev, $x, $y) = @_;
978 1157
979 ($x, $y) = ($ev->{x}, $ev->{y}); 1158 ($x, $y) = ($ev->{x}, $ev->{y});
980 1159
981 $self->move ($bx + $x - $ox, $by + $y - $oy); 1160 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
982 $self->update;
983 }; 1161 };
984 } 1162 }
985} 1163}
986 1164
987sub button_up { 1165sub button_up {
… …
997} 1175}
998 1176
999sub _draw { 1177sub _draw {
1000 my ($self) = @_; 1178 my ($self) = @_;
1001 1179
1180 my $child = $self->{children}[0];
1181
1002 my ($w, $h ) = ($self->{w}, $self->{h}); 1182 my ($w, $h ) = ($self->{w}, $self->{h});
1003 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1183 my ($cw, $ch) = ($child->{w}, $child->{h});
1004 1184
1005 glEnable GL_TEXTURE_2D; 1185 glEnable GL_TEXTURE_2D;
1006 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1186 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1007 1187
1008 my $border = $self->border; 1188 my $border = $self->border;
1009 1189
1010 glColor @{ $self->{border_bg} }; 1190 glColor @{ $self->{border_bg} };
1011 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1191 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1012 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1192 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1013 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1193 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1014 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1194 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1015 1195
1016 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1196 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1017 my $bg = $tex[0]; 1197 glColor @{ $self->{bg} };
1018 1198
1019 # TODO: repeat texture not scale 1199 # TODO: repeat texture not scale
1200 # solve this better(?)
1020 my $rep_x = $cw / $bg->{w}; 1201 $bg->{s} = $cw / $bg->{w};
1021 my $rep_y = $ch / $bg->{h}; 1202 $bg->{t} = $ch / $bg->{h};
1022
1023 glColor @{ $self->{bg} };
1024
1025 $bg->{s} = $rep_x;
1026 $bg->{t} = $rep_y;
1027 $bg->{wrap_mode} = 1;
1028 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1203 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1029 } 1204 }
1030 1205
1031 glDisable GL_TEXTURE_2D; 1206 glDisable GL_TEXTURE_2D;
1032 1207
1033 $self->{title}->draw if $self->{title};
1034
1035 $self->child->draw; 1208 $child->draw;
1209
1210 if ($self->{title}) {
1211 glTranslate 0, $border - $self->{h};
1212 $self->{title}->_draw;
1213 }
1036} 1214}
1037 1215
1038############################################################################# 1216#############################################################################
1039 1217
1040package CFClient::UI::Table; 1218package CFClient::UI::Table;
… …
1048sub new { 1226sub new {
1049 my $class = shift; 1227 my $class = shift;
1050 1228
1051 $class->SUPER::new ( 1229 $class->SUPER::new (
1052 col_expand => [], 1230 col_expand => [],
1053 @_ 1231 @_,
1054 ) 1232 )
1233}
1234
1235sub children {
1236 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1055} 1237}
1056 1238
1057sub add { 1239sub add {
1058 my ($self, $x, $y, $child) = @_; 1240 my ($self, $x, $y, $child) = @_;
1059 1241
1060 $child->set_parent ($self); 1242 $child->set_parent ($self);
1061 $self->{children}[$y][$x] = $child; 1243 $self->{children}[$y][$x] = $child;
1062 1244
1063 $child->check_size; 1245 $self->realloc;
1064} 1246}
1065 1247
1066sub children {
1067 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1068}
1069
1070# TODO: move to container class maybe? send childs a signal on removal? 1248# TODO: move to container class maybe? send children a signal on removal?
1071sub clear { 1249sub clear {
1072 my ($self) = @_; 1250 my ($self) = @_;
1073 1251
1074 my @children = $self->children; 1252 my @children = $self->children;
1075 delete $self->{children}; 1253 delete $self->{children};
… …
1077 for (@children) { 1255 for (@children) {
1078 delete $_->{parent}; 1256 delete $_->{parent};
1079 $_->hide; 1257 $_->hide;
1080 } 1258 }
1081 1259
1082 $self->update; 1260 $self->realloc;
1083} 1261}
1084 1262
1085sub get_wh { 1263sub get_wh {
1086 my ($self) = @_; 1264 my ($self) = @_;
1087 1265
… …
1118sub size_allocate { 1296sub size_allocate {
1119 my ($self, $w, $h) = @_; 1297 my ($self, $w, $h) = @_;
1120 1298
1121 my ($ws, $hs) = $self->get_wh; 1299 my ($ws, $hs) = $self->get_wh;
1122 1300
1123 my $req_w = sum @$ws; 1301 my $req_w = (sum @$ws) || 1;
1124 my $req_h = sum @$hs; 1302 my $req_h = (sum @$hs) || 1;
1125 1303
1126 # TODO: nicer code && do row_expand 1304 # TODO: nicer code && do row_expand
1127 my @col_expand = @{$self->{col_expand}}; 1305 my @col_expand = @{$self->{col_expand}};
1128 @col_expand = (1) x @$ws unless @col_expand; 1306 @col_expand = (1) x @$ws unless @col_expand;
1129 my $col_expand = (sum @col_expand) || 1; 1307 my $col_expand = (sum @col_expand) || 1;
… …
1183 } 1361 }
1184} 1362}
1185 1363
1186############################################################################# 1364#############################################################################
1187 1365
1188package CFClient::UI::HBox; 1366package CFClient::UI::Box;
1189
1190# TODO: wrap into common Box base class
1191 1367
1192our @ISA = CFClient::UI::Container::; 1368our @ISA = CFClient::UI::Container::;
1193 1369
1194sub size_request { 1370sub size_request {
1195 my ($self) = @_; 1371 my ($self) = @_;
1196 1372
1197 my @alloc = map [$_->size_request], @{$self->{children}}; 1373 $self->{vertical}
1198 1374 ? (
1199 ( 1375 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1200 (List::Util::sum map $_->[0], @alloc), 1376 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1201 (List::Util::max map $_->[1], @alloc), 1377 )
1202 ) 1378 : (
1379 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1380 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1381 )
1203} 1382}
1204 1383
1205sub size_allocate { 1384sub size_allocate {
1206 my ($self, $w, $h) = @_; 1385 my ($self, $w, $h) = @_;
1207 1386
1208 ($h, $w) = ($w, $h); 1387 my $space = $self->{vertical} ? $h : $w;
1209
1210 my $children = $self->{children}; 1388 my $children = $self->{children};
1211 1389
1212 my @h = map $_->{req_w}, @$children; 1390 my @req;
1213 1391
1214 my $req_h = List::Util::sum @h; 1392 if ($self->{homogeneous}) {
1215 1393 @req = ($space / (@$children || 1)) x @$children;
1216 if ($req_h > $h) {
1217 # ah well, not enough space
1218 $_ *= $h / $req_h for @h;
1219 } else { 1394 } else {
1395 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1396 my $req = List::Util::sum @req;
1397
1398 if ($req > $space) {
1399 # ah well, not enough space
1400 $_ *= $space / $req for @req;
1401 } else {
1220 my $exp = List::Util::sum map $_->{expand}, @$children; 1402 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1221 $exp ||= 1;
1222 1403
1404 $space = ($space - $req) / $expand; # remaining space to give away
1405
1406 $req[$_] += $space * $children->[$_]{expand}
1223 for (0 .. $#$children) { 1407 for 0 .. $#$children;
1224 my $child = $children->[$_];
1225
1226 my $alloc_h = $h[$_];
1227 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1228 $h[$_] = $alloc_h;
1229 } 1408 }
1230 } 1409 }
1231 1410
1232 CFClient::UI::harmonize \@h; 1411 CFClient::UI::harmonize \@req;
1233 1412
1234 my $y = 0; 1413 my $pos = 0;
1235 for (0 .. $#$children) { 1414 for (0 .. $#$children) {
1236 my $child = $children->[$_];
1237 my $h = $h[$_]; 1415 my $alloc = $req[$_];
1238 $child->configure ($y, 0, $h, $w); 1416 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1239 1417
1240 $y += $h; 1418 $pos += $alloc;
1241 } 1419 }
1242 1420
1243 1 1421 1
1244} 1422}
1245 1423
1246############################################################################# 1424#############################################################################
1247 1425
1426package CFClient::UI::HBox;
1427
1428our @ISA = CFClient::UI::Box::;
1429
1430sub new {
1431 my $class = shift;
1432
1433 $class->SUPER::new (
1434 vertical => 0,
1435 @_,
1436 )
1437}
1438
1439#############################################################################
1440
1248package CFClient::UI::VBox; 1441package CFClient::UI::VBox;
1249 1442
1250# TODO: wrap into common Box base class
1251
1252our @ISA = CFClient::UI::Container::; 1443our @ISA = CFClient::UI::Box::;
1253 1444
1254sub size_request { 1445sub new {
1255 my ($self) = @_; 1446 my $class = shift;
1256 1447
1257 my @alloc = map [$_->size_request], @{$self->{children}}; 1448 $class->SUPER::new (
1258 1449 vertical => 1,
1259 ( 1450 @_,
1260 (List::Util::max map $_->[0], @alloc),
1261 (List::Util::sum map $_->[1], @alloc),
1262 ) 1451 )
1263}
1264
1265sub size_allocate {
1266 my ($self, $w, $h) = @_;
1267
1268 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1269
1270 my $children = $self->{children};
1271
1272 my @h = map $_->{req_h}, @$children;
1273
1274 my $req_h = List::Util::sum @h;
1275
1276 if ($req_h > $h) {
1277 # ah well, not enough space
1278 $_ *= $h / $req_h for @h;
1279 } else {
1280 my $exp = List::Util::sum map $_->{expand}, @$children;
1281 $exp ||= 1;
1282
1283 for (0 .. $#$children) {
1284 my $child = $children->[$_];
1285
1286 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1287 }
1288 }
1289
1290 CFClient::UI::harmonize \@h;
1291
1292 my $y = 0;
1293 for (0 .. $#$children) {
1294 my $child = $children->[$_];
1295 my $h = $h[$_];
1296 $child->configure (0, $y, $w, $h);
1297
1298 $y += $h;
1299 }
1300
1301 1
1302} 1452}
1303 1453
1304############################################################################# 1454#############################################################################
1305 1455
1306package CFClient::UI::Label; 1456package CFClient::UI::Label;
… …
1323 ellipsise => 3, # end 1473 ellipsise => 3, # end
1324 layout => (new CFClient::Layout), 1474 layout => (new CFClient::Layout),
1325 fontsize => 1, 1475 fontsize => 1,
1326 align => -1, 1476 align => -1,
1327 valign => -1, 1477 valign => -1,
1328 padding => 2, 1478 padding_x => 2,
1479 padding_y => 2,
1329 can_events => 0, 1480 can_events => 0,
1330 %arg 1481 %arg
1331 ); 1482 );
1332 1483
1333 if (exists $self->{template}) { 1484 if (exists $self->{template}) {
… …
1369 $self->{text} = "T$text"; 1520 $self->{text} = "T$text";
1370 1521
1371 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1522 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1372 $self->{layout}->set_text ($text); 1523 $self->{layout}->set_text ($text);
1373 1524
1525 $self->realloc;
1374 $self->update; 1526 $self->update;
1375 $self->check_size;
1376} 1527}
1377 1528
1378sub set_markup { 1529sub set_markup {
1379 my ($self, $markup) = @_; 1530 my ($self, $markup) = @_;
1380 1531
… …
1384 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1535 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1385 1536
1386 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1537 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1387 $self->{layout}->set_markup ($markup); 1538 $self->{layout}->set_markup ($markup);
1388 1539
1540 $self->realloc;
1389 $self->update; 1541 $self->update;
1390 $self->check_size;
1391} 1542}
1392 1543
1393sub size_request { 1544sub size_request {
1394 my ($self) = @_; 1545 my ($self) = @_;
1395 1546
… …
1409 1560
1410 $w = List::Util::max $w, $w2; 1561 $w = List::Util::max $w, $w2;
1411 $h = List::Util::max $h, $h2; 1562 $h = List::Util::max $h, $h2;
1412 } 1563 }
1413 1564
1414 ( 1565 ($w, $h)
1415 $w + $self->{padding} * 2,
1416 $h + $self->{padding} * 2,
1417 )
1418} 1566}
1419 1567
1420sub size_allocate { 1568sub size_allocate {
1421 my ($self, $w, $h) = @_; 1569 my ($self, $w, $h) = @_;
1422 1570
1571 delete $self->{ox};
1572
1423 delete $self->{texture}; 1573 delete $self->{texture}
1574 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1424} 1575}
1425 1576
1426sub set_fontsize { 1577sub set_fontsize {
1427 my ($self, $fontsize) = @_; 1578 my ($self, $fontsize) = @_;
1428 1579
1429 $self->{fontsize} = $fontsize; 1580 $self->{fontsize} = $fontsize;
1430 delete $self->{texture}; 1581 delete $self->{texture};
1431 1582
1432 $self->update; 1583 $self->realloc;
1433 $self->check_size;
1434} 1584}
1435 1585
1436sub _draw { 1586sub _draw {
1437 my ($self) = @_; 1587 my ($self) = @_;
1438 1588
… …
1444 $self->{layout}->set_width ($self->{w}); 1594 $self->{layout}->set_width ($self->{w});
1445 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1595 $self->{layout}->set_ellipsise ($self->{ellipsise});
1446 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1596 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1447 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1597 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1448 1598
1449 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1599 new_from_layout CFClient::Texture $self->{layout}
1600 };
1450 1601
1602 unless (exists $self->{ox}) {
1451 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1603 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1452 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1604 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1453 : ($self->{w} - $tex->{w}) * 0.5); 1605 : ($self->{w} - $tex->{w}) * 0.5);
1454 1606
1455 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1607 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1456 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1608 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1457 : ($self->{h} - $tex->{h}) * 0.5); 1609 : ($self->{h} - $tex->{h}) * 0.5);
1458
1459 $tex
1460 }; 1610 };
1461 1611
1462 glEnable GL_TEXTURE_2D; 1612 glEnable GL_TEXTURE_2D;
1463 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1613 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1464 1614
… …
1510 $self->{text} = $text; 1660 $self->{text} = $text;
1511 1661
1512 $text =~ s/./*/g if $self->{hidden}; 1662 $text =~ s/./*/g if $self->{hidden};
1513 $self->{layout}->set_text ("$text "); 1663 $self->{layout}->set_text ("$text ");
1514 1664
1515 $self->emit (changed => $self->{text}); 1665 $self->_emit (changed => $self->{text});
1516} 1666}
1517 1667
1518sub set_text { 1668sub set_text {
1519 my ($self, $text) = @_; 1669 my ($self, $text) = @_;
1520 1670
1521 $self->{cursor} = length $text; 1671 $self->{cursor} = length $text;
1522 $self->_set_text ($text); 1672 $self->_set_text ($text);
1523 $self->update; 1673
1524 $self->check_size; 1674 $self->realloc;
1525} 1675}
1526 1676
1527sub get_text { 1677sub get_text {
1528 $_[0]{text} 1678 $_[0]{text}
1529} 1679}
… …
1532 my ($self) = @_; 1682 my ($self) = @_;
1533 1683
1534 my ($w, $h) = $self->SUPER::size_request; 1684 my ($w, $h) = $self->SUPER::size_request;
1535 1685
1536 ($w + 1, $h) # add 1 for cursor 1686 ($w + 1, $h) # add 1 for cursor
1537}
1538
1539sub size_allocate {
1540 my ($self, $w, $h) = @_;
1541
1542 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1543} 1687}
1544 1688
1545sub key_down { 1689sub key_down {
1546 my ($self, $ev) = @_; 1690 my ($self, $ev) = @_;
1547 1691
… …
1562 } elsif ($sym == CFClient::SDLK_HOME) { 1706 } elsif ($sym == CFClient::SDLK_HOME) {
1563 $self->{cursor} = 0; 1707 $self->{cursor} = 0;
1564 } elsif ($sym == CFClient::SDLK_END) { 1708 } elsif ($sym == CFClient::SDLK_END) {
1565 $self->{cursor} = length $text; 1709 $self->{cursor} = length $text;
1566 } elsif ($uni == 27) { 1710 } elsif ($uni == 27) {
1567 $self->emit ('escape'); 1711 $self->_emit ('escape');
1568 } elsif ($uni) { 1712 } elsif ($uni) {
1569 substr $text, $self->{cursor}++, 0, chr $uni; 1713 substr $text, $self->{cursor}++, 0, chr $uni;
1570 } 1714 }
1571 1715
1572 $self->_set_text ($text); 1716 $self->_set_text ($text);
1573 $self->update; 1717
1574 $self->check_size; 1718 $self->realloc;
1575} 1719}
1576 1720
1577sub focus_in { 1721sub focus_in {
1578 my ($self) = @_; 1722 my ($self) = @_;
1579 1723
… …
1659 if ($sym == 13) { 1803 if ($sym == 13) {
1660 unshift @{$self->{history}}, 1804 unshift @{$self->{history}},
1661 my $txt = $self->get_text; 1805 my $txt = $self->get_text;
1662 $self->{history_pointer} = -1; 1806 $self->{history_pointer} = -1;
1663 $self->{history_saveback} = ''; 1807 $self->{history_saveback} = '';
1664 $self->emit (activate => $txt); 1808 $self->_emit (activate => $txt);
1665 $self->update; 1809 $self->update;
1666 1810
1667 } elsif ($sym == CFClient::SDLK_UP) { 1811 } elsif ($sym == CFClient::SDLK_UP) {
1668 if ($self->{history_pointer} < 0) { 1812 if ($self->{history_pointer} < 0) {
1669 $self->{history_saveback} = $self->get_text; 1813 $self->{history_saveback} = $self->get_text;
… …
1706 1850
1707sub new { 1851sub new {
1708 my $class = shift; 1852 my $class = shift;
1709 1853
1710 $class->SUPER::new ( 1854 $class->SUPER::new (
1711 padding => 4, 1855 padding_x => 4,
1856 padding_y => 4,
1712 fg => [1, 1, 1], 1857 fg => [1, 1, 1],
1713 active_fg => [0, 0, 1], 1858 active_fg => [0, 0, 1],
1714 can_hover => 1, 1859 can_hover => 1,
1715 align => 0, 1860 align => 0,
1716 valign => 0, 1861 valign => 0,
1717 can_events => 1, 1862 can_events => 1,
1718 @_ 1863 @_
1719 ) 1864 )
1720} 1865}
1721 1866
1867sub activate { }
1868
1722sub button_up { 1869sub button_up {
1723 my ($self, $ev, $x, $y) = @_; 1870 my ($self, $ev, $x, $y) = @_;
1724 1871
1872 $self->emit ("activate")
1725 if ($x >= 0 && $x < $self->{w} 1873 if $x >= 0 && $x < $self->{w}
1726 && $y >= 0 && $y < $self->{h}) { 1874 && $y >= 0 && $y < $self->{h};
1727 $self->emit ("activate");
1728 }
1729} 1875}
1730 1876
1731sub _draw { 1877sub _draw {
1732 my ($self) = @_; 1878 my ($self) = @_;
1733 1879
… …
1762 1908
1763sub new { 1909sub new {
1764 my $class = shift; 1910 my $class = shift;
1765 1911
1766 $class->SUPER::new ( 1912 $class->SUPER::new (
1767 padding => 2, 1913 padding_x => 2,
1914 padding_y => 2,
1768 fg => [1, 1, 1], 1915 fg => [1, 1, 1],
1769 active_fg => [1, 1, 0], 1916 active_fg => [1, 1, 0],
1770 bg => [0, 0, 0, 0.2], 1917 bg => [0, 0, 0, 0.2],
1771 active_bg => [1, 1, 1, 0.5], 1918 active_bg => [1, 1, 1, 0.5],
1772 state => 0, 1919 state => 0,
… …
1776} 1923}
1777 1924
1778sub size_request { 1925sub size_request {
1779 my ($self) = @_; 1926 my ($self) = @_;
1780 1927
1781 ($self->{padding} * 2 + 6) x 2 1928 (6) x 2
1782} 1929}
1783 1930
1784sub button_down { 1931sub button_down {
1785 my ($self, $ev, $x, $y) = @_; 1932 my ($self, $ev, $x, $y) = @_;
1786 1933
1787 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1934 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1788 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1935 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1789 $self->{state} = !$self->{state}; 1936 $self->{state} = !$self->{state};
1790 $self->emit (changed => $self->{state}); 1937 $self->_emit (changed => $self->{state});
1791 } 1938 }
1792} 1939}
1793 1940
1794sub _draw { 1941sub _draw {
1795 my ($self) = @_; 1942 my ($self) = @_;
1796 1943
1797 $self->SUPER::_draw; 1944 $self->SUPER::_draw;
1798 1945
1799 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1946 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1800 1947
1801 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1948 my ($w, $h) = @$self{qw(w h)};
1949
1950 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1802 1951
1803 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1952 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1804 1953
1805 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1954 my $tex = $self->{state} ? $tex[1] : $tex[0];
1806 1955
… …
2071 fg => [1, 1, 1], 2220 fg => [1, 1, 1],
2072 active_fg => [0, 0, 0], 2221 active_fg => [0, 0, 0],
2073 bg => [0, 0, 0, 0.2], 2222 bg => [0, 0, 0, 0.2],
2074 active_bg => [1, 1, 1, 0.5], 2223 active_bg => [1, 1, 1, 0.5],
2075 range => [0, 0, 100, 10, 0], 2224 range => [0, 0, 100, 10, 0],
2076 req_w => $::WIDTH / 80, 2225 min_w => $::WIDTH / 80,
2077 req_h => $::WIDTH / 80, 2226 min_h => $::WIDTH / 80,
2078 vertical => 0, 2227 vertical => 0,
2079 can_hover => 1, 2228 can_hover => 1,
2080 inner_pad => 0.02, 2229 inner_pad => 0.02,
2081 @_ 2230 @_
2082 ); 2231 );
… …
2085 $self->update; 2234 $self->update;
2086 2235
2087 $self 2236 $self
2088} 2237}
2089 2238
2239sub changed { }
2240
2090sub set_range { 2241sub set_range {
2091 my ($self, $range) = @_; 2242 my ($self, $range) = @_;
2092 2243
2093 $self->{range} = $range; 2244 ($range, $self->{range}) = ($self->{range}, $range);
2094 2245
2095 $self->update; 2246 $self->update
2247 if "@$range" ne "@{$self->{range}}";
2096} 2248}
2097 2249
2098sub set_value { 2250sub set_value {
2099 my ($self, $value) = @_; 2251 my ($self, $value) = @_;
2100 2252
… …
2111 if $unit; 2263 if $unit;
2112 2264
2113 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2265 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114 2266
2115 if ($value != $old_value) { 2267 if ($value != $old_value) {
2116 $self->emit (changed => $value); 2268 $self->_emit (changed => $value);
2117 $self->update; 2269 $self->update;
2118 } 2270 }
2119} 2271}
2120 2272
2121sub size_request { 2273sub size_request {
2122 my ($self) = @_; 2274 my ($self) = @_;
2123 2275
2124 my $w = $self->{req_w}; 2276 ($self->{req_w}, $self->{req_h})
2125 my $h = $self->{req_h};
2126
2127 $self->{vertical} ? ($h, $w) : ($w, $h)
2128} 2277}
2129 2278
2130sub button_down { 2279sub button_down {
2131 my ($self, $ev, $x, $y) = @_; 2280 my ($self, $ev, $x, $y) = @_;
2132 2281
… …
2483 2632
2484sub new { 2633sub new {
2485 my $class = shift; 2634 my $class = shift;
2486 2635
2487 my $self = $class->SUPER::new ( 2636 my $self = $class->SUPER::new (
2488 state => 0, 2637 state => 0,
2489 connect_activate => \&toggle_flopper, 2638 on_activate => \&toggle_flopper,
2490 @_ 2639 @_
2491 ); 2640 );
2492 2641
2493 if ($self->{state}) {
2494 $self->{state} = 0;
2495 $self->toggle_flopper;
2496 }
2497
2498 $self 2642 $self
2499} 2643}
2500 2644
2501sub toggle_flopper { 2645sub toggle_flopper {
2502 my ($self) = @_; 2646 my ($self) = @_;
2503 2647
2504 # TODO: use animation 2648 $self->{other}->toggle_visibility;
2505 if ($self->{state} = !$self->{state}) {
2506 $CFClient::UI::ROOT->add ($self->{other});
2507 $self->{other}->move ($self->coord2global (0, $self->{h}));
2508 $self->emit ("open");
2509 } else {
2510 $CFClient::UI::ROOT->remove ($self->{other});
2511 $self->emit ("close");
2512 }
2513
2514 $self->emit (changed => $self->{state});
2515} 2649}
2516 2650
2517############################################################################# 2651#############################################################################
2518 2652
2519package CFClient::UI::Tooltip; 2653package CFClient::UI::Tooltip;
… …
2532} 2666}
2533 2667
2534sub set_tooltip_from { 2668sub set_tooltip_from {
2535 my ($self, $widget) = @_; 2669 my ($self, $widget) = @_;
2536 2670
2671 my $tooltip = $widget->{tooltip};
2672
2673 if ($ENV{CFPLUS_DEBUG} & 2) {
2674 $tooltip .= "\n\n" . (ref $widget) . "\n"
2675 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2676 . "req $widget->{req_w} $widget->{req_h}\n"
2677 . "visible $widget->{visible}";
2678 }
2679
2537 $self->add (new CFClient::UI::Label 2680 $self->add (new CFClient::UI::Label
2538 markup => $widget->{tooltip}, 2681 markup => $tooltip,
2539 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2682 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2540 fontsize => 0.8, 2683 fontsize => 0.8,
2541 fg => [0, 0, 0, 1], 2684 fg => [0, 0, 0, 1],
2542 ellipsise => 0, 2685 ellipsise => 0,
2543 font => ($widget->{tooltip_font} || $::FONT_PROP), 2686 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2554 2697
2555sub size_allocate { 2698sub size_allocate {
2556 my ($self, $w, $h) = @_; 2699 my ($self, $w, $h) = @_;
2557 2700
2558 $self->SUPER::size_allocate ($w - 4, $h - 4); 2701 $self->SUPER::size_allocate ($w - 4, $h - 4);
2702}
2703
2704sub visibility_change {
2705 my ($self, $visible) = @_;
2706
2707 return unless $visible;
2708
2709 $self->{root}->on_post_alloc ("move_$self" => sub {
2710 my $widget = $self->{owner}
2711 or return;
2712
2713 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2714
2715 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2716 if $x + $self->{w} > $::WIDTH;
2717
2718 $self->move_abs ($x, $y);
2719 });
2559} 2720}
2560 2721
2561sub _draw { 2722sub _draw {
2562 my ($self) = @_; 2723 my ($self) = @_;
2563 2724
… …
2580 glVertex $w, $h; 2741 glVertex $w, $h;
2581 glVertex $w, 0; 2742 glVertex $w, 0;
2582 glEnd; 2743 glEnd;
2583 2744
2584 glTranslate 2 - 0.375, 2 - 0.375; 2745 glTranslate 2 - 0.375, 2 - 0.375;
2746
2585 $self->SUPER::_draw; 2747 $self->SUPER::_draw;
2586} 2748}
2587 2749
2588############################################################################# 2750#############################################################################
2589 2751
… …
2595 2757
2596sub new { 2758sub new {
2597 my $class = shift; 2759 my $class = shift;
2598 2760
2599 my $self = $class->SUPER::new ( 2761 my $self = $class->SUPER::new (
2600 aspect => 1, 2762 aspect => 1,
2763 can_events => 0,
2601 @_, 2764 @_,
2602 ); 2765 );
2603 2766
2604 if ($self->{anim} && $self->{animspeed}) { 2767 if ($self->{anim} && $self->{animspeed}) {
2605 Scalar::Util::weaken (my $widget = $self); 2768 Scalar::Util::weaken (my $widget = $self);
… …
2664 $self->SUPER::DESTROY; 2827 $self->SUPER::DESTROY;
2665} 2828}
2666 2829
2667############################################################################# 2830#############################################################################
2668 2831
2669package CFClient::UI::InventoryItem;
2670
2671our @ISA = CFClient::UI::HBox::;
2672
2673sub _item_to_desc {
2674 my ($item) = @_;
2675
2676 my $desc =
2677 $item->{nrof} < 2
2678 ? $item->{name}
2679 : "$item->{nrof} × $item->{name_pl}";
2680
2681 $item->{flags} & Crossfire::Protocol::F_OPEN
2682 and $desc .= " (open)";
2683 $item->{flags} & Crossfire::Protocol::F_APPLIED
2684 and $desc .= " (applied)";
2685 $item->{flags} & Crossfire::Protocol::F_UNPAID
2686 and $desc .= " (unpaid)";
2687 $item->{flags} & Crossfire::Protocol::F_MAGIC
2688 and $desc .= " (magic)";
2689 $item->{flags} & Crossfire::Protocol::F_CURSED
2690 and $desc .= " (cursed)";
2691 $item->{flags} & Crossfire::Protocol::F_DAMNED
2692 and $desc .= " (damned)";
2693 $item->{flags} & Crossfire::Protocol::F_LOCKED
2694 and $desc .= " *";
2695
2696 $desc
2697}
2698
2699sub new {
2700 my $class = shift;
2701
2702 my %args = @_;
2703
2704 my $item = delete $args{item};
2705
2706 my $desc = _item_to_desc ($item);
2707
2708 my $self = $class->SUPER::new (
2709 can_hover => 1,
2710 can_events => 1,
2711 tooltip => ((CFClient::UI::Label::escape $desc)
2712 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2713 connect_button_down => sub {
2714 my ($self, $ev, $x, $y) = @_;
2715
2716 # todo: maybe put examine on 1? but should just be a tooltip :(
2717 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2718 my $targ = $::CONN->{player}{tag};
2719
2720 if ($item->{container} == $::CONN->{player}{tag}) {
2721 $targ = $main::OPENCONT;
2722 }
2723
2724 $::CONN->send ("move $targ $item->{tag} 0");
2725 } elsif ($ev->{button} == 1) {
2726 $::CONN->send ("examine $item->{tag}");
2727 } elsif ($ev->{button} == 2) {
2728 $::CONN->send ("apply $item->{tag}");
2729 } elsif ($ev->{button} == 3) {
2730 my @menu_items = (
2731 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2732 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2733 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2734 (
2735 $item->{flags} & Crossfire::Protocol::F_LOCKED
2736 ? (
2737 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2738 )
2739 : (
2740 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2741 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2742 )
2743 ),
2744 );
2745
2746 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2747 }
2748
2749 1
2750 },
2751 %args
2752 );
2753
2754
2755 $self->add (new CFClient::UI::Face
2756 can_events => 0,
2757 face => $item->{face},
2758 anim => $item->{anim},
2759 animspeed => $item->{animspeed},
2760 );
2761
2762 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2763
2764 $self->{item} = $item;
2765
2766 $self->update_item;
2767
2768 $self
2769}
2770
2771sub update_item {
2772 my ($self) = @_;
2773
2774 my $desc = _item_to_desc ($self->{item});
2775
2776 $self->{name_lbl}->set_text ($desc);
2777}
2778
2779#############################################################################
2780
2781package CFClient::UI::Inventory;
2782
2783our @ISA = CFClient::UI::ScrolledWindow::;
2784
2785sub new {
2786 my $class = shift;
2787
2788 my $self = $class->SUPER::new (
2789 scrolled => (new CFClient::UI::Table),
2790 @_,
2791 );
2792
2793 $self
2794}
2795
2796sub set_items {
2797 my ($self, $items) = @_;
2798
2799 $self->{scrolled}->clear;
2800 return unless $items;
2801
2802 my @items = sort {
2803 ($a->{type} <=> $b->{type})
2804 or ($a->{name} cmp $b->{name})
2805 } @$items;
2806
2807 $self->{real_items} = \@items;
2808
2809 for my $item (@items) {
2810 $item->{item} = $item;
2811 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2812 $item->update_item ();
2813 }
2814
2815 my $i = 0;
2816 for (@items) {
2817 $self->{scrolled}->add (0, $i, $_);
2818 my $nrof = $_->{item}->{nrof} || 1;
2819 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2820 }
2821
2822# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2823}
2824
2825sub size_request {
2826 my ($self) = @_;
2827 ($self->{req_w}, $self->{req_h});
2828}
2829
2830#############################################################################
2831
2832package CFClient::UI::Menu; 2832package CFClient::UI::Menu;
2833 2833
2834our @ISA = CFClient::UI::FancyFrame::; 2834our @ISA = CFClient::UI::FancyFrame::;
2835 2835
2836use CFClient::OpenGL; 2836use CFClient::OpenGL;
… …
2867 2867
2868# popup given the event (must be a mouse button down event currently) 2868# popup given the event (must be a mouse button down event currently)
2869sub popup { 2869sub popup {
2870 my ($self, $ev) = @_; 2870 my ($self, $ev) = @_;
2871 2871
2872 $self->emit ("popdown"); 2872 $self->_emit ("popdown");
2873 2873
2874 # maybe save $GRAB? must be careful about events... 2874 # maybe save $GRAB? must be careful about events...
2875 $GRAB = $self; 2875 $GRAB = $self;
2876 $self->{button} = $ev->{button}; 2876 $self->{button} = $ev->{button};
2877 2877
2878 $self->show; 2878 $self->show;
2879 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2879 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2880} 2880}
2881 2881
2882sub mouse_motion { 2882sub mouse_motion {
2883 my ($self, $ev, $x, $y) = @_; 2883 my ($self, $ev, $x, $y) = @_;
2884 2884
… …
2892 2892
2893 if ($ev->{button} == $self->{button}) { 2893 if ($ev->{button} == $self->{button}) {
2894 undef $GRAB; 2894 undef $GRAB;
2895 $self->hide; 2895 $self->hide;
2896 2896
2897 $self->emit ("popdown"); 2897 $self->_emit ("popdown");
2898 $self->{hover}[1]->() if $self->{hover}; 2898 $self->{hover}[1]->() if $self->{hover};
2899 } 2899 }
2900} 2900}
2901 2901
2902############################################################################# 2902#############################################################################
… …
2964sub add { 2964sub add {
2965 my ($self, $text, %arg) = @_; 2965 my ($self, $text, %arg) = @_;
2966 2966
2967 $text =~ s/^\s+//; 2967 $text =~ s/^\s+//;
2968 $text =~ s/\s+$//; 2968 $text =~ s/\s+$//;
2969
2970 return unless $text;
2969 2971
2970 my $timeout = time + ((delete $arg{timeout}) || 60); 2972 my $timeout = time + ((delete $arg{timeout}) || 60);
2971 2973
2972 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2974 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2973 2975
… …
3007 $self->SUPER::reconfigure; 3009 $self->SUPER::reconfigure;
3008} 3010}
3009 3011
3010############################################################################# 3012#############################################################################
3011 3013
3012package CFClient::UI::Root; 3014package CFClient::UI::Inventory;
3013 3015
3014our @ISA = CFClient::UI::Container::; 3016our @ISA = CFClient::UI::ScrolledWindow::;
3015
3016use CFClient::OpenGL;
3017 3017
3018sub new { 3018sub new {
3019 my $class = shift; 3019 my $class = shift;
3020 3020
3021 $class->SUPER::new ( 3021 my $self = $class->SUPER::new (
3022 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3022 @_, 3023 @_,
3023 ) 3024 );
3024}
3025 3025
3026sub configure { 3026 $self
3027}
3028
3029sub set_items {
3030 my ($self, $items) = @_;
3031
3032 $self->{scrolled}->clear;
3033 return unless $items;
3034
3035 my @items = sort {
3036 ($a->{type} <=> $b->{type})
3037 or ($a->{name} cmp $b->{name})
3038 } @$items;
3039
3040 $self->{real_items} = \@items;
3041
3042 my $row = 0;
3043 for my $item (@items) {
3044 CFClient::Item::update_widgets $item;
3045
3046 $self->{scrolled}->add (0, $row, $item->{face_widget});
3047 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3048 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3049
3050 $row++;
3051 }
3052}
3053
3054#############################################################################
3055
3056package CFClient::UI::BindEditor;
3057
3058our @ISA = CFClient::UI::FancyFrame::;
3059
3060sub new {
3061 my $class = shift;
3062
3063 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3064
3065 $self->add (my $vb = new CFClient::UI::VBox);
3066
3067
3068 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3069 text => "start recording",
3070 tooltip => "Start/Stops recording of actions."
3071 ."All subsequent actions after the recording started will be captured."
3072 ."The actions are displayed after the record was stopped."
3073 ."To bind the action you have to click on the 'Bind' button",
3074 on_activate => sub {
3075 unless ($self->{recording}) {
3076 $self->start;
3077 } else {
3078 $self->stop;
3079 }
3080 });
3081
3082 $vb->add (new CFClient::UI::Label text => "Actions:");
3083 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3084
3085 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3086 $vb->add (my $hb = new CFClient::UI::HBox);
3087 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3088 $hb->add (new CFClient::UI::Button
3089 text => "bind",
3090 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3091 on_activate => sub {
3092 $self->ask_for_bind;
3093 });
3094
3095 $vb->add (my $hb = new CFClient::UI::HBox);
3096 $hb->add (new CFClient::UI::Button
3097 text => "ok",
3098 expand => 1,
3099 tooltip => "This closes the binding editor and saves the binding",
3100 on_activate => sub {
3101 $self->hide;
3102 $self->commit;
3103 });
3104
3105 $hb->add (new CFClient::UI::Button
3106 text => "cancel",
3107 expand => 1,
3108 tooltip => "This closes the binding editor without saving",
3109 on_activate => sub {
3110 $self->hide;
3111 $self->{binding_cancel}->()
3112 if $self->{binding_cancel};
3113 });
3114
3115 $self->update_binding_widgets;
3116
3117 $self
3118}
3119
3120sub commit {
3121 my ($self) = @_;
3122 my ($mod, $sym, $cmds) = $self->get_binding;
3123 if ($sym != 0 && @$cmds > 0) {
3124 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3125 ."'. Don't forget 'Save Config'!");
3126 $self->{binding_change}->($mod, $sym, $cmds)
3127 if $self->{binding_change};
3128 } else {
3129 $::STATUSBOX->add ("No action bound, no key or action specified!");
3130 $self->{binding_cancel}->()
3131 if $self->{binding_cancel};
3132 }
3133}
3134
3135sub start {
3136 my ($self) = @_;
3137
3138 $self->{rec_btn}->set_text ("stop recording");
3139 $self->{recording} = 1;
3140 $self->clear_command_list;
3141 $::CONN->start_record if $::CONN;
3142}
3143
3144sub stop {
3145 my ($self) = @_;
3146
3147 $self->{rec_btn}->set_text ("start recording");
3148 $self->{recording} = 0;
3149
3150 my $rec;
3151 $rec = $::CONN->stop_record if $::CONN;
3152 return unless ref $rec eq 'ARRAY';
3153 $self->set_command_list ($rec);
3154}
3155
3156
3157sub ask_for_bind_and_commit {
3158 my ($self) = @_;
3159 $self->ask_for_bind (1);
3160}
3161
3162sub ask_for_bind {
3163 my ($self, $commit) = @_;
3164
3165 CFClient::Binder::open_binding_dialog (sub {
3166 my ($mod, $sym) = @_;
3167 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3168 $self->update_binding_widgets;
3169 $self->commit if $commit;
3170 });
3171}
3172
3173# $mod and $sym are the modifiers and key symbol
3174# $cmds is a array ref of strings (the commands)
3175# $cb is the callback that is executed on OK
3176# $ccb is the callback that is executed on CANCEL and
3177# when the binding was unsuccessful on OK
3178sub set_binding {
3027 my ($self, $x, $y, $w, $h) = @_; 3179 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3028 3180
3029 $self->{w} = $w; 3181 $self->clear_command_list;
3030 $self->{h} = $h; 3182 $self->{recording} = 0;
3031} 3183 $self->{rec_btn}->set_text ("start recording");
3032 3184
3033sub check_size { 3185 $self->{binding} = [$mod, $sym];
3186 $self->{commands} = $cmds;
3187
3188 $self->{binding_change} = $cb;
3189 $self->{binding_cancel} = $ccb;
3190
3191 $self->update_binding_widgets;
3192}
3193
3194# this is a shortcut method that asks for a binding
3195# and then just binds it.
3196sub do_quick_binding {
3034 my ($self) = @_; 3197 my ($self, $cmds) = @_;
3198 $self->set_binding (undef, undef, $cmds, sub {
3199 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3200 });
3201 $self->ask_for_bind (1);
3202}
3035 3203
3036 $self->size_allocate ($self->{w}, $self->{h}) 3204sub update_binding_widgets {
3037 if $self->{w}; 3205 my ($self) = @_;
3206 my ($mod, $sym, $cmds) = $self->get_binding;
3207 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3208 $self->set_command_list ($cmds);
3209}
3210
3211sub get_binding {
3212 my ($self) = @_;
3213 return (
3214 $self->{binding}->[0],
3215 $self->{binding}->[1],
3216 [ grep { defined $_ } @{$self->{commands}} ]
3217 );
3218}
3219
3220sub clear_command_list {
3221 my ($self) = @_;
3222 $self->{cmdbox}->clear ();
3223}
3224
3225sub set_command_list {
3226 my ($self, $cmds) = @_;
3227
3228 $self->{cmdbox}->clear ();
3229 $self->{commands} = $cmds;
3230
3231 my $idx = 0;
3232
3233 for (@$cmds) {
3234 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3235
3236 my $i = $idx;
3237 $hb->add (new CFClient::UI::Label text => $_);
3238 $hb->add (new CFClient::UI::Button
3239 text => "delete",
3240 tooltip => "Deletes the action from the record",
3241 on_activate => sub {
3242 $self->{cmdbox}->remove ($hb);
3243 $cmds->[$i] = undef;
3244 });
3245
3246
3247 $idx++
3248 }
3249}
3250
3251#############################################################################
3252
3253package CFClient::UI::SpellList;
3254
3255our @ISA = CFClient::UI::FancyFrame::;
3256
3257sub new {
3258 my $class = shift;
3259
3260 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3261
3262 $self->add (new CFClient::UI::ScrolledWindow
3263 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3264
3265 $self;
3266}
3267
3268# XXX: Do sorting? Argl...
3269sub add_spell {
3270 my ($self, $spell) = @_;
3271 $self->{spells}->{$spell->{name}} = $spell;
3272
3273 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3274 face => $spell->{face},
3275 can_hover => 1,
3276 can_events => 1,
3277 tooltip => $spell->{message});
3278
3279 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3280 text => $spell->{name},
3281 can_hover => 1,
3282 can_events => 1,
3283 tooltip => $spell->{message},
3284 expand => 1);
3285
3286 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3287 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3288 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3289 expand => 1);
3290
3291 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3292 text => "bind to key",
3293 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3294}
3295
3296sub rebuild_spell_list {
3297 my ($self) = @_;
3298 $self->{tbl_idx} = 0;
3299 $self->add_spell ($_) for values %{$self->{spells}};
3300}
3301
3302sub remove_spell {
3303 my ($self, $spell) = @_;
3304 delete $self->{spells}->{$spell->{name}};
3305 $self->rebuild_spell_list;
3306}
3307
3308#############################################################################
3309
3310package CFClient::UI::Root;
3311
3312our @ISA = CFClient::UI::Container::;
3313
3314use CFClient::OpenGL;
3315
3316sub new {
3317 my $class = shift;
3318
3319 my $self = $class->SUPER::new (
3320 visible => 1,
3321 @_,
3322 );
3323
3324 Scalar::Util::weaken ($self->{root} = $self);
3325
3326 $self
3038} 3327}
3039 3328
3040sub size_request { 3329sub size_request {
3041 my ($self) = @_; 3330 my ($self) = @_;
3042 3331
3043 ($self->{w}, $self->{h}) 3332 ($self->{w}, $self->{h})
3333}
3334
3335sub _to_pixel {
3336 my ($coord, $size, $max) = @_;
3337
3338 $coord =
3339 $coord eq "center" ? ($max - $size) * 0.5
3340 : $coord eq "max" ? $max
3341 : $coord;
3342
3343 $coord = 0 if $coord < 0;
3344 $coord = $max - $size if $coord > $max - $size;
3345
3346 int $coord + 0.5
3044} 3347}
3045 3348
3046sub size_allocate { 3349sub size_allocate {
3047 my ($self, $w, $h) = @_; 3350 my ($self, $w, $h) = @_;
3048 3351
3049 my $old_w = $self->{old_w}; $self->{old_w} = $w;
3050 my $old_h = $self->{old_h}; $self->{old_h} = $h;
3051
3052 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
3053 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
3054
3055 for my $child ($self->children) { 3352 for my $child ($self->children) {
3056 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3353 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3057 3354
3058 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3355 $X = $child->{force_x} if exists $child->{force_x};
3059 if exists $child->{req_x}; 3356 $Y = $child->{force_y} if exists $child->{force_y};
3060 3357
3061 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3358 $X = _to_pixel $X, $W, $self->{w};
3062 if exists $child->{req_y}; 3359 $Y = _to_pixel $Y, $H, $self->{h};
3063
3064 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3065 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3066 3360
3067 $child->configure ($X, $Y, $W, $H); 3361 $child->configure ($X, $Y, $W, $H);
3068 } 3362 }
3069} 3363}
3070 3364
… …
3081} 3375}
3082 3376
3083sub update { 3377sub update {
3084 my ($self) = @_; 3378 my ($self) = @_;
3085 3379
3086 $self->check_size;
3087 $::WANT_REFRESH++; 3380 $::WANT_REFRESH++;
3088} 3381}
3089 3382
3090sub add { 3383sub add {
3091 my ($self, @children) = @_; 3384 my ($self, @children) = @_;
3092 3385
3093 for my $child (@children) {
3094 $child->{toplevel} = 1; 3386 $_->{is_toplevel} = 1
3095 3387 for @children;
3096 # integerise window positions
3097 $child->{x} = int $child->{x};
3098 $child->{y} = int $child->{y};
3099 }
3100 3388
3101 $self->SUPER::add (@children); 3389 $self->SUPER::add (@children);
3390}
3391
3392sub remove {
3393 my ($self, @children) = @_;
3394
3395 $self->SUPER::remove (@children);
3396
3397 delete $self->{is_toplevel}
3398 for @children;
3102 3399
3103 while (@children) { 3400 while (@children) {
3104 my $w = pop @children; 3401 my $w = pop @children;
3105 push @children, $w->children; 3402 push @children, $w->children;
3106 $w->{visible} = 1; 3403 $w->set_invisible;
3107 }
3108}
3109
3110sub remove {
3111 my ($self, @children) = @_;
3112
3113 $self->SUPER::remove (@children);
3114
3115 while (@children) {
3116 my $w = pop @children;
3117 push @children, $w->children;
3118 delete $w->{visible};
3119 } 3404 }
3120} 3405}
3121 3406
3122sub on_refresh { 3407sub on_refresh {
3123 my ($self, $id, $cb) = @_; 3408 my ($self, $id, $cb) = @_;
… …
3137 while ($self->{refresh_hook}) { 3422 while ($self->{refresh_hook}) {
3138 $_->() 3423 $_->()
3139 for values %{delete $self->{refresh_hook}}; 3424 for values %{delete $self->{refresh_hook}};
3140 } 3425 }
3141 3426
3142 if ($self->{check_size}) { 3427 if ($self->{realloc}) {
3143 my @queue = ([], []); 3428 my %queue;
3429 my @queue;
3430 my $widget;
3144 3431
3145 for (;;) { 3432 outer:
3146 if ($self->{check_size}) { 3433 while () {
3147 # heuristic: check containers last 3434 if (my $realloc = delete $self->{realloc}) {
3148 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3435 for $widget (values %$realloc) {
3149 for values %{delete $self->{check_size}} 3436 $widget->{visible} or next; # do not resize invisible widgets
3437
3438 $queue{$widget+0}++ and next; # duplicates are common
3439
3440 push @{ $queue[$widget->{visible}] }, $widget;
3441 }
3150 } 3442 }
3151 3443
3152 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3444 while () {
3445 @queue or last outer;
3153 3446
3154 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3447 $widget = pop @{ $queue[-1] || [] }
3155 ? @$widget{qw(user_w user_h)} 3448 and last;
3156 : $widget->size_request;
3157
3158 if (delete $widget->{force_alloc}
3159 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3160 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3161 3449
3450 pop @queue;
3451 }
3452
3453 delete $queue{$widget+0};
3454
3455 my ($w, $h) = $widget->size_request;
3456
3457 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3458 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3459
3460 $w = $widget->{force_w} if exists $widget->{force_w};
3461 $h = $widget->{force_h} if exists $widget->{force_h};
3462
3463 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3464 || delete $widget->{force_realloc}) {
3162 $widget->{req_w} = $w; 3465 $widget->{req_w} = $w;
3163 $widget->{req_h} = $h; 3466 $widget->{req_h} = $h;
3164 3467
3165 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3468 $self->{size_alloc}{$widget+0} = $widget;
3166 3469
3167 $widget->{parent}->check_size
3168 if $widget->{parent}; 3470 if (my $parent = $widget->{parent}) {
3471 $self->{realloc}{$parent+0} = $parent
3472 unless $queue{$parent+0};
3473
3474 $parent->{force_size_alloc} = 1;
3475 $self->{size_alloc}{$parent+0} = $parent;
3476 }
3169 } 3477 }
3478
3479 delete $self->{realloc}{$widget+0};
3170 } 3480 }
3171 } 3481 }
3172 3482
3173 while ($self->{size_alloc}) { 3483 while (my $size_alloc = delete $self->{size_alloc}) {
3174 for (values %{delete $self->{size_alloc}}) { 3484 my @queue = sort { $b->{visible} <=> $a->{visible} }
3175 my ($widget, $w, $h) = @$_; 3485 values %$size_alloc;
3486
3487 while () {
3488 my $widget = pop @queue || last;
3489
3490 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3176 3491
3177 $w = 0 if $w < 0; 3492 $w = 0 if $w < 0;
3178 $h = 0 if $h < 0; 3493 $h = 0 if $h < 0;
3179 3494
3495 $w = int $w + 0.5;
3496 $h = int $h + 0.5;
3497
3498 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3499 $widget->{old_w} = $widget->{w};
3500 $widget->{old_h} = $widget->{h};
3501
3180 $widget->{w} = $w; 3502 $widget->{w} = $w;
3181 $widget->{h} = $h; 3503 $widget->{h} = $h;
3182 $widget->size_allocate ($w, $h); 3504
3183 $widget->emit (size_allocate => $w, $h); 3505 $widget->emit (size_allocate => $w, $h);
3506 }
3184 } 3507 }
3185 } 3508 }
3186 3509
3187 while ($self->{post_alloc_hook}) { 3510 while ($self->{post_alloc_hook}) {
3188 $_->() 3511 $_->()
3189 for values %{delete $self->{post_alloc_hook}}; 3512 for values %{delete $self->{post_alloc_hook}};
3190 } 3513 }
3514
3191 3515
3192 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3516 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3193 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3517 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3194 glClear GL_COLOR_BUFFER_BIT; 3518 glClear GL_COLOR_BUFFER_BIT;
3195 3519
… …
3197 glLoadIdentity; 3521 glLoadIdentity;
3198 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3522 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3199 glMatrixMode GL_MODELVIEW; 3523 glMatrixMode GL_MODELVIEW;
3200 glLoadIdentity; 3524 glLoadIdentity;
3201 3525
3526 {
3527 package CFClient::UI::Base;
3528
3529 ($draw_x, $draw_y, $draw_w, $draw_h) =
3530 (0, 0, $self->{w}, $self->{h});
3531 }
3532
3202 $self->_draw; 3533 $self->_draw;
3203} 3534}
3204 3535
3205############################################################################# 3536#############################################################################
3206 3537

Diff Legend

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