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.215 by root, Fri May 19 03:49:48 2006 UTC vs.
Revision 1.276 by root, Sun Jun 4 00:16:01 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) = @_;
… …
136 $rem += $_ - $i; 149 $rem += $_ - $i;
137 $_ = $i; 150 $_ = $i;
138 } 151 }
139} 152}
140 153
154sub full_refresh {
155 # make a copy, otherwise for complains about freed values.
156 my @widgets = values %WIDGET;
157
158 $_->update
159 for @widgets;
160}
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
141# call when resolution changes etc. 170# call when resolution changes etc.
142sub rescale_widgets { 171sub rescale_widgets {
143 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
144 173
145 # make a copy, otherwise for complains about freed values.
146 my @widgets = values %WIDGET; 174 for my $widget (values %WIDGET) {
147
148 for my $widget (@widgets) {
149 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
150 $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.]+$/;
151 $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};
152 $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};
153 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
154 $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.]+$/;
155 $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};
156 $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};
157 $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
158 } 189 }
159
160 $widget->reconfigure;
161 } 190 }
191
192 reconfigure_widgets;
162} 193}
163 194
164############################################################################# 195#############################################################################
165 196
166package CFClient::UI::Base; 197package CFClient::UI::Base;
… …
171 202
172sub new { 203sub new {
173 my $class = shift; 204 my $class = shift;
174 205
175 my $self = bless { 206 my $self = bless {
176 x => 0, 207 x => "center",
177 y => 0, 208 y => "center",
178 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
179 can_events => 1, 212 can_events => 1,
180 @_ 213 @_
181 }, $class; 214 }, $class;
182 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
183 for (keys %$self) { 218 for (keys %$self) {
184 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
185 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
186 } 221 }
187 } 222 }
188 223
189 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 }
190 235
191 $self 236 $self
192} 237}
193 238
194sub destroy { 239sub destroy {
… …
204 return if $self->{parent}; 249 return if $self->{parent};
205 250
206 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
207} 252}
208 253
209sub hide { 254sub set_visible {
210 my ($self) = @_; 255 my ($self) = @_;
256
257 return if $self->{visible};
258
259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
261
262 $self->emit (visibility_change => 1);
263
264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
267}
268
269sub set_invisible {
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};
211 278
212 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
213 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
214 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
215 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
216 if $self->{parent}; 313 if $self->{parent};
217} 314}
218 315
219sub move { 316sub move_abs {
220 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
221 318
222 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
223 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
224 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
225 322
226 $self->update; 323 $self->update;
227} 324}
228 325
229sub set_size { 326sub set_size {
230 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
231 328
232 $self->{user_w} = $w; 329 $self->{force_w} = $w;
233 $self->{user_h} = $h; 330 $self->{force_h} = $h;
234 331
235 $self->check_size; 332 $self->realloc;
236} 333}
237 334
238sub size_request { 335sub size_request {
239 require Carp; 336 require Carp;
240 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
242 339
243sub configure { 340sub configure {
244 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
245 342
246 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
247 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
248 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
249 348
250 # use alignment to adjust x, y 349 # use alignment to adjust x, y
251 350
252 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
253 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
254
255 ($w, $h) = ($w2, $h2);
256 } 353 }
257 354
258 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
259 $self->{x} = $x; 356 $self->{x} = $x;
260 $self->{y} = $y; 357 $self->{y} = $y;
261 $self->update; 358 $self->update;
262 } 359 }
263 360
264 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
265 $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;
266 } 368 }
267} 369}
268 370
269sub size_allocate { 371sub size_allocate {
270 # nothing to be done 372 # nothing to be done
271} 373}
272 374
273sub reconfigure {
274 my ($self) = @_;
275
276 $self->check_size (1);
277 $self->update;
278}
279
280sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
281} 381}
282 382
283sub set_max_size { 383sub set_max_size {
284 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
285 385
… …
287 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
288} 388}
289 389
290sub set_tooltip { 390sub set_tooltip {
291 my ($self, $tooltip) = @_; 391 my ($self, $tooltip) = @_;
392
393 $tooltip =~ s/^\s+//;
394 $tooltip =~ s/\s+$//;
395
396 return if $self->{tooltip} eq $tooltip;
292 397
293 $self->{tooltip} = $tooltip; 398 $self->{tooltip} = $tooltip;
294 399
295 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 400 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296 delete $CFClient::UI::TOOLTIP->{owner}; 401 delete $CFClient::UI::TOOLTIP->{owner};
… …
318 return if $FOCUS == $self; 423 return if $FOCUS == $self;
319 return unless $self->{can_focus}; 424 return unless $self->{can_focus};
320 425
321 my $focus = $FOCUS; $FOCUS = $self; 426 my $focus = $FOCUS; $FOCUS = $self;
322 427
323 $self->emit (focus_in => $focus); 428 $self->_emit (focus_in => $focus);
324 429
325 $focus->update if $focus; 430 $focus->update if $focus;
326 $FOCUS->update; 431 $FOCUS->update;
327} 432}
328 433
… …
331 436
332 return unless $FOCUS == $self; 437 return unless $FOCUS == $self;
333 438
334 my $focus = $FOCUS; undef $FOCUS; 439 my $focus = $FOCUS; undef $FOCUS;
335 440
336 $self->emit (focus_out => $focus); 441 $self->_emit (focus_out => $focus);
337 442
338 $focus->update if $focus; #? 443 $focus->update if $focus; #?
339}
340 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447}
448
341sub mouse_motion { } 449sub mouse_motion { 0 }
342sub button_up { } 450sub button_up { 0 }
343sub key_down { } 451sub key_down { 0 }
344sub key_up { } 452sub key_up { 0 }
345 453
346sub button_down { 454sub button_down {
347 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
348 456
349 $self->focus_in; 457 $self->focus_in;
350}
351 458
352sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
353sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
354sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
355sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
356sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 463 my ($self, $x, $y) = @_;
464
465 return () unless $self->{can_events};
466
467 return $self
468 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
469 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
470
471 ()
472}
473
474sub set_parent {
475 my ($self, $parent) = @_;
476
477 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502}
503
504sub realloc {
505 my ($self) = @_;
506
507 if ($self->{visible}) {
508 return if $self->{root}{realloc}{$self+0};
509
510 $self->{root}{realloc}{$self+0} = $self;
511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
516}
517
518sub update {
519 my ($self) = @_;
520
521 $self->{parent}->update
522 if $self->{parent};
523}
524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
357 535
358sub draw { 536sub draw {
359 my ($self) = @_; 537 my ($self) = @_;
360 538
361 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
362 550
363 glPushMatrix; 551 glPushMatrix;
364 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
365 $self->_draw; 553 $self->_draw;
366 glPopMatrix; 554 glPopMatrix;
… …
378 glVertex $x , $y + $self->{h}; 566 glVertex $x , $y + $self->{h};
379 glEnd; 567 glEnd;
380 glDisable GL_BLEND; 568 glDisable GL_BLEND;
381 } 569 }
382 570
383 if ($ENV{PCLIENT_DEBUG}) { 571 if ($ENV{CFPLUS_DEBUG} & 1) {
384 glPushMatrix; 572 glPushMatrix;
385 glColor 1, 1, 0, 1; 573 glColor 1, 1, 0, 1;
386 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
387 glBegin GL_LINE_LOOP; 575 glBegin GL_LINE_LOOP;
388 glVertex 0 , 0; 576 glVertex 0 , 0;
389 glVertex $self->{w}, 0; 577 glVertex $self->{w} - 1, 0;
390 glVertex $self->{w}, $self->{h}; 578 glVertex $self->{w} - 1, $self->{h} - 1;
391 glVertex 0 , $self->{h}; 579 glVertex 0 , $self->{h} - 1;
392 glEnd; 580 glEnd;
393 glPopMatrix; 581 glPopMatrix;
394 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 582 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
395 } 583 }
396} 584}
397 585
398sub _draw { 586sub _draw {
399 my ($self) = @_; 587 my ($self) = @_;
400 588
401 warn "no draw defined for $self\n"; 589 warn "no draw defined for $self\n";
402}
403
404sub find_widget {
405 my ($self, $x, $y) = @_;
406
407 return () unless $self->{can_events};
408
409 return $self
410 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
411 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
412
413 ()
414}
415
416sub set_parent {
417 my ($self, $parent) = @_;
418
419 Scalar::Util::weaken ($self->{parent} = $parent);
420
421 # TODO: req_w _does_change after ->reconfigure
422 $self->check_size
423 unless exists $self->{req_w};
424}
425
426sub check_size {
427 my ($self, $forced) = @_;
428
429 $self->{force_alloc} = 1 if $forced;
430 $CFClient::UI::ROOT->{check_size}{$self} = $self;
431}
432
433sub update {
434 my ($self) = @_;
435
436 $self->{parent}->update
437 if $self->{parent};
438}
439
440sub connect {
441 my ($self, $signal, $cb) = @_;
442
443 push @{ $self->{signal_cb}{$signal} }, $cb;
444}
445
446sub emit {
447 my ($self, $signal, @args) = @_;
448
449 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
450} 590}
451 591
452sub DESTROY { 592sub DESTROY {
453 my ($self) = @_; 593 my ($self) = @_;
454 594
… …
512 my ($class, %arg) = @_; 652 my ($class, %arg) = @_;
513 $class->SUPER::new (can_events => 0, %arg); 653 $class->SUPER::new (can_events => 0, %arg);
514} 654}
515 655
516sub size_request { 656sub size_request {
517 (0, 0) 657 my ($self) = @_;
658
659 ($self->{w} + 0, $self->{h} + 0)
518} 660}
519 661
520sub draw { } 662sub draw { }
521 663
522############################################################################# 664#############################################################################
… …
526our @ISA = CFClient::UI::Base::; 668our @ISA = CFClient::UI::Base::;
527 669
528sub new { 670sub new {
529 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
530 672
531 my $children = delete $arg{children} || []; 673 my $children = delete $arg{children};
532 674
533 my $self = $class->SUPER::new ( 675 my $self = $class->SUPER::new (
534 children => [], 676 children => [],
535 can_events => 0, 677 can_events => 0,
536 %arg, 678 %arg,
537 ); 679 );
680
538 $self->add ($_) for @$children; 681 $self->add (@$children)
682 if $children;
539 683
540 $self 684 $self
541} 685}
542 686
543sub add { 687sub add {
… …
551 $self->{children} = [ 695 $self->{children} = [
552 sort { $a->{z} <=> $b->{z} } 696 sort { $a->{z} <=> $b->{z} }
553 @{$self->{children}}, @widgets 697 @{$self->{children}}, @widgets
554 ]; 698 ];
555 699
556 $self->check_size (1); 700 $self->realloc;
557 $self->update;
558} 701}
559 702
560sub children { 703sub children {
561 @{ $_[0]{children} } 704 @{ $_[0]{children} }
562} 705}
… …
567 delete $child->{parent}; 710 delete $child->{parent};
568 $child->hide; 711 $child->hide;
569 712
570 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 713 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
571 714
572 $self->check_size; 715 $self->realloc;
573 $self->update;
574} 716}
575 717
576sub clear { 718sub clear {
577 my ($self) = @_; 719 my ($self) = @_;
578 720
… …
582 for (@$children) { 724 for (@$children) {
583 delete $_->{parent}; 725 delete $_->{parent};
584 $_->hide; 726 $_->hide;
585 } 727 }
586 728
587 $self->check_size; 729 $self->realloc;
588 $self->update;
589} 730}
590 731
591sub find_widget { 732sub find_widget {
592 my ($self, $x, $y) = @_; 733 my ($self, $x, $y) = @_;
593 734
594 $x -= $self->{x}; 735 $x -= $self->{x};
595 $y -= $self->{y}; 736 $y -= $self->{y};
596 737
597 my $res; 738 my $res;
598 739
599 for (reverse @{ $self->{children} }) { 740 for (reverse $self->visible_children) {
600 $res = $_->find_widget ($x, $y) 741 $res = $_->find_widget ($x, $y)
601 and return $res; 742 and return $res;
602 } 743 }
603 744
604 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
653 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
654} 795}
655 796
656############################################################################# 797#############################################################################
657 798
799# back-buffered drawing area
800
658package CFClient::UI::Window; 801package CFClient::UI::Window;
659 802
660our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
661 804
662use CFClient::OpenGL; 805use CFClient::OpenGL;
… …
680 $self->SUPER::size_allocate ($w, $h); 823 $self->SUPER::size_allocate ($w, $h);
681 $self->update; 824 $self->update;
682} 825}
683 826
684sub _render { 827sub _render {
828 my ($self) = @_;
829
685 $_[0]{children}[0]->draw; 830 $self->{children}[0]->draw;
686} 831}
687 832
688sub render_child { 833sub render_child {
689 my ($self) = @_; 834 my ($self) = @_;
690 835
691 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 836 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
692 glClearColor 0.5, 0.5, 0.5, 1; 837 glClearColor 0, 0, 0, 0;
693 glClear GL_COLOR_BUFFER_BIT; 838 glClear GL_COLOR_BUFFER_BIT;
839
840 {
841 package CFClient::UI::Base;
842
843 ($draw_x, $draw_y, $draw_w, $draw_h) =
844 (0, 0, $self->{w}, $self->{h});
845 }
694 846
695 $self->_render; 847 $self->_render;
696 }; 848 };
697} 849}
698 850
699sub _draw { 851sub _draw {
700 my ($self) = @_; 852 my ($self) = @_;
701 853
702 my ($w, $h) = ($self->w, $self->h); 854 my ($w, $h) = @$self{qw(w h)};
703 855
704 my $tex = $self->{texture} 856 my $tex = $self->{texture}
705 or return; 857 or return;
706 858
707 glEnable GL_TEXTURE_2D; 859 glEnable GL_TEXTURE_2D;
… …
717 869
718package CFClient::UI::ViewPort; 870package CFClient::UI::ViewPort;
719 871
720our @ISA = CFClient::UI::Window::; 872our @ISA = CFClient::UI::Window::;
721 873
874sub new {
875 my $class = shift;
876
877 $class->SUPER::new (
878 scroll_x => 0,
879 scroll_y => 1,
880 @_,
881 )
882}
883
722sub size_request { 884sub size_request {
723 my ($self) = @_; 885 my ($self) = @_;
724 886
725 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 887 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
727 888
728 @$self{qw(child_w child_h)} 889 $w = 10 if $self->{scroll_x};
890 $h = 10 if $self->{scroll_y};
891
892 ($w, $h)
729} 893}
730 894
731sub size_allocate { 895sub size_allocate {
732 my ($self, $w, $h) = @_; 896 my ($self, $w, $h) = @_;
733 897
898 my $child = $self->child;
899
900 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
901 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
902
903 $self->child->configure (0, 0, $w, $h);
734 $self->update; 904 $self->update;
735} 905}
736 906
737sub set_offset { 907sub set_offset {
738 my ($self, $x, $y) = @_; 908 my ($self, $x, $y) = @_;
… …
772} 942}
773 943
774sub _render { 944sub _render {
775 my ($self) = @_; 945 my ($self) = @_;
776 946
947 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
948 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
949
777 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
778 951
779 $self->SUPER::_render; 952 $self->SUPER::_render;
780} 953}
781 954
… …
784package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
785 958
786our @ISA = CFClient::UI::HBox::; 959our @ISA = CFClient::UI::HBox::;
787 960
788sub new { 961sub new {
789 my $class = shift; 962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
790 965
791 my $self; 966 my $self;
792 967
793 my $slider = new CFClient::UI::Slider 968 my $slider = new CFClient::UI::Slider
794 vertical => 1, 969 vertical => 1,
795 range => [0, 0, 1, 0.01], # HACK fix 970 range => [0, 0, 1, 0.01], # HACK fix
796 connect_changed => sub { 971 on_changed => sub {
797 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 972 $self->{vp}->set_offset (0, $_[1]);
798 }, 973 },
799 ; 974 ;
800 975
801 $self = $class->SUPER::new ( 976 $self = $class->SUPER::new (
802 vp => (new CFClient::UI::ViewPort), 977 vp => (new CFClient::UI::ViewPort expand => 1),
803 slider => $slider, 978 slider => $slider,
804 @_, 979 %arg,
805 ); 980 );
806 981
807 $self->{vp}->add ($self->{scrolled});
808 $self->add ($self->{vp});
809 $self->add ($self->{slider}); 982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
810 984
811 $self 985 $self
986}
987
988sub add {
989 my ($self, $widget) = @_;
990
991 $self->{vp}->add ($self->{child} = $widget);
992}
993
994sub update {
995 my ($self) = @_;
996
997 $self->SUPER::update;
998
999 # todo: overwrite size_allocate of child
1000 my $child = $self->{vp}->child;
1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1002}
1003
1004sub size_allocate {
1005 my ($self, $w, $h) = @_;
1006
1007 $self->SUPER::size_allocate ($w, $h);
1008
1009 my $child = $self->{vp}->child;
1010 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
812} 1011}
813 1012
814#TODO# update range on size_allocate depending on child 1013#TODO# update range on size_allocate depending on child
815# update viewport offset on scroll 1014# update viewport offset on scroll
816 1015
… …
860 1059
861our @ISA = CFClient::UI::Bin::; 1060our @ISA = CFClient::UI::Bin::;
862 1061
863use CFClient::OpenGL; 1062use CFClient::OpenGL;
864 1063
865my @tex = 1064my $bg =
1065 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1066 mipmap => 1, wrap => 1;
1067
1068my @border =
866 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
867 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
868 1071
869sub new { 1072sub new {
870 my $class = shift; 1073 my ($class, %arg) = @_;
871 1074
872 # TODO: user_x, user_y, overwrite moveto? 1075 my $title = delete $arg{title};
873 1076
874 my $self = $class->SUPER::new ( 1077 my $self = $class->SUPER::new (
875 bg => [1, 1, 1, 1], 1078 bg => [1, 1, 1, 1],
876 border_bg => [1, 1, 1, 1], 1079 border_bg => [1, 1, 1, 1],
877 border => 0.6, 1080 border => 0.6,
878 toplevel => 1,
879 can_events => 1, 1081 can_events => 1,
880 @_ 1082 min_w => 16,
1083 min_h => 16,
1084 %arg,
881 ); 1085 );
882 1086
883 $self->{title} &&= new CFClient::UI::Label 1087 $self->{title} = new CFClient::UI::Label
884 align => 0, 1088 align => 0,
885 valign => 1, 1089 valign => 1,
886 text => $self->{title}, 1090 text => $title,
887 fontsize => $self->{border}; 1091 fontsize => $self->{border}
1092 if defined $title;
888 1093
889 $self 1094 $self
1095}
1096
1097sub add {
1098 my ($self, @widgets) = @_;
1099
1100 $self->SUPER::add (@widgets);
1101 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
890} 1102}
891 1103
892sub border { 1104sub border {
893 int $_[0]{border} * $::FONTSIZE 1105 int $_[0]{border} * $::FONTSIZE
894} 1106}
895 1107
896sub size_request { 1108sub size_request {
897 my ($self) = @_; 1109 my ($self) = @_;
1110
1111 $self->{title}->size_request
1112 if $self->{title};
898 1113
899 my ($w, $h) = $self->SUPER::size_request; 1114 my ($w, $h) = $self->SUPER::size_request;
900 1115
901 ( 1116 (
902 $w + $self->border * 2, 1117 $w + $self->border * 2,
… …
905} 1120}
906 1121
907sub size_allocate { 1122sub size_allocate {
908 my ($self, $w, $h) = @_; 1123 my ($self, $w, $h) = @_;
909 1124
1125 if ($self->{title}) {
1126 $self->{title}{w} = $w;
1127 $self->{title}{h} = $h;
1128 $self->{title}->size_allocate ($w, $h);
1129 }
1130
1131 my $border = $self->border;
1132
910 $h -= List::Util::max 0, $self->border * 2; 1133 $h -= List::Util::max 0, $border * 2;
911 $w -= List::Util::max 0, $self->border * 2; 1134 $w -= List::Util::max 0, $border * 2;
912 1135
913 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
914 if $self->{title};
915
916 $self->child->configure ($self->border, $self->border, $w, $h); 1136 $self->child->configure ($border, $border, $w, $h);
917} 1137}
918 1138
919sub button_down { 1139sub button_down {
920 my ($self, $ev, $x, $y) = @_; 1140 my ($self, $ev, $x, $y) = @_;
921 1141
… …
937 my ($ev, $x, $y) = @_; 1157 my ($ev, $x, $y) = @_;
938 1158
939 my $dx = $ev->{x} - $ox; 1159 my $dx = $ev->{x} - $ox;
940 my $dy = $ev->{y} - $oy; 1160 my $dy = $ev->{y} - $oy;
941 1161
942 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1162 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
943 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1163 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1164
1165 $self->realloc;
944 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
945 $self->check_size;
946 }; 1167 };
947 1168
948 } elsif ($lr ^ $td) { 1169 } elsif ($lr ^ $td) {
949 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1170 my ($ox, $oy) = ($ev->{x}, $ev->{y});
950 my ($bx, $by) = ($self->{x}, $self->{y}); 1171 my ($bx, $by) = ($self->{x}, $self->{y});
… …
952 $self->{motion} = sub { 1173 $self->{motion} = sub {
953 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
954 1175
955 ($x, $y) = ($ev->{x}, $ev->{y}); 1176 ($x, $y) = ($ev->{x}, $ev->{y});
956 1177
957 $self->move ($bx + $x - $ox, $by + $y - $oy); 1178 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
958 $self->update;
959 }; 1179 };
1180 } else {
1181 return 0;
1182 }
1183
960 } 1184 1
961} 1185}
962 1186
963sub button_up { 1187sub button_up {
964 my ($self, $ev, $x, $y) = @_; 1188 my ($self, $ev, $x, $y) = @_;
965 1189
966 delete $self->{motion}; 1190 !!delete $self->{motion}
967} 1191}
968 1192
969sub mouse_motion { 1193sub mouse_motion {
970 my ($self, $ev, $x, $y) = @_; 1194 my ($self, $ev, $x, $y) = @_;
971 1195
972 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1196 $self->{motion}->($ev, $x, $y) if $self->{motion};
1197
1198 !!$self->{motion}
973} 1199}
974 1200
975sub _draw { 1201sub _draw {
976 my ($self) = @_; 1202 my ($self) = @_;
977 1203
1204 my $child = $self->{children}[0];
1205
978 my ($w, $h ) = ($self->{w}, $self->{h}); 1206 my ($w, $h ) = ($self->{w}, $self->{h});
979 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1207 my ($cw, $ch) = ($child->{w}, $child->{h});
980 1208
981 glEnable GL_TEXTURE_2D; 1209 glEnable GL_TEXTURE_2D;
982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1210 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
983 1211
984 my $border = $self->border; 1212 my $border = $self->border;
985 1213
986 glColor @{ $self->{border_bg} }; 1214 glColor @{ $self->{border_bg} };
987 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1215 $border[0]->draw_quad_alpha (0, 0, $w, $border);
988 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1216 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
989 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1217 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
990 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1218 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
991 1219
992 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1220 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
993 my $bg = $tex[0]; 1221 glColor @{ $self->{bg} };
994 1222
995 # TODO: repeat texture not scale 1223 # TODO: repeat texture not scale
1224 # solve this better(?)
996 my $rep_x = $cw / $bg->{w}; 1225 $bg->{s} = $cw / $bg->{w};
997 my $rep_y = $ch / $bg->{h}; 1226 $bg->{t} = $ch / $bg->{h};
998
999 glColor @{ $self->{bg} };
1000
1001 $bg->{s} = $rep_x;
1002 $bg->{t} = $rep_y;
1003 $bg->{wrap_mode} = 1;
1004 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1227 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1005 } 1228 }
1006 1229
1007 glDisable GL_TEXTURE_2D; 1230 glDisable GL_TEXTURE_2D;
1008 1231
1009 $self->{title}->draw if $self->{title};
1010
1011 $self->child->draw; 1232 $child->draw;
1233
1234 if ($self->{title}) {
1235 glTranslate 0, $border - $self->{h};
1236 $self->{title}->_draw;
1237 }
1012} 1238}
1013 1239
1014############################################################################# 1240#############################################################################
1015 1241
1016package CFClient::UI::Table; 1242package CFClient::UI::Table;
… …
1024sub new { 1250sub new {
1025 my $class = shift; 1251 my $class = shift;
1026 1252
1027 $class->SUPER::new ( 1253 $class->SUPER::new (
1028 col_expand => [], 1254 col_expand => [],
1029 @_ 1255 @_,
1030 ) 1256 )
1257}
1258
1259sub children {
1260 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031} 1261}
1032 1262
1033sub add { 1263sub add {
1034 my ($self, $x, $y, $child) = @_; 1264 my ($self, $x, $y, $child) = @_;
1035 1265
1036 $child->set_parent ($self); 1266 $child->set_parent ($self);
1037 $self->{children}[$y][$x] = $child; 1267 $self->{children}[$y][$x] = $child;
1038 1268
1039 $child->check_size; 1269 $self->realloc;
1040} 1270}
1041 1271
1042sub children {
1043 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1044}
1045
1046# TODO: move to container class maybe? send childs a signal on removal? 1272# TODO: move to container class maybe? send children a signal on removal?
1047sub clear { 1273sub clear {
1048 my ($self) = @_; 1274 my ($self) = @_;
1049 1275
1050 my @children = $self->children; 1276 my @children = $self->children;
1051 delete $self->{children}; 1277 delete $self->{children};
… …
1053 for (@children) { 1279 for (@children) {
1054 delete $_->{parent}; 1280 delete $_->{parent};
1055 $_->hide; 1281 $_->hide;
1056 } 1282 }
1057 1283
1058 $self->update; 1284 $self->realloc;
1059} 1285}
1060 1286
1061sub get_wh { 1287sub get_wh {
1062 my ($self) = @_; 1288 my ($self) = @_;
1063 1289
… …
1094sub size_allocate { 1320sub size_allocate {
1095 my ($self, $w, $h) = @_; 1321 my ($self, $w, $h) = @_;
1096 1322
1097 my ($ws, $hs) = $self->get_wh; 1323 my ($ws, $hs) = $self->get_wh;
1098 1324
1099 my $req_w = sum @$ws; 1325 my $req_w = (sum @$ws) || 1;
1100 my $req_h = sum @$hs; 1326 my $req_h = (sum @$hs) || 1;
1101 1327
1102 # TODO: nicer code && do row_expand 1328 # TODO: nicer code && do row_expand
1103 my @col_expand = @{$self->{col_expand}}; 1329 my @col_expand = @{$self->{col_expand}};
1104 @col_expand = (1) x @$ws unless @col_expand; 1330 @col_expand = (1) x @$ws unless @col_expand;
1105 my $col_expand = (sum @col_expand) || 1; 1331 my $col_expand = (sum @col_expand) || 1;
… …
1159 } 1385 }
1160} 1386}
1161 1387
1162############################################################################# 1388#############################################################################
1163 1389
1164package CFClient::UI::HBox; 1390package CFClient::UI::Box;
1165
1166# TODO: wrap into common Box base class
1167 1391
1168our @ISA = CFClient::UI::Container::; 1392our @ISA = CFClient::UI::Container::;
1169 1393
1170sub size_request { 1394sub size_request {
1171 my ($self) = @_; 1395 my ($self) = @_;
1172 1396
1173 my @alloc = map [$_->size_request], @{$self->{children}}; 1397 $self->{vertical}
1174 1398 ? (
1175 ( 1399 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1176 (List::Util::sum map $_->[0], @alloc), 1400 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1177 (List::Util::max map $_->[1], @alloc), 1401 )
1178 ) 1402 : (
1403 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1404 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1405 )
1179} 1406}
1180 1407
1181sub size_allocate { 1408sub size_allocate {
1182 my ($self, $w, $h) = @_; 1409 my ($self, $w, $h) = @_;
1183 1410
1184 ($h, $w) = ($w, $h); 1411 my $space = $self->{vertical} ? $h : $w;
1185
1186 my $children = $self->{children}; 1412 my $children = $self->{children};
1187 1413
1188 my @h = map $_->{req_w}, @$children; 1414 my @req;
1189 1415
1190 my $req_h = List::Util::sum @h; 1416 if ($self->{homogeneous}) {
1191 1417 @req = ($space / (@$children || 1)) x @$children;
1192 if ($req_h > $h) {
1193 # ah well, not enough space
1194 $_ *= $h / $req_h for @h;
1195 } else { 1418 } else {
1419 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1420 my $req = List::Util::sum @req;
1421
1422 if ($req > $space) {
1423 # ah well, not enough space
1424 $_ *= $space / $req for @req;
1425 } else {
1196 my $exp = List::Util::sum map $_->{expand}, @$children; 1426 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1197 $exp ||= 1;
1198 1427
1428 $space = ($space - $req) / $expand; # remaining space to give away
1429
1430 $req[$_] += $space * $children->[$_]{expand}
1199 for (0 .. $#$children) { 1431 for 0 .. $#$children;
1200 my $child = $children->[$_];
1201
1202 my $alloc_h = $h[$_];
1203 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1204 $h[$_] = $alloc_h;
1205 } 1432 }
1206 } 1433 }
1207 1434
1208 CFClient::UI::harmonize \@h; 1435 CFClient::UI::harmonize \@req;
1209 1436
1210 my $y = 0; 1437 my $pos = 0;
1211 for (0 .. $#$children) { 1438 for (0 .. $#$children) {
1212 my $child = $children->[$_];
1213 my $h = $h[$_]; 1439 my $alloc = $req[$_];
1214 $child->configure ($y, 0, $h, $w); 1440 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1215 1441
1216 $y += $h; 1442 $pos += $alloc;
1217 } 1443 }
1218 1444
1219 1 1445 1
1220} 1446}
1221 1447
1222############################################################################# 1448#############################################################################
1223 1449
1450package CFClient::UI::HBox;
1451
1452our @ISA = CFClient::UI::Box::;
1453
1454sub new {
1455 my $class = shift;
1456
1457 $class->SUPER::new (
1458 vertical => 0,
1459 @_,
1460 )
1461}
1462
1463#############################################################################
1464
1224package CFClient::UI::VBox; 1465package CFClient::UI::VBox;
1225 1466
1226# TODO: wrap into common Box base class
1227
1228our @ISA = CFClient::UI::Container::; 1467our @ISA = CFClient::UI::Box::;
1229 1468
1230sub size_request { 1469sub new {
1231 my ($self) = @_; 1470 my $class = shift;
1232 1471
1233 my @alloc = map [$_->size_request], @{$self->{children}}; 1472 $class->SUPER::new (
1234 1473 vertical => 1,
1235 ( 1474 @_,
1236 (List::Util::max map $_->[0], @alloc),
1237 (List::Util::sum map $_->[1], @alloc),
1238 ) 1475 )
1239}
1240
1241sub size_allocate {
1242 my ($self, $w, $h) = @_;
1243
1244 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1245
1246 my $children = $self->{children};
1247
1248 my @h = map $_->{req_h}, @$children;
1249
1250 my $req_h = List::Util::sum @h;
1251
1252 if ($req_h > $h) {
1253 # ah well, not enough space
1254 $_ *= $h / $req_h for @h;
1255 } else {
1256 my $exp = List::Util::sum map $_->{expand}, @$children;
1257 $exp ||= 1;
1258
1259 for (0 .. $#$children) {
1260 my $child = $children->[$_];
1261
1262 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1263 }
1264 }
1265
1266 CFClient::UI::harmonize \@h;
1267
1268 my $y = 0;
1269 for (0 .. $#$children) {
1270 my $child = $children->[$_];
1271 my $h = $h[$_];
1272 $child->configure (0, $y, $w, $h);
1273
1274 $y += $h;
1275 }
1276
1277 1
1278} 1476}
1279 1477
1280############################################################################# 1478#############################################################################
1281 1479
1282package CFClient::UI::Label; 1480package CFClient::UI::Label;
… …
1299 ellipsise => 3, # end 1497 ellipsise => 3, # end
1300 layout => (new CFClient::Layout), 1498 layout => (new CFClient::Layout),
1301 fontsize => 1, 1499 fontsize => 1,
1302 align => -1, 1500 align => -1,
1303 valign => -1, 1501 valign => -1,
1304 padding => 2, 1502 padding_x => 2,
1503 padding_y => 2,
1305 can_events => 0, 1504 can_events => 0,
1306 %arg 1505 %arg
1307 ); 1506 );
1308 1507
1309 if (exists $self->{template}) { 1508 if (exists $self->{template}) {
… …
1345 $self->{text} = "T$text"; 1544 $self->{text} = "T$text";
1346 1545
1347 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1546 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1348 $self->{layout}->set_text ($text); 1547 $self->{layout}->set_text ($text);
1349 1548
1549 $self->realloc;
1350 $self->update; 1550 $self->update;
1351 $self->check_size;
1352} 1551}
1353 1552
1354sub set_markup { 1553sub set_markup {
1355 my ($self, $markup) = @_; 1554 my ($self, $markup) = @_;
1356 1555
… …
1360 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1559 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1361 1560
1362 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1561 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1363 $self->{layout}->set_markup ($markup); 1562 $self->{layout}->set_markup ($markup);
1364 1563
1564 $self->realloc;
1365 $self->update; 1565 $self->update;
1366 $self->check_size;
1367} 1566}
1368 1567
1369sub size_request { 1568sub size_request {
1370 my ($self) = @_; 1569 my ($self) = @_;
1371 1570
… …
1385 1584
1386 $w = List::Util::max $w, $w2; 1585 $w = List::Util::max $w, $w2;
1387 $h = List::Util::max $h, $h2; 1586 $h = List::Util::max $h, $h2;
1388 } 1587 }
1389 1588
1390 ( 1589 ($w, $h)
1391 $w + $self->{padding} * 2,
1392 $h + $self->{padding} * 2,
1393 )
1394} 1590}
1395 1591
1396sub size_allocate { 1592sub size_allocate {
1397 my ($self, $w, $h) = @_; 1593 my ($self, $w, $h) = @_;
1398 1594
1595 delete $self->{ox};
1596
1399 delete $self->{texture}; 1597 delete $self->{texture}
1598 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1400} 1599}
1401 1600
1402sub set_fontsize { 1601sub set_fontsize {
1403 my ($self, $fontsize) = @_; 1602 my ($self, $fontsize) = @_;
1404 1603
1405 $self->{fontsize} = $fontsize; 1604 $self->{fontsize} = $fontsize;
1406 delete $self->{texture}; 1605 delete $self->{texture};
1407 1606
1408 $self->update; 1607 $self->realloc;
1409 $self->check_size;
1410} 1608}
1411 1609
1412sub _draw { 1610sub _draw {
1413 my ($self) = @_; 1611 my ($self) = @_;
1414 1612
… …
1420 $self->{layout}->set_width ($self->{w}); 1618 $self->{layout}->set_width ($self->{w});
1421 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1619 $self->{layout}->set_ellipsise ($self->{ellipsise});
1422 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1620 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1423 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1621 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1424 1622
1425 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1623 new_from_layout CFClient::Texture $self->{layout}
1624 };
1426 1625
1626 unless (exists $self->{ox}) {
1427 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1627 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1428 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1628 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1429 : ($self->{w} - $tex->{w}) * 0.5); 1629 : ($self->{w} - $tex->{w}) * 0.5);
1430 1630
1431 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1631 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1432 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1632 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1433 : ($self->{h} - $tex->{h}) * 0.5); 1633 : ($self->{h} - $tex->{h}) * 0.5);
1434
1435 $tex
1436 }; 1634 };
1437 1635
1438 glEnable GL_TEXTURE_2D; 1636 glEnable GL_TEXTURE_2D;
1439 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1637 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1440 1638
… …
1466 active_fg => [0, 0, 0], 1664 active_fg => [0, 0, 0],
1467 can_hover => 1, 1665 can_hover => 1,
1468 can_focus => 1, 1666 can_focus => 1,
1469 valign => 0, 1667 valign => 0,
1470 can_events => 1, 1668 can_events => 1,
1669 #text => ...
1471 @_ 1670 @_
1472 ) 1671 )
1473} 1672}
1474 1673
1475sub _set_text { 1674sub _set_text {
… …
1477 1676
1478 delete $self->{cur_h}; 1677 delete $self->{cur_h};
1479 1678
1480 return if $self->{text} eq $text; 1679 return if $self->{text} eq $text;
1481 1680
1482 delete $self->{texture};
1483
1484 $self->{last_activity} = $::NOW; 1681 $self->{last_activity} = $::NOW;
1485 $self->{text} = $text; 1682 $self->{text} = $text;
1486 1683
1487 $text =~ s/./*/g if $self->{hidden}; 1684 $text =~ s/./*/g if $self->{hidden};
1488 $self->{layout}->set_text ("$text "); 1685 $self->{layout}->set_text ("$text ");
1489 1686
1490 $self->emit (changed => $self->{text}); 1687 $self->_emit (changed => $self->{text});
1688 $self->update;
1491} 1689}
1492 1690
1493sub set_text { 1691sub set_text {
1494 my ($self, $text) = @_; 1692 my ($self, $text) = @_;
1495 1693
1496 $self->{cursor} = length $text; 1694 $self->{cursor} = length $text;
1497 $self->_set_text ($text); 1695 $self->_set_text ($text);
1498 $self->update; 1696
1499 $self->check_size; 1697 $self->realloc;
1500} 1698}
1501 1699
1502sub get_text { 1700sub get_text {
1503 $_[0]{text} 1701 $_[0]{text}
1504} 1702}
… …
1507 my ($self) = @_; 1705 my ($self) = @_;
1508 1706
1509 my ($w, $h) = $self->SUPER::size_request; 1707 my ($w, $h) = $self->SUPER::size_request;
1510 1708
1511 ($w + 1, $h) # add 1 for cursor 1709 ($w + 1, $h) # add 1 for cursor
1512}
1513
1514sub size_allocate {
1515 my ($self, $w, $h) = @_;
1516
1517 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1518} 1710}
1519 1711
1520sub key_down { 1712sub key_down {
1521 my ($self, $ev) = @_; 1713 my ($self, $ev) = @_;
1522 1714
… …
1537 } elsif ($sym == CFClient::SDLK_HOME) { 1729 } elsif ($sym == CFClient::SDLK_HOME) {
1538 $self->{cursor} = 0; 1730 $self->{cursor} = 0;
1539 } elsif ($sym == CFClient::SDLK_END) { 1731 } elsif ($sym == CFClient::SDLK_END) {
1540 $self->{cursor} = length $text; 1732 $self->{cursor} = length $text;
1541 } elsif ($uni == 27) { 1733 } elsif ($uni == 27) {
1542 $self->emit ('escape'); 1734 $self->_emit ('escape');
1543 } elsif ($uni) { 1735 } elsif ($uni) {
1544 substr $text, $self->{cursor}++, 0, chr $uni; 1736 substr $text, $self->{cursor}++, 0, chr $uni;
1737 } else {
1738 return 0;
1545 } 1739 }
1546 1740
1547 $self->_set_text ($text); 1741 $self->_set_text ($text);
1548 $self->update; 1742
1549 $self->check_size; 1743 $self->realloc;
1744
1745 1
1550} 1746}
1551 1747
1552sub focus_in { 1748sub focus_in {
1553 my ($self) = @_; 1749 my ($self) = @_;
1554 1750
… …
1569 utf8::encode $text; 1765 utf8::encode $text;
1570 $self->{cursor} = length substr $text, 0, $idx; 1766 $self->{cursor} = length substr $text, 0, $idx;
1571 1767
1572 $self->_set_text ($self->{text}); 1768 $self->_set_text ($self->{text});
1573 $self->update; 1769 $self->update;
1770
1771 1
1574} 1772}
1575 1773
1576sub mouse_motion { 1774sub mouse_motion {
1577 my ($self, $ev, $x, $y) = @_; 1775 my ($self, $ev, $x, $y) = @_;
1578# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1776# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1777
1778 0
1579} 1779}
1580 1780
1581sub _draw { 1781sub _draw {
1582 my ($self) = @_; 1782 my ($self) = @_;
1583 1783
… …
1634 if ($sym == 13) { 1834 if ($sym == 13) {
1635 unshift @{$self->{history}}, 1835 unshift @{$self->{history}},
1636 my $txt = $self->get_text; 1836 my $txt = $self->get_text;
1637 $self->{history_pointer} = -1; 1837 $self->{history_pointer} = -1;
1638 $self->{history_saveback} = ''; 1838 $self->{history_saveback} = '';
1639 $self->emit (activate => $txt); 1839 $self->_emit (activate => $txt);
1640 $self->update; 1840 $self->update;
1641 1841
1642 } elsif ($sym == CFClient::SDLK_UP) { 1842 } elsif ($sym == CFClient::SDLK_UP) {
1643 if ($self->{history_pointer} < 0) { 1843 if ($self->{history_pointer} < 0) {
1644 $self->{history_saveback} = $self->get_text; 1844 $self->{history_saveback} = $self->get_text;
… …
1660 } else { 1860 } else {
1661 $self->set_text ($self->{history_saveback}); 1861 $self->set_text ($self->{history_saveback});
1662 } 1862 }
1663 1863
1664 } else { 1864 } else {
1665 $self->SUPER::key_down ($ev); 1865 return $self->SUPER::key_down ($ev)
1866 }
1867
1666 } 1868 1
1667
1668} 1869}
1669 1870
1670############################################################################# 1871#############################################################################
1671 1872
1672package CFClient::UI::Button; 1873package CFClient::UI::Button;
… …
1681 1882
1682sub new { 1883sub new {
1683 my $class = shift; 1884 my $class = shift;
1684 1885
1685 $class->SUPER::new ( 1886 $class->SUPER::new (
1686 padding => 4, 1887 padding_x => 4,
1888 padding_y => 4,
1687 fg => [1, 1, 1], 1889 fg => [1, 1, 1],
1688 active_fg => [0, 0, 1], 1890 active_fg => [0, 0, 1],
1689 can_hover => 1, 1891 can_hover => 1,
1690 align => 0, 1892 align => 0,
1691 valign => 0, 1893 valign => 0,
1692 can_events => 1, 1894 can_events => 1,
1693 @_ 1895 @_
1694 ) 1896 )
1695} 1897}
1696 1898
1899sub activate { }
1900
1697sub button_up { 1901sub button_up {
1698 my ($self, $ev, $x, $y) = @_; 1902 my ($self, $ev, $x, $y) = @_;
1699 1903
1904 $self->emit ("activate")
1700 if ($x >= 0 && $x < $self->{w} 1905 if $x >= 0 && $x < $self->{w}
1701 && $y >= 0 && $y < $self->{h}) { 1906 && $y >= 0 && $y < $self->{h};
1702 $self->emit ("activate"); 1907
1703 } 1908 1
1704} 1909}
1705 1910
1706sub _draw { 1911sub _draw {
1707 my ($self) = @_; 1912 my ($self) = @_;
1708 1913
… …
1737 1942
1738sub new { 1943sub new {
1739 my $class = shift; 1944 my $class = shift;
1740 1945
1741 $class->SUPER::new ( 1946 $class->SUPER::new (
1742 padding => 2, 1947 padding_x => 2,
1948 padding_y => 2,
1743 fg => [1, 1, 1], 1949 fg => [1, 1, 1],
1744 active_fg => [1, 1, 0], 1950 active_fg => [1, 1, 0],
1745 bg => [0, 0, 0, 0.2], 1951 bg => [0, 0, 0, 0.2],
1746 active_bg => [1, 1, 1, 0.5], 1952 active_bg => [1, 1, 1, 0.5],
1747 state => 0, 1953 state => 0,
… …
1751} 1957}
1752 1958
1753sub size_request { 1959sub size_request {
1754 my ($self) = @_; 1960 my ($self) = @_;
1755 1961
1756 ($self->{padding} * 2 + 6) x 2 1962 (6) x 2
1757} 1963}
1758 1964
1759sub button_down { 1965sub button_down {
1760 my ($self, $ev, $x, $y) = @_; 1966 my ($self, $ev, $x, $y) = @_;
1761 1967
1762 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1968 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1763 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1969 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1764 $self->{state} = !$self->{state}; 1970 $self->{state} = !$self->{state};
1765 $self->emit (changed => $self->{state}); 1971 $self->_emit (changed => $self->{state});
1972 } else {
1973 return 0
1974 }
1975
1766 } 1976 1
1767} 1977}
1768 1978
1769sub _draw { 1979sub _draw {
1770 my ($self) = @_; 1980 my ($self) = @_;
1771 1981
1772 $self->SUPER::_draw; 1982 $self->SUPER::_draw;
1773 1983
1774 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1984 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1775 1985
1776 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1986 my ($w, $h) = @$self{qw(w h)};
1987
1988 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1777 1989
1778 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1990 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1779 1991
1780 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1992 my $tex = $self->{state} ? $tex[1] : $tex[0];
1781 1993
… …
2045 my $self = $class->SUPER::new ( 2257 my $self = $class->SUPER::new (
2046 fg => [1, 1, 1], 2258 fg => [1, 1, 1],
2047 active_fg => [0, 0, 0], 2259 active_fg => [0, 0, 0],
2048 bg => [0, 0, 0, 0.2], 2260 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5], 2261 active_bg => [1, 1, 1, 0.5],
2050 range => [0, 0, 100, 10], 2262 range => [0, 0, 100, 10, 0],
2051 req_w => $::WIDTH / 80, 2263 min_w => $::WIDTH / 80,
2052 req_h => $::WIDTH / 80, 2264 min_h => $::WIDTH / 80,
2053 vertical => 0, 2265 vertical => 0,
2054 can_hover => 1, 2266 can_hover => 1,
2055 inner_pad => .05, 2267 inner_pad => 0.02,
2056 @_ 2268 @_
2057 ); 2269 );
2058 2270
2059 $self->set_value ($self->{range}[0]); 2271 $self->set_value ($self->{range}[0]);
2060 $self->update; 2272 $self->update;
2061 2273
2062 $self 2274 $self
2063} 2275}
2064 2276
2277sub changed { }
2278
2279sub set_range {
2280 my ($self, $range) = @_;
2281
2282 ($range, $self->{range}) = ($self->{range}, $range);
2283
2284 $self->update
2285 if "@$range" ne "@{$self->{range}}";
2286}
2287
2065sub set_value { 2288sub set_value {
2066 my ($self, $value) = @_; 2289 my ($self, $value) = @_;
2067 2290
2068 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2291 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2069 2292
2070 $hi = $lo + 1 if $hi <= $lo; 2293 $hi = $lo + 1 if $hi <= $lo;
2071 2294
2295 $page = $hi - $lo if $page > $hi - $lo;
2296
2072 $value = $lo if $value < $lo; 2297 $value = $lo if $value < $lo;
2073 $value = $hi if $value > $hi; 2298 $value = $hi - $page if $value > $hi - $page;
2074 2299
2075 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2300 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2076 if $unit; 2301 if $unit;
2077 2302
2078 $page = $hi - $lo if $page > $hi - $lo;
2079
2080 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2303 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2081 2304
2082 if ($value != $old_value) { 2305 if ($value != $old_value) {
2083 $self->emit (changed => $value); 2306 $self->_emit (changed => $value);
2084 $self->update; 2307 $self->update;
2085 } 2308 }
2086} 2309}
2087 2310
2088sub size_request { 2311sub size_request {
2089 my ($self) = @_; 2312 my ($self) = @_;
2090 2313
2091 my $w = $self->{req_w}; 2314 ($self->{req_w}, $self->{req_h})
2092 my $h = $self->{req_h};
2093
2094 $self->{vertical} ? ($h, $w) : ($w, $h)
2095} 2315}
2096 2316
2097sub button_down { 2317sub button_down {
2098 my ($self, $ev, $x, $y) = @_; 2318 my ($self, $ev, $x, $y) = @_;
2099 2319
2100 $self->SUPER::button_down ($ev, $x, $y); 2320 $self->SUPER::button_down ($ev, $x, $y);
2321
2322 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2323
2101 $self->mouse_motion ($ev, $x, $y); 2324 $self->mouse_motion ($ev, $x, $y)
2102} 2325}
2103 2326
2104sub mouse_motion { 2327sub mouse_motion {
2105 my ($self, $ev, $x, $y) = @_; 2328 my ($self, $ev, $x, $y) = @_;
2106 2329
2107 if ($GRAB == $self) { 2330 if ($GRAB == $self) {
2108 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2331 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2109 2332
2110 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2333 my (undef, $lo, $hi, $page) = @{$self->{range}};
2111 2334
2112 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2335 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2113 2336
2114 $self->set_value ($x * ($hi - $lo) + $lo); 2337 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2338 } else {
2339 return 0;
2340 }
2341
2115 } 2342 1
2116} 2343}
2117 2344
2118sub update { 2345sub update {
2119 my ($self) = @_; 2346 my ($self) = @_;
2120 2347
2121 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2348 delete $self->{knob_w};
2349 $self->SUPER::update;
2350}
2351
2352sub _draw {
2353 my ($self) = @_;
2354
2355 unless ($self->{knob_w}) {
2122 $self->set_value ($self->{range}[0]); 2356 $self->set_value ($self->{range}[0]);
2123 2357
2124 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2358 my ($value, $lo, $hi, $page) = @{$self->{range}};
2359 my $range = ($hi - $page - $lo) || 1e-100;
2125 2360
2126 my $inner_w = 1 - 2 * $self->{inner_pad}; 2361 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2127 2362
2128 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2363 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2364 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2129 2365
2130 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2366 $value = ($value - $lo) / $range;
2131 $value = $self->{scale} * ($value - $lo); 2367 $value = $value * $self->{scale} + $self->{offset};
2132 2368
2133 $value = $self->{inner_pad} + ($value - $page * 0.5);
2134
2135 $value = 0 if $value < 0;
2136 $page = 1 - $value if $value + $page > 1;
2137
2138 $self->{knob_x} = $value; 2369 $self->{knob_x} = $value - $knob_w * 0.5;
2139 $self->{knob_w} = $page; 2370 $self->{knob_w} = $knob_w;
2140 }); 2371 }
2141
2142 $self->SUPER::update;
2143}
2144
2145sub _draw {
2146 my ($self) = @_;
2147 2372
2148 $self->SUPER::_draw (); 2373 $self->SUPER::_draw ();
2149 2374
2150 glScale $self->{w}, $self->{h}; 2375 glScale $self->{w}, $self->{h};
2151 2376
… …
2168 # draw handle 2393 # draw handle
2169 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2394 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2170 2395
2171 glDisable GL_TEXTURE_2D; 2396 glDisable GL_TEXTURE_2D;
2172} 2397}
2398
2399#############################################################################
2400
2401package CFClient::UI::ValSlider;
2402
2403our @ISA = CFClient::UI::HBox::;
2404
2405sub new {
2406 my ($class, %arg) = @_;
2407
2408 my $range = delete $arg{range};
2409
2410 my $self = $class->SUPER::new (
2411 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2412 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2413 to_value => sub { shift },
2414 from_value => sub { shift },
2415 %arg,
2416 );
2417
2418 $self->{slider}->connect (changed => sub {
2419 my ($self, $value) = @_;
2420 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2421 $self->{parent}->emit (changed => $value);
2422 });
2423
2424# $self->{entry}->connect (changed => sub {
2425# my ($self, $value) = @_;
2426# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2427# $self->{parent}->emit (changed => $value);
2428# });
2429
2430 $self->add ($self->{slider}, $self->{entry});
2431
2432 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2433
2434 $self
2435}
2436
2437sub set_range { shift->{slider}->set_range (@_) }
2438sub set_value { shift->{slider}->set_value (@_) }
2173 2439
2174############################################################################# 2440#############################################################################
2175 2441
2176package CFClient::UI::TextView; 2442package CFClient::UI::TextView;
2177 2443
… …
2207 2473
2208 $self->{fontsize} = $fontsize; 2474 $self->{fontsize} = $fontsize;
2209 $self->reflow; 2475 $self->reflow;
2210} 2476}
2211 2477
2212sub text_height {
2213 my ($self, $text) = @_;
2214
2215 my $layout = $self->{layout};
2216
2217 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2218 $layout->set_width ($self->{children}[0]{w});
2219 $layout->set_markup ($text);
2220
2221 ($layout->size)[1]
2222}
2223
2224sub reflow {
2225 my ($self) = @_;
2226
2227 $self->{need_reflow}++;
2228 $self->update;
2229}
2230
2231sub size_allocate { 2478sub size_allocate {
2232 my ($self, $w, $h) = @_; 2479 my ($self, $w, $h) = @_;
2233 2480
2234 $self->SUPER::size_allocate ($w, $h); 2481 $self->SUPER::size_allocate ($w, $h);
2235 2482
… …
2238 $self->{layout}->set_width ($self->{children}[0]{w}); 2485 $self->{layout}->set_width ($self->{children}[0]{w});
2239 2486
2240 $self->reflow; 2487 $self->reflow;
2241} 2488}
2242 2489
2490sub text_size {
2491 my ($self, $text, $indent) = @_;
2492
2493 my $layout = $self->{layout};
2494
2495 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2496 $layout->set_width ($self->{children}[0]{w} - $indent);
2497 $layout->set_markup ($text);
2498
2499 $layout->size
2500}
2501
2502sub reflow {
2503 my ($self) = @_;
2504
2505 $self->{need_reflow}++;
2506 $self->update;
2507}
2508
2509sub set_offset {
2510 my ($self, $offset) = @_;
2511
2512 # todo: base offset on lines or so, not on pixels
2513 $self->{children}[1]->set_value ($offset);
2514}
2515
2516sub clear {
2517 my ($self) = @_;
2518
2519 $self->{par} = [];
2520 $self->{height} = 0;
2521 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2522}
2523
2243sub add_paragraph { 2524sub add_paragraph {
2244 my ($self, $color, $text) = @_; 2525 my ($self, $color, $text, $indent) = @_;
2245 2526
2246 #TODO: intelligently "reformat" paragraph 2527 for my $line (split /\n/, $text) {
2247 2528 my ($w, $h) = $self->text_size ($line);
2248 my $height = $self->text_height ($text);
2249
2250 $self->{height} += $height; 2529 $self->{height} += $h;
2530 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2531 }
2251 2532
2252 push @{$self->{par}}, [$height, $color, $text];
2253
2254 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2533 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2255 $self->{children}[1]->update;
2256} 2534}
2257 2535
2258sub update { 2536sub update {
2259 my ($self) = @_; 2537 my ($self) = @_;
2260 2538
… …
2263 return unless $self->{h} > 0; 2541 return unless $self->{h} > 0;
2264 2542
2265 delete $self->{texture}; 2543 delete $self->{texture};
2266 2544
2267 $ROOT->on_post_alloc ($self, sub { 2545 $ROOT->on_post_alloc ($self, sub {
2546 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2547
2268 if (delete $self->{need_reflow}) { 2548 if (delete $self->{need_reflow}) {
2269 my $height = 0; 2549 my $height = 0;
2270 2550
2271 $height += $_->[0] = $self->text_height ($_->[2]) 2551 my $layout = $self->{layout};
2552
2553 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2554
2272 for @{$self->{par}}; 2555 for (@{$self->{par}}) {
2556 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2557 $layout->set_width ($W - $_->[3]);
2558 $layout->set_markup ($_->[4]);
2559 my ($w, $h) = $layout->size;
2560 $_->[0] = $w + $_->[3];
2561 $_->[1] = $h;
2562 }
2563
2564 $height += $_->[1];
2565 }
2273 2566
2274 $self->{height} = $height; 2567 $self->{height} = $height;
2275 2568
2276 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2569 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2277 2570
2278 delete $self->{texture}; 2571 delete $self->{texture};
2279 } 2572 }
2280 2573
2281 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2574 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2282 glClearColor 0.5, 0.5, 0.5, 0; 2575 glClearColor 0.5, 0.5, 0.5, 0;
2283 glClear GL_COLOR_BUFFER_BIT; 2576 glClear GL_COLOR_BUFFER_BIT;
2284 2577
2285 glEnable GL_TEXTURE_2D;
2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2287
2288 my $top = int $self->{children}[1]{range}[0]; 2578 my $top = int $self->{children}[1]{range}[0];
2289 2579
2290 my $y0 = $top; 2580 my $y0 = $top;
2291 my $y1 = $top + $self->{h}; 2581 my $y1 = $top + $H;
2292 2582
2293 my $y = 0; 2583 my $y = 0;
2294 2584
2295 my $layout = $self->{layout}; 2585 my $layout = $self->{layout};
2296 2586
2297 $layout->set_font ($self->{font}) if $self->{font}; 2587 $layout->set_font ($self->{font}) if $self->{font};
2298 2588
2589 glEnable GL_BLEND;
2590 #TODO# not correct in windows where rgba is forced off
2591 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2592
2299 for my $par (@{$self->{par}}) { 2593 for my $par (@{$self->{par}}) {
2300 my $h = $par->[0]; 2594 my $h = $par->[1];
2301 2595
2302 if ($y0 < $y + $h && $y < $y1) { 2596 if ($y0 < $y + $h && $y < $y1) {
2303 $layout->set_foreground (@{ $par->[1] }); 2597 $layout->set_foreground (@{ $par->[2] });
2598 $layout->set_width ($W - $par->[3]);
2304 $layout->set_markup ($par->[2]); 2599 $layout->set_markup ($par->[4]);
2305 2600
2306 my ($W, $H) = $layout->size; 2601 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2307 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2602
2603 glRasterPos $par->[3], $y - $y0;
2604 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2308 } 2605 }
2309 2606
2310 $y += $h; 2607 $y += $h;
2311 } 2608 }
2312 2609
2313 glDisable GL_TEXTURE_2D; 2610 glDisable GL_BLEND;
2314 }; 2611 };
2315 }); 2612 });
2316} 2613}
2317 2614
2318sub _draw { 2615sub _draw {
2319 my ($self) = @_; 2616 my ($self) = @_;
2320 2617
2321 glEnable GL_TEXTURE_2D; 2618 glEnable GL_TEXTURE_2D;
2322 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2619 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2323 glColor 1, 1, 1, 1; 2620 glColor 1, 1, 1, 1;
2324 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2621 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2325 glDisable GL_TEXTURE_2D; 2622 glDisable GL_TEXTURE_2D;
2326 2623
2327 $self->{children}[1]->draw; 2624 $self->{children}[1]->draw;
2328 2625
2329} 2626}
… …
2378 2675
2379sub new { 2676sub new {
2380 my $class = shift; 2677 my $class = shift;
2381 2678
2382 my $self = $class->SUPER::new ( 2679 my $self = $class->SUPER::new (
2383 state => 0, 2680 state => 0,
2384 connect_activate => \&toggle_flopper, 2681 on_activate => \&toggle_flopper,
2385 @_ 2682 @_
2386 ); 2683 );
2387 2684
2388 if ($self->{state}) {
2389 $self->{state} = 0;
2390 $self->toggle_flopper;
2391 }
2392
2393 $self 2685 $self
2394} 2686}
2395 2687
2396sub toggle_flopper { 2688sub toggle_flopper {
2397 my ($self) = @_; 2689 my ($self) = @_;
2398 2690
2399 # TODO: use animation 2691 $self->{other}->toggle_visibility;
2400 if ($self->{state} = !$self->{state}) {
2401 $CFClient::UI::ROOT->add ($self->{other});
2402 $self->{other}->move ($self->coord2global (0, $self->{h}));
2403 $self->emit ("open");
2404 } else {
2405 $CFClient::UI::ROOT->remove ($self->{other});
2406 $self->emit ("close");
2407 }
2408
2409 $self->emit (changed => $self->{state});
2410} 2692}
2411 2693
2412############################################################################# 2694#############################################################################
2413 2695
2414package CFClient::UI::Tooltip; 2696package CFClient::UI::Tooltip;
… …
2427} 2709}
2428 2710
2429sub set_tooltip_from { 2711sub set_tooltip_from {
2430 my ($self, $widget) = @_; 2712 my ($self, $widget) = @_;
2431 2713
2714 my $tooltip = $widget->{tooltip};
2715
2716 if ($ENV{CFPLUS_DEBUG} & 2) {
2717 $tooltip .= "\n\n" . (ref $widget) . "\n"
2718 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2719 . "req $widget->{req_w} $widget->{req_h}\n"
2720 . "visible $widget->{visible}";
2721 }
2722
2432 $self->add (new CFClient::UI::Label 2723 $self->add (new CFClient::UI::Label
2433 markup => $widget->{tooltip}, 2724 markup => $tooltip,
2434 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2725 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2435 fontsize => 0.8, 2726 fontsize => 0.8,
2436 fg => [0, 0, 0, 1], 2727 fg => [0, 0, 0, 1],
2437 ellipsise => 0, 2728 ellipsise => 0,
2438 font => ($widget->{tooltip_font} || $::FONT_PROP), 2729 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2449 2740
2450sub size_allocate { 2741sub size_allocate {
2451 my ($self, $w, $h) = @_; 2742 my ($self, $w, $h) = @_;
2452 2743
2453 $self->SUPER::size_allocate ($w - 4, $h - 4); 2744 $self->SUPER::size_allocate ($w - 4, $h - 4);
2745}
2746
2747sub visibility_change {
2748 my ($self, $visible) = @_;
2749
2750 return unless $visible;
2751
2752 $self->{root}->on_post_alloc ("move_$self" => sub {
2753 my $widget = $self->{owner}
2754 or return;
2755
2756 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2757
2758 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2759 if $x + $self->{w} > $::WIDTH;
2760
2761 $self->move_abs ($x, $y);
2762 });
2454} 2763}
2455 2764
2456sub _draw { 2765sub _draw {
2457 my ($self) = @_; 2766 my ($self) = @_;
2458 2767
… …
2475 glVertex $w, $h; 2784 glVertex $w, $h;
2476 glVertex $w, 0; 2785 glVertex $w, 0;
2477 glEnd; 2786 glEnd;
2478 2787
2479 glTranslate 2 - 0.375, 2 - 0.375; 2788 glTranslate 2 - 0.375, 2 - 0.375;
2789
2480 $self->SUPER::_draw; 2790 $self->SUPER::_draw;
2481} 2791}
2482 2792
2483############################################################################# 2793#############################################################################
2484 2794
… …
2489use CFClient::OpenGL; 2799use CFClient::OpenGL;
2490 2800
2491sub new { 2801sub new {
2492 my $class = shift; 2802 my $class = shift;
2493 2803
2494 $class->SUPER::new ( 2804 my $self = $class->SUPER::new (
2495 aspect => 1, 2805 aspect => 1,
2806 can_events => 0,
2496 @_, 2807 @_,
2497 ) 2808 );
2809
2810 if ($self->{anim} && $self->{animspeed}) {
2811 Scalar::Util::weaken (my $widget = $self);
2812
2813 $self->{timer} = Event->timer (
2814 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2815 hard => 1,
2816 interval => $self->{animspeed},
2817 cb => sub {
2818 ++$widget->{frame};
2819 $widget->update;
2820 },
2821 );
2822 }
2823
2824 $self
2498} 2825}
2499 2826
2500sub size_request { 2827sub size_request {
2501 (32, 8) 2828 (32, 8)
2502} 2829}
2503 2830
2831sub update {
2832 my ($self) = @_;
2833
2834 return unless $self->{visible};
2835
2836 $self->SUPER::update;
2837}
2838
2504sub _draw { 2839sub _draw {
2505 my ($self) = @_; 2840 my ($self) = @_;
2506 2841
2507 return unless $::CONN;#d# manage and cache textures differently 2842 return unless $::CONN;
2843
2844 my $face;
2845
2846 if ($self->{frame}) {
2847 my $anim = $::CONN->{anim}[$self->{anim}];
2848
2849 $face = $anim->[ $self->{frame} % @$anim ]
2850 if $anim && @$anim;
2851 }
2852
2508 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2853 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2509 2854
2510 # TODO animation
2511 if ($tex) { 2855 if ($tex) {
2512 glEnable GL_TEXTURE_2D; 2856 glEnable GL_TEXTURE_2D;
2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2857 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2514 glColor 1, 1, 1, 1; 2858 glColor 1, 1, 1, 1;
2515 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2859 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2516 glDisable GL_TEXTURE_2D; 2860 glDisable GL_TEXTURE_2D;
2517 } 2861 }
2518} 2862}
2519 2863
2864sub DESTROY {
2865 my ($self) = @_;
2866
2867 $self->{timer}->cancel
2868 if $self->{timer};
2869
2870 $self->SUPER::DESTROY;
2871}
2872
2520############################################################################# 2873#############################################################################
2521 2874
2522package CFClient::UI::InventoryItem; 2875package CFClient::UI::Buttonbar;
2523 2876
2524our @ISA = CFClient::UI::HBox::; 2877our @ISA = CFClient::UI::HBox::;
2525 2878
2526sub _item_to_desc { 2879# TODO: should actualyl wrap buttons and other goodies.
2527 my ($item) = @_;
2528
2529 my $desc =
2530 $item->{nrof} < 2
2531 ? $item->{name}
2532 : "$item->{nrof} $item->{name_pl}";
2533
2534 $item->{flags} & Crossfire::Protocol::F_OPEN
2535 and $desc .= " (open)";
2536 $item->{flags} & Crossfire::Protocol::F_APPLIED
2537 and $desc .= " (applied)";
2538 $item->{flags} & Crossfire::Protocol::F_UNPAID
2539 and $desc .= " (unpaid)";
2540 $item->{flags} & Crossfire::Protocol::F_MAGIC
2541 and $desc .= " (magic)";
2542 $item->{flags} & Crossfire::Protocol::F_CURSED
2543 and $desc .= " (cursed)";
2544 $item->{flags} & Crossfire::Protocol::F_DAMNED
2545 and $desc .= " (damned)";
2546 $item->{flags} & Crossfire::Protocol::F_LOCKED
2547 and $desc .= " *";
2548
2549 $desc
2550}
2551
2552sub new {
2553 my $class = shift;
2554
2555 my %args = @_;
2556
2557 my $item = delete $args{item};
2558
2559 my $desc = _item_to_desc ($item);
2560
2561 my $self = $class->SUPER::new (
2562 can_hover => 1,
2563 can_events => 1,
2564 tooltip => ((CFClient::UI::Label::escape $desc)
2565 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2566 connect_button_down => sub {
2567 my ($self, $ev, $x, $y) = @_;
2568
2569 # todo: maybe put examine on 1? but should just be a tooltip :(
2570 if ($ev->{button} == 1) {
2571 my $targ = $::CONN->{player}{tag};
2572
2573 if ($item->{container} == $::CONN->{player}{tag}) {
2574 $targ = $main::OPENCONT;
2575 }
2576
2577 $::CONN->send ("move $targ $item->{tag} 0");
2578 } elsif ($ev->{button} == 2) {
2579 $::CONN->send ("apply $item->{tag}");
2580 } elsif ($ev->{button} == 3) {
2581 my @menu_items = (
2582 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2583 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2584 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2585 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2586 [
2587 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2588 sub { $::CONN->send ("lock $item->{tag}") },
2589 ],
2590 );
2591
2592 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2593 }
2594
2595 1
2596 },
2597 %args
2598 );
2599
2600
2601 $self->add (new CFClient::UI::Face
2602 can_events => 0,
2603 face => $item->{face},
2604 anim => $item->{anim},
2605 animspeed => $item->{animspeed},
2606 );
2607
2608 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2609
2610 $self->{item} = $item;
2611
2612 $self->update_item;
2613
2614 $self
2615}
2616
2617sub update_item {
2618 my ($self) = @_;
2619
2620 my $desc = _item_to_desc ($self->{item});
2621
2622 $self->{name_lbl}->set_text ($desc);
2623}
2624
2625#############################################################################
2626
2627package CFClient::UI::Inventory;
2628
2629our @ISA = CFClient::UI::ScrolledWindow::;
2630
2631sub new {
2632 my $class = shift;
2633
2634 my $self = $class->SUPER::new (
2635 scrolled => (new CFClient::UI::VBox),
2636 @_,
2637 );
2638
2639 $self
2640}
2641
2642sub set_items {
2643 my ($self, $items) = @_;
2644
2645 $self->{scrolled}->clear;
2646 return unless $items;
2647
2648 my @items = sort {
2649 ($a->{type} <=> $b->{type})
2650 or ($a->{name} cmp $b->{name})
2651 } @$items;
2652
2653 $self->{real_items} = \@items;
2654
2655 for my $item (@items) {
2656 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2657 $item->update_item ();
2658 }
2659
2660 $self->{scrolled}->add (@items);
2661
2662# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2663}
2664
2665sub size_request {
2666 my ($self) = @_;
2667 ($self->{req_w}, $self->{req_h});
2668}
2669 2880
2670############################################################################# 2881#############################################################################
2671 2882
2672package CFClient::UI::Menu; 2883package CFClient::UI::Menu;
2673 2884
… …
2707 2918
2708# popup given the event (must be a mouse button down event currently) 2919# popup given the event (must be a mouse button down event currently)
2709sub popup { 2920sub popup {
2710 my ($self, $ev) = @_; 2921 my ($self, $ev) = @_;
2711 2922
2712 $self->emit ("popdown"); 2923 $self->_emit ("popdown");
2713 2924
2714 # maybe save $GRAB? must be careful about events... 2925 # maybe save $GRAB? must be careful about events...
2715 $GRAB = $self; 2926 $GRAB = $self;
2716 $self->{button} = $ev->{button}; 2927 $self->{button} = $ev->{button};
2717 2928
2718 $self->show; 2929 $self->show;
2719 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2930 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2720} 2931}
2721 2932
2722sub mouse_motion { 2933sub mouse_motion {
2723 my ($self, $ev, $x, $y) = @_; 2934 my ($self, $ev, $x, $y) = @_;
2724 2935
2725 # TODO: should use vbox->find_widget or so 2936 # TODO: should use vbox->find_widget or so
2726 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2937 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2727 $self->{hover} = $self->{item}{$HOVER}; 2938 $self->{hover} = $self->{item}{$HOVER};
2939
2940 0
2728} 2941}
2729 2942
2730sub button_up { 2943sub button_up {
2731 my ($self, $ev, $x, $y) = @_; 2944 my ($self, $ev, $x, $y) = @_;
2732 2945
2733 if ($ev->{button} == $self->{button}) { 2946 if ($ev->{button} == $self->{button}) {
2734 undef $GRAB; 2947 undef $GRAB;
2735 $self->hide; 2948 $self->hide;
2736 2949
2737 $self->emit ("popdown"); 2950 $self->_emit ("popdown");
2738 $self->{hover}[1]->() if $self->{hover}; 2951 $self->{hover}[1]->() if $self->{hover};
2952 } else {
2953 return 0
2954 }
2955
2956 1
2957}
2958
2959#############################################################################
2960
2961package CFClient::UI::Multiplexer;
2962
2963our @ISA = CFClient::UI::Container::;
2964
2965sub new {
2966 my $class = shift;
2967
2968 my $self = $class->SUPER::new (
2969 @_,
2970 );
2971
2972 $self->{current} = $self->{children}[0]
2973 if @{ $self->{children} };
2974
2975 $self
2976}
2977
2978sub add {
2979 my ($self, @widgets) = @_;
2980
2981 $self->SUPER::add (@widgets);
2982
2983 $self->{current} = $self->{children}[0]
2984 if @{ $self->{children} };
2985}
2986
2987sub set_current_page {
2988 my ($self, $page_or_widget) = @_;
2989
2990 my $widget = ref $page_or_widget
2991 ? $page_or_widget
2992 : $self->{children}[$page_or_widget];
2993
2994 $self->{current} = $widget;
2995 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2996
2997 $self->_emit (page_changed => $self->{current});
2998
2999 $self->realloc;
3000}
3001
3002sub visible_children {
3003 $_[0]{current}
3004}
3005
3006sub size_request {
3007 my ($self) = @_;
3008
3009 $self->{current}->size_request
3010}
3011
3012sub size_allocate {
3013 my ($self, $w, $h) = @_;
3014
3015 $self->{current}->configure (0, 0, $w, $h);
3016}
3017
3018sub _draw {
3019 my ($self) = @_;
3020
3021 $self->{current}->draw;
3022}
3023
3024#############################################################################
3025
3026package CFClient::UI::Notebook;
3027
3028our @ISA = CFClient::UI::VBox::;
3029
3030sub new {
3031 my $class = shift;
3032
3033 my $self = $class->SUPER::new (
3034 buttonbar => (new CFClient::UI::Buttonbar),
3035 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3036 # filter => # will be put between multiplexer and $self
3037 @_,
3038 );
2739 } 3039
3040 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3041 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3042
3043 $self
3044}
3045
3046sub add {
3047 my ($self, $title, $widget, $tooltip) = @_;
3048
3049 Scalar::Util::weaken $self;
3050
3051 $self->{buttonbar}->add (new CFClient::UI::Button
3052 markup => $title,
3053 tooltip => $tooltip,
3054 on_activate => sub { $self->set_current_page ($widget) },
3055 );
3056
3057 $self->{multiplexer}->add ($widget);
3058}
3059
3060sub set_current_page {
3061 my ($self, $page) = @_;
3062
3063 $self->{multiplexer}->set_current_page ($page);
3064 $self->_emit (page_changed => $self->{multiplexer}{current});
2740} 3065}
2741 3066
2742############################################################################# 3067#############################################################################
2743 3068
2744package CFClient::UI::Statusbox; 3069package CFClient::UI::Statusbox;
… …
2804sub add { 3129sub add {
2805 my ($self, $text, %arg) = @_; 3130 my ($self, $text, %arg) = @_;
2806 3131
2807 $text =~ s/^\s+//; 3132 $text =~ s/^\s+//;
2808 $text =~ s/\s+$//; 3133 $text =~ s/\s+$//;
3134
3135 return unless $text;
2809 3136
2810 my $timeout = time + ((delete $arg{timeout}) || 60); 3137 my $timeout = time + ((delete $arg{timeout}) || 60);
2811 3138
2812 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3139 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813 3140
… …
2847 $self->SUPER::reconfigure; 3174 $self->SUPER::reconfigure;
2848} 3175}
2849 3176
2850############################################################################# 3177#############################################################################
2851 3178
2852package CFClient::UI::Root; 3179package CFClient::UI::Inventory;
2853 3180
2854our @ISA = CFClient::UI::Container::; 3181our @ISA = CFClient::UI::ScrolledWindow::;
2855
2856use CFClient::OpenGL;
2857 3182
2858sub new { 3183sub new {
2859 my $class = shift; 3184 my $class = shift;
2860 3185
2861 $class->SUPER::new ( 3186 my $self = $class->SUPER::new (
3187 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3188 @_,
3189 );
3190
3191 $self
3192}
3193
3194sub set_items {
3195 my ($self, $items) = @_;
3196
3197 $self->{child}->clear;
3198 return unless $items;
3199
3200 my @items = sort {
3201 ($a->{type} <=> $b->{type})
3202 or ($a->{name} cmp $b->{name})
3203 } @$items;
3204
3205 $self->{real_items} = \@items;
3206
3207 my $row = 0;
3208 for my $item (@items) {
3209 CFClient::Item::update_widgets $item;
3210
3211 $self->{child}->add (0, $row, $item->{face_widget});
3212 $self->{child}->add (1, $row, $item->{desc_widget});
3213 $self->{child}->add (2, $row, $item->{weight_widget});
3214
3215 $row++;
3216 }
3217}
3218
3219#############################################################################
3220
3221package CFClient::UI::BindEditor;
3222
3223our @ISA = CFClient::UI::FancyFrame::;
3224
3225sub new {
3226 my $class = shift;
3227
3228 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3229
3230 $self->add (my $vb = new CFClient::UI::VBox);
3231
3232
3233 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3234 text => "start recording",
3235 tooltip => "Start/Stops recording of actions."
3236 ."All subsequent actions after the recording started will be captured."
3237 ."The actions are displayed after the record was stopped."
3238 ."To bind the action you have to click on the 'Bind' button",
3239 on_activate => sub {
3240 unless ($self->{recording}) {
3241 $self->start;
3242 } else {
3243 $self->stop;
3244 }
3245 });
3246
3247 $vb->add (new CFClient::UI::Label text => "Actions:");
3248 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3249
3250 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3251 $vb->add (my $hb = new CFClient::UI::HBox);
3252 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3253 $hb->add (new CFClient::UI::Button
3254 text => "bind",
3255 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3256 on_activate => sub {
3257 $self->ask_for_bind;
3258 });
3259
3260 $vb->add (my $hb = new CFClient::UI::HBox);
3261 $hb->add (new CFClient::UI::Button
3262 text => "ok",
3263 expand => 1,
3264 tooltip => "This closes the binding editor and saves the binding",
3265 on_activate => sub {
3266 $self->hide;
3267 $self->commit;
3268 });
3269
3270 $hb->add (new CFClient::UI::Button
3271 text => "cancel",
3272 expand => 1,
3273 tooltip => "This closes the binding editor without saving",
3274 on_activate => sub {
3275 $self->hide;
3276 $self->{binding_cancel}->()
3277 if $self->{binding_cancel};
3278 });
3279
3280 $self->update_binding_widgets;
3281
3282 $self
3283}
3284
3285sub commit {
3286 my ($self) = @_;
3287 my ($mod, $sym, $cmds) = $self->get_binding;
3288 if ($sym != 0 && @$cmds > 0) {
3289 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3290 ."'. Don't forget 'Save Config'!");
3291 $self->{binding_change}->($mod, $sym, $cmds)
3292 if $self->{binding_change};
3293 } else {
3294 $::STATUSBOX->add ("No action bound, no key or action specified!");
3295 $self->{binding_cancel}->()
3296 if $self->{binding_cancel};
3297 }
3298}
3299
3300sub start {
3301 my ($self) = @_;
3302
3303 $self->{rec_btn}->set_text ("stop recording");
3304 $self->{recording} = 1;
3305 $self->clear_command_list;
3306 $::CONN->start_record if $::CONN;
3307}
3308
3309sub stop {
3310 my ($self) = @_;
3311
3312 $self->{rec_btn}->set_text ("start recording");
3313 $self->{recording} = 0;
3314
3315 my $rec;
3316 $rec = $::CONN->stop_record if $::CONN;
3317 return unless ref $rec eq 'ARRAY';
3318 $self->set_command_list ($rec);
3319}
3320
3321
3322sub ask_for_bind_and_commit {
3323 my ($self) = @_;
3324 $self->ask_for_bind (1);
3325}
3326
3327sub ask_for_bind {
3328 my ($self, $commit) = @_;
3329
3330 CFClient::Binder::open_binding_dialog (sub {
3331 my ($mod, $sym) = @_;
3332 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3333 $self->update_binding_widgets;
3334 $self->commit if $commit;
3335 });
3336}
3337
3338# $mod and $sym are the modifiers and key symbol
3339# $cmds is a array ref of strings (the commands)
3340# $cb is the callback that is executed on OK
3341# $ccb is the callback that is executed on CANCEL and
3342# when the binding was unsuccessful on OK
3343sub set_binding {
3344 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3345
3346 $self->clear_command_list;
3347 $self->{recording} = 0;
3348 $self->{rec_btn}->set_text ("start recording");
3349
3350 $self->{binding} = [$mod, $sym];
3351 $self->{commands} = $cmds;
3352
3353 $self->{binding_change} = $cb;
3354 $self->{binding_cancel} = $ccb;
3355
3356 $self->update_binding_widgets;
3357}
3358
3359# this is a shortcut method that asks for a binding
3360# and then just binds it.
3361sub do_quick_binding {
3362 my ($self, $cmds) = @_;
3363 $self->set_binding (undef, undef, $cmds, sub {
3364 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3365 });
3366 $self->ask_for_bind (1);
3367}
3368
3369sub update_binding_widgets {
3370 my ($self) = @_;
3371 my ($mod, $sym, $cmds) = $self->get_binding;
3372 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3373 $self->set_command_list ($cmds);
3374}
3375
3376sub get_binding {
3377 my ($self) = @_;
3378 return (
3379 $self->{binding}->[0],
3380 $self->{binding}->[1],
3381 [ grep { defined $_ } @{$self->{commands}} ]
3382 );
3383}
3384
3385sub clear_command_list {
3386 my ($self) = @_;
3387 $self->{cmdbox}->clear ();
3388}
3389
3390sub set_command_list {
3391 my ($self, $cmds) = @_;
3392
3393 $self->{cmdbox}->clear ();
3394 $self->{commands} = $cmds;
3395
3396 my $idx = 0;
3397
3398 for (@$cmds) {
3399 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3400
3401 my $i = $idx;
3402 $hb->add (new CFClient::UI::Label text => $_);
3403 $hb->add (new CFClient::UI::Button
3404 text => "delete",
3405 tooltip => "Deletes the action from the record",
3406 on_activate => sub {
3407 $self->{cmdbox}->remove ($hb);
3408 $cmds->[$i] = undef;
3409 });
3410
3411
3412 $idx++
3413 }
3414}
3415
3416#############################################################################
3417
3418package CFClient::UI::SpellList;
3419
3420our @ISA = CFClient::UI::Table::;
3421
3422sub new {
3423 my $class = shift;
3424
3425 my $self = $class->SUPER::new (
3426 binding => [],
3427 commands => [],
2862 @_, 3428 @_,
2863 ) 3429 )
2864} 3430}
2865 3431
2866sub configure { 3432# XXX: Do sorting? Argl...
2867 my ($self, $x, $y, $w, $h) = @_; 3433sub add_spell {
2868
2869 $self->{w} = $w;
2870 $self->{h} = $h;
2871}
2872
2873sub check_size {
2874 my ($self) = @_; 3434 my ($self, $spell) = @_;
3435 $self->{spells}->{$spell->{name}} = $spell;
2875 3436
2876 $self->size_allocate ($self->{w}, $self->{h}) 3437 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2877 if $self->{w}; 3438 face => $spell->{face},
3439 can_hover => 1,
3440 can_events => 1,
3441 tooltip => $spell->{message});
3442
3443 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3444 text => $spell->{name},
3445 can_hover => 1,
3446 can_events => 1,
3447 tooltip => $spell->{message},
3448 expand => 1);
3449
3450 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3451 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3452 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3453 expand => 1);
3454
3455 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3456 text => "bind to key",
3457 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3458}
3459
3460sub rebuild_spell_list {
3461 my ($self) = @_;
3462 $self->{tbl_idx} = 0;
3463 $self->add_spell ($_) for values %{$self->{spells}};
3464}
3465
3466sub remove_spell {
3467 my ($self, $spell) = @_;
3468 delete $self->{spells}->{$spell->{name}};
3469 $self->rebuild_spell_list;
3470}
3471
3472#############################################################################
3473
3474package CFClient::UI::Root;
3475
3476our @ISA = CFClient::UI::Container::;
3477
3478use CFClient::OpenGL;
3479
3480sub new {
3481 my $class = shift;
3482
3483 my $self = $class->SUPER::new (
3484 visible => 1,
3485 @_,
3486 );
3487
3488 Scalar::Util::weaken ($self->{root} = $self);
3489
3490 $self
2878} 3491}
2879 3492
2880sub size_request { 3493sub size_request {
2881 my ($self) = @_; 3494 my ($self) = @_;
2882 3495
2883 ($self->{w}, $self->{h}) 3496 ($self->{w}, $self->{h})
3497}
3498
3499sub _to_pixel {
3500 my ($coord, $size, $max) = @_;
3501
3502 $coord =
3503 $coord eq "center" ? ($max - $size) * 0.5
3504 : $coord eq "max" ? $max
3505 : $coord;
3506
3507 $coord = 0 if $coord < 0;
3508 $coord = $max - $size if $coord > $max - $size;
3509
3510 int $coord + 0.5
2884} 3511}
2885 3512
2886sub size_allocate { 3513sub size_allocate {
2887 my ($self, $w, $h) = @_; 3514 my ($self, $w, $h) = @_;
2888 3515
2889 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2890 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2891
2892 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2893 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2894
2895 for my $child ($self->children) { 3516 for my $child ($self->children) {
2896 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3517 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2897 3518
2898 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3519 $X = $child->{force_x} if exists $child->{force_x};
2899 if exists $child->{req_x}; 3520 $Y = $child->{force_y} if exists $child->{force_y};
2900 3521
2901 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3522 $X = _to_pixel $X, $W, $self->{w};
2902 if exists $child->{req_y}; 3523 $Y = _to_pixel $Y, $H, $self->{h};
2903
2904 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2905 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2906 3524
2907 $child->configure ($X, $Y, $W, $H); 3525 $child->configure ($X, $Y, $W, $H);
2908 } 3526 }
2909} 3527}
2910 3528
… …
2921} 3539}
2922 3540
2923sub update { 3541sub update {
2924 my ($self) = @_; 3542 my ($self) = @_;
2925 3543
2926 $self->check_size;
2927 $::WANT_REFRESH++; 3544 $::WANT_REFRESH++;
2928} 3545}
2929 3546
2930sub add { 3547sub add {
2931 my ($self, @children) = @_; 3548 my ($self, @children) = @_;
2932 3549
2933 for my $child (@children) {
2934 $child->{toplevel} = 1; 3550 $_->{is_toplevel} = 1
2935 3551 for @children;
2936 # integerise window positions
2937 $child->{x} = int $child->{x};
2938 $child->{y} = int $child->{y};
2939 }
2940 3552
2941 $self->SUPER::add (@children); 3553 $self->SUPER::add (@children);
3554}
3555
3556sub remove {
3557 my ($self, @children) = @_;
3558
3559 $self->SUPER::remove (@children);
3560
3561 delete $self->{is_toplevel}
3562 for @children;
3563
3564 while (@children) {
3565 my $w = pop @children;
3566 push @children, $w->children;
3567 $w->set_invisible;
3568 }
2942} 3569}
2943 3570
2944sub on_refresh { 3571sub on_refresh {
2945 my ($self, $id, $cb) = @_; 3572 my ($self, $id, $cb) = @_;
2946 3573
… …
2959 while ($self->{refresh_hook}) { 3586 while ($self->{refresh_hook}) {
2960 $_->() 3587 $_->()
2961 for values %{delete $self->{refresh_hook}}; 3588 for values %{delete $self->{refresh_hook}};
2962 } 3589 }
2963 3590
2964 if ($self->{check_size}) { 3591 if ($self->{realloc}) {
2965 my @queue = ([], []); 3592 my %queue;
3593 my @queue;
3594 my $widget;
2966 3595
2967 for (;;) { 3596 outer:
2968 if ($self->{check_size}) { 3597 while () {
2969 # heuristic: check containers last 3598 if (my $realloc = delete $self->{realloc}) {
2970 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3599 for $widget (values %$realloc) {
2971 for values %{delete $self->{check_size}} 3600 $widget->{visible} or next; # do not resize invisible widgets
3601
3602 $queue{$widget+0}++ and next; # duplicates are common
3603
3604 push @{ $queue[$widget->{visible}] }, $widget;
3605 }
2972 } 3606 }
2973 3607
2974 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3608 while () {
3609 @queue or last outer;
2975 3610
2976 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3611 $widget = pop @{ $queue[-1] || [] }
2977 ? @$widget{qw(user_w user_h)} 3612 and last;
2978 : $widget->size_request;
2979
2980 if (delete $widget->{force_alloc}
2981 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2982 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2983 3613
3614 pop @queue;
3615 }
3616
3617 delete $queue{$widget+0};
3618
3619 my ($w, $h) = $widget->size_request;
3620
3621 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3622 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3623
3624 $w = $widget->{force_w} if exists $widget->{force_w};
3625 $h = $widget->{force_h} if exists $widget->{force_h};
3626
3627 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3628 || delete $widget->{force_realloc}) {
2984 $widget->{req_w} = $w; 3629 $widget->{req_w} = $w;
2985 $widget->{req_h} = $h; 3630 $widget->{req_h} = $h;
2986 3631
2987 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3632 $self->{size_alloc}{$widget+0} = $widget;
2988 3633
2989 $widget->{parent}->check_size
2990 if $widget->{parent}; 3634 if (my $parent = $widget->{parent}) {
3635 $self->{realloc}{$parent+0} = $parent
3636 unless $queue{$parent+0};
3637
3638 $parent->{force_size_alloc} = 1;
3639 $self->{size_alloc}{$parent+0} = $parent;
3640 }
2991 } 3641 }
3642
3643 delete $self->{realloc}{$widget+0};
2992 } 3644 }
2993 } 3645 }
2994 3646
2995 while ($self->{size_alloc}) { 3647 while (my $size_alloc = delete $self->{size_alloc}) {
2996 for (values %{delete $self->{size_alloc}}) { 3648 my @queue = sort { $b->{visible} <=> $a->{visible} }
2997 my ($widget, $w, $h) = @$_; 3649 values %$size_alloc;
3650
3651 while () {
3652 my $widget = pop @queue || last;
3653
3654 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
2998 3655
2999 $w = 0 if $w < 0; 3656 $w = 0 if $w < 0;
3000 $h = 0 if $h < 0; 3657 $h = 0 if $h < 0;
3001 3658
3659 $w = int $w + 0.5;
3660 $h = int $h + 0.5;
3661
3662 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3663 $widget->{old_w} = $widget->{w};
3664 $widget->{old_h} = $widget->{h};
3665
3002 $widget->{w} = $w; 3666 $widget->{w} = $w;
3003 $widget->{h} = $h; 3667 $widget->{h} = $h;
3004 $widget->size_allocate ($w, $h); 3668
3005 $widget->emit (size_allocate => $w, $h); 3669 $widget->emit (size_allocate => $w, $h);
3670 }
3006 } 3671 }
3007 } 3672 }
3008 3673
3009 while ($self->{post_alloc_hook}) { 3674 while ($self->{post_alloc_hook}) {
3010 $_->() 3675 $_->()
3011 for values %{delete $self->{post_alloc_hook}}; 3676 for values %{delete $self->{post_alloc_hook}};
3012 } 3677 }
3013 3678
3679
3014 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3680 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3015 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3681 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3016 glClear GL_COLOR_BUFFER_BIT; 3682 glClear GL_COLOR_BUFFER_BIT;
3017 3683
3018 glMatrixMode GL_PROJECTION; 3684 glMatrixMode GL_PROJECTION;
3019 glLoadIdentity; 3685 glLoadIdentity;
3020 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3686 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3021 glMatrixMode GL_MODELVIEW; 3687 glMatrixMode GL_MODELVIEW;
3022 glLoadIdentity; 3688 glLoadIdentity;
3023 3689
3690 {
3691 package CFClient::UI::Base;
3692
3693 ($draw_x, $draw_y, $draw_w, $draw_h) =
3694 (0, 0, $self->{w}, $self->{h});
3695 }
3696
3024 $self->_draw; 3697 $self->_draw;
3025} 3698}
3026 3699
3027############################################################################# 3700#############################################################################
3028 3701

Diff Legend

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