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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.228 by root, Wed May 24 03:52:54 2006 UTC vs.
Revision 1.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] * ($self->{vp}{child_h} - $self->{vp}{h})); 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]);
1003}
1004
1005sub size_allocate {
1006 my ($self, $w, $h) = @_;
1007
1008 $self->SUPER::size_allocate ($w, $h);
1009
1010 my $child = $self->{vp}->child;
1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
836} 1012}
837 1013
838#TODO# update range on size_allocate depending on child 1014#TODO# update range on size_allocate depending on child
839# update viewport offset on scroll 1015# update viewport offset on scroll
840 1016
… …
860 1036
861 if ($self->{bg}) { 1037 if ($self->{bg}) {
862 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
863 1039
864 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
865 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
866 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
867 1043
868 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
869 glVertex 0 , 0; 1045 glVertex 0 , 0;
870 glVertex 0 , $h; 1046 glVertex 0 , $h;
871 glVertex $w, $h; 1047 glVertex $w, $h;
… …
884 1060
885our @ISA = CFClient::UI::Bin::; 1061our @ISA = CFClient::UI::Bin::;
886 1062
887use CFClient::OpenGL; 1063use CFClient::OpenGL;
888 1064
889my @tex = 1065my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1;
1068
1069my @border =
890 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
891 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
892 1072
893sub new { 1073sub new {
894 my $class = shift; 1074 my ($class, %arg) = @_;
895 1075
896 # TODO: user_x, user_y, overwrite moveto? 1076 my $title = delete $arg{title};
897 1077
898 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
899 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
900 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
901 border => 0.6, 1081 border => 0.6,
902 toplevel => 1,
903 can_events => 1, 1082 can_events => 1,
904 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
905 ); 1086 );
906 1087
907 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title} = new CFClient::UI::Label
908 align => 0, 1089 align => 0,
909 valign => 1, 1090 valign => 1,
910 text => $self->{title}, 1091 text => $title,
911 fontsize => $self->{border}; 1092 fontsize => $self->{border}
1093 if defined $title;
912 1094
913 $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};
914} 1103}
915 1104
916sub border { 1105sub border {
917 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
918} 1107}
919 1108
920sub size_request { 1109sub size_request {
921 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title}->size_request
1113 if $self->{title};
922 1114
923 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
924 1116
925 ( 1117 (
926 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
929} 1121}
930 1122
931sub size_allocate { 1123sub size_allocate {
932 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
933 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
934 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
935 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
936 1136
937 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
938 if $self->{title};
939
940 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
941} 1138}
942 1139
943sub button_down { 1140sub button_down {
944 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
945 1142
… …
961 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
962 1159
963 my $dx = $ev->{x} - $ox; 1160 my $dx = $ev->{x} - $ox;
964 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
965 1162
966 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
967 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1165
968 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
969 $self->check_size; 1167 $self->realloc;
970 }; 1168 };
971 1169
972 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
973 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
974 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
976 $self->{motion} = sub { 1174 $self->{motion} = sub {
977 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
978 1176
979 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
980 1178
981 $self->move ($bx + $x - $ox, $by + $y - $oy); 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
982 $self->update; 1180 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
983 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
984 } 1187 1
985} 1188}
986 1189
987sub button_up { 1190sub button_up {
988 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
989 1192
990 delete $self->{motion}; 1193 !!delete $self->{motion}
991} 1194}
992 1195
993sub mouse_motion { 1196sub mouse_motion {
994 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
995 1198
996 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
997} 1202}
998 1203
999sub _draw { 1204sub _draw {
1000 my ($self) = @_; 1205 my ($self) = @_;
1001 1206
1207 my $child = $self->{children}[0];
1208
1002 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
1003 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
1004 1211
1005 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
1006 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1007 1214
1008 my $border = $self->border; 1215 my $border = $self->border;
1009 1216
1010 glColor @{ $self->{border_bg} }; 1217 glColor @{ $self->{border_bg} };
1011 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1218 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1012 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1013 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1014 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1015 1222
1016 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1017 my $bg = $tex[0]; 1224 glColor @{ $self->{bg} };
1018 1225
1019 # TODO: repeat texture not scale 1226 # TODO: repeat texture not scale
1227 # solve this better(?)
1020 my $rep_x = $cw / $bg->{w}; 1228 $bg->{s} = $cw / $bg->{w};
1021 my $rep_y = $ch / $bg->{h}; 1229 $bg->{t} = $ch / $bg->{h};
1022
1023 glColor @{ $self->{bg} };
1024
1025 $bg->{s} = $rep_x;
1026 $bg->{t} = $rep_y;
1027 $bg->{wrap_mode} = 1;
1028 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1029 } 1231 }
1030 1232
1031 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1032 1234
1033 $self->{title}->draw if $self->{title};
1034
1035 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw;
1240 }
1036} 1241}
1037 1242
1038############################################################################# 1243#############################################################################
1039 1244
1040package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
1048sub new { 1253sub new {
1049 my $class = shift; 1254 my $class = shift;
1050 1255
1051 $class->SUPER::new ( 1256 $class->SUPER::new (
1052 col_expand => [], 1257 col_expand => [],
1053 @_ 1258 @_,
1054 ) 1259 )
1260}
1261
1262sub children {
1263 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1055} 1264}
1056 1265
1057sub add { 1266sub add {
1058 my ($self, $x, $y, $child) = @_; 1267 my ($self, $x, $y, $child) = @_;
1059 1268
1060 $child->set_parent ($self); 1269 $child->set_parent ($self);
1061 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1062 1271
1063 $child->check_size; 1272 $self->realloc;
1064} 1273}
1065 1274
1066sub children {
1067 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1068}
1069
1070# 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?
1071sub clear { 1276sub clear {
1072 my ($self) = @_; 1277 my ($self) = @_;
1073 1278
1074 my @children = $self->children; 1279 my @children = $self->children;
1075 delete $self->{children}; 1280 delete $self->{children};
… …
1077 for (@children) { 1282 for (@children) {
1078 delete $_->{parent}; 1283 delete $_->{parent};
1079 $_->hide; 1284 $_->hide;
1080 } 1285 }
1081 1286
1082 $self->update; 1287 $self->realloc;
1083} 1288}
1084 1289
1085sub get_wh { 1290sub get_wh {
1086 my ($self) = @_; 1291 my ($self) = @_;
1087 1292
… …
1118sub size_allocate { 1323sub size_allocate {
1119 my ($self, $w, $h) = @_; 1324 my ($self, $w, $h) = @_;
1120 1325
1121 my ($ws, $hs) = $self->get_wh; 1326 my ($ws, $hs) = $self->get_wh;
1122 1327
1123 my $req_w = sum @$ws; 1328 my $req_w = (sum @$ws) || 1;
1124 my $req_h = sum @$hs; 1329 my $req_h = (sum @$hs) || 1;
1125 1330
1126 # TODO: nicer code && do row_expand 1331 # TODO: nicer code && do row_expand
1127 my @col_expand = @{$self->{col_expand}}; 1332 my @col_expand = @{$self->{col_expand}};
1128 @col_expand = (1) x @$ws unless @col_expand; 1333 @col_expand = (1) x @$ws unless @col_expand;
1129 my $col_expand = (sum @col_expand) || 1; 1334 my $col_expand = (sum @col_expand) || 1;
… …
1183 } 1388 }
1184} 1389}
1185 1390
1186############################################################################# 1391#############################################################################
1187 1392
1188package CFClient::UI::HBox; 1393package CFClient::UI::Box;
1189
1190# TODO: wrap into common Box base class
1191 1394
1192our @ISA = CFClient::UI::Container::; 1395our @ISA = CFClient::UI::Container::;
1193 1396
1194sub size_request { 1397sub size_request {
1195 my ($self) = @_; 1398 my ($self) = @_;
1196 1399
1197 my @alloc = map [$_->size_request], @{$self->{children}}; 1400 $self->{vertical}
1198 1401 ? (
1199 ( 1402 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1200 (List::Util::sum map $_->[0], @alloc), 1403 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1201 (List::Util::max map $_->[1], @alloc), 1404 )
1202 ) 1405 : (
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 )
1203} 1409}
1204 1410
1205sub size_allocate { 1411sub size_allocate {
1206 my ($self, $w, $h) = @_; 1412 my ($self, $w, $h) = @_;
1207 1413
1208 ($h, $w) = ($w, $h); 1414 my $space = $self->{vertical} ? $h : $w;
1209
1210 my $children = $self->{children}; 1415 my $children = $self->{children};
1211 1416
1212 my @h = map $_->{req_w}, @$children; 1417 my @req;
1213 1418
1214 my $req_h = List::Util::sum @h; 1419 if ($self->{homogeneous}) {
1215 1420 @req = ($space / (@$children || 1)) x @$children;
1216 if ($req_h > $h) {
1217 # ah well, not enough space
1218 $_ *= $h / $req_h for @h;
1219 } else { 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 {
1220 my $exp = List::Util::sum map $_->{expand}, @$children; 1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1221 $exp ||= 1;
1222 1430
1431 $space = ($space - $req) / $expand; # remaining space to give away
1432
1433 $req[$_] += $space * $children->[$_]{expand}
1223 for (0 .. $#$children) { 1434 for 0 .. $#$children;
1224 my $child = $children->[$_];
1225
1226 my $alloc_h = $h[$_];
1227 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1228 $h[$_] = $alloc_h;
1229 } 1435 }
1230 } 1436 }
1231 1437
1232 CFClient::UI::harmonize \@h; 1438 CFClient::UI::harmonize \@req;
1233 1439
1234 my $y = 0; 1440 my $pos = 0;
1235 for (0 .. $#$children) { 1441 for (0 .. $#$children) {
1236 my $child = $children->[$_];
1237 my $h = $h[$_]; 1442 my $alloc = $req[$_];
1238 $child->configure ($y, 0, $h, $w); 1443 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1239 1444
1240 $y += $h; 1445 $pos += $alloc;
1241 } 1446 }
1242 1447
1243 1 1448 1
1244} 1449}
1245 1450
1246############################################################################# 1451#############################################################################
1247 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
1248package CFClient::UI::VBox; 1468package CFClient::UI::VBox;
1249 1469
1250# TODO: wrap into common Box base class
1251
1252our @ISA = CFClient::UI::Container::; 1470our @ISA = CFClient::UI::Box::;
1253 1471
1254sub size_request { 1472sub new {
1255 my ($self) = @_; 1473 my $class = shift;
1256 1474
1257 my @alloc = map [$_->size_request], @{$self->{children}}; 1475 $class->SUPER::new (
1258 1476 vertical => 1,
1259 ( 1477 @_,
1260 (List::Util::max map $_->[0], @alloc),
1261 (List::Util::sum map $_->[1], @alloc),
1262 ) 1478 )
1263}
1264
1265sub size_allocate {
1266 my ($self, $w, $h) = @_;
1267
1268 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1269
1270 my $children = $self->{children};
1271
1272 my @h = map $_->{req_h}, @$children;
1273
1274 my $req_h = List::Util::sum @h;
1275
1276 if ($req_h > $h) {
1277 # ah well, not enough space
1278 $_ *= $h / $req_h for @h;
1279 } else {
1280 my $exp = List::Util::sum map $_->{expand}, @$children;
1281 $exp ||= 1;
1282
1283 for (0 .. $#$children) {
1284 my $child = $children->[$_];
1285
1286 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1287 }
1288 }
1289
1290 CFClient::UI::harmonize \@h;
1291
1292 my $y = 0;
1293 for (0 .. $#$children) {
1294 my $child = $children->[$_];
1295 my $h = $h[$_];
1296 $child->configure (0, $y, $w, $h);
1297
1298 $y += $h;
1299 }
1300
1301 1
1302} 1479}
1303 1480
1304############################################################################# 1481#############################################################################
1305 1482
1306package CFClient::UI::Label; 1483package CFClient::UI::Label;
… …
1323 ellipsise => 3, # end 1500 ellipsise => 3, # end
1324 layout => (new CFClient::Layout), 1501 layout => (new CFClient::Layout),
1325 fontsize => 1, 1502 fontsize => 1,
1326 align => -1, 1503 align => -1,
1327 valign => -1, 1504 valign => -1,
1328 padding => 2, 1505 padding_x => 2,
1506 padding_y => 2,
1329 can_events => 0, 1507 can_events => 0,
1330 %arg 1508 %arg
1331 ); 1509 );
1332 1510
1333 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1369 $self->{text} = "T$text"; 1547 $self->{text} = "T$text";
1370 1548
1371 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1549 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1372 $self->{layout}->set_text ($text); 1550 $self->{layout}->set_text ($text);
1373 1551
1552 $self->realloc;
1374 $self->update; 1553 $self->update;
1375 $self->check_size;
1376} 1554}
1377 1555
1378sub set_markup { 1556sub set_markup {
1379 my ($self, $markup) = @_; 1557 my ($self, $markup) = @_;
1380 1558
… …
1384 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1562 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1385 1563
1386 $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;
1387 $self->{layout}->set_markup ($markup); 1565 $self->{layout}->set_markup ($markup);
1388 1566
1567 $self->realloc;
1389 $self->update; 1568 $self->update;
1390 $self->check_size;
1391} 1569}
1392 1570
1393sub size_request { 1571sub size_request {
1394 my ($self) = @_; 1572 my ($self) = @_;
1395 1573
… …
1409 1587
1410 $w = List::Util::max $w, $w2; 1588 $w = List::Util::max $w, $w2;
1411 $h = List::Util::max $h, $h2; 1589 $h = List::Util::max $h, $h2;
1412 } 1590 }
1413 1591
1414 ( 1592 ($w, $h)
1415 $w + $self->{padding} * 2,
1416 $h + $self->{padding} * 2,
1417 )
1418} 1593}
1419 1594
1420sub size_allocate { 1595sub size_allocate {
1421 my ($self, $w, $h) = @_; 1596 my ($self, $w, $h) = @_;
1422 1597
1598 delete $self->{ox};
1599
1423 delete $self->{texture}; 1600 delete $self->{texture}
1601 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1424} 1602}
1425 1603
1426sub set_fontsize { 1604sub set_fontsize {
1427 my ($self, $fontsize) = @_; 1605 my ($self, $fontsize) = @_;
1428 1606
1429 $self->{fontsize} = $fontsize; 1607 $self->{fontsize} = $fontsize;
1430 delete $self->{texture}; 1608 delete $self->{texture};
1431 1609
1432 $self->update; 1610 $self->realloc;
1433 $self->check_size;
1434} 1611}
1435 1612
1436sub _draw { 1613sub _draw {
1437 my ($self) = @_; 1614 my ($self) = @_;
1438 1615
… …
1444 $self->{layout}->set_width ($self->{w}); 1621 $self->{layout}->set_width ($self->{w});
1445 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1622 $self->{layout}->set_ellipsise ($self->{ellipsise});
1446 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1623 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1447 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1448 1625
1449 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1626 new_from_layout CFClient::Texture $self->{layout}
1627 };
1450 1628
1629 unless (exists $self->{ox}) {
1451 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1630 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1452 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1631 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1453 : ($self->{w} - $tex->{w}) * 0.5); 1632 : ($self->{w} - $tex->{w}) * 0.5);
1454 1633
1455 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1634 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1456 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1635 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1457 : ($self->{h} - $tex->{h}) * 0.5); 1636 : ($self->{h} - $tex->{h}) * 0.5);
1458
1459 $tex
1460 }; 1637 };
1461 1638
1462 glEnable GL_TEXTURE_2D; 1639 glEnable GL_TEXTURE_2D;
1463 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1640 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1464 1641
1642 glColor_premultiply @{$self->{fg}}
1465 if ($tex->{format} == GL_ALPHA) { 1643 if $tex->{format} == GL_ALPHA;
1466 glColor @{$self->{fg}}; 1644
1467 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1468 } else {
1469 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1645 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1470 }
1471 1646
1472 glDisable GL_TEXTURE_2D; 1647 glDisable GL_TEXTURE_2D;
1473} 1648}
1474 1649
1475############################################################################# 1650#############################################################################
… …
1502 1677
1503 delete $self->{cur_h}; 1678 delete $self->{cur_h};
1504 1679
1505 return if $self->{text} eq $text; 1680 return if $self->{text} eq $text;
1506 1681
1507 delete $self->{texture};
1508
1509 $self->{last_activity} = $::NOW; 1682 $self->{last_activity} = $::NOW;
1510 $self->{text} = $text; 1683 $self->{text} = $text;
1511 1684
1512 $text =~ s/./*/g if $self->{hidden}; 1685 $text =~ s/./*/g if $self->{hidden};
1513 $self->{layout}->set_text ("$text "); 1686 $self->{layout}->set_text ("$text ");
1514 1687
1515 $self->emit (changed => $self->{text}); 1688 $self->_emit (changed => $self->{text});
1689 $self->update;
1516} 1690}
1517 1691
1518sub set_text { 1692sub set_text {
1519 my ($self, $text) = @_; 1693 my ($self, $text) = @_;
1520 1694
1521 $self->{cursor} = length $text; 1695 $self->{cursor} = length $text;
1522 $self->_set_text ($text); 1696 $self->_set_text ($text);
1523 $self->update; 1697
1524 $self->check_size; 1698 $self->realloc;
1525} 1699}
1526 1700
1527sub get_text { 1701sub get_text {
1528 $_[0]{text} 1702 $_[0]{text}
1529} 1703}
… …
1532 my ($self) = @_; 1706 my ($self) = @_;
1533 1707
1534 my ($w, $h) = $self->SUPER::size_request; 1708 my ($w, $h) = $self->SUPER::size_request;
1535 1709
1536 ($w + 1, $h) # add 1 for cursor 1710 ($w + 1, $h) # add 1 for cursor
1537}
1538
1539sub size_allocate {
1540 my ($self, $w, $h) = @_;
1541
1542 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1543} 1711}
1544 1712
1545sub key_down { 1713sub key_down {
1546 my ($self, $ev) = @_; 1714 my ($self, $ev) = @_;
1547 1715
… …
1562 } elsif ($sym == CFClient::SDLK_HOME) { 1730 } elsif ($sym == CFClient::SDLK_HOME) {
1563 $self->{cursor} = 0; 1731 $self->{cursor} = 0;
1564 } elsif ($sym == CFClient::SDLK_END) { 1732 } elsif ($sym == CFClient::SDLK_END) {
1565 $self->{cursor} = length $text; 1733 $self->{cursor} = length $text;
1566 } elsif ($uni == 27) { 1734 } elsif ($uni == 27) {
1567 $self->emit ('escape'); 1735 $self->_emit ('escape');
1568 } elsif ($uni) { 1736 } elsif ($uni) {
1569 substr $text, $self->{cursor}++, 0, chr $uni; 1737 substr $text, $self->{cursor}++, 0, chr $uni;
1738 } else {
1739 return 0;
1570 } 1740 }
1571 1741
1572 $self->_set_text ($text); 1742 $self->_set_text ($text);
1573 $self->update; 1743
1574 $self->check_size; 1744 $self->realloc;
1745
1746 1
1575} 1747}
1576 1748
1577sub focus_in { 1749sub focus_in {
1578 my ($self) = @_; 1750 my ($self) = @_;
1579 1751
… …
1594 utf8::encode $text; 1766 utf8::encode $text;
1595 $self->{cursor} = length substr $text, 0, $idx; 1767 $self->{cursor} = length substr $text, 0, $idx;
1596 1768
1597 $self->_set_text ($self->{text}); 1769 $self->_set_text ($self->{text});
1598 $self->update; 1770 $self->update;
1771
1772 1
1599} 1773}
1600 1774
1601sub mouse_motion { 1775sub mouse_motion {
1602 my ($self, $ev, $x, $y) = @_; 1776 my ($self, $ev, $x, $y) = @_;
1603# 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
1604} 1780}
1605 1781
1606sub _draw { 1782sub _draw {
1607 my ($self) = @_; 1783 my ($self) = @_;
1608 1784
1609 local $self->{fg} = $self->{fg}; 1785 local $self->{fg} = $self->{fg};
1610 1786
1611 if ($FOCUS == $self) { 1787 if ($FOCUS == $self) {
1612 glColor @{$self->{active_bg}}; 1788 glColor_premultiply @{$self->{active_bg}};
1613 $self->{fg} = $self->{active_fg}; 1789 $self->{fg} = $self->{active_fg};
1614 } else { 1790 } else {
1615 glColor @{$self->{bg}}; 1791 glColor_premultiply @{$self->{bg}};
1616 } 1792 }
1617 1793
1618 glEnable GL_BLEND; 1794 glEnable GL_BLEND;
1619 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1795 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1620 glBegin GL_QUADS; 1796 glBegin GL_QUADS;
1621 glVertex 0 , 0; 1797 glVertex 0 , 0;
1622 glVertex 0 , $self->{h}; 1798 glVertex 0 , $self->{h};
1623 glVertex $self->{w}, $self->{h}; 1799 glVertex $self->{w}, $self->{h};
1624 glVertex $self->{w}, 0; 1800 glVertex $self->{w}, 0;
… …
1659 if ($sym == 13) { 1835 if ($sym == 13) {
1660 unshift @{$self->{history}}, 1836 unshift @{$self->{history}},
1661 my $txt = $self->get_text; 1837 my $txt = $self->get_text;
1662 $self->{history_pointer} = -1; 1838 $self->{history_pointer} = -1;
1663 $self->{history_saveback} = ''; 1839 $self->{history_saveback} = '';
1664 $self->emit (activate => $txt); 1840 $self->_emit (activate => $txt);
1665 $self->update; 1841 $self->update;
1666 1842
1667 } elsif ($sym == CFClient::SDLK_UP) { 1843 } elsif ($sym == CFClient::SDLK_UP) {
1668 if ($self->{history_pointer} < 0) { 1844 if ($self->{history_pointer} < 0) {
1669 $self->{history_saveback} = $self->get_text; 1845 $self->{history_saveback} = $self->get_text;
… …
1685 } else { 1861 } else {
1686 $self->set_text ($self->{history_saveback}); 1862 $self->set_text ($self->{history_saveback});
1687 } 1863 }
1688 1864
1689 } else { 1865 } else {
1690 $self->SUPER::key_down ($ev); 1866 return $self->SUPER::key_down ($ev)
1867 }
1868
1691 } 1869 1
1692
1693} 1870}
1694 1871
1695############################################################################# 1872#############################################################################
1696 1873
1697package CFClient::UI::Button; 1874package CFClient::UI::Button;
… …
1706 1883
1707sub new { 1884sub new {
1708 my $class = shift; 1885 my $class = shift;
1709 1886
1710 $class->SUPER::new ( 1887 $class->SUPER::new (
1711 padding => 4, 1888 padding_x => 4,
1889 padding_y => 4,
1712 fg => [1, 1, 1], 1890 fg => [1, 1, 1],
1713 active_fg => [0, 0, 1], 1891 active_fg => [0, 0, 1],
1714 can_hover => 1, 1892 can_hover => 1,
1715 align => 0, 1893 align => 0,
1716 valign => 0, 1894 valign => 0,
1717 can_events => 1, 1895 can_events => 1,
1718 @_ 1896 @_
1719 ) 1897 )
1720} 1898}
1721 1899
1900sub activate { }
1901
1722sub button_up { 1902sub button_up {
1723 my ($self, $ev, $x, $y) = @_; 1903 my ($self, $ev, $x, $y) = @_;
1724 1904
1905 $self->emit ("activate")
1725 if ($x >= 0 && $x < $self->{w} 1906 if $x >= 0 && $x < $self->{w}
1726 && $y >= 0 && $y < $self->{h}) { 1907 && $y >= 0 && $y < $self->{h};
1727 $self->emit ("activate"); 1908
1728 } 1909 1
1729} 1910}
1730 1911
1731sub _draw { 1912sub _draw {
1732 my ($self) = @_; 1913 my ($self) = @_;
1733 1914
1734 local $self->{fg} = $self->{fg}; 1915 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1735
1736 if ($GRAB == $self) {
1737 $self->{fg} = $self->{active_fg};
1738 }
1739 1916
1740 glEnable GL_TEXTURE_2D; 1917 glEnable GL_TEXTURE_2D;
1741 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1742 glColor 0, 0, 0, 1; 1919 glColor 0, 0, 0, 1;
1743 1920
… …
1762 1939
1763sub new { 1940sub new {
1764 my $class = shift; 1941 my $class = shift;
1765 1942
1766 $class->SUPER::new ( 1943 $class->SUPER::new (
1767 padding => 2, 1944 padding_x => 2,
1945 padding_y => 2,
1768 fg => [1, 1, 1], 1946 fg => [1, 1, 1],
1769 active_fg => [1, 1, 0], 1947 active_fg => [1, 1, 0],
1770 bg => [0, 0, 0, 0.2], 1948 bg => [0, 0, 0, 0.2],
1771 active_bg => [1, 1, 1, 0.5], 1949 active_bg => [1, 1, 1, 0.5],
1772 state => 0, 1950 state => 0,
… …
1776} 1954}
1777 1955
1778sub size_request { 1956sub size_request {
1779 my ($self) = @_; 1957 my ($self) = @_;
1780 1958
1781 ($self->{padding} * 2 + 6) x 2 1959 (6) x 2
1782} 1960}
1783 1961
1784sub button_down { 1962sub button_down {
1785 my ($self, $ev, $x, $y) = @_; 1963 my ($self, $ev, $x, $y) = @_;
1786 1964
1787 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1965 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1788 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1966 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1789 $self->{state} = !$self->{state}; 1967 $self->{state} = !$self->{state};
1790 $self->emit (changed => $self->{state}); 1968 $self->_emit (changed => $self->{state});
1969 } else {
1970 return 0
1971 }
1972
1791 } 1973 1
1792} 1974}
1793 1975
1794sub _draw { 1976sub _draw {
1795 my ($self) = @_; 1977 my ($self) = @_;
1796 1978
1797 $self->SUPER::_draw; 1979 $self->SUPER::_draw;
1798 1980
1799 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1981 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1800 1982
1801 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;
1802 1986
1803 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1987 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1804 1988
1805 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1989 my $tex = $self->{state} ? $tex[1] : $tex[0];
1806 1990
… …
1961 2145
1962 my $h1 = $self->{h} * (1 - $ycut1); 2146 my $h1 = $self->{h} * (1 - $ycut1);
1963 my $h2 = $self->{h} * (1 - $ycut2); 2147 my $h2 = $self->{h} * (1 - $ycut2);
1964 2148
1965 glEnable GL_BLEND; 2149 glEnable GL_BLEND;
1966 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;
1967 glEnable GL_TEXTURE_2D; 2152 glEnable GL_TEXTURE_2D;
1968 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2153 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1969 2154
1970 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2155 glBindTexture GL_TEXTURE_2D, $t1->{name};
1971 glBegin GL_QUADS; 2156 glBegin GL_QUADS;
… …
2071 fg => [1, 1, 1], 2256 fg => [1, 1, 1],
2072 active_fg => [0, 0, 0], 2257 active_fg => [0, 0, 0],
2073 bg => [0, 0, 0, 0.2], 2258 bg => [0, 0, 0, 0.2],
2074 active_bg => [1, 1, 1, 0.5], 2259 active_bg => [1, 1, 1, 0.5],
2075 range => [0, 0, 100, 10, 0], 2260 range => [0, 0, 100, 10, 0],
2076 req_w => $::WIDTH / 80, 2261 min_w => $::WIDTH / 80,
2077 req_h => $::WIDTH / 80, 2262 min_h => $::WIDTH / 80,
2078 vertical => 0, 2263 vertical => 0,
2079 can_hover => 1, 2264 can_hover => 1,
2080 inner_pad => 0.02, 2265 inner_pad => 0.02,
2081 @_ 2266 @_
2082 ); 2267 );
… …
2085 $self->update; 2270 $self->update;
2086 2271
2087 $self 2272 $self
2088} 2273}
2089 2274
2275sub changed { }
2276
2090sub set_range { 2277sub set_range {
2091 my ($self, $range) = @_; 2278 my ($self, $range) = @_;
2092 2279
2093 $self->{range} = $range; 2280 ($range, $self->{range}) = ($self->{range}, $range);
2094 2281
2095 $self->update; 2282 $self->update
2283 if "@$range" ne "@{$self->{range}}";
2096} 2284}
2097 2285
2098sub set_value { 2286sub set_value {
2099 my ($self, $value) = @_; 2287 my ($self, $value) = @_;
2100 2288
… …
2111 if $unit; 2299 if $unit;
2112 2300
2113 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2301 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114 2302
2115 if ($value != $old_value) { 2303 if ($value != $old_value) {
2116 $self->emit (changed => $value); 2304 $self->_emit (changed => $value);
2117 $self->update; 2305 $self->update;
2118 } 2306 }
2119} 2307}
2120 2308
2121sub size_request { 2309sub size_request {
2122 my ($self) = @_; 2310 my ($self) = @_;
2123 2311
2124 my $w = $self->{req_w}; 2312 ($self->{req_w}, $self->{req_h})
2125 my $h = $self->{req_h};
2126
2127 $self->{vertical} ? ($h, $w) : ($w, $h)
2128} 2313}
2129 2314
2130sub button_down { 2315sub button_down {
2131 my ($self, $ev, $x, $y) = @_; 2316 my ($self, $ev, $x, $y) = @_;
2132 2317
2133 $self->SUPER::button_down ($ev, $x, $y); 2318 $self->SUPER::button_down ($ev, $x, $y);
2134 2319
2135 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2320 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2136 2321
2137 $self->mouse_motion ($ev, $x, $y); 2322 $self->mouse_motion ($ev, $x, $y)
2138} 2323}
2139 2324
2140sub mouse_motion { 2325sub mouse_motion {
2141 my ($self, $ev, $x, $y) = @_; 2326 my ($self, $ev, $x, $y) = @_;
2142 2327
… …
2146 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2331 my (undef, $lo, $hi, $page) = @{$self->{range}};
2147 2332
2148 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2333 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2149 2334
2150 $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
2151 } 2340 1
2152} 2341}
2153 2342
2154sub update { 2343sub update {
2155 my ($self) = @_; 2344 my ($self) = @_;
2156 2345
2157 $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}) {
2158 $self->set_value ($self->{range}[0]); 2354 $self->set_value ($self->{range}[0]);
2159 2355
2160 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2356 my ($value, $lo, $hi, $page) = @{$self->{range}};
2161 my $range = ($hi - $page - $lo) || 1e-100; 2357 my $range = ($hi - $page - $lo) || 1e-100;
2162 2358
… …
2168 $value = ($value - $lo) / $range; 2364 $value = ($value - $lo) / $range;
2169 $value = $value * $self->{scale} + $self->{offset}; 2365 $value = $value * $self->{scale} + $self->{offset};
2170 2366
2171 $self->{knob_x} = $value - $knob_w * 0.5; 2367 $self->{knob_x} = $value - $knob_w * 0.5;
2172 $self->{knob_w} = $knob_w; 2368 $self->{knob_w} = $knob_w;
2173 }); 2369 }
2174
2175 $self->SUPER::update;
2176}
2177
2178sub _draw {
2179 my ($self) = @_;
2180 2370
2181 $self->SUPER::_draw (); 2371 $self->SUPER::_draw ();
2182 2372
2183 glScale $self->{w}, $self->{h}; 2373 glScale $self->{w}, $self->{h};
2184 2374
… …
2378 2568
2379 delete $self->{texture}; 2569 delete $self->{texture};
2380 } 2570 }
2381 2571
2382 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2383 glClearColor 0.5, 0.5, 0.5, 0; 2573 glClearColor 0, 0, 0, 0;
2384 glClear GL_COLOR_BUFFER_BIT; 2574 glClear GL_COLOR_BUFFER_BIT;
2385 2575
2386 my $top = int $self->{children}[1]{range}[0]; 2576 my $top = int $self->{children}[1]{range}[0];
2387 2577
2388 my $y0 = $top; 2578 my $y0 = $top;
… …
2423sub _draw { 2613sub _draw {
2424 my ($self) = @_; 2614 my ($self) = @_;
2425 2615
2426 glEnable GL_TEXTURE_2D; 2616 glEnable GL_TEXTURE_2D;
2427 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2428 glColor 1, 1, 1, 1; 2618 glColor 0, 0, 0, 1;
2429 $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});
2430 glDisable GL_TEXTURE_2D; 2620 glDisable GL_TEXTURE_2D;
2431 2621
2432 $self->{children}[1]->draw; 2622 $self->{children}[1]->draw;
2433 2623
2434} 2624}
… …
2483 2673
2484sub new { 2674sub new {
2485 my $class = shift; 2675 my $class = shift;
2486 2676
2487 my $self = $class->SUPER::new ( 2677 my $self = $class->SUPER::new (
2488 state => 0, 2678 state => 0,
2489 connect_activate => \&toggle_flopper, 2679 on_activate => \&toggle_flopper,
2490 @_ 2680 @_
2491 ); 2681 );
2492 2682
2493 if ($self->{state}) {
2494 $self->{state} = 0;
2495 $self->toggle_flopper;
2496 }
2497
2498 $self 2683 $self
2499} 2684}
2500 2685
2501sub toggle_flopper { 2686sub toggle_flopper {
2502 my ($self) = @_; 2687 my ($self) = @_;
2503 2688
2504 # TODO: use animation 2689 $self->{other}->toggle_visibility;
2505 if ($self->{state} = !$self->{state}) {
2506 $CFClient::UI::ROOT->add ($self->{other});
2507 $self->{other}->move ($self->coord2global (0, $self->{h}));
2508 $self->emit ("open");
2509 } else {
2510 $CFClient::UI::ROOT->remove ($self->{other});
2511 $self->emit ("close");
2512 }
2513
2514 $self->emit (changed => $self->{state});
2515} 2690}
2516 2691
2517############################################################################# 2692#############################################################################
2518 2693
2519package CFClient::UI::Tooltip; 2694package CFClient::UI::Tooltip;
… …
2532} 2707}
2533 2708
2534sub set_tooltip_from { 2709sub set_tooltip_from {
2535 my ($self, $widget) = @_; 2710 my ($self, $widget) = @_;
2536 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
2537 $self->add (new CFClient::UI::Label 2721 $self->add (new CFClient::UI::Label
2538 markup => $widget->{tooltip}, 2722 markup => $tooltip,
2539 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2540 fontsize => 0.8, 2724 fontsize => 0.8,
2541 fg => [0, 0, 0, 1], 2725 fg => [0, 0, 0, 1],
2542 ellipsise => 0, 2726 ellipsise => 0,
2543 font => ($widget->{tooltip_font} || $::FONT_PROP), 2727 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2554 2738
2555sub size_allocate { 2739sub size_allocate {
2556 my ($self, $w, $h) = @_; 2740 my ($self, $w, $h) = @_;
2557 2741
2558 $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 });
2559} 2761}
2560 2762
2561sub _draw { 2763sub _draw {
2562 my ($self) = @_; 2764 my ($self) = @_;
2563 2765
… …
2580 glVertex $w, $h; 2782 glVertex $w, $h;
2581 glVertex $w, 0; 2783 glVertex $w, 0;
2582 glEnd; 2784 glEnd;
2583 2785
2584 glTranslate 2 - 0.375, 2 - 0.375; 2786 glTranslate 2 - 0.375, 2 - 0.375;
2787
2585 $self->SUPER::_draw; 2788 $self->SUPER::_draw;
2586} 2789}
2587 2790
2588############################################################################# 2791#############################################################################
2589 2792
… …
2595 2798
2596sub new { 2799sub new {
2597 my $class = shift; 2800 my $class = shift;
2598 2801
2599 my $self = $class->SUPER::new ( 2802 my $self = $class->SUPER::new (
2600 aspect => 1, 2803 aspect => 1,
2804 can_events => 0,
2601 @_, 2805 @_,
2602 ); 2806 );
2603 2807
2604 if ($self->{anim} && $self->{animspeed}) { 2808 if ($self->{anim} && $self->{animspeed}) {
2605 Scalar::Util::weaken (my $widget = $self); 2809 Scalar::Util::weaken (my $widget = $self);
… …
2647 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2648 2852
2649 if ($tex) { 2853 if ($tex) {
2650 glEnable GL_TEXTURE_2D; 2854 glEnable GL_TEXTURE_2D;
2651 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2652 glColor 1, 1, 1, 1; 2856 glColor 0, 0, 0, 1;
2653 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2654 glDisable GL_TEXTURE_2D; 2858 glDisable GL_TEXTURE_2D;
2655 } 2859 }
2656} 2860}
2657 2861
… …
2664 $self->SUPER::DESTROY; 2868 $self->SUPER::DESTROY;
2665} 2869}
2666 2870
2667############################################################################# 2871#############################################################################
2668 2872
2669package CFClient::UI::InventoryItem; 2873package CFClient::UI::Buttonbar;
2670 2874
2671our @ISA = CFClient::UI::HBox::; 2875our @ISA = CFClient::UI::HBox::;
2672 2876
2673sub _item_to_desc { 2877# TODO: should actualyl wrap buttons and other goodies.
2674 my ($item) = @_;
2675
2676 my $desc =
2677 $item->{nrof} < 2
2678 ? $item->{name}
2679 : "$item->{nrof} × $item->{name_pl}";
2680
2681 $item->{flags} & Crossfire::Protocol::F_OPEN
2682 and $desc .= " (open)";
2683 $item->{flags} & Crossfire::Protocol::F_APPLIED
2684 and $desc .= " (applied)";
2685 $item->{flags} & Crossfire::Protocol::F_UNPAID
2686 and $desc .= " (unpaid)";
2687 $item->{flags} & Crossfire::Protocol::F_MAGIC
2688 and $desc .= " (magic)";
2689 $item->{flags} & Crossfire::Protocol::F_CURSED
2690 and $desc .= " (cursed)";
2691 $item->{flags} & Crossfire::Protocol::F_DAMNED
2692 and $desc .= " (damned)";
2693 $item->{flags} & Crossfire::Protocol::F_LOCKED
2694 and $desc .= " *";
2695
2696 $desc
2697}
2698
2699sub new {
2700 my $class = shift;
2701
2702 my %args = @_;
2703
2704 my $item = delete $args{item};
2705
2706 my $desc = _item_to_desc ($item);
2707
2708 my $self = $class->SUPER::new (
2709 can_hover => 1,
2710 can_events => 1,
2711 tooltip => ((CFClient::UI::Label::escape $desc)
2712 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2713 connect_button_down => sub {
2714 my ($self, $ev, $x, $y) = @_;
2715
2716 # todo: maybe put examine on 1? but should just be a tooltip :(
2717 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2718 my $targ = $::CONN->{player}{tag};
2719
2720 if ($item->{container} == $::CONN->{player}{tag}) {
2721 $targ = $main::OPENCONT;
2722 }
2723
2724 $::CONN->send ("move $targ $item->{tag} 0");
2725 } elsif ($ev->{button} == 1) {
2726 $::CONN->send ("examine $item->{tag}");
2727 } elsif ($ev->{button} == 2) {
2728 $::CONN->send ("apply $item->{tag}");
2729 } elsif ($ev->{button} == 3) {
2730 my @menu_items = (
2731 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2732 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2733 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2734 (
2735 $item->{flags} & Crossfire::Protocol::F_LOCKED
2736 ? (
2737 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2738 )
2739 : (
2740 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2741 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2742 )
2743 ),
2744 );
2745
2746 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2747 }
2748
2749 1
2750 },
2751 %args
2752 );
2753
2754
2755 $self->add (new CFClient::UI::Face
2756 can_events => 0,
2757 face => $item->{face},
2758 anim => $item->{anim},
2759 animspeed => $item->{animspeed},
2760 );
2761
2762 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2763
2764 $self->{item} = $item;
2765
2766 $self->update_item;
2767
2768 $self
2769}
2770
2771sub update_item {
2772 my ($self) = @_;
2773
2774 my $desc = _item_to_desc ($self->{item});
2775
2776 $self->{name_lbl}->set_text ($desc);
2777}
2778
2779#############################################################################
2780
2781package CFClient::UI::Inventory;
2782
2783our @ISA = CFClient::UI::ScrolledWindow::;
2784
2785sub new {
2786 my $class = shift;
2787
2788 my $self = $class->SUPER::new (
2789 scrolled => (new CFClient::UI::Table),
2790 @_,
2791 );
2792
2793 $self
2794}
2795
2796sub set_items {
2797 my ($self, $items) = @_;
2798
2799 $self->{scrolled}->clear;
2800 return unless $items;
2801
2802 my @items = sort {
2803 ($a->{type} <=> $b->{type})
2804 or ($a->{name} cmp $b->{name})
2805 } @$items;
2806
2807 $self->{real_items} = \@items;
2808
2809 for my $item (@items) {
2810 $item->{item} = $item;
2811 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2812 $item->update_item ();
2813 }
2814
2815 my $i = 0;
2816 for (@items) {
2817 $self->{scrolled}->add (0, $i, $_);
2818 my $nrof = $_->{item}->{nrof} || 1;
2819 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2820 }
2821
2822# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2823}
2824
2825sub size_request {
2826 my ($self) = @_;
2827 ($self->{req_w}, $self->{req_h});
2828}
2829 2878
2830############################################################################# 2879#############################################################################
2831 2880
2832package CFClient::UI::Menu; 2881package CFClient::UI::Menu;
2833 2882
… …
2867 2916
2868# 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)
2869sub popup { 2918sub popup {
2870 my ($self, $ev) = @_; 2919 my ($self, $ev) = @_;
2871 2920
2872 $self->emit ("popdown"); 2921 $self->_emit ("popdown");
2873 2922
2874 # maybe save $GRAB? must be careful about events... 2923 # maybe save $GRAB? must be careful about events...
2875 $GRAB = $self; 2924 $GRAB = $self;
2876 $self->{button} = $ev->{button}; 2925 $self->{button} = $ev->{button};
2877 2926
2878 $self->show; 2927 $self->show;
2879 $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);
2880} 2929}
2881 2930
2882sub mouse_motion { 2931sub mouse_motion {
2883 my ($self, $ev, $x, $y) = @_; 2932 my ($self, $ev, $x, $y) = @_;
2884 2933
2885 # TODO: should use vbox->find_widget or so 2934 # TODO: should use vbox->find_widget or so
2886 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2887 $self->{hover} = $self->{item}{$HOVER}; 2936 $self->{hover} = $self->{item}{$HOVER};
2937
2938 0
2888} 2939}
2889 2940
2890sub button_up { 2941sub button_up {
2891 my ($self, $ev, $x, $y) = @_; 2942 my ($self, $ev, $x, $y) = @_;
2892 2943
2893 if ($ev->{button} == $self->{button}) { 2944 if ($ev->{button} == $self->{button}) {
2894 undef $GRAB; 2945 undef $GRAB;
2895 $self->hide; 2946 $self->hide;
2896 2947
2897 $self->emit ("popdown"); 2948 $self->_emit ("popdown");
2898 $self->{hover}[1]->() if $self->{hover}; 2949 $self->{hover}[1]->() if $self->{hover};
2950 } else {
2951 return 0
2952 }
2953
2899 } 2954 1
2900} 2955}
2901 2956
2902############################################################################# 2957#############################################################################
2903 2958
2904package CFClient::UI::Statusbox; 2959package CFClient::UI::Multiplexer;
2905 2960
2906our @ISA = CFClient::UI::VBox::; 2961our @ISA = CFClient::UI::Container::;
2907 2962
2908sub new { 2963sub new {
2909 my $class = shift; 2964 my $class = shift;
2910 2965
2911 $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 (
2912 fontsize => 0.8, 3075 fontsize => 0.8,
2913 @_, 3076 @_,
2914 ) 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
2915} 3087}
2916 3088
2917sub reorder { 3089sub reorder {
2918 my ($self) = @_; 3090 my ($self) = @_;
2919 my $NOW = time; 3091 my $NOW = Time::HiRes::time;
2920 3092
2921 while (my ($k, $v) = each %{ $self->{item} }) { 3093 while (my ($k, $v) = each %{ $self->{item} }) {
2922 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3094 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2923 } 3095 }
2924 3096
… …
2926 3098
2927 my @items = sort { 3099 my @items = sort {
2928 $a->{pri} <=> $b->{pri} 3100 $a->{pri} <=> $b->{pri}
2929 or $b->{id} <=> $a->{id} 3101 or $b->{id} <=> $a->{id}
2930 } values %{ $self->{item} }; 3102 } values %{ $self->{item} };
3103
3104 $self->{timer}->interval (1);
2931 3105
2932 my $count = 10 + 1; 3106 my $count = 10 + 1;
2933 for my $item (@items) { 3107 for my $item (@items) {
2934 last unless --$count; 3108 last unless --$count;
2935 3109
… …
2950 tooltip_font => $::FONT_PROP, 3124 tooltip_font => $::FONT_PROP,
2951 tooltip_width => 0.67, 3125 tooltip_width => 0.67,
2952 fontsize => $item->{fontsize} || $self->{fontsize}, 3126 fontsize => $item->{fontsize} || $self->{fontsize},
2953 max_w => $::WIDTH * 0.44, 3127 max_w => $::WIDTH * 0.44,
2954 fg => $item->{fg}, 3128 fg => $item->{fg},
3129 orig_alpha => $item->{fg}[3] || 1,
2955 can_events => 1, 3130 can_events => 1,
2956 can_hover => 1 3131 can_hover => 1
2957 }; 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 }
2958 } 3143 }
2959 3144
2960 $self->clear; 3145 $self->clear;
2961 $self->SUPER::add (reverse @widgets); 3146 $self->SUPER::add (reverse @widgets);
2962} 3147}
… …
2965 my ($self, $text, %arg) = @_; 3150 my ($self, $text, %arg) = @_;
2966 3151
2967 $text =~ s/^\s+//; 3152 $text =~ s/^\s+//;
2968 $text =~ s/\s+$//; 3153 $text =~ s/\s+$//;
2969 3154
3155 return unless $text;
3156
2970 my $timeout = time + ((delete $arg{timeout}) || 60); 3157 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2971 3158
2972 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3159 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2973 3160
2974 if (my $item = $self->{item}{$group}) { 3161 if (my $item = $self->{item}{$group}) {
2975 if ($item->{text} eq $text) { 3162 if ($item->{text} eq $text) {
… …
3005 3192
3006 $self->reorder; 3193 $self->reorder;
3007 $self->SUPER::reconfigure; 3194 $self->SUPER::reconfigure;
3008} 3195}
3009 3196
3197sub DESTROY {
3198 my ($self) = @_;
3199
3200 $self->{timer}->cancel;
3201
3202 $self->SUPER::DESTROY;
3203}
3204
3010############################################################################# 3205#############################################################################
3011 3206
3012package CFClient::UI::Root; 3207package CFClient::UI::Inventory;
3013 3208
3014our @ISA = CFClient::UI::Container::; 3209our @ISA = CFClient::UI::ScrolledWindow::;
3015
3016use CFClient::OpenGL;
3017 3210
3018sub new { 3211sub new {
3019 my $class = shift; 3212 my $class = shift;
3020 3213
3021 $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 => [],
3022 @_, 3456 @_,
3023 ) 3457 )
3024} 3458}
3025 3459
3026sub configure { 3460# XXX: Do sorting? Argl...
3027 my ($self, $x, $y, $w, $h) = @_; 3461sub add_spell {
3028
3029 $self->{w} = $w;
3030 $self->{h} = $h;
3031}
3032
3033sub check_size {
3034 my ($self) = @_; 3462 my ($self, $spell) = @_;
3463 $self->{spells}->{$spell->{name}} = $spell;
3035 3464
3036 $self->size_allocate ($self->{w}, $self->{h}) 3465 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3037 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
3038} 3521}
3039 3522
3040sub size_request { 3523sub size_request {
3041 my ($self) = @_; 3524 my ($self) = @_;
3042 3525
3043 ($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
3044} 3541}
3045 3542
3046sub size_allocate { 3543sub size_allocate {
3047 my ($self, $w, $h) = @_; 3544 my ($self, $w, $h) = @_;
3048 3545
3049 my $old_w = $self->{old_w}; $self->{old_w} = $w;
3050 my $old_h = $self->{old_h}; $self->{old_h} = $h;
3051
3052 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
3053 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
3054
3055 for my $child ($self->children) { 3546 for my $child ($self->children) {
3056 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)};
3057 3548
3058 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3549 $X = $child->{force_x} if exists $child->{force_x};
3059 if exists $child->{req_x}; 3550 $Y = $child->{force_y} if exists $child->{force_y};
3060 3551
3061 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3552 $X = _to_pixel $X, $W, $self->{w};
3062 if exists $child->{req_y}; 3553 $Y = _to_pixel $Y, $H, $self->{h};
3063
3064 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3065 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3066 3554
3067 $child->configure ($X, $Y, $W, $H); 3555 $child->configure ($X, $Y, $W, $H);
3068 } 3556 }
3069} 3557}
3070 3558
… …
3081} 3569}
3082 3570
3083sub update { 3571sub update {
3084 my ($self) = @_; 3572 my ($self) = @_;
3085 3573
3086 $self->check_size;
3087 $::WANT_REFRESH++; 3574 $::WANT_REFRESH++;
3088} 3575}
3089 3576
3090sub add { 3577sub add {
3091 my ($self, @children) = @_; 3578 my ($self, @children) = @_;
3092 3579
3093 for my $child (@children) {
3094 $child->{toplevel} = 1; 3580 $_->{is_toplevel} = 1
3095 3581 for @children;
3096 # integerise window positions
3097 $child->{x} = int $child->{x};
3098 $child->{y} = int $child->{y};
3099 }
3100 3582
3101 $self->SUPER::add (@children); 3583 $self->SUPER::add (@children);
3584}
3585
3586sub remove {
3587 my ($self, @children) = @_;
3588
3589 $self->SUPER::remove (@children);
3590
3591 delete $self->{is_toplevel}
3592 for @children;
3102 3593
3103 while (@children) { 3594 while (@children) {
3104 my $w = pop @children; 3595 my $w = pop @children;
3105 push @children, $w->children; 3596 push @children, $w->children;
3106 $w->{visible} = 1; 3597 $w->set_invisible;
3107 }
3108}
3109
3110sub remove {
3111 my ($self, @children) = @_;
3112
3113 $self->SUPER::remove (@children);
3114
3115 while (@children) {
3116 my $w = pop @children;
3117 push @children, $w->children;
3118 delete $w->{visible};
3119 } 3598 }
3120} 3599}
3121 3600
3122sub on_refresh { 3601sub on_refresh {
3123 my ($self, $id, $cb) = @_; 3602 my ($self, $id, $cb) = @_;
… …
3137 while ($self->{refresh_hook}) { 3616 while ($self->{refresh_hook}) {
3138 $_->() 3617 $_->()
3139 for values %{delete $self->{refresh_hook}}; 3618 for values %{delete $self->{refresh_hook}};
3140 } 3619 }
3141 3620
3142 if ($self->{check_size}) { 3621 if ($self->{realloc}) {
3143 my @queue = ([], []); 3622 my %queue;
3623 my @queue;
3624 my $widget;
3144 3625
3145 for (;;) { 3626 outer:
3146 if ($self->{check_size}) { 3627 while () {
3147 # heuristic: check containers last 3628 if (my $realloc = delete $self->{realloc}) {
3148 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3629 for $widget (values %$realloc) {
3149 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 }
3150 } 3636 }
3151 3637
3152 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3638 while () {
3639 @queue or last outer;
3153 3640
3154 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3641 $widget = pop @{ $queue[-1] || [] }
3155 ? @$widget{qw(user_w user_h)} 3642 and last;
3156 : $widget->size_request;
3157
3158 if (delete $widget->{force_alloc}
3159 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3160 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3161 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}) {
3162 $widget->{req_w} = $w; 3662 $widget->{req_w} = $w;
3163 $widget->{req_h} = $h; 3663 $widget->{req_h} = $h;
3164 3664
3165 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3665 $self->{size_alloc}{$widget+0} = $widget;
3166 3666
3167 $widget->{parent}->check_size
3168 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 }
3169 } 3674 }
3675
3676 delete $self->{realloc}{$widget+0};
3170 } 3677 }
3171 } 3678 }
3172 3679
3173 while ($self->{size_alloc}) { 3680 while (my $size_alloc = delete $self->{size_alloc}) {
3174 for (values %{delete $self->{size_alloc}}) { 3681 my @queue = sort { $b->{visible} <=> $a->{visible} }
3175 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)};
3176 3688
3177 $w = 0 if $w < 0; 3689 $w = 0 if $w < 0;
3178 $h = 0 if $h < 0; 3690 $h = 0 if $h < 0;
3179 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
3180 $widget->{w} = $w; 3699 $widget->{w} = $w;
3181 $widget->{h} = $h; 3700 $widget->{h} = $h;
3182 $widget->size_allocate ($w, $h); 3701
3183 $widget->emit (size_allocate => $w, $h); 3702 $widget->emit (size_allocate => $w, $h);
3703 }
3184 } 3704 }
3185 } 3705 }
3186 3706
3187 while ($self->{post_alloc_hook}) { 3707 while ($self->{post_alloc_hook}) {
3188 $_->() 3708 $_->()
3189 for values %{delete $self->{post_alloc_hook}}; 3709 for values %{delete $self->{post_alloc_hook}};
3190 } 3710 }
3711
3191 3712
3192 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3713 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3193 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3714 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3194 glClear GL_COLOR_BUFFER_BIT; 3715 glClear GL_COLOR_BUFFER_BIT;
3195 3716
… …
3197 glLoadIdentity; 3718 glLoadIdentity;
3198 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3719 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3199 glMatrixMode GL_MODELVIEW; 3720 glMatrixMode GL_MODELVIEW;
3200 glLoadIdentity; 3721 glLoadIdentity;
3201 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
3202 $self->_draw; 3730 $self->_draw;
3203} 3731}
3204 3732
3205############################################################################# 3733#############################################################################
3206 3734

Diff Legend

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