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.269 by root, Fri Jun 2 06:22:55 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]); 959 $self->{vp}->set_offset (0, $_[1]);
822 }, 960 },
823 ; 961 ;
824 962
825 $self = $class->SUPER::new ( 963 $self = $class->SUPER::new (
… …
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]);
836} 984}
837 985
838sub size_allocate { 986sub size_allocate {
839 my ($self, $w, $h) = @_; 987 my ($self, $w, $h) = @_;
840 988
… …
893 1041
894our @ISA = CFClient::UI::Bin::; 1042our @ISA = CFClient::UI::Bin::;
895 1043
896use CFClient::OpenGL; 1044use CFClient::OpenGL;
897 1045
898my @tex = 1046my $bg =
1047 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1048 mipmap => 1, wrap => 1;
1049
1050my @border =
899 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1051 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); 1052 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
901 1053
902sub new { 1054sub new {
903 my $class = shift; 1055 my ($class, %arg) = @_;
904 1056
905 # TODO: user_x, user_y, overwrite moveto? 1057 my $title = delete $arg{title};
906 1058
907 my $self = $class->SUPER::new ( 1059 my $self = $class->SUPER::new (
908 bg => [1, 1, 1, 1], 1060 bg => [1, 1, 1, 1],
909 border_bg => [1, 1, 1, 1], 1061 border_bg => [1, 1, 1, 1],
910 border => 0.6, 1062 border => 0.6,
911 toplevel => 1,
912 can_events => 1, 1063 can_events => 1,
913 @_ 1064 min_w => 16,
1065 min_h => 16,
1066 %arg,
914 ); 1067 );
915 1068
916 $self->{title} &&= new CFClient::UI::Label 1069 $self->{title} = new CFClient::UI::Label
917 align => 0, 1070 align => 0,
918 valign => 1, 1071 valign => 1,
919 text => $self->{title}, 1072 text => $title,
920 fontsize => $self->{border}; 1073 fontsize => $self->{border}
1074 if defined $title;
921 1075
922 $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};
923} 1084}
924 1085
925sub border { 1086sub border {
926 int $_[0]{border} * $::FONTSIZE 1087 int $_[0]{border} * $::FONTSIZE
927} 1088}
928 1089
929sub size_request { 1090sub size_request {
930 my ($self) = @_; 1091 my ($self) = @_;
1092
1093 $self->{title}->size_request
1094 if $self->{title};
931 1095
932 my ($w, $h) = $self->SUPER::size_request; 1096 my ($w, $h) = $self->SUPER::size_request;
933 1097
934 ( 1098 (
935 $w + $self->border * 2, 1099 $w + $self->border * 2,
… …
938} 1102}
939 1103
940sub size_allocate { 1104sub size_allocate {
941 my ($self, $w, $h) = @_; 1105 my ($self, $w, $h) = @_;
942 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
943 $h -= List::Util::max 0, $self->border * 2; 1115 $h -= List::Util::max 0, $border * 2;
944 $w -= List::Util::max 0, $self->border * 2; 1116 $w -= List::Util::max 0, $border * 2;
945 1117
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); 1118 $self->child->configure ($border, $border, $w, $h);
950} 1119}
951 1120
952sub button_down { 1121sub button_down {
953 my ($self, $ev, $x, $y) = @_; 1122 my ($self, $ev, $x, $y) = @_;
954 1123
… …
970 my ($ev, $x, $y) = @_; 1139 my ($ev, $x, $y) = @_;
971 1140
972 my $dx = $ev->{x} - $ox; 1141 my $dx = $ev->{x} - $ox;
973 my $dy = $ev->{y} - $oy; 1142 my $dy = $ev->{y} - $oy;
974 1143
975 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1144 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
976 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1145 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1146
1147 $self->realloc;
977 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1148 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
978 $self->check_size;
979 }; 1149 };
980 1150
981 } elsif ($lr ^ $td) { 1151 } elsif ($lr ^ $td) {
982 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1152 my ($ox, $oy) = ($ev->{x}, $ev->{y});
983 my ($bx, $by) = ($self->{x}, $self->{y}); 1153 my ($bx, $by) = ($self->{x}, $self->{y});
… …
985 $self->{motion} = sub { 1155 $self->{motion} = sub {
986 my ($ev, $x, $y) = @_; 1156 my ($ev, $x, $y) = @_;
987 1157
988 ($x, $y) = ($ev->{x}, $ev->{y}); 1158 ($x, $y) = ($ev->{x}, $ev->{y});
989 1159
990 $self->move ($bx + $x - $ox, $by + $y - $oy); 1160 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
991 $self->update;
992 }; 1161 };
993 } 1162 }
994} 1163}
995 1164
996sub button_up { 1165sub button_up {
… …
1006} 1175}
1007 1176
1008sub _draw { 1177sub _draw {
1009 my ($self) = @_; 1178 my ($self) = @_;
1010 1179
1180 my $child = $self->{children}[0];
1181
1011 my ($w, $h ) = ($self->{w}, $self->{h}); 1182 my ($w, $h ) = ($self->{w}, $self->{h});
1012 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1183 my ($cw, $ch) = ($child->{w}, $child->{h});
1013 1184
1014 glEnable GL_TEXTURE_2D; 1185 glEnable GL_TEXTURE_2D;
1015 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1186 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1016 1187
1017 my $border = $self->border; 1188 my $border = $self->border;
1018 1189
1019 glColor @{ $self->{border_bg} }; 1190 glColor @{ $self->{border_bg} };
1020 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1191 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1021 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1192 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1022 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1193 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1023 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1194 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1024 1195
1025 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1196 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1026 my $bg = $tex[0]; 1197 glColor @{ $self->{bg} };
1027 1198
1028 # TODO: repeat texture not scale 1199 # TODO: repeat texture not scale
1200 # solve this better(?)
1029 my $rep_x = $cw / $bg->{w}; 1201 $bg->{s} = $cw / $bg->{w};
1030 my $rep_y = $ch / $bg->{h}; 1202 $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); 1203 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1038 } 1204 }
1039 1205
1040 glDisable GL_TEXTURE_2D; 1206 glDisable GL_TEXTURE_2D;
1041 1207
1042 $self->{title}->draw if $self->{title};
1043
1044 $self->child->draw; 1208 $child->draw;
1209
1210 if ($self->{title}) {
1211 glTranslate 0, $border - $self->{h};
1212 $self->{title}->_draw;
1213 }
1045} 1214}
1046 1215
1047############################################################################# 1216#############################################################################
1048 1217
1049package CFClient::UI::Table; 1218package CFClient::UI::Table;
… …
1057sub new { 1226sub new {
1058 my $class = shift; 1227 my $class = shift;
1059 1228
1060 $class->SUPER::new ( 1229 $class->SUPER::new (
1061 col_expand => [], 1230 col_expand => [],
1062 @_ 1231 @_,
1063 ) 1232 )
1233}
1234
1235sub children {
1236 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1064} 1237}
1065 1238
1066sub add { 1239sub add {
1067 my ($self, $x, $y, $child) = @_; 1240 my ($self, $x, $y, $child) = @_;
1068 1241
1069 $child->set_parent ($self); 1242 $child->set_parent ($self);
1070 $self->{children}[$y][$x] = $child; 1243 $self->{children}[$y][$x] = $child;
1071 1244
1072 $child->check_size; 1245 $self->realloc;
1073} 1246}
1074 1247
1075sub children {
1076 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1077}
1078
1079# 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?
1080sub clear { 1249sub clear {
1081 my ($self) = @_; 1250 my ($self) = @_;
1082 1251
1083 my @children = $self->children; 1252 my @children = $self->children;
1084 delete $self->{children}; 1253 delete $self->{children};
… …
1086 for (@children) { 1255 for (@children) {
1087 delete $_->{parent}; 1256 delete $_->{parent};
1088 $_->hide; 1257 $_->hide;
1089 } 1258 }
1090 1259
1091 $self->update; 1260 $self->realloc;
1092} 1261}
1093 1262
1094sub get_wh { 1263sub get_wh {
1095 my ($self) = @_; 1264 my ($self) = @_;
1096 1265
… …
1127sub size_allocate { 1296sub size_allocate {
1128 my ($self, $w, $h) = @_; 1297 my ($self, $w, $h) = @_;
1129 1298
1130 my ($ws, $hs) = $self->get_wh; 1299 my ($ws, $hs) = $self->get_wh;
1131 1300
1132 my $req_w = sum @$ws; 1301 my $req_w = (sum @$ws) || 1;
1133 my $req_h = sum @$hs; 1302 my $req_h = (sum @$hs) || 1;
1134 1303
1135 # TODO: nicer code && do row_expand 1304 # TODO: nicer code && do row_expand
1136 my @col_expand = @{$self->{col_expand}}; 1305 my @col_expand = @{$self->{col_expand}};
1137 @col_expand = (1) x @$ws unless @col_expand; 1306 @col_expand = (1) x @$ws unless @col_expand;
1138 my $col_expand = (sum @col_expand) || 1; 1307 my $col_expand = (sum @col_expand) || 1;
… …
1192 } 1361 }
1193} 1362}
1194 1363
1195############################################################################# 1364#############################################################################
1196 1365
1197package CFClient::UI::HBox; 1366package CFClient::UI::Box;
1198
1199# TODO: wrap into common Box base class
1200 1367
1201our @ISA = CFClient::UI::Container::; 1368our @ISA = CFClient::UI::Container::;
1202 1369
1203sub size_request { 1370sub size_request {
1204 my ($self) = @_; 1371 my ($self) = @_;
1205 1372
1206 my @alloc = map [$_->size_request], @{$self->{children}}; 1373 $self->{vertical}
1207 1374 ? (
1208 ( 1375 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1209 (List::Util::sum map $_->[0], @alloc), 1376 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1210 (List::Util::max map $_->[1], @alloc), 1377 )
1211 ) 1378 : (
1379 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1380 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1381 )
1212} 1382}
1213 1383
1214sub size_allocate { 1384sub size_allocate {
1215 my ($self, $w, $h) = @_; 1385 my ($self, $w, $h) = @_;
1216 1386
1217 ($h, $w) = ($w, $h); 1387 my $space = $self->{vertical} ? $h : $w;
1218
1219 my $children = $self->{children}; 1388 my $children = $self->{children};
1220 1389
1221 my @h = map $_->{req_w}, @$children; 1390 my @req;
1222 1391
1223 my $req_h = List::Util::sum @h; 1392 if ($self->{homogeneous}) {
1224 1393 @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 { 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 {
1229 my $exp = List::Util::sum map $_->{expand}, @$children; 1402 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1230 $exp ||= 1;
1231 1403
1404 $space = ($space - $req) / $expand; # remaining space to give away
1405
1406 $req[$_] += $space * $children->[$_]{expand}
1232 for (0 .. $#$children) { 1407 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 } 1408 }
1239 } 1409 }
1240 1410
1241 CFClient::UI::harmonize \@h; 1411 CFClient::UI::harmonize \@req;
1242 1412
1243 my $y = 0; 1413 my $pos = 0;
1244 for (0 .. $#$children) { 1414 for (0 .. $#$children) {
1245 my $child = $children->[$_];
1246 my $h = $h[$_]; 1415 my $alloc = $req[$_];
1247 $child->configure ($y, 0, $h, $w); 1416 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1248 1417
1249 $y += $h; 1418 $pos += $alloc;
1250 } 1419 }
1251 1420
1252 1 1421 1
1253} 1422}
1254 1423
1255############################################################################# 1424#############################################################################
1256 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
1257package CFClient::UI::VBox; 1441package CFClient::UI::VBox;
1258 1442
1259# TODO: wrap into common Box base class
1260
1261our @ISA = CFClient::UI::Container::; 1443our @ISA = CFClient::UI::Box::;
1262 1444
1263sub size_request { 1445sub new {
1264 my ($self) = @_; 1446 my $class = shift;
1265 1447
1266 my @alloc = map [$_->size_request], @{$self->{children}}; 1448 $class->SUPER::new (
1267 1449 vertical => 1,
1268 ( 1450 @_,
1269 (List::Util::max map $_->[0], @alloc),
1270 (List::Util::sum map $_->[1], @alloc),
1271 ) 1451 )
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} 1452}
1312 1453
1313############################################################################# 1454#############################################################################
1314 1455
1315package CFClient::UI::Label; 1456package CFClient::UI::Label;
… …
1332 ellipsise => 3, # end 1473 ellipsise => 3, # end
1333 layout => (new CFClient::Layout), 1474 layout => (new CFClient::Layout),
1334 fontsize => 1, 1475 fontsize => 1,
1335 align => -1, 1476 align => -1,
1336 valign => -1, 1477 valign => -1,
1337 padding => 2, 1478 padding_x => 2,
1479 padding_y => 2,
1338 can_events => 0, 1480 can_events => 0,
1339 %arg 1481 %arg
1340 ); 1482 );
1341 1483
1342 if (exists $self->{template}) { 1484 if (exists $self->{template}) {
… …
1378 $self->{text} = "T$text"; 1520 $self->{text} = "T$text";
1379 1521
1380 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1522 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1381 $self->{layout}->set_text ($text); 1523 $self->{layout}->set_text ($text);
1382 1524
1525 $self->realloc;
1383 $self->update; 1526 $self->update;
1384 $self->check_size;
1385} 1527}
1386 1528
1387sub set_markup { 1529sub set_markup {
1388 my ($self, $markup) = @_; 1530 my ($self, $markup) = @_;
1389 1531
… …
1393 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1535 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1394 1536
1395 $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;
1396 $self->{layout}->set_markup ($markup); 1538 $self->{layout}->set_markup ($markup);
1397 1539
1540 $self->realloc;
1398 $self->update; 1541 $self->update;
1399 $self->check_size;
1400} 1542}
1401 1543
1402sub size_request { 1544sub size_request {
1403 my ($self) = @_; 1545 my ($self) = @_;
1404 1546
… …
1418 1560
1419 $w = List::Util::max $w, $w2; 1561 $w = List::Util::max $w, $w2;
1420 $h = List::Util::max $h, $h2; 1562 $h = List::Util::max $h, $h2;
1421 } 1563 }
1422 1564
1423 ( 1565 ($w, $h)
1424 $w + $self->{padding} * 2,
1425 $h + $self->{padding} * 2,
1426 )
1427} 1566}
1428 1567
1429sub size_allocate { 1568sub size_allocate {
1430 my ($self, $w, $h) = @_; 1569 my ($self, $w, $h) = @_;
1431 1570
1571 delete $self->{ox};
1572
1432 delete $self->{texture}; 1573 delete $self->{texture}
1574 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1433} 1575}
1434 1576
1435sub set_fontsize { 1577sub set_fontsize {
1436 my ($self, $fontsize) = @_; 1578 my ($self, $fontsize) = @_;
1437 1579
1438 $self->{fontsize} = $fontsize; 1580 $self->{fontsize} = $fontsize;
1439 delete $self->{texture}; 1581 delete $self->{texture};
1440 1582
1441 $self->update; 1583 $self->realloc;
1442 $self->check_size;
1443} 1584}
1444 1585
1445sub _draw { 1586sub _draw {
1446 my ($self) = @_; 1587 my ($self) = @_;
1447 1588
… …
1453 $self->{layout}->set_width ($self->{w}); 1594 $self->{layout}->set_width ($self->{w});
1454 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1595 $self->{layout}->set_ellipsise ($self->{ellipsise});
1455 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1596 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1456 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1597 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1457 1598
1458 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1599 new_from_layout CFClient::Texture $self->{layout}
1600 };
1459 1601
1602 unless (exists $self->{ox}) {
1460 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1603 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1461 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1604 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1462 : ($self->{w} - $tex->{w}) * 0.5); 1605 : ($self->{w} - $tex->{w}) * 0.5);
1463 1606
1464 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1607 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1465 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1608 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1466 : ($self->{h} - $tex->{h}) * 0.5); 1609 : ($self->{h} - $tex->{h}) * 0.5);
1467
1468 $tex
1469 }; 1610 };
1470 1611
1471 glEnable GL_TEXTURE_2D; 1612 glEnable GL_TEXTURE_2D;
1472 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1613 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1473 1614
… …
1519 $self->{text} = $text; 1660 $self->{text} = $text;
1520 1661
1521 $text =~ s/./*/g if $self->{hidden}; 1662 $text =~ s/./*/g if $self->{hidden};
1522 $self->{layout}->set_text ("$text "); 1663 $self->{layout}->set_text ("$text ");
1523 1664
1524 $self->emit (changed => $self->{text}); 1665 $self->_emit (changed => $self->{text});
1525} 1666}
1526 1667
1527sub set_text { 1668sub set_text {
1528 my ($self, $text) = @_; 1669 my ($self, $text) = @_;
1529 1670
1530 $self->{cursor} = length $text; 1671 $self->{cursor} = length $text;
1531 $self->_set_text ($text); 1672 $self->_set_text ($text);
1532 $self->update; 1673
1533 $self->check_size; 1674 $self->realloc;
1534} 1675}
1535 1676
1536sub get_text { 1677sub get_text {
1537 $_[0]{text} 1678 $_[0]{text}
1538} 1679}
… …
1541 my ($self) = @_; 1682 my ($self) = @_;
1542 1683
1543 my ($w, $h) = $self->SUPER::size_request; 1684 my ($w, $h) = $self->SUPER::size_request;
1544 1685
1545 ($w + 1, $h) # add 1 for cursor 1686 ($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} 1687}
1553 1688
1554sub key_down { 1689sub key_down {
1555 my ($self, $ev) = @_; 1690 my ($self, $ev) = @_;
1556 1691
… …
1571 } elsif ($sym == CFClient::SDLK_HOME) { 1706 } elsif ($sym == CFClient::SDLK_HOME) {
1572 $self->{cursor} = 0; 1707 $self->{cursor} = 0;
1573 } elsif ($sym == CFClient::SDLK_END) { 1708 } elsif ($sym == CFClient::SDLK_END) {
1574 $self->{cursor} = length $text; 1709 $self->{cursor} = length $text;
1575 } elsif ($uni == 27) { 1710 } elsif ($uni == 27) {
1576 $self->emit ('escape'); 1711 $self->_emit ('escape');
1577 } elsif ($uni) { 1712 } elsif ($uni) {
1578 substr $text, $self->{cursor}++, 0, chr $uni; 1713 substr $text, $self->{cursor}++, 0, chr $uni;
1579 } 1714 }
1580 1715
1581 $self->_set_text ($text); 1716 $self->_set_text ($text);
1582 $self->update; 1717
1583 $self->check_size; 1718 $self->realloc;
1584} 1719}
1585 1720
1586sub focus_in { 1721sub focus_in {
1587 my ($self) = @_; 1722 my ($self) = @_;
1588 1723
… …
1668 if ($sym == 13) { 1803 if ($sym == 13) {
1669 unshift @{$self->{history}}, 1804 unshift @{$self->{history}},
1670 my $txt = $self->get_text; 1805 my $txt = $self->get_text;
1671 $self->{history_pointer} = -1; 1806 $self->{history_pointer} = -1;
1672 $self->{history_saveback} = ''; 1807 $self->{history_saveback} = '';
1673 $self->emit (activate => $txt); 1808 $self->_emit (activate => $txt);
1674 $self->update; 1809 $self->update;
1675 1810
1676 } elsif ($sym == CFClient::SDLK_UP) { 1811 } elsif ($sym == CFClient::SDLK_UP) {
1677 if ($self->{history_pointer} < 0) { 1812 if ($self->{history_pointer} < 0) {
1678 $self->{history_saveback} = $self->get_text; 1813 $self->{history_saveback} = $self->get_text;
… …
1715 1850
1716sub new { 1851sub new {
1717 my $class = shift; 1852 my $class = shift;
1718 1853
1719 $class->SUPER::new ( 1854 $class->SUPER::new (
1720 padding => 4, 1855 padding_x => 4,
1856 padding_y => 4,
1721 fg => [1, 1, 1], 1857 fg => [1, 1, 1],
1722 active_fg => [0, 0, 1], 1858 active_fg => [0, 0, 1],
1723 can_hover => 1, 1859 can_hover => 1,
1724 align => 0, 1860 align => 0,
1725 valign => 0, 1861 valign => 0,
1726 can_events => 1, 1862 can_events => 1,
1727 @_ 1863 @_
1728 ) 1864 )
1729} 1865}
1730 1866
1867sub activate { }
1868
1731sub button_up { 1869sub button_up {
1732 my ($self, $ev, $x, $y) = @_; 1870 my ($self, $ev, $x, $y) = @_;
1733 1871
1872 $self->emit ("activate")
1734 if ($x >= 0 && $x < $self->{w} 1873 if $x >= 0 && $x < $self->{w}
1735 && $y >= 0 && $y < $self->{h}) { 1874 && $y >= 0 && $y < $self->{h};
1736 $self->emit ("activate");
1737 }
1738} 1875}
1739 1876
1740sub _draw { 1877sub _draw {
1741 my ($self) = @_; 1878 my ($self) = @_;
1742 1879
… …
1771 1908
1772sub new { 1909sub new {
1773 my $class = shift; 1910 my $class = shift;
1774 1911
1775 $class->SUPER::new ( 1912 $class->SUPER::new (
1776 padding => 2, 1913 padding_x => 2,
1914 padding_y => 2,
1777 fg => [1, 1, 1], 1915 fg => [1, 1, 1],
1778 active_fg => [1, 1, 0], 1916 active_fg => [1, 1, 0],
1779 bg => [0, 0, 0, 0.2], 1917 bg => [0, 0, 0, 0.2],
1780 active_bg => [1, 1, 1, 0.5], 1918 active_bg => [1, 1, 1, 0.5],
1781 state => 0, 1919 state => 0,
… …
1785} 1923}
1786 1924
1787sub size_request { 1925sub size_request {
1788 my ($self) = @_; 1926 my ($self) = @_;
1789 1927
1790 ($self->{padding} * 2 + 6) x 2 1928 (6) x 2
1791} 1929}
1792 1930
1793sub button_down { 1931sub button_down {
1794 my ($self, $ev, $x, $y) = @_; 1932 my ($self, $ev, $x, $y) = @_;
1795 1933
1796 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1934 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1797 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1935 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1798 $self->{state} = !$self->{state}; 1936 $self->{state} = !$self->{state};
1799 $self->emit (changed => $self->{state}); 1937 $self->_emit (changed => $self->{state});
1800 } 1938 }
1801} 1939}
1802 1940
1803sub _draw { 1941sub _draw {
1804 my ($self) = @_; 1942 my ($self) = @_;
1805 1943
1806 $self->SUPER::_draw; 1944 $self->SUPER::_draw;
1807 1945
1808 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1946 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1809 1947
1810 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;
1811 1951
1812 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1952 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1813 1953
1814 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1954 my $tex = $self->{state} ? $tex[1] : $tex[0];
1815 1955
… …
2080 fg => [1, 1, 1], 2220 fg => [1, 1, 1],
2081 active_fg => [0, 0, 0], 2221 active_fg => [0, 0, 0],
2082 bg => [0, 0, 0, 0.2], 2222 bg => [0, 0, 0, 0.2],
2083 active_bg => [1, 1, 1, 0.5], 2223 active_bg => [1, 1, 1, 0.5],
2084 range => [0, 0, 100, 10, 0], 2224 range => [0, 0, 100, 10, 0],
2085 req_w => $::WIDTH / 80, 2225 min_w => $::WIDTH / 80,
2086 req_h => $::WIDTH / 80, 2226 min_h => $::WIDTH / 80,
2087 vertical => 0, 2227 vertical => 0,
2088 can_hover => 1, 2228 can_hover => 1,
2089 inner_pad => 0.02, 2229 inner_pad => 0.02,
2090 @_ 2230 @_
2091 ); 2231 );
… …
2094 $self->update; 2234 $self->update;
2095 2235
2096 $self 2236 $self
2097} 2237}
2098 2238
2239sub changed { }
2240
2099sub set_range { 2241sub set_range {
2100 my ($self, $range) = @_; 2242 my ($self, $range) = @_;
2101 2243
2102 $self->{range} = $range; 2244 ($range, $self->{range}) = ($self->{range}, $range);
2103 2245
2104 $self->update; 2246 $self->update
2247 if "@$range" ne "@{$self->{range}}";
2105} 2248}
2106 2249
2107sub set_value { 2250sub set_value {
2108 my ($self, $value) = @_; 2251 my ($self, $value) = @_;
2109 2252
… …
2120 if $unit; 2263 if $unit;
2121 2264
2122 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2265 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2123 2266
2124 if ($value != $old_value) { 2267 if ($value != $old_value) {
2125 $self->emit (changed => $value); 2268 $self->_emit (changed => $value);
2126 $self->update; 2269 $self->update;
2127 } 2270 }
2128} 2271}
2129 2272
2130sub size_request { 2273sub size_request {
2131 my ($self) = @_; 2274 my ($self) = @_;
2132 2275
2133 my $w = $self->{req_w}; 2276 ($self->{req_w}, $self->{req_h})
2134 my $h = $self->{req_h};
2135
2136 $self->{vertical} ? ($h, $w) : ($w, $h)
2137} 2277}
2138 2278
2139sub button_down { 2279sub button_down {
2140 my ($self, $ev, $x, $y) = @_; 2280 my ($self, $ev, $x, $y) = @_;
2141 2281
… …
2492 2632
2493sub new { 2633sub new {
2494 my $class = shift; 2634 my $class = shift;
2495 2635
2496 my $self = $class->SUPER::new ( 2636 my $self = $class->SUPER::new (
2497 state => 0, 2637 state => 0,
2498 connect_activate => \&toggle_flopper, 2638 on_activate => \&toggle_flopper,
2499 @_ 2639 @_
2500 ); 2640 );
2501 2641
2502 if ($self->{state}) {
2503 $self->{state} = 0;
2504 $self->toggle_flopper;
2505 }
2506
2507 $self 2642 $self
2508} 2643}
2509 2644
2510sub toggle_flopper { 2645sub toggle_flopper {
2511 my ($self) = @_; 2646 my ($self) = @_;
2512 2647
2513 # TODO: use animation 2648 $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} 2649}
2525 2650
2526############################################################################# 2651#############################################################################
2527 2652
2528package CFClient::UI::Tooltip; 2653package CFClient::UI::Tooltip;
… …
2541} 2666}
2542 2667
2543sub set_tooltip_from { 2668sub set_tooltip_from {
2544 my ($self, $widget) = @_; 2669 my ($self, $widget) = @_;
2545 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
2546 $self->add (new CFClient::UI::Label 2680 $self->add (new CFClient::UI::Label
2547 markup => $widget->{tooltip}, 2681 markup => $tooltip,
2548 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2682 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2549 fontsize => 0.8, 2683 fontsize => 0.8,
2550 fg => [0, 0, 0, 1], 2684 fg => [0, 0, 0, 1],
2551 ellipsise => 0, 2685 ellipsise => 0,
2552 font => ($widget->{tooltip_font} || $::FONT_PROP), 2686 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2563 2697
2564sub size_allocate { 2698sub size_allocate {
2565 my ($self, $w, $h) = @_; 2699 my ($self, $w, $h) = @_;
2566 2700
2567 $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 });
2568} 2720}
2569 2721
2570sub _draw { 2722sub _draw {
2571 my ($self) = @_; 2723 my ($self) = @_;
2572 2724
… …
2589 glVertex $w, $h; 2741 glVertex $w, $h;
2590 glVertex $w, 0; 2742 glVertex $w, 0;
2591 glEnd; 2743 glEnd;
2592 2744
2593 glTranslate 2 - 0.375, 2 - 0.375; 2745 glTranslate 2 - 0.375, 2 - 0.375;
2746
2594 $self->SUPER::_draw; 2747 $self->SUPER::_draw;
2595} 2748}
2596 2749
2597############################################################################# 2750#############################################################################
2598 2751
… …
2604 2757
2605sub new { 2758sub new {
2606 my $class = shift; 2759 my $class = shift;
2607 2760
2608 my $self = $class->SUPER::new ( 2761 my $self = $class->SUPER::new (
2609 aspect => 1, 2762 aspect => 1,
2763 can_events => 0,
2610 @_, 2764 @_,
2611 ); 2765 );
2612 2766
2613 if ($self->{anim} && $self->{animspeed}) { 2767 if ($self->{anim} && $self->{animspeed}) {
2614 Scalar::Util::weaken (my $widget = $self); 2768 Scalar::Util::weaken (my $widget = $self);
… …
2673 $self->SUPER::DESTROY; 2827 $self->SUPER::DESTROY;
2674} 2828}
2675 2829
2676############################################################################# 2830#############################################################################
2677 2831
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; 2832package CFClient::UI::Menu;
2842 2833
2843our @ISA = CFClient::UI::FancyFrame::; 2834our @ISA = CFClient::UI::FancyFrame::;
2844 2835
2845use CFClient::OpenGL; 2836use CFClient::OpenGL;
… …
2876 2867
2877# 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)
2878sub popup { 2869sub popup {
2879 my ($self, $ev) = @_; 2870 my ($self, $ev) = @_;
2880 2871
2881 $self->emit ("popdown"); 2872 $self->_emit ("popdown");
2882 2873
2883 # maybe save $GRAB? must be careful about events... 2874 # maybe save $GRAB? must be careful about events...
2884 $GRAB = $self; 2875 $GRAB = $self;
2885 $self->{button} = $ev->{button}; 2876 $self->{button} = $ev->{button};
2886 2877
2887 $self->show; 2878 $self->show;
2888 $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);
2889} 2880}
2890 2881
2891sub mouse_motion { 2882sub mouse_motion {
2892 my ($self, $ev, $x, $y) = @_; 2883 my ($self, $ev, $x, $y) = @_;
2893 2884
… …
2901 2892
2902 if ($ev->{button} == $self->{button}) { 2893 if ($ev->{button} == $self->{button}) {
2903 undef $GRAB; 2894 undef $GRAB;
2904 $self->hide; 2895 $self->hide;
2905 2896
2906 $self->emit ("popdown"); 2897 $self->_emit ("popdown");
2907 $self->{hover}[1]->() if $self->{hover}; 2898 $self->{hover}[1]->() if $self->{hover};
2908 } 2899 }
2909} 2900}
2910 2901
2911############################################################################# 2902#############################################################################
… …
2973sub add { 2964sub add {
2974 my ($self, $text, %arg) = @_; 2965 my ($self, $text, %arg) = @_;
2975 2966
2976 $text =~ s/^\s+//; 2967 $text =~ s/^\s+//;
2977 $text =~ s/\s+$//; 2968 $text =~ s/\s+$//;
2969
2970 return unless $text;
2978 2971
2979 my $timeout = time + ((delete $arg{timeout}) || 60); 2972 my $timeout = time + ((delete $arg{timeout}) || 60);
2980 2973
2981 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2974 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2982 2975
… …
3016 $self->SUPER::reconfigure; 3009 $self->SUPER::reconfigure;
3017} 3010}
3018 3011
3019############################################################################# 3012#############################################################################
3020 3013
3021package CFClient::UI::Root; 3014package CFClient::UI::Inventory;
3022 3015
3023our @ISA = CFClient::UI::Container::; 3016our @ISA = CFClient::UI::ScrolledWindow::;
3024
3025use CFClient::OpenGL;
3026 3017
3027sub new { 3018sub new {
3028 my $class = shift; 3019 my $class = shift;
3029 3020
3030 $class->SUPER::new ( 3021 my $self = $class->SUPER::new (
3022 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3031 @_, 3023 @_,
3032 ) 3024 );
3033}
3034 3025
3035sub 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# if $commit is true, the binding will be set after the user entered a key combo
3157sub ask_for_bind {
3158 my ($self, $commit) = @_;
3159
3160 CFClient::Binder::open_binding_dialog (sub {
3161 my ($mod, $sym) = @_;
3162 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3163 $self->update_binding_widgets;
3164 $self->commit if $commit;
3165 });
3166}
3167
3168# $mod and $sym are the modifiers and key symbol
3169# $cmds is a array ref of strings (the commands)
3170# $cb is the callback that is executed on OK
3171# $ccb is the callback that is executed on CANCEL and
3172# when the binding was unsuccessful on OK
3173sub set_binding {
3036 my ($self, $x, $y, $w, $h) = @_; 3174 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3037 3175
3038 $self->{w} = $w; 3176 $self->clear_command_list;
3039 $self->{h} = $h; 3177 $self->{recording} = 0;
3040} 3178 $self->{rec_btn}->set_text ("start recording");
3041 3179
3042sub check_size { 3180 $self->{binding} = [$mod, $sym];
3181 $self->{commands} = $cmds;
3182
3183 $self->{binding_change} = $cb;
3184 $self->{binding_cancel} = $ccb;
3185
3186 $self->update_binding_widgets;
3187}
3188
3189# this is a shortcut method that asks for a binding
3190# and then just binds it.
3191sub do_quick_binding {
3043 my ($self) = @_; 3192 my ($self, $cmds) = @_;
3193 $self->set_binding (undef, undef, $cmds, sub {
3194 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3195 });
3196 $self->ask_for_bind (1);
3197}
3044 3198
3045 $self->size_allocate ($self->{w}, $self->{h}) 3199sub update_binding_widgets {
3046 if $self->{w}; 3200 my ($self) = @_;
3201 my ($mod, $sym, $cmds) = $self->get_binding;
3202 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3203 $self->set_command_list ($cmds);
3204}
3205
3206sub get_binding {
3207 my ($self) = @_;
3208 return (
3209 $self->{binding}->[0],
3210 $self->{binding}->[1],
3211 [ grep { defined $_ } @{$self->{commands}} ]
3212 );
3213}
3214
3215sub clear_command_list {
3216 my ($self) = @_;
3217 $self->{cmdbox}->clear ();
3218}
3219
3220sub set_command_list {
3221 my ($self, $cmds) = @_;
3222
3223 $self->{cmdbox}->clear ();
3224 $self->{commands} = $cmds;
3225
3226 my $idx = 0;
3227
3228 for (@$cmds) {
3229 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3230
3231 my $i = $idx;
3232 $hb->add (new CFClient::UI::Label text => $_);
3233 $hb->add (new CFClient::UI::Button
3234 text => "delete",
3235 tooltip => "Deletes the action from the record",
3236 on_activate => sub {
3237 $self->{cmdbox}->remove ($hb);
3238 $cmds->[$i] = undef;
3239 });
3240
3241
3242 $idx++
3243 }
3244}
3245
3246#############################################################################
3247
3248package CFClient::UI::SpellList;
3249
3250our @ISA = CFClient::UI::FancyFrame::;
3251
3252sub new {
3253 my $class = shift;
3254
3255 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3256
3257 $self->add (new CFClient::UI::ScrolledWindow
3258 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3259
3260 $self;
3261}
3262
3263# XXX: Do sorting? Argl...
3264sub add_spell {
3265 my ($self, $spell) = @_;
3266 $self->{spells}->{$spell->{name}} = $spell;
3267
3268 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3269 face => $spell->{face},
3270 can_hover => 1,
3271 can_events => 1,
3272 tooltip => $spell->{message});
3273
3274 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3275 text => $spell->{name},
3276 can_hover => 1,
3277 can_events => 1,
3278 tooltip => $spell->{message},
3279 expand => 1);
3280
3281 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3282 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3283 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3284 expand => 1);
3285
3286 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3287 text => "bind to key",
3288 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3289}
3290
3291sub rebuild_spell_list {
3292 my ($self) = @_;
3293 $self->{tbl_idx} = 0;
3294 $self->add_spell ($_) for values %{$self->{spells}};
3295}
3296
3297sub remove_spell {
3298 my ($self, $spell) = @_;
3299 delete $self->{spells}->{$spell->{name}};
3300 $self->rebuild_spell_list;
3301}
3302
3303#############################################################################
3304
3305package CFClient::UI::Root;
3306
3307our @ISA = CFClient::UI::Container::;
3308
3309use CFClient::OpenGL;
3310
3311sub new {
3312 my $class = shift;
3313
3314 my $self = $class->SUPER::new (
3315 visible => 1,
3316 @_,
3317 );
3318
3319 Scalar::Util::weaken ($self->{root} = $self);
3320
3321 $self
3047} 3322}
3048 3323
3049sub size_request { 3324sub size_request {
3050 my ($self) = @_; 3325 my ($self) = @_;
3051 3326
3052 ($self->{w}, $self->{h}) 3327 ($self->{w}, $self->{h})
3328}
3329
3330sub _to_pixel {
3331 my ($coord, $size, $max) = @_;
3332
3333 $coord =
3334 $coord eq "center" ? ($max - $size) * 0.5
3335 : $coord eq "max" ? $max
3336 : $coord;
3337
3338 $coord = 0 if $coord < 0;
3339 $coord = $max - $size if $coord > $max - $size;
3340
3341 int $coord + 0.5
3053} 3342}
3054 3343
3055sub size_allocate { 3344sub size_allocate {
3056 my ($self, $w, $h) = @_; 3345 my ($self, $w, $h) = @_;
3057 3346
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) { 3347 for my $child ($self->children) {
3065 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3348 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3066 3349
3067 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3350 $X = $child->{force_x} if exists $child->{force_x};
3068 if exists $child->{req_x}; 3351 $Y = $child->{force_y} if exists $child->{force_y};
3069 3352
3070 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3353 $X = _to_pixel $X, $W, $self->{w};
3071 if exists $child->{req_y}; 3354 $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 3355
3076 $child->configure ($X, $Y, $W, $H); 3356 $child->configure ($X, $Y, $W, $H);
3077 } 3357 }
3078} 3358}
3079 3359
… …
3090} 3370}
3091 3371
3092sub update { 3372sub update {
3093 my ($self) = @_; 3373 my ($self) = @_;
3094 3374
3095 $self->check_size;
3096 $::WANT_REFRESH++; 3375 $::WANT_REFRESH++;
3097} 3376}
3098 3377
3099sub add { 3378sub add {
3100 my ($self, @children) = @_; 3379 my ($self, @children) = @_;
3101 3380
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; 3381 $_->{is_toplevel} = 1
3110 3382 for @children;
3111 # integerise window positions
3112 $child->{x} = int $child->{x};
3113 $child->{y} = int $child->{y};
3114 }
3115 3383
3116 $self->SUPER::add (@children); 3384 $self->SUPER::add (@children);
3117} 3385}
3118 3386
3119sub remove { 3387sub remove {
3120 my ($self, @children) = @_; 3388 my ($self, @children) = @_;
3121 3389
3122 $self->SUPER::remove (@children); 3390 $self->SUPER::remove (@children);
3391
3392 delete $self->{is_toplevel}
3393 for @children;
3123 3394
3124 while (@children) { 3395 while (@children) {
3125 my $w = pop @children; 3396 my $w = pop @children;
3126 push @children, $w->children; 3397 push @children, $w->children;
3127 delete $w->{visible}; 3398 $w->set_invisible;
3128 } 3399 }
3129} 3400}
3130 3401
3131sub on_refresh { 3402sub on_refresh {
3132 my ($self, $id, $cb) = @_; 3403 my ($self, $id, $cb) = @_;
… …
3146 while ($self->{refresh_hook}) { 3417 while ($self->{refresh_hook}) {
3147 $_->() 3418 $_->()
3148 for values %{delete $self->{refresh_hook}}; 3419 for values %{delete $self->{refresh_hook}};
3149 } 3420 }
3150 3421
3151 if ($self->{check_size}) { 3422 if ($self->{realloc}) {
3152 my @queue = ([], []); 3423 my %queue;
3424 my @queue;
3425 my $widget;
3153 3426
3154 for (;;) { 3427 outer:
3155 if ($self->{check_size}) { 3428 while () {
3156 # heuristic: check containers last 3429 if (my $realloc = delete $self->{realloc}) {
3157 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3430 for $widget (values %$realloc) {
3158 for values %{delete $self->{check_size}} 3431 $widget->{visible} or next; # do not resize invisible widgets
3432
3433 $queue{$widget+0}++ and next; # duplicates are common
3434
3435 push @{ $queue[$widget->{visible}] }, $widget;
3436 }
3159 } 3437 }
3160 3438
3161 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3439 while () {
3440 @queue or last outer;
3162 3441
3163 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3442 $widget = pop @{ $queue[-1] || [] }
3164 ? @$widget{qw(user_w user_h)} 3443 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 3444
3445 pop @queue;
3446 }
3447
3448 delete $queue{$widget+0};
3449
3450 my ($w, $h) = $widget->size_request;
3451
3452 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3453 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3454
3455 $w = $widget->{force_w} if exists $widget->{force_w};
3456 $h = $widget->{force_h} if exists $widget->{force_h};
3457
3458 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3459 || delete $widget->{force_realloc}) {
3171 $widget->{req_w} = $w; 3460 $widget->{req_w} = $w;
3172 $widget->{req_h} = $h; 3461 $widget->{req_h} = $h;
3173 3462
3174 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3463 $self->{size_alloc}{$widget+0} = $widget;
3175 3464
3176 $widget->{parent}->check_size
3177 if $widget->{parent}; 3465 if (my $parent = $widget->{parent}) {
3466 $self->{realloc}{$parent+0} = $parent
3467 unless $queue{$parent+0};
3468
3469 $parent->{force_size_alloc} = 1;
3470 $self->{size_alloc}{$parent+0} = $parent;
3471 }
3178 } 3472 }
3473
3474 delete $self->{realloc}{$widget+0};
3179 } 3475 }
3180 } 3476 }
3181 3477
3182 while ($self->{size_alloc}) { 3478 while (my $size_alloc = delete $self->{size_alloc}) {
3183 for (values %{delete $self->{size_alloc}}) { 3479 my @queue = sort { $b->{visible} <=> $a->{visible} }
3184 my ($widget, $w, $h) = @$_; 3480 values %$size_alloc;
3481
3482 while () {
3483 my $widget = pop @queue || last;
3484
3485 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3185 3486
3186 $w = 0 if $w < 0; 3487 $w = 0 if $w < 0;
3187 $h = 0 if $h < 0; 3488 $h = 0 if $h < 0;
3188 3489
3490 $w = int $w + 0.5;
3491 $h = int $h + 0.5;
3492
3493 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3494 $widget->{old_w} = $widget->{w};
3495 $widget->{old_h} = $widget->{h};
3496
3189 $widget->{w} = $w; 3497 $widget->{w} = $w;
3190 $widget->{h} = $h; 3498 $widget->{h} = $h;
3191 $widget->size_allocate ($w, $h); 3499
3192 $widget->emit (size_allocate => $w, $h); 3500 $widget->emit (size_allocate => $w, $h);
3501 }
3193 } 3502 }
3194 } 3503 }
3195 3504
3196 while ($self->{post_alloc_hook}) { 3505 while ($self->{post_alloc_hook}) {
3197 $_->() 3506 $_->()
3198 for values %{delete $self->{post_alloc_hook}}; 3507 for values %{delete $self->{post_alloc_hook}};
3199 } 3508 }
3509
3200 3510
3201 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3511 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3202 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3512 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3203 glClear GL_COLOR_BUFFER_BIT; 3513 glClear GL_COLOR_BUFFER_BIT;
3204 3514
… …
3206 glLoadIdentity; 3516 glLoadIdentity;
3207 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3517 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3208 glMatrixMode GL_MODELVIEW; 3518 glMatrixMode GL_MODELVIEW;
3209 glLoadIdentity; 3519 glLoadIdentity;
3210 3520
3521 {
3522 package CFClient::UI::Base;
3523
3524 ($draw_x, $draw_y, $draw_w, $draw_h) =
3525 (0, 0, $self->{w}, $self->{h});
3526 }
3527
3211 $self->_draw; 3528 $self->_draw;
3212} 3529}
3213 3530
3214############################################################################# 3531#############################################################################
3215 3532

Diff Legend

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