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

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

Diff Legend

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