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.201 by root, Sat May 13 23:17:49 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
19our %WIDGET; # all widgets, weak-referenced
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
17sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
18 if (!$GRAB) { 47 if (!$GRAB) {
19 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
21
22 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
23 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
24 54
25 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
26 56
27 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
28 58
29 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
30 $TOOLTIP->show; 60 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 $TOOLTIP->check_size;
40 $TOOLTIP->update;
41 } 61 }
42 62
43 return; 63 return;
44 } 64 }
45 } 65 }
… …
49 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
50} 70}
51 71
52# class methods for events 72# class methods for events
53sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
54 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
55 if $FOCUS; 75 if $FOCUS;
56} 76}
57 77
58sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
59 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
60 if $FOCUS; 80 if $FOCUS;
61} 81}
62 82
63sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
64 my ($ev) = @_; 84 my ($ev) = @_;
… …
73 check_tooltip; 93 check_tooltip;
74 } 94 }
75 95
76 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
77 97
78 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
79 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
80 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
81 }
82} 100}
83 101
84sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
85 my ($ev) = @_; 103 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
87 105
88 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
89 107
90 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
91 109
92 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
93 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
94 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
95 }
96 112
97 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
98 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
99 $grab->update if $grab; 115 $grab->update if $grab;
100 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
116 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
117 133
118 check_tooltip; 134 check_tooltip;
119 } 135 }
120 136
121 if ($HOVER) {
122 ($x, $y) = $HOVER->coord2local ($x, $y);
123 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
124 } 138 if $HOVER;
125} 139}
126 140
127# convert position array to integers 141# convert position array to integers
128sub harmonize { 142sub harmonize {
129 my ($vals) = @_; 143 my ($vals) = @_;
… …
135 $rem += $_ - $i; 149 $rem += $_ - $i;
136 $_ = $i; 150 $_ = $i;
137 } 151 }
138} 152}
139 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
170# call when resolution changes etc.
171sub rescale_widgets {
172 my ($sx, $sy) = @_;
173
174 for my $widget (values %WIDGET) {
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
179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_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
189 }
190 }
191
192 reconfigure_widgets;
193}
194
140############################################################################# 195#############################################################################
141 196
142package CFClient::UI::Base; 197package CFClient::UI::Base;
143 198
144use strict; 199use strict;
… …
147 202
148sub new { 203sub new {
149 my $class = shift; 204 my $class = shift;
150 205
151 my $self = bless { 206 my $self = bless {
152 x => 0, 207 x => "center",
153 y => 0, 208 y => "center",
154 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
155 can_events => 1, 212 can_events => 1,
156 @_ 213 @_
157 }, $class; 214 }, $class;
158 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
159 for (keys %$self) { 218 for (keys %$self) {
160 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
161 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
162 } 221 }
163 } 222 }
164 223
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 }
235
165 $self 236 $self
166} 237}
167 238
168sub destroy { 239sub destroy {
169 my ($self) = @_; 240 my ($self) = @_;
… …
178 return if $self->{parent}; 249 return if $self->{parent};
179 250
180 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
181} 252}
182 253
183sub hide { 254sub set_visible {
184 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};
185 278
186 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
187 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
188 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
189 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
190 if $self->{parent}; 313 if $self->{parent};
191} 314}
192 315
193sub move { 316sub move_abs {
194 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
195 318
196 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
197 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
198 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
199 322
200 $self->update; 323 $self->update;
201} 324}
202 325
203sub set_size { 326sub set_size {
204 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
205 328
206 $self->{user_w} = $w; 329 $self->{force_w} = $w;
207 $self->{user_h} = $h; 330 $self->{force_h} = $h;
208 331
209 $self->check_size; 332 $self->realloc;
210} 333}
211 334
212sub size_request { 335sub size_request {
213 require Carp; 336 require Carp;
214 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
216 339
217sub configure { 340sub configure {
218 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
219 342
220 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
221 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
222 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
223 348
224 # use alignment to adjust x, y 349 # use alignment to adjust x, y
225 350
226 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
227 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
228
229 ($w, $h) = ($w2, $h2);
230 } 353 }
231 354
232 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
233 $self->{x} = $x; 356 $self->{x} = $x;
234 $self->{y} = $y; 357 $self->{y} = $y;
235 $self->update; 358 $self->update;
236 } 359 }
237 360
238 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
239 $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;
240 } 368 }
241} 369}
242 370
243sub size_allocate { 371sub size_allocate {
244 # nothing to be done 372 # nothing to be done
245} 373}
246 374
247sub children { 375sub children {
248} 376}
249 377
250# call when resolution changes etc.
251sub reconfigure {
252 my ($self) = @_;
253
254 $_->reconfigure
255 for $self->children;
256
257 $self->check_size (1);
258 $self->update;
259}
260
261sub set_max_size { 378sub set_max_size {
262 my ($self, $w, $h) = @_; 379 my ($self, $w, $h) = @_;
263 380
264 delete $self->{max_w}; $self->{max_w} = $w if $w; 381 delete $self->{max_w}; $self->{max_w} = $w if $w;
265 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 }
266} 399}
267 400
268# translate global coordinates to local coordinate system 401# translate global coordinates to local coordinate system
269sub coord2local { 402sub coord2local {
270 my ($self, $x, $y) = @_; 403 my ($self, $x, $y) = @_;
… …
285 return if $FOCUS == $self; 418 return if $FOCUS == $self;
286 return unless $self->{can_focus}; 419 return unless $self->{can_focus};
287 420
288 my $focus = $FOCUS; $FOCUS = $self; 421 my $focus = $FOCUS; $FOCUS = $self;
289 422
290 $self->emit (focus_in => $focus); 423 $self->_emit (focus_in => $focus);
291 424
292 $focus->update if $focus; 425 $focus->update if $focus;
293 $FOCUS->update; 426 $FOCUS->update;
294} 427}
295 428
… …
298 431
299 return unless $FOCUS == $self; 432 return unless $FOCUS == $self;
300 433
301 my $focus = $FOCUS; undef $FOCUS; 434 my $focus = $FOCUS; undef $FOCUS;
302 435
303 $self->emit (focus_out => $focus); 436 $self->_emit (focus_out => $focus);
304 437
305 $focus->update if $focus; #? 438 $focus->update if $focus; #?
306}
307 439
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
441 unless $FOCUS;
442}
443
308sub mouse_motion { } 444sub mouse_motion { 0 }
309sub button_up { } 445sub button_up { 0 }
310sub key_down { } 446sub key_down { 0 }
311sub key_up { } 447sub key_up { 0 }
312 448
313sub button_down { 449sub button_down {
314 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
315 451
316 $self->focus_in; 452 $self->focus_in;
317}
318 453
319sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454 0
320sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455}
321sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456
322sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub find_widget {
323sub 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
324 530
325sub draw { 531sub draw {
326 my ($self) = @_; 532 my ($self) = @_;
327 533
328 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);
329 545
330 glPushMatrix; 546 glPushMatrix;
331 glTranslate $self->{x}, $self->{y}, 0; 547 glTranslate $self->{x}, $self->{y}, 0;
332 $self->_draw; 548 $self->_draw;
333 glPopMatrix; 549 glPopMatrix;
… …
345 glVertex $x , $y + $self->{h}; 561 glVertex $x , $y + $self->{h};
346 glEnd; 562 glEnd;
347 glDisable GL_BLEND; 563 glDisable GL_BLEND;
348 } 564 }
349 565
350 if ($ENV{PCLIENT_DEBUG}) { 566 if ($ENV{CFPLUS_DEBUG} & 1) {
351 glPushMatrix; 567 glPushMatrix;
352 glColor 1, 1, 0, 1; 568 glColor 1, 1, 0, 1;
353 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 569 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
354 glBegin GL_LINE_LOOP; 570 glBegin GL_LINE_LOOP;
355 glVertex 0 , 0; 571 glVertex 0 , 0;
356 glVertex $self->{w}, 0; 572 glVertex $self->{w} - 1, 0;
357 glVertex $self->{w}, $self->{h}; 573 glVertex $self->{w} - 1, $self->{h} - 1;
358 glVertex 0 , $self->{h}; 574 glVertex 0 , $self->{h} - 1;
359 glEnd; 575 glEnd;
360 glPopMatrix; 576 glPopMatrix;
361 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;
362 } 578 }
363} 579}
364 580
365sub _draw { 581sub _draw {
366 my ($self) = @_; 582 my ($self) = @_;
367 583
368 warn "no draw defined for $self\n"; 584 warn "no draw defined for $self\n";
369} 585}
370 586
371sub find_widget {
372 my ($self, $x, $y) = @_;
373
374 return () unless $self->{can_events};
375
376 return $self
377 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
378 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
379
380 ()
381}
382
383sub set_parent {
384 my ($self, $parent) = @_;
385
386 Scalar::Util::weaken ($self->{parent} = $parent);
387
388 # TODO: req_w _does_change after ->reconfigure
389 $self->check_size
390 unless exists $self->{req_w};
391}
392
393sub check_size {
394 my ($self, $forced) = @_;
395
396 $self->{force_alloc} = 1 if $forced;
397 $CFClient::UI::ROOT->{check_size}{$self} = $self;
398}
399
400sub update {
401 my ($self) = @_;
402
403 $self->{parent}->update
404 if $self->{parent};
405}
406
407sub connect {
408 my ($self, $signal, $cb) = @_;
409
410 push @{ $self->{signal_cb}{$signal} }, $cb;
411}
412
413sub emit {
414 my ($self, $signal, @args) = @_;
415
416 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
417}
418
419sub DESTROY { 587sub DESTROY {
420 my ($self) = @_; 588 my ($self) = @_;
421 589
590 delete $WIDGET{$self+0};
422 #$self->deactivate; 591 #$self->deactivate;
423} 592}
424 593
425############################################################################# 594#############################################################################
426 595
… …
435 my $class = shift; 604 my $class = shift;
436 605
437 # range [value, low, high, page] 606 # range [value, low, high, page]
438 607
439 $class->SUPER::new ( 608 $class->SUPER::new (
440 bg => [0, 0, 0, 0.2], 609 #bg => [0, 0, 0, 0.2],
441 active_bg => [1, 1, 1, 0.5], 610 #active_bg => [1, 1, 1, 0.5],
442 @_ 611 @_
443 ) 612 )
444} 613}
445 614
446sub _draw { 615sub _draw {
447 my ($self) = @_; 616 my ($self) = @_;
448 617
618 my $color = $FOCUS == $self && $self->{active_bg}
619 ? $self->{active_bg}
620 : $self->{bg};
621
622 if ($color && (@$color < 4 || $color->[3])) {
449 my ($w, $h) = @$self{qw(w h)}; 623 my ($w, $h) = @$self{qw(w h)};
450 624
451 glEnable GL_BLEND; 625 glEnable GL_BLEND;
452 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 626 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
453 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 627 glColor @$color;
454 628
455 glBegin GL_QUADS; 629 glBegin GL_QUADS;
456 glVertex 0 , 0; 630 glVertex 0 , 0;
457 glVertex 0 , $h; 631 glVertex 0 , $h;
458 glVertex $w, $h; 632 glVertex $w, $h;
459 glVertex $w, 0; 633 glVertex $w, 0;
460 glEnd; 634 glEnd;
461 635
462 glDisable GL_BLEND; 636 glDisable GL_BLEND;
637 }
463} 638}
464 639
465############################################################################# 640#############################################################################
466 641
467package CFClient::UI::Empty; 642package CFClient::UI::Empty;
… …
472 my ($class, %arg) = @_; 647 my ($class, %arg) = @_;
473 $class->SUPER::new (can_events => 0, %arg); 648 $class->SUPER::new (can_events => 0, %arg);
474} 649}
475 650
476sub size_request { 651sub size_request {
477 (0, 0) 652 my ($self) = @_;
653
654 ($self->{w} + 0, $self->{h} + 0)
478} 655}
479 656
480sub draw { } 657sub draw { }
481 658
482############################################################################# 659#############################################################################
… …
511 $self->{children} = [ 688 $self->{children} = [
512 sort { $a->{z} <=> $b->{z} } 689 sort { $a->{z} <=> $b->{z} }
513 @{$self->{children}}, @widgets 690 @{$self->{children}}, @widgets
514 ]; 691 ];
515 692
516 $self->check_size (1); 693 $self->realloc;
517 $self->update;
518} 694}
519 695
520sub children { 696sub children {
521 @{ $_[0]{children} } 697 @{ $_[0]{children} }
522} 698}
… …
527 delete $child->{parent}; 703 delete $child->{parent};
528 $child->hide; 704 $child->hide;
529 705
530 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 706 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
531 707
532 $self->check_size; 708 $self->realloc;
533 $self->update;
534} 709}
535 710
536sub clear { 711sub clear {
537 my ($self) = @_; 712 my ($self) = @_;
538 713
… …
542 for (@$children) { 717 for (@$children) {
543 delete $_->{parent}; 718 delete $_->{parent};
544 $_->hide; 719 $_->hide;
545 } 720 }
546 721
547 $self->check_size; 722 $self->realloc;
548 $self->update;
549} 723}
550 724
551sub find_widget { 725sub find_widget {
552 my ($self, $x, $y) = @_; 726 my ($self, $x, $y) = @_;
553 727
… …
640 $self->SUPER::size_allocate ($w, $h); 814 $self->SUPER::size_allocate ($w, $h);
641 $self->update; 815 $self->update;
642} 816}
643 817
644sub _render { 818sub _render {
819 my ($self) = @_;
820
645 $_[0]{children}[0]->draw; 821 $self->{children}[0]->draw;
646} 822}
647 823
648sub render_child { 824sub render_child {
649 my ($self) = @_; 825 my ($self) = @_;
650 826
651 $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 {
652 glClearColor 0, 0, 0, 0; 828 glClearColor 0, 0, 0, 0;
653 glClear GL_COLOR_BUFFER_BIT; 829 glClear GL_COLOR_BUFFER_BIT;
654 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
655 $self->_render; 838 $self->_render;
656# glColorMask 1, 1, 1, 0;
657# glEnable GL_BLEND;
658# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
659# glRasterPos 0, 0;
660# glCopyPixels 0, 0, $self->{w}, $self->{h};
661# glDisable GL_BLEND;
662# glColorMask 1, 1, 1, 1;
663 }; 839 };
664} 840}
665 841
666sub _draw { 842sub _draw {
667 my ($self) = @_; 843 my ($self) = @_;
668 844
669 my ($w, $h) = ($self->w, $self->h); 845 my ($w, $h) = @$self{qw(w h)};
670 846
671 my $tex = $self->{texture} 847 my $tex = $self->{texture}
672 or return; 848 or return;
673 849
674 glEnable GL_TEXTURE_2D; 850 glEnable GL_TEXTURE_2D;
675 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 851 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
676 glColor 0, 0, 0, 1; 852 glColor 1, 1, 1, 1;
677 853
678 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 854 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
679 855
680 glDisable GL_TEXTURE_2D; 856 glDisable GL_TEXTURE_2D;
681} 857}
… …
684 860
685package CFClient::UI::ViewPort; 861package CFClient::UI::ViewPort;
686 862
687our @ISA = CFClient::UI::Window::; 863our @ISA = CFClient::UI::Window::;
688 864
865sub new {
866 my $class = shift;
867
868 $class->SUPER::new (
869 scroll_x => 0,
870 scroll_y => 1,
871 @_,
872 )
873}
874
689sub size_request { 875sub size_request {
690 my ($self) = @_; 876 my ($self) = @_;
691 877
692 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 878 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
694 879
695 @$self{qw(child_w child_h)} 880 $w = 10 if $self->{scroll_x};
881 $h = 10 if $self->{scroll_y};
882
883 ($w, $h)
696} 884}
697 885
698sub size_allocate { 886sub size_allocate {
699 my ($self, $w, $h) = @_; 887 my ($self, $w, $h) = @_;
700 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);
701 $self->update; 895 $self->update;
702} 896}
703 897
704sub set_offset { 898sub set_offset {
705 my ($self, $x, $y) = @_; 899 my ($self, $x, $y) = @_;
… …
739} 933}
740 934
741sub _render { 935sub _render {
742 my ($self) = @_; 936 my ($self) = @_;
743 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
744 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 941 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
745 942
746 $self->SUPER::_render; 943 $self->SUPER::_render;
747} 944}
748 945
… …
756 my $class = shift; 953 my $class = shift;
757 954
758 my $self; 955 my $self;
759 956
760 my $slider = new CFClient::UI::Slider 957 my $slider = new CFClient::UI::Slider
761 vertical => 1, 958 vertical => 1,
762 range => [0, 0, 1, 0.01], # HACK fix 959 range => [0, 0, 1, 0.01], # HACK fix
763 connect_changed => sub { 960 on_changed => sub {
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 961 $self->{vp}->set_offset (0, $_[1]);
765 }, 962 },
766 ; 963 ;
767 964
768 $self = $class->SUPER::new ( 965 $self = $class->SUPER::new (
769 vp => (new CFClient::UI::ViewPort), 966 vp => (new CFClient::UI::ViewPort expand => 1),
770 slider => $slider, 967 slider => $slider,
771 @_, 968 @_,
772 ); 969 );
773 970
774 $self->{vp}->add ($self->{scrolled}); 971 $self->{vp}->add ($self->{scrolled});
775 $self->add ($self->{vp}); 972 $self->add ($self->{vp});
776 $self->add ($self->{slider}); 973 $self->add ($self->{slider});
777 974
778 $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]);
779} 995}
780 996
781#TODO# update range on size_allocate depending on child 997#TODO# update range on size_allocate depending on child
782# update viewport offset on scroll 998# update viewport offset on scroll
783 999
… …
827 1043
828our @ISA = CFClient::UI::Bin::; 1044our @ISA = CFClient::UI::Bin::;
829 1045
830use CFClient::OpenGL; 1046use CFClient::OpenGL;
831 1047
832my @tex = 1048my $bg =
1049 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1050 mipmap => 1, wrap => 1;
1051
1052my @border =
833 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1053 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
834 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);
835 1055
836sub new { 1056sub new {
837 my $class = shift; 1057 my ($class, %arg) = @_;
838 1058
839 # TODO: user_x, user_y, overwrite moveto? 1059 my $title = delete $arg{title};
840 1060
841 my $self = $class->SUPER::new ( 1061 my $self = $class->SUPER::new (
842 bg => [1, 1, 1, 1], 1062 bg => [1, 1, 1, 1],
843 border_bg => [1, 1, 1, 1], 1063 border_bg => [1, 1, 1, 1],
844 border => 0.6, 1064 border => 0.6,
845 can_events => 1, 1065 can_events => 1,
846 @_ 1066 min_w => 16,
1067 min_h => 16,
1068 %arg,
847 ); 1069 );
848 1070
849 $self->{title} &&= new CFClient::UI::Label 1071 $self->{title} = new CFClient::UI::Label
850 align => 0, 1072 align => 0,
851 valign => 1, 1073 valign => 1,
852 text => $self->{title}, 1074 text => $title,
853 fontsize => $self->{border}; 1075 fontsize => $self->{border}
1076 if defined $title;
854 1077
855 $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};
856} 1086}
857 1087
858sub border { 1088sub border {
859 int $_[0]{border} * $::FONTSIZE 1089 int $_[0]{border} * $::FONTSIZE
860} 1090}
861 1091
862sub size_request { 1092sub size_request {
863 my ($self) = @_; 1093 my ($self) = @_;
1094
1095 $self->{title}->size_request
1096 if $self->{title};
864 1097
865 my ($w, $h) = $self->SUPER::size_request; 1098 my ($w, $h) = $self->SUPER::size_request;
866 1099
867 ( 1100 (
868 $w + $self->border * 2, 1101 $w + $self->border * 2,
… …
871} 1104}
872 1105
873sub size_allocate { 1106sub size_allocate {
874 my ($self, $w, $h) = @_; 1107 my ($self, $w, $h) = @_;
875 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
876 $h -= List::Util::max 0, $self->border * 2; 1117 $h -= List::Util::max 0, $border * 2;
877 $w -= List::Util::max 0, $self->border * 2; 1118 $w -= List::Util::max 0, $border * 2;
878 1119
879 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
880 if $self->{title};
881
882 $self->child->configure ($self->border, $self->border, $w, $h); 1120 $self->child->configure ($border, $border, $w, $h);
883} 1121}
884 1122
885sub button_down { 1123sub button_down {
886 my ($self, $ev, $x, $y) = @_; 1124 my ($self, $ev, $x, $y) = @_;
887 1125
… …
903 my ($ev, $x, $y) = @_; 1141 my ($ev, $x, $y) = @_;
904 1142
905 my $dx = $ev->{x} - $ox; 1143 my $dx = $ev->{x} - $ox;
906 my $dy = $ev->{y} - $oy; 1144 my $dy = $ev->{y} - $oy;
907 1145
908 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1146 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
909 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1147 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1148
1149 $self->realloc;
910 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1150 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
911 $self->check_size;
912 }; 1151 };
913 1152
914 } elsif ($lr ^ $td) { 1153 } elsif ($lr ^ $td) {
915 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1154 my ($ox, $oy) = ($ev->{x}, $ev->{y});
916 my ($bx, $by) = ($self->{x}, $self->{y}); 1155 my ($bx, $by) = ($self->{x}, $self->{y});
… …
918 $self->{motion} = sub { 1157 $self->{motion} = sub {
919 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
920 1159
921 ($x, $y) = ($ev->{x}, $ev->{y}); 1160 ($x, $y) = ($ev->{x}, $ev->{y});
922 1161
923 $self->move ($bx + $x - $ox, $by + $y - $oy); 1162 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
924 $self->update;
925 }; 1163 };
1164 } else {
1165 return 0;
1166 }
1167
926 } 1168 1
927} 1169}
928 1170
929sub button_up { 1171sub button_up {
930 my ($self, $ev, $x, $y) = @_; 1172 my ($self, $ev, $x, $y) = @_;
931 1173
932 delete $self->{motion}; 1174 !!delete $self->{motion}
933} 1175}
934 1176
935sub mouse_motion { 1177sub mouse_motion {
936 my ($self, $ev, $x, $y) = @_; 1178 my ($self, $ev, $x, $y) = @_;
937 1179
938 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1180 $self->{motion}->($ev, $x, $y) if $self->{motion};
1181
1182 !!$self->{motion}
939} 1183}
940 1184
941sub _draw { 1185sub _draw {
942 my ($self) = @_; 1186 my ($self) = @_;
943 1187
1188 my $child = $self->{children}[0];
1189
944 my ($w, $h ) = ($self->{w}, $self->{h}); 1190 my ($w, $h ) = ($self->{w}, $self->{h});
945 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1191 my ($cw, $ch) = ($child->{w}, $child->{h});
946 1192
947 glEnable GL_TEXTURE_2D; 1193 glEnable GL_TEXTURE_2D;
948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1194 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
949 1195
950 my $border = $self->border; 1196 my $border = $self->border;
951 1197
952 glColor @{ $self->{border_bg} }; 1198 glColor @{ $self->{border_bg} };
953 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1199 $border[0]->draw_quad_alpha (0, 0, $w, $border);
954 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1200 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
955 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1201 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
956 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1202 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
957 1203
958 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1204 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
959 my $bg = $tex[0]; 1205 glColor @{ $self->{bg} };
960 1206
961 # TODO: repeat texture not scale 1207 # TODO: repeat texture not scale
1208 # solve this better(?)
962 my $rep_x = $cw / $bg->{w}; 1209 $bg->{s} = $cw / $bg->{w};
963 my $rep_y = $ch / $bg->{h}; 1210 $bg->{t} = $ch / $bg->{h};
964
965 glColor @{ $self->{bg} };
966
967 $bg->{s} = $rep_x;
968 $bg->{t} = $rep_y;
969 $bg->{wrap_mode} = 1;
970 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1211 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
971 } 1212 }
972 1213
973 glDisable GL_TEXTURE_2D; 1214 glDisable GL_TEXTURE_2D;
974 1215
975 $self->{title}->draw if $self->{title};
976
977 $self->child->draw; 1216 $child->draw;
1217
1218 if ($self->{title}) {
1219 glTranslate 0, $border - $self->{h};
1220 $self->{title}->_draw;
1221 }
978} 1222}
979 1223
980############################################################################# 1224#############################################################################
981 1225
982package CFClient::UI::Table; 1226package CFClient::UI::Table;
… …
990sub new { 1234sub new {
991 my $class = shift; 1235 my $class = shift;
992 1236
993 $class->SUPER::new ( 1237 $class->SUPER::new (
994 col_expand => [], 1238 col_expand => [],
995 @_ 1239 @_,
996 ) 1240 )
1241}
1242
1243sub children {
1244 grep $_, map @$_, grep $_, @{ $_[0]{children} }
997} 1245}
998 1246
999sub add { 1247sub add {
1000 my ($self, $x, $y, $child) = @_; 1248 my ($self, $x, $y, $child) = @_;
1001 1249
1002 $child->set_parent ($self); 1250 $child->set_parent ($self);
1003 $self->{children}[$y][$x] = $child; 1251 $self->{children}[$y][$x] = $child;
1004 1252
1005 $child->check_size; 1253 $self->realloc;
1006} 1254}
1007 1255
1008sub children {
1009 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1010}
1011
1012# 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?
1013sub clear { 1257sub clear {
1014 my ($self) = @_; 1258 my ($self) = @_;
1015 1259
1016 my @children = $self->children; 1260 my @children = $self->children;
1017 delete $self->{children}; 1261 delete $self->{children};
… …
1019 for (@children) { 1263 for (@children) {
1020 delete $_->{parent}; 1264 delete $_->{parent};
1021 $_->hide; 1265 $_->hide;
1022 } 1266 }
1023 1267
1024 $self->update; 1268 $self->realloc;
1025} 1269}
1026 1270
1027sub get_wh { 1271sub get_wh {
1028 my ($self) = @_; 1272 my ($self) = @_;
1029 1273
… …
1060sub size_allocate { 1304sub size_allocate {
1061 my ($self, $w, $h) = @_; 1305 my ($self, $w, $h) = @_;
1062 1306
1063 my ($ws, $hs) = $self->get_wh; 1307 my ($ws, $hs) = $self->get_wh;
1064 1308
1065 my $req_w = sum @$ws; 1309 my $req_w = (sum @$ws) || 1;
1066 my $req_h = sum @$hs; 1310 my $req_h = (sum @$hs) || 1;
1067 1311
1068 # TODO: nicer code && do row_expand 1312 # TODO: nicer code && do row_expand
1069 my @col_expand = @{$self->{col_expand}}; 1313 my @col_expand = @{$self->{col_expand}};
1070 @col_expand = (1) x @$ws unless @col_expand; 1314 @col_expand = (1) x @$ws unless @col_expand;
1071 my $col_expand = (sum @col_expand) || 1; 1315 my $col_expand = (sum @col_expand) || 1;
… …
1125 } 1369 }
1126} 1370}
1127 1371
1128############################################################################# 1372#############################################################################
1129 1373
1130package CFClient::UI::HBox; 1374package CFClient::UI::Box;
1131
1132# TODO: wrap into common Box base class
1133 1375
1134our @ISA = CFClient::UI::Container::; 1376our @ISA = CFClient::UI::Container::;
1135 1377
1136sub size_request { 1378sub size_request {
1137 my ($self) = @_; 1379 my ($self) = @_;
1138 1380
1139 my @alloc = map [$_->size_request], @{$self->{children}}; 1381 $self->{vertical}
1140 1382 ? (
1141 ( 1383 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1142 (List::Util::sum map $_->[0], @alloc), 1384 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1143 (List::Util::max map $_->[1], @alloc), 1385 )
1144 ) 1386 : (
1387 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1388 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1389 )
1145} 1390}
1146 1391
1147sub size_allocate { 1392sub size_allocate {
1148 my ($self, $w, $h) = @_; 1393 my ($self, $w, $h) = @_;
1149 1394
1150 ($h, $w) = ($w, $h); 1395 my $space = $self->{vertical} ? $h : $w;
1151
1152 my $children = $self->{children}; 1396 my $children = $self->{children};
1153 1397
1154 my @h = map $_->{req_w}, @$children; 1398 my @req;
1155 1399
1156 my $req_h = List::Util::sum @h; 1400 if ($self->{homogeneous}) {
1157 1401 @req = ($space / (@$children || 1)) x @$children;
1158 if ($req_h > $h) {
1159 # ah well, not enough space
1160 $_ *= $h / $req_h for @h;
1161 } 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 {
1162 my $exp = List::Util::sum map $_->{expand}, @$children; 1410 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1163 $exp ||= 1;
1164 1411
1412 $space = ($space - $req) / $expand; # remaining space to give away
1413
1414 $req[$_] += $space * $children->[$_]{expand}
1165 for (0 .. $#$children) { 1415 for 0 .. $#$children;
1166 my $child = $children->[$_];
1167
1168 my $alloc_h = $h[$_];
1169 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1170 $h[$_] = $alloc_h;
1171 } 1416 }
1172 } 1417 }
1173 1418
1174 CFClient::UI::harmonize \@h; 1419 CFClient::UI::harmonize \@req;
1175 1420
1176 my $y = 0; 1421 my $pos = 0;
1177 for (0 .. $#$children) { 1422 for (0 .. $#$children) {
1178 my $child = $children->[$_];
1179 my $h = $h[$_]; 1423 my $alloc = $req[$_];
1180 $child->configure ($y, 0, $h, $w); 1424 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1181 1425
1182 $y += $h; 1426 $pos += $alloc;
1183 } 1427 }
1184 1428
1185 1 1429 1
1186} 1430}
1187 1431
1188############################################################################# 1432#############################################################################
1189 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
1190package CFClient::UI::VBox; 1449package CFClient::UI::VBox;
1191 1450
1192# TODO: wrap into common Box base class
1193
1194our @ISA = CFClient::UI::Container::; 1451our @ISA = CFClient::UI::Box::;
1195 1452
1196sub size_request { 1453sub new {
1197 my ($self) = @_; 1454 my $class = shift;
1198 1455
1199 my @alloc = map [$_->size_request], @{$self->{children}}; 1456 $class->SUPER::new (
1200 1457 vertical => 1,
1201 ( 1458 @_,
1202 (List::Util::max map $_->[0], @alloc),
1203 (List::Util::sum map $_->[1], @alloc),
1204 ) 1459 )
1205} 1460}
1206 1461
1207sub size_allocate {
1208 my ($self, $w, $h) = @_;
1209
1210 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1211
1212 my $children = $self->{children};
1213
1214 my @h = map $_->{req_h}, @$children;
1215
1216 my $req_h = List::Util::sum @h;
1217
1218 if ($req_h > $h) {
1219 # ah well, not enough space
1220 $_ *= $h / $req_h for @h;
1221 } else {
1222 my $exp = List::Util::sum map $_->{expand}, @$children;
1223 $exp ||= 1;
1224
1225 for (0 .. $#$children) {
1226 my $child = $children->[$_];
1227
1228 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1229 }
1230 }
1231
1232 CFClient::UI::harmonize \@h;
1233
1234 my $y = 0;
1235 for (0 .. $#$children) {
1236 my $child = $children->[$_];
1237 my $h = $h[$_];
1238 $child->configure (0, $y, $w, $h);
1239
1240 $y += $h;
1241 }
1242
1243 1
1244}
1245
1246############################################################################# 1462#############################################################################
1247 1463
1248package CFClient::UI::Label; 1464package CFClient::UI::Label;
1249 1465
1250our @ISA = CFClient::UI::Base::; 1466our @ISA = CFClient::UI::DrawBG::;
1251 1467
1252use CFClient::OpenGL; 1468use CFClient::OpenGL;
1253 1469
1254sub new { 1470sub new {
1255 my ($class, %arg) = @_; 1471 my ($class, %arg) = @_;
1256 1472
1257 my $self = $class->SUPER::new ( 1473 my $self = $class->SUPER::new (
1258 fg => [1, 1, 1], 1474 fg => [1, 1, 1],
1475 #bg => none
1476 #active_bg => none
1259 #font => default_font 1477 #font => default_font
1260 #text => initial text 1478 #text => initial text
1261 #markup => initial narkup 1479 #markup => initial narkup
1480 #max_w => maximum pixel width
1481 ellipsise => 3, # end
1262 layout => (new CFClient::Layout), 1482 layout => (new CFClient::Layout),
1263 fontsize => 1, 1483 fontsize => 1,
1264 align => -1, 1484 align => -1,
1265 valign => -1, 1485 valign => -1,
1266 padding => 2, 1486 padding_x => 2,
1487 padding_y => 2,
1267 can_events => 0, 1488 can_events => 0,
1268 %arg 1489 %arg
1269 ); 1490 );
1270 1491
1271 if (exists $self->{template}) { 1492 if (exists $self->{template}) {
… …
1281 } 1502 }
1282 1503
1283 $self 1504 $self
1284} 1505}
1285 1506
1286sub escape { 1507sub escape($) {
1287 local $_ = $_[1]; 1508 local $_ = $_[0];
1288 1509
1289 s/&/&amp;/g; 1510 s/&/&amp;/g;
1290 s/>/&gt;/g; 1511 s/>/&gt;/g;
1291 s/</&lt;/g; 1512 s/</&lt;/g;
1292 1513
1293 $_[1] 1514 $_
1294} 1515}
1295 1516
1296sub update { 1517sub update {
1297 my ($self) = @_; 1518 my ($self) = @_;
1298 1519
… …
1307 $self->{text} = "T$text"; 1528 $self->{text} = "T$text";
1308 1529
1309 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1530 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1310 $self->{layout}->set_text ($text); 1531 $self->{layout}->set_text ($text);
1311 1532
1533 $self->realloc;
1312 $self->update; 1534 $self->update;
1313 $self->check_size;
1314} 1535}
1315 1536
1316sub set_markup { 1537sub set_markup {
1317 my ($self, $markup) = @_; 1538 my ($self, $markup) = @_;
1318 1539
… …
1322 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1543 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1323 1544
1324 $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;
1325 $self->{layout}->set_markup ($markup); 1546 $self->{layout}->set_markup ($markup);
1326 1547
1548 $self->realloc;
1327 $self->update; 1549 $self->update;
1328 $self->check_size;
1329} 1550}
1330 1551
1331sub size_request { 1552sub size_request {
1332 my ($self) = @_; 1553 my ($self) = @_;
1333 1554
1334 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1555 $self->{layout}->set_font ($self->{font}) if $self->{font};
1335 $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});
1336 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1559 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1337 1560
1338 my ($w, $h) = $self->{layout}->size; 1561 my ($w, $h) = $self->{layout}->size;
1339 1562
1340 if (exists $self->{template}) { 1563 if (exists $self->{template}) {
… …
1345 1568
1346 $w = List::Util::max $w, $w2; 1569 $w = List::Util::max $w, $w2;
1347 $h = List::Util::max $h, $h2; 1570 $h = List::Util::max $h, $h2;
1348 } 1571 }
1349 1572
1350 ( 1573 ($w, $h)
1351 $w + $self->{padding} * 2,
1352 $h + $self->{padding} * 2,
1353 )
1354} 1574}
1355 1575
1356sub size_allocate { 1576sub size_allocate {
1357 my ($self, $w, $h) = @_; 1577 my ($self, $w, $h) = @_;
1358 1578
1579 delete $self->{ox};
1580
1359 delete $self->{texture}; 1581 delete $self->{texture}
1582 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1360} 1583}
1361 1584
1362sub set_fontsize { 1585sub set_fontsize {
1363 my ($self, $fontsize) = @_; 1586 my ($self, $fontsize) = @_;
1364 1587
1365 $self->{fontsize} = $fontsize; 1588 $self->{fontsize} = $fontsize;
1366 delete $self->{texture}; 1589 delete $self->{texture};
1367 1590
1368 $self->update; 1591 $self->realloc;
1369 $self->check_size;
1370} 1592}
1371 1593
1372sub _draw { 1594sub _draw {
1373 my ($self) = @_; 1595 my ($self) = @_;
1596
1597 $self->SUPER::_draw; # draw background, if applicable
1374 1598
1375 my $tex = $self->{texture} ||= do { 1599 my $tex = $self->{texture} ||= do {
1376 $self->{layout}->set_foreground (@{$self->{fg}}); 1600 $self->{layout}->set_foreground (@{$self->{fg}});
1377 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1601 $self->{layout}->set_font ($self->{font}) if $self->{font};
1378 $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});
1379 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1605 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1380 1606
1381 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1607 new_from_layout CFClient::Texture $self->{layout}
1608 };
1382 1609
1610 unless (exists $self->{ox}) {
1383 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1611 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1384 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1612 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1385 : ($self->{w} - $tex->{w}) * 0.5; 1613 : ($self->{w} - $tex->{w}) * 0.5);
1386 1614
1387 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1615 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1388 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1616 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1389 : ($self->{h} - $tex->{h}) * 0.5; 1617 : ($self->{h} - $tex->{h}) * 0.5);
1390
1391 $tex
1392 }; 1618 };
1393 1619
1394 glEnable GL_TEXTURE_2D; 1620 glEnable GL_TEXTURE_2D;
1395 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1621 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1396 1622
… …
1422 active_fg => [0, 0, 0], 1648 active_fg => [0, 0, 0],
1423 can_hover => 1, 1649 can_hover => 1,
1424 can_focus => 1, 1650 can_focus => 1,
1425 valign => 0, 1651 valign => 0,
1426 can_events => 1, 1652 can_events => 1,
1653 #text => ...
1427 @_ 1654 @_
1428 ) 1655 )
1429} 1656}
1430 1657
1431sub _set_text { 1658sub _set_text {
… …
1441 $self->{text} = $text; 1668 $self->{text} = $text;
1442 1669
1443 $text =~ s/./*/g if $self->{hidden}; 1670 $text =~ s/./*/g if $self->{hidden};
1444 $self->{layout}->set_text ("$text "); 1671 $self->{layout}->set_text ("$text ");
1445 1672
1446 $self->emit (changed => $self->{text}); 1673 $self->_emit (changed => $self->{text});
1447} 1674}
1448 1675
1449sub set_text { 1676sub set_text {
1450 my ($self, $text) = @_; 1677 my ($self, $text) = @_;
1451 1678
1452 $self->{cursor} = length $text; 1679 $self->{cursor} = length $text;
1453 $self->_set_text ($text); 1680 $self->_set_text ($text);
1454 $self->check_size; 1681
1455 $self->update; 1682 $self->realloc;
1456} 1683}
1457 1684
1458sub get_text { 1685sub get_text {
1459 $_[0]{text} 1686 $_[0]{text}
1460} 1687}
… …
1463 my ($self) = @_; 1690 my ($self) = @_;
1464 1691
1465 my ($w, $h) = $self->SUPER::size_request; 1692 my ($w, $h) = $self->SUPER::size_request;
1466 1693
1467 ($w + 1, $h) # add 1 for cursor 1694 ($w + 1, $h) # add 1 for cursor
1468}
1469
1470sub size_allocate {
1471 my ($self, $w, $h) = @_;
1472
1473 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1474} 1695}
1475 1696
1476sub key_down { 1697sub key_down {
1477 my ($self, $ev) = @_; 1698 my ($self, $ev) = @_;
1478 1699
… …
1493 } elsif ($sym == CFClient::SDLK_HOME) { 1714 } elsif ($sym == CFClient::SDLK_HOME) {
1494 $self->{cursor} = 0; 1715 $self->{cursor} = 0;
1495 } elsif ($sym == CFClient::SDLK_END) { 1716 } elsif ($sym == CFClient::SDLK_END) {
1496 $self->{cursor} = length $text; 1717 $self->{cursor} = length $text;
1497 } elsif ($uni == 27) { 1718 } elsif ($uni == 27) {
1498 $self->emit ('escape'); 1719 $self->_emit ('escape');
1499 } elsif ($uni) { 1720 } elsif ($uni) {
1500 substr $text, $self->{cursor}++, 0, chr $uni; 1721 substr $text, $self->{cursor}++, 0, chr $uni;
1722 } else {
1723 return 0;
1501 } 1724 }
1502 1725
1503 $self->_set_text ($text); 1726 $self->_set_text ($text);
1504 $self->update; 1727
1728 $self->realloc;
1729
1730 1
1505} 1731}
1506 1732
1507sub focus_in { 1733sub focus_in {
1508 my ($self) = @_; 1734 my ($self) = @_;
1509 1735
… …
1524 utf8::encode $text; 1750 utf8::encode $text;
1525 $self->{cursor} = length substr $text, 0, $idx; 1751 $self->{cursor} = length substr $text, 0, $idx;
1526 1752
1527 $self->_set_text ($self->{text}); 1753 $self->_set_text ($self->{text});
1528 $self->update; 1754 $self->update;
1755
1756 1
1529} 1757}
1530 1758
1531sub mouse_motion { 1759sub mouse_motion {
1532 my ($self, $ev, $x, $y) = @_; 1760 my ($self, $ev, $x, $y) = @_;
1533# 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
1534} 1764}
1535 1765
1536sub _draw { 1766sub _draw {
1537 my ($self) = @_; 1767 my ($self) = @_;
1538 1768
… …
1589 if ($sym == 13) { 1819 if ($sym == 13) {
1590 unshift @{$self->{history}}, 1820 unshift @{$self->{history}},
1591 my $txt = $self->get_text; 1821 my $txt = $self->get_text;
1592 $self->{history_pointer} = -1; 1822 $self->{history_pointer} = -1;
1593 $self->{history_saveback} = ''; 1823 $self->{history_saveback} = '';
1594 $self->emit (activate => $txt); 1824 $self->_emit (activate => $txt);
1595 $self->update; 1825 $self->update;
1596 1826
1597 } elsif ($sym == CFClient::SDLK_UP) { 1827 } elsif ($sym == CFClient::SDLK_UP) {
1598 if ($self->{history_pointer} < 0) { 1828 if ($self->{history_pointer} < 0) {
1599 $self->{history_saveback} = $self->get_text; 1829 $self->{history_saveback} = $self->get_text;
… …
1615 } else { 1845 } else {
1616 $self->set_text ($self->{history_saveback}); 1846 $self->set_text ($self->{history_saveback});
1617 } 1847 }
1618 1848
1619 } else { 1849 } else {
1620 $self->SUPER::key_down ($ev); 1850 return $self->SUPER::key_down ($ev)
1851 }
1852
1621 } 1853 1
1622
1623} 1854}
1624 1855
1625############################################################################# 1856#############################################################################
1626 1857
1627package CFClient::UI::Button; 1858package CFClient::UI::Button;
… …
1636 1867
1637sub new { 1868sub new {
1638 my $class = shift; 1869 my $class = shift;
1639 1870
1640 $class->SUPER::new ( 1871 $class->SUPER::new (
1641 padding => 4, 1872 padding_x => 4,
1873 padding_y => 4,
1642 fg => [1, 1, 1], 1874 fg => [1, 1, 1],
1643 bg => [1, 1, 1, 0.2],
1644 active_fg => [0, 0, 1], 1875 active_fg => [0, 0, 1],
1645 can_hover => 1, 1876 can_hover => 1,
1646 align => 0, 1877 align => 0,
1647 valign => 0, 1878 valign => 0,
1648 can_events => 1, 1879 can_events => 1,
1649 @_ 1880 @_
1650 ) 1881 )
1651} 1882}
1652 1883
1884sub activate { }
1885
1653sub button_up { 1886sub button_up {
1654 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1655 1888
1889 $self->emit ("activate")
1656 if ($x >= 0 && $x < $self->{w} 1890 if $x >= 0 && $x < $self->{w}
1657 && $y >= 0 && $y < $self->{h}) { 1891 && $y >= 0 && $y < $self->{h};
1658 $self->emit ("activate"); 1892
1659 } 1893 1
1660} 1894}
1661 1895
1662sub _draw { 1896sub _draw {
1663 my ($self) = @_; 1897 my ($self) = @_;
1664 1898
… …
1693 1927
1694sub new { 1928sub new {
1695 my $class = shift; 1929 my $class = shift;
1696 1930
1697 $class->SUPER::new ( 1931 $class->SUPER::new (
1698 padding => 2, 1932 padding_x => 2,
1933 padding_y => 2,
1699 fg => [1, 1, 1], 1934 fg => [1, 1, 1],
1700 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],
1701 state => 0, 1938 state => 0,
1702 can_hover => 1, 1939 can_hover => 1,
1703 @_ 1940 @_
1704 ) 1941 )
1705} 1942}
1706 1943
1707sub size_request { 1944sub size_request {
1708 my ($self) = @_; 1945 my ($self) = @_;
1709 1946
1710 ($self->{padding} * 2 + 6) x 2 1947 (6) x 2
1711} 1948}
1712 1949
1713sub button_down { 1950sub button_down {
1714 my ($self, $ev, $x, $y) = @_; 1951 my ($self, $ev, $x, $y) = @_;
1715 1952
1716 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1953 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1717 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1954 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1718 $self->{state} = !$self->{state}; 1955 $self->{state} = !$self->{state};
1719 $self->emit (changed => $self->{state}); 1956 $self->_emit (changed => $self->{state});
1957 } else {
1958 return 0
1959 }
1960
1720 } 1961 1
1721} 1962}
1722 1963
1723sub _draw { 1964sub _draw {
1724 my ($self) = @_; 1965 my ($self) = @_;
1725 1966
1726 $self->SUPER::_draw; 1967 $self->SUPER::_draw;
1727 1968
1728 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1969 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1729 1970
1730 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;
1731 1974
1732 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1975 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1733 1976
1734 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1977 my $tex = $self->{state} ? $tex[1] : $tex[0];
1735 1978
… …
1989 qw(s1_slider.png s1_slider_bg.png); 2232 qw(s1_slider.png s1_slider_bg.png);
1990 2233
1991sub new { 2234sub new {
1992 my $class = shift; 2235 my $class = shift;
1993 2236
1994 # range [value, low, high, page] 2237 # range [value, low, high, page, unit]
1995 2238
1996 # TODO: 0-width page 2239 # TODO: 0-width page
1997 # TODO: req_w/h are wrong with vertical 2240 # TODO: req_w/h are wrong with vertical
1998 # TODO: calculations are off 2241 # TODO: calculations are off
1999 my $self = $class->SUPER::new ( 2242 my $self = $class->SUPER::new (
2000 fg => [1, 1, 1], 2243 fg => [1, 1, 1],
2001 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],
2002 range => [0, 0, 100, 10], 2247 range => [0, 0, 100, 10, 0],
2003 req_w => $::WIDTH / 80, 2248 min_w => $::WIDTH / 80,
2004 req_h => $::WIDTH / 80, 2249 min_h => $::WIDTH / 80,
2005 vertical => 0, 2250 vertical => 0,
2006 can_hover => 1, 2251 can_hover => 1,
2007 inner_pad => 5, 2252 inner_pad => 0.02,
2008 @_ 2253 @_
2009 ); 2254 );
2010 2255
2256 $self->set_value ($self->{range}[0]);
2257 $self->update;
2258
2011 $self 2259 $self
2012} 2260}
2013 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
2014sub size_request { 2296sub size_request {
2015 my ($self) = @_; 2297 my ($self) = @_;
2016 2298
2017 my $w = $self->{req_w}; 2299 ($self->{req_w}, $self->{req_h})
2018 my $h = $self->{req_h};
2019
2020 $self->{vertical} ? ($h, $w) : ($w, $h)
2021} 2300}
2022 2301
2023sub button_down { 2302sub button_down {
2024 my ($self, $ev, $x, $y) = @_; 2303 my ($self, $ev, $x, $y) = @_;
2025 2304
2026 $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
2027 $self->mouse_motion ($ev, $x, $y); 2309 $self->mouse_motion ($ev, $x, $y)
2028} 2310}
2029 2311
2030sub mouse_motion { 2312sub mouse_motion {
2031 my ($self, $ev, $x, $y) = @_; 2313 my ($self, $ev, $x, $y) = @_;
2032 2314
2033 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
2034 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2336 my ($value, $lo, $hi, $page) = @{$self->{range}};
2337 my $range = ($hi - $page - $lo) || 1e-100;
2035 2338
2036 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2339 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2037 2340
2038 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2341 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2039 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2342 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2040 2343
2041 $x -= $inner_pad_px; # substract the padding 2344 $value = ($value - $lo) / $range;
2042 $x = $x * ($hi - $lo) / $inner_w + $lo; 2345 $value = $value * $self->{scale} + $self->{offset};
2043 $x = $lo if $x < $lo;
2044 $x = $hi - $page if $x > $hi - $page;
2045 $self->{range}[0] = $x;
2046 2346
2047 $self->emit (changed => $x); 2347 $self->{knob_x} = $value - $knob_w * 0.5;
2048 $self->update; 2348 $self->{knob_w} = $knob_w;
2049 } 2349 });
2050}
2051 2350
2052# the inner_* stuff is for generating a padding for the slider handle, 2351 $self->SUPER::update;
2053# so that the handle doesn't leave the texture. This calculation isn't 100%
2054# correct propably, but it does the job for now
2055sub _calc_inner_pad_px {
2056 my ($self, $w) = @_;
2057 ($w / 100) * $self->{inner_pad} # % to pixels
2058} 2352}
2059 2353
2060sub _draw { 2354sub _draw {
2061 my ($self) = @_; 2355 my ($self) = @_;
2062 2356
2063 $self->SUPER::_draw (); 2357 $self->SUPER::_draw ();
2064 2358
2065 my ($w, $h) = @$self{qw(w h)}; 2359 glScale $self->{w}, $self->{h};
2066 2360
2067 if ($self->{vertical}) { 2361 if ($self->{vertical}) {
2068 # draw a vertical slider like a rotated horizontal slider 2362 # draw a vertical slider like a rotated horizontal slider
2069 2363
2364 glTranslate 1, 0, 0;
2070 glRotate 90, 0, 0, 1; 2365 glRotate 90, 0, 0, 1;
2071 glTranslate 0, -$self->{w}, 0;
2072
2073 ($w, $h) = ($h, $w);
2074 } 2366 }
2075 2367
2076 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2368 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2077 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2369 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2078 2370
2079 my ($value, $lo, $hi, $page) = @{$self->{range}};
2080
2081 $hi = $value + 1 if $lo == $hi;
2082
2083 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2084 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2085
2086 $page = int $page * $inner_w / ($hi - $lo);
2087 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2088
2089 $w -= $page;
2090 $page &= ~1;
2091 glTranslate $page * 0.5, 0, 0;
2092 $page ||= 2;
2093
2094 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2095 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2096
2097 glEnable GL_TEXTURE_2D; 2371 glEnable GL_TEXTURE_2D;
2098 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2372 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2099 2373
2100 # draw background 2374 # draw background
2101 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2375 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2102 2376
2103 # draw handle 2377 # draw handle
2104 $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);
2105 2379
2106 glDisable GL_TEXTURE_2D; 2380 glDisable GL_TEXTURE_2D;
2107} 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 (@_) }
2108 2423
2109############################################################################# 2424#############################################################################
2110 2425
2111package CFClient::UI::TextView; 2426package CFClient::UI::TextView;
2112 2427
… …
2142 2457
2143 $self->{fontsize} = $fontsize; 2458 $self->{fontsize} = $fontsize;
2144 $self->reflow; 2459 $self->reflow;
2145} 2460}
2146 2461
2147sub text_height {
2148 my ($self, $text) = @_;
2149
2150 my $layout = $self->{layout};
2151
2152 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2153 $layout->set_width ($self->{children}[0]{w});
2154 $layout->set_markup ($text);
2155
2156 ($layout->size)[1]
2157}
2158
2159sub reflow {
2160 my ($self) = @_;
2161
2162 $self->{need_reflow}++;
2163 $self->update;
2164}
2165
2166sub size_allocate { 2462sub size_allocate {
2167 my ($self, $w, $h) = @_; 2463 my ($self, $w, $h) = @_;
2168 2464
2169 $self->SUPER::size_allocate ($w, $h); 2465 $self->SUPER::size_allocate ($w, $h);
2170 2466
… …
2173 $self->{layout}->set_width ($self->{children}[0]{w}); 2469 $self->{layout}->set_width ($self->{children}[0]{w});
2174 2470
2175 $self->reflow; 2471 $self->reflow;
2176} 2472}
2177 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
2178sub add_paragraph { 2508sub add_paragraph {
2179 my ($self, $color, $text) = @_; 2509 my ($self, $color, $text, $indent) = @_;
2180 2510
2181 #TODO: intelligently "reformat" paragraph 2511 for my $line (split /\n/, $text) {
2182 2512 my ($w, $h) = $self->text_size ($line);
2183 my $height = $self->text_height ($text);
2184
2185 $self->{height} += $height; 2513 $self->{height} += $h;
2514 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2515 }
2186 2516
2187 push @{$self->{par}}, [$height, $color, $text];
2188
2189 $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]);
2190 $self->{children}[1]->update;
2191} 2518}
2192 2519
2193sub update { 2520sub update {
2194 my ($self) = @_; 2521 my ($self) = @_;
2195 2522
… …
2198 return unless $self->{h} > 0; 2525 return unless $self->{h} > 0;
2199 2526
2200 delete $self->{texture}; 2527 delete $self->{texture};
2201 2528
2202 $ROOT->on_post_alloc ($self, sub { 2529 $ROOT->on_post_alloc ($self, sub {
2530 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2531
2203 if (delete $self->{need_reflow}) { 2532 if (delete $self->{need_reflow}) {
2204 my $height = 0; 2533 my $height = 0;
2205 2534
2206 $height += $_->[0] = $self->text_height ($_->[2]) 2535 my $layout = $self->{layout};
2536
2537 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2538
2207 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 }
2208 2550
2209 $self->{height} = $height; 2551 $self->{height} = $height;
2210 2552
2211 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2553 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2212 2554
2213 delete $self->{texture}; 2555 delete $self->{texture};
2214 } 2556 }
2215 2557
2216 $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 {
2217 glClearColor 0, 0, 0, 0; 2559 glClearColor 0.5, 0.5, 0.5, 0;
2218 glClear GL_COLOR_BUFFER_BIT; 2560 glClear GL_COLOR_BUFFER_BIT;
2219 2561
2220 glEnable GL_TEXTURE_2D;
2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2222
2223 my $top = int $self->{children}[1]{range}[0]; 2562 my $top = int $self->{children}[1]{range}[0];
2224 2563
2225 my $y0 = $top; 2564 my $y0 = $top;
2226 my $y1 = $top + $self->{h}; 2565 my $y1 = $top + $H;
2227 2566
2228 my $y = 0; 2567 my $y = 0;
2229 2568
2230 my $layout = $self->{layout}; 2569 my $layout = $self->{layout};
2231 2570
2232 $layout->set_font ($self->{font}) if $self->{font}; 2571 $layout->set_font ($self->{font}) if $self->{font};
2233 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
2234 for my $par (@{$self->{par}}) { 2577 for my $par (@{$self->{par}}) {
2235 my $h = $par->[0]; 2578 my $h = $par->[1];
2236 2579
2237 if ($y0 < $y + $h && $y < $y1) { 2580 if ($y0 < $y + $h && $y < $y1) {
2238 $layout->set_foreground (@{ $par->[1] }); 2581 $layout->set_foreground (@{ $par->[2] });
2582 $layout->set_width ($W - $par->[3]);
2239 $layout->set_markup ($par->[2]); 2583 $layout->set_markup ($par->[4]);
2240 2584
2241 my ($W, $H) = $layout->size; 2585 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2242 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;
2243 } 2589 }
2244 2590
2245 $y += $h; 2591 $y += $h;
2246 } 2592 }
2247 2593
2248 glDisable GL_TEXTURE_2D; 2594 glDisable GL_BLEND;
2249 }; 2595 };
2250 }); 2596 });
2251} 2597}
2252 2598
2253sub _draw { 2599sub _draw {
2254 my ($self) = @_; 2600 my ($self) = @_;
2255 2601
2256 glEnable GL_TEXTURE_2D; 2602 glEnable GL_TEXTURE_2D;
2257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2603 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2258 glColor 1, 1, 1, 1; 2604 glColor 1, 1, 1, 1;
2259 $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});
2260 glDisable GL_TEXTURE_2D; 2606 glDisable GL_TEXTURE_2D;
2261 2607
2262 $self->{children}[1]->draw; 2608 $self->{children}[1]->draw;
2263 2609
2264} 2610}
… …
2313 2659
2314sub new { 2660sub new {
2315 my $class = shift; 2661 my $class = shift;
2316 2662
2317 my $self = $class->SUPER::new ( 2663 my $self = $class->SUPER::new (
2318 state => 0, 2664 state => 0,
2319 connect_activate => \&toggle_flopper, 2665 on_activate => \&toggle_flopper,
2320 @_ 2666 @_
2321 ); 2667 );
2322 2668
2323 if ($self->{state}) {
2324 $self->{state} = 0;
2325 $self->toggle_flopper;
2326 }
2327
2328 $self 2669 $self
2329} 2670}
2330 2671
2331sub toggle_flopper { 2672sub toggle_flopper {
2332 my ($self) = @_; 2673 my ($self) = @_;
2333 2674
2334 # TODO: use animation 2675 $self->{other}->toggle_visibility;
2335 if ($self->{state} = !$self->{state}) {
2336 $CFClient::UI::ROOT->add ($self->{other});
2337 $self->{other}->move ($self->coord2global (0, $self->{h}));
2338 $self->emit ("open");
2339 } else {
2340 $CFClient::UI::ROOT->remove ($self->{other});
2341 $self->emit ("close");
2342 }
2343
2344 $self->emit (changed => $self->{state});
2345} 2676}
2346 2677
2347############################################################################# 2678#############################################################################
2348 2679
2349package CFClient::UI::Tooltip; 2680package CFClient::UI::Tooltip;
… …
2362} 2693}
2363 2694
2364sub set_tooltip_from { 2695sub set_tooltip_from {
2365 my ($self, $widget) = @_; 2696 my ($self, $widget) = @_;
2366 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
2367 $self->add (new CFClient::UI::Label 2707 $self->add (new CFClient::UI::Label
2368 markup => $widget->{tooltip}, 2708 markup => $tooltip,
2369 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2709 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2370 fontsize => 0.8, 2710 fontsize => 0.8,
2371 fg => [0, 0, 0, 1], 2711 fg => [0, 0, 0, 1],
2712 ellipsise => 0,
2372 font => ($widget->{tooltip_font} || $::FONT_PROP), 2713 font => ($widget->{tooltip_font} || $::FONT_PROP),
2373 ); 2714 );
2374} 2715}
2375 2716
2376sub size_request { 2717sub size_request {
2377 my ($self) = @_; 2718 my ($self) = @_;
… …
2383 2724
2384sub size_allocate { 2725sub size_allocate {
2385 my ($self, $w, $h) = @_; 2726 my ($self, $w, $h) = @_;
2386 2727
2387 $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 });
2388} 2747}
2389 2748
2390sub _draw { 2749sub _draw {
2391 my ($self) = @_; 2750 my ($self) = @_;
2392 2751
… …
2409 glVertex $w, $h; 2768 glVertex $w, $h;
2410 glVertex $w, 0; 2769 glVertex $w, 0;
2411 glEnd; 2770 glEnd;
2412 2771
2413 glTranslate 2 - 0.375, 2 - 0.375; 2772 glTranslate 2 - 0.375, 2 - 0.375;
2773
2414 $self->SUPER::_draw; 2774 $self->SUPER::_draw;
2415} 2775}
2416 2776
2417############################################################################# 2777#############################################################################
2418 2778
… …
2423use CFClient::OpenGL; 2783use CFClient::OpenGL;
2424 2784
2425sub new { 2785sub new {
2426 my $class = shift; 2786 my $class = shift;
2427 2787
2428 $class->SUPER::new ( 2788 my $self = $class->SUPER::new (
2429 aspect => 1, 2789 aspect => 1,
2790 can_events => 0,
2430 @_, 2791 @_,
2431 ) 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
2432} 2809}
2433 2810
2434sub size_request { 2811sub size_request {
2435 (32, 8) 2812 (32, 8)
2436} 2813}
2437 2814
2815sub update {
2816 my ($self) = @_;
2817
2818 return unless $self->{visible};
2819
2820 $self->SUPER::update;
2821}
2822
2438sub _draw { 2823sub _draw {
2439 my ($self) = @_; 2824 my ($self) = @_;
2440 2825
2441 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
2442 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2837 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2443 2838
2444 # TODO animation
2445 if ($tex) { 2839 if ($tex) {
2446 glEnable GL_TEXTURE_2D; 2840 glEnable GL_TEXTURE_2D;
2447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2841 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2448 glColor 1, 1, 1, 1; 2842 glColor 1, 1, 1, 1;
2449 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2843 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2450 glDisable GL_TEXTURE_2D; 2844 glDisable GL_TEXTURE_2D;
2451 } 2845 }
2452} 2846}
2453 2847
2454############################################################################# 2848sub DESTROY {
2455
2456package CFClient::UI::InventoryItem;
2457
2458our @ISA = CFClient::UI::HBox::;
2459
2460sub new {
2461 my $class = shift;
2462
2463 my %args = @_;
2464
2465 my $item = delete $args{item};
2466
2467 my $desc = $item->{nrof} < 2
2468 ? $item->{name}
2469 : "$item->{nrof} $item->{name_pl}";
2470
2471
2472 my $self = $class->SUPER::new (
2473 can_hover => 1,
2474 can_events => 1,
2475 tooltip => (CFClient::UI::Label->escape ($desc)
2476 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2477 connect_button_down => sub {
2478 my ($self, $ev, $x, $y) = @_;
2479
2480 # todo: maybe put examine on 1? but should just be a tooltip :(
2481 if ($ev->{button} == 1) {
2482 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2483 } elsif ($ev->{button} == 2) {
2484 $::CONN->send ("apply $item->{tag}");
2485 } elsif ($ev->{button} == 3) {
2486 CFClient::UI::Menu->new (
2487 items => [
2488 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2489 [
2490 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2491 sub { $::CONN->send ("lock $item->{tag}") },
2492 ],
2493 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2494 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2495 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2496 ],
2497 )->popup ($ev);
2498 }
2499
2500 1
2501 },
2502 %args
2503 );
2504
2505 $self->add (new CFClient::UI::Face
2506 can_events => 0,
2507 face => $item->{face},
2508 anim => $item->{anim},
2509 animspeed => $item->{animspeed},
2510 );
2511
2512 $self->add (new CFClient::UI::Label
2513 can_events => 0,
2514 text => $desc,
2515 );
2516
2517 $self
2518}
2519
2520#############################################################################
2521
2522package CFClient::UI::Inventory;
2523
2524our @ISA = CFClient::UI::ScrolledWindow::;
2525
2526sub new {
2527 my $class = shift;
2528
2529 my $self = $class->SUPER::new (
2530 scrolled => (new CFClient::UI::VBox),
2531 @_,
2532 );
2533
2534 $self
2535}
2536
2537sub set_items {
2538 my ($self, $items) = @_; 2849 my ($self) = @_;
2539 2850
2540 $self->{scrolled}->clear; 2851 $self->{timer}->cancel
2541 return unless $items; 2852 if $self->{timer};
2542 2853
2543 my @items = sort { 2854 $self->SUPER::DESTROY;
2544 ($a->{type} <=> $b->{type})
2545 or ($a->{name} cmp $b->{name})
2546 } @$items;
2547
2548 $self->{real_items} = \@items;
2549
2550 for my $item (@items) {
2551 my $desc = $item->{nrof} < 2
2552 ? $item->{name}
2553 : "$item->{nrof} $item->{name_pl}";
2554
2555 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2556 }
2557
2558 $self->{scrolled}->add (@items);
2559
2560# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2561}
2562
2563sub size_request {
2564 my ($self) = @_;
2565 ($self->{req_w}, $self->{req_h});
2566} 2855}
2567 2856
2568############################################################################# 2857#############################################################################
2569 2858
2570package CFClient::UI::Menu; 2859package CFClient::UI::Menu;
… …
2605 2894
2606# 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)
2607sub popup { 2896sub popup {
2608 my ($self, $ev) = @_; 2897 my ($self, $ev) = @_;
2609 2898
2610 $self->emit ("popdown"); 2899 $self->_emit ("popdown");
2611 2900
2612 # maybe save $GRAB? must be careful about events... 2901 # maybe save $GRAB? must be careful about events...
2613 $GRAB = $self; 2902 $GRAB = $self;
2614 $self->{button} = $ev->{button}; 2903 $self->{button} = $ev->{button};
2615 2904
2616 $self->show; 2905 $self->show;
2617 $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);
2618} 2907}
2619 2908
2620sub mouse_motion { 2909sub mouse_motion {
2621 my ($self, $ev, $x, $y) = @_; 2910 my ($self, $ev, $x, $y) = @_;
2622 2911
2623 # TODO: should use vbox->find_widget or so 2912 # TODO: should use vbox->find_widget or so
2624 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2913 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2625 $self->{hover} = $self->{item}{$HOVER}; 2914 $self->{hover} = $self->{item}{$HOVER};
2915
2916 0
2626} 2917}
2627 2918
2628sub button_up { 2919sub button_up {
2629 my ($self, $ev, $x, $y) = @_; 2920 my ($self, $ev, $x, $y) = @_;
2630 2921
2631 if ($ev->{button} == $self->{button}) { 2922 if ($ev->{button} == $self->{button}) {
2632 undef $GRAB; 2923 undef $GRAB;
2633 $self->hide; 2924 $self->hide;
2634 2925
2635 $self->emit ("popdown"); 2926 $self->_emit ("popdown");
2636 $self->{hover}[1]->() if $self->{hover}; 2927 $self->{hover}[1]->() if $self->{hover};
2928 } else {
2929 return 0
2930 }
2931
2637 } 2932 1
2638} 2933}
2639 2934
2640############################################################################# 2935#############################################################################
2641 2936
2642package CFClient::UI::Statusbox; 2937package CFClient::UI::Statusbox;
2643 2938
2644our @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}
2645 2949
2646sub reorder { 2950sub reorder {
2647 my ($self) = @_; 2951 my ($self) = @_;
2648 my $NOW = time; 2952 my $NOW = time;
2649 2953
… …
2668 ? "<b>$item->{count} ×</b> $item->{text}" 2972 ? "<b>$item->{count} ×</b> $item->{text}"
2669 : $item->{text}; 2973 : $item->{text};
2670 2974
2671 for ($short) { 2975 for ($short) {
2672 s/^\s+//; 2976 s/^\s+//;
2673 s/\012.*/…/s; 2977 s/\s+/ /g;
2674 my $len = int 40 / $item->{fontsize};
2675 substr $_, $len, length, "…" if $len < length;
2676 } 2978 }
2677 2979
2678 new CFClient::UI::Label 2980 new CFClient::UI::Label
2679 markup => $short, 2981 markup => $short,
2680 tooltip => $item->{tooltip}, 2982 tooltip => $item->{tooltip},
2681 tooltip_font => $::FONT_PROP, 2983 tooltip_font => $::FONT_PROP,
2682 tooltip_width => 0.67, 2984 tooltip_width => 0.67,
2683 fontsize => $item->{fontsize}, 2985 fontsize => $item->{fontsize} || $self->{fontsize},
2986 max_w => $::WIDTH * 0.44,
2684 color => $item->{color}, 2987 fg => $item->{fg},
2685 can_events => 1, 2988 can_events => 1,
2686 can_hover => 1 2989 can_hover => 1
2687 }; 2990 };
2688 } 2991 }
2689 2992
… …
2694sub add { 2997sub add {
2695 my ($self, $text, %arg) = @_; 2998 my ($self, $text, %arg) = @_;
2696 2999
2697 $text =~ s/^\s+//; 3000 $text =~ s/^\s+//;
2698 $text =~ s/\s+$//; 3001 $text =~ s/\s+$//;
3002
3003 return unless $text;
2699 3004
2700 my $timeout = time + ((delete $arg{timeout}) || 60); 3005 my $timeout = time + ((delete $arg{timeout}) || 60);
2701 3006
2702 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3007 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2703 3008
… …
2715 $self->{item}{$group} = { 3020 $self->{item}{$group} = {
2716 id => ++$self->{id}, 3021 id => ++$self->{id},
2717 text => $text, 3022 text => $text,
2718 timeout => $timeout, 3023 timeout => $timeout,
2719 tooltip => $text, 3024 tooltip => $text,
2720 fontsize => 0.8,
2721 color => [0.8, 0.8, 0.8, 0.8], 3025 fg => [0.8, 0.8, 0.8, 0.8],
2722 pri => 0, 3026 pri => 0,
2723 count => 1, 3027 count => 1,
2724 %arg, 3028 %arg,
2725 }; 3029 };
2726 } 3030 }
2727 3031
2728 $self->reorder; 3032 $self->reorder;
2729} 3033}
2730 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
2731############################################################################# 3045#############################################################################
2732 3046
2733package CFClient::UI::Root; 3047package CFClient::UI::Inventory;
2734 3048
2735our @ISA = CFClient::UI::Container::; 3049our @ISA = CFClient::UI::ScrolledWindow::;
2736
2737use CFClient::OpenGL;
2738 3050
2739sub new { 3051sub new {
2740 my $class = shift; 3052 my $class = shift;
2741 3053
2742 $class->SUPER::new ( 3054 my $self = $class->SUPER::new (
3055 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2743 @_, 3056 @_,
2744 ) 3057 );
2745}
2746 3058
2747sub 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 {
2748 my ($self, $x, $y, $w, $h) = @_; 3212 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2749 3213
2750 $self->{w} = $w; 3214 $self->clear_command_list;
2751 $self->{h} = $h; 3215 $self->{recording} = 0;
2752} 3216 $self->{rec_btn}->set_text ("start recording");
2753 3217
2754sub 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 {
2755 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}
2756 3236
2757 $self->size_allocate ($self->{w}, $self->{h}) 3237sub update_binding_widgets {
2758 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
2759} 3360}
2760 3361
2761sub size_request { 3362sub size_request {
2762 my ($self) = @_; 3363 my ($self) = @_;
2763 3364
2764 ($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
2765} 3380}
2766 3381
2767sub size_allocate { 3382sub size_allocate {
2768 my ($self, $w, $h) = @_; 3383 my ($self, $w, $h) = @_;
2769 3384
2770 my $old_w = $self->{old_w};
2771 my $old_h = $self->{old_h};
2772
2773 if ($old_w && $old_h) {
2774 for my $child ($self->children) {
2775 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2776 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2777 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2778 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2779 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2780 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2781 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2782 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2783 }
2784 }
2785
2786 for my $child ($self->children) { 3385 for my $child ($self->children) {
2787 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)};
2788 3387
2789 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3388 $X = $child->{force_x} if exists $child->{force_x};
2790 $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
2791 $child->configure ($X, $Y, $W, $H); 3394 $child->configure ($X, $Y, $W, $H);
2792 } 3395 }
2793
2794 $self->{old_w} = $w;
2795 $self->{old_h} = $h;
2796} 3396}
2797 3397
2798sub coord2local { 3398sub coord2local {
2799 my ($self, $x, $y) = @_; 3399 my ($self, $x, $y) = @_;
2800 3400
… …
2808} 3408}
2809 3409
2810sub update { 3410sub update {
2811 my ($self) = @_; 3411 my ($self) = @_;
2812 3412
2813 $self->check_size;
2814 $::WANT_REFRESH++; 3413 $::WANT_REFRESH++;
2815} 3414}
2816 3415
2817sub add { 3416sub add {
2818 my ($self, $child) = @_; 3417 my ($self, @children) = @_;
2819 3418
2820 # integerise window positions 3419 $_->{is_toplevel} = 1
2821 $child->{x} = int $child->{x}; 3420 for @children;
2822 $child->{y} = int $child->{y};
2823 3421
2824 $self->SUPER::add ($child); 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 }
2825} 3438}
2826 3439
2827sub on_refresh { 3440sub on_refresh {
2828 my ($self, $id, $cb) = @_; 3441 my ($self, $id, $cb) = @_;
2829 3442
… …
2842 while ($self->{refresh_hook}) { 3455 while ($self->{refresh_hook}) {
2843 $_->() 3456 $_->()
2844 for values %{delete $self->{refresh_hook}}; 3457 for values %{delete $self->{refresh_hook}};
2845 } 3458 }
2846 3459
2847 if ($self->{check_size}) { 3460 if ($self->{realloc}) {
2848 my @queue = ([], []); 3461 my %queue;
3462 my @queue;
3463 my $widget;
2849 3464
2850 for (;;) { 3465 outer:
2851 if ($self->{check_size}) { 3466 while () {
2852 # heuristic: check containers last 3467 if (my $realloc = delete $self->{realloc}) {
2853 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3468 for $widget (values %$realloc) {
2854 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 }
2855 } 3475 }
2856 3476
2857 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3477 while () {
3478 @queue or last outer;
2858 3479
2859 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3480 $widget = pop @{ $queue[-1] || [] }
2860 ? @$widget{qw(user_w user_h)} 3481 and last;
2861 : $widget->size_request;
2862
2863 if (delete $widget->{force_alloc}
2864 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2865 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2866 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}) {
2867 $widget->{req_w} = $w; 3498 $widget->{req_w} = $w;
2868 $widget->{req_h} = $h; 3499 $widget->{req_h} = $h;
2869 3500
2870 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3501 $self->{size_alloc}{$widget+0} = $widget;
2871 3502
2872 $widget->{parent}->check_size
2873 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 }
2874 } 3510 }
3511
3512 delete $self->{realloc}{$widget+0};
2875 } 3513 }
2876 } 3514 }
2877 3515
2878 while ($self->{size_alloc}) { 3516 while (my $size_alloc = delete $self->{size_alloc}) {
2879 for (values %{delete $self->{size_alloc}}) { 3517 my @queue = sort { $b->{visible} <=> $a->{visible} }
2880 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)};
2881 3524
2882 $w = 0 if $w < 0; 3525 $w = 0 if $w < 0;
2883 $h = 0 if $h < 0; 3526 $h = 0 if $h < 0;
2884 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
2885 $widget->{w} = $w; 3535 $widget->{w} = $w;
2886 $widget->{h} = $h; 3536 $widget->{h} = $h;
2887 $widget->size_allocate ($w, $h); 3537
2888 $widget->emit (size_allocate => $w, $h); 3538 $widget->emit (size_allocate => $w, $h);
3539 }
2889 } 3540 }
2890 } 3541 }
2891 3542
2892 while ($self->{post_alloc_hook}) { 3543 while ($self->{post_alloc_hook}) {
2893 $_->() 3544 $_->()
2894 for values %{delete $self->{post_alloc_hook}}; 3545 for values %{delete $self->{post_alloc_hook}};
2895 } 3546 }
2896 3547
3548
2897 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3549 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2898 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3550 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2899 glClear GL_COLOR_BUFFER_BIT; 3551 glClear GL_COLOR_BUFFER_BIT;
2900 3552
2901 glMatrixMode GL_PROJECTION; 3553 glMatrixMode GL_PROJECTION;
2902 glLoadIdentity; 3554 glLoadIdentity;
2903 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3555 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2904 glMatrixMode GL_MODELVIEW; 3556 glMatrixMode GL_MODELVIEW;
2905 glLoadIdentity; 3557 glLoadIdentity;
2906 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
2907 $self->_draw; 3566 $self->_draw;
2908} 3567}
2909 3568
2910############################################################################# 3569#############################################################################
2911 3570
2912package CFClient::UI; 3571package CFClient::UI;
2913 3572
2914$ROOT = new CFClient::UI::Root; 3573$ROOT = new CFClient::UI::Root;
2915$TOOLTIP = new CFClient::UI::Tooltip; 3574$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2916 3575
29171 35761
2918 3577

Diff Legend

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