ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.230 by root, Wed May 24 21:59:54 2006 UTC vs.
Revision 1.280 by root, Mon Jun 5 01:22:08 2006 UTC

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

Diff Legend

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