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.203 by root, Sun May 14 21:13:11 2006 UTC vs.
Revision 1.271 by root, Fri Jun 2 22:13:47 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 if ($x + $TOOLTIP->{w} > $::WIDTH) {
37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
38 }
39
40 $TOOLTIP->move ($x, $y);
41 $TOOLTIP->check_size;
42 $TOOLTIP->update;
43 } 61 }
44 62
45 return; 63 return;
46 } 64 }
47 } 65 }
… …
51 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
52} 70}
53 71
54# class methods for events 72# class methods for events
55sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
56 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
57 if $FOCUS; 75 if $FOCUS;
58} 76}
59 77
60sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
61 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
62 if $FOCUS; 80 if $FOCUS;
63} 81}
64 82
65sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
66 my ($ev) = @_; 84 my ($ev) = @_;
… …
75 check_tooltip; 93 check_tooltip;
76 } 94 }
77 95
78 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
79 97
80 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
81 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
82 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
83 }
84} 100}
85 101
86sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
87 my ($ev) = @_; 103 my ($ev) = @_;
88 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
89 105
90 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
91 107
92 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
93 109
94 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
95 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
96 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
97 }
98 112
99 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
100 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
101 $grab->update if $grab; 115 $grab->update if $grab;
102 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
118 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
119 133
120 check_tooltip; 134 check_tooltip;
121 } 135 }
122 136
123 if ($HOVER) {
124 ($x, $y) = $HOVER->coord2local ($x, $y);
125 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
126 } 138 if $HOVER;
127} 139}
128 140
129# convert position array to integers 141# convert position array to integers
130sub harmonize { 142sub harmonize {
131 my ($vals) = @_; 143 my ($vals) = @_;
… …
137 $rem += $_ - $i; 149 $rem += $_ - $i;
138 $_ = $i; 150 $_ = $i;
139 } 151 }
140} 152}
141 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
142# call when resolution changes etc. 170# call when resolution changes etc.
143sub rescale_widgets { 171sub rescale_widgets {
144 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
145 173
146 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
147 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
148 $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.]+$/;
149 $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};
150 $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};
151 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
152 $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.]+$/;
153 $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};
154 $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};
155 $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
156 } 189 }
157
158 $widget->reconfigure;
159 } 190 }
191
192 reconfigure_widgets;
160} 193}
161 194
162############################################################################# 195#############################################################################
163 196
164package CFClient::UI::Base; 197package CFClient::UI::Base;
… …
169 202
170sub new { 203sub new {
171 my $class = shift; 204 my $class = shift;
172 205
173 my $self = bless { 206 my $self = bless {
174 x => 0, 207 x => "center",
175 y => 0, 208 y => "center",
176 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
177 can_events => 1, 212 can_events => 1,
178 @_ 213 @_
179 }, $class; 214 }, $class;
180 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
181 for (keys %$self) { 218 for (keys %$self) {
182 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
183 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
184 } 221 }
185 } 222 }
186 223
187 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 }
188 235
189 $self 236 $self
190} 237}
191 238
192sub destroy { 239sub destroy {
… …
202 return if $self->{parent}; 249 return if $self->{parent};
203 250
204 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
205} 252}
206 253
207sub hide { 254sub set_visible {
208 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};
209 278
210 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
211 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
212 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
213 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
214 if $self->{parent}; 313 if $self->{parent};
215} 314}
216 315
217sub move { 316sub move_abs {
218 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
219 318
220 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
221 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
222 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
223 322
224 $self->update; 323 $self->update;
225} 324}
226 325
227sub set_size { 326sub set_size {
228 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
229 328
230 $self->{user_w} = $w; 329 $self->{force_w} = $w;
231 $self->{user_h} = $h; 330 $self->{force_h} = $h;
232 331
233 $self->check_size; 332 $self->realloc;
234} 333}
235 334
236sub size_request { 335sub size_request {
237 require Carp; 336 require Carp;
238 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
240 339
241sub configure { 340sub configure {
242 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
243 342
244 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
245 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
246 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
247 348
248 # use alignment to adjust x, y 349 # use alignment to adjust x, y
249 350
250 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
251 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
252
253 ($w, $h) = ($w2, $h2);
254 } 353 }
255 354
256 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
257 $self->{x} = $x; 356 $self->{x} = $x;
258 $self->{y} = $y; 357 $self->{y} = $y;
259 $self->update; 358 $self->update;
260 } 359 }
261 360
262 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
263 $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;
264 } 368 }
265} 369}
266 370
267sub size_allocate { 371sub size_allocate {
268 # nothing to be done 372 # nothing to be done
269} 373}
270 374
271sub reconfigure {
272 my ($self) = @_;
273
274 $self->check_size (1);
275 $self->update;
276}
277
278sub children { 375sub children {
279} 376}
280 377
281sub set_max_size { 378sub set_max_size {
282 my ($self, $w, $h) = @_; 379 my ($self, $w, $h) = @_;
283 380
284 delete $self->{max_w}; $self->{max_w} = $w if $w; 381 delete $self->{max_w}; $self->{max_w} = $w if $w;
285 delete $self->{max_h}; $self->{max_h} = $h if $h; 382 delete $self->{max_h}; $self->{max_h} = $h if $h;
383}
384
385sub set_tooltip {
386 my ($self, $tooltip) = @_;
387
388 $tooltip =~ s/^\s+//;
389 $tooltip =~ s/\s+$//;
390
391 return if $self->{tooltip} eq $tooltip;
392
393 $self->{tooltip} = $tooltip;
394
395 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
396 delete $CFClient::UI::TOOLTIP->{owner};
397 CFClient::UI::check_tooltip;
398 }
286} 399}
287 400
288# translate global coordinates to local coordinate system 401# translate global coordinates to local coordinate system
289sub coord2local { 402sub coord2local {
290 my ($self, $x, $y) = @_; 403 my ($self, $x, $y) = @_;
… …
305 return if $FOCUS == $self; 418 return if $FOCUS == $self;
306 return unless $self->{can_focus}; 419 return unless $self->{can_focus};
307 420
308 my $focus = $FOCUS; $FOCUS = $self; 421 my $focus = $FOCUS; $FOCUS = $self;
309 422
310 $self->emit (focus_in => $focus); 423 $self->_emit (focus_in => $focus);
311 424
312 $focus->update if $focus; 425 $focus->update if $focus;
313 $FOCUS->update; 426 $FOCUS->update;
314} 427}
315 428
… …
318 431
319 return unless $FOCUS == $self; 432 return unless $FOCUS == $self;
320 433
321 my $focus = $FOCUS; undef $FOCUS; 434 my $focus = $FOCUS; undef $FOCUS;
322 435
323 $self->emit (focus_out => $focus); 436 $self->_emit (focus_out => $focus);
324 437
325 $focus->update if $focus; #? 438 $focus->update if $focus; #?
326}
327 439
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
441 unless $FOCUS;
442}
443
328sub mouse_motion { } 444sub mouse_motion { 0 }
329sub button_up { } 445sub button_up { 0 }
330sub key_down { } 446sub key_down { 0 }
331sub key_up { } 447sub key_up { 0 }
332 448
333sub button_down { 449sub button_down {
334 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
335 451
336 $self->focus_in; 452 $self->focus_in;
337}
338 453
339sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454 0
340sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455}
341sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456
342sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub find_widget {
343sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 458 my ($self, $x, $y) = @_;
459
460 return () unless $self->{can_events};
461
462 return $self
463 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
464 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
465
466 ()
467}
468
469sub set_parent {
470 my ($self, $parent) = @_;
471
472 Scalar::Util::weaken ($self->{parent} = $parent);
473 $self->set_visible if $parent->{visible};
474}
475
476sub connect {
477 my ($self, $signal, $cb) = @_;
478
479 push @{ $self->{signal_cb}{$signal} }, $cb;
480}
481
482sub _emit {
483 my ($self, $signal, @args) = @_;
484
485 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486}
487
488sub emit {
489 my ($self, $signal, @args) = @_;
490
491 $self->_emit ($signal, @args)
492 || $self->$signal (@args);
493}
494
495sub visibility_change {
496 #my ($self, $visible) = @_;
497}
498
499sub realloc {
500 my ($self) = @_;
501
502 if ($self->{visible}) {
503 return if $self->{root}{realloc}{$self+0};
504
505 $self->{root}{realloc}{$self+0} = $self;
506 $self->{root}->update;
507 } else {
508 delete $self->{req_w};
509 delete $self->{req_h};
510 }
511}
512
513sub update {
514 my ($self) = @_;
515
516 $self->{parent}->update
517 if $self->{parent};
518}
519
520sub reconfigure {
521 my ($self) = @_;
522
523 $self->realloc;
524 $self->update;
525}
526
527# using global variables seems a bit hacky, but passing through all drawing
528# functions seems pointless.
529our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
344 530
345sub draw { 531sub draw {
346 my ($self) = @_; 532 my ($self) = @_;
347 533
348 return unless $self->{h} && $self->{w}; 534 return unless $self->{h} && $self->{w};
535
536 # update screen rectangle
537 local $draw_x = $draw_x + $self->{x};
538 local $draw_y = $draw_y + $self->{y};
539 local $draw_w = $draw_x + $self->{w};
540 local $draw_h = $draw_y + $self->{h};
541
542 # skip widgets that are entirely outside the drawing area
543 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
349 545
350 glPushMatrix; 546 glPushMatrix;
351 glTranslate $self->{x}, $self->{y}, 0; 547 glTranslate $self->{x}, $self->{y}, 0;
352 $self->_draw; 548 $self->_draw;
353 glPopMatrix; 549 glPopMatrix;
… …
365 glVertex $x , $y + $self->{h}; 561 glVertex $x , $y + $self->{h};
366 glEnd; 562 glEnd;
367 glDisable GL_BLEND; 563 glDisable GL_BLEND;
368 } 564 }
369 565
370 if ($ENV{PCLIENT_DEBUG}) { 566 if ($ENV{CFPLUS_DEBUG} & 1) {
371 glPushMatrix; 567 glPushMatrix;
372 glColor 1, 1, 0, 1; 568 glColor 1, 1, 0, 1;
373 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 569 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
374 glBegin GL_LINE_LOOP; 570 glBegin GL_LINE_LOOP;
375 glVertex 0 , 0; 571 glVertex 0 , 0;
376 glVertex $self->{w}, 0; 572 glVertex $self->{w} - 1, 0;
377 glVertex $self->{w}, $self->{h}; 573 glVertex $self->{w} - 1, $self->{h} - 1;
378 glVertex 0 , $self->{h}; 574 glVertex 0 , $self->{h} - 1;
379 glEnd; 575 glEnd;
380 glPopMatrix; 576 glPopMatrix;
381 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 577 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
382 } 578 }
383} 579}
384 580
385sub _draw { 581sub _draw {
386 my ($self) = @_; 582 my ($self) = @_;
387 583
388 warn "no draw defined for $self\n"; 584 warn "no draw defined for $self\n";
389}
390
391sub find_widget {
392 my ($self, $x, $y) = @_;
393
394 return () unless $self->{can_events};
395
396 return $self
397 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
398 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
399
400 ()
401}
402
403sub set_parent {
404 my ($self, $parent) = @_;
405
406 Scalar::Util::weaken ($self->{parent} = $parent);
407
408 # TODO: req_w _does_change after ->reconfigure
409 $self->check_size
410 unless exists $self->{req_w};
411}
412
413sub check_size {
414 my ($self, $forced) = @_;
415
416 $self->{force_alloc} = 1 if $forced;
417 $CFClient::UI::ROOT->{check_size}{$self} = $self;
418}
419
420sub update {
421 my ($self) = @_;
422
423 $self->{parent}->update
424 if $self->{parent};
425}
426
427sub connect {
428 my ($self, $signal, $cb) = @_;
429
430 push @{ $self->{signal_cb}{$signal} }, $cb;
431}
432
433sub emit {
434 my ($self, $signal, @args) = @_;
435
436 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
437} 585}
438 586
439sub DESTROY { 587sub DESTROY {
440 my ($self) = @_; 588 my ($self) = @_;
441 589
… …
456 my $class = shift; 604 my $class = shift;
457 605
458 # range [value, low, high, page] 606 # range [value, low, high, page]
459 607
460 $class->SUPER::new ( 608 $class->SUPER::new (
461 bg => [0, 0, 0, 0.2], 609 #bg => [0, 0, 0, 0.2],
462 active_bg => [1, 1, 1, 0.5], 610 #active_bg => [1, 1, 1, 0.5],
463 @_ 611 @_
464 ) 612 )
465} 613}
466 614
467sub _draw { 615sub _draw {
468 my ($self) = @_; 616 my ($self) = @_;
469 617
618 my $color = $FOCUS == $self && $self->{active_bg}
619 ? $self->{active_bg}
620 : $self->{bg};
621
622 if ($color && (@$color < 4 || $color->[3])) {
470 my ($w, $h) = @$self{qw(w h)}; 623 my ($w, $h) = @$self{qw(w h)};
471 624
472 glEnable GL_BLEND; 625 glEnable GL_BLEND;
473 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 626 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
474 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 627 glColor @$color;
475 628
476 glBegin GL_QUADS; 629 glBegin GL_QUADS;
477 glVertex 0 , 0; 630 glVertex 0 , 0;
478 glVertex 0 , $h; 631 glVertex 0 , $h;
479 glVertex $w, $h; 632 glVertex $w, $h;
480 glVertex $w, 0; 633 glVertex $w, 0;
481 glEnd; 634 glEnd;
482 635
483 glDisable GL_BLEND; 636 glDisable GL_BLEND;
637 }
484} 638}
485 639
486############################################################################# 640#############################################################################
487 641
488package CFClient::UI::Empty; 642package CFClient::UI::Empty;
… …
493 my ($class, %arg) = @_; 647 my ($class, %arg) = @_;
494 $class->SUPER::new (can_events => 0, %arg); 648 $class->SUPER::new (can_events => 0, %arg);
495} 649}
496 650
497sub size_request { 651sub size_request {
498 (0, 0) 652 my ($self) = @_;
653
654 ($self->{w} + 0, $self->{h} + 0)
499} 655}
500 656
501sub draw { } 657sub draw { }
502 658
503############################################################################# 659#############################################################################
… …
532 $self->{children} = [ 688 $self->{children} = [
533 sort { $a->{z} <=> $b->{z} } 689 sort { $a->{z} <=> $b->{z} }
534 @{$self->{children}}, @widgets 690 @{$self->{children}}, @widgets
535 ]; 691 ];
536 692
537 $self->check_size (1); 693 $self->realloc;
538 $self->update;
539} 694}
540 695
541sub children { 696sub children {
542 @{ $_[0]{children} } 697 @{ $_[0]{children} }
543} 698}
… …
548 delete $child->{parent}; 703 delete $child->{parent};
549 $child->hide; 704 $child->hide;
550 705
551 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 706 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
552 707
553 $self->check_size; 708 $self->realloc;
554 $self->update;
555} 709}
556 710
557sub clear { 711sub clear {
558 my ($self) = @_; 712 my ($self) = @_;
559 713
… …
563 for (@$children) { 717 for (@$children) {
564 delete $_->{parent}; 718 delete $_->{parent};
565 $_->hide; 719 $_->hide;
566 } 720 }
567 721
568 $self->check_size; 722 $self->realloc;
569 $self->update;
570} 723}
571 724
572sub find_widget { 725sub find_widget {
573 my ($self, $x, $y) = @_; 726 my ($self, $x, $y) = @_;
574 727
… …
661 $self->SUPER::size_allocate ($w, $h); 814 $self->SUPER::size_allocate ($w, $h);
662 $self->update; 815 $self->update;
663} 816}
664 817
665sub _render { 818sub _render {
819 my ($self) = @_;
820
666 $_[0]{children}[0]->draw; 821 $self->{children}[0]->draw;
667} 822}
668 823
669sub render_child { 824sub render_child {
670 my ($self) = @_; 825 my ($self) = @_;
671 826
672 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 827 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
673 glClearColor 0, 0, 0, 0; 828 glClearColor 0, 0, 0, 0;
674 glClear GL_COLOR_BUFFER_BIT; 829 glClear GL_COLOR_BUFFER_BIT;
675 830
831 {
832 package CFClient::UI::Base;
833
834 ($draw_x, $draw_y, $draw_w, $draw_h) =
835 (0, 0, $self->{w}, $self->{h});
836 }
837
676 $self->_render; 838 $self->_render;
677# glColorMask 1, 1, 1, 0;
678# glEnable GL_BLEND;
679# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
680# glRasterPos 0, 0;
681# glCopyPixels 0, 0, $self->{w}, $self->{h};
682# glDisable GL_BLEND;
683# glColorMask 1, 1, 1, 1;
684 }; 839 };
685} 840}
686 841
687sub _draw { 842sub _draw {
688 my ($self) = @_; 843 my ($self) = @_;
689 844
690 my ($w, $h) = ($self->w, $self->h); 845 my ($w, $h) = @$self{qw(w h)};
691 846
692 my $tex = $self->{texture} 847 my $tex = $self->{texture}
693 or return; 848 or return;
694 849
695 glEnable GL_TEXTURE_2D; 850 glEnable GL_TEXTURE_2D;
696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 851 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
697 glColor 0, 0, 0, 1; 852 glColor 1, 1, 1, 1;
698 853
699 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 854 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
700 855
701 glDisable GL_TEXTURE_2D; 856 glDisable GL_TEXTURE_2D;
702} 857}
… …
705 860
706package CFClient::UI::ViewPort; 861package CFClient::UI::ViewPort;
707 862
708our @ISA = CFClient::UI::Window::; 863our @ISA = CFClient::UI::Window::;
709 864
865sub new {
866 my $class = shift;
867
868 $class->SUPER::new (
869 scroll_x => 0,
870 scroll_y => 1,
871 @_,
872 )
873}
874
710sub size_request { 875sub size_request {
711 my ($self) = @_; 876 my ($self) = @_;
712 877
713 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 878 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
714 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
715 879
716 @$self{qw(child_w child_h)} 880 $w = 10 if $self->{scroll_x};
881 $h = 10 if $self->{scroll_y};
882
883 ($w, $h)
717} 884}
718 885
719sub size_allocate { 886sub size_allocate {
720 my ($self, $w, $h) = @_; 887 my ($self, $w, $h) = @_;
721 888
889 my $child = $self->child;
890
891 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
892 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
893
894 $self->child->configure (0, 0, $w, $h);
722 $self->update; 895 $self->update;
723} 896}
724 897
725sub set_offset { 898sub set_offset {
726 my ($self, $x, $y) = @_; 899 my ($self, $x, $y) = @_;
… …
760} 933}
761 934
762sub _render { 935sub _render {
763 my ($self) = @_; 936 my ($self) = @_;
764 937
938 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
939 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
940
765 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 941 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
766 942
767 $self->SUPER::_render; 943 $self->SUPER::_render;
768} 944}
769 945
… …
777 my $class = shift; 953 my $class = shift;
778 954
779 my $self; 955 my $self;
780 956
781 my $slider = new CFClient::UI::Slider 957 my $slider = new CFClient::UI::Slider
782 vertical => 1, 958 vertical => 1,
783 range => [0, 0, 1, 0.01], # HACK fix 959 range => [0, 0, 1, 0.01], # HACK fix
784 connect_changed => sub { 960 on_changed => sub {
785 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 961 $self->{vp}->set_offset (0, $_[1]);
786 }, 962 },
787 ; 963 ;
788 964
789 $self = $class->SUPER::new ( 965 $self = $class->SUPER::new (
790 vp => (new CFClient::UI::ViewPort), 966 vp => (new CFClient::UI::ViewPort expand => 1),
791 slider => $slider, 967 slider => $slider,
792 @_, 968 @_,
793 ); 969 );
794 970
795 $self->{vp}->add ($self->{scrolled}); 971 $self->{vp}->add ($self->{scrolled});
796 $self->add ($self->{vp}); 972 $self->add ($self->{vp});
797 $self->add ($self->{slider}); 973 $self->add ($self->{slider});
798 974
799 $self 975 $self
976}
977
978sub update {
979 my ($self) = @_;
980
981 $self->SUPER::update;
982
983 # todo: overwrite size_allocate of child
984 my $child = $self->{vp}->child;
985 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
986}
987
988sub size_allocate {
989 my ($self, $w, $h) = @_;
990
991 $self->SUPER::size_allocate ($w, $h);
992
993 my $child = $self->{vp}->child;
994 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
800} 995}
801 996
802#TODO# update range on size_allocate depending on child 997#TODO# update range on size_allocate depending on child
803# update viewport offset on scroll 998# update viewport offset on scroll
804 999
… …
848 1043
849our @ISA = CFClient::UI::Bin::; 1044our @ISA = CFClient::UI::Bin::;
850 1045
851use CFClient::OpenGL; 1046use CFClient::OpenGL;
852 1047
853my @tex = 1048my $bg =
1049 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1050 mipmap => 1, wrap => 1;
1051
1052my @border =
854 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1053 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
855 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1054 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
856 1055
857sub new { 1056sub new {
858 my $class = shift; 1057 my ($class, %arg) = @_;
859 1058
860 # TODO: user_x, user_y, overwrite moveto? 1059 my $title = delete $arg{title};
861 1060
862 my $self = $class->SUPER::new ( 1061 my $self = $class->SUPER::new (
863 bg => [1, 1, 1, 1], 1062 bg => [1, 1, 1, 1],
864 border_bg => [1, 1, 1, 1], 1063 border_bg => [1, 1, 1, 1],
865 border => 0.6, 1064 border => 0.6,
866 toplevel => 1,
867 can_events => 1, 1065 can_events => 1,
868 @_ 1066 min_w => 16,
1067 min_h => 16,
1068 %arg,
869 ); 1069 );
870 1070
871 $self->{title} &&= new CFClient::UI::Label 1071 $self->{title} = new CFClient::UI::Label
872 align => 0, 1072 align => 0,
873 valign => 1, 1073 valign => 1,
874 text => $self->{title}, 1074 text => $title,
875 fontsize => $self->{border}; 1075 fontsize => $self->{border}
1076 if defined $title;
876 1077
877 $self 1078 $self
1079}
1080
1081sub add {
1082 my ($self, @widgets) = @_;
1083
1084 $self->SUPER::add (@widgets);
1085 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
878} 1086}
879 1087
880sub border { 1088sub border {
881 int $_[0]{border} * $::FONTSIZE 1089 int $_[0]{border} * $::FONTSIZE
882} 1090}
883 1091
884sub size_request { 1092sub size_request {
885 my ($self) = @_; 1093 my ($self) = @_;
1094
1095 $self->{title}->size_request
1096 if $self->{title};
886 1097
887 my ($w, $h) = $self->SUPER::size_request; 1098 my ($w, $h) = $self->SUPER::size_request;
888 1099
889 ( 1100 (
890 $w + $self->border * 2, 1101 $w + $self->border * 2,
… …
893} 1104}
894 1105
895sub size_allocate { 1106sub size_allocate {
896 my ($self, $w, $h) = @_; 1107 my ($self, $w, $h) = @_;
897 1108
1109 if ($self->{title}) {
1110 $self->{title}{w} = $w;
1111 $self->{title}{h} = $h;
1112 $self->{title}->size_allocate ($w, $h);
1113 }
1114
1115 my $border = $self->border;
1116
898 $h -= List::Util::max 0, $self->border * 2; 1117 $h -= List::Util::max 0, $border * 2;
899 $w -= List::Util::max 0, $self->border * 2; 1118 $w -= List::Util::max 0, $border * 2;
900 1119
901 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
902 if $self->{title};
903
904 $self->child->configure ($self->border, $self->border, $w, $h); 1120 $self->child->configure ($border, $border, $w, $h);
905} 1121}
906 1122
907sub button_down { 1123sub button_down {
908 my ($self, $ev, $x, $y) = @_; 1124 my ($self, $ev, $x, $y) = @_;
909 1125
… …
925 my ($ev, $x, $y) = @_; 1141 my ($ev, $x, $y) = @_;
926 1142
927 my $dx = $ev->{x} - $ox; 1143 my $dx = $ev->{x} - $ox;
928 my $dy = $ev->{y} - $oy; 1144 my $dy = $ev->{y} - $oy;
929 1145
930 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1146 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
931 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1147 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1148
1149 $self->realloc;
932 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1150 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
933 $self->check_size;
934 }; 1151 };
935 1152
936 } elsif ($lr ^ $td) { 1153 } elsif ($lr ^ $td) {
937 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1154 my ($ox, $oy) = ($ev->{x}, $ev->{y});
938 my ($bx, $by) = ($self->{x}, $self->{y}); 1155 my ($bx, $by) = ($self->{x}, $self->{y});
… …
940 $self->{motion} = sub { 1157 $self->{motion} = sub {
941 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
942 1159
943 ($x, $y) = ($ev->{x}, $ev->{y}); 1160 ($x, $y) = ($ev->{x}, $ev->{y});
944 1161
945 $self->move ($bx + $x - $ox, $by + $y - $oy); 1162 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
946 $self->update;
947 }; 1163 };
1164 } else {
1165 return 0;
1166 }
1167
948 } 1168 1
949} 1169}
950 1170
951sub button_up { 1171sub button_up {
952 my ($self, $ev, $x, $y) = @_; 1172 my ($self, $ev, $x, $y) = @_;
953 1173
954 delete $self->{motion}; 1174 !!delete $self->{motion}
955} 1175}
956 1176
957sub mouse_motion { 1177sub mouse_motion {
958 my ($self, $ev, $x, $y) = @_; 1178 my ($self, $ev, $x, $y) = @_;
959 1179
960 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1180 $self->{motion}->($ev, $x, $y) if $self->{motion};
1181
1182 !!$self->{motion}
961} 1183}
962 1184
963sub _draw { 1185sub _draw {
964 my ($self) = @_; 1186 my ($self) = @_;
965 1187
1188 my $child = $self->{children}[0];
1189
966 my ($w, $h ) = ($self->{w}, $self->{h}); 1190 my ($w, $h ) = ($self->{w}, $self->{h});
967 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1191 my ($cw, $ch) = ($child->{w}, $child->{h});
968 1192
969 glEnable GL_TEXTURE_2D; 1193 glEnable GL_TEXTURE_2D;
970 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1194 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
971 1195
972 my $border = $self->border; 1196 my $border = $self->border;
973 1197
974 glColor @{ $self->{border_bg} }; 1198 glColor @{ $self->{border_bg} };
975 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1199 $border[0]->draw_quad_alpha (0, 0, $w, $border);
976 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1200 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
977 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1201 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
978 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1202 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
979 1203
980 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1204 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
981 my $bg = $tex[0]; 1205 glColor @{ $self->{bg} };
982 1206
983 # TODO: repeat texture not scale 1207 # TODO: repeat texture not scale
1208 # solve this better(?)
984 my $rep_x = $cw / $bg->{w}; 1209 $bg->{s} = $cw / $bg->{w};
985 my $rep_y = $ch / $bg->{h}; 1210 $bg->{t} = $ch / $bg->{h};
986
987 glColor @{ $self->{bg} };
988
989 $bg->{s} = $rep_x;
990 $bg->{t} = $rep_y;
991 $bg->{wrap_mode} = 1;
992 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1211 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
993 } 1212 }
994 1213
995 glDisable GL_TEXTURE_2D; 1214 glDisable GL_TEXTURE_2D;
996 1215
997 $self->{title}->draw if $self->{title};
998
999 $self->child->draw; 1216 $child->draw;
1217
1218 if ($self->{title}) {
1219 glTranslate 0, $border - $self->{h};
1220 $self->{title}->_draw;
1221 }
1000} 1222}
1001 1223
1002############################################################################# 1224#############################################################################
1003 1225
1004package CFClient::UI::Table; 1226package CFClient::UI::Table;
… …
1012sub new { 1234sub new {
1013 my $class = shift; 1235 my $class = shift;
1014 1236
1015 $class->SUPER::new ( 1237 $class->SUPER::new (
1016 col_expand => [], 1238 col_expand => [],
1017 @_ 1239 @_,
1018 ) 1240 )
1241}
1242
1243sub children {
1244 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1019} 1245}
1020 1246
1021sub add { 1247sub add {
1022 my ($self, $x, $y, $child) = @_; 1248 my ($self, $x, $y, $child) = @_;
1023 1249
1024 $child->set_parent ($self); 1250 $child->set_parent ($self);
1025 $self->{children}[$y][$x] = $child; 1251 $self->{children}[$y][$x] = $child;
1026 1252
1027 $child->check_size; 1253 $self->realloc;
1028} 1254}
1029 1255
1030sub children {
1031 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1032}
1033
1034# TODO: move to container class maybe? send childs a signal on removal? 1256# TODO: move to container class maybe? send children a signal on removal?
1035sub clear { 1257sub clear {
1036 my ($self) = @_; 1258 my ($self) = @_;
1037 1259
1038 my @children = $self->children; 1260 my @children = $self->children;
1039 delete $self->{children}; 1261 delete $self->{children};
… …
1041 for (@children) { 1263 for (@children) {
1042 delete $_->{parent}; 1264 delete $_->{parent};
1043 $_->hide; 1265 $_->hide;
1044 } 1266 }
1045 1267
1046 $self->update; 1268 $self->realloc;
1047} 1269}
1048 1270
1049sub get_wh { 1271sub get_wh {
1050 my ($self) = @_; 1272 my ($self) = @_;
1051 1273
… …
1082sub size_allocate { 1304sub size_allocate {
1083 my ($self, $w, $h) = @_; 1305 my ($self, $w, $h) = @_;
1084 1306
1085 my ($ws, $hs) = $self->get_wh; 1307 my ($ws, $hs) = $self->get_wh;
1086 1308
1087 my $req_w = sum @$ws; 1309 my $req_w = (sum @$ws) || 1;
1088 my $req_h = sum @$hs; 1310 my $req_h = (sum @$hs) || 1;
1089 1311
1090 # TODO: nicer code && do row_expand 1312 # TODO: nicer code && do row_expand
1091 my @col_expand = @{$self->{col_expand}}; 1313 my @col_expand = @{$self->{col_expand}};
1092 @col_expand = (1) x @$ws unless @col_expand; 1314 @col_expand = (1) x @$ws unless @col_expand;
1093 my $col_expand = (sum @col_expand) || 1; 1315 my $col_expand = (sum @col_expand) || 1;
… …
1147 } 1369 }
1148} 1370}
1149 1371
1150############################################################################# 1372#############################################################################
1151 1373
1152package CFClient::UI::HBox; 1374package CFClient::UI::Box;
1153
1154# TODO: wrap into common Box base class
1155 1375
1156our @ISA = CFClient::UI::Container::; 1376our @ISA = CFClient::UI::Container::;
1157 1377
1158sub size_request { 1378sub size_request {
1159 my ($self) = @_; 1379 my ($self) = @_;
1160 1380
1161 my @alloc = map [$_->size_request], @{$self->{children}}; 1381 $self->{vertical}
1162 1382 ? (
1163 ( 1383 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1164 (List::Util::sum map $_->[0], @alloc), 1384 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1165 (List::Util::max map $_->[1], @alloc), 1385 )
1166 ) 1386 : (
1387 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1388 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1389 )
1167} 1390}
1168 1391
1169sub size_allocate { 1392sub size_allocate {
1170 my ($self, $w, $h) = @_; 1393 my ($self, $w, $h) = @_;
1171 1394
1172 ($h, $w) = ($w, $h); 1395 my $space = $self->{vertical} ? $h : $w;
1173
1174 my $children = $self->{children}; 1396 my $children = $self->{children};
1175 1397
1176 my @h = map $_->{req_w}, @$children; 1398 my @req;
1177 1399
1178 my $req_h = List::Util::sum @h; 1400 if ($self->{homogeneous}) {
1179 1401 @req = ($space / (@$children || 1)) x @$children;
1180 if ($req_h > $h) {
1181 # ah well, not enough space
1182 $_ *= $h / $req_h for @h;
1183 } else { 1402 } else {
1403 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1404 my $req = List::Util::sum @req;
1405
1406 if ($req > $space) {
1407 # ah well, not enough space
1408 $_ *= $space / $req for @req;
1409 } else {
1184 my $exp = List::Util::sum map $_->{expand}, @$children; 1410 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1185 $exp ||= 1;
1186 1411
1412 $space = ($space - $req) / $expand; # remaining space to give away
1413
1414 $req[$_] += $space * $children->[$_]{expand}
1187 for (0 .. $#$children) { 1415 for 0 .. $#$children;
1188 my $child = $children->[$_];
1189
1190 my $alloc_h = $h[$_];
1191 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1192 $h[$_] = $alloc_h;
1193 } 1416 }
1194 } 1417 }
1195 1418
1196 CFClient::UI::harmonize \@h; 1419 CFClient::UI::harmonize \@req;
1197 1420
1198 my $y = 0; 1421 my $pos = 0;
1199 for (0 .. $#$children) { 1422 for (0 .. $#$children) {
1200 my $child = $children->[$_];
1201 my $h = $h[$_]; 1423 my $alloc = $req[$_];
1202 $child->configure ($y, 0, $h, $w); 1424 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1203 1425
1204 $y += $h; 1426 $pos += $alloc;
1205 } 1427 }
1206 1428
1207 1 1429 1
1208} 1430}
1209 1431
1210############################################################################# 1432#############################################################################
1211 1433
1434package CFClient::UI::HBox;
1435
1436our @ISA = CFClient::UI::Box::;
1437
1438sub new {
1439 my $class = shift;
1440
1441 $class->SUPER::new (
1442 vertical => 0,
1443 @_,
1444 )
1445}
1446
1447#############################################################################
1448
1212package CFClient::UI::VBox; 1449package CFClient::UI::VBox;
1213 1450
1214# TODO: wrap into common Box base class
1215
1216our @ISA = CFClient::UI::Container::; 1451our @ISA = CFClient::UI::Box::;
1217 1452
1218sub size_request { 1453sub new {
1219 my ($self) = @_; 1454 my $class = shift;
1220 1455
1221 my @alloc = map [$_->size_request], @{$self->{children}}; 1456 $class->SUPER::new (
1222 1457 vertical => 1,
1223 ( 1458 @_,
1224 (List::Util::max map $_->[0], @alloc),
1225 (List::Util::sum map $_->[1], @alloc),
1226 ) 1459 )
1227} 1460}
1228 1461
1229sub size_allocate {
1230 my ($self, $w, $h) = @_;
1231
1232 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1233
1234 my $children = $self->{children};
1235
1236 my @h = map $_->{req_h}, @$children;
1237
1238 my $req_h = List::Util::sum @h;
1239
1240 if ($req_h > $h) {
1241 # ah well, not enough space
1242 $_ *= $h / $req_h for @h;
1243 } else {
1244 my $exp = List::Util::sum map $_->{expand}, @$children;
1245 $exp ||= 1;
1246
1247 for (0 .. $#$children) {
1248 my $child = $children->[$_];
1249
1250 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1251 }
1252 }
1253
1254 CFClient::UI::harmonize \@h;
1255
1256 my $y = 0;
1257 for (0 .. $#$children) {
1258 my $child = $children->[$_];
1259 my $h = $h[$_];
1260 $child->configure (0, $y, $w, $h);
1261
1262 $y += $h;
1263 }
1264
1265 1
1266}
1267
1268############################################################################# 1462#############################################################################
1269 1463
1270package CFClient::UI::Label; 1464package CFClient::UI::Label;
1271 1465
1272our @ISA = CFClient::UI::Base::; 1466our @ISA = CFClient::UI::DrawBG::;
1273 1467
1274use CFClient::OpenGL; 1468use CFClient::OpenGL;
1275 1469
1276sub new { 1470sub new {
1277 my ($class, %arg) = @_; 1471 my ($class, %arg) = @_;
1278 1472
1279 my $self = $class->SUPER::new ( 1473 my $self = $class->SUPER::new (
1280 fg => [1, 1, 1], 1474 fg => [1, 1, 1],
1475 #bg => none
1476 #active_bg => none
1281 #font => default_font 1477 #font => default_font
1282 #text => initial text 1478 #text => initial text
1283 #markup => initial narkup 1479 #markup => initial narkup
1480 #max_w => maximum pixel width
1481 ellipsise => 3, # end
1284 layout => (new CFClient::Layout), 1482 layout => (new CFClient::Layout),
1285 fontsize => 1, 1483 fontsize => 1,
1286 align => -1, 1484 align => -1,
1287 valign => -1, 1485 valign => -1,
1288 padding => 2, 1486 padding_x => 2,
1487 padding_y => 2,
1289 can_events => 0, 1488 can_events => 0,
1290 %arg 1489 %arg
1291 ); 1490 );
1292 1491
1293 if (exists $self->{template}) { 1492 if (exists $self->{template}) {
… …
1303 } 1502 }
1304 1503
1305 $self 1504 $self
1306} 1505}
1307 1506
1308sub escape { 1507sub escape($) {
1309 local $_ = $_[1]; 1508 local $_ = $_[0];
1310 1509
1311 s/&/&amp;/g; 1510 s/&/&amp;/g;
1312 s/>/&gt;/g; 1511 s/>/&gt;/g;
1313 s/</&lt;/g; 1512 s/</&lt;/g;
1314 1513
1315 $_[1] 1514 $_
1316} 1515}
1317 1516
1318sub update { 1517sub update {
1319 my ($self) = @_; 1518 my ($self) = @_;
1320 1519
… …
1329 $self->{text} = "T$text"; 1528 $self->{text} = "T$text";
1330 1529
1331 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1530 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1332 $self->{layout}->set_text ($text); 1531 $self->{layout}->set_text ($text);
1333 1532
1533 $self->realloc;
1334 $self->update; 1534 $self->update;
1335 $self->check_size;
1336} 1535}
1337 1536
1338sub set_markup { 1537sub set_markup {
1339 my ($self, $markup) = @_; 1538 my ($self, $markup) = @_;
1340 1539
… …
1344 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1543 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1345 1544
1346 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1545 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1347 $self->{layout}->set_markup ($markup); 1546 $self->{layout}->set_markup ($markup);
1348 1547
1548 $self->realloc;
1349 $self->update; 1549 $self->update;
1350 $self->check_size;
1351} 1550}
1352 1551
1353sub size_request { 1552sub size_request {
1354 my ($self) = @_; 1553 my ($self) = @_;
1355 1554
1356 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1555 $self->{layout}->set_font ($self->{font}) if $self->{font};
1357 $self->{layout}->set_width ($self->{max_w} || -1); 1556 $self->{layout}->set_width ($self->{max_w} || -1);
1557 $self->{layout}->set_ellipsise ($self->{ellipsise});
1558 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1358 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1559 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1359 1560
1360 my ($w, $h) = $self->{layout}->size; 1561 my ($w, $h) = $self->{layout}->size;
1361 1562
1362 if (exists $self->{template}) { 1563 if (exists $self->{template}) {
… …
1367 1568
1368 $w = List::Util::max $w, $w2; 1569 $w = List::Util::max $w, $w2;
1369 $h = List::Util::max $h, $h2; 1570 $h = List::Util::max $h, $h2;
1370 } 1571 }
1371 1572
1372 ( 1573 ($w, $h)
1373 $w + $self->{padding} * 2,
1374 $h + $self->{padding} * 2,
1375 )
1376} 1574}
1377 1575
1378sub size_allocate { 1576sub size_allocate {
1379 my ($self, $w, $h) = @_; 1577 my ($self, $w, $h) = @_;
1380 1578
1579 delete $self->{ox};
1580
1381 delete $self->{texture}; 1581 delete $self->{texture}
1582 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1382} 1583}
1383 1584
1384sub set_fontsize { 1585sub set_fontsize {
1385 my ($self, $fontsize) = @_; 1586 my ($self, $fontsize) = @_;
1386 1587
1387 $self->{fontsize} = $fontsize; 1588 $self->{fontsize} = $fontsize;
1388 delete $self->{texture}; 1589 delete $self->{texture};
1389 1590
1390 $self->update; 1591 $self->realloc;
1391 $self->check_size;
1392} 1592}
1393 1593
1394sub _draw { 1594sub _draw {
1395 my ($self) = @_; 1595 my ($self) = @_;
1596
1597 $self->SUPER::_draw; # draw background, if applicable
1396 1598
1397 my $tex = $self->{texture} ||= do { 1599 my $tex = $self->{texture} ||= do {
1398 $self->{layout}->set_foreground (@{$self->{fg}}); 1600 $self->{layout}->set_foreground (@{$self->{fg}});
1399 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1601 $self->{layout}->set_font ($self->{font}) if $self->{font};
1400 $self->{layout}->set_width ($self->{w}); 1602 $self->{layout}->set_width ($self->{w});
1603 $self->{layout}->set_ellipsise ($self->{ellipsise});
1604 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1401 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1605 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1402 1606
1403 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1607 new_from_layout CFClient::Texture $self->{layout}
1608 };
1404 1609
1610 unless (exists $self->{ox}) {
1405 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1611 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1406 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1612 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1407 : ($self->{w} - $tex->{w}) * 0.5; 1613 : ($self->{w} - $tex->{w}) * 0.5);
1408 1614
1409 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1615 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1410 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1616 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1411 : ($self->{h} - $tex->{h}) * 0.5; 1617 : ($self->{h} - $tex->{h}) * 0.5);
1412
1413 $tex
1414 }; 1618 };
1415 1619
1416 glEnable GL_TEXTURE_2D; 1620 glEnable GL_TEXTURE_2D;
1417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1621 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1418 1622
… …
1444 active_fg => [0, 0, 0], 1648 active_fg => [0, 0, 0],
1445 can_hover => 1, 1649 can_hover => 1,
1446 can_focus => 1, 1650 can_focus => 1,
1447 valign => 0, 1651 valign => 0,
1448 can_events => 1, 1652 can_events => 1,
1653 #text => ...
1449 @_ 1654 @_
1450 ) 1655 )
1451} 1656}
1452 1657
1453sub _set_text { 1658sub _set_text {
… …
1463 $self->{text} = $text; 1668 $self->{text} = $text;
1464 1669
1465 $text =~ s/./*/g if $self->{hidden}; 1670 $text =~ s/./*/g if $self->{hidden};
1466 $self->{layout}->set_text ("$text "); 1671 $self->{layout}->set_text ("$text ");
1467 1672
1468 $self->emit (changed => $self->{text}); 1673 $self->_emit (changed => $self->{text});
1469} 1674}
1470 1675
1471sub set_text { 1676sub set_text {
1472 my ($self, $text) = @_; 1677 my ($self, $text) = @_;
1473 1678
1474 $self->{cursor} = length $text; 1679 $self->{cursor} = length $text;
1475 $self->_set_text ($text); 1680 $self->_set_text ($text);
1476 $self->check_size; 1681
1477 $self->update; 1682 $self->realloc;
1478} 1683}
1479 1684
1480sub get_text { 1685sub get_text {
1481 $_[0]{text} 1686 $_[0]{text}
1482} 1687}
… …
1485 my ($self) = @_; 1690 my ($self) = @_;
1486 1691
1487 my ($w, $h) = $self->SUPER::size_request; 1692 my ($w, $h) = $self->SUPER::size_request;
1488 1693
1489 ($w + 1, $h) # add 1 for cursor 1694 ($w + 1, $h) # add 1 for cursor
1490}
1491
1492sub size_allocate {
1493 my ($self, $w, $h) = @_;
1494
1495 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1496} 1695}
1497 1696
1498sub key_down { 1697sub key_down {
1499 my ($self, $ev) = @_; 1698 my ($self, $ev) = @_;
1500 1699
… …
1515 } elsif ($sym == CFClient::SDLK_HOME) { 1714 } elsif ($sym == CFClient::SDLK_HOME) {
1516 $self->{cursor} = 0; 1715 $self->{cursor} = 0;
1517 } elsif ($sym == CFClient::SDLK_END) { 1716 } elsif ($sym == CFClient::SDLK_END) {
1518 $self->{cursor} = length $text; 1717 $self->{cursor} = length $text;
1519 } elsif ($uni == 27) { 1718 } elsif ($uni == 27) {
1520 $self->emit ('escape'); 1719 $self->_emit ('escape');
1521 } elsif ($uni) { 1720 } elsif ($uni) {
1522 substr $text, $self->{cursor}++, 0, chr $uni; 1721 substr $text, $self->{cursor}++, 0, chr $uni;
1722 } else {
1723 return 0;
1523 } 1724 }
1524 1725
1525 $self->_set_text ($text); 1726 $self->_set_text ($text);
1526 $self->update; 1727
1728 $self->realloc;
1729
1730 1
1527} 1731}
1528 1732
1529sub focus_in { 1733sub focus_in {
1530 my ($self) = @_; 1734 my ($self) = @_;
1531 1735
… …
1546 utf8::encode $text; 1750 utf8::encode $text;
1547 $self->{cursor} = length substr $text, 0, $idx; 1751 $self->{cursor} = length substr $text, 0, $idx;
1548 1752
1549 $self->_set_text ($self->{text}); 1753 $self->_set_text ($self->{text});
1550 $self->update; 1754 $self->update;
1755
1756 1
1551} 1757}
1552 1758
1553sub mouse_motion { 1759sub mouse_motion {
1554 my ($self, $ev, $x, $y) = @_; 1760 my ($self, $ev, $x, $y) = @_;
1555# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1761# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1762
1763 0
1556} 1764}
1557 1765
1558sub _draw { 1766sub _draw {
1559 my ($self) = @_; 1767 my ($self) = @_;
1560 1768
… …
1611 if ($sym == 13) { 1819 if ($sym == 13) {
1612 unshift @{$self->{history}}, 1820 unshift @{$self->{history}},
1613 my $txt = $self->get_text; 1821 my $txt = $self->get_text;
1614 $self->{history_pointer} = -1; 1822 $self->{history_pointer} = -1;
1615 $self->{history_saveback} = ''; 1823 $self->{history_saveback} = '';
1616 $self->emit (activate => $txt); 1824 $self->_emit (activate => $txt);
1617 $self->update; 1825 $self->update;
1618 1826
1619 } elsif ($sym == CFClient::SDLK_UP) { 1827 } elsif ($sym == CFClient::SDLK_UP) {
1620 if ($self->{history_pointer} < 0) { 1828 if ($self->{history_pointer} < 0) {
1621 $self->{history_saveback} = $self->get_text; 1829 $self->{history_saveback} = $self->get_text;
… …
1637 } else { 1845 } else {
1638 $self->set_text ($self->{history_saveback}); 1846 $self->set_text ($self->{history_saveback});
1639 } 1847 }
1640 1848
1641 } else { 1849 } else {
1642 $self->SUPER::key_down ($ev); 1850 return $self->SUPER::key_down ($ev)
1851 }
1852
1643 } 1853 1
1644
1645} 1854}
1646 1855
1647############################################################################# 1856#############################################################################
1648 1857
1649package CFClient::UI::Button; 1858package CFClient::UI::Button;
… …
1658 1867
1659sub new { 1868sub new {
1660 my $class = shift; 1869 my $class = shift;
1661 1870
1662 $class->SUPER::new ( 1871 $class->SUPER::new (
1663 padding => 4, 1872 padding_x => 4,
1873 padding_y => 4,
1664 fg => [1, 1, 1], 1874 fg => [1, 1, 1],
1665 bg => [1, 1, 1, 0.2],
1666 active_fg => [0, 0, 1], 1875 active_fg => [0, 0, 1],
1667 can_hover => 1, 1876 can_hover => 1,
1668 align => 0, 1877 align => 0,
1669 valign => 0, 1878 valign => 0,
1670 can_events => 1, 1879 can_events => 1,
1671 @_ 1880 @_
1672 ) 1881 )
1673} 1882}
1674 1883
1884sub activate { }
1885
1675sub button_up { 1886sub button_up {
1676 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1677 1888
1889 $self->emit ("activate")
1678 if ($x >= 0 && $x < $self->{w} 1890 if $x >= 0 && $x < $self->{w}
1679 && $y >= 0 && $y < $self->{h}) { 1891 && $y >= 0 && $y < $self->{h};
1680 $self->emit ("activate"); 1892
1681 } 1893 1
1682} 1894}
1683 1895
1684sub _draw { 1896sub _draw {
1685 my ($self) = @_; 1897 my ($self) = @_;
1686 1898
… …
1715 1927
1716sub new { 1928sub new {
1717 my $class = shift; 1929 my $class = shift;
1718 1930
1719 $class->SUPER::new ( 1931 $class->SUPER::new (
1720 padding => 2, 1932 padding_x => 2,
1933 padding_y => 2,
1721 fg => [1, 1, 1], 1934 fg => [1, 1, 1],
1722 active_fg => [1, 1, 0], 1935 active_fg => [1, 1, 0],
1936 bg => [0, 0, 0, 0.2],
1937 active_bg => [1, 1, 1, 0.5],
1723 state => 0, 1938 state => 0,
1724 can_hover => 1, 1939 can_hover => 1,
1725 @_ 1940 @_
1726 ) 1941 )
1727} 1942}
1728 1943
1729sub size_request { 1944sub size_request {
1730 my ($self) = @_; 1945 my ($self) = @_;
1731 1946
1732 ($self->{padding} * 2 + 6) x 2 1947 (6) x 2
1733} 1948}
1734 1949
1735sub button_down { 1950sub button_down {
1736 my ($self, $ev, $x, $y) = @_; 1951 my ($self, $ev, $x, $y) = @_;
1737 1952
1738 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1953 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1739 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1954 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1740 $self->{state} = !$self->{state}; 1955 $self->{state} = !$self->{state};
1741 $self->emit (changed => $self->{state}); 1956 $self->_emit (changed => $self->{state});
1957 } else {
1958 return 0
1959 }
1960
1742 } 1961 1
1743} 1962}
1744 1963
1745sub _draw { 1964sub _draw {
1746 my ($self) = @_; 1965 my ($self) = @_;
1747 1966
1748 $self->SUPER::_draw; 1967 $self->SUPER::_draw;
1749 1968
1750 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1969 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1751 1970
1752 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1971 my ($w, $h) = @$self{qw(w h)};
1972
1973 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1753 1974
1754 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1975 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1755 1976
1756 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1977 my $tex = $self->{state} ? $tex[1] : $tex[0];
1757 1978
… …
2011 qw(s1_slider.png s1_slider_bg.png); 2232 qw(s1_slider.png s1_slider_bg.png);
2012 2233
2013sub new { 2234sub new {
2014 my $class = shift; 2235 my $class = shift;
2015 2236
2016 # range [value, low, high, page] 2237 # range [value, low, high, page, unit]
2017 2238
2018 # TODO: 0-width page 2239 # TODO: 0-width page
2019 # TODO: req_w/h are wrong with vertical 2240 # TODO: req_w/h are wrong with vertical
2020 # TODO: calculations are off 2241 # TODO: calculations are off
2021 my $self = $class->SUPER::new ( 2242 my $self = $class->SUPER::new (
2022 fg => [1, 1, 1], 2243 fg => [1, 1, 1],
2023 active_fg => [0, 0, 0], 2244 active_fg => [0, 0, 0],
2245 bg => [0, 0, 0, 0.2],
2246 active_bg => [1, 1, 1, 0.5],
2024 range => [0, 0, 100, 10], 2247 range => [0, 0, 100, 10, 0],
2025 req_w => $::WIDTH / 80, 2248 min_w => $::WIDTH / 80,
2026 req_h => $::WIDTH / 80, 2249 min_h => $::WIDTH / 80,
2027 vertical => 0, 2250 vertical => 0,
2028 can_hover => 1, 2251 can_hover => 1,
2029 inner_pad => 5, 2252 inner_pad => 0.02,
2030 @_ 2253 @_
2031 ); 2254 );
2032 2255
2256 $self->set_value ($self->{range}[0]);
2257 $self->update;
2258
2033 $self 2259 $self
2034} 2260}
2035 2261
2262sub changed { }
2263
2264sub set_range {
2265 my ($self, $range) = @_;
2266
2267 ($range, $self->{range}) = ($self->{range}, $range);
2268
2269 $self->update
2270 if "@$range" ne "@{$self->{range}}";
2271}
2272
2273sub set_value {
2274 my ($self, $value) = @_;
2275
2276 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2277
2278 $hi = $lo + 1 if $hi <= $lo;
2279
2280 $page = $hi - $lo if $page > $hi - $lo;
2281
2282 $value = $lo if $value < $lo;
2283 $value = $hi - $page if $value > $hi - $page;
2284
2285 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2286 if $unit;
2287
2288 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2289
2290 if ($value != $old_value) {
2291 $self->_emit (changed => $value);
2292 $self->update;
2293 }
2294}
2295
2036sub size_request { 2296sub size_request {
2037 my ($self) = @_; 2297 my ($self) = @_;
2038 2298
2039 my $w = $self->{req_w}; 2299 ($self->{req_w}, $self->{req_h})
2040 my $h = $self->{req_h};
2041
2042 $self->{vertical} ? ($h, $w) : ($w, $h)
2043} 2300}
2044 2301
2045sub button_down { 2302sub button_down {
2046 my ($self, $ev, $x, $y) = @_; 2303 my ($self, $ev, $x, $y) = @_;
2047 2304
2048 $self->SUPER::button_down ($ev, $x, $y); 2305 $self->SUPER::button_down ($ev, $x, $y);
2306
2307 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2308
2049 $self->mouse_motion ($ev, $x, $y); 2309 $self->mouse_motion ($ev, $x, $y)
2050} 2310}
2051 2311
2052sub mouse_motion { 2312sub mouse_motion {
2053 my ($self, $ev, $x, $y) = @_; 2313 my ($self, $ev, $x, $y) = @_;
2054 2314
2055 if ($GRAB == $self) { 2315 if ($GRAB == $self) {
2316 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2317
2318 my (undef, $lo, $hi, $page) = @{$self->{range}};
2319
2320 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2321
2322 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2323 } else {
2324 return 0;
2325 }
2326
2327 1
2328}
2329
2330sub update {
2331 my ($self) = @_;
2332
2333 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2334 $self->set_value ($self->{range}[0]);
2335
2056 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2336 my ($value, $lo, $hi, $page) = @{$self->{range}};
2337 my $range = ($hi - $page - $lo) || 1e-100;
2057 2338
2058 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2339 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2059 2340
2060 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2341 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2061 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2342 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2062 2343
2063 $x -= $inner_pad_px; # substract the padding 2344 $value = ($value - $lo) / $range;
2064 $x = $x * ($hi - $lo) / $inner_w + $lo; 2345 $value = $value * $self->{scale} + $self->{offset};
2065 $x = $lo if $x < $lo;
2066 $x = $hi - $page if $x > $hi - $page;
2067 $self->{range}[0] = $x;
2068 2346
2069 $self->emit (changed => $x); 2347 $self->{knob_x} = $value - $knob_w * 0.5;
2070 $self->update; 2348 $self->{knob_w} = $knob_w;
2071 } 2349 });
2072}
2073 2350
2074# the inner_* stuff is for generating a padding for the slider handle, 2351 $self->SUPER::update;
2075# so that the handle doesn't leave the texture. This calculation isn't 100%
2076# correct propably, but it does the job for now
2077sub _calc_inner_pad_px {
2078 my ($self, $w) = @_;
2079 ($w / 100) * $self->{inner_pad} # % to pixels
2080} 2352}
2081 2353
2082sub _draw { 2354sub _draw {
2083 my ($self) = @_; 2355 my ($self) = @_;
2084 2356
2085 $self->SUPER::_draw (); 2357 $self->SUPER::_draw ();
2086 2358
2087 my ($w, $h) = @$self{qw(w h)}; 2359 glScale $self->{w}, $self->{h};
2088 2360
2089 if ($self->{vertical}) { 2361 if ($self->{vertical}) {
2090 # draw a vertical slider like a rotated horizontal slider 2362 # draw a vertical slider like a rotated horizontal slider
2091 2363
2364 glTranslate 1, 0, 0;
2092 glRotate 90, 0, 0, 1; 2365 glRotate 90, 0, 0, 1;
2093 glTranslate 0, -$self->{w}, 0;
2094
2095 ($w, $h) = ($h, $w);
2096 } 2366 }
2097 2367
2098 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2368 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2099 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2369 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2100 2370
2101 my ($value, $lo, $hi, $page) = @{$self->{range}};
2102
2103 $hi = $value + 1 if $lo == $hi;
2104
2105 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2106 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2107
2108 $page = int $page * $inner_w / ($hi - $lo);
2109 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2110
2111 $w -= $page;
2112 $page &= ~1;
2113 glTranslate $page * 0.5, 0, 0;
2114 $page ||= 2;
2115
2116 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2117 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2118
2119 glEnable GL_TEXTURE_2D; 2371 glEnable GL_TEXTURE_2D;
2120 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2372 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2121 2373
2122 # draw background 2374 # draw background
2123 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2375 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2124 2376
2125 # draw handle 2377 # draw handle
2126 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2378 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2127 2379
2128 glDisable GL_TEXTURE_2D; 2380 glDisable GL_TEXTURE_2D;
2129} 2381}
2382
2383#############################################################################
2384
2385package CFClient::UI::ValSlider;
2386
2387our @ISA = CFClient::UI::HBox::;
2388
2389sub new {
2390 my ($class, %arg) = @_;
2391
2392 my $range = delete $arg{range};
2393
2394 my $self = $class->SUPER::new (
2395 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2396 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2397 to_value => sub { shift },
2398 from_value => sub { shift },
2399 %arg,
2400 );
2401
2402 $self->{slider}->connect (changed => sub {
2403 my ($self, $value) = @_;
2404 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2405 $self->{parent}->emit (changed => $value);
2406 });
2407
2408# $self->{entry}->connect (changed => sub {
2409# my ($self, $value) = @_;
2410# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2411# $self->{parent}->emit (changed => $value);
2412# });
2413
2414 $self->add ($self->{slider}, $self->{entry});
2415
2416 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2417
2418 $self
2419}
2420
2421sub set_range { shift->{slider}->set_range (@_) }
2422sub set_value { shift->{slider}->set_value (@_) }
2130 2423
2131############################################################################# 2424#############################################################################
2132 2425
2133package CFClient::UI::TextView; 2426package CFClient::UI::TextView;
2134 2427
… …
2164 2457
2165 $self->{fontsize} = $fontsize; 2458 $self->{fontsize} = $fontsize;
2166 $self->reflow; 2459 $self->reflow;
2167} 2460}
2168 2461
2169sub text_height {
2170 my ($self, $text) = @_;
2171
2172 my $layout = $self->{layout};
2173
2174 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2175 $layout->set_width ($self->{children}[0]{w});
2176 $layout->set_markup ($text);
2177
2178 ($layout->size)[1]
2179}
2180
2181sub reflow {
2182 my ($self) = @_;
2183
2184 $self->{need_reflow}++;
2185 $self->update;
2186}
2187
2188sub size_allocate { 2462sub size_allocate {
2189 my ($self, $w, $h) = @_; 2463 my ($self, $w, $h) = @_;
2190 2464
2191 $self->SUPER::size_allocate ($w, $h); 2465 $self->SUPER::size_allocate ($w, $h);
2192 2466
… …
2195 $self->{layout}->set_width ($self->{children}[0]{w}); 2469 $self->{layout}->set_width ($self->{children}[0]{w});
2196 2470
2197 $self->reflow; 2471 $self->reflow;
2198} 2472}
2199 2473
2474sub text_size {
2475 my ($self, $text, $indent) = @_;
2476
2477 my $layout = $self->{layout};
2478
2479 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2480 $layout->set_width ($self->{children}[0]{w} - $indent);
2481 $layout->set_markup ($text);
2482
2483 $layout->size
2484}
2485
2486sub reflow {
2487 my ($self) = @_;
2488
2489 $self->{need_reflow}++;
2490 $self->update;
2491}
2492
2493sub set_offset {
2494 my ($self, $offset) = @_;
2495
2496 # todo: base offset on lines or so, not on pixels
2497 $self->{children}[1]->set_value ($offset);
2498}
2499
2500sub clear {
2501 my ($self) = @_;
2502
2503 $self->{par} = [];
2504 $self->{height} = 0;
2505 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2506}
2507
2200sub add_paragraph { 2508sub add_paragraph {
2201 my ($self, $color, $text) = @_; 2509 my ($self, $color, $text, $indent) = @_;
2202 2510
2203 #TODO: intelligently "reformat" paragraph 2511 for my $line (split /\n/, $text) {
2204 2512 my ($w, $h) = $self->text_size ($line);
2205 my $height = $self->text_height ($text);
2206
2207 $self->{height} += $height; 2513 $self->{height} += $h;
2514 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2515 }
2208 2516
2209 push @{$self->{par}}, [$height, $color, $text];
2210
2211 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2517 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2212 $self->{children}[1]->update;
2213} 2518}
2214 2519
2215sub update { 2520sub update {
2216 my ($self) = @_; 2521 my ($self) = @_;
2217 2522
… …
2220 return unless $self->{h} > 0; 2525 return unless $self->{h} > 0;
2221 2526
2222 delete $self->{texture}; 2527 delete $self->{texture};
2223 2528
2224 $ROOT->on_post_alloc ($self, sub { 2529 $ROOT->on_post_alloc ($self, sub {
2530 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2531
2225 if (delete $self->{need_reflow}) { 2532 if (delete $self->{need_reflow}) {
2226 my $height = 0; 2533 my $height = 0;
2227 2534
2228 $height += $_->[0] = $self->text_height ($_->[2]) 2535 my $layout = $self->{layout};
2536
2537 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2538
2229 for @{$self->{par}}; 2539 for (@{$self->{par}}) {
2540 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2541 $layout->set_width ($W - $_->[3]);
2542 $layout->set_markup ($_->[4]);
2543 my ($w, $h) = $layout->size;
2544 $_->[0] = $w + $_->[3];
2545 $_->[1] = $h;
2546 }
2547
2548 $height += $_->[1];
2549 }
2230 2550
2231 $self->{height} = $height; 2551 $self->{height} = $height;
2232 2552
2233 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2553 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2234 2554
2235 delete $self->{texture}; 2555 delete $self->{texture};
2236 } 2556 }
2237 2557
2238 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2558 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2239 glClearColor 0, 0, 0, 0; 2559 glClearColor 0.5, 0.5, 0.5, 0;
2240 glClear GL_COLOR_BUFFER_BIT; 2560 glClear GL_COLOR_BUFFER_BIT;
2241 2561
2242 glEnable GL_TEXTURE_2D;
2243 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2244
2245 my $top = int $self->{children}[1]{range}[0]; 2562 my $top = int $self->{children}[1]{range}[0];
2246 2563
2247 my $y0 = $top; 2564 my $y0 = $top;
2248 my $y1 = $top + $self->{h}; 2565 my $y1 = $top + $H;
2249 2566
2250 my $y = 0; 2567 my $y = 0;
2251 2568
2252 my $layout = $self->{layout}; 2569 my $layout = $self->{layout};
2253 2570
2254 $layout->set_font ($self->{font}) if $self->{font}; 2571 $layout->set_font ($self->{font}) if $self->{font};
2255 2572
2573 glEnable GL_BLEND;
2574 #TODO# not correct in windows where rgba is forced off
2575 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2576
2256 for my $par (@{$self->{par}}) { 2577 for my $par (@{$self->{par}}) {
2257 my $h = $par->[0]; 2578 my $h = $par->[1];
2258 2579
2259 if ($y0 < $y + $h && $y < $y1) { 2580 if ($y0 < $y + $h && $y < $y1) {
2260 $layout->set_foreground (@{ $par->[1] }); 2581 $layout->set_foreground (@{ $par->[2] });
2582 $layout->set_width ($W - $par->[3]);
2261 $layout->set_markup ($par->[2]); 2583 $layout->set_markup ($par->[4]);
2262 2584
2263 my ($W, $H) = $layout->size; 2585 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2264 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2586
2587 glRasterPos $par->[3], $y - $y0;
2588 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2265 } 2589 }
2266 2590
2267 $y += $h; 2591 $y += $h;
2268 } 2592 }
2269 2593
2270 glDisable GL_TEXTURE_2D; 2594 glDisable GL_BLEND;
2271 }; 2595 };
2272 }); 2596 });
2273} 2597}
2274 2598
2275sub _draw { 2599sub _draw {
2276 my ($self) = @_; 2600 my ($self) = @_;
2277 2601
2278 glEnable GL_TEXTURE_2D; 2602 glEnable GL_TEXTURE_2D;
2279 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2603 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2280 glColor 1, 1, 1, 1; 2604 glColor 1, 1, 1, 1;
2281 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2605 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2282 glDisable GL_TEXTURE_2D; 2606 glDisable GL_TEXTURE_2D;
2283 2607
2284 $self->{children}[1]->draw; 2608 $self->{children}[1]->draw;
2285 2609
2286} 2610}
… …
2335 2659
2336sub new { 2660sub new {
2337 my $class = shift; 2661 my $class = shift;
2338 2662
2339 my $self = $class->SUPER::new ( 2663 my $self = $class->SUPER::new (
2340 state => 0, 2664 state => 0,
2341 connect_activate => \&toggle_flopper, 2665 on_activate => \&toggle_flopper,
2342 @_ 2666 @_
2343 ); 2667 );
2344 2668
2345 if ($self->{state}) {
2346 $self->{state} = 0;
2347 $self->toggle_flopper;
2348 }
2349
2350 $self 2669 $self
2351} 2670}
2352 2671
2353sub toggle_flopper { 2672sub toggle_flopper {
2354 my ($self) = @_; 2673 my ($self) = @_;
2355 2674
2356 # TODO: use animation 2675 $self->{other}->toggle_visibility;
2357 if ($self->{state} = !$self->{state}) {
2358 $CFClient::UI::ROOT->add ($self->{other});
2359 $self->{other}->move ($self->coord2global (0, $self->{h}));
2360 $self->emit ("open");
2361 } else {
2362 $CFClient::UI::ROOT->remove ($self->{other});
2363 $self->emit ("close");
2364 }
2365
2366 $self->emit (changed => $self->{state});
2367} 2676}
2368 2677
2369############################################################################# 2678#############################################################################
2370 2679
2371package CFClient::UI::Tooltip; 2680package CFClient::UI::Tooltip;
… …
2384} 2693}
2385 2694
2386sub set_tooltip_from { 2695sub set_tooltip_from {
2387 my ($self, $widget) = @_; 2696 my ($self, $widget) = @_;
2388 2697
2698 my $tooltip = $widget->{tooltip};
2699
2700 if ($ENV{CFPLUS_DEBUG} & 2) {
2701 $tooltip .= "\n\n" . (ref $widget) . "\n"
2702 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2703 . "req $widget->{req_w} $widget->{req_h}\n"
2704 . "visible $widget->{visible}";
2705 }
2706
2389 $self->add (new CFClient::UI::Label 2707 $self->add (new CFClient::UI::Label
2390 markup => $widget->{tooltip}, 2708 markup => $tooltip,
2391 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2709 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2392 fontsize => 0.8, 2710 fontsize => 0.8,
2393 fg => [0, 0, 0, 1], 2711 fg => [0, 0, 0, 1],
2712 ellipsise => 0,
2394 font => ($widget->{tooltip_font} || $::FONT_PROP), 2713 font => ($widget->{tooltip_font} || $::FONT_PROP),
2395 ); 2714 );
2396} 2715}
2397 2716
2398sub size_request { 2717sub size_request {
2399 my ($self) = @_; 2718 my ($self) = @_;
… …
2405 2724
2406sub size_allocate { 2725sub size_allocate {
2407 my ($self, $w, $h) = @_; 2726 my ($self, $w, $h) = @_;
2408 2727
2409 $self->SUPER::size_allocate ($w - 4, $h - 4); 2728 $self->SUPER::size_allocate ($w - 4, $h - 4);
2729}
2730
2731sub visibility_change {
2732 my ($self, $visible) = @_;
2733
2734 return unless $visible;
2735
2736 $self->{root}->on_post_alloc ("move_$self" => sub {
2737 my $widget = $self->{owner}
2738 or return;
2739
2740 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2741
2742 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2743 if $x + $self->{w} > $::WIDTH;
2744
2745 $self->move_abs ($x, $y);
2746 });
2410} 2747}
2411 2748
2412sub _draw { 2749sub _draw {
2413 my ($self) = @_; 2750 my ($self) = @_;
2414 2751
… …
2431 glVertex $w, $h; 2768 glVertex $w, $h;
2432 glVertex $w, 0; 2769 glVertex $w, 0;
2433 glEnd; 2770 glEnd;
2434 2771
2435 glTranslate 2 - 0.375, 2 - 0.375; 2772 glTranslate 2 - 0.375, 2 - 0.375;
2773
2436 $self->SUPER::_draw; 2774 $self->SUPER::_draw;
2437} 2775}
2438 2776
2439############################################################################# 2777#############################################################################
2440 2778
… …
2445use CFClient::OpenGL; 2783use CFClient::OpenGL;
2446 2784
2447sub new { 2785sub new {
2448 my $class = shift; 2786 my $class = shift;
2449 2787
2450 $class->SUPER::new ( 2788 my $self = $class->SUPER::new (
2451 aspect => 1, 2789 aspect => 1,
2790 can_events => 0,
2452 @_, 2791 @_,
2453 ) 2792 );
2793
2794 if ($self->{anim} && $self->{animspeed}) {
2795 Scalar::Util::weaken (my $widget = $self);
2796
2797 $self->{timer} = Event->timer (
2798 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2799 hard => 1,
2800 interval => $self->{animspeed},
2801 cb => sub {
2802 ++$widget->{frame};
2803 $widget->update;
2804 },
2805 );
2806 }
2807
2808 $self
2454} 2809}
2455 2810
2456sub size_request { 2811sub size_request {
2457 (32, 8) 2812 (32, 8)
2458} 2813}
2459 2814
2815sub update {
2816 my ($self) = @_;
2817
2818 return unless $self->{visible};
2819
2820 $self->SUPER::update;
2821}
2822
2460sub _draw { 2823sub _draw {
2461 my ($self) = @_; 2824 my ($self) = @_;
2462 2825
2463 return unless $::CONN;#d# manage and cache textures differently 2826 return unless $::CONN;
2827
2828 my $face;
2829
2830 if ($self->{frame}) {
2831 my $anim = $::CONN->{anim}[$self->{anim}];
2832
2833 $face = $anim->[ $self->{frame} % @$anim ]
2834 if $anim && @$anim;
2835 }
2836
2464 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2837 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2465 2838
2466 # TODO animation
2467 if ($tex) { 2839 if ($tex) {
2468 glEnable GL_TEXTURE_2D; 2840 glEnable GL_TEXTURE_2D;
2469 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2841 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470 glColor 1, 1, 1, 1; 2842 glColor 1, 1, 1, 1;
2471 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2843 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472 glDisable GL_TEXTURE_2D; 2844 glDisable GL_TEXTURE_2D;
2473 } 2845 }
2474} 2846}
2475 2847
2476############################################################################# 2848sub DESTROY {
2477
2478package CFClient::UI::InventoryItem;
2479
2480our @ISA = CFClient::UI::HBox::;
2481
2482sub new {
2483 my $class = shift;
2484
2485 my %args = @_;
2486
2487 my $item = delete $args{item};
2488
2489 my $desc = $item->{nrof} < 2
2490 ? $item->{name}
2491 : "$item->{nrof} $item->{name_pl}";
2492
2493
2494 my $self = $class->SUPER::new (
2495 can_hover => 1,
2496 can_events => 1,
2497 tooltip => (CFClient::UI::Label->escape ($desc)
2498 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2499 connect_button_down => sub {
2500 my ($self, $ev, $x, $y) = @_;
2501
2502 # todo: maybe put examine on 1? but should just be a tooltip :(
2503 if ($ev->{button} == 1) {
2504 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2505 } elsif ($ev->{button} == 2) {
2506 $::CONN->send ("apply $item->{tag}");
2507 } elsif ($ev->{button} == 3) {
2508 CFClient::UI::Menu->new (
2509 items => [
2510 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2511 [
2512 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2513 sub { $::CONN->send ("lock $item->{tag}") },
2514 ],
2515 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2516 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2517 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2518 ],
2519 )->popup ($ev);
2520 }
2521
2522 1
2523 },
2524 %args
2525 );
2526
2527 $self->add (new CFClient::UI::Face
2528 can_events => 0,
2529 face => $item->{face},
2530 anim => $item->{anim},
2531 animspeed => $item->{animspeed},
2532 );
2533
2534 $self->add (new CFClient::UI::Label
2535 can_events => 0,
2536 text => $desc,
2537 );
2538
2539 $self
2540}
2541
2542#############################################################################
2543
2544package CFClient::UI::Inventory;
2545
2546our @ISA = CFClient::UI::ScrolledWindow::;
2547
2548sub new {
2549 my $class = shift;
2550
2551 my $self = $class->SUPER::new (
2552 scrolled => (new CFClient::UI::VBox),
2553 @_,
2554 );
2555
2556 $self
2557}
2558
2559sub set_items {
2560 my ($self, $items) = @_; 2849 my ($self) = @_;
2561 2850
2562 $self->{scrolled}->clear; 2851 $self->{timer}->cancel
2563 return unless $items; 2852 if $self->{timer};
2564 2853
2565 my @items = sort { 2854 $self->SUPER::DESTROY;
2566 ($a->{type} <=> $b->{type})
2567 or ($a->{name} cmp $b->{name})
2568 } @$items;
2569
2570 $self->{real_items} = \@items;
2571
2572 for my $item (@items) {
2573 my $desc = $item->{nrof} < 2
2574 ? $item->{name}
2575 : "$item->{nrof} $item->{name_pl}";
2576
2577 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2578 }
2579
2580 $self->{scrolled}->add (@items);
2581
2582# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2583}
2584
2585sub size_request {
2586 my ($self) = @_;
2587 ($self->{req_w}, $self->{req_h});
2588} 2855}
2589 2856
2590############################################################################# 2857#############################################################################
2591 2858
2592package CFClient::UI::Menu; 2859package CFClient::UI::Menu;
… …
2627 2894
2628# popup given the event (must be a mouse button down event currently) 2895# popup given the event (must be a mouse button down event currently)
2629sub popup { 2896sub popup {
2630 my ($self, $ev) = @_; 2897 my ($self, $ev) = @_;
2631 2898
2632 $self->emit ("popdown"); 2899 $self->_emit ("popdown");
2633 2900
2634 # maybe save $GRAB? must be careful about events... 2901 # maybe save $GRAB? must be careful about events...
2635 $GRAB = $self; 2902 $GRAB = $self;
2636 $self->{button} = $ev->{button}; 2903 $self->{button} = $ev->{button};
2637 2904
2638 $self->show; 2905 $self->show;
2639 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2906 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2640} 2907}
2641 2908
2642sub mouse_motion { 2909sub mouse_motion {
2643 my ($self, $ev, $x, $y) = @_; 2910 my ($self, $ev, $x, $y) = @_;
2644 2911
2645 # TODO: should use vbox->find_widget or so 2912 # TODO: should use vbox->find_widget or so
2646 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2913 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2647 $self->{hover} = $self->{item}{$HOVER}; 2914 $self->{hover} = $self->{item}{$HOVER};
2915
2916 0
2648} 2917}
2649 2918
2650sub button_up { 2919sub button_up {
2651 my ($self, $ev, $x, $y) = @_; 2920 my ($self, $ev, $x, $y) = @_;
2652 2921
2653 if ($ev->{button} == $self->{button}) { 2922 if ($ev->{button} == $self->{button}) {
2654 undef $GRAB; 2923 undef $GRAB;
2655 $self->hide; 2924 $self->hide;
2656 2925
2657 $self->emit ("popdown"); 2926 $self->_emit ("popdown");
2658 $self->{hover}[1]->() if $self->{hover}; 2927 $self->{hover}[1]->() if $self->{hover};
2928 } else {
2929 return 0
2930 }
2931
2659 } 2932 1
2660} 2933}
2661 2934
2662############################################################################# 2935#############################################################################
2663 2936
2664package CFClient::UI::Statusbox; 2937package CFClient::UI::Statusbox;
2665 2938
2666our @ISA = CFClient::UI::VBox::; 2939our @ISA = CFClient::UI::VBox::;
2940
2941sub new {
2942 my $class = shift;
2943
2944 $class->SUPER::new (
2945 fontsize => 0.8,
2946 @_,
2947 )
2948}
2667 2949
2668sub reorder { 2950sub reorder {
2669 my ($self) = @_; 2951 my ($self) = @_;
2670 my $NOW = time; 2952 my $NOW = time;
2671 2953
… …
2690 ? "<b>$item->{count} ×</b> $item->{text}" 2972 ? "<b>$item->{count} ×</b> $item->{text}"
2691 : $item->{text}; 2973 : $item->{text};
2692 2974
2693 for ($short) { 2975 for ($short) {
2694 s/^\s+//; 2976 s/^\s+//;
2695 s/\012.*/…/s; 2977 s/\s+/ /g;
2696 my $len = int 40 / $item->{fontsize};
2697 substr $_, $len, length, "…" if $len < length;
2698 } 2978 }
2699 2979
2700 new CFClient::UI::Label 2980 new CFClient::UI::Label
2701 markup => $short, 2981 markup => $short,
2702 tooltip => $item->{tooltip}, 2982 tooltip => $item->{tooltip},
2703 tooltip_font => $::FONT_PROP, 2983 tooltip_font => $::FONT_PROP,
2704 tooltip_width => 0.67, 2984 tooltip_width => 0.67,
2705 fontsize => $item->{fontsize}, 2985 fontsize => $item->{fontsize} || $self->{fontsize},
2986 max_w => $::WIDTH * 0.44,
2706 color => $item->{color}, 2987 fg => $item->{fg},
2707 can_events => 1, 2988 can_events => 1,
2708 can_hover => 1 2989 can_hover => 1
2709 }; 2990 };
2710 } 2991 }
2711 2992
… …
2716sub add { 2997sub add {
2717 my ($self, $text, %arg) = @_; 2998 my ($self, $text, %arg) = @_;
2718 2999
2719 $text =~ s/^\s+//; 3000 $text =~ s/^\s+//;
2720 $text =~ s/\s+$//; 3001 $text =~ s/\s+$//;
3002
3003 return unless $text;
2721 3004
2722 my $timeout = time + ((delete $arg{timeout}) || 60); 3005 my $timeout = time + ((delete $arg{timeout}) || 60);
2723 3006
2724 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3007 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2725 3008
… …
2737 $self->{item}{$group} = { 3020 $self->{item}{$group} = {
2738 id => ++$self->{id}, 3021 id => ++$self->{id},
2739 text => $text, 3022 text => $text,
2740 timeout => $timeout, 3023 timeout => $timeout,
2741 tooltip => $text, 3024 tooltip => $text,
2742 fontsize => 0.8,
2743 color => [0.8, 0.8, 0.8, 0.8], 3025 fg => [0.8, 0.8, 0.8, 0.8],
2744 pri => 0, 3026 pri => 0,
2745 count => 1, 3027 count => 1,
2746 %arg, 3028 %arg,
2747 }; 3029 };
2748 } 3030 }
2749 3031
2750 $self->reorder; 3032 $self->reorder;
2751} 3033}
2752 3034
3035sub reconfigure {
3036 my ($self) = @_;
3037
3038 delete $_->{label}
3039 for values %{ $self->{item} || {} };
3040
3041 $self->reorder;
3042 $self->SUPER::reconfigure;
3043}
3044
2753############################################################################# 3045#############################################################################
2754 3046
2755package CFClient::UI::Root; 3047package CFClient::UI::Inventory;
2756 3048
2757our @ISA = CFClient::UI::Container::; 3049our @ISA = CFClient::UI::ScrolledWindow::;
2758
2759use CFClient::OpenGL;
2760 3050
2761sub new { 3051sub new {
2762 my $class = shift; 3052 my $class = shift;
2763 3053
2764 $class->SUPER::new ( 3054 my $self = $class->SUPER::new (
3055 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2765 @_, 3056 @_,
2766 ) 3057 );
2767}
2768 3058
2769sub configure { 3059 $self
3060}
3061
3062sub set_items {
3063 my ($self, $items) = @_;
3064
3065 $self->{scrolled}->clear;
3066 return unless $items;
3067
3068 my @items = sort {
3069 ($a->{type} <=> $b->{type})
3070 or ($a->{name} cmp $b->{name})
3071 } @$items;
3072
3073 $self->{real_items} = \@items;
3074
3075 my $row = 0;
3076 for my $item (@items) {
3077 CFClient::Item::update_widgets $item;
3078
3079 $self->{scrolled}->add (0, $row, $item->{face_widget});
3080 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3081 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3082
3083 $row++;
3084 }
3085}
3086
3087#############################################################################
3088
3089package CFClient::UI::BindEditor;
3090
3091our @ISA = CFClient::UI::FancyFrame::;
3092
3093sub new {
3094 my $class = shift;
3095
3096 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3097
3098 $self->add (my $vb = new CFClient::UI::VBox);
3099
3100
3101 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3102 text => "start recording",
3103 tooltip => "Start/Stops recording of actions."
3104 ."All subsequent actions after the recording started will be captured."
3105 ."The actions are displayed after the record was stopped."
3106 ."To bind the action you have to click on the 'Bind' button",
3107 on_activate => sub {
3108 unless ($self->{recording}) {
3109 $self->start;
3110 } else {
3111 $self->stop;
3112 }
3113 });
3114
3115 $vb->add (new CFClient::UI::Label text => "Actions:");
3116 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3117
3118 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3119 $vb->add (my $hb = new CFClient::UI::HBox);
3120 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3121 $hb->add (new CFClient::UI::Button
3122 text => "bind",
3123 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3124 on_activate => sub {
3125 $self->ask_for_bind;
3126 });
3127
3128 $vb->add (my $hb = new CFClient::UI::HBox);
3129 $hb->add (new CFClient::UI::Button
3130 text => "ok",
3131 expand => 1,
3132 tooltip => "This closes the binding editor and saves the binding",
3133 on_activate => sub {
3134 $self->hide;
3135 $self->commit;
3136 });
3137
3138 $hb->add (new CFClient::UI::Button
3139 text => "cancel",
3140 expand => 1,
3141 tooltip => "This closes the binding editor without saving",
3142 on_activate => sub {
3143 $self->hide;
3144 $self->{binding_cancel}->()
3145 if $self->{binding_cancel};
3146 });
3147
3148 $self->update_binding_widgets;
3149
3150 $self
3151}
3152
3153sub commit {
3154 my ($self) = @_;
3155 my ($mod, $sym, $cmds) = $self->get_binding;
3156 if ($sym != 0 && @$cmds > 0) {
3157 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3158 ."'. Don't forget 'Save Config'!");
3159 $self->{binding_change}->($mod, $sym, $cmds)
3160 if $self->{binding_change};
3161 } else {
3162 $::STATUSBOX->add ("No action bound, no key or action specified!");
3163 $self->{binding_cancel}->()
3164 if $self->{binding_cancel};
3165 }
3166}
3167
3168sub start {
3169 my ($self) = @_;
3170
3171 $self->{rec_btn}->set_text ("stop recording");
3172 $self->{recording} = 1;
3173 $self->clear_command_list;
3174 $::CONN->start_record if $::CONN;
3175}
3176
3177sub stop {
3178 my ($self) = @_;
3179
3180 $self->{rec_btn}->set_text ("start recording");
3181 $self->{recording} = 0;
3182
3183 my $rec;
3184 $rec = $::CONN->stop_record if $::CONN;
3185 return unless ref $rec eq 'ARRAY';
3186 $self->set_command_list ($rec);
3187}
3188
3189
3190sub ask_for_bind_and_commit {
3191 my ($self) = @_;
3192 $self->ask_for_bind (1);
3193}
3194
3195sub ask_for_bind {
3196 my ($self, $commit) = @_;
3197
3198 CFClient::Binder::open_binding_dialog (sub {
3199 my ($mod, $sym) = @_;
3200 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3201 $self->update_binding_widgets;
3202 $self->commit if $commit;
3203 });
3204}
3205
3206# $mod and $sym are the modifiers and key symbol
3207# $cmds is a array ref of strings (the commands)
3208# $cb is the callback that is executed on OK
3209# $ccb is the callback that is executed on CANCEL and
3210# when the binding was unsuccessful on OK
3211sub set_binding {
2770 my ($self, $x, $y, $w, $h) = @_; 3212 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2771 3213
2772 $self->{w} = $w; 3214 $self->clear_command_list;
2773 $self->{h} = $h; 3215 $self->{recording} = 0;
2774} 3216 $self->{rec_btn}->set_text ("start recording");
2775 3217
2776sub check_size { 3218 $self->{binding} = [$mod, $sym];
3219 $self->{commands} = $cmds;
3220
3221 $self->{binding_change} = $cb;
3222 $self->{binding_cancel} = $ccb;
3223
3224 $self->update_binding_widgets;
3225}
3226
3227# this is a shortcut method that asks for a binding
3228# and then just binds it.
3229sub do_quick_binding {
2777 my ($self) = @_; 3230 my ($self, $cmds) = @_;
3231 $self->set_binding (undef, undef, $cmds, sub {
3232 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3233 });
3234 $self->ask_for_bind (1);
3235}
2778 3236
2779 $self->size_allocate ($self->{w}, $self->{h}) 3237sub update_binding_widgets {
2780 if $self->{w}; 3238 my ($self) = @_;
3239 my ($mod, $sym, $cmds) = $self->get_binding;
3240 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3241 $self->set_command_list ($cmds);
3242}
3243
3244sub get_binding {
3245 my ($self) = @_;
3246 return (
3247 $self->{binding}->[0],
3248 $self->{binding}->[1],
3249 [ grep { defined $_ } @{$self->{commands}} ]
3250 );
3251}
3252
3253sub clear_command_list {
3254 my ($self) = @_;
3255 $self->{cmdbox}->clear ();
3256}
3257
3258sub set_command_list {
3259 my ($self, $cmds) = @_;
3260
3261 $self->{cmdbox}->clear ();
3262 $self->{commands} = $cmds;
3263
3264 my $idx = 0;
3265
3266 for (@$cmds) {
3267 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3268
3269 my $i = $idx;
3270 $hb->add (new CFClient::UI::Label text => $_);
3271 $hb->add (new CFClient::UI::Button
3272 text => "delete",
3273 tooltip => "Deletes the action from the record",
3274 on_activate => sub {
3275 $self->{cmdbox}->remove ($hb);
3276 $cmds->[$i] = undef;
3277 });
3278
3279
3280 $idx++
3281 }
3282}
3283
3284#############################################################################
3285
3286package CFClient::UI::SpellList;
3287
3288our @ISA = CFClient::UI::FancyFrame::;
3289
3290sub new {
3291 my $class = shift;
3292
3293 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3294
3295 $self->add (new CFClient::UI::ScrolledWindow
3296 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3297
3298 $self;
3299}
3300
3301# XXX: Do sorting? Argl...
3302sub add_spell {
3303 my ($self, $spell) = @_;
3304 $self->{spells}->{$spell->{name}} = $spell;
3305
3306 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3307 face => $spell->{face},
3308 can_hover => 1,
3309 can_events => 1,
3310 tooltip => $spell->{message});
3311
3312 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3313 text => $spell->{name},
3314 can_hover => 1,
3315 can_events => 1,
3316 tooltip => $spell->{message},
3317 expand => 1);
3318
3319 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3320 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3321 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3322 expand => 1);
3323
3324 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3325 text => "bind to key",
3326 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3327}
3328
3329sub rebuild_spell_list {
3330 my ($self) = @_;
3331 $self->{tbl_idx} = 0;
3332 $self->add_spell ($_) for values %{$self->{spells}};
3333}
3334
3335sub remove_spell {
3336 my ($self, $spell) = @_;
3337 delete $self->{spells}->{$spell->{name}};
3338 $self->rebuild_spell_list;
3339}
3340
3341#############################################################################
3342
3343package CFClient::UI::Root;
3344
3345our @ISA = CFClient::UI::Container::;
3346
3347use CFClient::OpenGL;
3348
3349sub new {
3350 my $class = shift;
3351
3352 my $self = $class->SUPER::new (
3353 visible => 1,
3354 @_,
3355 );
3356
3357 Scalar::Util::weaken ($self->{root} = $self);
3358
3359 $self
2781} 3360}
2782 3361
2783sub size_request { 3362sub size_request {
2784 my ($self) = @_; 3363 my ($self) = @_;
2785 3364
2786 ($self->{w}, $self->{h}) 3365 ($self->{w}, $self->{h})
3366}
3367
3368sub _to_pixel {
3369 my ($coord, $size, $max) = @_;
3370
3371 $coord =
3372 $coord eq "center" ? ($max - $size) * 0.5
3373 : $coord eq "max" ? $max
3374 : $coord;
3375
3376 $coord = 0 if $coord < 0;
3377 $coord = $max - $size if $coord > $max - $size;
3378
3379 int $coord + 0.5
2787} 3380}
2788 3381
2789sub size_allocate { 3382sub size_allocate {
2790 my ($self, $w, $h) = @_; 3383 my ($self, $w, $h) = @_;
2791 3384
2792 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2793 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2794
2795 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2796 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2797
2798 for my $child ($self->children) { 3385 for my $child ($self->children) {
2799 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3386 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2800 3387
2801 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3388 $X = $child->{force_x} if exists $child->{force_x};
2802 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3389 $Y = $child->{force_y} if exists $child->{force_y};
3390
3391 $X = _to_pixel $X, $W, $self->{w};
3392 $Y = _to_pixel $Y, $H, $self->{h};
3393
2803 $child->configure ($X, $Y, $W, $H); 3394 $child->configure ($X, $Y, $W, $H);
2804 } 3395 }
2805} 3396}
2806 3397
2807sub coord2local { 3398sub coord2local {
… …
2817} 3408}
2818 3409
2819sub update { 3410sub update {
2820 my ($self) = @_; 3411 my ($self) = @_;
2821 3412
2822 $self->check_size;
2823 $::WANT_REFRESH++; 3413 $::WANT_REFRESH++;
2824} 3414}
2825 3415
2826sub add { 3416sub add {
2827 my ($self, @children) = @_; 3417 my ($self, @children) = @_;
2828 3418
2829 for my $child (@children) {
2830 $child->{toplevel} = 1; 3419 $_->{is_toplevel} = 1
2831 3420 for @children;
2832 # integerise window positions
2833 $child->{x} = int $child->{x};
2834 $child->{y} = int $child->{y};
2835 }
2836 3421
2837 $self->SUPER::add (@children); 3422 $self->SUPER::add (@children);
3423}
3424
3425sub remove {
3426 my ($self, @children) = @_;
3427
3428 $self->SUPER::remove (@children);
3429
3430 delete $self->{is_toplevel}
3431 for @children;
3432
3433 while (@children) {
3434 my $w = pop @children;
3435 push @children, $w->children;
3436 $w->set_invisible;
3437 }
2838} 3438}
2839 3439
2840sub on_refresh { 3440sub on_refresh {
2841 my ($self, $id, $cb) = @_; 3441 my ($self, $id, $cb) = @_;
2842 3442
… …
2855 while ($self->{refresh_hook}) { 3455 while ($self->{refresh_hook}) {
2856 $_->() 3456 $_->()
2857 for values %{delete $self->{refresh_hook}}; 3457 for values %{delete $self->{refresh_hook}};
2858 } 3458 }
2859 3459
2860 if ($self->{check_size}) { 3460 if ($self->{realloc}) {
2861 my @queue = ([], []); 3461 my %queue;
3462 my @queue;
3463 my $widget;
2862 3464
2863 for (;;) { 3465 outer:
2864 if ($self->{check_size}) { 3466 while () {
2865 # heuristic: check containers last 3467 if (my $realloc = delete $self->{realloc}) {
2866 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3468 for $widget (values %$realloc) {
2867 for values %{delete $self->{check_size}} 3469 $widget->{visible} or next; # do not resize invisible widgets
3470
3471 $queue{$widget+0}++ and next; # duplicates are common
3472
3473 push @{ $queue[$widget->{visible}] }, $widget;
3474 }
2868 } 3475 }
2869 3476
2870 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3477 while () {
3478 @queue or last outer;
2871 3479
2872 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3480 $widget = pop @{ $queue[-1] || [] }
2873 ? @$widget{qw(user_w user_h)} 3481 and last;
2874 : $widget->size_request;
2875
2876 if (delete $widget->{force_alloc}
2877 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2878 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2879 3482
3483 pop @queue;
3484 }
3485
3486 delete $queue{$widget+0};
3487
3488 my ($w, $h) = $widget->size_request;
3489
3490 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3491 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3492
3493 $w = $widget->{force_w} if exists $widget->{force_w};
3494 $h = $widget->{force_h} if exists $widget->{force_h};
3495
3496 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3497 || delete $widget->{force_realloc}) {
2880 $widget->{req_w} = $w; 3498 $widget->{req_w} = $w;
2881 $widget->{req_h} = $h; 3499 $widget->{req_h} = $h;
2882 3500
2883 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3501 $self->{size_alloc}{$widget+0} = $widget;
2884 3502
2885 $widget->{parent}->check_size
2886 if $widget->{parent}; 3503 if (my $parent = $widget->{parent}) {
3504 $self->{realloc}{$parent+0} = $parent
3505 unless $queue{$parent+0};
3506
3507 $parent->{force_size_alloc} = 1;
3508 $self->{size_alloc}{$parent+0} = $parent;
3509 }
2887 } 3510 }
3511
3512 delete $self->{realloc}{$widget+0};
2888 } 3513 }
2889 } 3514 }
2890 3515
2891 while ($self->{size_alloc}) { 3516 while (my $size_alloc = delete $self->{size_alloc}) {
2892 for (values %{delete $self->{size_alloc}}) { 3517 my @queue = sort { $b->{visible} <=> $a->{visible} }
2893 my ($widget, $w, $h) = @$_; 3518 values %$size_alloc;
3519
3520 while () {
3521 my $widget = pop @queue || last;
3522
3523 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
2894 3524
2895 $w = 0 if $w < 0; 3525 $w = 0 if $w < 0;
2896 $h = 0 if $h < 0; 3526 $h = 0 if $h < 0;
2897 3527
3528 $w = int $w + 0.5;
3529 $h = int $h + 0.5;
3530
3531 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3532 $widget->{old_w} = $widget->{w};
3533 $widget->{old_h} = $widget->{h};
3534
2898 $widget->{w} = $w; 3535 $widget->{w} = $w;
2899 $widget->{h} = $h; 3536 $widget->{h} = $h;
2900 $widget->size_allocate ($w, $h); 3537
2901 $widget->emit (size_allocate => $w, $h); 3538 $widget->emit (size_allocate => $w, $h);
3539 }
2902 } 3540 }
2903 } 3541 }
2904 3542
2905 while ($self->{post_alloc_hook}) { 3543 while ($self->{post_alloc_hook}) {
2906 $_->() 3544 $_->()
2907 for values %{delete $self->{post_alloc_hook}}; 3545 for values %{delete $self->{post_alloc_hook}};
2908 } 3546 }
2909 3547
3548
2910 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3549 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2911 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3550 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2912 glClear GL_COLOR_BUFFER_BIT; 3551 glClear GL_COLOR_BUFFER_BIT;
2913 3552
2914 glMatrixMode GL_PROJECTION; 3553 glMatrixMode GL_PROJECTION;
2915 glLoadIdentity; 3554 glLoadIdentity;
2916 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3555 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2917 glMatrixMode GL_MODELVIEW; 3556 glMatrixMode GL_MODELVIEW;
2918 glLoadIdentity; 3557 glLoadIdentity;
2919 3558
3559 {
3560 package CFClient::UI::Base;
3561
3562 ($draw_x, $draw_y, $draw_w, $draw_h) =
3563 (0, 0, $self->{w}, $self->{h});
3564 }
3565
2920 $self->_draw; 3566 $self->_draw;
2921} 3567}
2922 3568
2923############################################################################# 3569#############################################################################
2924 3570
2925package CFClient::UI; 3571package CFClient::UI;
2926 3572
2927$ROOT = new CFClient::UI::Root; 3573$ROOT = new CFClient::UI::Root;
2928$TOOLTIP = new CFClient::UI::Tooltip; 3574$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2929 3575
29301 35761
2931 3577

Diff Legend

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