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.214 by root, Wed May 17 22:59:13 2006 UTC vs.
Revision 1.273 by root, Sat Jun 3 02:32:35 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})
… …
680 $self->SUPER::size_allocate ($w, $h); 821 $self->SUPER::size_allocate ($w, $h);
681 $self->update; 822 $self->update;
682} 823}
683 824
684sub _render { 825sub _render {
826 my ($self) = @_;
827
685 $_[0]{children}[0]->draw; 828 $self->{children}[0]->draw;
686} 829}
687 830
688sub render_child { 831sub render_child {
689 my ($self) = @_; 832 my ($self) = @_;
690 833
691 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 834 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
692 glClearColor 0, 0, 0, 0; 835 glClearColor 0, 0, 0, 0;
693 glClear GL_COLOR_BUFFER_BIT; 836 glClear GL_COLOR_BUFFER_BIT;
694 837
838 {
839 package CFClient::UI::Base;
840
841 ($draw_x, $draw_y, $draw_w, $draw_h) =
842 (0, 0, $self->{w}, $self->{h});
843 }
844
695 $self->_render; 845 $self->_render;
696# glColorMask 1, 1, 1, 0;
697# glEnable GL_BLEND;
698# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
699# glRasterPos 0, 0;
700# glCopyPixels 0, 0, $self->{w}, $self->{h};
701# glDisable GL_BLEND;
702# glColorMask 1, 1, 1, 1;
703 }; 846 };
704} 847}
705 848
706sub _draw { 849sub _draw {
707 my ($self) = @_; 850 my ($self) = @_;
708 851
709 my ($w, $h) = ($self->w, $self->h); 852 my ($w, $h) = @$self{qw(w h)};
710 853
711 my $tex = $self->{texture} 854 my $tex = $self->{texture}
712 or return; 855 or return;
713 856
714 glEnable GL_TEXTURE_2D; 857 glEnable GL_TEXTURE_2D;
715 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
716 glColor 0, 0, 0, 1; 859 glColor 1, 1, 1, 1;
717 860
718 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
719 862
720 glDisable GL_TEXTURE_2D; 863 glDisable GL_TEXTURE_2D;
721} 864}
… …
724 867
725package CFClient::UI::ViewPort; 868package CFClient::UI::ViewPort;
726 869
727our @ISA = CFClient::UI::Window::; 870our @ISA = CFClient::UI::Window::;
728 871
872sub new {
873 my $class = shift;
874
875 $class->SUPER::new (
876 scroll_x => 0,
877 scroll_y => 1,
878 @_,
879 )
880}
881
729sub size_request { 882sub size_request {
730 my ($self) = @_; 883 my ($self) = @_;
731 884
732 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 885 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
733 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
734 886
735 @$self{qw(child_w child_h)} 887 $w = 10 if $self->{scroll_x};
888 $h = 10 if $self->{scroll_y};
889
890 ($w, $h)
736} 891}
737 892
738sub size_allocate { 893sub size_allocate {
739 my ($self, $w, $h) = @_; 894 my ($self, $w, $h) = @_;
740 895
896 my $child = $self->child;
897
898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
900
901 $self->child->configure (0, 0, $w, $h);
741 $self->update; 902 $self->update;
742} 903}
743 904
744sub set_offset { 905sub set_offset {
745 my ($self, $x, $y) = @_; 906 my ($self, $x, $y) = @_;
… …
779} 940}
780 941
781sub _render { 942sub _render {
782 my ($self) = @_; 943 my ($self) = @_;
783 944
945 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
946 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
947
784 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 948 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
785 949
786 $self->SUPER::_render; 950 $self->SUPER::_render;
787} 951}
788 952
… …
791package CFClient::UI::ScrolledWindow; 955package CFClient::UI::ScrolledWindow;
792 956
793our @ISA = CFClient::UI::HBox::; 957our @ISA = CFClient::UI::HBox::;
794 958
795sub new { 959sub new {
796 my $class = shift; 960 my ($class, %arg) = @_;
961
962 my $child = delete $arg{child};
797 963
798 my $self; 964 my $self;
799 965
800 my $slider = new CFClient::UI::Slider 966 my $slider = new CFClient::UI::Slider
801 vertical => 1, 967 vertical => 1,
802 range => [0, 0, 1, 0.01], # HACK fix 968 range => [0, 0, 1, 0.01], # HACK fix
803 connect_changed => sub { 969 on_changed => sub {
804 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 970 $self->{vp}->set_offset (0, $_[1]);
805 }, 971 },
806 ; 972 ;
807 973
808 $self = $class->SUPER::new ( 974 $self = $class->SUPER::new (
809 vp => (new CFClient::UI::ViewPort), 975 vp => (new CFClient::UI::ViewPort expand => 1),
810 slider => $slider, 976 slider => $slider,
811 @_, 977 %arg,
812 ); 978 );
813 979
814 $self->{vp}->add ($self->{scrolled});
815 $self->add ($self->{vp});
816 $self->add ($self->{slider}); 980 $self->SUPER::add ($self->{vp}, $self->{slider});
981 $self->add ($child) if $child;
817 982
818 $self 983 $self
984}
985
986sub add {
987 my ($self, $widget) = @_;
988
989 $self->{vp}->add ($self->{child} = $widget);
990}
991
992sub update {
993 my ($self) = @_;
994
995 $self->SUPER::update;
996
997 # todo: overwrite size_allocate of child
998 my $child = $self->{vp}->child;
999 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1000}
1001
1002sub size_allocate {
1003 my ($self, $w, $h) = @_;
1004
1005 $self->SUPER::size_allocate ($w, $h);
1006
1007 my $child = $self->{vp}->child;
1008 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
819} 1009}
820 1010
821#TODO# update range on size_allocate depending on child 1011#TODO# update range on size_allocate depending on child
822# update viewport offset on scroll 1012# update viewport offset on scroll
823 1013
… …
867 1057
868our @ISA = CFClient::UI::Bin::; 1058our @ISA = CFClient::UI::Bin::;
869 1059
870use CFClient::OpenGL; 1060use CFClient::OpenGL;
871 1061
872my @tex = 1062my $bg =
1063 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1064 mipmap => 1, wrap => 1;
1065
1066my @border =
873 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1067 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
874 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1068 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
875 1069
876sub new { 1070sub new {
877 my $class = shift; 1071 my ($class, %arg) = @_;
878 1072
879 # TODO: user_x, user_y, overwrite moveto? 1073 my $title = delete $arg{title};
880 1074
881 my $self = $class->SUPER::new ( 1075 my $self = $class->SUPER::new (
882 bg => [1, 1, 1, 1], 1076 bg => [1, 1, 1, 1],
883 border_bg => [1, 1, 1, 1], 1077 border_bg => [1, 1, 1, 1],
884 border => 0.6, 1078 border => 0.6,
885 toplevel => 1,
886 can_events => 1, 1079 can_events => 1,
887 @_ 1080 min_w => 16,
1081 min_h => 16,
1082 %arg,
888 ); 1083 );
889 1084
890 $self->{title} &&= new CFClient::UI::Label 1085 $self->{title} = new CFClient::UI::Label
891 align => 0, 1086 align => 0,
892 valign => 1, 1087 valign => 1,
893 text => $self->{title}, 1088 text => $title,
894 fontsize => $self->{border}; 1089 fontsize => $self->{border}
1090 if defined $title;
895 1091
896 $self 1092 $self
1093}
1094
1095sub add {
1096 my ($self, @widgets) = @_;
1097
1098 $self->SUPER::add (@widgets);
1099 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
897} 1100}
898 1101
899sub border { 1102sub border {
900 int $_[0]{border} * $::FONTSIZE 1103 int $_[0]{border} * $::FONTSIZE
901} 1104}
902 1105
903sub size_request { 1106sub size_request {
904 my ($self) = @_; 1107 my ($self) = @_;
1108
1109 $self->{title}->size_request
1110 if $self->{title};
905 1111
906 my ($w, $h) = $self->SUPER::size_request; 1112 my ($w, $h) = $self->SUPER::size_request;
907 1113
908 ( 1114 (
909 $w + $self->border * 2, 1115 $w + $self->border * 2,
… …
912} 1118}
913 1119
914sub size_allocate { 1120sub size_allocate {
915 my ($self, $w, $h) = @_; 1121 my ($self, $w, $h) = @_;
916 1122
1123 if ($self->{title}) {
1124 $self->{title}{w} = $w;
1125 $self->{title}{h} = $h;
1126 $self->{title}->size_allocate ($w, $h);
1127 }
1128
1129 my $border = $self->border;
1130
917 $h -= List::Util::max 0, $self->border * 2; 1131 $h -= List::Util::max 0, $border * 2;
918 $w -= List::Util::max 0, $self->border * 2; 1132 $w -= List::Util::max 0, $border * 2;
919 1133
920 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
921 if $self->{title};
922
923 $self->child->configure ($self->border, $self->border, $w, $h); 1134 $self->child->configure ($border, $border, $w, $h);
924} 1135}
925 1136
926sub button_down { 1137sub button_down {
927 my ($self, $ev, $x, $y) = @_; 1138 my ($self, $ev, $x, $y) = @_;
928 1139
… …
944 my ($ev, $x, $y) = @_; 1155 my ($ev, $x, $y) = @_;
945 1156
946 my $dx = $ev->{x} - $ox; 1157 my $dx = $ev->{x} - $ox;
947 my $dy = $ev->{y} - $oy; 1158 my $dy = $ev->{y} - $oy;
948 1159
949 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1160 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
950 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1161 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1162
1163 $self->realloc;
951 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
952 $self->check_size;
953 }; 1165 };
954 1166
955 } elsif ($lr ^ $td) { 1167 } elsif ($lr ^ $td) {
956 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1168 my ($ox, $oy) = ($ev->{x}, $ev->{y});
957 my ($bx, $by) = ($self->{x}, $self->{y}); 1169 my ($bx, $by) = ($self->{x}, $self->{y});
… …
959 $self->{motion} = sub { 1171 $self->{motion} = sub {
960 my ($ev, $x, $y) = @_; 1172 my ($ev, $x, $y) = @_;
961 1173
962 ($x, $y) = ($ev->{x}, $ev->{y}); 1174 ($x, $y) = ($ev->{x}, $ev->{y});
963 1175
964 $self->move ($bx + $x - $ox, $by + $y - $oy); 1176 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
965 $self->update;
966 }; 1177 };
1178 } else {
1179 return 0;
1180 }
1181
967 } 1182 1
968} 1183}
969 1184
970sub button_up { 1185sub button_up {
971 my ($self, $ev, $x, $y) = @_; 1186 my ($self, $ev, $x, $y) = @_;
972 1187
973 delete $self->{motion}; 1188 !!delete $self->{motion}
974} 1189}
975 1190
976sub mouse_motion { 1191sub mouse_motion {
977 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
978 1193
979 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1194 $self->{motion}->($ev, $x, $y) if $self->{motion};
1195
1196 !!$self->{motion}
980} 1197}
981 1198
982sub _draw { 1199sub _draw {
983 my ($self) = @_; 1200 my ($self) = @_;
984 1201
1202 my $child = $self->{children}[0];
1203
985 my ($w, $h ) = ($self->{w}, $self->{h}); 1204 my ($w, $h ) = ($self->{w}, $self->{h});
986 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1205 my ($cw, $ch) = ($child->{w}, $child->{h});
987 1206
988 glEnable GL_TEXTURE_2D; 1207 glEnable GL_TEXTURE_2D;
989 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1208 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
990 1209
991 my $border = $self->border; 1210 my $border = $self->border;
992 1211
993 glColor @{ $self->{border_bg} }; 1212 glColor @{ $self->{border_bg} };
994 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1213 $border[0]->draw_quad_alpha (0, 0, $w, $border);
995 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1214 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
996 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1215 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
997 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1216 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
998 1217
999 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1218 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1000 my $bg = $tex[0]; 1219 glColor @{ $self->{bg} };
1001 1220
1002 # TODO: repeat texture not scale 1221 # TODO: repeat texture not scale
1222 # solve this better(?)
1003 my $rep_x = $cw / $bg->{w}; 1223 $bg->{s} = $cw / $bg->{w};
1004 my $rep_y = $ch / $bg->{h}; 1224 $bg->{t} = $ch / $bg->{h};
1005
1006 glColor @{ $self->{bg} };
1007
1008 $bg->{s} = $rep_x;
1009 $bg->{t} = $rep_y;
1010 $bg->{wrap_mode} = 1;
1011 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1225 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1012 } 1226 }
1013 1227
1014 glDisable GL_TEXTURE_2D; 1228 glDisable GL_TEXTURE_2D;
1015 1229
1016 $self->{title}->draw if $self->{title};
1017
1018 $self->child->draw; 1230 $child->draw;
1231
1232 if ($self->{title}) {
1233 glTranslate 0, $border - $self->{h};
1234 $self->{title}->_draw;
1235 }
1019} 1236}
1020 1237
1021############################################################################# 1238#############################################################################
1022 1239
1023package CFClient::UI::Table; 1240package CFClient::UI::Table;
… …
1031sub new { 1248sub new {
1032 my $class = shift; 1249 my $class = shift;
1033 1250
1034 $class->SUPER::new ( 1251 $class->SUPER::new (
1035 col_expand => [], 1252 col_expand => [],
1036 @_ 1253 @_,
1037 ) 1254 )
1255}
1256
1257sub children {
1258 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1038} 1259}
1039 1260
1040sub add { 1261sub add {
1041 my ($self, $x, $y, $child) = @_; 1262 my ($self, $x, $y, $child) = @_;
1042 1263
1043 $child->set_parent ($self); 1264 $child->set_parent ($self);
1044 $self->{children}[$y][$x] = $child; 1265 $self->{children}[$y][$x] = $child;
1045 1266
1046 $child->check_size; 1267 $self->realloc;
1047} 1268}
1048 1269
1049sub children {
1050 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1051}
1052
1053# TODO: move to container class maybe? send childs a signal on removal? 1270# TODO: move to container class maybe? send children a signal on removal?
1054sub clear { 1271sub clear {
1055 my ($self) = @_; 1272 my ($self) = @_;
1056 1273
1057 my @children = $self->children; 1274 my @children = $self->children;
1058 delete $self->{children}; 1275 delete $self->{children};
… …
1060 for (@children) { 1277 for (@children) {
1061 delete $_->{parent}; 1278 delete $_->{parent};
1062 $_->hide; 1279 $_->hide;
1063 } 1280 }
1064 1281
1065 $self->update; 1282 $self->realloc;
1066} 1283}
1067 1284
1068sub get_wh { 1285sub get_wh {
1069 my ($self) = @_; 1286 my ($self) = @_;
1070 1287
… …
1101sub size_allocate { 1318sub size_allocate {
1102 my ($self, $w, $h) = @_; 1319 my ($self, $w, $h) = @_;
1103 1320
1104 my ($ws, $hs) = $self->get_wh; 1321 my ($ws, $hs) = $self->get_wh;
1105 1322
1106 my $req_w = sum @$ws; 1323 my $req_w = (sum @$ws) || 1;
1107 my $req_h = sum @$hs; 1324 my $req_h = (sum @$hs) || 1;
1108 1325
1109 # TODO: nicer code && do row_expand 1326 # TODO: nicer code && do row_expand
1110 my @col_expand = @{$self->{col_expand}}; 1327 my @col_expand = @{$self->{col_expand}};
1111 @col_expand = (1) x @$ws unless @col_expand; 1328 @col_expand = (1) x @$ws unless @col_expand;
1112 my $col_expand = (sum @col_expand) || 1; 1329 my $col_expand = (sum @col_expand) || 1;
… …
1166 } 1383 }
1167} 1384}
1168 1385
1169############################################################################# 1386#############################################################################
1170 1387
1171package CFClient::UI::HBox; 1388package CFClient::UI::Box;
1172
1173# TODO: wrap into common Box base class
1174 1389
1175our @ISA = CFClient::UI::Container::; 1390our @ISA = CFClient::UI::Container::;
1176 1391
1177sub size_request { 1392sub size_request {
1178 my ($self) = @_; 1393 my ($self) = @_;
1179 1394
1180 my @alloc = map [$_->size_request], @{$self->{children}}; 1395 $self->{vertical}
1181 1396 ? (
1182 ( 1397 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1183 (List::Util::sum map $_->[0], @alloc), 1398 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1184 (List::Util::max map $_->[1], @alloc), 1399 )
1185 ) 1400 : (
1401 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1402 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1403 )
1186} 1404}
1187 1405
1188sub size_allocate { 1406sub size_allocate {
1189 my ($self, $w, $h) = @_; 1407 my ($self, $w, $h) = @_;
1190 1408
1191 ($h, $w) = ($w, $h); 1409 my $space = $self->{vertical} ? $h : $w;
1192
1193 my $children = $self->{children}; 1410 my $children = $self->{children};
1194 1411
1195 my @h = map $_->{req_w}, @$children; 1412 my @req;
1196 1413
1197 my $req_h = List::Util::sum @h; 1414 if ($self->{homogeneous}) {
1198 1415 @req = ($space / (@$children || 1)) x @$children;
1199 if ($req_h > $h) {
1200 # ah well, not enough space
1201 $_ *= $h / $req_h for @h;
1202 } else { 1416 } else {
1417 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1418 my $req = List::Util::sum @req;
1419
1420 if ($req > $space) {
1421 # ah well, not enough space
1422 $_ *= $space / $req for @req;
1423 } else {
1203 my $exp = List::Util::sum map $_->{expand}, @$children; 1424 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1204 $exp ||= 1;
1205 1425
1426 $space = ($space - $req) / $expand; # remaining space to give away
1427
1428 $req[$_] += $space * $children->[$_]{expand}
1206 for (0 .. $#$children) { 1429 for 0 .. $#$children;
1207 my $child = $children->[$_];
1208
1209 my $alloc_h = $h[$_];
1210 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1211 $h[$_] = $alloc_h;
1212 } 1430 }
1213 } 1431 }
1214 1432
1215 CFClient::UI::harmonize \@h; 1433 CFClient::UI::harmonize \@req;
1216 1434
1217 my $y = 0; 1435 my $pos = 0;
1218 for (0 .. $#$children) { 1436 for (0 .. $#$children) {
1219 my $child = $children->[$_];
1220 my $h = $h[$_]; 1437 my $alloc = $req[$_];
1221 $child->configure ($y, 0, $h, $w); 1438 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1222 1439
1223 $y += $h; 1440 $pos += $alloc;
1224 } 1441 }
1225 1442
1226 1 1443 1
1227} 1444}
1228 1445
1229############################################################################# 1446#############################################################################
1230 1447
1448package CFClient::UI::HBox;
1449
1450our @ISA = CFClient::UI::Box::;
1451
1452sub new {
1453 my $class = shift;
1454
1455 $class->SUPER::new (
1456 vertical => 0,
1457 @_,
1458 )
1459}
1460
1461#############################################################################
1462
1231package CFClient::UI::VBox; 1463package CFClient::UI::VBox;
1232 1464
1233# TODO: wrap into common Box base class
1234
1235our @ISA = CFClient::UI::Container::; 1465our @ISA = CFClient::UI::Box::;
1236 1466
1237sub size_request { 1467sub new {
1238 my ($self) = @_; 1468 my $class = shift;
1239 1469
1240 my @alloc = map [$_->size_request], @{$self->{children}}; 1470 $class->SUPER::new (
1241 1471 vertical => 1,
1242 ( 1472 @_,
1243 (List::Util::max map $_->[0], @alloc),
1244 (List::Util::sum map $_->[1], @alloc),
1245 ) 1473 )
1246}
1247
1248sub size_allocate {
1249 my ($self, $w, $h) = @_;
1250
1251 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1252
1253 my $children = $self->{children};
1254
1255 my @h = map $_->{req_h}, @$children;
1256
1257 my $req_h = List::Util::sum @h;
1258
1259 if ($req_h > $h) {
1260 # ah well, not enough space
1261 $_ *= $h / $req_h for @h;
1262 } else {
1263 my $exp = List::Util::sum map $_->{expand}, @$children;
1264 $exp ||= 1;
1265
1266 for (0 .. $#$children) {
1267 my $child = $children->[$_];
1268
1269 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1270 }
1271 }
1272
1273 CFClient::UI::harmonize \@h;
1274
1275 my $y = 0;
1276 for (0 .. $#$children) {
1277 my $child = $children->[$_];
1278 my $h = $h[$_];
1279 $child->configure (0, $y, $w, $h);
1280
1281 $y += $h;
1282 }
1283
1284 1
1285} 1474}
1286 1475
1287############################################################################# 1476#############################################################################
1288 1477
1289package CFClient::UI::Label; 1478package CFClient::UI::Label;
… …
1306 ellipsise => 3, # end 1495 ellipsise => 3, # end
1307 layout => (new CFClient::Layout), 1496 layout => (new CFClient::Layout),
1308 fontsize => 1, 1497 fontsize => 1,
1309 align => -1, 1498 align => -1,
1310 valign => -1, 1499 valign => -1,
1311 padding => 2, 1500 padding_x => 2,
1501 padding_y => 2,
1312 can_events => 0, 1502 can_events => 0,
1313 %arg 1503 %arg
1314 ); 1504 );
1315 1505
1316 if (exists $self->{template}) { 1506 if (exists $self->{template}) {
… …
1352 $self->{text} = "T$text"; 1542 $self->{text} = "T$text";
1353 1543
1354 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1544 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1355 $self->{layout}->set_text ($text); 1545 $self->{layout}->set_text ($text);
1356 1546
1547 $self->realloc;
1357 $self->update; 1548 $self->update;
1358 $self->check_size;
1359} 1549}
1360 1550
1361sub set_markup { 1551sub set_markup {
1362 my ($self, $markup) = @_; 1552 my ($self, $markup) = @_;
1363 1553
… …
1367 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1557 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1368 1558
1369 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1559 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1370 $self->{layout}->set_markup ($markup); 1560 $self->{layout}->set_markup ($markup);
1371 1561
1562 $self->realloc;
1372 $self->update; 1563 $self->update;
1373 $self->check_size;
1374} 1564}
1375 1565
1376sub size_request { 1566sub size_request {
1377 my ($self) = @_; 1567 my ($self) = @_;
1378 1568
… …
1392 1582
1393 $w = List::Util::max $w, $w2; 1583 $w = List::Util::max $w, $w2;
1394 $h = List::Util::max $h, $h2; 1584 $h = List::Util::max $h, $h2;
1395 } 1585 }
1396 1586
1397 ( 1587 ($w, $h)
1398 $w + $self->{padding} * 2,
1399 $h + $self->{padding} * 2,
1400 )
1401} 1588}
1402 1589
1403sub size_allocate { 1590sub size_allocate {
1404 my ($self, $w, $h) = @_; 1591 my ($self, $w, $h) = @_;
1405 1592
1593 delete $self->{ox};
1594
1406 delete $self->{texture}; 1595 delete $self->{texture}
1596 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1407} 1597}
1408 1598
1409sub set_fontsize { 1599sub set_fontsize {
1410 my ($self, $fontsize) = @_; 1600 my ($self, $fontsize) = @_;
1411 1601
1412 $self->{fontsize} = $fontsize; 1602 $self->{fontsize} = $fontsize;
1413 delete $self->{texture}; 1603 delete $self->{texture};
1414 1604
1415 $self->update; 1605 $self->realloc;
1416 $self->check_size;
1417} 1606}
1418 1607
1419sub _draw { 1608sub _draw {
1420 my ($self) = @_; 1609 my ($self) = @_;
1421 1610
… …
1427 $self->{layout}->set_width ($self->{w}); 1616 $self->{layout}->set_width ($self->{w});
1428 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1617 $self->{layout}->set_ellipsise ($self->{ellipsise});
1429 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1618 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1430 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1619 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1431 1620
1432 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1621 new_from_layout CFClient::Texture $self->{layout}
1622 };
1433 1623
1624 unless (exists $self->{ox}) {
1434 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1625 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1435 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1626 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1436 : ($self->{w} - $tex->{w}) * 0.5); 1627 : ($self->{w} - $tex->{w}) * 0.5);
1437 1628
1438 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1629 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1439 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1630 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1440 : ($self->{h} - $tex->{h}) * 0.5); 1631 : ($self->{h} - $tex->{h}) * 0.5);
1441
1442 $tex
1443 }; 1632 };
1444 1633
1445 glEnable GL_TEXTURE_2D; 1634 glEnable GL_TEXTURE_2D;
1446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1447 1636
… …
1473 active_fg => [0, 0, 0], 1662 active_fg => [0, 0, 0],
1474 can_hover => 1, 1663 can_hover => 1,
1475 can_focus => 1, 1664 can_focus => 1,
1476 valign => 0, 1665 valign => 0,
1477 can_events => 1, 1666 can_events => 1,
1667 #text => ...
1478 @_ 1668 @_
1479 ) 1669 )
1480} 1670}
1481 1671
1482sub _set_text { 1672sub _set_text {
… …
1492 $self->{text} = $text; 1682 $self->{text} = $text;
1493 1683
1494 $text =~ s/./*/g if $self->{hidden}; 1684 $text =~ s/./*/g if $self->{hidden};
1495 $self->{layout}->set_text ("$text "); 1685 $self->{layout}->set_text ("$text ");
1496 1686
1497 $self->emit (changed => $self->{text}); 1687 $self->_emit (changed => $self->{text});
1498} 1688}
1499 1689
1500sub set_text { 1690sub set_text {
1501 my ($self, $text) = @_; 1691 my ($self, $text) = @_;
1502 1692
1503 $self->{cursor} = length $text; 1693 $self->{cursor} = length $text;
1504 $self->_set_text ($text); 1694 $self->_set_text ($text);
1505 $self->update; 1695
1506 $self->check_size; 1696 $self->realloc;
1507} 1697}
1508 1698
1509sub get_text { 1699sub get_text {
1510 $_[0]{text} 1700 $_[0]{text}
1511} 1701}
… …
1514 my ($self) = @_; 1704 my ($self) = @_;
1515 1705
1516 my ($w, $h) = $self->SUPER::size_request; 1706 my ($w, $h) = $self->SUPER::size_request;
1517 1707
1518 ($w + 1, $h) # add 1 for cursor 1708 ($w + 1, $h) # add 1 for cursor
1519}
1520
1521sub size_allocate {
1522 my ($self, $w, $h) = @_;
1523
1524 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1525} 1709}
1526 1710
1527sub key_down { 1711sub key_down {
1528 my ($self, $ev) = @_; 1712 my ($self, $ev) = @_;
1529 1713
… …
1544 } elsif ($sym == CFClient::SDLK_HOME) { 1728 } elsif ($sym == CFClient::SDLK_HOME) {
1545 $self->{cursor} = 0; 1729 $self->{cursor} = 0;
1546 } elsif ($sym == CFClient::SDLK_END) { 1730 } elsif ($sym == CFClient::SDLK_END) {
1547 $self->{cursor} = length $text; 1731 $self->{cursor} = length $text;
1548 } elsif ($uni == 27) { 1732 } elsif ($uni == 27) {
1549 $self->emit ('escape'); 1733 $self->_emit ('escape');
1550 } elsif ($uni) { 1734 } elsif ($uni) {
1551 substr $text, $self->{cursor}++, 0, chr $uni; 1735 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else {
1737 return 0;
1552 } 1738 }
1553 1739
1554 $self->_set_text ($text); 1740 $self->_set_text ($text);
1555 $self->update; 1741
1556 $self->check_size; 1742 $self->realloc;
1743
1744 1
1557} 1745}
1558 1746
1559sub focus_in { 1747sub focus_in {
1560 my ($self) = @_; 1748 my ($self) = @_;
1561 1749
… …
1576 utf8::encode $text; 1764 utf8::encode $text;
1577 $self->{cursor} = length substr $text, 0, $idx; 1765 $self->{cursor} = length substr $text, 0, $idx;
1578 1766
1579 $self->_set_text ($self->{text}); 1767 $self->_set_text ($self->{text});
1580 $self->update; 1768 $self->update;
1769
1770 1
1581} 1771}
1582 1772
1583sub mouse_motion { 1773sub mouse_motion {
1584 my ($self, $ev, $x, $y) = @_; 1774 my ($self, $ev, $x, $y) = @_;
1585# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1775# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1776
1777 0
1586} 1778}
1587 1779
1588sub _draw { 1780sub _draw {
1589 my ($self) = @_; 1781 my ($self) = @_;
1590 1782
… …
1641 if ($sym == 13) { 1833 if ($sym == 13) {
1642 unshift @{$self->{history}}, 1834 unshift @{$self->{history}},
1643 my $txt = $self->get_text; 1835 my $txt = $self->get_text;
1644 $self->{history_pointer} = -1; 1836 $self->{history_pointer} = -1;
1645 $self->{history_saveback} = ''; 1837 $self->{history_saveback} = '';
1646 $self->emit (activate => $txt); 1838 $self->_emit (activate => $txt);
1647 $self->update; 1839 $self->update;
1648 1840
1649 } elsif ($sym == CFClient::SDLK_UP) { 1841 } elsif ($sym == CFClient::SDLK_UP) {
1650 if ($self->{history_pointer} < 0) { 1842 if ($self->{history_pointer} < 0) {
1651 $self->{history_saveback} = $self->get_text; 1843 $self->{history_saveback} = $self->get_text;
… …
1667 } else { 1859 } else {
1668 $self->set_text ($self->{history_saveback}); 1860 $self->set_text ($self->{history_saveback});
1669 } 1861 }
1670 1862
1671 } else { 1863 } else {
1672 $self->SUPER::key_down ($ev); 1864 return $self->SUPER::key_down ($ev)
1865 }
1866
1673 } 1867 1
1674
1675} 1868}
1676 1869
1677############################################################################# 1870#############################################################################
1678 1871
1679package CFClient::UI::Button; 1872package CFClient::UI::Button;
… …
1688 1881
1689sub new { 1882sub new {
1690 my $class = shift; 1883 my $class = shift;
1691 1884
1692 $class->SUPER::new ( 1885 $class->SUPER::new (
1693 padding => 4, 1886 padding_x => 4,
1887 padding_y => 4,
1694 fg => [1, 1, 1], 1888 fg => [1, 1, 1],
1695 active_fg => [0, 0, 1], 1889 active_fg => [0, 0, 1],
1696 can_hover => 1, 1890 can_hover => 1,
1697 align => 0, 1891 align => 0,
1698 valign => 0, 1892 valign => 0,
1699 can_events => 1, 1893 can_events => 1,
1700 @_ 1894 @_
1701 ) 1895 )
1702} 1896}
1703 1897
1898sub activate { }
1899
1704sub button_up { 1900sub button_up {
1705 my ($self, $ev, $x, $y) = @_; 1901 my ($self, $ev, $x, $y) = @_;
1706 1902
1903 $self->emit ("activate")
1707 if ($x >= 0 && $x < $self->{w} 1904 if $x >= 0 && $x < $self->{w}
1708 && $y >= 0 && $y < $self->{h}) { 1905 && $y >= 0 && $y < $self->{h};
1709 $self->emit ("activate"); 1906
1710 } 1907 1
1711} 1908}
1712 1909
1713sub _draw { 1910sub _draw {
1714 my ($self) = @_; 1911 my ($self) = @_;
1715 1912
… …
1744 1941
1745sub new { 1942sub new {
1746 my $class = shift; 1943 my $class = shift;
1747 1944
1748 $class->SUPER::new ( 1945 $class->SUPER::new (
1749 padding => 2, 1946 padding_x => 2,
1947 padding_y => 2,
1750 fg => [1, 1, 1], 1948 fg => [1, 1, 1],
1751 active_fg => [1, 1, 0], 1949 active_fg => [1, 1, 0],
1752 bg => [0, 0, 0, 0.2], 1950 bg => [0, 0, 0, 0.2],
1753 active_bg => [1, 1, 1, 0.5], 1951 active_bg => [1, 1, 1, 0.5],
1754 state => 0, 1952 state => 0,
… …
1758} 1956}
1759 1957
1760sub size_request { 1958sub size_request {
1761 my ($self) = @_; 1959 my ($self) = @_;
1762 1960
1763 ($self->{padding} * 2 + 6) x 2 1961 (6) x 2
1764} 1962}
1765 1963
1766sub button_down { 1964sub button_down {
1767 my ($self, $ev, $x, $y) = @_; 1965 my ($self, $ev, $x, $y) = @_;
1768 1966
1769 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1967 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1770 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1968 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1771 $self->{state} = !$self->{state}; 1969 $self->{state} = !$self->{state};
1772 $self->emit (changed => $self->{state}); 1970 $self->_emit (changed => $self->{state});
1971 } else {
1972 return 0
1973 }
1974
1773 } 1975 1
1774} 1976}
1775 1977
1776sub _draw { 1978sub _draw {
1777 my ($self) = @_; 1979 my ($self) = @_;
1778 1980
1779 $self->SUPER::_draw; 1981 $self->SUPER::_draw;
1780 1982
1781 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1983 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1782 1984
1783 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1985 my ($w, $h) = @$self{qw(w h)};
1986
1987 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1784 1988
1785 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1989 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1786 1990
1787 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1991 my $tex = $self->{state} ? $tex[1] : $tex[0];
1788 1992
… …
2052 my $self = $class->SUPER::new ( 2256 my $self = $class->SUPER::new (
2053 fg => [1, 1, 1], 2257 fg => [1, 1, 1],
2054 active_fg => [0, 0, 0], 2258 active_fg => [0, 0, 0],
2055 bg => [0, 0, 0, 0.2], 2259 bg => [0, 0, 0, 0.2],
2056 active_bg => [1, 1, 1, 0.5], 2260 active_bg => [1, 1, 1, 0.5],
2057 range => [0, 0, 100, 10], 2261 range => [0, 0, 100, 10, 0],
2058 req_w => $::WIDTH / 80, 2262 min_w => $::WIDTH / 80,
2059 req_h => $::WIDTH / 80, 2263 min_h => $::WIDTH / 80,
2060 vertical => 0, 2264 vertical => 0,
2061 can_hover => 1, 2265 can_hover => 1,
2062 inner_pad => .05, 2266 inner_pad => 0.02,
2063 @_ 2267 @_
2064 ); 2268 );
2065 2269
2066 $self->set_value ($self->{range}[0]); 2270 $self->set_value ($self->{range}[0]);
2067 $self->update; 2271 $self->update;
2068 2272
2069 $self 2273 $self
2070} 2274}
2071 2275
2276sub changed { }
2277
2278sub set_range {
2279 my ($self, $range) = @_;
2280
2281 ($range, $self->{range}) = ($self->{range}, $range);
2282
2283 $self->update
2284 if "@$range" ne "@{$self->{range}}";
2285}
2286
2072sub set_value { 2287sub set_value {
2073 my ($self, $value) = @_; 2288 my ($self, $value) = @_;
2074 2289
2075 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2290 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2076 2291
2077 $hi = $lo + 1 if $hi <= $lo; 2292 $hi = $lo + 1 if $hi <= $lo;
2078 2293
2294 $page = $hi - $lo if $page > $hi - $lo;
2295
2079 $value = $lo if $value < $lo; 2296 $value = $lo if $value < $lo;
2080 $value = $hi if $value > $hi; 2297 $value = $hi - $page if $value > $hi - $page;
2081 2298
2082 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2299 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2083 if $unit; 2300 if $unit;
2084 2301
2085 $page = $hi - $lo if $page > $hi - $lo;
2086
2087 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2302 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2088 2303
2089 if ($value != $old_value) { 2304 if ($value != $old_value) {
2090 $self->emit (changed => $value); 2305 $self->_emit (changed => $value);
2091 $self->update; 2306 $self->update;
2092 } 2307 }
2093} 2308}
2094 2309
2095sub size_request { 2310sub size_request {
2096 my ($self) = @_; 2311 my ($self) = @_;
2097 2312
2098 my $w = $self->{req_w}; 2313 ($self->{req_w}, $self->{req_h})
2099 my $h = $self->{req_h};
2100
2101 $self->{vertical} ? ($h, $w) : ($w, $h)
2102} 2314}
2103 2315
2104sub button_down { 2316sub button_down {
2105 my ($self, $ev, $x, $y) = @_; 2317 my ($self, $ev, $x, $y) = @_;
2106 2318
2107 $self->SUPER::button_down ($ev, $x, $y); 2319 $self->SUPER::button_down ($ev, $x, $y);
2320
2321 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2322
2108 $self->mouse_motion ($ev, $x, $y); 2323 $self->mouse_motion ($ev, $x, $y)
2109} 2324}
2110 2325
2111sub mouse_motion { 2326sub mouse_motion {
2112 my ($self, $ev, $x, $y) = @_; 2327 my ($self, $ev, $x, $y) = @_;
2113 2328
2114 if ($GRAB == $self) { 2329 if ($GRAB == $self) {
2115 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2330 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2116 2331
2117 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2332 my (undef, $lo, $hi, $page) = @{$self->{range}};
2118 2333
2119 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2334 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2120 2335
2121 $self->set_value ($x * ($hi - $lo) + $lo); 2336 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2337 } else {
2338 return 0;
2339 }
2340
2122 } 2341 1
2123} 2342}
2124 2343
2125sub update { 2344sub update {
2126 my ($self) = @_; 2345 my ($self) = @_;
2127 2346
2128 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2347 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2129 $self->set_value ($self->{range}[0]); 2348 $self->set_value ($self->{range}[0]);
2130 2349
2131 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2350 my ($value, $lo, $hi, $page) = @{$self->{range}};
2351 my $range = ($hi - $page - $lo) || 1e-100;
2132 2352
2133 my $inner_w = 1 - 2 * $self->{inner_pad}; 2353 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2134 2354
2135 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2355 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2356 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2136 2357
2137 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2358 $value = ($value - $lo) / $range;
2138 $value = $self->{scale} * ($value - $lo); 2359 $value = $value * $self->{scale} + $self->{offset};
2139 2360
2140 $value = $self->{inner_pad} + ($value - $page * 0.5);
2141
2142 $value = 0 if $value < 0;
2143 $page = 1 - $value if $value + $page > 1;
2144
2145 $self->{knob_x} = $value; 2361 $self->{knob_x} = $value - $knob_w * 0.5;
2146 $self->{knob_w} = $page; 2362 $self->{knob_w} = $knob_w;
2147 }); 2363 });
2148 2364
2149 $self->SUPER::update; 2365 $self->SUPER::update;
2150} 2366}
2151 2367
… …
2175 # draw handle 2391 # draw handle
2176 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2392 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2177 2393
2178 glDisable GL_TEXTURE_2D; 2394 glDisable GL_TEXTURE_2D;
2179} 2395}
2396
2397#############################################################################
2398
2399package CFClient::UI::ValSlider;
2400
2401our @ISA = CFClient::UI::HBox::;
2402
2403sub new {
2404 my ($class, %arg) = @_;
2405
2406 my $range = delete $arg{range};
2407
2408 my $self = $class->SUPER::new (
2409 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2410 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2411 to_value => sub { shift },
2412 from_value => sub { shift },
2413 %arg,
2414 );
2415
2416 $self->{slider}->connect (changed => sub {
2417 my ($self, $value) = @_;
2418 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2419 $self->{parent}->emit (changed => $value);
2420 });
2421
2422# $self->{entry}->connect (changed => sub {
2423# my ($self, $value) = @_;
2424# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2425# $self->{parent}->emit (changed => $value);
2426# });
2427
2428 $self->add ($self->{slider}, $self->{entry});
2429
2430 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2431
2432 $self
2433}
2434
2435sub set_range { shift->{slider}->set_range (@_) }
2436sub set_value { shift->{slider}->set_value (@_) }
2180 2437
2181############################################################################# 2438#############################################################################
2182 2439
2183package CFClient::UI::TextView; 2440package CFClient::UI::TextView;
2184 2441
… …
2214 2471
2215 $self->{fontsize} = $fontsize; 2472 $self->{fontsize} = $fontsize;
2216 $self->reflow; 2473 $self->reflow;
2217} 2474}
2218 2475
2219sub text_height {
2220 my ($self, $text) = @_;
2221
2222 my $layout = $self->{layout};
2223
2224 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2225 $layout->set_width ($self->{children}[0]{w});
2226 $layout->set_markup ($text);
2227
2228 ($layout->size)[1]
2229}
2230
2231sub reflow {
2232 my ($self) = @_;
2233
2234 $self->{need_reflow}++;
2235 $self->update;
2236}
2237
2238sub size_allocate { 2476sub size_allocate {
2239 my ($self, $w, $h) = @_; 2477 my ($self, $w, $h) = @_;
2240 2478
2241 $self->SUPER::size_allocate ($w, $h); 2479 $self->SUPER::size_allocate ($w, $h);
2242 2480
… …
2245 $self->{layout}->set_width ($self->{children}[0]{w}); 2483 $self->{layout}->set_width ($self->{children}[0]{w});
2246 2484
2247 $self->reflow; 2485 $self->reflow;
2248} 2486}
2249 2487
2488sub text_size {
2489 my ($self, $text, $indent) = @_;
2490
2491 my $layout = $self->{layout};
2492
2493 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2494 $layout->set_width ($self->{children}[0]{w} - $indent);
2495 $layout->set_markup ($text);
2496
2497 $layout->size
2498}
2499
2500sub reflow {
2501 my ($self) = @_;
2502
2503 $self->{need_reflow}++;
2504 $self->update;
2505}
2506
2507sub set_offset {
2508 my ($self, $offset) = @_;
2509
2510 # todo: base offset on lines or so, not on pixels
2511 $self->{children}[1]->set_value ($offset);
2512}
2513
2514sub clear {
2515 my ($self) = @_;
2516
2517 $self->{par} = [];
2518 $self->{height} = 0;
2519 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2520}
2521
2250sub add_paragraph { 2522sub add_paragraph {
2251 my ($self, $color, $text) = @_; 2523 my ($self, $color, $text, $indent) = @_;
2252 2524
2253 #TODO: intelligently "reformat" paragraph 2525 for my $line (split /\n/, $text) {
2254 2526 my ($w, $h) = $self->text_size ($line);
2255 my $height = $self->text_height ($text);
2256
2257 $self->{height} += $height; 2527 $self->{height} += $h;
2528 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2529 }
2258 2530
2259 push @{$self->{par}}, [$height, $color, $text];
2260
2261 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2531 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2262 $self->{children}[1]->update;
2263} 2532}
2264 2533
2265sub update { 2534sub update {
2266 my ($self) = @_; 2535 my ($self) = @_;
2267 2536
… …
2270 return unless $self->{h} > 0; 2539 return unless $self->{h} > 0;
2271 2540
2272 delete $self->{texture}; 2541 delete $self->{texture};
2273 2542
2274 $ROOT->on_post_alloc ($self, sub { 2543 $ROOT->on_post_alloc ($self, sub {
2544 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2545
2275 if (delete $self->{need_reflow}) { 2546 if (delete $self->{need_reflow}) {
2276 my $height = 0; 2547 my $height = 0;
2277 2548
2278 $height += $_->[0] = $self->text_height ($_->[2]) 2549 my $layout = $self->{layout};
2550
2551 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2552
2279 for @{$self->{par}}; 2553 for (@{$self->{par}}) {
2554 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2555 $layout->set_width ($W - $_->[3]);
2556 $layout->set_markup ($_->[4]);
2557 my ($w, $h) = $layout->size;
2558 $_->[0] = $w + $_->[3];
2559 $_->[1] = $h;
2560 }
2561
2562 $height += $_->[1];
2563 }
2280 2564
2281 $self->{height} = $height; 2565 $self->{height} = $height;
2282 2566
2283 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2567 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2284 2568
2285 delete $self->{texture}; 2569 delete $self->{texture};
2286 } 2570 }
2287 2571
2288 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2289 glClearColor 0, 0, 0, 0; 2573 glClearColor 0.5, 0.5, 0.5, 0;
2290 glClear GL_COLOR_BUFFER_BIT; 2574 glClear GL_COLOR_BUFFER_BIT;
2291 2575
2292 glEnable GL_TEXTURE_2D;
2293 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2294
2295 my $top = int $self->{children}[1]{range}[0]; 2576 my $top = int $self->{children}[1]{range}[0];
2296 2577
2297 my $y0 = $top; 2578 my $y0 = $top;
2298 my $y1 = $top + $self->{h}; 2579 my $y1 = $top + $H;
2299 2580
2300 my $y = 0; 2581 my $y = 0;
2301 2582
2302 my $layout = $self->{layout}; 2583 my $layout = $self->{layout};
2303 2584
2304 $layout->set_font ($self->{font}) if $self->{font}; 2585 $layout->set_font ($self->{font}) if $self->{font};
2305 2586
2587 glEnable GL_BLEND;
2588 #TODO# not correct in windows where rgba is forced off
2589 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2590
2306 for my $par (@{$self->{par}}) { 2591 for my $par (@{$self->{par}}) {
2307 my $h = $par->[0]; 2592 my $h = $par->[1];
2308 2593
2309 if ($y0 < $y + $h && $y < $y1) { 2594 if ($y0 < $y + $h && $y < $y1) {
2310 $layout->set_foreground (@{ $par->[1] }); 2595 $layout->set_foreground (@{ $par->[2] });
2596 $layout->set_width ($W - $par->[3]);
2311 $layout->set_markup ($par->[2]); 2597 $layout->set_markup ($par->[4]);
2312 2598
2313 my ($W, $H) = $layout->size; 2599 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2314 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2600
2601 glRasterPos $par->[3], $y - $y0;
2602 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2315 } 2603 }
2316 2604
2317 $y += $h; 2605 $y += $h;
2318 } 2606 }
2319 2607
2320 glDisable GL_TEXTURE_2D; 2608 glDisable GL_BLEND;
2321 }; 2609 };
2322 }); 2610 });
2323} 2611}
2324 2612
2325sub _draw { 2613sub _draw {
2326 my ($self) = @_; 2614 my ($self) = @_;
2327 2615
2328 glEnable GL_TEXTURE_2D; 2616 glEnable GL_TEXTURE_2D;
2329 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2330 glColor 1, 1, 1, 1; 2618 glColor 1, 1, 1, 1;
2331 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2619 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2332 glDisable GL_TEXTURE_2D; 2620 glDisable GL_TEXTURE_2D;
2333 2621
2334 $self->{children}[1]->draw; 2622 $self->{children}[1]->draw;
2335 2623
2336} 2624}
… …
2385 2673
2386sub new { 2674sub new {
2387 my $class = shift; 2675 my $class = shift;
2388 2676
2389 my $self = $class->SUPER::new ( 2677 my $self = $class->SUPER::new (
2390 state => 0, 2678 state => 0,
2391 connect_activate => \&toggle_flopper, 2679 on_activate => \&toggle_flopper,
2392 @_ 2680 @_
2393 ); 2681 );
2394 2682
2395 if ($self->{state}) {
2396 $self->{state} = 0;
2397 $self->toggle_flopper;
2398 }
2399
2400 $self 2683 $self
2401} 2684}
2402 2685
2403sub toggle_flopper { 2686sub toggle_flopper {
2404 my ($self) = @_; 2687 my ($self) = @_;
2405 2688
2406 # TODO: use animation 2689 $self->{other}->toggle_visibility;
2407 if ($self->{state} = !$self->{state}) {
2408 $CFClient::UI::ROOT->add ($self->{other});
2409 $self->{other}->move ($self->coord2global (0, $self->{h}));
2410 $self->emit ("open");
2411 } else {
2412 $CFClient::UI::ROOT->remove ($self->{other});
2413 $self->emit ("close");
2414 }
2415
2416 $self->emit (changed => $self->{state});
2417} 2690}
2418 2691
2419############################################################################# 2692#############################################################################
2420 2693
2421package CFClient::UI::Tooltip; 2694package CFClient::UI::Tooltip;
… …
2434} 2707}
2435 2708
2436sub set_tooltip_from { 2709sub set_tooltip_from {
2437 my ($self, $widget) = @_; 2710 my ($self, $widget) = @_;
2438 2711
2712 my $tooltip = $widget->{tooltip};
2713
2714 if ($ENV{CFPLUS_DEBUG} & 2) {
2715 $tooltip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}";
2719 }
2720
2439 $self->add (new CFClient::UI::Label 2721 $self->add (new CFClient::UI::Label
2440 markup => $widget->{tooltip}, 2722 markup => $tooltip,
2441 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2442 fontsize => 0.8, 2724 fontsize => 0.8,
2443 fg => [0, 0, 0, 1], 2725 fg => [0, 0, 0, 1],
2444 ellipsise => 0, 2726 ellipsise => 0,
2445 font => ($widget->{tooltip_font} || $::FONT_PROP), 2727 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2456 2738
2457sub size_allocate { 2739sub size_allocate {
2458 my ($self, $w, $h) = @_; 2740 my ($self, $w, $h) = @_;
2459 2741
2460 $self->SUPER::size_allocate ($w - 4, $h - 4); 2742 $self->SUPER::size_allocate ($w - 4, $h - 4);
2743}
2744
2745sub visibility_change {
2746 my ($self, $visible) = @_;
2747
2748 return unless $visible;
2749
2750 $self->{root}->on_post_alloc ("move_$self" => sub {
2751 my $widget = $self->{owner}
2752 or return;
2753
2754 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755
2756 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757 if $x + $self->{w} > $::WIDTH;
2758
2759 $self->move_abs ($x, $y);
2760 });
2461} 2761}
2462 2762
2463sub _draw { 2763sub _draw {
2464 my ($self) = @_; 2764 my ($self) = @_;
2465 2765
… …
2482 glVertex $w, $h; 2782 glVertex $w, $h;
2483 glVertex $w, 0; 2783 glVertex $w, 0;
2484 glEnd; 2784 glEnd;
2485 2785
2486 glTranslate 2 - 0.375, 2 - 0.375; 2786 glTranslate 2 - 0.375, 2 - 0.375;
2787
2487 $self->SUPER::_draw; 2788 $self->SUPER::_draw;
2488} 2789}
2489 2790
2490############################################################################# 2791#############################################################################
2491 2792
… …
2496use CFClient::OpenGL; 2797use CFClient::OpenGL;
2497 2798
2498sub new { 2799sub new {
2499 my $class = shift; 2800 my $class = shift;
2500 2801
2501 $class->SUPER::new ( 2802 my $self = $class->SUPER::new (
2502 aspect => 1, 2803 aspect => 1,
2804 can_events => 0,
2503 @_, 2805 @_,
2504 ) 2806 );
2807
2808 if ($self->{anim} && $self->{animspeed}) {
2809 Scalar::Util::weaken (my $widget = $self);
2810
2811 $self->{timer} = Event->timer (
2812 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2813 hard => 1,
2814 interval => $self->{animspeed},
2815 cb => sub {
2816 ++$widget->{frame};
2817 $widget->update;
2818 },
2819 );
2820 }
2821
2822 $self
2505} 2823}
2506 2824
2507sub size_request { 2825sub size_request {
2508 (32, 8) 2826 (32, 8)
2509} 2827}
2510 2828
2829sub update {
2830 my ($self) = @_;
2831
2832 return unless $self->{visible};
2833
2834 $self->SUPER::update;
2835}
2836
2511sub _draw { 2837sub _draw {
2512 my ($self) = @_; 2838 my ($self) = @_;
2513 2839
2514 return unless $::CONN;#d# manage and cache textures differently 2840 return unless $::CONN;
2841
2842 my $face;
2843
2844 if ($self->{frame}) {
2845 my $anim = $::CONN->{anim}[$self->{anim}];
2846
2847 $face = $anim->[ $self->{frame} % @$anim ]
2848 if $anim && @$anim;
2849 }
2850
2515 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2516 2852
2517 # TODO animation
2518 if ($tex) { 2853 if ($tex) {
2519 glEnable GL_TEXTURE_2D; 2854 glEnable GL_TEXTURE_2D;
2520 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2521 glColor 1, 1, 1, 1; 2856 glColor 1, 1, 1, 1;
2522 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2523 glDisable GL_TEXTURE_2D; 2858 glDisable GL_TEXTURE_2D;
2524 } 2859 }
2525} 2860}
2526 2861
2862sub DESTROY {
2863 my ($self) = @_;
2864
2865 $self->{timer}->cancel
2866 if $self->{timer};
2867
2868 $self->SUPER::DESTROY;
2869}
2870
2527############################################################################# 2871#############################################################################
2528 2872
2529package CFClient::UI::InventoryItem; 2873package CFClient::UI::Buttonbar;
2530 2874
2531our @ISA = CFClient::UI::HBox::; 2875our @ISA = CFClient::UI::HBox::;
2532 2876
2533sub _item_to_desc { 2877# TODO: should actualyl wrap buttons and other goodies.
2534 my ($item) = @_;
2535
2536 my $desc =
2537 $item->{nrof} < 2
2538 ? $item->{name}
2539 : "$item->{nrof} $item->{name_pl}";
2540
2541 $item->{flags} & Crossfire::Protocol::F_OPEN
2542 and $desc .= " (open)";
2543 $item->{flags} & Crossfire::Protocol::F_APPLIED
2544 and $desc .= " (applied)";
2545 $item->{flags} & Crossfire::Protocol::F_UNPAID
2546 and $desc .= " (unpaid)";
2547 $item->{flags} & Crossfire::Protocol::F_MAGIC
2548 and $desc .= " (magic)";
2549 $item->{flags} & Crossfire::Protocol::F_CURSED
2550 and $desc .= " (cursed)";
2551 $item->{flags} & Crossfire::Protocol::F_DAMNED
2552 and $desc .= " (damned)";
2553 $item->{flags} & Crossfire::Protocol::F_LOCKED
2554 and $desc .= " *";
2555
2556 $desc
2557}
2558
2559sub new {
2560 my $class = shift;
2561
2562 my %args = @_;
2563
2564 my $item = delete $args{item};
2565
2566 my $desc = _item_to_desc ($item);
2567
2568 my $self = $class->SUPER::new (
2569 can_hover => 1,
2570 can_events => 1,
2571 tooltip => ((CFClient::UI::Label::escape $desc)
2572 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2573 connect_button_down => sub {
2574 my ($self, $ev, $x, $y) = @_;
2575
2576 # todo: maybe put examine on 1? but should just be a tooltip :(
2577 if ($ev->{button} == 1) {
2578 my $targ = $::CONN->{player}{tag};
2579
2580 if ($item->{container} == $::CONN->{player}{tag}) {
2581 $targ = $main::OPENCONT;
2582 }
2583
2584 $::CONN->send ("move $targ $item->{tag} 0");
2585 } elsif ($ev->{button} == 2) {
2586 $::CONN->send ("apply $item->{tag}");
2587 } elsif ($ev->{button} == 3) {
2588 my @menu_items = (
2589 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2590 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2591 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2592 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2593 [
2594 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2595 sub { $::CONN->send ("lock $item->{tag}") },
2596 ],
2597 );
2598
2599 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2600 }
2601
2602 1
2603 },
2604 %args
2605 );
2606
2607
2608 $self->add (new CFClient::UI::Face
2609 can_events => 0,
2610 face => $item->{face},
2611 anim => $item->{anim},
2612 animspeed => $item->{animspeed},
2613 );
2614
2615 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2616
2617 $self->{item} = $item;
2618
2619 $self->update_item;
2620
2621 $self
2622}
2623
2624sub update_item {
2625 my ($self) = @_;
2626
2627 my $desc = _item_to_desc ($self->{item});
2628
2629 $self->{name_lbl}->set_text ($desc);
2630}
2631
2632#############################################################################
2633
2634package CFClient::UI::Inventory;
2635
2636our @ISA = CFClient::UI::ScrolledWindow::;
2637
2638sub new {
2639 my $class = shift;
2640
2641 my $self = $class->SUPER::new (
2642 scrolled => (new CFClient::UI::VBox),
2643 @_,
2644 );
2645
2646 $self
2647}
2648
2649sub set_items {
2650 my ($self, $items) = @_;
2651
2652 $self->{scrolled}->clear;
2653 return unless $items;
2654
2655 my @items = sort {
2656 ($a->{type} <=> $b->{type})
2657 or ($a->{name} cmp $b->{name})
2658 } @$items;
2659
2660 $self->{real_items} = \@items;
2661
2662 for my $item (@items) {
2663 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2664 $item->update_item ();
2665 }
2666
2667 $self->{scrolled}->add (@items);
2668
2669# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2670}
2671
2672sub size_request {
2673 my ($self) = @_;
2674 ($self->{req_w}, $self->{req_h});
2675}
2676 2878
2677############################################################################# 2879#############################################################################
2678 2880
2679package CFClient::UI::Menu; 2881package CFClient::UI::Menu;
2680 2882
… …
2714 2916
2715# popup given the event (must be a mouse button down event currently) 2917# popup given the event (must be a mouse button down event currently)
2716sub popup { 2918sub popup {
2717 my ($self, $ev) = @_; 2919 my ($self, $ev) = @_;
2718 2920
2719 $self->emit ("popdown"); 2921 $self->_emit ("popdown");
2720 2922
2721 # maybe save $GRAB? must be careful about events... 2923 # maybe save $GRAB? must be careful about events...
2722 $GRAB = $self; 2924 $GRAB = $self;
2723 $self->{button} = $ev->{button}; 2925 $self->{button} = $ev->{button};
2724 2926
2725 $self->show; 2927 $self->show;
2726 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2928 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2727} 2929}
2728 2930
2729sub mouse_motion { 2931sub mouse_motion {
2730 my ($self, $ev, $x, $y) = @_; 2932 my ($self, $ev, $x, $y) = @_;
2731 2933
2732 # TODO: should use vbox->find_widget or so 2934 # TODO: should use vbox->find_widget or so
2733 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2734 $self->{hover} = $self->{item}{$HOVER}; 2936 $self->{hover} = $self->{item}{$HOVER};
2937
2938 0
2735} 2939}
2736 2940
2737sub button_up { 2941sub button_up {
2738 my ($self, $ev, $x, $y) = @_; 2942 my ($self, $ev, $x, $y) = @_;
2739 2943
2740 if ($ev->{button} == $self->{button}) { 2944 if ($ev->{button} == $self->{button}) {
2741 undef $GRAB; 2945 undef $GRAB;
2742 $self->hide; 2946 $self->hide;
2743 2947
2744 $self->emit ("popdown"); 2948 $self->_emit ("popdown");
2745 $self->{hover}[1]->() if $self->{hover}; 2949 $self->{hover}[1]->() if $self->{hover};
2950 } else {
2951 return 0
2952 }
2953
2954 1
2955}
2956
2957#############################################################################
2958
2959package CFClient::UI::Multiplexer;
2960
2961our @ISA = CFClient::UI::Container::;
2962
2963sub new {
2964 my $class = shift;
2965
2966 my $self = $class->SUPER::new (
2967 @_,
2968 );
2969
2970 $self->{current} = $self->{children}[0]
2971 if @{ $self->{children} };
2972
2973 $self
2974}
2975
2976sub add {
2977 my ($self, @widgets) = @_;
2978
2979 $self->SUPER::add (@widgets);
2980
2981 $self->{current} = $self->{children}[0]
2982 if @{ $self->{children} };
2983}
2984
2985sub set_current_page {
2986 my ($self, $page_or_widget) = @_;
2987
2988 my $widget = ref $page_or_widget
2989 ? $page_or_widget
2990 : $self->{children}[$page_or_widget];
2991
2992 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994
2995 $self->_emit (page_changed => $self->{current});
2996
2997 $self->realloc;
2998}
2999
3000sub visible_children {
3001 $_[0]{current}
3002}
3003
3004sub size_request {
3005 my ($self) = @_;
3006
3007 $self->{current}->size_request
3008}
3009
3010sub size_allocate {
3011 my ($self, $w, $h) = @_;
3012
3013 $self->{current}->configure (0, 0, $w, $h);
3014}
3015
3016sub _draw {
3017 my ($self) = @_;
3018
3019 $self->{current}->draw;
3020}
3021
3022#############################################################################
3023
3024package CFClient::UI::Notebook;
3025
3026our @ISA = CFClient::UI::VBox::;
3027
3028sub new {
3029 my $class = shift;
3030
3031 my $self = $class->SUPER::new (
3032 buttonbar => (new CFClient::UI::Buttonbar),
3033 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3034 # filter => # will be put between multiplexer and $self
3035 @_,
3036 );
2746 } 3037
3038 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3039 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3040
3041 $self
3042}
3043
3044sub add {
3045 my ($self, $title, $widget, $tooltip) = @_;
3046
3047 Scalar::Util::weaken $self;
3048
3049 $self->{buttonbar}->add (new CFClient::UI::Button
3050 markup => $title,
3051 tooltip => $tooltip,
3052 on_activate => sub { $self->set_current_page ($widget) },
3053 );
3054
3055 $self->{multiplexer}->add ($widget);
3056}
3057
3058sub set_current_page {
3059 my ($self, $page) = @_;
3060
3061 $self->{multiplexer}->set_current_page ($page);
3062 $self->_emit (page_changed => $self->{multiplexer}{current});
2747} 3063}
2748 3064
2749############################################################################# 3065#############################################################################
2750 3066
2751package CFClient::UI::Statusbox; 3067package CFClient::UI::Statusbox;
… …
2811sub add { 3127sub add {
2812 my ($self, $text, %arg) = @_; 3128 my ($self, $text, %arg) = @_;
2813 3129
2814 $text =~ s/^\s+//; 3130 $text =~ s/^\s+//;
2815 $text =~ s/\s+$//; 3131 $text =~ s/\s+$//;
3132
3133 return unless $text;
2816 3134
2817 my $timeout = time + ((delete $arg{timeout}) || 60); 3135 my $timeout = time + ((delete $arg{timeout}) || 60);
2818 3136
2819 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3137 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2820 3138
… …
2854 $self->SUPER::reconfigure; 3172 $self->SUPER::reconfigure;
2855} 3173}
2856 3174
2857############################################################################# 3175#############################################################################
2858 3176
2859package CFClient::UI::Root; 3177package CFClient::UI::Inventory;
2860 3178
2861our @ISA = CFClient::UI::Container::; 3179our @ISA = CFClient::UI::ScrolledWindow::;
2862
2863use CFClient::OpenGL;
2864 3180
2865sub new { 3181sub new {
2866 my $class = shift; 3182 my $class = shift;
2867 3183
2868 $class->SUPER::new ( 3184 my $self = $class->SUPER::new (
3185 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3186 @_,
3187 );
3188
3189 $self
3190}
3191
3192sub set_items {
3193 my ($self, $items) = @_;
3194
3195 $self->{child}->clear;
3196 return unless $items;
3197
3198 my @items = sort {
3199 ($a->{type} <=> $b->{type})
3200 or ($a->{name} cmp $b->{name})
3201 } @$items;
3202
3203 $self->{real_items} = \@items;
3204
3205 my $row = 0;
3206 for my $item (@items) {
3207 CFClient::Item::update_widgets $item;
3208
3209 $self->{child}->add (0, $row, $item->{face_widget});
3210 $self->{child}->add (1, $row, $item->{desc_widget});
3211 $self->{child}->add (2, $row, $item->{weight_widget});
3212
3213 $row++;
3214 }
3215}
3216
3217#############################################################################
3218
3219package CFClient::UI::BindEditor;
3220
3221our @ISA = CFClient::UI::FancyFrame::;
3222
3223sub new {
3224 my $class = shift;
3225
3226 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3227
3228 $self->add (my $vb = new CFClient::UI::VBox);
3229
3230
3231 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3232 text => "start recording",
3233 tooltip => "Start/Stops recording of actions."
3234 ."All subsequent actions after the recording started will be captured."
3235 ."The actions are displayed after the record was stopped."
3236 ."To bind the action you have to click on the 'Bind' button",
3237 on_activate => sub {
3238 unless ($self->{recording}) {
3239 $self->start;
3240 } else {
3241 $self->stop;
3242 }
3243 });
3244
3245 $vb->add (new CFClient::UI::Label text => "Actions:");
3246 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3247
3248 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3249 $vb->add (my $hb = new CFClient::UI::HBox);
3250 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3251 $hb->add (new CFClient::UI::Button
3252 text => "bind",
3253 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3254 on_activate => sub {
3255 $self->ask_for_bind;
3256 });
3257
3258 $vb->add (my $hb = new CFClient::UI::HBox);
3259 $hb->add (new CFClient::UI::Button
3260 text => "ok",
3261 expand => 1,
3262 tooltip => "This closes the binding editor and saves the binding",
3263 on_activate => sub {
3264 $self->hide;
3265 $self->commit;
3266 });
3267
3268 $hb->add (new CFClient::UI::Button
3269 text => "cancel",
3270 expand => 1,
3271 tooltip => "This closes the binding editor without saving",
3272 on_activate => sub {
3273 $self->hide;
3274 $self->{binding_cancel}->()
3275 if $self->{binding_cancel};
3276 });
3277
3278 $self->update_binding_widgets;
3279
3280 $self
3281}
3282
3283sub commit {
3284 my ($self) = @_;
3285 my ($mod, $sym, $cmds) = $self->get_binding;
3286 if ($sym != 0 && @$cmds > 0) {
3287 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3288 ."'. Don't forget 'Save Config'!");
3289 $self->{binding_change}->($mod, $sym, $cmds)
3290 if $self->{binding_change};
3291 } else {
3292 $::STATUSBOX->add ("No action bound, no key or action specified!");
3293 $self->{binding_cancel}->()
3294 if $self->{binding_cancel};
3295 }
3296}
3297
3298sub start {
3299 my ($self) = @_;
3300
3301 $self->{rec_btn}->set_text ("stop recording");
3302 $self->{recording} = 1;
3303 $self->clear_command_list;
3304 $::CONN->start_record if $::CONN;
3305}
3306
3307sub stop {
3308 my ($self) = @_;
3309
3310 $self->{rec_btn}->set_text ("start recording");
3311 $self->{recording} = 0;
3312
3313 my $rec;
3314 $rec = $::CONN->stop_record if $::CONN;
3315 return unless ref $rec eq 'ARRAY';
3316 $self->set_command_list ($rec);
3317}
3318
3319
3320sub ask_for_bind_and_commit {
3321 my ($self) = @_;
3322 $self->ask_for_bind (1);
3323}
3324
3325sub ask_for_bind {
3326 my ($self, $commit) = @_;
3327
3328 CFClient::Binder::open_binding_dialog (sub {
3329 my ($mod, $sym) = @_;
3330 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3331 $self->update_binding_widgets;
3332 $self->commit if $commit;
3333 });
3334}
3335
3336# $mod and $sym are the modifiers and key symbol
3337# $cmds is a array ref of strings (the commands)
3338# $cb is the callback that is executed on OK
3339# $ccb is the callback that is executed on CANCEL and
3340# when the binding was unsuccessful on OK
3341sub set_binding {
3342 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3343
3344 $self->clear_command_list;
3345 $self->{recording} = 0;
3346 $self->{rec_btn}->set_text ("start recording");
3347
3348 $self->{binding} = [$mod, $sym];
3349 $self->{commands} = $cmds;
3350
3351 $self->{binding_change} = $cb;
3352 $self->{binding_cancel} = $ccb;
3353
3354 $self->update_binding_widgets;
3355}
3356
3357# this is a shortcut method that asks for a binding
3358# and then just binds it.
3359sub do_quick_binding {
3360 my ($self, $cmds) = @_;
3361 $self->set_binding (undef, undef, $cmds, sub {
3362 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3363 });
3364 $self->ask_for_bind (1);
3365}
3366
3367sub update_binding_widgets {
3368 my ($self) = @_;
3369 my ($mod, $sym, $cmds) = $self->get_binding;
3370 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3371 $self->set_command_list ($cmds);
3372}
3373
3374sub get_binding {
3375 my ($self) = @_;
3376 return (
3377 $self->{binding}->[0],
3378 $self->{binding}->[1],
3379 [ grep { defined $_ } @{$self->{commands}} ]
3380 );
3381}
3382
3383sub clear_command_list {
3384 my ($self) = @_;
3385 $self->{cmdbox}->clear ();
3386}
3387
3388sub set_command_list {
3389 my ($self, $cmds) = @_;
3390
3391 $self->{cmdbox}->clear ();
3392 $self->{commands} = $cmds;
3393
3394 my $idx = 0;
3395
3396 for (@$cmds) {
3397 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3398
3399 my $i = $idx;
3400 $hb->add (new CFClient::UI::Label text => $_);
3401 $hb->add (new CFClient::UI::Button
3402 text => "delete",
3403 tooltip => "Deletes the action from the record",
3404 on_activate => sub {
3405 $self->{cmdbox}->remove ($hb);
3406 $cmds->[$i] = undef;
3407 });
3408
3409
3410 $idx++
3411 }
3412}
3413
3414#############################################################################
3415
3416package CFClient::UI::SpellList;
3417
3418our @ISA = CFClient::UI::Table::;
3419
3420sub new {
3421 my $class = shift;
3422
3423 my $self = $class->SUPER::new (
3424 binding => [],
3425 commands => [],
2869 @_, 3426 @_,
2870 ) 3427 )
2871} 3428}
2872 3429
2873sub configure { 3430# XXX: Do sorting? Argl...
2874 my ($self, $x, $y, $w, $h) = @_; 3431sub add_spell {
2875
2876 $self->{w} = $w;
2877 $self->{h} = $h;
2878}
2879
2880sub check_size {
2881 my ($self) = @_; 3432 my ($self, $spell) = @_;
3433 $self->{spells}->{$spell->{name}} = $spell;
2882 3434
2883 $self->size_allocate ($self->{w}, $self->{h}) 3435 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2884 if $self->{w}; 3436 face => $spell->{face},
3437 can_hover => 1,
3438 can_events => 1,
3439 tooltip => $spell->{message});
3440
3441 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3442 text => $spell->{name},
3443 can_hover => 1,
3444 can_events => 1,
3445 tooltip => $spell->{message},
3446 expand => 1);
3447
3448 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3449 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3450 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3451 expand => 1);
3452
3453 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3454 text => "bind to key",
3455 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3456}
3457
3458sub rebuild_spell_list {
3459 my ($self) = @_;
3460 $self->{tbl_idx} = 0;
3461 $self->add_spell ($_) for values %{$self->{spells}};
3462}
3463
3464sub remove_spell {
3465 my ($self, $spell) = @_;
3466 delete $self->{spells}->{$spell->{name}};
3467 $self->rebuild_spell_list;
3468}
3469
3470#############################################################################
3471
3472package CFClient::UI::Root;
3473
3474our @ISA = CFClient::UI::Container::;
3475
3476use CFClient::OpenGL;
3477
3478sub new {
3479 my $class = shift;
3480
3481 my $self = $class->SUPER::new (
3482 visible => 1,
3483 @_,
3484 );
3485
3486 Scalar::Util::weaken ($self->{root} = $self);
3487
3488 $self
2885} 3489}
2886 3490
2887sub size_request { 3491sub size_request {
2888 my ($self) = @_; 3492 my ($self) = @_;
2889 3493
2890 ($self->{w}, $self->{h}) 3494 ($self->{w}, $self->{h})
3495}
3496
3497sub _to_pixel {
3498 my ($coord, $size, $max) = @_;
3499
3500 $coord =
3501 $coord eq "center" ? ($max - $size) * 0.5
3502 : $coord eq "max" ? $max
3503 : $coord;
3504
3505 $coord = 0 if $coord < 0;
3506 $coord = $max - $size if $coord > $max - $size;
3507
3508 int $coord + 0.5
2891} 3509}
2892 3510
2893sub size_allocate { 3511sub size_allocate {
2894 my ($self, $w, $h) = @_; 3512 my ($self, $w, $h) = @_;
2895 3513
2896 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2897 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2898
2899 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2900 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2901
2902 for my $child ($self->children) { 3514 for my $child ($self->children) {
2903 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3515 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2904 3516
2905 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3517 $X = $child->{force_x} if exists $child->{force_x};
2906 if exists $child->{req_x}; 3518 $Y = $child->{force_y} if exists $child->{force_y};
2907 3519
2908 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3520 $X = _to_pixel $X, $W, $self->{w};
2909 if exists $child->{req_y}; 3521 $Y = _to_pixel $Y, $H, $self->{h};
2910
2911 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2912 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2913 3522
2914 $child->configure ($X, $Y, $W, $H); 3523 $child->configure ($X, $Y, $W, $H);
2915 } 3524 }
2916} 3525}
2917 3526
… …
2928} 3537}
2929 3538
2930sub update { 3539sub update {
2931 my ($self) = @_; 3540 my ($self) = @_;
2932 3541
2933 $self->check_size;
2934 $::WANT_REFRESH++; 3542 $::WANT_REFRESH++;
2935} 3543}
2936 3544
2937sub add { 3545sub add {
2938 my ($self, @children) = @_; 3546 my ($self, @children) = @_;
2939 3547
2940 for my $child (@children) {
2941 $child->{toplevel} = 1; 3548 $_->{is_toplevel} = 1
2942 3549 for @children;
2943 # integerise window positions
2944 $child->{x} = int $child->{x};
2945 $child->{y} = int $child->{y};
2946 }
2947 3550
2948 $self->SUPER::add (@children); 3551 $self->SUPER::add (@children);
3552}
3553
3554sub remove {
3555 my ($self, @children) = @_;
3556
3557 $self->SUPER::remove (@children);
3558
3559 delete $self->{is_toplevel}
3560 for @children;
3561
3562 while (@children) {
3563 my $w = pop @children;
3564 push @children, $w->children;
3565 $w->set_invisible;
3566 }
2949} 3567}
2950 3568
2951sub on_refresh { 3569sub on_refresh {
2952 my ($self, $id, $cb) = @_; 3570 my ($self, $id, $cb) = @_;
2953 3571
… …
2966 while ($self->{refresh_hook}) { 3584 while ($self->{refresh_hook}) {
2967 $_->() 3585 $_->()
2968 for values %{delete $self->{refresh_hook}}; 3586 for values %{delete $self->{refresh_hook}};
2969 } 3587 }
2970 3588
2971 if ($self->{check_size}) { 3589 if ($self->{realloc}) {
2972 my @queue = ([], []); 3590 my %queue;
3591 my @queue;
3592 my $widget;
2973 3593
2974 for (;;) { 3594 outer:
2975 if ($self->{check_size}) { 3595 while () {
2976 # heuristic: check containers last 3596 if (my $realloc = delete $self->{realloc}) {
2977 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3597 for $widget (values %$realloc) {
2978 for values %{delete $self->{check_size}} 3598 $widget->{visible} or next; # do not resize invisible widgets
3599
3600 $queue{$widget+0}++ and next; # duplicates are common
3601
3602 push @{ $queue[$widget->{visible}] }, $widget;
3603 }
2979 } 3604 }
2980 3605
2981 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3606 while () {
3607 @queue or last outer;
2982 3608
2983 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3609 $widget = pop @{ $queue[-1] || [] }
2984 ? @$widget{qw(user_w user_h)} 3610 and last;
2985 : $widget->size_request;
2986
2987 if (delete $widget->{force_alloc}
2988 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2989 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2990 3611
3612 pop @queue;
3613 }
3614
3615 delete $queue{$widget+0};
3616
3617 my ($w, $h) = $widget->size_request;
3618
3619 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3620 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3621
3622 $w = $widget->{force_w} if exists $widget->{force_w};
3623 $h = $widget->{force_h} if exists $widget->{force_h};
3624
3625 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3626 || delete $widget->{force_realloc}) {
2991 $widget->{req_w} = $w; 3627 $widget->{req_w} = $w;
2992 $widget->{req_h} = $h; 3628 $widget->{req_h} = $h;
2993 3629
2994 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3630 $self->{size_alloc}{$widget+0} = $widget;
2995 3631
2996 $widget->{parent}->check_size
2997 if $widget->{parent}; 3632 if (my $parent = $widget->{parent}) {
3633 $self->{realloc}{$parent+0} = $parent
3634 unless $queue{$parent+0};
3635
3636 $parent->{force_size_alloc} = 1;
3637 $self->{size_alloc}{$parent+0} = $parent;
3638 }
2998 } 3639 }
3640
3641 delete $self->{realloc}{$widget+0};
2999 } 3642 }
3000 } 3643 }
3001 3644
3002 while ($self->{size_alloc}) { 3645 while (my $size_alloc = delete $self->{size_alloc}) {
3003 for (values %{delete $self->{size_alloc}}) { 3646 my @queue = sort { $b->{visible} <=> $a->{visible} }
3004 my ($widget, $w, $h) = @$_; 3647 values %$size_alloc;
3648
3649 while () {
3650 my $widget = pop @queue || last;
3651
3652 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3005 3653
3006 $w = 0 if $w < 0; 3654 $w = 0 if $w < 0;
3007 $h = 0 if $h < 0; 3655 $h = 0 if $h < 0;
3008 3656
3657 $w = int $w + 0.5;
3658 $h = int $h + 0.5;
3659
3660 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3661 $widget->{old_w} = $widget->{w};
3662 $widget->{old_h} = $widget->{h};
3663
3009 $widget->{w} = $w; 3664 $widget->{w} = $w;
3010 $widget->{h} = $h; 3665 $widget->{h} = $h;
3011 $widget->size_allocate ($w, $h); 3666
3012 $widget->emit (size_allocate => $w, $h); 3667 $widget->emit (size_allocate => $w, $h);
3668 }
3013 } 3669 }
3014 } 3670 }
3015 3671
3016 while ($self->{post_alloc_hook}) { 3672 while ($self->{post_alloc_hook}) {
3017 $_->() 3673 $_->()
3018 for values %{delete $self->{post_alloc_hook}}; 3674 for values %{delete $self->{post_alloc_hook}};
3019 } 3675 }
3020 3676
3677
3021 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3678 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3022 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3679 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3023 glClear GL_COLOR_BUFFER_BIT; 3680 glClear GL_COLOR_BUFFER_BIT;
3024 3681
3025 glMatrixMode GL_PROJECTION; 3682 glMatrixMode GL_PROJECTION;
3026 glLoadIdentity; 3683 glLoadIdentity;
3027 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3684 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3028 glMatrixMode GL_MODELVIEW; 3685 glMatrixMode GL_MODELVIEW;
3029 glLoadIdentity; 3686 glLoadIdentity;
3030 3687
3688 {
3689 package CFClient::UI::Base;
3690
3691 ($draw_x, $draw_y, $draw_w, $draw_h) =
3692 (0, 0, $self->{w}, $self->{h});
3693 }
3694
3031 $self->_draw; 3695 $self->_draw;
3032} 3696}
3033 3697
3034############################################################################# 3698#############################################################################
3035 3699

Diff Legend

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