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.218 by root, Sat May 20 15:37:27 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) = @_;
… …
136 $rem += $_ - $i; 149 $rem += $_ - $i;
137 $_ = $i; 150 $_ = $i;
138 } 151 }
139} 152}
140 153
154sub full_refresh {
155 # make a copy, otherwise for complains about freed values.
156 my @widgets = values %WIDGET;
157
158 $_->update
159 for @widgets;
160}
161
162sub reconfigure_widgets {
163 # make a copy, otherwise C<for> complains about freed values.
164 my @widgets = values %WIDGET;
165
166 $_->reconfigure
167 for @widgets;
168}
169
141# call when resolution changes etc. 170# call when resolution changes etc.
142sub rescale_widgets { 171sub rescale_widgets {
143 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
144 173
145 # make a copy, otherwise for complains about freed values.
146 my @widgets = values %WIDGET; 174 for my $widget (values %WIDGET) {
147
148 for my $widget (@widgets) {
149 if ($widget->{toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
150 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
151 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
152 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
153 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
154 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
155 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
156 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
157 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
158 } 189 }
159
160 $widget->reconfigure;
161 } 190 }
191
192 reconfigure_widgets;
162} 193}
163 194
164############################################################################# 195#############################################################################
165 196
166package CFClient::UI::Base; 197package CFClient::UI::Base;
… …
171 202
172sub new { 203sub new {
173 my $class = shift; 204 my $class = shift;
174 205
175 my $self = bless { 206 my $self = bless {
176 x => 0, 207 x => "center",
177 y => 0, 208 y => "center",
178 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
179 can_events => 1, 212 can_events => 1,
180 @_ 213 @_
181 }, $class; 214 }, $class;
182 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
183 for (keys %$self) { 218 for (keys %$self) {
184 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
185 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
186 } 221 }
187 } 222 }
188 223
189 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
190 235
191 $self 236 $self
192} 237}
193 238
194sub destroy { 239sub destroy {
… …
204 return if $self->{parent}; 249 return if $self->{parent};
205 250
206 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
207} 252}
208 253
209sub hide { 254sub set_visible {
210 my ($self) = @_; 255 my ($self) = @_;
256
257 return if $self->{visible};
258
259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
261
262 $self->emit (visibility_change => 1);
263
264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
267}
268
269sub set_invisible {
270 my ($self) = @_;
271
272 return unless $self->{visible};
273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
277 delete $self->{visible};
211 278
212 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
213 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
214 281
282 CFClient::UI::check_tooltip
283 if $TOOLTIP->{owner} == $self;
284
285 $self->focus_out;
286
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
305}
306
307sub hide {
308 my ($self) = @_;
309
310 $self->set_invisible;
311
215 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
216 if $self->{parent}; 313 if $self->{parent};
217} 314}
218 315
219sub move { 316sub move_abs {
220 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
221 318
222 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
223 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
224 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
225 322
226 $self->update; 323 $self->update;
227} 324}
228 325
229sub set_size { 326sub set_size {
230 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
231 328
232 $self->{user_w} = $w; 329 $self->{force_w} = $w;
233 $self->{user_h} = $h; 330 $self->{force_h} = $h;
234 331
235 $self->check_size; 332 $self->realloc;
236} 333}
237 334
238sub size_request { 335sub size_request {
239 require Carp; 336 require Carp;
240 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
242 339
243sub configure { 340sub configure {
244 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
245 342
246 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
247 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
248 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
249 348
250 # use alignment to adjust x, y 349 # use alignment to adjust x, y
251 350
252 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
253 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
254
255 ($w, $h) = ($w2, $h2);
256 } 353 }
257 354
258 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
259 $self->{x} = $x; 356 $self->{x} = $x;
260 $self->{y} = $y; 357 $self->{y} = $y;
261 $self->update; 358 $self->update;
262 } 359 }
263 360
264 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
265 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
266 } 368 }
267} 369}
268 370
269sub size_allocate { 371sub size_allocate {
270 # nothing to be done 372 # nothing to be done
271} 373}
272 374
273sub reconfigure {
274 my ($self) = @_;
275
276 $self->check_size (1);
277 $self->update;
278}
279
280sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
281} 381}
282 382
283sub set_max_size { 383sub set_max_size {
284 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
285 385
… …
287 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
288} 388}
289 389
290sub set_tooltip { 390sub set_tooltip {
291 my ($self, $tooltip) = @_; 391 my ($self, $tooltip) = @_;
392
393 $tooltip =~ s/^\s+//;
394 $tooltip =~ s/\s+$//;
395
396 return if $self->{tooltip} eq $tooltip;
292 397
293 $self->{tooltip} = $tooltip; 398 $self->{tooltip} = $tooltip;
294 399
295 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 400 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296 delete $CFClient::UI::TOOLTIP->{owner}; 401 delete $CFClient::UI::TOOLTIP->{owner};
… …
318 return if $FOCUS == $self; 423 return if $FOCUS == $self;
319 return unless $self->{can_focus}; 424 return unless $self->{can_focus};
320 425
321 my $focus = $FOCUS; $FOCUS = $self; 426 my $focus = $FOCUS; $FOCUS = $self;
322 427
323 $self->emit (focus_in => $focus); 428 $self->_emit (focus_in => $focus);
324 429
325 $focus->update if $focus; 430 $focus->update if $focus;
326 $FOCUS->update; 431 $FOCUS->update;
327} 432}
328 433
… …
331 436
332 return unless $FOCUS == $self; 437 return unless $FOCUS == $self;
333 438
334 my $focus = $FOCUS; undef $FOCUS; 439 my $focus = $FOCUS; undef $FOCUS;
335 440
336 $self->emit (focus_out => $focus); 441 $self->_emit (focus_out => $focus);
337 442
338 $focus->update if $focus; #? 443 $focus->update if $focus; #?
339}
340 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447}
448
341sub mouse_motion { } 449sub mouse_motion { 0 }
342sub button_up { } 450sub button_up { 0 }
343sub key_down { } 451sub key_down { 0 }
344sub key_up { } 452sub key_up { 0 }
345 453
346sub button_down { 454sub button_down {
347 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
348 456
349 $self->focus_in; 457 $self->focus_in;
350}
351 458
352sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
353sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
354sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
355sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
356sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 463 my ($self, $x, $y) = @_;
464
465 return () unless $self->{can_events};
466
467 return $self
468 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
469 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
470
471 ()
472}
473
474sub set_parent {
475 my ($self, $parent) = @_;
476
477 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502}
503
504sub realloc {
505 my ($self) = @_;
506
507 if ($self->{visible}) {
508 return if $self->{root}{realloc}{$self+0};
509
510 $self->{root}{realloc}{$self+0} = $self;
511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
516}
517
518sub update {
519 my ($self) = @_;
520
521 $self->{parent}->update
522 if $self->{parent};
523}
524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
357 535
358sub draw { 536sub draw {
359 my ($self) = @_; 537 my ($self) = @_;
360 538
361 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
362 550
363 glPushMatrix; 551 glPushMatrix;
364 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
365 $self->_draw;
366 glPopMatrix;
367 553
368 if ($self == $HOVER && $self->{can_hover}) { 554 if ($self == $HOVER && $self->{can_hover}) {
369 my ($x, $y) = @$self{qw(x y)};
370
371 glColor 1, 0.8, 0.5, 0.2; 555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
372 glEnable GL_BLEND; 556 glEnable GL_BLEND;
373 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
374 glBegin GL_QUADS; 558 glBegin GL_QUADS;
375 glVertex $x , $y;
376 glVertex $x + $self->{w}, $y;
377 glVertex $x + $self->{w}, $y + $self->{h};
378 glVertex $x , $y + $self->{h};
379 glEnd;
380 glDisable GL_BLEND;
381 }
382
383 if ($ENV{PCLIENT_DEBUG}) {
384 glPushMatrix;
385 glColor 1, 1, 0, 1;
386 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
387 glBegin GL_LINE_LOOP;
388 glVertex 0 , 0; 559 glVertex 0 , 0;
389 glVertex $self->{w}, 0; 560 glVertex $self->{w}, 0;
390 glVertex $self->{w}, $self->{h}; 561 glVertex $self->{w}, $self->{h};
391 glVertex 0 , $self->{h}; 562 glVertex 0 , $self->{h};
392 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;
393 glPopMatrix; 577 glPopMatrix;
394 #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;
395 } 579 }
580
581 $self->_draw;
582 glPopMatrix;
396} 583}
397 584
398sub _draw { 585sub _draw {
399 my ($self) = @_; 586 my ($self) = @_;
400 587
401 warn "no draw defined for $self\n"; 588 warn "no draw defined for $self\n";
402}
403
404sub find_widget {
405 my ($self, $x, $y) = @_;
406
407 return () unless $self->{can_events};
408
409 return $self
410 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
411 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
412
413 ()
414}
415
416sub set_parent {
417 my ($self, $parent) = @_;
418
419 Scalar::Util::weaken ($self->{parent} = $parent);
420
421 # TODO: req_w _does_change after ->reconfigure
422 $self->check_size
423 unless exists $self->{req_w};
424}
425
426sub check_size {
427 my ($self, $forced) = @_;
428
429 $self->{force_alloc} = 1 if $forced;
430 $CFClient::UI::ROOT->{check_size}{$self} = $self;
431}
432
433sub update {
434 my ($self) = @_;
435
436 $self->{parent}->update
437 if $self->{parent};
438}
439
440sub connect {
441 my ($self, $signal, $cb) = @_;
442
443 push @{ $self->{signal_cb}{$signal} }, $cb;
444}
445
446sub emit {
447 my ($self, $signal, @args) = @_;
448
449 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
450} 589}
451 590
452sub DESTROY { 591sub DESTROY {
453 my ($self) = @_; 592 my ($self) = @_;
454 593
… …
486 625
487 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
488 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
489 628
490 glEnable GL_BLEND; 629 glEnable GL_BLEND;
491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
492 glColor @$color; 631 glColor_premultiply @$color;
493 632
494 glBegin GL_QUADS; 633 glBegin GL_QUADS;
495 glVertex 0 , 0; 634 glVertex 0 , 0;
496 glVertex 0 , $h; 635 glVertex 0 , $h;
497 glVertex $w, $h; 636 glVertex $w, $h;
… …
512 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
513 $class->SUPER::new (can_events => 0, %arg); 652 $class->SUPER::new (can_events => 0, %arg);
514} 653}
515 654
516sub size_request { 655sub size_request {
517 (0, 0) 656 my ($self) = @_;
657
658 ($self->{w} + 0, $self->{h} + 0)
518} 659}
519 660
520sub draw { } 661sub draw { }
521 662
522############################################################################# 663#############################################################################
… …
526our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
527 668
528sub new { 669sub new {
529 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
530 671
531 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
532 673
533 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
534 children => [], 675 children => [],
535 can_events => 0, 676 can_events => 0,
536 %arg, 677 %arg,
537 ); 678 );
679
538 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
539 682
540 $self 683 $self
541} 684}
542 685
543sub add { 686sub add {
… …
551 $self->{children} = [ 694 $self->{children} = [
552 sort { $a->{z} <=> $b->{z} } 695 sort { $a->{z} <=> $b->{z} }
553 @{$self->{children}}, @widgets 696 @{$self->{children}}, @widgets
554 ]; 697 ];
555 698
556 $self->check_size (1); 699 $self->realloc;
557 $self->update;
558} 700}
559 701
560sub children { 702sub children {
561 @{ $_[0]{children} } 703 @{ $_[0]{children} }
562} 704}
… …
567 delete $child->{parent}; 709 delete $child->{parent};
568 $child->hide; 710 $child->hide;
569 711
570 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
571 713
572 $self->check_size; 714 $self->realloc;
573 $self->update;
574} 715}
575 716
576sub clear { 717sub clear {
577 my ($self) = @_; 718 my ($self) = @_;
578 719
… …
582 for (@$children) { 723 for (@$children) {
583 delete $_->{parent}; 724 delete $_->{parent};
584 $_->hide; 725 $_->hide;
585 } 726 }
586 727
587 $self->check_size; 728 $self->realloc;
588 $self->update;
589} 729}
590 730
591sub find_widget { 731sub find_widget {
592 my ($self, $x, $y) = @_; 732 my ($self, $x, $y) = @_;
593 733
594 $x -= $self->{x}; 734 $x -= $self->{x};
595 $y -= $self->{y}; 735 $y -= $self->{y};
596 736
597 my $res; 737 my $res;
598 738
599 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
600 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
601 and return $res; 741 and return $res;
602 } 742 }
603 743
604 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
653 $self->{children}[0]->configure (0, 0, $w, $h); 793 $self->{children}[0]->configure (0, 0, $w, $h);
654} 794}
655 795
656############################################################################# 796#############################################################################
657 797
798# back-buffered drawing area
799
658package CFClient::UI::Window; 800package CFClient::UI::Window;
659 801
660our @ISA = CFClient::UI::Bin::; 802our @ISA = CFClient::UI::Bin::;
661 803
662use CFClient::OpenGL; 804use CFClient::OpenGL;
… …
680 $self->SUPER::size_allocate ($w, $h); 822 $self->SUPER::size_allocate ($w, $h);
681 $self->update; 823 $self->update;
682} 824}
683 825
684sub _render { 826sub _render {
827 my ($self) = @_;
828
685 $_[0]{children}[0]->draw; 829 $self->{children}[0]->draw;
686} 830}
687 831
688sub render_child { 832sub render_child {
689 my ($self) = @_; 833 my ($self) = @_;
690 834
691 $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 {
692 glClearColor 0, 0, 0, 0; 836 glClearColor 0, 0, 0, 0;
693 glClear GL_COLOR_BUFFER_BIT; 837 glClear GL_COLOR_BUFFER_BIT;
694 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
695 $self->_render; 846 $self->_render;
696 }; 847 };
697} 848}
698 849
699sub _draw { 850sub _draw {
700 my ($self) = @_; 851 my ($self) = @_;
701 852
702 my ($w, $h) = ($self->w, $self->h); 853 my ($w, $h) = @$self{qw(w h)};
703 854
704 my $tex = $self->{texture} 855 my $tex = $self->{texture}
705 or return; 856 or return;
706 857
707 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
708 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;
709 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
710 863
711 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad (0, 0, $w, $h);
712 865
866 glDisable GL_BLEND;
713 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
714} 868}
715 869
716############################################################################# 870#############################################################################
717 871
718package CFClient::UI::ViewPort; 872package CFClient::UI::ViewPort;
719 873
720our @ISA = CFClient::UI::Window::; 874our @ISA = CFClient::UI::Window::;
721 875
876sub new {
877 my $class = shift;
878
879 $class->SUPER::new (
880 scroll_x => 0,
881 scroll_y => 1,
882 @_,
883 )
884}
885
722sub size_request { 886sub size_request {
723 my ($self) = @_; 887 my ($self) = @_;
724 888
725 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 889 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
727 890
728 @$self{qw(child_w child_h)} 891 $w = 10 if $self->{scroll_x};
892 $h = 10 if $self->{scroll_y};
893
894 ($w, $h)
729} 895}
730 896
731sub size_allocate { 897sub size_allocate {
732 my ($self, $w, $h) = @_; 898 my ($self, $w, $h) = @_;
733 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);
734 $self->update; 906 $self->update;
735} 907}
736 908
737sub set_offset { 909sub set_offset {
738 my ($self, $x, $y) = @_; 910 my ($self, $x, $y) = @_;
… …
772} 944}
773 945
774sub _render { 946sub _render {
775 my ($self) = @_; 947 my ($self) = @_;
776 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
777 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
778 953
779 $self->SUPER::_render; 954 $self->SUPER::_render;
780} 955}
781 956
… …
784package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
785 960
786our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
787 962
788sub new { 963sub new {
789 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
790 967
791 my $self; 968 my $self;
792 969
793 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
794 vertical => 1, 971 vertical => 1,
795 range => [0, 0, 1, 0.01], # HACK fix 972 range => [0, 0, 1, 0.01], # HACK fix
796 connect_changed => sub { 973 on_changed => sub {
797 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 974 $self->{vp}->set_offset (0, $_[1]);
798 }, 975 },
799 ; 976 ;
800 977
801 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
802 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
803 slider => $slider, 980 slider => $slider,
804 @_, 981 %arg,
805 ); 982 );
806 983
807 $self->{vp}->add ($self->{scrolled});
808 $self->add ($self->{vp});
809 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
810 986
811 $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]);
812} 1013}
813 1014
814#TODO# update range on size_allocate depending on child 1015#TODO# update range on size_allocate depending on child
815# update viewport offset on scroll 1016# update viewport offset on scroll
816 1017
… …
836 1037
837 if ($self->{bg}) { 1038 if ($self->{bg}) {
838 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
839 1040
840 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
841 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
842 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
843 1044
844 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
845 glVertex 0 , 0; 1046 glVertex 0 , 0;
846 glVertex 0 , $h; 1047 glVertex 0 , $h;
847 glVertex $w, $h; 1048 glVertex $w, $h;
… …
860 1061
861our @ISA = CFClient::UI::Bin::; 1062our @ISA = CFClient::UI::Bin::;
862 1063
863use CFClient::OpenGL; 1064use CFClient::OpenGL;
864 1065
865my @tex = 1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
866 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
867 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);
868 1073
869sub new { 1074sub new {
870 my $class = shift; 1075 my ($class, %arg) = @_;
871 1076
872 # TODO: user_x, user_y, overwrite moveto? 1077 my $title = delete $arg{title};
873 1078
874 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
875 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
876 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
877 border => 0.6, 1082 border => 0.6,
878 toplevel => 1,
879 can_events => 1, 1083 can_events => 1,
880 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
881 ); 1087 );
882 1088
883 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
884 align => 0, 1090 align => 0,
885 valign => 1, 1091 valign => 1,
886 text => $self->{title}, 1092 text => $title,
887 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
888 1095
889 $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};
890} 1104}
891 1105
892sub border { 1106sub border {
893 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
894} 1108}
895 1109
896sub size_request { 1110sub size_request {
897 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
898 1115
899 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
900 1117
901 ( 1118 (
902 $w + $self->border * 2, 1119 $w + $self->border * 2,
… …
905} 1122}
906 1123
907sub size_allocate { 1124sub size_allocate {
908 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
909 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
910 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
911 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
912 1137
913 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
914 if $self->{title};
915
916 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
917} 1139}
918 1140
919sub button_down { 1141sub button_down {
920 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
921 1143
… …
937 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
938 1160
939 my $dx = $ev->{x} - $ox; 1161 my $dx = $ev->{x} - $ox;
940 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
941 1163
942 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
943 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1166
944 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
945 $self->check_size; 1168 $self->realloc;
946 }; 1169 };
947 1170
948 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
949 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
950 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
952 $self->{motion} = sub { 1175 $self->{motion} = sub {
953 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
954 1177
955 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
956 1179
957 $self->move ($bx + $x - $ox, $by + $y - $oy); 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
958 $self->update; 1181 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
959 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
960 } 1188 1
961} 1189}
962 1190
963sub button_up { 1191sub button_up {
964 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
965 1193
966 delete $self->{motion}; 1194 !!delete $self->{motion}
967} 1195}
968 1196
969sub mouse_motion { 1197sub mouse_motion {
970 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
971 1199
972 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
973} 1203}
974 1204
975sub _draw { 1205sub _draw {
976 my ($self) = @_; 1206 my ($self) = @_;
977 1207
1208 my $child = $self->{children}[0];
1209
978 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
979 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
980 1212
981 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
983 1215
984 my $border = $self->border; 1216 my $border = $self->border;
985 1217
986 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
987 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
988 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
989 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
990 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
991 1223
992 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
993 my $bg = $tex[0]; 1225 glColor @{ $self->{bg} };
994 1226
995 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
1228 # solve this better(?)
996 my $rep_x = $cw / $bg->{w}; 1229 $bg->{s} = $cw / $bg->{w};
997 my $rep_y = $ch / $bg->{h}; 1230 $bg->{t} = $ch / $bg->{h};
998
999 glColor @{ $self->{bg} };
1000
1001 $bg->{s} = $rep_x;
1002 $bg->{t} = $rep_y;
1003 $bg->{wrap_mode} = 1;
1004 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1005 } 1232 }
1006 1233
1007 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
1008 1235
1009 $self->{title}->draw if $self->{title};
1010
1011 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1012} 1242}
1013 1243
1014############################################################################# 1244#############################################################################
1015 1245
1016package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
1024sub new { 1254sub new {
1025 my $class = shift; 1255 my $class = shift;
1026 1256
1027 $class->SUPER::new ( 1257 $class->SUPER::new (
1028 col_expand => [], 1258 col_expand => [],
1029 @_ 1259 @_,
1030 ) 1260 )
1261}
1262
1263sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031} 1265}
1032 1266
1033sub add { 1267sub add {
1034 my ($self, $x, $y, $child) = @_; 1268 my ($self, $x, $y, $child) = @_;
1035 1269
1036 $child->set_parent ($self); 1270 $child->set_parent ($self);
1037 $self->{children}[$y][$x] = $child; 1271 $self->{children}[$y][$x] = $child;
1038 1272
1039 $child->check_size; 1273 $self->realloc;
1040} 1274}
1041 1275
1042sub children {
1043 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1044}
1045
1046# 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?
1047sub clear { 1277sub clear {
1048 my ($self) = @_; 1278 my ($self) = @_;
1049 1279
1050 my @children = $self->children; 1280 my @children = $self->children;
1051 delete $self->{children}; 1281 delete $self->{children};
… …
1053 for (@children) { 1283 for (@children) {
1054 delete $_->{parent}; 1284 delete $_->{parent};
1055 $_->hide; 1285 $_->hide;
1056 } 1286 }
1057 1287
1058 $self->update; 1288 $self->realloc;
1059} 1289}
1060 1290
1061sub get_wh { 1291sub get_wh {
1062 my ($self) = @_; 1292 my ($self) = @_;
1063 1293
… …
1094sub size_allocate { 1324sub size_allocate {
1095 my ($self, $w, $h) = @_; 1325 my ($self, $w, $h) = @_;
1096 1326
1097 my ($ws, $hs) = $self->get_wh; 1327 my ($ws, $hs) = $self->get_wh;
1098 1328
1099 my $req_w = sum @$ws; 1329 my $req_w = (sum @$ws) || 1;
1100 my $req_h = sum @$hs; 1330 my $req_h = (sum @$hs) || 1;
1101 1331
1102 # TODO: nicer code && do row_expand 1332 # TODO: nicer code && do row_expand
1103 my @col_expand = @{$self->{col_expand}}; 1333 my @col_expand = @{$self->{col_expand}};
1104 @col_expand = (1) x @$ws unless @col_expand; 1334 @col_expand = (1) x @$ws unless @col_expand;
1105 my $col_expand = (sum @col_expand) || 1; 1335 my $col_expand = (sum @col_expand) || 1;
… …
1159 } 1389 }
1160} 1390}
1161 1391
1162############################################################################# 1392#############################################################################
1163 1393
1164package CFClient::UI::HBox; 1394package CFClient::UI::Box;
1165
1166# TODO: wrap into common Box base class
1167 1395
1168our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Container::;
1169 1397
1170sub size_request { 1398sub size_request {
1171 my ($self) = @_; 1399 my ($self) = @_;
1172 1400
1173 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $self->{vertical}
1174 1402 ? (
1175 ( 1403 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1176 (List::Util::sum map $_->[0], @alloc), 1404 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1177 (List::Util::max map $_->[1], @alloc), 1405 )
1178 ) 1406 : (
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 )
1179} 1410}
1180 1411
1181sub size_allocate { 1412sub size_allocate {
1182 my ($self, $w, $h) = @_; 1413 my ($self, $w, $h) = @_;
1183 1414
1184 ($h, $w) = ($w, $h); 1415 my $space = $self->{vertical} ? $h : $w;
1185
1186 my $children = $self->{children}; 1416 my $children = $self->{children};
1187 1417
1188 my @h = map $_->{req_w}, @$children; 1418 my @req;
1189 1419
1190 my $req_h = List::Util::sum @h; 1420 if ($self->{homogeneous}) {
1191 1421 @req = ($space / (@$children || 1)) x @$children;
1192 if ($req_h > $h) {
1193 # ah well, not enough space
1194 $_ *= $h / $req_h for @h;
1195 } 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 {
1196 my $exp = List::Util::sum map $_->{expand}, @$children; 1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1197 $exp ||= 1;
1198 1431
1432 $space = ($space - $req) / $expand; # remaining space to give away
1433
1434 $req[$_] += $space * $children->[$_]{expand}
1199 for (0 .. $#$children) { 1435 for 0 .. $#$children;
1200 my $child = $children->[$_];
1201
1202 my $alloc_h = $h[$_];
1203 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1204 $h[$_] = $alloc_h;
1205 } 1436 }
1206 } 1437 }
1207 1438
1208 CFClient::UI::harmonize \@h; 1439 CFClient::UI::harmonize \@req;
1209 1440
1210 my $y = 0; 1441 my $pos = 0;
1211 for (0 .. $#$children) { 1442 for (0 .. $#$children) {
1212 my $child = $children->[$_];
1213 my $h = $h[$_]; 1443 my $alloc = $req[$_];
1214 $child->configure ($y, 0, $h, $w); 1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1215 1445
1216 $y += $h; 1446 $pos += $alloc;
1217 } 1447 }
1218 1448
1219 1 1449 1
1220} 1450}
1221 1451
1222############################################################################# 1452#############################################################################
1223 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
1224package CFClient::UI::VBox; 1469package CFClient::UI::VBox;
1225 1470
1226# TODO: wrap into common Box base class
1227
1228our @ISA = CFClient::UI::Container::; 1471our @ISA = CFClient::UI::Box::;
1229 1472
1230sub size_request { 1473sub new {
1231 my ($self) = @_; 1474 my $class = shift;
1232 1475
1233 my @alloc = map [$_->size_request], @{$self->{children}}; 1476 $class->SUPER::new (
1234 1477 vertical => 1,
1235 ( 1478 @_,
1236 (List::Util::max map $_->[0], @alloc),
1237 (List::Util::sum map $_->[1], @alloc),
1238 ) 1479 )
1239}
1240
1241sub size_allocate {
1242 my ($self, $w, $h) = @_;
1243
1244 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1245
1246 my $children = $self->{children};
1247
1248 my @h = map $_->{req_h}, @$children;
1249
1250 my $req_h = List::Util::sum @h;
1251
1252 if ($req_h > $h) {
1253 # ah well, not enough space
1254 $_ *= $h / $req_h for @h;
1255 } else {
1256 my $exp = List::Util::sum map $_->{expand}, @$children;
1257 $exp ||= 1;
1258
1259 for (0 .. $#$children) {
1260 my $child = $children->[$_];
1261
1262 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1263 }
1264 }
1265
1266 CFClient::UI::harmonize \@h;
1267
1268 my $y = 0;
1269 for (0 .. $#$children) {
1270 my $child = $children->[$_];
1271 my $h = $h[$_];
1272 $child->configure (0, $y, $w, $h);
1273
1274 $y += $h;
1275 }
1276
1277 1
1278} 1480}
1279 1481
1280############################################################################# 1482#############################################################################
1281 1483
1282package CFClient::UI::Label; 1484package CFClient::UI::Label;
… …
1299 ellipsise => 3, # end 1501 ellipsise => 3, # end
1300 layout => (new CFClient::Layout), 1502 layout => (new CFClient::Layout),
1301 fontsize => 1, 1503 fontsize => 1,
1302 align => -1, 1504 align => -1,
1303 valign => -1, 1505 valign => -1,
1304 padding => 2, 1506 padding_x => 2,
1507 padding_y => 2,
1305 can_events => 0, 1508 can_events => 0,
1306 %arg 1509 %arg
1307 ); 1510 );
1308 1511
1309 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1345 $self->{text} = "T$text"; 1548 $self->{text} = "T$text";
1346 1549
1347 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1550 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1348 $self->{layout}->set_text ($text); 1551 $self->{layout}->set_text ($text);
1349 1552
1553 $self->realloc;
1350 $self->update; 1554 $self->update;
1351 $self->check_size;
1352} 1555}
1353 1556
1354sub set_markup { 1557sub set_markup {
1355 my ($self, $markup) = @_; 1558 my ($self, $markup) = @_;
1356 1559
… …
1360 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1563 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1361 1564
1362 $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;
1363 $self->{layout}->set_markup ($markup); 1566 $self->{layout}->set_markup ($markup);
1364 1567
1568 $self->realloc;
1365 $self->update; 1569 $self->update;
1366 $self->check_size;
1367} 1570}
1368 1571
1369sub size_request { 1572sub size_request {
1370 my ($self) = @_; 1573 my ($self) = @_;
1371 1574
… …
1385 1588
1386 $w = List::Util::max $w, $w2; 1589 $w = List::Util::max $w, $w2;
1387 $h = List::Util::max $h, $h2; 1590 $h = List::Util::max $h, $h2;
1388 } 1591 }
1389 1592
1390 ( 1593 ($w, $h)
1391 $w + $self->{padding} * 2,
1392 $h + $self->{padding} * 2,
1393 )
1394} 1594}
1395 1595
1396sub size_allocate { 1596sub size_allocate {
1397 my ($self, $w, $h) = @_; 1597 my ($self, $w, $h) = @_;
1398 1598
1599 delete $self->{ox};
1600
1399 delete $self->{texture}; 1601 delete $self->{texture}
1602 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1400} 1603}
1401 1604
1402sub set_fontsize { 1605sub set_fontsize {
1403 my ($self, $fontsize) = @_; 1606 my ($self, $fontsize) = @_;
1404 1607
1405 $self->{fontsize} = $fontsize; 1608 $self->{fontsize} = $fontsize;
1406 delete $self->{texture}; 1609 delete $self->{texture};
1407 1610
1408 $self->update; 1611 $self->realloc;
1409 $self->check_size;
1410} 1612}
1411 1613
1412sub _draw { 1614sub _draw {
1413 my ($self) = @_; 1615 my ($self) = @_;
1414 1616
… …
1420 $self->{layout}->set_width ($self->{w}); 1622 $self->{layout}->set_width ($self->{w});
1421 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1623 $self->{layout}->set_ellipsise ($self->{ellipsise});
1422 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1624 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1423 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1625 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1424 1626
1425 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1627 new_from_layout CFClient::Texture $self->{layout}
1628 };
1426 1629
1630 unless (exists $self->{ox}) {
1427 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1631 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1428 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1632 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1429 : ($self->{w} - $tex->{w}) * 0.5); 1633 : ($self->{w} - $tex->{w}) * 0.5);
1430 1634
1431 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1635 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1432 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1636 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1433 : ($self->{h} - $tex->{h}) * 0.5); 1637 : ($self->{h} - $tex->{h}) * 0.5);
1434
1435 $tex
1436 }; 1638 };
1437 1639
1438 glEnable GL_TEXTURE_2D; 1640 glEnable GL_TEXTURE_2D;
1439 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1440 1642
… …
1466 active_fg => [0, 0, 0], 1668 active_fg => [0, 0, 0],
1467 can_hover => 1, 1669 can_hover => 1,
1468 can_focus => 1, 1670 can_focus => 1,
1469 valign => 0, 1671 valign => 0,
1470 can_events => 1, 1672 can_events => 1,
1673 #text => ...
1471 @_ 1674 @_
1472 ) 1675 )
1473} 1676}
1474 1677
1475sub _set_text { 1678sub _set_text {
… …
1477 1680
1478 delete $self->{cur_h}; 1681 delete $self->{cur_h};
1479 1682
1480 return if $self->{text} eq $text; 1683 return if $self->{text} eq $text;
1481 1684
1482 delete $self->{texture};
1483
1484 $self->{last_activity} = $::NOW; 1685 $self->{last_activity} = $::NOW;
1485 $self->{text} = $text; 1686 $self->{text} = $text;
1486 1687
1487 $text =~ s/./*/g if $self->{hidden}; 1688 $text =~ s/./*/g if $self->{hidden};
1488 $self->{layout}->set_text ("$text "); 1689 $self->{layout}->set_text ("$text ");
1489 1690
1490 $self->emit (changed => $self->{text}); 1691 $self->_emit (changed => $self->{text});
1692 $self->update;
1491} 1693}
1492 1694
1493sub set_text { 1695sub set_text {
1494 my ($self, $text) = @_; 1696 my ($self, $text) = @_;
1495 1697
1496 $self->{cursor} = length $text; 1698 $self->{cursor} = length $text;
1497 $self->_set_text ($text); 1699 $self->_set_text ($text);
1498 $self->update; 1700
1499 $self->check_size; 1701 $self->realloc;
1500} 1702}
1501 1703
1502sub get_text { 1704sub get_text {
1503 $_[0]{text} 1705 $_[0]{text}
1504} 1706}
… …
1507 my ($self) = @_; 1709 my ($self) = @_;
1508 1710
1509 my ($w, $h) = $self->SUPER::size_request; 1711 my ($w, $h) = $self->SUPER::size_request;
1510 1712
1511 ($w + 1, $h) # add 1 for cursor 1713 ($w + 1, $h) # add 1 for cursor
1512}
1513
1514sub size_allocate {
1515 my ($self, $w, $h) = @_;
1516
1517 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1518} 1714}
1519 1715
1520sub key_down { 1716sub key_down {
1521 my ($self, $ev) = @_; 1717 my ($self, $ev) = @_;
1522 1718
… …
1537 } elsif ($sym == CFClient::SDLK_HOME) { 1733 } elsif ($sym == CFClient::SDLK_HOME) {
1538 $self->{cursor} = 0; 1734 $self->{cursor} = 0;
1539 } elsif ($sym == CFClient::SDLK_END) { 1735 } elsif ($sym == CFClient::SDLK_END) {
1540 $self->{cursor} = length $text; 1736 $self->{cursor} = length $text;
1541 } elsif ($uni == 27) { 1737 } elsif ($uni == 27) {
1542 $self->emit ('escape'); 1738 $self->_emit ('escape');
1543 } elsif ($uni) { 1739 } elsif ($uni) {
1544 substr $text, $self->{cursor}++, 0, chr $uni; 1740 substr $text, $self->{cursor}++, 0, chr $uni;
1741 } else {
1742 return 0;
1545 } 1743 }
1546 1744
1547 $self->_set_text ($text); 1745 $self->_set_text ($text);
1548 $self->update; 1746
1549 $self->check_size; 1747 $self->realloc;
1748
1749 1
1550} 1750}
1551 1751
1552sub focus_in { 1752sub focus_in {
1553 my ($self) = @_; 1753 my ($self) = @_;
1554 1754
… …
1569 utf8::encode $text; 1769 utf8::encode $text;
1570 $self->{cursor} = length substr $text, 0, $idx; 1770 $self->{cursor} = length substr $text, 0, $idx;
1571 1771
1572 $self->_set_text ($self->{text}); 1772 $self->_set_text ($self->{text});
1573 $self->update; 1773 $self->update;
1774
1775 1
1574} 1776}
1575 1777
1576sub mouse_motion { 1778sub mouse_motion {
1577 my ($self, $ev, $x, $y) = @_; 1779 my ($self, $ev, $x, $y) = @_;
1578# 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
1579} 1783}
1580 1784
1581sub _draw { 1785sub _draw {
1582 my ($self) = @_; 1786 my ($self) = @_;
1583 1787
1584 local $self->{fg} = $self->{fg}; 1788 local $self->{fg} = $self->{fg};
1585 1789
1586 if ($FOCUS == $self) { 1790 if ($FOCUS == $self) {
1587 glColor @{$self->{active_bg}}; 1791 glColor_premultiply @{$self->{active_bg}};
1588 $self->{fg} = $self->{active_fg}; 1792 $self->{fg} = $self->{active_fg};
1589 } else { 1793 } else {
1590 glColor @{$self->{bg}}; 1794 glColor_premultiply @{$self->{bg}};
1591 } 1795 }
1592 1796
1593 glEnable GL_BLEND; 1797 glEnable GL_BLEND;
1594 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1798 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1595 glBegin GL_QUADS; 1799 glBegin GL_QUADS;
1596 glVertex 0 , 0; 1800 glVertex 0 , 0;
1597 glVertex 0 , $self->{h}; 1801 glVertex 0 , $self->{h};
1598 glVertex $self->{w}, $self->{h}; 1802 glVertex $self->{w}, $self->{h};
1599 glVertex $self->{w}, 0; 1803 glVertex $self->{w}, 0;
… …
1634 if ($sym == 13) { 1838 if ($sym == 13) {
1635 unshift @{$self->{history}}, 1839 unshift @{$self->{history}},
1636 my $txt = $self->get_text; 1840 my $txt = $self->get_text;
1637 $self->{history_pointer} = -1; 1841 $self->{history_pointer} = -1;
1638 $self->{history_saveback} = ''; 1842 $self->{history_saveback} = '';
1639 $self->emit (activate => $txt); 1843 $self->_emit (activate => $txt);
1640 $self->update; 1844 $self->update;
1641 1845
1642 } elsif ($sym == CFClient::SDLK_UP) { 1846 } elsif ($sym == CFClient::SDLK_UP) {
1643 if ($self->{history_pointer} < 0) { 1847 if ($self->{history_pointer} < 0) {
1644 $self->{history_saveback} = $self->get_text; 1848 $self->{history_saveback} = $self->get_text;
… …
1660 } else { 1864 } else {
1661 $self->set_text ($self->{history_saveback}); 1865 $self->set_text ($self->{history_saveback});
1662 } 1866 }
1663 1867
1664 } else { 1868 } else {
1665 $self->SUPER::key_down ($ev); 1869 return $self->SUPER::key_down ($ev)
1870 }
1871
1666 } 1872 1
1667
1668} 1873}
1669 1874
1670############################################################################# 1875#############################################################################
1671 1876
1672package CFClient::UI::Button; 1877package CFClient::UI::Button;
… …
1681 1886
1682sub new { 1887sub new {
1683 my $class = shift; 1888 my $class = shift;
1684 1889
1685 $class->SUPER::new ( 1890 $class->SUPER::new (
1686 padding => 4, 1891 padding_x => 4,
1892 padding_y => 4,
1687 fg => [1, 1, 1], 1893 fg => [1, 1, 1],
1688 active_fg => [0, 0, 1], 1894 active_fg => [0, 0, 1],
1689 can_hover => 1, 1895 can_hover => 1,
1690 align => 0, 1896 align => 0,
1691 valign => 0, 1897 valign => 0,
1692 can_events => 1, 1898 can_events => 1,
1693 @_ 1899 @_
1694 ) 1900 )
1695} 1901}
1696 1902
1903sub activate { }
1904
1697sub button_up { 1905sub button_up {
1698 my ($self, $ev, $x, $y) = @_; 1906 my ($self, $ev, $x, $y) = @_;
1699 1907
1908 $self->emit ("activate")
1700 if ($x >= 0 && $x < $self->{w} 1909 if $x >= 0 && $x < $self->{w}
1701 && $y >= 0 && $y < $self->{h}) { 1910 && $y >= 0 && $y < $self->{h};
1702 $self->emit ("activate"); 1911
1703 } 1912 1
1704} 1913}
1705 1914
1706sub _draw { 1915sub _draw {
1707 my ($self) = @_; 1916 my ($self) = @_;
1708 1917
… …
1737 1946
1738sub new { 1947sub new {
1739 my $class = shift; 1948 my $class = shift;
1740 1949
1741 $class->SUPER::new ( 1950 $class->SUPER::new (
1742 padding => 2, 1951 padding_x => 2,
1952 padding_y => 2,
1743 fg => [1, 1, 1], 1953 fg => [1, 1, 1],
1744 active_fg => [1, 1, 0], 1954 active_fg => [1, 1, 0],
1745 bg => [0, 0, 0, 0.2], 1955 bg => [0, 0, 0, 0.2],
1746 active_bg => [1, 1, 1, 0.5], 1956 active_bg => [1, 1, 1, 0.5],
1747 state => 0, 1957 state => 0,
… …
1751} 1961}
1752 1962
1753sub size_request { 1963sub size_request {
1754 my ($self) = @_; 1964 my ($self) = @_;
1755 1965
1756 ($self->{padding} * 2 + 6) x 2 1966 (6) x 2
1757} 1967}
1758 1968
1759sub button_down { 1969sub button_down {
1760 my ($self, $ev, $x, $y) = @_; 1970 my ($self, $ev, $x, $y) = @_;
1761 1971
1762 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1972 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1763 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1973 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1764 $self->{state} = !$self->{state}; 1974 $self->{state} = !$self->{state};
1765 $self->emit (changed => $self->{state}); 1975 $self->_emit (changed => $self->{state});
1976 } else {
1977 return 0
1978 }
1979
1766 } 1980 1
1767} 1981}
1768 1982
1769sub _draw { 1983sub _draw {
1770 my ($self) = @_; 1984 my ($self) = @_;
1771 1985
1772 $self->SUPER::_draw; 1986 $self->SUPER::_draw;
1773 1987
1774 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1988 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1775 1989
1776 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;
1777 1993
1778 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1994 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1779 1995
1780 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1996 my $tex = $self->{state} ? $tex[1] : $tex[0];
1781 1997
… …
1936 2152
1937 my $h1 = $self->{h} * (1 - $ycut1); 2153 my $h1 = $self->{h} * (1 - $ycut1);
1938 my $h2 = $self->{h} * (1 - $ycut2); 2154 my $h2 = $self->{h} * (1 - $ycut2);
1939 2155
1940 glEnable GL_BLEND; 2156 glEnable GL_BLEND;
1941 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;
1942 glEnable GL_TEXTURE_2D; 2159 glEnable GL_TEXTURE_2D;
1943 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2160 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1944 2161
1945 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2162 glBindTexture GL_TEXTURE_2D, $t1->{name};
1946 glBegin GL_QUADS; 2163 glBegin GL_QUADS;
… …
2045 my $self = $class->SUPER::new ( 2262 my $self = $class->SUPER::new (
2046 fg => [1, 1, 1], 2263 fg => [1, 1, 1],
2047 active_fg => [0, 0, 0], 2264 active_fg => [0, 0, 0],
2048 bg => [0, 0, 0, 0.2], 2265 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5], 2266 active_bg => [1, 1, 1, 0.5],
2050 range => [0, 0, 100, 10], 2267 range => [0, 0, 100, 10, 0],
2051 req_w => $::WIDTH / 80, 2268 min_w => $::WIDTH / 80,
2052 req_h => $::WIDTH / 80, 2269 min_h => $::WIDTH / 80,
2053 vertical => 0, 2270 vertical => 0,
2054 can_hover => 1, 2271 can_hover => 1,
2055 inner_pad => 0.02, 2272 inner_pad => 0.02,
2056 @_ 2273 @_
2057 ); 2274 );
… …
2060 $self->update; 2277 $self->update;
2061 2278
2062 $self 2279 $self
2063} 2280}
2064 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
2065sub set_value { 2293sub set_value {
2066 my ($self, $value) = @_; 2294 my ($self, $value) = @_;
2067 2295
2068 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2296 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2069 2297
2070 $hi = $lo + 1 if $hi <= $lo; 2298 $hi = $lo + 1 if $hi <= $lo;
2071 2299
2300 $page = $hi - $lo if $page > $hi - $lo;
2301
2072 $value = $lo if $value < $lo; 2302 $value = $lo if $value < $lo;
2073 $value = $hi if $value > $hi; 2303 $value = $hi - $page if $value > $hi - $page;
2074 2304
2075 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2305 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2076 if $unit; 2306 if $unit;
2077 2307
2078 $page = $hi - $lo if $page > $hi - $lo;
2079
2080 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2308 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2081 2309
2082 if ($value != $old_value) { 2310 if ($value != $old_value) {
2083 $self->emit (changed => $value); 2311 $self->_emit (changed => $value);
2084 $self->update; 2312 $self->update;
2085 } 2313 }
2086} 2314}
2087 2315
2088sub size_request { 2316sub size_request {
2089 my ($self) = @_; 2317 my ($self) = @_;
2090 2318
2091 my $w = $self->{req_w}; 2319 ($self->{req_w}, $self->{req_h})
2092 my $h = $self->{req_h};
2093
2094 $self->{vertical} ? ($h, $w) : ($w, $h)
2095} 2320}
2096 2321
2097sub button_down { 2322sub button_down {
2098 my ($self, $ev, $x, $y) = @_; 2323 my ($self, $ev, $x, $y) = @_;
2099 2324
2100 $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
2101 $self->mouse_motion ($ev, $x, $y); 2329 $self->mouse_motion ($ev, $x, $y)
2102} 2330}
2103 2331
2104sub mouse_motion { 2332sub mouse_motion {
2105 my ($self, $ev, $x, $y) = @_; 2333 my ($self, $ev, $x, $y) = @_;
2106 2334
2107 if ($GRAB == $self) { 2335 if ($GRAB == $self) {
2108 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2336 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2109 2337
2110 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2338 my (undef, $lo, $hi, $page) = @{$self->{range}};
2111 2339
2112 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2340 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2113 2341
2114 $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
2115 } 2347 1
2116} 2348}
2117 2349
2118sub update { 2350sub update {
2119 my ($self) = @_; 2351 my ($self) = @_;
2120 2352
2121 $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}) {
2122 $self->set_value ($self->{range}[0]); 2361 $self->set_value ($self->{range}[0]);
2123 2362
2124 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2363 my ($value, $lo, $hi, $page) = @{$self->{range}};
2364 my $range = ($hi - $page - $lo) || 1e-100;
2125 2365
2126 my $inner_w = 1 - 2 * $self->{inner_pad}; 2366 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2127 2367
2128 $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;
2129 2370
2130 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2371 $value = ($value - $lo) / $range;
2131 $value = $self->{scale} * ($value - $lo); 2372 $value = $value * $self->{scale} + $self->{offset};
2132 2373
2133 $value = $self->{inner_pad} + ($value - $page * 0.5);
2134
2135 $value = 0 if $value < 0;
2136 $page = 1 - $value if $value + $page > 1;
2137
2138 $self->{knob_x} = $value; 2374 $self->{knob_x} = $value - $knob_w * 0.5;
2139 $self->{knob_w} = $page; 2375 $self->{knob_w} = $knob_w;
2140 }); 2376 }
2141
2142 $self->SUPER::update;
2143}
2144
2145sub _draw {
2146 my ($self) = @_;
2147 2377
2148 $self->SUPER::_draw (); 2378 $self->SUPER::_draw ();
2149 2379
2150 glScale $self->{w}, $self->{h}; 2380 glScale $self->{w}, $self->{h};
2151 2381
… …
2168 # draw handle 2398 # draw handle
2169 $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);
2170 2400
2171 glDisable GL_TEXTURE_2D; 2401 glDisable GL_TEXTURE_2D;
2172} 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 (@_) }
2173 2444
2174############################################################################# 2445#############################################################################
2175 2446
2176package CFClient::UI::TextView; 2447package CFClient::UI::TextView;
2177 2448
… …
2207 2478
2208 $self->{fontsize} = $fontsize; 2479 $self->{fontsize} = $fontsize;
2209 $self->reflow; 2480 $self->reflow;
2210} 2481}
2211 2482
2212sub text_height {
2213 my ($self, $text) = @_;
2214
2215 my $layout = $self->{layout};
2216
2217 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2218 $layout->set_width ($self->{children}[0]{w});
2219 $layout->set_markup ($text);
2220
2221 ($layout->size)[1]
2222}
2223
2224sub reflow {
2225 my ($self) = @_;
2226
2227 $self->{need_reflow}++;
2228 $self->update;
2229}
2230
2231sub size_allocate { 2483sub size_allocate {
2232 my ($self, $w, $h) = @_; 2484 my ($self, $w, $h) = @_;
2233 2485
2234 $self->SUPER::size_allocate ($w, $h); 2486 $self->SUPER::size_allocate ($w, $h);
2235 2487
… …
2238 $self->{layout}->set_width ($self->{children}[0]{w}); 2490 $self->{layout}->set_width ($self->{children}[0]{w});
2239 2491
2240 $self->reflow; 2492 $self->reflow;
2241} 2493}
2242 2494
2495sub text_size {
2496 my ($self, $text, $indent) = @_;
2497
2498 my $layout = $self->{layout};
2499
2500 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2501 $layout->set_width ($self->{children}[0]{w} - $indent);
2502 $layout->set_markup ($text);
2503
2504 $layout->size
2505}
2506
2507sub reflow {
2508 my ($self) = @_;
2509
2510 $self->{need_reflow}++;
2511 $self->update;
2512}
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
2243sub add_paragraph { 2529sub add_paragraph {
2244 my ($self, $color, $text) = @_; 2530 my ($self, $color, $text, $indent) = @_;
2245 2531
2246 #TODO: intelligently "reformat" paragraph 2532 for my $line (split /\n/, $text) {
2247 2533 my ($w, $h) = $self->text_size ($line);
2248 my $height = $self->text_height ($text);
2249
2250 $self->{height} += $height; 2534 $self->{height} += $h;
2535 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2536 }
2251 2537
2252 push @{$self->{par}}, [$height, $color, $text];
2253
2254 $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]);
2255 $self->{children}[1]->update;
2256} 2539}
2257 2540
2258sub update { 2541sub update {
2259 my ($self) = @_; 2542 my ($self) = @_;
2260 2543
… …
2263 return unless $self->{h} > 0; 2546 return unless $self->{h} > 0;
2264 2547
2265 delete $self->{texture}; 2548 delete $self->{texture};
2266 2549
2267 $ROOT->on_post_alloc ($self, sub { 2550 $ROOT->on_post_alloc ($self, sub {
2551 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2552
2268 if (delete $self->{need_reflow}) { 2553 if (delete $self->{need_reflow}) {
2269 my $height = 0; 2554 my $height = 0;
2270 2555
2271 $height += $_->[0] = $self->text_height ($_->[2]) 2556 my $layout = $self->{layout};
2557
2558 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2559
2272 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 }
2273 2571
2274 $self->{height} = $height; 2572 $self->{height} = $height;
2275 2573
2276 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2574 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2277 2575
2278 delete $self->{texture}; 2576 delete $self->{texture};
2279 } 2577 }
2280 2578
2281 $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 {
2282 glClearColor 0.5, 0.5, 0.5, 0; 2580 glClearColor 0.5, 0.5, 0.5, 0;
2283 glClear GL_COLOR_BUFFER_BIT; 2581 glClear GL_COLOR_BUFFER_BIT;
2284 2582
2285 glEnable GL_TEXTURE_2D;
2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2287
2288 my $top = int $self->{children}[1]{range}[0]; 2583 my $top = int $self->{children}[1]{range}[0];
2289 2584
2290 my $y0 = $top; 2585 my $y0 = $top;
2291 my $y1 = $top + $self->{h}; 2586 my $y1 = $top + $H;
2292 2587
2293 my $y = 0; 2588 my $y = 0;
2294 2589
2295 my $layout = $self->{layout}; 2590 my $layout = $self->{layout};
2296 2591
2297 $layout->set_font ($self->{font}) if $self->{font}; 2592 $layout->set_font ($self->{font}) if $self->{font};
2298 2593
2594 glEnable GL_BLEND;
2595 #TODO# not correct in windows where rgba is forced off
2596 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2597
2299 for my $par (@{$self->{par}}) { 2598 for my $par (@{$self->{par}}) {
2300 my $h = $par->[0]; 2599 my $h = $par->[1];
2301 2600
2302 if ($y0 < $y + $h && $y < $y1) { 2601 if ($y0 < $y + $h && $y < $y1) {
2303 $layout->set_foreground (@{ $par->[1] }); 2602 $layout->set_foreground (@{ $par->[2] });
2603 $layout->set_width ($W - $par->[3]);
2304 $layout->set_markup ($par->[2]); 2604 $layout->set_markup ($par->[4]);
2305 2605
2306 my ($W, $H) = $layout->size; 2606 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2307 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2607
2608 glRasterPos $par->[3], $y - $y0;
2609 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2308 } 2610 }
2309 2611
2310 $y += $h; 2612 $y += $h;
2311 } 2613 }
2312 2614
2313 glDisable GL_TEXTURE_2D; 2615 glDisable GL_BLEND;
2314 }; 2616 };
2315 }); 2617 });
2316} 2618}
2317 2619
2318sub _draw { 2620sub _draw {
… …
2378 2680
2379sub new { 2681sub new {
2380 my $class = shift; 2682 my $class = shift;
2381 2683
2382 my $self = $class->SUPER::new ( 2684 my $self = $class->SUPER::new (
2383 state => 0, 2685 state => 0,
2384 connect_activate => \&toggle_flopper, 2686 on_activate => \&toggle_flopper,
2385 @_ 2687 @_
2386 ); 2688 );
2387 2689
2388 if ($self->{state}) {
2389 $self->{state} = 0;
2390 $self->toggle_flopper;
2391 }
2392
2393 $self 2690 $self
2394} 2691}
2395 2692
2396sub toggle_flopper { 2693sub toggle_flopper {
2397 my ($self) = @_; 2694 my ($self) = @_;
2398 2695
2399 # TODO: use animation 2696 $self->{other}->toggle_visibility;
2400 if ($self->{state} = !$self->{state}) {
2401 $CFClient::UI::ROOT->add ($self->{other});
2402 $self->{other}->move ($self->coord2global (0, $self->{h}));
2403 $self->emit ("open");
2404 } else {
2405 $CFClient::UI::ROOT->remove ($self->{other});
2406 $self->emit ("close");
2407 }
2408
2409 $self->emit (changed => $self->{state});
2410} 2697}
2411 2698
2412############################################################################# 2699#############################################################################
2413 2700
2414package CFClient::UI::Tooltip; 2701package CFClient::UI::Tooltip;
… …
2427} 2714}
2428 2715
2429sub set_tooltip_from { 2716sub set_tooltip_from {
2430 my ($self, $widget) = @_; 2717 my ($self, $widget) = @_;
2431 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
2432 $self->add (new CFClient::UI::Label 2728 $self->add (new CFClient::UI::Label
2433 markup => $widget->{tooltip}, 2729 markup => $tooltip,
2434 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2730 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2435 fontsize => 0.8, 2731 fontsize => 0.8,
2436 fg => [0, 0, 0, 1], 2732 fg => [0, 0, 0, 1],
2437 ellipsise => 0, 2733 ellipsise => 0,
2438 font => ($widget->{tooltip_font} || $::FONT_PROP), 2734 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2449 2745
2450sub size_allocate { 2746sub size_allocate {
2451 my ($self, $w, $h) = @_; 2747 my ($self, $w, $h) = @_;
2452 2748
2453 $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 });
2454} 2768}
2455 2769
2456sub _draw { 2770sub _draw {
2457 my ($self) = @_; 2771 my ($self) = @_;
2458 2772
… …
2475 glVertex $w, $h; 2789 glVertex $w, $h;
2476 glVertex $w, 0; 2790 glVertex $w, 0;
2477 glEnd; 2791 glEnd;
2478 2792
2479 glTranslate 2 - 0.375, 2 - 0.375; 2793 glTranslate 2 - 0.375, 2 - 0.375;
2794
2480 $self->SUPER::_draw; 2795 $self->SUPER::_draw;
2481} 2796}
2482 2797
2483############################################################################# 2798#############################################################################
2484 2799
… …
2490 2805
2491sub new { 2806sub new {
2492 my $class = shift; 2807 my $class = shift;
2493 2808
2494 my $self = $class->SUPER::new ( 2809 my $self = $class->SUPER::new (
2495 aspect => 1, 2810 aspect => 1,
2811 can_events => 0,
2496 @_, 2812 @_,
2497 ); 2813 );
2498 2814
2499 if ($self->{anim} && $self->{animspeed}) { 2815 if ($self->{anim} && $self->{animspeed}) {
2500 Scalar::Util::weaken (my $widget = $self); 2816 Scalar::Util::weaken (my $widget = $self);
… …
2515 2831
2516sub size_request { 2832sub size_request {
2517 (32, 8) 2833 (32, 8)
2518} 2834}
2519 2835
2836sub update {
2837 my ($self) = @_;
2838
2839 return unless $self->{visible};
2840
2841 $self->SUPER::update;
2842}
2843
2520sub _draw { 2844sub _draw {
2521 my ($self) = @_; 2845 my ($self) = @_;
2522 2846
2523 return unless $::CONN;#d# manage and cache textures differently 2847 return unless $::CONN;
2524 2848
2525 my $face; 2849 my $face;
2526 2850
2527 if ($self->{frame}) { 2851 if ($self->{frame}) {
2528 my $anim = $::CONN->{anim}[$self->{anim}]; 2852 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2551 $self->SUPER::DESTROY; 2875 $self->SUPER::DESTROY;
2552} 2876}
2553 2877
2554############################################################################# 2878#############################################################################
2555 2879
2556package CFClient::UI::InventoryItem; 2880package CFClient::UI::Buttonbar;
2557 2881
2558our @ISA = CFClient::UI::HBox::; 2882our @ISA = CFClient::UI::HBox::;
2559 2883
2560sub _item_to_desc { 2884# TODO: should actualyl wrap buttons and other goodies.
2561 my ($item) = @_;
2562
2563 my $desc =
2564 $item->{nrof} < 2
2565 ? $item->{name}
2566 : "$item->{nrof} × $item->{name_pl}";
2567
2568 $item->{flags} & Crossfire::Protocol::F_OPEN
2569 and $desc .= " (open)";
2570 $item->{flags} & Crossfire::Protocol::F_APPLIED
2571 and $desc .= " (applied)";
2572 $item->{flags} & Crossfire::Protocol::F_UNPAID
2573 and $desc .= " (unpaid)";
2574 $item->{flags} & Crossfire::Protocol::F_MAGIC
2575 and $desc .= " (magic)";
2576 $item->{flags} & Crossfire::Protocol::F_CURSED
2577 and $desc .= " (cursed)";
2578 $item->{flags} & Crossfire::Protocol::F_DAMNED
2579 and $desc .= " (damned)";
2580 $item->{flags} & Crossfire::Protocol::F_LOCKED
2581 and $desc .= " *";
2582
2583 $desc
2584}
2585
2586sub new {
2587 my $class = shift;
2588
2589 my %args = @_;
2590
2591 my $item = delete $args{item};
2592
2593 my $desc = _item_to_desc ($item);
2594
2595 my $self = $class->SUPER::new (
2596 can_hover => 1,
2597 can_events => 1,
2598 tooltip => ((CFClient::UI::Label::escape $desc)
2599 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2600 connect_button_down => sub {
2601 my ($self, $ev, $x, $y) = @_;
2602
2603 # todo: maybe put examine on 1? but should just be a tooltip :(
2604 if ($ev->{button} == 1) {
2605 my $targ = $::CONN->{player}{tag};
2606
2607 if ($item->{container} == $::CONN->{player}{tag}) {
2608 $targ = $main::OPENCONT;
2609 }
2610
2611 $::CONN->send ("move $targ $item->{tag} 0");
2612 } elsif ($ev->{button} == 2) {
2613 $::CONN->send ("apply $item->{tag}");
2614 } elsif ($ev->{button} == 3) {
2615 my @menu_items = (
2616 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2617 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2618 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2619 (
2620 $item->{flags} & Crossfire::Protocol::F_LOCKED
2621 ? (
2622 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2623 )
2624 : (
2625 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2626 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2627 )
2628 ),
2629 );
2630
2631 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2632 }
2633
2634 1
2635 },
2636 %args
2637 );
2638
2639
2640 $self->add (new CFClient::UI::Face
2641 can_events => 0,
2642 face => $item->{face},
2643 anim => $item->{anim},
2644 animspeed => $item->{animspeed},
2645 );
2646
2647 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2648
2649 $self->{item} = $item;
2650
2651 $self->update_item;
2652
2653 $self
2654}
2655
2656sub update_item {
2657 my ($self) = @_;
2658
2659 my $desc = _item_to_desc ($self->{item});
2660
2661 $self->{name_lbl}->set_text ($desc);
2662}
2663
2664#############################################################################
2665
2666package CFClient::UI::Inventory;
2667
2668our @ISA = CFClient::UI::ScrolledWindow::;
2669
2670sub new {
2671 my $class = shift;
2672
2673 my $self = $class->SUPER::new (
2674 scrolled => (new CFClient::UI::VBox),
2675 @_,
2676 );
2677
2678 $self
2679}
2680
2681sub set_items {
2682 my ($self, $items) = @_;
2683
2684 $self->{scrolled}->clear;
2685 return unless $items;
2686
2687 my @items = sort {
2688 ($a->{type} <=> $b->{type})
2689 or ($a->{name} cmp $b->{name})
2690 } @$items;
2691
2692 $self->{real_items} = \@items;
2693
2694 for my $item (@items) {
2695 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2696 $item->update_item ();
2697 }
2698
2699 $self->{scrolled}->add (@items);
2700
2701# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2702}
2703
2704sub size_request {
2705 my ($self) = @_;
2706 ($self->{req_w}, $self->{req_h});
2707}
2708 2885
2709############################################################################# 2886#############################################################################
2710 2887
2711package CFClient::UI::Menu; 2888package CFClient::UI::Menu;
2712 2889
… …
2746 2923
2747# 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)
2748sub popup { 2925sub popup {
2749 my ($self, $ev) = @_; 2926 my ($self, $ev) = @_;
2750 2927
2751 $self->emit ("popdown"); 2928 $self->_emit ("popdown");
2752 2929
2753 # maybe save $GRAB? must be careful about events... 2930 # maybe save $GRAB? must be careful about events...
2754 $GRAB = $self; 2931 $GRAB = $self;
2755 $self->{button} = $ev->{button}; 2932 $self->{button} = $ev->{button};
2756 2933
2757 $self->show; 2934 $self->show;
2758 $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);
2759} 2936}
2760 2937
2761sub mouse_motion { 2938sub mouse_motion {
2762 my ($self, $ev, $x, $y) = @_; 2939 my ($self, $ev, $x, $y) = @_;
2763 2940
2764 # TODO: should use vbox->find_widget or so 2941 # TODO: should use vbox->find_widget or so
2765 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2942 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2766 $self->{hover} = $self->{item}{$HOVER}; 2943 $self->{hover} = $self->{item}{$HOVER};
2944
2945 0
2767} 2946}
2768 2947
2769sub button_up { 2948sub button_up {
2770 my ($self, $ev, $x, $y) = @_; 2949 my ($self, $ev, $x, $y) = @_;
2771 2950
2772 if ($ev->{button} == $self->{button}) { 2951 if ($ev->{button} == $self->{button}) {
2773 undef $GRAB; 2952 undef $GRAB;
2774 $self->hide; 2953 $self->hide;
2775 2954
2776 $self->emit ("popdown"); 2955 $self->_emit ("popdown");
2777 $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 );
2778 } 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});
2779} 3070}
2780 3071
2781############################################################################# 3072#############################################################################
2782 3073
2783package CFClient::UI::Statusbox; 3074package CFClient::UI::Statusbox;
… …
2843sub add { 3134sub add {
2844 my ($self, $text, %arg) = @_; 3135 my ($self, $text, %arg) = @_;
2845 3136
2846 $text =~ s/^\s+//; 3137 $text =~ s/^\s+//;
2847 $text =~ s/\s+$//; 3138 $text =~ s/\s+$//;
3139
3140 return unless $text;
2848 3141
2849 my $timeout = time + ((delete $arg{timeout}) || 60); 3142 my $timeout = time + ((delete $arg{timeout}) || 60);
2850 3143
2851 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3144 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2852 3145
… …
2886 $self->SUPER::reconfigure; 3179 $self->SUPER::reconfigure;
2887} 3180}
2888 3181
2889############################################################################# 3182#############################################################################
2890 3183
2891package CFClient::UI::Root; 3184package CFClient::UI::Inventory;
2892 3185
2893our @ISA = CFClient::UI::Container::; 3186our @ISA = CFClient::UI::ScrolledWindow::;
2894
2895use CFClient::OpenGL;
2896 3187
2897sub new { 3188sub new {
2898 my $class = shift; 3189 my $class = shift;
2899 3190
2900 $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 => [],
2901 @_, 3433 @_,
2902 ) 3434 )
2903} 3435}
2904 3436
2905sub configure { 3437# XXX: Do sorting? Argl...
2906 my ($self, $x, $y, $w, $h) = @_; 3438sub add_spell {
2907
2908 $self->{w} = $w;
2909 $self->{h} = $h;
2910}
2911
2912sub check_size {
2913 my ($self) = @_; 3439 my ($self, $spell) = @_;
3440 $self->{spells}->{$spell->{name}} = $spell;
2914 3441
2915 $self->size_allocate ($self->{w}, $self->{h}) 3442 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2916 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
2917} 3496}
2918 3497
2919sub size_request { 3498sub size_request {
2920 my ($self) = @_; 3499 my ($self) = @_;
2921 3500
2922 ($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
2923} 3516}
2924 3517
2925sub size_allocate { 3518sub size_allocate {
2926 my ($self, $w, $h) = @_; 3519 my ($self, $w, $h) = @_;
2927 3520
2928 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2929 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2930
2931 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2932 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2933
2934 for my $child ($self->children) { 3521 for my $child ($self->children) {
2935 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)};
2936 3523
2937 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3524 $X = $child->{force_x} if exists $child->{force_x};
2938 if exists $child->{req_x}; 3525 $Y = $child->{force_y} if exists $child->{force_y};
2939 3526
2940 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3527 $X = _to_pixel $X, $W, $self->{w};
2941 if exists $child->{req_y}; 3528 $Y = _to_pixel $Y, $H, $self->{h};
2942
2943 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2944 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2945 3529
2946 $child->configure ($X, $Y, $W, $H); 3530 $child->configure ($X, $Y, $W, $H);
2947 } 3531 }
2948} 3532}
2949 3533
… …
2960} 3544}
2961 3545
2962sub update { 3546sub update {
2963 my ($self) = @_; 3547 my ($self) = @_;
2964 3548
2965 $self->check_size;
2966 $::WANT_REFRESH++; 3549 $::WANT_REFRESH++;
2967} 3550}
2968 3551
2969sub add { 3552sub add {
2970 my ($self, @children) = @_; 3553 my ($self, @children) = @_;
2971 3554
2972 for my $child (@children) {
2973 $child->{toplevel} = 1; 3555 $_->{is_toplevel} = 1
2974 3556 for @children;
2975 # integerise window positions
2976 $child->{x} = int $child->{x};
2977 $child->{y} = int $child->{y};
2978 }
2979 3557
2980 $self->SUPER::add (@children); 3558 $self->SUPER::add (@children);
3559}
3560
3561sub remove {
3562 my ($self, @children) = @_;
3563
3564 $self->SUPER::remove (@children);
3565
3566 delete $self->{is_toplevel}
3567 for @children;
3568
3569 while (@children) {
3570 my $w = pop @children;
3571 push @children, $w->children;
3572 $w->set_invisible;
3573 }
2981} 3574}
2982 3575
2983sub on_refresh { 3576sub on_refresh {
2984 my ($self, $id, $cb) = @_; 3577 my ($self, $id, $cb) = @_;
2985 3578
… …
2998 while ($self->{refresh_hook}) { 3591 while ($self->{refresh_hook}) {
2999 $_->() 3592 $_->()
3000 for values %{delete $self->{refresh_hook}}; 3593 for values %{delete $self->{refresh_hook}};
3001 } 3594 }
3002 3595
3003 if ($self->{check_size}) { 3596 if ($self->{realloc}) {
3004 my @queue = ([], []); 3597 my %queue;
3598 my @queue;
3599 my $widget;
3005 3600
3006 for (;;) { 3601 outer:
3007 if ($self->{check_size}) { 3602 while () {
3008 # heuristic: check containers last 3603 if (my $realloc = delete $self->{realloc}) {
3009 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3604 for $widget (values %$realloc) {
3010 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 }
3011 } 3611 }
3012 3612
3013 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3613 while () {
3614 @queue or last outer;
3014 3615
3015 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3616 $widget = pop @{ $queue[-1] || [] }
3016 ? @$widget{qw(user_w user_h)} 3617 and last;
3017 : $widget->size_request;
3018
3019 if (delete $widget->{force_alloc}
3020 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3021 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3022 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}) {
3023 $widget->{req_w} = $w; 3634 $widget->{req_w} = $w;
3024 $widget->{req_h} = $h; 3635 $widget->{req_h} = $h;
3025 3636
3026 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3637 $self->{size_alloc}{$widget+0} = $widget;
3027 3638
3028 $widget->{parent}->check_size
3029 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 }
3030 } 3646 }
3647
3648 delete $self->{realloc}{$widget+0};
3031 } 3649 }
3032 } 3650 }
3033 3651
3034 while ($self->{size_alloc}) { 3652 while (my $size_alloc = delete $self->{size_alloc}) {
3035 for (values %{delete $self->{size_alloc}}) { 3653 my @queue = sort { $b->{visible} <=> $a->{visible} }
3036 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)};
3037 3660
3038 $w = 0 if $w < 0; 3661 $w = 0 if $w < 0;
3039 $h = 0 if $h < 0; 3662 $h = 0 if $h < 0;
3040 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
3041 $widget->{w} = $w; 3671 $widget->{w} = $w;
3042 $widget->{h} = $h; 3672 $widget->{h} = $h;
3043 $widget->size_allocate ($w, $h); 3673
3044 $widget->emit (size_allocate => $w, $h); 3674 $widget->emit (size_allocate => $w, $h);
3675 }
3045 } 3676 }
3046 } 3677 }
3047 3678
3048 while ($self->{post_alloc_hook}) { 3679 while ($self->{post_alloc_hook}) {
3049 $_->() 3680 $_->()
3050 for values %{delete $self->{post_alloc_hook}}; 3681 for values %{delete $self->{post_alloc_hook}};
3051 } 3682 }
3052 3683
3684
3053 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3685 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3054 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3686 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3055 glClear GL_COLOR_BUFFER_BIT; 3687 glClear GL_COLOR_BUFFER_BIT;
3056 3688
3057 glMatrixMode GL_PROJECTION; 3689 glMatrixMode GL_PROJECTION;
3058 glLoadIdentity; 3690 glLoadIdentity;
3059 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3691 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3060 glMatrixMode GL_MODELVIEW; 3692 glMatrixMode GL_MODELVIEW;
3061 glLoadIdentity; 3693 glLoadIdentity;
3062 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
3063 $self->_draw; 3702 $self->_draw;
3064} 3703}
3065 3704
3066############################################################################# 3705#############################################################################
3067 3706

Diff Legend

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