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.222 by root, Mon May 22 03:59:51 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 {
… …
206 %$self = (); 243 %$self = ();
207} 244}
208 245
209sub show { 246sub show {
210 my ($self) = @_; 247 my ($self) = @_;
248
211 return if $self->{parent}; 249 return if $self->{parent};
212 250
213 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
214} 252}
215 253
216sub hide { 254sub set_visible {
217 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};
218 278
219 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
220 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
221 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
222 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
223 if $self->{parent}; 313 if $self->{parent};
224} 314}
225 315
226sub move { 316sub move_abs {
227 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
228 318
229 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
230 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
231 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
232 322
233 $self->update; 323 $self->update;
234} 324}
235 325
236sub set_size { 326sub set_size {
237 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
238 328
239 $self->{user_w} = $w; 329 $self->{force_w} = $w;
240 $self->{user_h} = $h; 330 $self->{force_h} = $h;
241 331
242 $self->check_size; 332 $self->realloc;
243} 333}
244 334
245sub size_request { 335sub size_request {
246 require Carp; 336 require Carp;
247 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
249 339
250sub configure { 340sub configure {
251 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
252 342
253 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
254 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
255 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
256 348
257 # use alignment to adjust x, y 349 # use alignment to adjust x, y
258 350
259 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
260 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
261
262 ($w, $h) = ($w2, $h2);
263 } 353 }
264 354
265 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
266 $self->{x} = $x; 356 $self->{x} = $x;
267 $self->{y} = $y; 357 $self->{y} = $y;
268 $self->update; 358 $self->update;
269 } 359 }
270 360
271 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
272 $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;
273 } 368 }
274} 369}
275 370
276sub size_allocate { 371sub size_allocate {
277 # nothing to be done 372 # nothing to be done
278} 373}
279 374
280sub reconfigure {
281 my ($self) = @_;
282
283 $self->check_size (1);
284 $self->update;
285}
286
287sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
288} 381}
289 382
290sub set_max_size { 383sub set_max_size {
291 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
292 385
… …
294 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
295} 388}
296 389
297sub set_tooltip { 390sub set_tooltip {
298 my ($self, $tooltip) = @_; 391 my ($self, $tooltip) = @_;
392
393 $tooltip =~ s/^\s+//;
394 $tooltip =~ s/\s+$//;
395
396 return if $self->{tooltip} eq $tooltip;
299 397
300 $self->{tooltip} = $tooltip; 398 $self->{tooltip} = $tooltip;
301 399
302 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 400 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
303 delete $CFClient::UI::TOOLTIP->{owner}; 401 delete $CFClient::UI::TOOLTIP->{owner};
… …
325 return if $FOCUS == $self; 423 return if $FOCUS == $self;
326 return unless $self->{can_focus}; 424 return unless $self->{can_focus};
327 425
328 my $focus = $FOCUS; $FOCUS = $self; 426 my $focus = $FOCUS; $FOCUS = $self;
329 427
330 $self->emit (focus_in => $focus); 428 $self->_emit (focus_in => $focus);
331 429
332 $focus->update if $focus; 430 $focus->update if $focus;
333 $FOCUS->update; 431 $FOCUS->update;
334} 432}
335 433
… …
338 436
339 return unless $FOCUS == $self; 437 return unless $FOCUS == $self;
340 438
341 my $focus = $FOCUS; undef $FOCUS; 439 my $focus = $FOCUS; undef $FOCUS;
342 440
343 $self->emit (focus_out => $focus); 441 $self->_emit (focus_out => $focus);
344 442
345 $focus->update if $focus; #? 443 $focus->update if $focus; #?
346}
347 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447}
448
348sub mouse_motion { } 449sub mouse_motion { 0 }
349sub button_up { } 450sub button_up { 0 }
350sub key_down { } 451sub key_down { 0 }
351sub key_up { } 452sub key_up { 0 }
352 453
353sub button_down { 454sub button_down {
354 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
355 456
356 $self->focus_in; 457 $self->focus_in;
357}
358 458
359sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
360sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
361sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
362sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
363sub 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
364 535
365sub draw { 536sub draw {
366 my ($self) = @_; 537 my ($self) = @_;
367 538
368 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);
369 550
370 glPushMatrix; 551 glPushMatrix;
371 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
372 $self->_draw;
373 glPopMatrix;
374 553
375 if ($self == $HOVER && $self->{can_hover}) { 554 if ($self == $HOVER && $self->{can_hover}) {
376 my ($x, $y) = @$self{qw(x y)};
377
378 glColor 1, 0.8, 0.5, 0.2; 555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
379 glEnable GL_BLEND; 556 glEnable GL_BLEND;
380 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
381 glBegin GL_QUADS; 558 glBegin GL_QUADS;
382 glVertex $x , $y;
383 glVertex $x + $self->{w}, $y;
384 glVertex $x + $self->{w}, $y + $self->{h};
385 glVertex $x , $y + $self->{h};
386 glEnd;
387 glDisable GL_BLEND;
388 }
389
390 if ($ENV{PCLIENT_DEBUG}) {
391 glPushMatrix;
392 glColor 1, 1, 0, 1;
393 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
394 glBegin GL_LINE_LOOP;
395 glVertex 0 , 0; 559 glVertex 0 , 0;
396 glVertex $self->{w}, 0; 560 glVertex $self->{w}, 0;
397 glVertex $self->{w}, $self->{h}; 561 glVertex $self->{w}, $self->{h};
398 glVertex 0 , $self->{h}; 562 glVertex 0 , $self->{h};
399 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;
400 glPopMatrix; 577 glPopMatrix;
401 #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;
402 } 579 }
580
581 $self->_draw;
582 glPopMatrix;
403} 583}
404 584
405sub _draw { 585sub _draw {
406 my ($self) = @_; 586 my ($self) = @_;
407 587
408 warn "no draw defined for $self\n"; 588 warn "no draw defined for $self\n";
409}
410
411sub find_widget {
412 my ($self, $x, $y) = @_;
413
414 return () unless $self->{can_events};
415
416 return $self
417 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
418 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
419
420 ()
421}
422
423sub set_parent {
424 my ($self, $parent) = @_;
425
426 Scalar::Util::weaken ($self->{parent} = $parent);
427
428 # TODO: req_w _does_change after ->reconfigure
429 $self->check_size
430 unless exists $self->{req_w};
431
432 $self->show;
433}
434
435sub check_size {
436 my ($self, $forced) = @_;
437
438 $self->{force_alloc} = 1 if $forced;
439 $CFClient::UI::ROOT->{check_size}{$self} = $self;
440}
441
442sub update {
443 my ($self) = @_;
444
445 $self->{parent}->update
446 if $self->{parent};
447}
448
449sub connect {
450 my ($self, $signal, $cb) = @_;
451
452 push @{ $self->{signal_cb}{$signal} }, $cb;
453}
454
455sub emit {
456 my ($self, $signal, @args) = @_;
457
458 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
459} 589}
460 590
461sub DESTROY { 591sub DESTROY {
462 my ($self) = @_; 592 my ($self) = @_;
463 593
… …
495 625
496 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
497 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
498 628
499 glEnable GL_BLEND; 629 glEnable GL_BLEND;
500 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
501 glColor @$color; 631 glColor_premultiply @$color;
502 632
503 glBegin GL_QUADS; 633 glBegin GL_QUADS;
504 glVertex 0 , 0; 634 glVertex 0 , 0;
505 glVertex 0 , $h; 635 glVertex 0 , $h;
506 glVertex $w, $h; 636 glVertex $w, $h;
… …
521 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
522 $class->SUPER::new (can_events => 0, %arg); 652 $class->SUPER::new (can_events => 0, %arg);
523} 653}
524 654
525sub size_request { 655sub size_request {
526 (0, 0) 656 my ($self) = @_;
657
658 ($self->{w} + 0, $self->{h} + 0)
527} 659}
528 660
529sub draw { } 661sub draw { }
530 662
531############################################################################# 663#############################################################################
… …
535our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
536 668
537sub new { 669sub new {
538 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
539 671
540 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
541 673
542 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
543 children => [], 675 children => [],
544 can_events => 0, 676 can_events => 0,
545 %arg, 677 %arg,
546 ); 678 );
679
547 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
548 682
549 $self 683 $self
550} 684}
551 685
552sub add { 686sub add {
… …
560 $self->{children} = [ 694 $self->{children} = [
561 sort { $a->{z} <=> $b->{z} } 695 sort { $a->{z} <=> $b->{z} }
562 @{$self->{children}}, @widgets 696 @{$self->{children}}, @widgets
563 ]; 697 ];
564 698
565 $self->check_size (1); 699 $self->realloc;
566 $self->update;
567} 700}
568 701
569sub children { 702sub children {
570 @{ $_[0]{children} } 703 @{ $_[0]{children} }
571} 704}
… …
576 delete $child->{parent}; 709 delete $child->{parent};
577 $child->hide; 710 $child->hide;
578 711
579 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
580 713
581 $self->check_size; 714 $self->realloc;
582 $self->update;
583} 715}
584 716
585sub clear { 717sub clear {
586 my ($self) = @_; 718 my ($self) = @_;
587 719
… …
591 for (@$children) { 723 for (@$children) {
592 delete $_->{parent}; 724 delete $_->{parent};
593 $_->hide; 725 $_->hide;
594 } 726 }
595 727
596 $self->check_size; 728 $self->realloc;
597 $self->update;
598} 729}
599 730
600sub find_widget { 731sub find_widget {
601 my ($self, $x, $y) = @_; 732 my ($self, $x, $y) = @_;
602 733
603 $x -= $self->{x}; 734 $x -= $self->{x};
604 $y -= $self->{y}; 735 $y -= $self->{y};
605 736
606 my $res; 737 my $res;
607 738
608 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
609 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
610 and return $res; 741 and return $res;
611 } 742 }
612 743
613 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
662 $self->{children}[0]->configure (0, 0, $w, $h); 793 $self->{children}[0]->configure (0, 0, $w, $h);
663} 794}
664 795
665############################################################################# 796#############################################################################
666 797
798# back-buffered drawing area
799
667package CFClient::UI::Window; 800package CFClient::UI::Window;
668 801
669our @ISA = CFClient::UI::Bin::; 802our @ISA = CFClient::UI::Bin::;
670 803
671use CFClient::OpenGL; 804use CFClient::OpenGL;
… …
689 $self->SUPER::size_allocate ($w, $h); 822 $self->SUPER::size_allocate ($w, $h);
690 $self->update; 823 $self->update;
691} 824}
692 825
693sub _render { 826sub _render {
827 my ($self) = @_;
828
694 $_[0]{children}[0]->draw; 829 $self->{children}[0]->draw;
695} 830}
696 831
697sub render_child { 832sub render_child {
698 my ($self) = @_; 833 my ($self) = @_;
699 834
700 $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 {
701 glClearColor 0, 0, 0, 0; 836 glClearColor 0, 0, 0, 0;
702 glClear GL_COLOR_BUFFER_BIT; 837 glClear GL_COLOR_BUFFER_BIT;
703 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
704 $self->_render; 846 $self->_render;
705 }; 847 };
706} 848}
707 849
708sub _draw { 850sub _draw {
709 my ($self) = @_; 851 my ($self) = @_;
710 852
711 my ($w, $h) = ($self->w, $self->h); 853 my ($w, $h) = @$self{qw(w h)};
712 854
713 my $tex = $self->{texture} 855 my $tex = $self->{texture}
714 or return; 856 or return;
715 857
716 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
717 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;
718 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
719 863
720 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad (0, 0, $w, $h);
721 865
866 glDisable GL_BLEND;
722 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
723} 868}
724 869
725############################################################################# 870#############################################################################
726 871
727package CFClient::UI::ViewPort; 872package CFClient::UI::ViewPort;
728 873
729our @ISA = CFClient::UI::Window::; 874our @ISA = CFClient::UI::Window::;
730 875
876sub new {
877 my $class = shift;
878
879 $class->SUPER::new (
880 scroll_x => 0,
881 scroll_y => 1,
882 @_,
883 )
884}
885
731sub size_request { 886sub size_request {
732 my ($self) = @_; 887 my ($self) = @_;
733 888
734 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 889 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
735 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
736 890
737 @$self{qw(child_w child_h)} 891 $w = 10 if $self->{scroll_x};
892 $h = 10 if $self->{scroll_y};
893
894 ($w, $h)
738} 895}
739 896
740sub size_allocate { 897sub size_allocate {
741 my ($self, $w, $h) = @_; 898 my ($self, $w, $h) = @_;
742 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);
743 $self->update; 906 $self->update;
744} 907}
745 908
746sub set_offset { 909sub set_offset {
747 my ($self, $x, $y) = @_; 910 my ($self, $x, $y) = @_;
… …
781} 944}
782 945
783sub _render { 946sub _render {
784 my ($self) = @_; 947 my ($self) = @_;
785 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
786 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
787 953
788 $self->SUPER::_render; 954 $self->SUPER::_render;
789} 955}
790 956
… …
793package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
794 960
795our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
796 962
797sub new { 963sub new {
798 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
799 967
800 my $self; 968 my $self;
801 969
802 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
803 vertical => 1, 971 vertical => 1,
804 range => [0, 0, 1, 0.01], # HACK fix 972 range => [0, 0, 1, 0.01], # HACK fix
805 connect_changed => sub { 973 on_changed => sub {
806 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 974 $self->{vp}->set_offset (0, $_[1]);
807 }, 975 },
808 ; 976 ;
809 977
810 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
811 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
812 slider => $slider, 980 slider => $slider,
813 @_, 981 %arg,
814 ); 982 );
815 983
816 $self->{vp}->add ($self->{scrolled});
817 $self->add ($self->{vp});
818 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
819 986
820 $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]);
821} 1013}
822 1014
823#TODO# update range on size_allocate depending on child 1015#TODO# update range on size_allocate depending on child
824# update viewport offset on scroll 1016# update viewport offset on scroll
825 1017
… …
845 1037
846 if ($self->{bg}) { 1038 if ($self->{bg}) {
847 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
848 1040
849 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
850 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
851 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
852 1044
853 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
854 glVertex 0 , 0; 1046 glVertex 0 , 0;
855 glVertex 0 , $h; 1047 glVertex 0 , $h;
856 glVertex $w, $h; 1048 glVertex $w, $h;
… …
869 1061
870our @ISA = CFClient::UI::Bin::; 1062our @ISA = CFClient::UI::Bin::;
871 1063
872use CFClient::OpenGL; 1064use CFClient::OpenGL;
873 1065
874my @tex = 1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
875 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
876 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);
877 1073
878sub new { 1074sub new {
879 my $class = shift; 1075 my ($class, %arg) = @_;
880 1076
881 # TODO: user_x, user_y, overwrite moveto? 1077 my $title = delete $arg{title};
882 1078
883 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
884 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
885 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
886 border => 0.6, 1082 border => 0.6,
887 toplevel => 1,
888 can_events => 1, 1083 can_events => 1,
889 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
890 ); 1087 );
891 1088
892 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
893 align => 0, 1090 align => 0,
894 valign => 1, 1091 valign => 1,
895 text => $self->{title}, 1092 text => $title,
896 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
897 1095
898 $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};
899} 1104}
900 1105
901sub border { 1106sub border {
902 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
903} 1108}
904 1109
905sub size_request { 1110sub size_request {
906 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
907 1115
908 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
909 1117
910 ( 1118 (
911 $w + $self->border * 2, 1119 $w + $self->border * 2,
… …
914} 1122}
915 1123
916sub size_allocate { 1124sub size_allocate {
917 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
918 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
919 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
920 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
921 1137
922 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
923 if $self->{title};
924
925 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
926} 1139}
927 1140
928sub button_down { 1141sub button_down {
929 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
930 1143
… …
946 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
947 1160
948 my $dx = $ev->{x} - $ox; 1161 my $dx = $ev->{x} - $ox;
949 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
950 1163
951 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
952 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1166
953 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
954 $self->check_size; 1168 $self->realloc;
955 }; 1169 };
956 1170
957 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
958 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
959 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
961 $self->{motion} = sub { 1175 $self->{motion} = sub {
962 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
963 1177
964 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
965 1179
966 $self->move ($bx + $x - $ox, $by + $y - $oy); 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
967 $self->update; 1181 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
968 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
969 } 1188 1
970} 1189}
971 1190
972sub button_up { 1191sub button_up {
973 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
974 1193
975 delete $self->{motion}; 1194 !!delete $self->{motion}
976} 1195}
977 1196
978sub mouse_motion { 1197sub mouse_motion {
979 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
980 1199
981 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
982} 1203}
983 1204
984sub _draw { 1205sub _draw {
985 my ($self) = @_; 1206 my ($self) = @_;
986 1207
1208 my $child = $self->{children}[0];
1209
987 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
988 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
989 1212
990 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
991 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
992 1215
993 my $border = $self->border; 1216 my $border = $self->border;
994 1217
995 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
996 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
997 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
998 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
999 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1000 1223
1001 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1002 my $bg = $tex[0]; 1225 glColor @{ $self->{bg} };
1003 1226
1004 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
1228 # solve this better(?)
1005 my $rep_x = $cw / $bg->{w}; 1229 $bg->{s} = $cw / $bg->{w};
1006 my $rep_y = $ch / $bg->{h}; 1230 $bg->{t} = $ch / $bg->{h};
1007
1008 glColor @{ $self->{bg} };
1009
1010 $bg->{s} = $rep_x;
1011 $bg->{t} = $rep_y;
1012 $bg->{wrap_mode} = 1;
1013 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1014 } 1232 }
1015 1233
1016 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
1017 1235
1018 $self->{title}->draw if $self->{title};
1019
1020 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1021} 1242}
1022 1243
1023############################################################################# 1244#############################################################################
1024 1245
1025package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
1033sub new { 1254sub new {
1034 my $class = shift; 1255 my $class = shift;
1035 1256
1036 $class->SUPER::new ( 1257 $class->SUPER::new (
1037 col_expand => [], 1258 col_expand => [],
1038 @_ 1259 @_,
1039 ) 1260 )
1261}
1262
1263sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1040} 1265}
1041 1266
1042sub add { 1267sub add {
1043 my ($self, $x, $y, $child) = @_; 1268 my ($self, $x, $y, $child) = @_;
1044 1269
1045 $child->set_parent ($self); 1270 $child->set_parent ($self);
1046 $self->{children}[$y][$x] = $child; 1271 $self->{children}[$y][$x] = $child;
1047 1272
1048 $child->check_size; 1273 $self->realloc;
1049} 1274}
1050 1275
1051sub children {
1052 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1053}
1054
1055# 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?
1056sub clear { 1277sub clear {
1057 my ($self) = @_; 1278 my ($self) = @_;
1058 1279
1059 my @children = $self->children; 1280 my @children = $self->children;
1060 delete $self->{children}; 1281 delete $self->{children};
… …
1062 for (@children) { 1283 for (@children) {
1063 delete $_->{parent}; 1284 delete $_->{parent};
1064 $_->hide; 1285 $_->hide;
1065 } 1286 }
1066 1287
1067 $self->update; 1288 $self->realloc;
1068} 1289}
1069 1290
1070sub get_wh { 1291sub get_wh {
1071 my ($self) = @_; 1292 my ($self) = @_;
1072 1293
… …
1103sub size_allocate { 1324sub size_allocate {
1104 my ($self, $w, $h) = @_; 1325 my ($self, $w, $h) = @_;
1105 1326
1106 my ($ws, $hs) = $self->get_wh; 1327 my ($ws, $hs) = $self->get_wh;
1107 1328
1108 my $req_w = sum @$ws; 1329 my $req_w = (sum @$ws) || 1;
1109 my $req_h = sum @$hs; 1330 my $req_h = (sum @$hs) || 1;
1110 1331
1111 # TODO: nicer code && do row_expand 1332 # TODO: nicer code && do row_expand
1112 my @col_expand = @{$self->{col_expand}}; 1333 my @col_expand = @{$self->{col_expand}};
1113 @col_expand = (1) x @$ws unless @col_expand; 1334 @col_expand = (1) x @$ws unless @col_expand;
1114 my $col_expand = (sum @col_expand) || 1; 1335 my $col_expand = (sum @col_expand) || 1;
… …
1168 } 1389 }
1169} 1390}
1170 1391
1171############################################################################# 1392#############################################################################
1172 1393
1173package CFClient::UI::HBox; 1394package CFClient::UI::Box;
1174
1175# TODO: wrap into common Box base class
1176 1395
1177our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Container::;
1178 1397
1179sub size_request { 1398sub size_request {
1180 my ($self) = @_; 1399 my ($self) = @_;
1181 1400
1182 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $self->{vertical}
1183 1402 ? (
1184 ( 1403 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1185 (List::Util::sum map $_->[0], @alloc), 1404 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1186 (List::Util::max map $_->[1], @alloc), 1405 )
1187 ) 1406 : (
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 )
1188} 1410}
1189 1411
1190sub size_allocate { 1412sub size_allocate {
1191 my ($self, $w, $h) = @_; 1413 my ($self, $w, $h) = @_;
1192 1414
1193 ($h, $w) = ($w, $h); 1415 my $space = $self->{vertical} ? $h : $w;
1194
1195 my $children = $self->{children}; 1416 my $children = $self->{children};
1196 1417
1197 my @h = map $_->{req_w}, @$children; 1418 my @req;
1198 1419
1199 my $req_h = List::Util::sum @h; 1420 if ($self->{homogeneous}) {
1200 1421 @req = ($space / (@$children || 1)) x @$children;
1201 if ($req_h > $h) {
1202 # ah well, not enough space
1203 $_ *= $h / $req_h for @h;
1204 } 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 {
1205 my $exp = List::Util::sum map $_->{expand}, @$children; 1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1206 $exp ||= 1;
1207 1431
1432 $space = ($space - $req) / $expand; # remaining space to give away
1433
1434 $req[$_] += $space * $children->[$_]{expand}
1208 for (0 .. $#$children) { 1435 for 0 .. $#$children;
1209 my $child = $children->[$_];
1210
1211 my $alloc_h = $h[$_];
1212 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1213 $h[$_] = $alloc_h;
1214 } 1436 }
1215 } 1437 }
1216 1438
1217 CFClient::UI::harmonize \@h; 1439 CFClient::UI::harmonize \@req;
1218 1440
1219 my $y = 0; 1441 my $pos = 0;
1220 for (0 .. $#$children) { 1442 for (0 .. $#$children) {
1221 my $child = $children->[$_];
1222 my $h = $h[$_]; 1443 my $alloc = $req[$_];
1223 $child->configure ($y, 0, $h, $w); 1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1224 1445
1225 $y += $h; 1446 $pos += $alloc;
1226 } 1447 }
1227 1448
1228 1 1449 1
1229} 1450}
1230 1451
1231############################################################################# 1452#############################################################################
1232 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
1233package CFClient::UI::VBox; 1469package CFClient::UI::VBox;
1234 1470
1235# TODO: wrap into common Box base class
1236
1237our @ISA = CFClient::UI::Container::; 1471our @ISA = CFClient::UI::Box::;
1238 1472
1239sub size_request { 1473sub new {
1240 my ($self) = @_; 1474 my $class = shift;
1241 1475
1242 my @alloc = map [$_->size_request], @{$self->{children}}; 1476 $class->SUPER::new (
1243 1477 vertical => 1,
1244 ( 1478 @_,
1245 (List::Util::max map $_->[0], @alloc),
1246 (List::Util::sum map $_->[1], @alloc),
1247 ) 1479 )
1248}
1249
1250sub size_allocate {
1251 my ($self, $w, $h) = @_;
1252
1253 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1254
1255 my $children = $self->{children};
1256
1257 my @h = map $_->{req_h}, @$children;
1258
1259 my $req_h = List::Util::sum @h;
1260
1261 if ($req_h > $h) {
1262 # ah well, not enough space
1263 $_ *= $h / $req_h for @h;
1264 } else {
1265 my $exp = List::Util::sum map $_->{expand}, @$children;
1266 $exp ||= 1;
1267
1268 for (0 .. $#$children) {
1269 my $child = $children->[$_];
1270
1271 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1272 }
1273 }
1274
1275 CFClient::UI::harmonize \@h;
1276
1277 my $y = 0;
1278 for (0 .. $#$children) {
1279 my $child = $children->[$_];
1280 my $h = $h[$_];
1281 $child->configure (0, $y, $w, $h);
1282
1283 $y += $h;
1284 }
1285
1286 1
1287} 1480}
1288 1481
1289############################################################################# 1482#############################################################################
1290 1483
1291package CFClient::UI::Label; 1484package CFClient::UI::Label;
… …
1308 ellipsise => 3, # end 1501 ellipsise => 3, # end
1309 layout => (new CFClient::Layout), 1502 layout => (new CFClient::Layout),
1310 fontsize => 1, 1503 fontsize => 1,
1311 align => -1, 1504 align => -1,
1312 valign => -1, 1505 valign => -1,
1313 padding => 2, 1506 padding_x => 2,
1507 padding_y => 2,
1314 can_events => 0, 1508 can_events => 0,
1315 %arg 1509 %arg
1316 ); 1510 );
1317 1511
1318 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1354 $self->{text} = "T$text"; 1548 $self->{text} = "T$text";
1355 1549
1356 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1550 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1357 $self->{layout}->set_text ($text); 1551 $self->{layout}->set_text ($text);
1358 1552
1553 $self->realloc;
1359 $self->update; 1554 $self->update;
1360 $self->check_size;
1361} 1555}
1362 1556
1363sub set_markup { 1557sub set_markup {
1364 my ($self, $markup) = @_; 1558 my ($self, $markup) = @_;
1365 1559
… …
1369 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1563 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1370 1564
1371 $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;
1372 $self->{layout}->set_markup ($markup); 1566 $self->{layout}->set_markup ($markup);
1373 1567
1568 $self->realloc;
1374 $self->update; 1569 $self->update;
1375 $self->check_size;
1376} 1570}
1377 1571
1378sub size_request { 1572sub size_request {
1379 my ($self) = @_; 1573 my ($self) = @_;
1380 1574
… …
1394 1588
1395 $w = List::Util::max $w, $w2; 1589 $w = List::Util::max $w, $w2;
1396 $h = List::Util::max $h, $h2; 1590 $h = List::Util::max $h, $h2;
1397 } 1591 }
1398 1592
1399 ( 1593 ($w, $h)
1400 $w + $self->{padding} * 2,
1401 $h + $self->{padding} * 2,
1402 )
1403} 1594}
1404 1595
1405sub size_allocate { 1596sub size_allocate {
1406 my ($self, $w, $h) = @_; 1597 my ($self, $w, $h) = @_;
1407 1598
1599 delete $self->{ox};
1600
1408 delete $self->{texture}; 1601 delete $self->{texture}
1602 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1409} 1603}
1410 1604
1411sub set_fontsize { 1605sub set_fontsize {
1412 my ($self, $fontsize) = @_; 1606 my ($self, $fontsize) = @_;
1413 1607
1414 $self->{fontsize} = $fontsize; 1608 $self->{fontsize} = $fontsize;
1415 delete $self->{texture}; 1609 delete $self->{texture};
1416 1610
1417 $self->update; 1611 $self->realloc;
1418 $self->check_size;
1419} 1612}
1420 1613
1421sub _draw { 1614sub _draw {
1422 my ($self) = @_; 1615 my ($self) = @_;
1423 1616
… …
1429 $self->{layout}->set_width ($self->{w}); 1622 $self->{layout}->set_width ($self->{w});
1430 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1623 $self->{layout}->set_ellipsise ($self->{ellipsise});
1431 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1624 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1432 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1625 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1433 1626
1434 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1627 new_from_layout CFClient::Texture $self->{layout}
1628 };
1435 1629
1630 unless (exists $self->{ox}) {
1436 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1631 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1437 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1632 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1438 : ($self->{w} - $tex->{w}) * 0.5); 1633 : ($self->{w} - $tex->{w}) * 0.5);
1439 1634
1440 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1635 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1441 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1636 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1442 : ($self->{h} - $tex->{h}) * 0.5); 1637 : ($self->{h} - $tex->{h}) * 0.5);
1443
1444 $tex
1445 }; 1638 };
1446 1639
1447 glEnable GL_TEXTURE_2D; 1640 glEnable GL_TEXTURE_2D;
1448 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1449 1642
… …
1475 active_fg => [0, 0, 0], 1668 active_fg => [0, 0, 0],
1476 can_hover => 1, 1669 can_hover => 1,
1477 can_focus => 1, 1670 can_focus => 1,
1478 valign => 0, 1671 valign => 0,
1479 can_events => 1, 1672 can_events => 1,
1673 #text => ...
1480 @_ 1674 @_
1481 ) 1675 )
1482} 1676}
1483 1677
1484sub _set_text { 1678sub _set_text {
… …
1486 1680
1487 delete $self->{cur_h}; 1681 delete $self->{cur_h};
1488 1682
1489 return if $self->{text} eq $text; 1683 return if $self->{text} eq $text;
1490 1684
1491 delete $self->{texture};
1492
1493 $self->{last_activity} = $::NOW; 1685 $self->{last_activity} = $::NOW;
1494 $self->{text} = $text; 1686 $self->{text} = $text;
1495 1687
1496 $text =~ s/./*/g if $self->{hidden}; 1688 $text =~ s/./*/g if $self->{hidden};
1497 $self->{layout}->set_text ("$text "); 1689 $self->{layout}->set_text ("$text ");
1498 1690
1499 $self->emit (changed => $self->{text}); 1691 $self->_emit (changed => $self->{text});
1692 $self->update;
1500} 1693}
1501 1694
1502sub set_text { 1695sub set_text {
1503 my ($self, $text) = @_; 1696 my ($self, $text) = @_;
1504 1697
1505 $self->{cursor} = length $text; 1698 $self->{cursor} = length $text;
1506 $self->_set_text ($text); 1699 $self->_set_text ($text);
1507 $self->update; 1700
1508 $self->check_size; 1701 $self->realloc;
1509} 1702}
1510 1703
1511sub get_text { 1704sub get_text {
1512 $_[0]{text} 1705 $_[0]{text}
1513} 1706}
… …
1516 my ($self) = @_; 1709 my ($self) = @_;
1517 1710
1518 my ($w, $h) = $self->SUPER::size_request; 1711 my ($w, $h) = $self->SUPER::size_request;
1519 1712
1520 ($w + 1, $h) # add 1 for cursor 1713 ($w + 1, $h) # add 1 for cursor
1521}
1522
1523sub size_allocate {
1524 my ($self, $w, $h) = @_;
1525
1526 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1527} 1714}
1528 1715
1529sub key_down { 1716sub key_down {
1530 my ($self, $ev) = @_; 1717 my ($self, $ev) = @_;
1531 1718
… …
1546 } elsif ($sym == CFClient::SDLK_HOME) { 1733 } elsif ($sym == CFClient::SDLK_HOME) {
1547 $self->{cursor} = 0; 1734 $self->{cursor} = 0;
1548 } elsif ($sym == CFClient::SDLK_END) { 1735 } elsif ($sym == CFClient::SDLK_END) {
1549 $self->{cursor} = length $text; 1736 $self->{cursor} = length $text;
1550 } elsif ($uni == 27) { 1737 } elsif ($uni == 27) {
1551 $self->emit ('escape'); 1738 $self->_emit ('escape');
1552 } elsif ($uni) { 1739 } elsif ($uni) {
1553 substr $text, $self->{cursor}++, 0, chr $uni; 1740 substr $text, $self->{cursor}++, 0, chr $uni;
1741 } else {
1742 return 0;
1554 } 1743 }
1555 1744
1556 $self->_set_text ($text); 1745 $self->_set_text ($text);
1557 $self->update; 1746
1558 $self->check_size; 1747 $self->realloc;
1748
1749 1
1559} 1750}
1560 1751
1561sub focus_in { 1752sub focus_in {
1562 my ($self) = @_; 1753 my ($self) = @_;
1563 1754
… …
1578 utf8::encode $text; 1769 utf8::encode $text;
1579 $self->{cursor} = length substr $text, 0, $idx; 1770 $self->{cursor} = length substr $text, 0, $idx;
1580 1771
1581 $self->_set_text ($self->{text}); 1772 $self->_set_text ($self->{text});
1582 $self->update; 1773 $self->update;
1774
1775 1
1583} 1776}
1584 1777
1585sub mouse_motion { 1778sub mouse_motion {
1586 my ($self, $ev, $x, $y) = @_; 1779 my ($self, $ev, $x, $y) = @_;
1587# 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
1588} 1783}
1589 1784
1590sub _draw { 1785sub _draw {
1591 my ($self) = @_; 1786 my ($self) = @_;
1592 1787
1593 local $self->{fg} = $self->{fg}; 1788 local $self->{fg} = $self->{fg};
1594 1789
1595 if ($FOCUS == $self) { 1790 if ($FOCUS == $self) {
1596 glColor @{$self->{active_bg}}; 1791 glColor_premultiply @{$self->{active_bg}};
1597 $self->{fg} = $self->{active_fg}; 1792 $self->{fg} = $self->{active_fg};
1598 } else { 1793 } else {
1599 glColor @{$self->{bg}}; 1794 glColor_premultiply @{$self->{bg}};
1600 } 1795 }
1601 1796
1602 glEnable GL_BLEND; 1797 glEnable GL_BLEND;
1603 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1798 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1604 glBegin GL_QUADS; 1799 glBegin GL_QUADS;
1605 glVertex 0 , 0; 1800 glVertex 0 , 0;
1606 glVertex 0 , $self->{h}; 1801 glVertex 0 , $self->{h};
1607 glVertex $self->{w}, $self->{h}; 1802 glVertex $self->{w}, $self->{h};
1608 glVertex $self->{w}, 0; 1803 glVertex $self->{w}, 0;
… …
1643 if ($sym == 13) { 1838 if ($sym == 13) {
1644 unshift @{$self->{history}}, 1839 unshift @{$self->{history}},
1645 my $txt = $self->get_text; 1840 my $txt = $self->get_text;
1646 $self->{history_pointer} = -1; 1841 $self->{history_pointer} = -1;
1647 $self->{history_saveback} = ''; 1842 $self->{history_saveback} = '';
1648 $self->emit (activate => $txt); 1843 $self->_emit (activate => $txt);
1649 $self->update; 1844 $self->update;
1650 1845
1651 } elsif ($sym == CFClient::SDLK_UP) { 1846 } elsif ($sym == CFClient::SDLK_UP) {
1652 if ($self->{history_pointer} < 0) { 1847 if ($self->{history_pointer} < 0) {
1653 $self->{history_saveback} = $self->get_text; 1848 $self->{history_saveback} = $self->get_text;
… …
1669 } else { 1864 } else {
1670 $self->set_text ($self->{history_saveback}); 1865 $self->set_text ($self->{history_saveback});
1671 } 1866 }
1672 1867
1673 } else { 1868 } else {
1674 $self->SUPER::key_down ($ev); 1869 return $self->SUPER::key_down ($ev)
1870 }
1871
1675 } 1872 1
1676
1677} 1873}
1678 1874
1679############################################################################# 1875#############################################################################
1680 1876
1681package CFClient::UI::Button; 1877package CFClient::UI::Button;
… …
1690 1886
1691sub new { 1887sub new {
1692 my $class = shift; 1888 my $class = shift;
1693 1889
1694 $class->SUPER::new ( 1890 $class->SUPER::new (
1695 padding => 4, 1891 padding_x => 4,
1892 padding_y => 4,
1696 fg => [1, 1, 1], 1893 fg => [1, 1, 1],
1697 active_fg => [0, 0, 1], 1894 active_fg => [0, 0, 1],
1698 can_hover => 1, 1895 can_hover => 1,
1699 align => 0, 1896 align => 0,
1700 valign => 0, 1897 valign => 0,
1701 can_events => 1, 1898 can_events => 1,
1702 @_ 1899 @_
1703 ) 1900 )
1704} 1901}
1705 1902
1903sub activate { }
1904
1706sub button_up { 1905sub button_up {
1707 my ($self, $ev, $x, $y) = @_; 1906 my ($self, $ev, $x, $y) = @_;
1708 1907
1908 $self->emit ("activate")
1709 if ($x >= 0 && $x < $self->{w} 1909 if $x >= 0 && $x < $self->{w}
1710 && $y >= 0 && $y < $self->{h}) { 1910 && $y >= 0 && $y < $self->{h};
1711 $self->emit ("activate"); 1911
1712 } 1912 1
1713} 1913}
1714 1914
1715sub _draw { 1915sub _draw {
1716 my ($self) = @_; 1916 my ($self) = @_;
1717 1917
… …
1746 1946
1747sub new { 1947sub new {
1748 my $class = shift; 1948 my $class = shift;
1749 1949
1750 $class->SUPER::new ( 1950 $class->SUPER::new (
1751 padding => 2, 1951 padding_x => 2,
1952 padding_y => 2,
1752 fg => [1, 1, 1], 1953 fg => [1, 1, 1],
1753 active_fg => [1, 1, 0], 1954 active_fg => [1, 1, 0],
1754 bg => [0, 0, 0, 0.2], 1955 bg => [0, 0, 0, 0.2],
1755 active_bg => [1, 1, 1, 0.5], 1956 active_bg => [1, 1, 1, 0.5],
1756 state => 0, 1957 state => 0,
… …
1760} 1961}
1761 1962
1762sub size_request { 1963sub size_request {
1763 my ($self) = @_; 1964 my ($self) = @_;
1764 1965
1765 ($self->{padding} * 2 + 6) x 2 1966 (6) x 2
1766} 1967}
1767 1968
1768sub button_down { 1969sub button_down {
1769 my ($self, $ev, $x, $y) = @_; 1970 my ($self, $ev, $x, $y) = @_;
1770 1971
1771 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1972 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1772 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1973 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1773 $self->{state} = !$self->{state}; 1974 $self->{state} = !$self->{state};
1774 $self->emit (changed => $self->{state}); 1975 $self->_emit (changed => $self->{state});
1976 } else {
1977 return 0
1978 }
1979
1775 } 1980 1
1776} 1981}
1777 1982
1778sub _draw { 1983sub _draw {
1779 my ($self) = @_; 1984 my ($self) = @_;
1780 1985
1781 $self->SUPER::_draw; 1986 $self->SUPER::_draw;
1782 1987
1783 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1988 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1784 1989
1785 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;
1786 1993
1787 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1994 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1788 1995
1789 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1996 my $tex = $self->{state} ? $tex[1] : $tex[0];
1790 1997
… …
1945 2152
1946 my $h1 = $self->{h} * (1 - $ycut1); 2153 my $h1 = $self->{h} * (1 - $ycut1);
1947 my $h2 = $self->{h} * (1 - $ycut2); 2154 my $h2 = $self->{h} * (1 - $ycut2);
1948 2155
1949 glEnable GL_BLEND; 2156 glEnable GL_BLEND;
1950 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;
1951 glEnable GL_TEXTURE_2D; 2159 glEnable GL_TEXTURE_2D;
1952 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2160 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1953 2161
1954 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2162 glBindTexture GL_TEXTURE_2D, $t1->{name};
1955 glBegin GL_QUADS; 2163 glBegin GL_QUADS;
… …
2054 my $self = $class->SUPER::new ( 2262 my $self = $class->SUPER::new (
2055 fg => [1, 1, 1], 2263 fg => [1, 1, 1],
2056 active_fg => [0, 0, 0], 2264 active_fg => [0, 0, 0],
2057 bg => [0, 0, 0, 0.2], 2265 bg => [0, 0, 0, 0.2],
2058 active_bg => [1, 1, 1, 0.5], 2266 active_bg => [1, 1, 1, 0.5],
2059 range => [0, 0, 100, 10], 2267 range => [0, 0, 100, 10, 0],
2060 req_w => $::WIDTH / 80, 2268 min_w => $::WIDTH / 80,
2061 req_h => $::WIDTH / 80, 2269 min_h => $::WIDTH / 80,
2062 vertical => 0, 2270 vertical => 0,
2063 can_hover => 1, 2271 can_hover => 1,
2064 inner_pad => 0.02, 2272 inner_pad => 0.02,
2065 @_ 2273 @_
2066 ); 2274 );
… …
2069 $self->update; 2277 $self->update;
2070 2278
2071 $self 2279 $self
2072} 2280}
2073 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
2074sub set_value { 2293sub set_value {
2075 my ($self, $value) = @_; 2294 my ($self, $value) = @_;
2076 2295
2077 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2296 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2078 2297
2079 $hi = $lo + 1 if $hi <= $lo; 2298 $hi = $lo + 1 if $hi <= $lo;
2080 2299
2300 $page = $hi - $lo if $page > $hi - $lo;
2301
2081 $value = $lo if $value < $lo; 2302 $value = $lo if $value < $lo;
2082 $value = $hi if $value > $hi; 2303 $value = $hi - $page if $value > $hi - $page;
2083 2304
2084 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2305 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2085 if $unit; 2306 if $unit;
2086 2307
2087 $page = $hi - $lo if $page > $hi - $lo;
2088
2089 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2308 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2090 2309
2091 if ($value != $old_value) { 2310 if ($value != $old_value) {
2092 $self->emit (changed => $value); 2311 $self->_emit (changed => $value);
2093 $self->update; 2312 $self->update;
2094 } 2313 }
2095} 2314}
2096 2315
2097sub size_request { 2316sub size_request {
2098 my ($self) = @_; 2317 my ($self) = @_;
2099 2318
2100 my $w = $self->{req_w}; 2319 ($self->{req_w}, $self->{req_h})
2101 my $h = $self->{req_h};
2102
2103 $self->{vertical} ? ($h, $w) : ($w, $h)
2104} 2320}
2105 2321
2106sub button_down { 2322sub button_down {
2107 my ($self, $ev, $x, $y) = @_; 2323 my ($self, $ev, $x, $y) = @_;
2108 2324
2109 $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
2110 $self->mouse_motion ($ev, $x, $y); 2329 $self->mouse_motion ($ev, $x, $y)
2111} 2330}
2112 2331
2113sub mouse_motion { 2332sub mouse_motion {
2114 my ($self, $ev, $x, $y) = @_; 2333 my ($self, $ev, $x, $y) = @_;
2115 2334
2116 if ($GRAB == $self) { 2335 if ($GRAB == $self) {
2117 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2336 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2118 2337
2119 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2338 my (undef, $lo, $hi, $page) = @{$self->{range}};
2120 2339
2121 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2340 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2122 2341
2123 $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
2124 } 2347 1
2125} 2348}
2126 2349
2127sub update { 2350sub update {
2128 my ($self) = @_; 2351 my ($self) = @_;
2129 2352
2130 $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}) {
2131 $self->set_value ($self->{range}[0]); 2361 $self->set_value ($self->{range}[0]);
2132 2362
2133 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2363 my ($value, $lo, $hi, $page) = @{$self->{range}};
2364 my $range = ($hi - $page - $lo) || 1e-100;
2134 2365
2135 my $inner_w = 1 - 2 * $self->{inner_pad}; 2366 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2136 2367
2137 $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;
2138 2370
2139 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2371 $value = ($value - $lo) / $range;
2140 $value = $self->{scale} * ($value - $lo); 2372 $value = $value * $self->{scale} + $self->{offset};
2141 2373
2142 $value = $self->{inner_pad} + ($value - $page * 0.5);
2143
2144 $value = 0 if $value < 0;
2145 $page = 1 - $value if $value + $page > 1;
2146
2147 $self->{knob_x} = $value; 2374 $self->{knob_x} = $value - $knob_w * 0.5;
2148 $self->{knob_w} = $page; 2375 $self->{knob_w} = $knob_w;
2149 }); 2376 }
2150
2151 $self->SUPER::update;
2152}
2153
2154sub _draw {
2155 my ($self) = @_;
2156 2377
2157 $self->SUPER::_draw (); 2378 $self->SUPER::_draw ();
2158 2379
2159 glScale $self->{w}, $self->{h}; 2380 glScale $self->{w}, $self->{h};
2160 2381
… …
2177 # draw handle 2398 # draw handle
2178 $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);
2179 2400
2180 glDisable GL_TEXTURE_2D; 2401 glDisable GL_TEXTURE_2D;
2181} 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 (@_) }
2182 2444
2183############################################################################# 2445#############################################################################
2184 2446
2185package CFClient::UI::TextView; 2447package CFClient::UI::TextView;
2186 2448
… …
2228 $self->{layout}->set_width ($self->{children}[0]{w}); 2490 $self->{layout}->set_width ($self->{children}[0]{w});
2229 2491
2230 $self->reflow; 2492 $self->reflow;
2231} 2493}
2232 2494
2233sub text_height { 2495sub text_size {
2234 my ($self, $text, $indent) = @_; 2496 my ($self, $text, $indent) = @_;
2235 2497
2236 my $layout = $self->{layout}; 2498 my $layout = $self->{layout};
2237 2499
2238 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2500 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2239 $layout->set_width ($self->{children}[0]{w} - $indent); 2501 $layout->set_width ($self->{children}[0]{w} - $indent);
2240 $layout->set_markup ($text); 2502 $layout->set_markup ($text);
2241 2503
2242 ($layout->size)[1] 2504 $layout->size
2243} 2505}
2244 2506
2245sub reflow { 2507sub reflow {
2246 my ($self) = @_; 2508 my ($self) = @_;
2247 2509
2248 $self->{need_reflow}++; 2510 $self->{need_reflow}++;
2249 $self->update; 2511 $self->update;
2250} 2512}
2251 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
2252sub add_paragraph { 2529sub add_paragraph {
2253 my ($self, $color, $text, $indent) = @_; 2530 my ($self, $color, $text, $indent) = @_;
2254 2531
2255 #TODO: intelligently "reformat" paragraph
2256
2257 for my $line (split /\n/, $text) { 2532 for my $line (split /\n/, $text) {
2258 my $height = $self->text_height ($line); 2533 my ($w, $h) = $self->text_size ($line);
2259 $self->{height} += $height; 2534 $self->{height} += $h;
2260 push @{$self->{par}}, [$height, $color, $indent, $line]; 2535 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2261 } 2536 }
2262 2537
2263 $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]);
2264 $self->{children}[1]->update;
2265} 2539}
2266 2540
2267sub update { 2541sub update {
2268 my ($self) = @_; 2542 my ($self) = @_;
2269 2543
… …
2272 return unless $self->{h} > 0; 2546 return unless $self->{h} > 0;
2273 2547
2274 delete $self->{texture}; 2548 delete $self->{texture};
2275 2549
2276 $ROOT->on_post_alloc ($self, sub { 2550 $ROOT->on_post_alloc ($self, sub {
2551 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2552
2277 if (delete $self->{need_reflow}) { 2553 if (delete $self->{need_reflow}) {
2278 my $height = 0; 2554 my $height = 0;
2279 2555
2280 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2556 my $layout = $self->{layout};
2557
2558 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2559
2281 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 }
2282 2571
2283 $self->{height} = $height; 2572 $self->{height} = $height;
2284 2573
2285 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2574 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2286 $self->{children}[1]->update;
2287 2575
2288 delete $self->{texture}; 2576 delete $self->{texture};
2289 } 2577 }
2290 2578
2291 $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 {
2292 glClearColor 0.5, 0.5, 0.5, 0; 2580 glClearColor 0.5, 0.5, 0.5, 0;
2293 glClear GL_COLOR_BUFFER_BIT; 2581 glClear GL_COLOR_BUFFER_BIT;
2294 2582
2295 my $top = int $self->{children}[1]{range}[0]; 2583 my $top = int $self->{children}[1]{range}[0];
2296 2584
2297 my $y0 = $top; 2585 my $y0 = $top;
2298 my $y1 = $top + $self->{h}; 2586 my $y1 = $top + $H;
2299 2587
2300 my $y = 0; 2588 my $y = 0;
2301 2589
2302 my $layout = $self->{layout}; 2590 my $layout = $self->{layout};
2303 2591
2304 $layout->set_font ($self->{font}) if $self->{font}; 2592 $layout->set_font ($self->{font}) if $self->{font};
2305 2593
2306 glEnable GL_BLEND; 2594 glEnable GL_BLEND;
2595 #TODO# not correct in windows where rgba is forced off
2307 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2596 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2308 2597
2309 for my $par (@{$self->{par}}) { 2598 for my $par (@{$self->{par}}) {
2310 my $h = $par->[0]; 2599 my $h = $par->[1];
2311 2600
2312 if ($y0 < $y + $h && $y < $y1) { 2601 if ($y0 < $y + $h && $y < $y1) {
2313 $layout->set_foreground (@{ $par->[1] }); 2602 $layout->set_foreground (@{ $par->[2] });
2314 $layout->set_width ($self->{w} - $par->[2]); 2603 $layout->set_width ($W - $par->[3]);
2315 $layout->set_markup ($par->[3]); 2604 $layout->set_markup ($par->[4]);
2316 2605
2317 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2606 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2318 2607
2319 glRasterPos $par->[2], $y - $y0; 2608 glRasterPos $par->[3], $y - $y0;
2320 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2609 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2321 } 2610 }
2322 2611
2323 $y += $h; 2612 $y += $h;
2324 } 2613 }
… …
2391 2680
2392sub new { 2681sub new {
2393 my $class = shift; 2682 my $class = shift;
2394 2683
2395 my $self = $class->SUPER::new ( 2684 my $self = $class->SUPER::new (
2396 state => 0, 2685 state => 0,
2397 connect_activate => \&toggle_flopper, 2686 on_activate => \&toggle_flopper,
2398 @_ 2687 @_
2399 ); 2688 );
2400 2689
2401 if ($self->{state}) {
2402 $self->{state} = 0;
2403 $self->toggle_flopper;
2404 }
2405
2406 $self 2690 $self
2407} 2691}
2408 2692
2409sub toggle_flopper { 2693sub toggle_flopper {
2410 my ($self) = @_; 2694 my ($self) = @_;
2411 2695
2412 # TODO: use animation 2696 $self->{other}->toggle_visibility;
2413 if ($self->{state} = !$self->{state}) {
2414 $CFClient::UI::ROOT->add ($self->{other});
2415 $self->{other}->move ($self->coord2global (0, $self->{h}));
2416 $self->emit ("open");
2417 } else {
2418 $CFClient::UI::ROOT->remove ($self->{other});
2419 $self->emit ("close");
2420 }
2421
2422 $self->emit (changed => $self->{state});
2423} 2697}
2424 2698
2425############################################################################# 2699#############################################################################
2426 2700
2427package CFClient::UI::Tooltip; 2701package CFClient::UI::Tooltip;
… …
2440} 2714}
2441 2715
2442sub set_tooltip_from { 2716sub set_tooltip_from {
2443 my ($self, $widget) = @_; 2717 my ($self, $widget) = @_;
2444 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
2445 $self->add (new CFClient::UI::Label 2728 $self->add (new CFClient::UI::Label
2446 markup => $widget->{tooltip}, 2729 markup => $tooltip,
2447 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2730 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2448 fontsize => 0.8, 2731 fontsize => 0.8,
2449 fg => [0, 0, 0, 1], 2732 fg => [0, 0, 0, 1],
2450 ellipsise => 0, 2733 ellipsise => 0,
2451 font => ($widget->{tooltip_font} || $::FONT_PROP), 2734 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2462 2745
2463sub size_allocate { 2746sub size_allocate {
2464 my ($self, $w, $h) = @_; 2747 my ($self, $w, $h) = @_;
2465 2748
2466 $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 });
2467} 2768}
2468 2769
2469sub _draw { 2770sub _draw {
2470 my ($self) = @_; 2771 my ($self) = @_;
2471 2772
… …
2488 glVertex $w, $h; 2789 glVertex $w, $h;
2489 glVertex $w, 0; 2790 glVertex $w, 0;
2490 glEnd; 2791 glEnd;
2491 2792
2492 glTranslate 2 - 0.375, 2 - 0.375; 2793 glTranslate 2 - 0.375, 2 - 0.375;
2794
2493 $self->SUPER::_draw; 2795 $self->SUPER::_draw;
2494} 2796}
2495 2797
2496############################################################################# 2798#############################################################################
2497 2799
… …
2503 2805
2504sub new { 2806sub new {
2505 my $class = shift; 2807 my $class = shift;
2506 2808
2507 my $self = $class->SUPER::new ( 2809 my $self = $class->SUPER::new (
2508 aspect => 1, 2810 aspect => 1,
2811 can_events => 0,
2509 @_, 2812 @_,
2510 ); 2813 );
2511 2814
2512 if ($self->{anim} && $self->{animspeed}) { 2815 if ($self->{anim} && $self->{animspeed}) {
2513 Scalar::Util::weaken (my $widget = $self); 2816 Scalar::Util::weaken (my $widget = $self);
… …
2539} 2842}
2540 2843
2541sub _draw { 2844sub _draw {
2542 my ($self) = @_; 2845 my ($self) = @_;
2543 2846
2544 return unless $::CONN;#d# manage and cache textures differently 2847 return unless $::CONN;
2545 2848
2546 my $face; 2849 my $face;
2547 2850
2548 if ($self->{frame}) { 2851 if ($self->{frame}) {
2549 my $anim = $::CONN->{anim}[$self->{anim}]; 2852 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2572 $self->SUPER::DESTROY; 2875 $self->SUPER::DESTROY;
2573} 2876}
2574 2877
2575############################################################################# 2878#############################################################################
2576 2879
2577package CFClient::UI::InventoryItem; 2880package CFClient::UI::Buttonbar;
2578 2881
2579our @ISA = CFClient::UI::HBox::; 2882our @ISA = CFClient::UI::HBox::;
2580 2883
2581sub _item_to_desc { 2884# TODO: should actualyl wrap buttons and other goodies.
2582 my ($item) = @_;
2583
2584 my $desc =
2585 $item->{nrof} < 2
2586 ? $item->{name}
2587 : "$item->{nrof} × $item->{name_pl}";
2588
2589 $item->{flags} & Crossfire::Protocol::F_OPEN
2590 and $desc .= " (open)";
2591 $item->{flags} & Crossfire::Protocol::F_APPLIED
2592 and $desc .= " (applied)";
2593 $item->{flags} & Crossfire::Protocol::F_UNPAID
2594 and $desc .= " (unpaid)";
2595 $item->{flags} & Crossfire::Protocol::F_MAGIC
2596 and $desc .= " (magic)";
2597 $item->{flags} & Crossfire::Protocol::F_CURSED
2598 and $desc .= " (cursed)";
2599 $item->{flags} & Crossfire::Protocol::F_DAMNED
2600 and $desc .= " (damned)";
2601 $item->{flags} & Crossfire::Protocol::F_LOCKED
2602 and $desc .= " *";
2603
2604 $desc
2605}
2606
2607sub new {
2608 my $class = shift;
2609
2610 my %args = @_;
2611
2612 my $item = delete $args{item};
2613
2614 my $desc = _item_to_desc ($item);
2615
2616 my $self = $class->SUPER::new (
2617 can_hover => 1,
2618 can_events => 1,
2619 tooltip => ((CFClient::UI::Label::escape $desc)
2620 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2621 connect_button_down => sub {
2622 my ($self, $ev, $x, $y) = @_;
2623
2624 # todo: maybe put examine on 1? but should just be a tooltip :(
2625 if ($ev->{button} == 1) {
2626 my $targ = $::CONN->{player}{tag};
2627
2628 if ($item->{container} == $::CONN->{player}{tag}) {
2629 $targ = $main::OPENCONT;
2630 }
2631
2632 $::CONN->send ("move $targ $item->{tag} 0");
2633 } elsif ($ev->{button} == 2) {
2634 $::CONN->send ("apply $item->{tag}");
2635 } elsif ($ev->{button} == 3) {
2636 my @menu_items = (
2637 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2638 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2639 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2640 (
2641 $item->{flags} & Crossfire::Protocol::F_LOCKED
2642 ? (
2643 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2644 )
2645 : (
2646 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2647 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2648 )
2649 ),
2650 );
2651
2652 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2653 }
2654
2655 1
2656 },
2657 %args
2658 );
2659
2660
2661 $self->add (new CFClient::UI::Face
2662 can_events => 0,
2663 face => $item->{face},
2664 anim => $item->{anim},
2665 animspeed => $item->{animspeed},
2666 );
2667
2668 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2669
2670 $self->{item} = $item;
2671
2672 $self->update_item;
2673
2674 $self
2675}
2676
2677sub update_item {
2678 my ($self) = @_;
2679
2680 my $desc = _item_to_desc ($self->{item});
2681
2682 $self->{name_lbl}->set_text ($desc);
2683}
2684
2685#############################################################################
2686
2687package CFClient::UI::Inventory;
2688
2689our @ISA = CFClient::UI::ScrolledWindow::;
2690
2691sub new {
2692 my $class = shift;
2693
2694 my $self = $class->SUPER::new (
2695 scrolled => (new CFClient::UI::VBox),
2696 @_,
2697 );
2698
2699 $self
2700}
2701
2702sub set_items {
2703 my ($self, $items) = @_;
2704
2705 $self->{scrolled}->clear;
2706 return unless $items;
2707
2708 my @items = sort {
2709 ($a->{type} <=> $b->{type})
2710 or ($a->{name} cmp $b->{name})
2711 } @$items;
2712
2713 $self->{real_items} = \@items;
2714
2715 for my $item (@items) {
2716 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2717 $item->update_item ();
2718 }
2719
2720 $self->{scrolled}->add (@items);
2721
2722# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2723}
2724
2725sub size_request {
2726 my ($self) = @_;
2727 ($self->{req_w}, $self->{req_h});
2728}
2729 2885
2730############################################################################# 2886#############################################################################
2731 2887
2732package CFClient::UI::Menu; 2888package CFClient::UI::Menu;
2733 2889
… …
2767 2923
2768# 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)
2769sub popup { 2925sub popup {
2770 my ($self, $ev) = @_; 2926 my ($self, $ev) = @_;
2771 2927
2772 $self->emit ("popdown"); 2928 $self->_emit ("popdown");
2773 2929
2774 # maybe save $GRAB? must be careful about events... 2930 # maybe save $GRAB? must be careful about events...
2775 $GRAB = $self; 2931 $GRAB = $self;
2776 $self->{button} = $ev->{button}; 2932 $self->{button} = $ev->{button};
2777 2933
2778 $self->show; 2934 $self->show;
2779 $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);
2780} 2936}
2781 2937
2782sub mouse_motion { 2938sub mouse_motion {
2783 my ($self, $ev, $x, $y) = @_; 2939 my ($self, $ev, $x, $y) = @_;
2784 2940
2785 # TODO: should use vbox->find_widget or so 2941 # TODO: should use vbox->find_widget or so
2786 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2942 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2787 $self->{hover} = $self->{item}{$HOVER}; 2943 $self->{hover} = $self->{item}{$HOVER};
2944
2945 0
2788} 2946}
2789 2947
2790sub button_up { 2948sub button_up {
2791 my ($self, $ev, $x, $y) = @_; 2949 my ($self, $ev, $x, $y) = @_;
2792 2950
2793 if ($ev->{button} == $self->{button}) { 2951 if ($ev->{button} == $self->{button}) {
2794 undef $GRAB; 2952 undef $GRAB;
2795 $self->hide; 2953 $self->hide;
2796 2954
2797 $self->emit ("popdown"); 2955 $self->_emit ("popdown");
2798 $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 );
2799 } 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});
2800} 3070}
2801 3071
2802############################################################################# 3072#############################################################################
2803 3073
2804package CFClient::UI::Statusbox; 3074package CFClient::UI::Statusbox;
… …
2864sub add { 3134sub add {
2865 my ($self, $text, %arg) = @_; 3135 my ($self, $text, %arg) = @_;
2866 3136
2867 $text =~ s/^\s+//; 3137 $text =~ s/^\s+//;
2868 $text =~ s/\s+$//; 3138 $text =~ s/\s+$//;
3139
3140 return unless $text;
2869 3141
2870 my $timeout = time + ((delete $arg{timeout}) || 60); 3142 my $timeout = time + ((delete $arg{timeout}) || 60);
2871 3143
2872 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3144 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2873 3145
… …
2907 $self->SUPER::reconfigure; 3179 $self->SUPER::reconfigure;
2908} 3180}
2909 3181
2910############################################################################# 3182#############################################################################
2911 3183
2912package CFClient::UI::Root; 3184package CFClient::UI::Inventory;
2913 3185
2914our @ISA = CFClient::UI::Container::; 3186our @ISA = CFClient::UI::ScrolledWindow::;
2915
2916use CFClient::OpenGL;
2917 3187
2918sub new { 3188sub new {
2919 my $class = shift; 3189 my $class = shift;
2920 3190
2921 $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 => [],
2922 @_, 3433 @_,
2923 ) 3434 )
2924} 3435}
2925 3436
2926sub configure { 3437# XXX: Do sorting? Argl...
2927 my ($self, $x, $y, $w, $h) = @_; 3438sub add_spell {
2928
2929 $self->{w} = $w;
2930 $self->{h} = $h;
2931}
2932
2933sub check_size {
2934 my ($self) = @_; 3439 my ($self, $spell) = @_;
3440 $self->{spells}->{$spell->{name}} = $spell;
2935 3441
2936 $self->size_allocate ($self->{w}, $self->{h}) 3442 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2937 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
2938} 3496}
2939 3497
2940sub size_request { 3498sub size_request {
2941 my ($self) = @_; 3499 my ($self) = @_;
2942 3500
2943 ($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
2944} 3516}
2945 3517
2946sub size_allocate { 3518sub size_allocate {
2947 my ($self, $w, $h) = @_; 3519 my ($self, $w, $h) = @_;
2948 3520
2949 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2950 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2951
2952 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2953 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2954
2955 for my $child ($self->children) { 3521 for my $child ($self->children) {
2956 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)};
2957 3523
2958 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3524 $X = $child->{force_x} if exists $child->{force_x};
2959 if exists $child->{req_x}; 3525 $Y = $child->{force_y} if exists $child->{force_y};
2960 3526
2961 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3527 $X = _to_pixel $X, $W, $self->{w};
2962 if exists $child->{req_y}; 3528 $Y = _to_pixel $Y, $H, $self->{h};
2963
2964 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2965 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2966 3529
2967 $child->configure ($X, $Y, $W, $H); 3530 $child->configure ($X, $Y, $W, $H);
2968 } 3531 }
2969} 3532}
2970 3533
… …
2981} 3544}
2982 3545
2983sub update { 3546sub update {
2984 my ($self) = @_; 3547 my ($self) = @_;
2985 3548
2986 $self->check_size;
2987 $::WANT_REFRESH++; 3549 $::WANT_REFRESH++;
2988} 3550}
2989 3551
2990sub add { 3552sub add {
2991 my ($self, @children) = @_; 3553 my ($self, @children) = @_;
2992 3554
2993 for my $child (@children) {
2994 $child->{toplevel} = 1; 3555 $_->{is_toplevel} = 1
2995 3556 for @children;
2996 # integerise window positions
2997 $child->{x} = int $child->{x};
2998 $child->{y} = int $child->{y};
2999 }
3000 3557
3001 $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;
3002 3568
3003 while (@children) { 3569 while (@children) {
3004 my $w = pop @children; 3570 my $w = pop @children;
3005 push @children, $w->children; 3571 push @children, $w->children;
3006 $w->{visible} = 1; 3572 $w->set_invisible;
3007 }
3008}
3009
3010sub remove {
3011 my ($self, @children) = @_;
3012
3013 $self->SUPER::remove (@children);
3014
3015 while (@children) {
3016 my $w = pop @children;
3017 push @children, $w->children;
3018 delete $w->{visible};
3019 } 3573 }
3020} 3574}
3021 3575
3022sub on_refresh { 3576sub on_refresh {
3023 my ($self, $id, $cb) = @_; 3577 my ($self, $id, $cb) = @_;
… …
3037 while ($self->{refresh_hook}) { 3591 while ($self->{refresh_hook}) {
3038 $_->() 3592 $_->()
3039 for values %{delete $self->{refresh_hook}}; 3593 for values %{delete $self->{refresh_hook}};
3040 } 3594 }
3041 3595
3042 if ($self->{check_size}) { 3596 if ($self->{realloc}) {
3043 my @queue = ([], []); 3597 my %queue;
3598 my @queue;
3599 my $widget;
3044 3600
3045 for (;;) { 3601 outer:
3046 if ($self->{check_size}) { 3602 while () {
3047 # heuristic: check containers last 3603 if (my $realloc = delete $self->{realloc}) {
3048 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3604 for $widget (values %$realloc) {
3049 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 }
3050 } 3611 }
3051 3612
3052 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3613 while () {
3614 @queue or last outer;
3053 3615
3054 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3616 $widget = pop @{ $queue[-1] || [] }
3055 ? @$widget{qw(user_w user_h)} 3617 and last;
3056 : $widget->size_request;
3057
3058 if (delete $widget->{force_alloc}
3059 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3060 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3061 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}) {
3062 $widget->{req_w} = $w; 3634 $widget->{req_w} = $w;
3063 $widget->{req_h} = $h; 3635 $widget->{req_h} = $h;
3064 3636
3065 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3637 $self->{size_alloc}{$widget+0} = $widget;
3066 3638
3067 $widget->{parent}->check_size
3068 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 }
3069 } 3646 }
3647
3648 delete $self->{realloc}{$widget+0};
3070 } 3649 }
3071 } 3650 }
3072 3651
3073 while ($self->{size_alloc}) { 3652 while (my $size_alloc = delete $self->{size_alloc}) {
3074 for (values %{delete $self->{size_alloc}}) { 3653 my @queue = sort { $b->{visible} <=> $a->{visible} }
3075 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)};
3076 3660
3077 $w = 0 if $w < 0; 3661 $w = 0 if $w < 0;
3078 $h = 0 if $h < 0; 3662 $h = 0 if $h < 0;
3079 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
3080 $widget->{w} = $w; 3671 $widget->{w} = $w;
3081 $widget->{h} = $h; 3672 $widget->{h} = $h;
3082 $widget->size_allocate ($w, $h); 3673
3083 $widget->emit (size_allocate => $w, $h); 3674 $widget->emit (size_allocate => $w, $h);
3675 }
3084 } 3676 }
3085 } 3677 }
3086 3678
3087 while ($self->{post_alloc_hook}) { 3679 while ($self->{post_alloc_hook}) {
3088 $_->() 3680 $_->()
3089 for values %{delete $self->{post_alloc_hook}}; 3681 for values %{delete $self->{post_alloc_hook}};
3090 } 3682 }
3683
3091 3684
3092 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3685 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3093 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3686 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3094 glClear GL_COLOR_BUFFER_BIT; 3687 glClear GL_COLOR_BUFFER_BIT;
3095 3688
… …
3097 glLoadIdentity; 3690 glLoadIdentity;
3098 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3691 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3099 glMatrixMode GL_MODELVIEW; 3692 glMatrixMode GL_MODELVIEW;
3100 glLoadIdentity; 3693 glLoadIdentity;
3101 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
3102 $self->_draw; 3702 $self->_draw;
3103} 3703}
3104 3704
3105############################################################################# 3705#############################################################################
3106 3706

Diff Legend

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