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.220 by root, Mon May 22 03:28:55 2006 UTC vs.
Revision 1.278 by root, Sun Jun 4 23:05:06 2006 UTC

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

Diff Legend

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