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.214 by root, Wed May 17 22:59:13 2006 UTC vs.
Revision 1.279 by root, Mon Jun 5 00:17:47 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
18 20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
19sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
20 if (!$GRAB) { 47 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
25 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
26 54
27 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
28 56
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 58
31 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 60 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($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# glColorMask 1, 1, 1, 0;
697# glEnable GL_BLEND;
698# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
699# glRasterPos 0, 0;
700# glCopyPixels 0, 0, $self->{w}, $self->{h};
701# glDisable GL_BLEND;
702# glColorMask 1, 1, 1, 1;
703 }; 847 };
704} 848}
705 849
706sub _draw { 850sub _draw {
707 my ($self) = @_; 851 my ($self) = @_;
708 852
709 my ($w, $h) = ($self->w, $self->h); 853 my ($w, $h) = @$self{qw(w h)};
710 854
711 my $tex = $self->{texture} 855 my $tex = $self->{texture}
712 or return; 856 or return;
713 857
714 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
… …
724 868
725package CFClient::UI::ViewPort; 869package CFClient::UI::ViewPort;
726 870
727our @ISA = CFClient::UI::Window::; 871our @ISA = CFClient::UI::Window::;
728 872
873sub new {
874 my $class = shift;
875
876 $class->SUPER::new (
877 scroll_x => 0,
878 scroll_y => 1,
879 @_,
880 )
881}
882
729sub size_request { 883sub size_request {
730 my ($self) = @_; 884 my ($self) = @_;
731 885
732 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 886 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
733 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
734 887
735 @$self{qw(child_w child_h)} 888 $w = 10 if $self->{scroll_x};
889 $h = 10 if $self->{scroll_y};
890
891 ($w, $h)
736} 892}
737 893
738sub size_allocate { 894sub size_allocate {
739 my ($self, $w, $h) = @_; 895 my ($self, $w, $h) = @_;
740 896
897 my $child = $self->child;
898
899 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
900 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
901
902 $self->child->configure (0, 0, $w, $h);
741 $self->update; 903 $self->update;
742} 904}
743 905
744sub set_offset { 906sub set_offset {
745 my ($self, $x, $y) = @_; 907 my ($self, $x, $y) = @_;
… …
779} 941}
780 942
781sub _render { 943sub _render {
782 my ($self) = @_; 944 my ($self) = @_;
783 945
946 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
947 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
948
784 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 949 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
785 950
786 $self->SUPER::_render; 951 $self->SUPER::_render;
787} 952}
788 953
… …
791package CFClient::UI::ScrolledWindow; 956package CFClient::UI::ScrolledWindow;
792 957
793our @ISA = CFClient::UI::HBox::; 958our @ISA = CFClient::UI::HBox::;
794 959
795sub new { 960sub new {
796 my $class = shift; 961 my ($class, %arg) = @_;
962
963 my $child = delete $arg{child};
797 964
798 my $self; 965 my $self;
799 966
800 my $slider = new CFClient::UI::Slider 967 my $slider = new CFClient::UI::Slider
801 vertical => 1, 968 vertical => 1,
802 range => [0, 0, 1, 0.01], # HACK fix 969 range => [0, 0, 1, 0.01], # HACK fix
803 connect_changed => sub { 970 on_changed => sub {
804 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 971 $self->{vp}->set_offset (0, $_[1]);
805 }, 972 },
806 ; 973 ;
807 974
808 $self = $class->SUPER::new ( 975 $self = $class->SUPER::new (
809 vp => (new CFClient::UI::ViewPort), 976 vp => (new CFClient::UI::ViewPort expand => 1),
810 slider => $slider, 977 slider => $slider,
811 @_, 978 %arg,
812 ); 979 );
813 980
814 $self->{vp}->add ($self->{scrolled});
815 $self->add ($self->{vp});
816 $self->add ($self->{slider}); 981 $self->SUPER::add ($self->{vp}, $self->{slider});
982 $self->add ($child) if $child;
817 983
818 $self 984 $self
985}
986
987sub add {
988 my ($self, $widget) = @_;
989
990 $self->{vp}->add ($self->{child} = $widget);
991}
992
993sub update {
994 my ($self) = @_;
995
996 $self->SUPER::update;
997
998 # todo: overwrite size_allocate of child
999 my $child = $self->{vp}->child;
1000 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1001}
1002
1003sub size_allocate {
1004 my ($self, $w, $h) = @_;
1005
1006 $self->SUPER::size_allocate ($w, $h);
1007
1008 my $child = $self->{vp}->child;
1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
819} 1010}
820 1011
821#TODO# update range on size_allocate depending on child 1012#TODO# update range on size_allocate depending on child
822# update viewport offset on scroll 1013# update viewport offset on scroll
823 1014
… …
843 1034
844 if ($self->{bg}) { 1035 if ($self->{bg}) {
845 my ($w, $h) = @$self{qw(w h)}; 1036 my ($w, $h) = @$self{qw(w h)};
846 1037
847 glEnable GL_BLEND; 1038 glEnable GL_BLEND;
848 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1039 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
849 glColor @{ $self->{bg} }; 1040 glColor_premultiply @{ $self->{bg} };
850 1041
851 glBegin GL_QUADS; 1042 glBegin GL_QUADS;
852 glVertex 0 , 0; 1043 glVertex 0 , 0;
853 glVertex 0 , $h; 1044 glVertex 0 , $h;
854 glVertex $w, $h; 1045 glVertex $w, $h;
… …
867 1058
868our @ISA = CFClient::UI::Bin::; 1059our @ISA = CFClient::UI::Bin::;
869 1060
870use CFClient::OpenGL; 1061use CFClient::OpenGL;
871 1062
872my @tex = 1063my $bg =
1064 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1065 mipmap => 1, wrap => 1;
1066
1067my @border =
873 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1068 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
874 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1069 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
875 1070
876sub new { 1071sub new {
877 my $class = shift; 1072 my ($class, %arg) = @_;
878 1073
879 # TODO: user_x, user_y, overwrite moveto? 1074 my $title = delete $arg{title};
880 1075
881 my $self = $class->SUPER::new ( 1076 my $self = $class->SUPER::new (
882 bg => [1, 1, 1, 1], 1077 bg => [1, 1, 1, 1],
883 border_bg => [1, 1, 1, 1], 1078 border_bg => [1, 1, 1, 1],
884 border => 0.6, 1079 border => 0.6,
885 toplevel => 1,
886 can_events => 1, 1080 can_events => 1,
887 @_ 1081 min_w => 16,
1082 min_h => 16,
1083 %arg,
888 ); 1084 );
889 1085
890 $self->{title} &&= new CFClient::UI::Label 1086 $self->{title} = new CFClient::UI::Label
891 align => 0, 1087 align => 0,
892 valign => 1, 1088 valign => 1,
893 text => $self->{title}, 1089 text => $title,
894 fontsize => $self->{border}; 1090 fontsize => $self->{border}
1091 if defined $title;
895 1092
896 $self 1093 $self
1094}
1095
1096sub add {
1097 my ($self, @widgets) = @_;
1098
1099 $self->SUPER::add (@widgets);
1100 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
897} 1101}
898 1102
899sub border { 1103sub border {
900 int $_[0]{border} * $::FONTSIZE 1104 int $_[0]{border} * $::FONTSIZE
901} 1105}
902 1106
903sub size_request { 1107sub size_request {
904 my ($self) = @_; 1108 my ($self) = @_;
1109
1110 $self->{title}->size_request
1111 if $self->{title};
905 1112
906 my ($w, $h) = $self->SUPER::size_request; 1113 my ($w, $h) = $self->SUPER::size_request;
907 1114
908 ( 1115 (
909 $w + $self->border * 2, 1116 $w + $self->border * 2,
… …
912} 1119}
913 1120
914sub size_allocate { 1121sub size_allocate {
915 my ($self, $w, $h) = @_; 1122 my ($self, $w, $h) = @_;
916 1123
1124 if ($self->{title}) {
1125 $self->{title}{w} = $w;
1126 $self->{title}{h} = $h;
1127 $self->{title}->size_allocate ($w, $h);
1128 }
1129
1130 my $border = $self->border;
1131
917 $h -= List::Util::max 0, $self->border * 2; 1132 $h -= List::Util::max 0, $border * 2;
918 $w -= List::Util::max 0, $self->border * 2; 1133 $w -= List::Util::max 0, $border * 2;
919 1134
920 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
921 if $self->{title};
922
923 $self->child->configure ($self->border, $self->border, $w, $h); 1135 $self->child->configure ($border, $border, $w, $h);
924} 1136}
925 1137
926sub button_down { 1138sub button_down {
927 my ($self, $ev, $x, $y) = @_; 1139 my ($self, $ev, $x, $y) = @_;
928 1140
… …
944 my ($ev, $x, $y) = @_; 1156 my ($ev, $x, $y) = @_;
945 1157
946 my $dx = $ev->{x} - $ox; 1158 my $dx = $ev->{x} - $ox;
947 my $dy = $ev->{y} - $oy; 1159 my $dy = $ev->{y} - $oy;
948 1160
949 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1161 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
950 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1162 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1163
951 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
952 $self->check_size; 1165 $self->realloc;
953 }; 1166 };
954 1167
955 } elsif ($lr ^ $td) { 1168 } elsif ($lr ^ $td) {
956 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1169 my ($ox, $oy) = ($ev->{x}, $ev->{y});
957 my ($bx, $by) = ($self->{x}, $self->{y}); 1170 my ($bx, $by) = ($self->{x}, $self->{y});
… …
959 $self->{motion} = sub { 1172 $self->{motion} = sub {
960 my ($ev, $x, $y) = @_; 1173 my ($ev, $x, $y) = @_;
961 1174
962 ($x, $y) = ($ev->{x}, $ev->{y}); 1175 ($x, $y) = ($ev->{x}, $ev->{y});
963 1176
964 $self->move ($bx + $x - $ox, $by + $y - $oy); 1177 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
965 $self->update; 1178 # HACK: the next line is required to enforce placement
1179 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
966 }; 1180 };
1181 } else {
1182 return 0;
1183 }
1184
967 } 1185 1
968} 1186}
969 1187
970sub button_up { 1188sub button_up {
971 my ($self, $ev, $x, $y) = @_; 1189 my ($self, $ev, $x, $y) = @_;
972 1190
973 delete $self->{motion}; 1191 !!delete $self->{motion}
974} 1192}
975 1193
976sub mouse_motion { 1194sub mouse_motion {
977 my ($self, $ev, $x, $y) = @_; 1195 my ($self, $ev, $x, $y) = @_;
978 1196
979 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1197 $self->{motion}->($ev, $x, $y) if $self->{motion};
1198
1199 !!$self->{motion}
980} 1200}
981 1201
982sub _draw { 1202sub _draw {
983 my ($self) = @_; 1203 my ($self) = @_;
984 1204
1205 my $child = $self->{children}[0];
1206
985 my ($w, $h ) = ($self->{w}, $self->{h}); 1207 my ($w, $h ) = ($self->{w}, $self->{h});
986 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1208 my ($cw, $ch) = ($child->{w}, $child->{h});
987 1209
988 glEnable GL_TEXTURE_2D; 1210 glEnable GL_TEXTURE_2D;
989 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1211 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
990 1212
991 my $border = $self->border; 1213 my $border = $self->border;
992 1214
993 glColor @{ $self->{border_bg} }; 1215 glColor @{ $self->{border_bg} };
994 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1216 $border[0]->draw_quad_alpha (0, 0, $w, $border);
995 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1217 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
996 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1218 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
997 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1219 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
998 1220
999 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1221 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1000 my $bg = $tex[0]; 1222 glColor @{ $self->{bg} };
1001 1223
1002 # TODO: repeat texture not scale 1224 # TODO: repeat texture not scale
1225 # solve this better(?)
1003 my $rep_x = $cw / $bg->{w}; 1226 $bg->{s} = $cw / $bg->{w};
1004 my $rep_y = $ch / $bg->{h}; 1227 $bg->{t} = $ch / $bg->{h};
1005
1006 glColor @{ $self->{bg} };
1007
1008 $bg->{s} = $rep_x;
1009 $bg->{t} = $rep_y;
1010 $bg->{wrap_mode} = 1;
1011 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1228 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1012 } 1229 }
1013 1230
1014 glDisable GL_TEXTURE_2D; 1231 glDisable GL_TEXTURE_2D;
1015 1232
1016 $self->{title}->draw if $self->{title};
1017
1018 $self->child->draw; 1233 $child->draw;
1234
1235 if ($self->{title}) {
1236 glTranslate 0, $border - $self->{h};
1237 $self->{title}->_draw;
1238 }
1019} 1239}
1020 1240
1021############################################################################# 1241#############################################################################
1022 1242
1023package CFClient::UI::Table; 1243package CFClient::UI::Table;
… …
1031sub new { 1251sub new {
1032 my $class = shift; 1252 my $class = shift;
1033 1253
1034 $class->SUPER::new ( 1254 $class->SUPER::new (
1035 col_expand => [], 1255 col_expand => [],
1036 @_ 1256 @_,
1037 ) 1257 )
1258}
1259
1260sub children {
1261 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1038} 1262}
1039 1263
1040sub add { 1264sub add {
1041 my ($self, $x, $y, $child) = @_; 1265 my ($self, $x, $y, $child) = @_;
1042 1266
1043 $child->set_parent ($self); 1267 $child->set_parent ($self);
1044 $self->{children}[$y][$x] = $child; 1268 $self->{children}[$y][$x] = $child;
1045 1269
1046 $child->check_size; 1270 $self->realloc;
1047} 1271}
1048 1272
1049sub children {
1050 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1051}
1052
1053# TODO: move to container class maybe? send childs a signal on removal? 1273# TODO: move to container class maybe? send children a signal on removal?
1054sub clear { 1274sub clear {
1055 my ($self) = @_; 1275 my ($self) = @_;
1056 1276
1057 my @children = $self->children; 1277 my @children = $self->children;
1058 delete $self->{children}; 1278 delete $self->{children};
… …
1060 for (@children) { 1280 for (@children) {
1061 delete $_->{parent}; 1281 delete $_->{parent};
1062 $_->hide; 1282 $_->hide;
1063 } 1283 }
1064 1284
1065 $self->update; 1285 $self->realloc;
1066} 1286}
1067 1287
1068sub get_wh { 1288sub get_wh {
1069 my ($self) = @_; 1289 my ($self) = @_;
1070 1290
… …
1101sub size_allocate { 1321sub size_allocate {
1102 my ($self, $w, $h) = @_; 1322 my ($self, $w, $h) = @_;
1103 1323
1104 my ($ws, $hs) = $self->get_wh; 1324 my ($ws, $hs) = $self->get_wh;
1105 1325
1106 my $req_w = sum @$ws; 1326 my $req_w = (sum @$ws) || 1;
1107 my $req_h = sum @$hs; 1327 my $req_h = (sum @$hs) || 1;
1108 1328
1109 # TODO: nicer code && do row_expand 1329 # TODO: nicer code && do row_expand
1110 my @col_expand = @{$self->{col_expand}}; 1330 my @col_expand = @{$self->{col_expand}};
1111 @col_expand = (1) x @$ws unless @col_expand; 1331 @col_expand = (1) x @$ws unless @col_expand;
1112 my $col_expand = (sum @col_expand) || 1; 1332 my $col_expand = (sum @col_expand) || 1;
… …
1166 } 1386 }
1167} 1387}
1168 1388
1169############################################################################# 1389#############################################################################
1170 1390
1171package CFClient::UI::HBox; 1391package CFClient::UI::Box;
1172
1173# TODO: wrap into common Box base class
1174 1392
1175our @ISA = CFClient::UI::Container::; 1393our @ISA = CFClient::UI::Container::;
1176 1394
1177sub size_request { 1395sub size_request {
1178 my ($self) = @_; 1396 my ($self) = @_;
1179 1397
1180 my @alloc = map [$_->size_request], @{$self->{children}}; 1398 $self->{vertical}
1181 1399 ? (
1182 ( 1400 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1183 (List::Util::sum map $_->[0], @alloc), 1401 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1184 (List::Util::max map $_->[1], @alloc), 1402 )
1185 ) 1403 : (
1404 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1405 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1406 )
1186} 1407}
1187 1408
1188sub size_allocate { 1409sub size_allocate {
1189 my ($self, $w, $h) = @_; 1410 my ($self, $w, $h) = @_;
1190 1411
1191 ($h, $w) = ($w, $h); 1412 my $space = $self->{vertical} ? $h : $w;
1192
1193 my $children = $self->{children}; 1413 my $children = $self->{children};
1194 1414
1195 my @h = map $_->{req_w}, @$children; 1415 my @req;
1196 1416
1197 my $req_h = List::Util::sum @h; 1417 if ($self->{homogeneous}) {
1198 1418 @req = ($space / (@$children || 1)) x @$children;
1199 if ($req_h > $h) {
1200 # ah well, not enough space
1201 $_ *= $h / $req_h for @h;
1202 } else { 1419 } else {
1420 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1421 my $req = List::Util::sum @req;
1422
1423 if ($req > $space) {
1424 # ah well, not enough space
1425 $_ *= $space / $req for @req;
1426 } else {
1203 my $exp = List::Util::sum map $_->{expand}, @$children; 1427 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1204 $exp ||= 1;
1205 1428
1429 $space = ($space - $req) / $expand; # remaining space to give away
1430
1431 $req[$_] += $space * $children->[$_]{expand}
1206 for (0 .. $#$children) { 1432 for 0 .. $#$children;
1207 my $child = $children->[$_];
1208
1209 my $alloc_h = $h[$_];
1210 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1211 $h[$_] = $alloc_h;
1212 } 1433 }
1213 } 1434 }
1214 1435
1215 CFClient::UI::harmonize \@h; 1436 CFClient::UI::harmonize \@req;
1216 1437
1217 my $y = 0; 1438 my $pos = 0;
1218 for (0 .. $#$children) { 1439 for (0 .. $#$children) {
1219 my $child = $children->[$_];
1220 my $h = $h[$_]; 1440 my $alloc = $req[$_];
1221 $child->configure ($y, 0, $h, $w); 1441 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1222 1442
1223 $y += $h; 1443 $pos += $alloc;
1224 } 1444 }
1225 1445
1226 1 1446 1
1227} 1447}
1228 1448
1229############################################################################# 1449#############################################################################
1230 1450
1451package CFClient::UI::HBox;
1452
1453our @ISA = CFClient::UI::Box::;
1454
1455sub new {
1456 my $class = shift;
1457
1458 $class->SUPER::new (
1459 vertical => 0,
1460 @_,
1461 )
1462}
1463
1464#############################################################################
1465
1231package CFClient::UI::VBox; 1466package CFClient::UI::VBox;
1232 1467
1233# TODO: wrap into common Box base class
1234
1235our @ISA = CFClient::UI::Container::; 1468our @ISA = CFClient::UI::Box::;
1236 1469
1237sub size_request { 1470sub new {
1238 my ($self) = @_; 1471 my $class = shift;
1239 1472
1240 my @alloc = map [$_->size_request], @{$self->{children}}; 1473 $class->SUPER::new (
1241 1474 vertical => 1,
1242 ( 1475 @_,
1243 (List::Util::max map $_->[0], @alloc),
1244 (List::Util::sum map $_->[1], @alloc),
1245 ) 1476 )
1246}
1247
1248sub size_allocate {
1249 my ($self, $w, $h) = @_;
1250
1251 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1252
1253 my $children = $self->{children};
1254
1255 my @h = map $_->{req_h}, @$children;
1256
1257 my $req_h = List::Util::sum @h;
1258
1259 if ($req_h > $h) {
1260 # ah well, not enough space
1261 $_ *= $h / $req_h for @h;
1262 } else {
1263 my $exp = List::Util::sum map $_->{expand}, @$children;
1264 $exp ||= 1;
1265
1266 for (0 .. $#$children) {
1267 my $child = $children->[$_];
1268
1269 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1270 }
1271 }
1272
1273 CFClient::UI::harmonize \@h;
1274
1275 my $y = 0;
1276 for (0 .. $#$children) {
1277 my $child = $children->[$_];
1278 my $h = $h[$_];
1279 $child->configure (0, $y, $w, $h);
1280
1281 $y += $h;
1282 }
1283
1284 1
1285} 1477}
1286 1478
1287############################################################################# 1479#############################################################################
1288 1480
1289package CFClient::UI::Label; 1481package CFClient::UI::Label;
… …
1306 ellipsise => 3, # end 1498 ellipsise => 3, # end
1307 layout => (new CFClient::Layout), 1499 layout => (new CFClient::Layout),
1308 fontsize => 1, 1500 fontsize => 1,
1309 align => -1, 1501 align => -1,
1310 valign => -1, 1502 valign => -1,
1311 padding => 2, 1503 padding_x => 2,
1504 padding_y => 2,
1312 can_events => 0, 1505 can_events => 0,
1313 %arg 1506 %arg
1314 ); 1507 );
1315 1508
1316 if (exists $self->{template}) { 1509 if (exists $self->{template}) {
… …
1352 $self->{text} = "T$text"; 1545 $self->{text} = "T$text";
1353 1546
1354 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1547 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1355 $self->{layout}->set_text ($text); 1548 $self->{layout}->set_text ($text);
1356 1549
1550 $self->realloc;
1357 $self->update; 1551 $self->update;
1358 $self->check_size;
1359} 1552}
1360 1553
1361sub set_markup { 1554sub set_markup {
1362 my ($self, $markup) = @_; 1555 my ($self, $markup) = @_;
1363 1556
… …
1367 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1560 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1368 1561
1369 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1562 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1370 $self->{layout}->set_markup ($markup); 1563 $self->{layout}->set_markup ($markup);
1371 1564
1565 $self->realloc;
1372 $self->update; 1566 $self->update;
1373 $self->check_size;
1374} 1567}
1375 1568
1376sub size_request { 1569sub size_request {
1377 my ($self) = @_; 1570 my ($self) = @_;
1378 1571
… …
1392 1585
1393 $w = List::Util::max $w, $w2; 1586 $w = List::Util::max $w, $w2;
1394 $h = List::Util::max $h, $h2; 1587 $h = List::Util::max $h, $h2;
1395 } 1588 }
1396 1589
1397 ( 1590 ($w, $h)
1398 $w + $self->{padding} * 2,
1399 $h + $self->{padding} * 2,
1400 )
1401} 1591}
1402 1592
1403sub size_allocate { 1593sub size_allocate {
1404 my ($self, $w, $h) = @_; 1594 my ($self, $w, $h) = @_;
1405 1595
1596 delete $self->{ox};
1597
1406 delete $self->{texture}; 1598 delete $self->{texture}
1599 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1407} 1600}
1408 1601
1409sub set_fontsize { 1602sub set_fontsize {
1410 my ($self, $fontsize) = @_; 1603 my ($self, $fontsize) = @_;
1411 1604
1412 $self->{fontsize} = $fontsize; 1605 $self->{fontsize} = $fontsize;
1413 delete $self->{texture}; 1606 delete $self->{texture};
1414 1607
1415 $self->update; 1608 $self->realloc;
1416 $self->check_size;
1417} 1609}
1418 1610
1419sub _draw { 1611sub _draw {
1420 my ($self) = @_; 1612 my ($self) = @_;
1421 1613
… …
1427 $self->{layout}->set_width ($self->{w}); 1619 $self->{layout}->set_width ($self->{w});
1428 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1620 $self->{layout}->set_ellipsise ($self->{ellipsise});
1429 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1621 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1430 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1622 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1431 1623
1432 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1624 new_from_layout CFClient::Texture $self->{layout}
1625 };
1433 1626
1627 unless (exists $self->{ox}) {
1434 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1628 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1435 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1629 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1436 : ($self->{w} - $tex->{w}) * 0.5); 1630 : ($self->{w} - $tex->{w}) * 0.5);
1437 1631
1438 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1632 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1439 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1633 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1440 : ($self->{h} - $tex->{h}) * 0.5); 1634 : ($self->{h} - $tex->{h}) * 0.5);
1441
1442 $tex
1443 }; 1635 };
1444 1636
1445 glEnable GL_TEXTURE_2D; 1637 glEnable GL_TEXTURE_2D;
1446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1638 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1447 1639
1640 glColor_premultiply @{$self->{fg}}
1448 if ($tex->{format} == GL_ALPHA) { 1641 if $tex->{format} == GL_ALPHA;
1449 glColor @{$self->{fg}}; 1642
1450 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1451 } else {
1452 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1453 }
1454 1644
1455 glDisable GL_TEXTURE_2D; 1645 glDisable GL_TEXTURE_2D;
1456} 1646}
1457 1647
1458############################################################################# 1648#############################################################################
… …
1473 active_fg => [0, 0, 0], 1663 active_fg => [0, 0, 0],
1474 can_hover => 1, 1664 can_hover => 1,
1475 can_focus => 1, 1665 can_focus => 1,
1476 valign => 0, 1666 valign => 0,
1477 can_events => 1, 1667 can_events => 1,
1668 #text => ...
1478 @_ 1669 @_
1479 ) 1670 )
1480} 1671}
1481 1672
1482sub _set_text { 1673sub _set_text {
… …
1484 1675
1485 delete $self->{cur_h}; 1676 delete $self->{cur_h};
1486 1677
1487 return if $self->{text} eq $text; 1678 return if $self->{text} eq $text;
1488 1679
1489 delete $self->{texture};
1490
1491 $self->{last_activity} = $::NOW; 1680 $self->{last_activity} = $::NOW;
1492 $self->{text} = $text; 1681 $self->{text} = $text;
1493 1682
1494 $text =~ s/./*/g if $self->{hidden}; 1683 $text =~ s/./*/g if $self->{hidden};
1495 $self->{layout}->set_text ("$text "); 1684 $self->{layout}->set_text ("$text ");
1496 1685
1497 $self->emit (changed => $self->{text}); 1686 $self->_emit (changed => $self->{text});
1687 $self->update;
1498} 1688}
1499 1689
1500sub set_text { 1690sub set_text {
1501 my ($self, $text) = @_; 1691 my ($self, $text) = @_;
1502 1692
1503 $self->{cursor} = length $text; 1693 $self->{cursor} = length $text;
1504 $self->_set_text ($text); 1694 $self->_set_text ($text);
1505 $self->update; 1695
1506 $self->check_size; 1696 $self->realloc;
1507} 1697}
1508 1698
1509sub get_text { 1699sub get_text {
1510 $_[0]{text} 1700 $_[0]{text}
1511} 1701}
… …
1514 my ($self) = @_; 1704 my ($self) = @_;
1515 1705
1516 my ($w, $h) = $self->SUPER::size_request; 1706 my ($w, $h) = $self->SUPER::size_request;
1517 1707
1518 ($w + 1, $h) # add 1 for cursor 1708 ($w + 1, $h) # add 1 for cursor
1519}
1520
1521sub size_allocate {
1522 my ($self, $w, $h) = @_;
1523
1524 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1525} 1709}
1526 1710
1527sub key_down { 1711sub key_down {
1528 my ($self, $ev) = @_; 1712 my ($self, $ev) = @_;
1529 1713
… …
1544 } elsif ($sym == CFClient::SDLK_HOME) { 1728 } elsif ($sym == CFClient::SDLK_HOME) {
1545 $self->{cursor} = 0; 1729 $self->{cursor} = 0;
1546 } elsif ($sym == CFClient::SDLK_END) { 1730 } elsif ($sym == CFClient::SDLK_END) {
1547 $self->{cursor} = length $text; 1731 $self->{cursor} = length $text;
1548 } elsif ($uni == 27) { 1732 } elsif ($uni == 27) {
1549 $self->emit ('escape'); 1733 $self->_emit ('escape');
1550 } elsif ($uni) { 1734 } elsif ($uni) {
1551 substr $text, $self->{cursor}++, 0, chr $uni; 1735 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else {
1737 return 0;
1552 } 1738 }
1553 1739
1554 $self->_set_text ($text); 1740 $self->_set_text ($text);
1555 $self->update; 1741
1556 $self->check_size; 1742 $self->realloc;
1743
1744 1
1557} 1745}
1558 1746
1559sub focus_in { 1747sub focus_in {
1560 my ($self) = @_; 1748 my ($self) = @_;
1561 1749
… …
1576 utf8::encode $text; 1764 utf8::encode $text;
1577 $self->{cursor} = length substr $text, 0, $idx; 1765 $self->{cursor} = length substr $text, 0, $idx;
1578 1766
1579 $self->_set_text ($self->{text}); 1767 $self->_set_text ($self->{text});
1580 $self->update; 1768 $self->update;
1769
1770 1
1581} 1771}
1582 1772
1583sub mouse_motion { 1773sub mouse_motion {
1584 my ($self, $ev, $x, $y) = @_; 1774 my ($self, $ev, $x, $y) = @_;
1585# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1775# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1776
1777 0
1586} 1778}
1587 1779
1588sub _draw { 1780sub _draw {
1589 my ($self) = @_; 1781 my ($self) = @_;
1590 1782
1591 local $self->{fg} = $self->{fg}; 1783 local $self->{fg} = $self->{fg};
1592 1784
1593 if ($FOCUS == $self) { 1785 if ($FOCUS == $self) {
1594 glColor @{$self->{active_bg}}; 1786 glColor_premultiply @{$self->{active_bg}};
1595 $self->{fg} = $self->{active_fg}; 1787 $self->{fg} = $self->{active_fg};
1596 } else { 1788 } else {
1597 glColor @{$self->{bg}}; 1789 glColor_premultiply @{$self->{bg}};
1598 } 1790 }
1599 1791
1600 glEnable GL_BLEND; 1792 glEnable GL_BLEND;
1601 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1793 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1602 glBegin GL_QUADS; 1794 glBegin GL_QUADS;
1603 glVertex 0 , 0; 1795 glVertex 0 , 0;
1604 glVertex 0 , $self->{h}; 1796 glVertex 0 , $self->{h};
1605 glVertex $self->{w}, $self->{h}; 1797 glVertex $self->{w}, $self->{h};
1606 glVertex $self->{w}, 0; 1798 glVertex $self->{w}, 0;
… …
1641 if ($sym == 13) { 1833 if ($sym == 13) {
1642 unshift @{$self->{history}}, 1834 unshift @{$self->{history}},
1643 my $txt = $self->get_text; 1835 my $txt = $self->get_text;
1644 $self->{history_pointer} = -1; 1836 $self->{history_pointer} = -1;
1645 $self->{history_saveback} = ''; 1837 $self->{history_saveback} = '';
1646 $self->emit (activate => $txt); 1838 $self->_emit (activate => $txt);
1647 $self->update; 1839 $self->update;
1648 1840
1649 } elsif ($sym == CFClient::SDLK_UP) { 1841 } elsif ($sym == CFClient::SDLK_UP) {
1650 if ($self->{history_pointer} < 0) { 1842 if ($self->{history_pointer} < 0) {
1651 $self->{history_saveback} = $self->get_text; 1843 $self->{history_saveback} = $self->get_text;
… …
1667 } else { 1859 } else {
1668 $self->set_text ($self->{history_saveback}); 1860 $self->set_text ($self->{history_saveback});
1669 } 1861 }
1670 1862
1671 } else { 1863 } else {
1672 $self->SUPER::key_down ($ev); 1864 return $self->SUPER::key_down ($ev)
1865 }
1866
1673 } 1867 1
1674
1675} 1868}
1676 1869
1677############################################################################# 1870#############################################################################
1678 1871
1679package CFClient::UI::Button; 1872package CFClient::UI::Button;
… …
1688 1881
1689sub new { 1882sub new {
1690 my $class = shift; 1883 my $class = shift;
1691 1884
1692 $class->SUPER::new ( 1885 $class->SUPER::new (
1693 padding => 4, 1886 padding_x => 4,
1887 padding_y => 4,
1694 fg => [1, 1, 1], 1888 fg => [1, 1, 1],
1695 active_fg => [0, 0, 1], 1889 active_fg => [0, 0, 1],
1696 can_hover => 1, 1890 can_hover => 1,
1697 align => 0, 1891 align => 0,
1698 valign => 0, 1892 valign => 0,
1699 can_events => 1, 1893 can_events => 1,
1700 @_ 1894 @_
1701 ) 1895 )
1702} 1896}
1703 1897
1898sub activate { }
1899
1704sub button_up { 1900sub button_up {
1705 my ($self, $ev, $x, $y) = @_; 1901 my ($self, $ev, $x, $y) = @_;
1706 1902
1903 $self->emit ("activate")
1707 if ($x >= 0 && $x < $self->{w} 1904 if $x >= 0 && $x < $self->{w}
1708 && $y >= 0 && $y < $self->{h}) { 1905 && $y >= 0 && $y < $self->{h};
1709 $self->emit ("activate"); 1906
1710 } 1907 1
1711} 1908}
1712 1909
1713sub _draw { 1910sub _draw {
1714 my ($self) = @_; 1911 my ($self) = @_;
1715 1912
1716 local $self->{fg} = $self->{fg}; 1913 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1717
1718 if ($GRAB == $self) {
1719 $self->{fg} = $self->{active_fg};
1720 }
1721 1914
1722 glEnable GL_TEXTURE_2D; 1915 glEnable GL_TEXTURE_2D;
1723 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1916 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1724 glColor 0, 0, 0, 1; 1917 glColor 0, 0, 0, 1;
1725 1918
… …
1744 1937
1745sub new { 1938sub new {
1746 my $class = shift; 1939 my $class = shift;
1747 1940
1748 $class->SUPER::new ( 1941 $class->SUPER::new (
1749 padding => 2, 1942 padding_x => 2,
1943 padding_y => 2,
1750 fg => [1, 1, 1], 1944 fg => [1, 1, 1],
1751 active_fg => [1, 1, 0], 1945 active_fg => [1, 1, 0],
1752 bg => [0, 0, 0, 0.2], 1946 bg => [0, 0, 0, 0.2],
1753 active_bg => [1, 1, 1, 0.5], 1947 active_bg => [1, 1, 1, 0.5],
1754 state => 0, 1948 state => 0,
… …
1758} 1952}
1759 1953
1760sub size_request { 1954sub size_request {
1761 my ($self) = @_; 1955 my ($self) = @_;
1762 1956
1763 ($self->{padding} * 2 + 6) x 2 1957 (6) x 2
1764} 1958}
1765 1959
1766sub button_down { 1960sub button_down {
1767 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1768 1962
1769 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1963 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1770 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1964 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1771 $self->{state} = !$self->{state}; 1965 $self->{state} = !$self->{state};
1772 $self->emit (changed => $self->{state}); 1966 $self->_emit (changed => $self->{state});
1967 } else {
1968 return 0
1969 }
1970
1773 } 1971 1
1774} 1972}
1775 1973
1776sub _draw { 1974sub _draw {
1777 my ($self) = @_; 1975 my ($self) = @_;
1778 1976
1779 $self->SUPER::_draw; 1977 $self->SUPER::_draw;
1780 1978
1781 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1979 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1782 1980
1783 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1981 my ($w, $h) = @$self{qw(w h)};
1982
1983 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1784 1984
1785 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1985 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1786 1986
1787 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1987 my $tex = $self->{state} ? $tex[1] : $tex[0];
1788 1988
… …
1943 2143
1944 my $h1 = $self->{h} * (1 - $ycut1); 2144 my $h1 = $self->{h} * (1 - $ycut1);
1945 my $h2 = $self->{h} * (1 - $ycut2); 2145 my $h2 = $self->{h} * (1 - $ycut2);
1946 2146
1947 glEnable GL_BLEND; 2147 glEnable GL_BLEND;
1948 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2148 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2149 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1949 glEnable GL_TEXTURE_2D; 2150 glEnable GL_TEXTURE_2D;
1950 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2151 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1951 2152
1952 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2153 glBindTexture GL_TEXTURE_2D, $t1->{name};
1953 glBegin GL_QUADS; 2154 glBegin GL_QUADS;
… …
2052 my $self = $class->SUPER::new ( 2253 my $self = $class->SUPER::new (
2053 fg => [1, 1, 1], 2254 fg => [1, 1, 1],
2054 active_fg => [0, 0, 0], 2255 active_fg => [0, 0, 0],
2055 bg => [0, 0, 0, 0.2], 2256 bg => [0, 0, 0, 0.2],
2056 active_bg => [1, 1, 1, 0.5], 2257 active_bg => [1, 1, 1, 0.5],
2057 range => [0, 0, 100, 10], 2258 range => [0, 0, 100, 10, 0],
2058 req_w => $::WIDTH / 80, 2259 min_w => $::WIDTH / 80,
2059 req_h => $::WIDTH / 80, 2260 min_h => $::WIDTH / 80,
2060 vertical => 0, 2261 vertical => 0,
2061 can_hover => 1, 2262 can_hover => 1,
2062 inner_pad => .05, 2263 inner_pad => 0.02,
2063 @_ 2264 @_
2064 ); 2265 );
2065 2266
2066 $self->set_value ($self->{range}[0]); 2267 $self->set_value ($self->{range}[0]);
2067 $self->update; 2268 $self->update;
2068 2269
2069 $self 2270 $self
2070} 2271}
2071 2272
2273sub changed { }
2274
2275sub set_range {
2276 my ($self, $range) = @_;
2277
2278 ($range, $self->{range}) = ($self->{range}, $range);
2279
2280 $self->update
2281 if "@$range" ne "@{$self->{range}}";
2282}
2283
2072sub set_value { 2284sub set_value {
2073 my ($self, $value) = @_; 2285 my ($self, $value) = @_;
2074 2286
2075 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2287 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2076 2288
2077 $hi = $lo + 1 if $hi <= $lo; 2289 $hi = $lo + 1 if $hi <= $lo;
2078 2290
2291 $page = $hi - $lo if $page > $hi - $lo;
2292
2079 $value = $lo if $value < $lo; 2293 $value = $lo if $value < $lo;
2080 $value = $hi if $value > $hi; 2294 $value = $hi - $page if $value > $hi - $page;
2081 2295
2082 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2296 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2083 if $unit; 2297 if $unit;
2084 2298
2085 $page = $hi - $lo if $page > $hi - $lo;
2086
2087 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2299 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2088 2300
2089 if ($value != $old_value) { 2301 if ($value != $old_value) {
2090 $self->emit (changed => $value); 2302 $self->_emit (changed => $value);
2091 $self->update; 2303 $self->update;
2092 } 2304 }
2093} 2305}
2094 2306
2095sub size_request { 2307sub size_request {
2096 my ($self) = @_; 2308 my ($self) = @_;
2097 2309
2098 my $w = $self->{req_w}; 2310 ($self->{req_w}, $self->{req_h})
2099 my $h = $self->{req_h};
2100
2101 $self->{vertical} ? ($h, $w) : ($w, $h)
2102} 2311}
2103 2312
2104sub button_down { 2313sub button_down {
2105 my ($self, $ev, $x, $y) = @_; 2314 my ($self, $ev, $x, $y) = @_;
2106 2315
2107 $self->SUPER::button_down ($ev, $x, $y); 2316 $self->SUPER::button_down ($ev, $x, $y);
2317
2318 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2319
2108 $self->mouse_motion ($ev, $x, $y); 2320 $self->mouse_motion ($ev, $x, $y)
2109} 2321}
2110 2322
2111sub mouse_motion { 2323sub mouse_motion {
2112 my ($self, $ev, $x, $y) = @_; 2324 my ($self, $ev, $x, $y) = @_;
2113 2325
2114 if ($GRAB == $self) { 2326 if ($GRAB == $self) {
2115 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2327 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2116 2328
2117 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2329 my (undef, $lo, $hi, $page) = @{$self->{range}};
2118 2330
2119 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2331 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2120 2332
2121 $self->set_value ($x * ($hi - $lo) + $lo); 2333 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2334 } else {
2335 return 0;
2336 }
2337
2122 } 2338 1
2123} 2339}
2124 2340
2125sub update { 2341sub update {
2126 my ($self) = @_; 2342 my ($self) = @_;
2127 2343
2128 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2344 delete $self->{knob_w};
2345 $self->SUPER::update;
2346}
2347
2348sub _draw {
2349 my ($self) = @_;
2350
2351 unless ($self->{knob_w}) {
2129 $self->set_value ($self->{range}[0]); 2352 $self->set_value ($self->{range}[0]);
2130 2353
2131 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2354 my ($value, $lo, $hi, $page) = @{$self->{range}};
2355 my $range = ($hi - $page - $lo) || 1e-100;
2132 2356
2133 my $inner_w = 1 - 2 * $self->{inner_pad}; 2357 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2134 2358
2135 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2359 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2360 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2136 2361
2137 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2362 $value = ($value - $lo) / $range;
2138 $value = $self->{scale} * ($value - $lo); 2363 $value = $value * $self->{scale} + $self->{offset};
2139 2364
2140 $value = $self->{inner_pad} + ($value - $page * 0.5);
2141
2142 $value = 0 if $value < 0;
2143 $page = 1 - $value if $value + $page > 1;
2144
2145 $self->{knob_x} = $value; 2365 $self->{knob_x} = $value - $knob_w * 0.5;
2146 $self->{knob_w} = $page; 2366 $self->{knob_w} = $knob_w;
2147 }); 2367 }
2148
2149 $self->SUPER::update;
2150}
2151
2152sub _draw {
2153 my ($self) = @_;
2154 2368
2155 $self->SUPER::_draw (); 2369 $self->SUPER::_draw ();
2156 2370
2157 glScale $self->{w}, $self->{h}; 2371 glScale $self->{w}, $self->{h};
2158 2372
… …
2175 # draw handle 2389 # draw handle
2176 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2390 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2177 2391
2178 glDisable GL_TEXTURE_2D; 2392 glDisable GL_TEXTURE_2D;
2179} 2393}
2394
2395#############################################################################
2396
2397package CFClient::UI::ValSlider;
2398
2399our @ISA = CFClient::UI::HBox::;
2400
2401sub new {
2402 my ($class, %arg) = @_;
2403
2404 my $range = delete $arg{range};
2405
2406 my $self = $class->SUPER::new (
2407 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2408 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2409 to_value => sub { shift },
2410 from_value => sub { shift },
2411 %arg,
2412 );
2413
2414 $self->{slider}->connect (changed => sub {
2415 my ($self, $value) = @_;
2416 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2417 $self->{parent}->emit (changed => $value);
2418 });
2419
2420# $self->{entry}->connect (changed => sub {
2421# my ($self, $value) = @_;
2422# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2423# $self->{parent}->emit (changed => $value);
2424# });
2425
2426 $self->add ($self->{slider}, $self->{entry});
2427
2428 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2429
2430 $self
2431}
2432
2433sub set_range { shift->{slider}->set_range (@_) }
2434sub set_value { shift->{slider}->set_value (@_) }
2180 2435
2181############################################################################# 2436#############################################################################
2182 2437
2183package CFClient::UI::TextView; 2438package CFClient::UI::TextView;
2184 2439
… …
2214 2469
2215 $self->{fontsize} = $fontsize; 2470 $self->{fontsize} = $fontsize;
2216 $self->reflow; 2471 $self->reflow;
2217} 2472}
2218 2473
2219sub text_height {
2220 my ($self, $text) = @_;
2221
2222 my $layout = $self->{layout};
2223
2224 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2225 $layout->set_width ($self->{children}[0]{w});
2226 $layout->set_markup ($text);
2227
2228 ($layout->size)[1]
2229}
2230
2231sub reflow {
2232 my ($self) = @_;
2233
2234 $self->{need_reflow}++;
2235 $self->update;
2236}
2237
2238sub size_allocate { 2474sub size_allocate {
2239 my ($self, $w, $h) = @_; 2475 my ($self, $w, $h) = @_;
2240 2476
2241 $self->SUPER::size_allocate ($w, $h); 2477 $self->SUPER::size_allocate ($w, $h);
2242 2478
… …
2245 $self->{layout}->set_width ($self->{children}[0]{w}); 2481 $self->{layout}->set_width ($self->{children}[0]{w});
2246 2482
2247 $self->reflow; 2483 $self->reflow;
2248} 2484}
2249 2485
2486sub text_size {
2487 my ($self, $text, $indent) = @_;
2488
2489 my $layout = $self->{layout};
2490
2491 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2492 $layout->set_width ($self->{children}[0]{w} - $indent);
2493 $layout->set_markup ($text);
2494
2495 $layout->size
2496}
2497
2498sub reflow {
2499 my ($self) = @_;
2500
2501 $self->{need_reflow}++;
2502 $self->update;
2503}
2504
2505sub set_offset {
2506 my ($self, $offset) = @_;
2507
2508 # todo: base offset on lines or so, not on pixels
2509 $self->{children}[1]->set_value ($offset);
2510}
2511
2512sub clear {
2513 my ($self) = @_;
2514
2515 $self->{par} = [];
2516 $self->{height} = 0;
2517 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2518}
2519
2250sub add_paragraph { 2520sub add_paragraph {
2251 my ($self, $color, $text) = @_; 2521 my ($self, $color, $text, $indent) = @_;
2252 2522
2253 #TODO: intelligently "reformat" paragraph 2523 for my $line (split /\n/, $text) {
2254 2524 my ($w, $h) = $self->text_size ($line);
2255 my $height = $self->text_height ($text);
2256
2257 $self->{height} += $height; 2525 $self->{height} += $h;
2526 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2527 }
2258 2528
2259 push @{$self->{par}}, [$height, $color, $text];
2260
2261 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2529 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2262 $self->{children}[1]->update;
2263} 2530}
2264 2531
2265sub update { 2532sub update {
2266 my ($self) = @_; 2533 my ($self) = @_;
2267 2534
… …
2270 return unless $self->{h} > 0; 2537 return unless $self->{h} > 0;
2271 2538
2272 delete $self->{texture}; 2539 delete $self->{texture};
2273 2540
2274 $ROOT->on_post_alloc ($self, sub { 2541 $ROOT->on_post_alloc ($self, sub {
2542 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2543
2275 if (delete $self->{need_reflow}) { 2544 if (delete $self->{need_reflow}) {
2276 my $height = 0; 2545 my $height = 0;
2277 2546
2278 $height += $_->[0] = $self->text_height ($_->[2]) 2547 my $layout = $self->{layout};
2548
2549 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2550
2279 for @{$self->{par}}; 2551 for (@{$self->{par}}) {
2552 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2553 $layout->set_width ($W - $_->[3]);
2554 $layout->set_markup ($_->[4]);
2555 my ($w, $h) = $layout->size;
2556 $_->[0] = $w + $_->[3];
2557 $_->[1] = $h;
2558 }
2559
2560 $height += $_->[1];
2561 }
2280 2562
2281 $self->{height} = $height; 2563 $self->{height} = $height;
2282 2564
2283 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2565 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2284 2566
2285 delete $self->{texture}; 2567 delete $self->{texture};
2286 } 2568 }
2287 2569
2288 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2570 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2289 glClearColor 0, 0, 0, 0; 2571 glClearColor 0, 0, 0, 0;
2290 glClear GL_COLOR_BUFFER_BIT; 2572 glClear GL_COLOR_BUFFER_BIT;
2291 2573
2292 glEnable GL_TEXTURE_2D;
2293 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2294
2295 my $top = int $self->{children}[1]{range}[0]; 2574 my $top = int $self->{children}[1]{range}[0];
2296 2575
2297 my $y0 = $top; 2576 my $y0 = $top;
2298 my $y1 = $top + $self->{h}; 2577 my $y1 = $top + $H;
2299 2578
2300 my $y = 0; 2579 my $y = 0;
2301 2580
2302 my $layout = $self->{layout}; 2581 my $layout = $self->{layout};
2303 2582
2304 $layout->set_font ($self->{font}) if $self->{font}; 2583 $layout->set_font ($self->{font}) if $self->{font};
2305 2584
2585 glEnable GL_BLEND;
2586 #TODO# not correct in windows where rgba is forced off
2587 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2588
2306 for my $par (@{$self->{par}}) { 2589 for my $par (@{$self->{par}}) {
2307 my $h = $par->[0]; 2590 my $h = $par->[1];
2308 2591
2309 if ($y0 < $y + $h && $y < $y1) { 2592 if ($y0 < $y + $h && $y < $y1) {
2310 $layout->set_foreground (@{ $par->[1] }); 2593 $layout->set_foreground (@{ $par->[2] });
2594 $layout->set_width ($W - $par->[3]);
2311 $layout->set_markup ($par->[2]); 2595 $layout->set_markup ($par->[4]);
2312 2596
2313 my ($W, $H) = $layout->size; 2597 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2314 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2598
2599 glRasterPos $par->[3], $y - $y0;
2600 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2315 } 2601 }
2316 2602
2317 $y += $h; 2603 $y += $h;
2318 } 2604 }
2319 2605
2320 glDisable GL_TEXTURE_2D; 2606 glDisable GL_BLEND;
2321 }; 2607 };
2322 }); 2608 });
2323} 2609}
2324 2610
2325sub _draw { 2611sub _draw {
2326 my ($self) = @_; 2612 my ($self) = @_;
2327 2613
2328 glEnable GL_TEXTURE_2D; 2614 glEnable GL_TEXTURE_2D;
2329 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2615 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2330 glColor 1, 1, 1, 1; 2616 glColor 0, 0, 0, 1;
2331 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2617 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2332 glDisable GL_TEXTURE_2D; 2618 glDisable GL_TEXTURE_2D;
2333 2619
2334 $self->{children}[1]->draw; 2620 $self->{children}[1]->draw;
2335 2621
… …
2385 2671
2386sub new { 2672sub new {
2387 my $class = shift; 2673 my $class = shift;
2388 2674
2389 my $self = $class->SUPER::new ( 2675 my $self = $class->SUPER::new (
2390 state => 0, 2676 state => 0,
2391 connect_activate => \&toggle_flopper, 2677 on_activate => \&toggle_flopper,
2392 @_ 2678 @_
2393 ); 2679 );
2394 2680
2395 if ($self->{state}) {
2396 $self->{state} = 0;
2397 $self->toggle_flopper;
2398 }
2399
2400 $self 2681 $self
2401} 2682}
2402 2683
2403sub toggle_flopper { 2684sub toggle_flopper {
2404 my ($self) = @_; 2685 my ($self) = @_;
2405 2686
2406 # TODO: use animation 2687 $self->{other}->toggle_visibility;
2407 if ($self->{state} = !$self->{state}) {
2408 $CFClient::UI::ROOT->add ($self->{other});
2409 $self->{other}->move ($self->coord2global (0, $self->{h}));
2410 $self->emit ("open");
2411 } else {
2412 $CFClient::UI::ROOT->remove ($self->{other});
2413 $self->emit ("close");
2414 }
2415
2416 $self->emit (changed => $self->{state});
2417} 2688}
2418 2689
2419############################################################################# 2690#############################################################################
2420 2691
2421package CFClient::UI::Tooltip; 2692package CFClient::UI::Tooltip;
… …
2434} 2705}
2435 2706
2436sub set_tooltip_from { 2707sub set_tooltip_from {
2437 my ($self, $widget) = @_; 2708 my ($self, $widget) = @_;
2438 2709
2710 my $tooltip = $widget->{tooltip};
2711
2712 if ($ENV{CFPLUS_DEBUG} & 2) {
2713 $tooltip .= "\n\n" . (ref $widget) . "\n"
2714 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2715 . "req $widget->{req_w} $widget->{req_h}\n"
2716 . "visible $widget->{visible}";
2717 }
2718
2439 $self->add (new CFClient::UI::Label 2719 $self->add (new CFClient::UI::Label
2440 markup => $widget->{tooltip}, 2720 markup => $tooltip,
2441 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2721 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2442 fontsize => 0.8, 2722 fontsize => 0.8,
2443 fg => [0, 0, 0, 1], 2723 fg => [0, 0, 0, 1],
2444 ellipsise => 0, 2724 ellipsise => 0,
2445 font => ($widget->{tooltip_font} || $::FONT_PROP), 2725 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2456 2736
2457sub size_allocate { 2737sub size_allocate {
2458 my ($self, $w, $h) = @_; 2738 my ($self, $w, $h) = @_;
2459 2739
2460 $self->SUPER::size_allocate ($w - 4, $h - 4); 2740 $self->SUPER::size_allocate ($w - 4, $h - 4);
2741}
2742
2743sub visibility_change {
2744 my ($self, $visible) = @_;
2745
2746 return unless $visible;
2747
2748 $self->{root}->on_post_alloc ("move_$self" => sub {
2749 my $widget = $self->{owner}
2750 or return;
2751
2752 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2753
2754 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2755 if $x + $self->{w} > $::WIDTH;
2756
2757 $self->move_abs ($x, $y);
2758 });
2461} 2759}
2462 2760
2463sub _draw { 2761sub _draw {
2464 my ($self) = @_; 2762 my ($self) = @_;
2465 2763
… …
2482 glVertex $w, $h; 2780 glVertex $w, $h;
2483 glVertex $w, 0; 2781 glVertex $w, 0;
2484 glEnd; 2782 glEnd;
2485 2783
2486 glTranslate 2 - 0.375, 2 - 0.375; 2784 glTranslate 2 - 0.375, 2 - 0.375;
2785
2487 $self->SUPER::_draw; 2786 $self->SUPER::_draw;
2488} 2787}
2489 2788
2490############################################################################# 2789#############################################################################
2491 2790
… …
2496use CFClient::OpenGL; 2795use CFClient::OpenGL;
2497 2796
2498sub new { 2797sub new {
2499 my $class = shift; 2798 my $class = shift;
2500 2799
2501 $class->SUPER::new ( 2800 my $self = $class->SUPER::new (
2502 aspect => 1, 2801 aspect => 1,
2802 can_events => 0,
2503 @_, 2803 @_,
2504 ) 2804 );
2805
2806 if ($self->{anim} && $self->{animspeed}) {
2807 Scalar::Util::weaken (my $widget = $self);
2808
2809 $self->{timer} = Event->timer (
2810 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2811 hard => 1,
2812 interval => $self->{animspeed},
2813 cb => sub {
2814 ++$widget->{frame};
2815 $widget->update;
2816 },
2817 );
2818 }
2819
2820 $self
2505} 2821}
2506 2822
2507sub size_request { 2823sub size_request {
2508 (32, 8) 2824 (32, 8)
2509} 2825}
2510 2826
2827sub update {
2828 my ($self) = @_;
2829
2830 return unless $self->{visible};
2831
2832 $self->SUPER::update;
2833}
2834
2511sub _draw { 2835sub _draw {
2512 my ($self) = @_; 2836 my ($self) = @_;
2513 2837
2514 return unless $::CONN;#d# manage and cache textures differently 2838 return unless $::CONN;
2839
2840 my $face;
2841
2842 if ($self->{frame}) {
2843 my $anim = $::CONN->{anim}[$self->{anim}];
2844
2845 $face = $anim->[ $self->{frame} % @$anim ]
2846 if $anim && @$anim;
2847 }
2848
2515 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2849 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2516 2850
2517 # TODO animation
2518 if ($tex) { 2851 if ($tex) {
2519 glEnable GL_TEXTURE_2D; 2852 glEnable GL_TEXTURE_2D;
2520 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2853 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2521 glColor 1, 1, 1, 1; 2854 glColor 0, 0, 0, 1;
2522 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2855 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2523 glDisable GL_TEXTURE_2D; 2856 glDisable GL_TEXTURE_2D;
2524 } 2857 }
2525} 2858}
2526 2859
2860sub DESTROY {
2861 my ($self) = @_;
2862
2863 $self->{timer}->cancel
2864 if $self->{timer};
2865
2866 $self->SUPER::DESTROY;
2867}
2868
2527############################################################################# 2869#############################################################################
2528 2870
2529package CFClient::UI::InventoryItem; 2871package CFClient::UI::Buttonbar;
2530 2872
2531our @ISA = CFClient::UI::HBox::; 2873our @ISA = CFClient::UI::HBox::;
2532 2874
2533sub _item_to_desc { 2875# TODO: should actualyl wrap buttons and other goodies.
2534 my ($item) = @_;
2535
2536 my $desc =
2537 $item->{nrof} < 2
2538 ? $item->{name}
2539 : "$item->{nrof} $item->{name_pl}";
2540
2541 $item->{flags} & Crossfire::Protocol::F_OPEN
2542 and $desc .= " (open)";
2543 $item->{flags} & Crossfire::Protocol::F_APPLIED
2544 and $desc .= " (applied)";
2545 $item->{flags} & Crossfire::Protocol::F_UNPAID
2546 and $desc .= " (unpaid)";
2547 $item->{flags} & Crossfire::Protocol::F_MAGIC
2548 and $desc .= " (magic)";
2549 $item->{flags} & Crossfire::Protocol::F_CURSED
2550 and $desc .= " (cursed)";
2551 $item->{flags} & Crossfire::Protocol::F_DAMNED
2552 and $desc .= " (damned)";
2553 $item->{flags} & Crossfire::Protocol::F_LOCKED
2554 and $desc .= " *";
2555
2556 $desc
2557}
2558
2559sub new {
2560 my $class = shift;
2561
2562 my %args = @_;
2563
2564 my $item = delete $args{item};
2565
2566 my $desc = _item_to_desc ($item);
2567
2568 my $self = $class->SUPER::new (
2569 can_hover => 1,
2570 can_events => 1,
2571 tooltip => ((CFClient::UI::Label::escape $desc)
2572 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2573 connect_button_down => sub {
2574 my ($self, $ev, $x, $y) = @_;
2575
2576 # todo: maybe put examine on 1? but should just be a tooltip :(
2577 if ($ev->{button} == 1) {
2578 my $targ = $::CONN->{player}{tag};
2579
2580 if ($item->{container} == $::CONN->{player}{tag}) {
2581 $targ = $main::OPENCONT;
2582 }
2583
2584 $::CONN->send ("move $targ $item->{tag} 0");
2585 } elsif ($ev->{button} == 2) {
2586 $::CONN->send ("apply $item->{tag}");
2587 } elsif ($ev->{button} == 3) {
2588 my @menu_items = (
2589 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2590 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2591 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2592 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2593 [
2594 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2595 sub { $::CONN->send ("lock $item->{tag}") },
2596 ],
2597 );
2598
2599 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2600 }
2601
2602 1
2603 },
2604 %args
2605 );
2606
2607
2608 $self->add (new CFClient::UI::Face
2609 can_events => 0,
2610 face => $item->{face},
2611 anim => $item->{anim},
2612 animspeed => $item->{animspeed},
2613 );
2614
2615 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2616
2617 $self->{item} = $item;
2618
2619 $self->update_item;
2620
2621 $self
2622}
2623
2624sub update_item {
2625 my ($self) = @_;
2626
2627 my $desc = _item_to_desc ($self->{item});
2628
2629 $self->{name_lbl}->set_text ($desc);
2630}
2631
2632#############################################################################
2633
2634package CFClient::UI::Inventory;
2635
2636our @ISA = CFClient::UI::ScrolledWindow::;
2637
2638sub new {
2639 my $class = shift;
2640
2641 my $self = $class->SUPER::new (
2642 scrolled => (new CFClient::UI::VBox),
2643 @_,
2644 );
2645
2646 $self
2647}
2648
2649sub set_items {
2650 my ($self, $items) = @_;
2651
2652 $self->{scrolled}->clear;
2653 return unless $items;
2654
2655 my @items = sort {
2656 ($a->{type} <=> $b->{type})
2657 or ($a->{name} cmp $b->{name})
2658 } @$items;
2659
2660 $self->{real_items} = \@items;
2661
2662 for my $item (@items) {
2663 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2664 $item->update_item ();
2665 }
2666
2667 $self->{scrolled}->add (@items);
2668
2669# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2670}
2671
2672sub size_request {
2673 my ($self) = @_;
2674 ($self->{req_w}, $self->{req_h});
2675}
2676 2876
2677############################################################################# 2877#############################################################################
2678 2878
2679package CFClient::UI::Menu; 2879package CFClient::UI::Menu;
2680 2880
… …
2714 2914
2715# popup given the event (must be a mouse button down event currently) 2915# popup given the event (must be a mouse button down event currently)
2716sub popup { 2916sub popup {
2717 my ($self, $ev) = @_; 2917 my ($self, $ev) = @_;
2718 2918
2719 $self->emit ("popdown"); 2919 $self->_emit ("popdown");
2720 2920
2721 # maybe save $GRAB? must be careful about events... 2921 # maybe save $GRAB? must be careful about events...
2722 $GRAB = $self; 2922 $GRAB = $self;
2723 $self->{button} = $ev->{button}; 2923 $self->{button} = $ev->{button};
2724 2924
2725 $self->show; 2925 $self->show;
2726 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2926 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2727} 2927}
2728 2928
2729sub mouse_motion { 2929sub mouse_motion {
2730 my ($self, $ev, $x, $y) = @_; 2930 my ($self, $ev, $x, $y) = @_;
2731 2931
2732 # TODO: should use vbox->find_widget or so 2932 # TODO: should use vbox->find_widget or so
2733 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2933 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2734 $self->{hover} = $self->{item}{$HOVER}; 2934 $self->{hover} = $self->{item}{$HOVER};
2935
2936 0
2735} 2937}
2736 2938
2737sub button_up { 2939sub button_up {
2738 my ($self, $ev, $x, $y) = @_; 2940 my ($self, $ev, $x, $y) = @_;
2739 2941
2740 if ($ev->{button} == $self->{button}) { 2942 if ($ev->{button} == $self->{button}) {
2741 undef $GRAB; 2943 undef $GRAB;
2742 $self->hide; 2944 $self->hide;
2743 2945
2744 $self->emit ("popdown"); 2946 $self->_emit ("popdown");
2745 $self->{hover}[1]->() if $self->{hover}; 2947 $self->{hover}[1]->() if $self->{hover};
2948 } else {
2949 return 0
2950 }
2951
2952 1
2953}
2954
2955#############################################################################
2956
2957package CFClient::UI::Multiplexer;
2958
2959our @ISA = CFClient::UI::Container::;
2960
2961sub new {
2962 my $class = shift;
2963
2964 my $self = $class->SUPER::new (
2965 @_,
2966 );
2967
2968 $self->{current} = $self->{children}[0]
2969 if @{ $self->{children} };
2970
2971 $self
2972}
2973
2974sub add {
2975 my ($self, @widgets) = @_;
2976
2977 $self->SUPER::add (@widgets);
2978
2979 $self->{current} = $self->{children}[0]
2980 if @{ $self->{children} };
2981}
2982
2983sub set_current_page {
2984 my ($self, $page_or_widget) = @_;
2985
2986 my $widget = ref $page_or_widget
2987 ? $page_or_widget
2988 : $self->{children}[$page_or_widget];
2989
2990 $self->{current} = $widget;
2991 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2992
2993 $self->_emit (page_changed => $self->{current});
2994
2995 $self->realloc;
2996}
2997
2998sub visible_children {
2999 $_[0]{current}
3000}
3001
3002sub size_request {
3003 my ($self) = @_;
3004
3005 $self->{current}->size_request
3006}
3007
3008sub size_allocate {
3009 my ($self, $w, $h) = @_;
3010
3011 $self->{current}->configure (0, 0, $w, $h);
3012}
3013
3014sub _draw {
3015 my ($self) = @_;
3016
3017 $self->{current}->draw;
3018}
3019
3020#############################################################################
3021
3022package CFClient::UI::Notebook;
3023
3024our @ISA = CFClient::UI::VBox::;
3025
3026sub new {
3027 my $class = shift;
3028
3029 my $self = $class->SUPER::new (
3030 buttonbar => (new CFClient::UI::Buttonbar),
3031 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3032 # filter => # will be put between multiplexer and $self
3033 @_,
3034 );
2746 } 3035
3036 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3037 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3038
3039 $self
3040}
3041
3042sub add {
3043 my ($self, $title, $widget, $tooltip) = @_;
3044
3045 Scalar::Util::weaken $self;
3046
3047 $self->{buttonbar}->add (new CFClient::UI::Button
3048 markup => $title,
3049 tooltip => $tooltip,
3050 on_activate => sub { $self->set_current_page ($widget) },
3051 );
3052
3053 $self->{multiplexer}->add ($widget);
3054}
3055
3056sub set_current_page {
3057 my ($self, $page) = @_;
3058
3059 $self->{multiplexer}->set_current_page ($page);
3060 $self->_emit (page_changed => $self->{multiplexer}{current});
2747} 3061}
2748 3062
2749############################################################################# 3063#############################################################################
2750 3064
2751package CFClient::UI::Statusbox; 3065package CFClient::UI::Statusbox;
… …
2811sub add { 3125sub add {
2812 my ($self, $text, %arg) = @_; 3126 my ($self, $text, %arg) = @_;
2813 3127
2814 $text =~ s/^\s+//; 3128 $text =~ s/^\s+//;
2815 $text =~ s/\s+$//; 3129 $text =~ s/\s+$//;
3130
3131 return unless $text;
2816 3132
2817 my $timeout = time + ((delete $arg{timeout}) || 60); 3133 my $timeout = time + ((delete $arg{timeout}) || 60);
2818 3134
2819 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3135 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2820 3136
… …
2854 $self->SUPER::reconfigure; 3170 $self->SUPER::reconfigure;
2855} 3171}
2856 3172
2857############################################################################# 3173#############################################################################
2858 3174
2859package CFClient::UI::Root; 3175package CFClient::UI::Inventory;
2860 3176
2861our @ISA = CFClient::UI::Container::; 3177our @ISA = CFClient::UI::ScrolledWindow::;
2862
2863use CFClient::OpenGL;
2864 3178
2865sub new { 3179sub new {
2866 my $class = shift; 3180 my $class = shift;
2867 3181
2868 $class->SUPER::new ( 3182 my $self = $class->SUPER::new (
3183 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3184 @_,
3185 );
3186
3187 $self
3188}
3189
3190sub set_items {
3191 my ($self, $items) = @_;
3192
3193 $self->{child}->clear;
3194 return unless $items;
3195
3196 my @items = sort {
3197 ($a->{type} <=> $b->{type})
3198 or ($a->{name} cmp $b->{name})
3199 } @$items;
3200
3201 $self->{real_items} = \@items;
3202
3203 my $row = 0;
3204 for my $item (@items) {
3205 CFClient::Item::update_widgets $item;
3206
3207 $self->{child}->add (0, $row, $item->{face_widget});
3208 $self->{child}->add (1, $row, $item->{desc_widget});
3209 $self->{child}->add (2, $row, $item->{weight_widget});
3210
3211 $row++;
3212 }
3213}
3214
3215#############################################################################
3216
3217package CFClient::UI::BindEditor;
3218
3219our @ISA = CFClient::UI::FancyFrame::;
3220
3221sub new {
3222 my $class = shift;
3223
3224 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3225
3226 $self->add (my $vb = new CFClient::UI::VBox);
3227
3228
3229 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3230 text => "start recording",
3231 tooltip => "Start/Stops recording of actions."
3232 ."All subsequent actions after the recording started will be captured."
3233 ."The actions are displayed after the record was stopped."
3234 ."To bind the action you have to click on the 'Bind' button",
3235 on_activate => sub {
3236 unless ($self->{recording}) {
3237 $self->start;
3238 } else {
3239 $self->stop;
3240 }
3241 });
3242
3243 $vb->add (new CFClient::UI::Label text => "Actions:");
3244 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3245
3246 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3247 $vb->add (my $hb = new CFClient::UI::HBox);
3248 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3249 $hb->add (new CFClient::UI::Button
3250 text => "bind",
3251 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3252 on_activate => sub {
3253 $self->ask_for_bind;
3254 });
3255
3256 $vb->add (my $hb = new CFClient::UI::HBox);
3257 $hb->add (new CFClient::UI::Button
3258 text => "ok",
3259 expand => 1,
3260 tooltip => "This closes the binding editor and saves the binding",
3261 on_activate => sub {
3262 $self->hide;
3263 $self->commit;
3264 });
3265
3266 $hb->add (new CFClient::UI::Button
3267 text => "cancel",
3268 expand => 1,
3269 tooltip => "This closes the binding editor without saving",
3270 on_activate => sub {
3271 $self->hide;
3272 $self->{binding_cancel}->()
3273 if $self->{binding_cancel};
3274 });
3275
3276 $self->update_binding_widgets;
3277
3278 $self
3279}
3280
3281sub commit {
3282 my ($self) = @_;
3283 my ($mod, $sym, $cmds) = $self->get_binding;
3284 if ($sym != 0 && @$cmds > 0) {
3285 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3286 ."'. Don't forget 'Save Config'!");
3287 $self->{binding_change}->($mod, $sym, $cmds)
3288 if $self->{binding_change};
3289 } else {
3290 $::STATUSBOX->add ("No action bound, no key or action specified!");
3291 $self->{binding_cancel}->()
3292 if $self->{binding_cancel};
3293 }
3294}
3295
3296sub start {
3297 my ($self) = @_;
3298
3299 $self->{rec_btn}->set_text ("stop recording");
3300 $self->{recording} = 1;
3301 $self->clear_command_list;
3302 $::CONN->start_record if $::CONN;
3303}
3304
3305sub stop {
3306 my ($self) = @_;
3307
3308 $self->{rec_btn}->set_text ("start recording");
3309 $self->{recording} = 0;
3310
3311 my $rec;
3312 $rec = $::CONN->stop_record if $::CONN;
3313 return unless ref $rec eq 'ARRAY';
3314 $self->set_command_list ($rec);
3315}
3316
3317
3318sub ask_for_bind_and_commit {
3319 my ($self) = @_;
3320 $self->ask_for_bind (1);
3321}
3322
3323sub ask_for_bind {
3324 my ($self, $commit) = @_;
3325
3326 CFClient::Binder::open_binding_dialog (sub {
3327 my ($mod, $sym) = @_;
3328 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3329 $self->update_binding_widgets;
3330 $self->commit if $commit;
3331 });
3332}
3333
3334# $mod and $sym are the modifiers and key symbol
3335# $cmds is a array ref of strings (the commands)
3336# $cb is the callback that is executed on OK
3337# $ccb is the callback that is executed on CANCEL and
3338# when the binding was unsuccessful on OK
3339sub set_binding {
3340 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3341
3342 $self->clear_command_list;
3343 $self->{recording} = 0;
3344 $self->{rec_btn}->set_text ("start recording");
3345
3346 $self->{binding} = [$mod, $sym];
3347 $self->{commands} = $cmds;
3348
3349 $self->{binding_change} = $cb;
3350 $self->{binding_cancel} = $ccb;
3351
3352 $self->update_binding_widgets;
3353}
3354
3355# this is a shortcut method that asks for a binding
3356# and then just binds it.
3357sub do_quick_binding {
3358 my ($self, $cmds) = @_;
3359 $self->set_binding (undef, undef, $cmds, sub {
3360 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3361 });
3362 $self->ask_for_bind (1);
3363}
3364
3365sub update_binding_widgets {
3366 my ($self) = @_;
3367 my ($mod, $sym, $cmds) = $self->get_binding;
3368 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3369 $self->set_command_list ($cmds);
3370}
3371
3372sub get_binding {
3373 my ($self) = @_;
3374 return (
3375 $self->{binding}->[0],
3376 $self->{binding}->[1],
3377 [ grep { defined $_ } @{$self->{commands}} ]
3378 );
3379}
3380
3381sub clear_command_list {
3382 my ($self) = @_;
3383 $self->{cmdbox}->clear ();
3384}
3385
3386sub set_command_list {
3387 my ($self, $cmds) = @_;
3388
3389 $self->{cmdbox}->clear ();
3390 $self->{commands} = $cmds;
3391
3392 my $idx = 0;
3393
3394 for (@$cmds) {
3395 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3396
3397 my $i = $idx;
3398 $hb->add (new CFClient::UI::Label text => $_);
3399 $hb->add (new CFClient::UI::Button
3400 text => "delete",
3401 tooltip => "Deletes the action from the record",
3402 on_activate => sub {
3403 $self->{cmdbox}->remove ($hb);
3404 $cmds->[$i] = undef;
3405 });
3406
3407
3408 $idx++
3409 }
3410}
3411
3412#############################################################################
3413
3414package CFClient::UI::SpellList;
3415
3416our @ISA = CFClient::UI::Table::;
3417
3418sub new {
3419 my $class = shift;
3420
3421 my $self = $class->SUPER::new (
3422 binding => [],
3423 commands => [],
2869 @_, 3424 @_,
2870 ) 3425 )
2871} 3426}
2872 3427
2873sub configure { 3428# XXX: Do sorting? Argl...
2874 my ($self, $x, $y, $w, $h) = @_; 3429sub add_spell {
2875
2876 $self->{w} = $w;
2877 $self->{h} = $h;
2878}
2879
2880sub check_size {
2881 my ($self) = @_; 3430 my ($self, $spell) = @_;
3431 $self->{spells}->{$spell->{name}} = $spell;
2882 3432
2883 $self->size_allocate ($self->{w}, $self->{h}) 3433 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2884 if $self->{w}; 3434 face => $spell->{face},
3435 can_hover => 1,
3436 can_events => 1,
3437 tooltip => $spell->{message});
3438
3439 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3440 text => $spell->{name},
3441 can_hover => 1,
3442 can_events => 1,
3443 tooltip => $spell->{message},
3444 expand => 1);
3445
3446 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3447 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3448 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3449 expand => 1);
3450
3451 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3452 text => "bind to key",
3453 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3454}
3455
3456sub rebuild_spell_list {
3457 my ($self) = @_;
3458 $self->{tbl_idx} = 0;
3459 $self->add_spell ($_) for values %{$self->{spells}};
3460}
3461
3462sub remove_spell {
3463 my ($self, $spell) = @_;
3464 delete $self->{spells}->{$spell->{name}};
3465 $self->rebuild_spell_list;
3466}
3467
3468#############################################################################
3469
3470package CFClient::UI::Root;
3471
3472our @ISA = CFClient::UI::Container::;
3473
3474use CFClient::OpenGL;
3475
3476sub new {
3477 my $class = shift;
3478
3479 my $self = $class->SUPER::new (
3480 visible => 1,
3481 @_,
3482 );
3483
3484 Scalar::Util::weaken ($self->{root} = $self);
3485
3486 $self
2885} 3487}
2886 3488
2887sub size_request { 3489sub size_request {
2888 my ($self) = @_; 3490 my ($self) = @_;
2889 3491
2890 ($self->{w}, $self->{h}) 3492 ($self->{w}, $self->{h})
3493}
3494
3495sub _to_pixel {
3496 my ($coord, $size, $max) = @_;
3497
3498 $coord =
3499 $coord eq "center" ? ($max - $size) * 0.5
3500 : $coord eq "max" ? $max
3501 : $coord;
3502
3503 $coord = 0 if $coord < 0;
3504 $coord = $max - $size if $coord > $max - $size;
3505
3506 int $coord + 0.5
2891} 3507}
2892 3508
2893sub size_allocate { 3509sub size_allocate {
2894 my ($self, $w, $h) = @_; 3510 my ($self, $w, $h) = @_;
2895 3511
2896 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2897 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2898
2899 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2900 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2901
2902 for my $child ($self->children) { 3512 for my $child ($self->children) {
2903 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3513 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2904 3514
2905 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3515 $X = $child->{force_x} if exists $child->{force_x};
2906 if exists $child->{req_x}; 3516 $Y = $child->{force_y} if exists $child->{force_y};
2907 3517
2908 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3518 $X = _to_pixel $X, $W, $self->{w};
2909 if exists $child->{req_y}; 3519 $Y = _to_pixel $Y, $H, $self->{h};
2910
2911 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2912 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2913 3520
2914 $child->configure ($X, $Y, $W, $H); 3521 $child->configure ($X, $Y, $W, $H);
2915 } 3522 }
2916} 3523}
2917 3524
… …
2928} 3535}
2929 3536
2930sub update { 3537sub update {
2931 my ($self) = @_; 3538 my ($self) = @_;
2932 3539
2933 $self->check_size;
2934 $::WANT_REFRESH++; 3540 $::WANT_REFRESH++;
2935} 3541}
2936 3542
2937sub add { 3543sub add {
2938 my ($self, @children) = @_; 3544 my ($self, @children) = @_;
2939 3545
2940 for my $child (@children) {
2941 $child->{toplevel} = 1; 3546 $_->{is_toplevel} = 1
2942 3547 for @children;
2943 # integerise window positions
2944 $child->{x} = int $child->{x};
2945 $child->{y} = int $child->{y};
2946 }
2947 3548
2948 $self->SUPER::add (@children); 3549 $self->SUPER::add (@children);
3550}
3551
3552sub remove {
3553 my ($self, @children) = @_;
3554
3555 $self->SUPER::remove (@children);
3556
3557 delete $self->{is_toplevel}
3558 for @children;
3559
3560 while (@children) {
3561 my $w = pop @children;
3562 push @children, $w->children;
3563 $w->set_invisible;
3564 }
2949} 3565}
2950 3566
2951sub on_refresh { 3567sub on_refresh {
2952 my ($self, $id, $cb) = @_; 3568 my ($self, $id, $cb) = @_;
2953 3569
… …
2966 while ($self->{refresh_hook}) { 3582 while ($self->{refresh_hook}) {
2967 $_->() 3583 $_->()
2968 for values %{delete $self->{refresh_hook}}; 3584 for values %{delete $self->{refresh_hook}};
2969 } 3585 }
2970 3586
2971 if ($self->{check_size}) { 3587 if ($self->{realloc}) {
2972 my @queue = ([], []); 3588 my %queue;
3589 my @queue;
3590 my $widget;
2973 3591
2974 for (;;) { 3592 outer:
2975 if ($self->{check_size}) { 3593 while () {
2976 # heuristic: check containers last 3594 if (my $realloc = delete $self->{realloc}) {
2977 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3595 for $widget (values %$realloc) {
2978 for values %{delete $self->{check_size}} 3596 $widget->{visible} or next; # do not resize invisible widgets
3597
3598 $queue{$widget+0}++ and next; # duplicates are common
3599
3600 push @{ $queue[$widget->{visible}] }, $widget;
3601 }
2979 } 3602 }
2980 3603
2981 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3604 while () {
3605 @queue or last outer;
2982 3606
2983 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3607 $widget = pop @{ $queue[-1] || [] }
2984 ? @$widget{qw(user_w user_h)} 3608 and last;
2985 : $widget->size_request;
2986
2987 if (delete $widget->{force_alloc}
2988 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2989 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2990 3609
3610 pop @queue;
3611 }
3612
3613 delete $queue{$widget+0};
3614
3615 my ($w, $h) = $widget->size_request;
3616
3617 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3618 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3619
3620 $w = $widget->{force_w} if exists $widget->{force_w};
3621 $h = $widget->{force_h} if exists $widget->{force_h};
3622
3623 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3624 || delete $widget->{force_realloc}) {
2991 $widget->{req_w} = $w; 3625 $widget->{req_w} = $w;
2992 $widget->{req_h} = $h; 3626 $widget->{req_h} = $h;
2993 3627
2994 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3628 $self->{size_alloc}{$widget+0} = $widget;
2995 3629
2996 $widget->{parent}->check_size
2997 if $widget->{parent}; 3630 if (my $parent = $widget->{parent}) {
3631 $self->{realloc}{$parent+0} = $parent
3632 unless $queue{$parent+0};
3633
3634 $parent->{force_size_alloc} = 1;
3635 $self->{size_alloc}{$parent+0} = $parent;
3636 }
2998 } 3637 }
3638
3639 delete $self->{realloc}{$widget+0};
2999 } 3640 }
3000 } 3641 }
3001 3642
3002 while ($self->{size_alloc}) { 3643 while (my $size_alloc = delete $self->{size_alloc}) {
3003 for (values %{delete $self->{size_alloc}}) { 3644 my @queue = sort { $b->{visible} <=> $a->{visible} }
3004 my ($widget, $w, $h) = @$_; 3645 values %$size_alloc;
3646
3647 while () {
3648 my $widget = pop @queue || last;
3649
3650 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3005 3651
3006 $w = 0 if $w < 0; 3652 $w = 0 if $w < 0;
3007 $h = 0 if $h < 0; 3653 $h = 0 if $h < 0;
3008 3654
3655 $w = int $w + 0.5;
3656 $h = int $h + 0.5;
3657
3658 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3659 $widget->{old_w} = $widget->{w};
3660 $widget->{old_h} = $widget->{h};
3661
3009 $widget->{w} = $w; 3662 $widget->{w} = $w;
3010 $widget->{h} = $h; 3663 $widget->{h} = $h;
3011 $widget->size_allocate ($w, $h); 3664
3012 $widget->emit (size_allocate => $w, $h); 3665 $widget->emit (size_allocate => $w, $h);
3666 }
3013 } 3667 }
3014 } 3668 }
3015 3669
3016 while ($self->{post_alloc_hook}) { 3670 while ($self->{post_alloc_hook}) {
3017 $_->() 3671 $_->()
3018 for values %{delete $self->{post_alloc_hook}}; 3672 for values %{delete $self->{post_alloc_hook}};
3019 } 3673 }
3020 3674
3675
3021 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3676 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3022 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3677 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3023 glClear GL_COLOR_BUFFER_BIT; 3678 glClear GL_COLOR_BUFFER_BIT;
3024 3679
3025 glMatrixMode GL_PROJECTION; 3680 glMatrixMode GL_PROJECTION;
3026 glLoadIdentity; 3681 glLoadIdentity;
3027 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3682 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3028 glMatrixMode GL_MODELVIEW; 3683 glMatrixMode GL_MODELVIEW;
3029 glLoadIdentity; 3684 glLoadIdentity;
3030 3685
3686 {
3687 package CFClient::UI::Base;
3688
3689 ($draw_x, $draw_y, $draw_w, $draw_h) =
3690 (0, 0, $self->{w}, $self->{h});
3691 }
3692
3031 $self->_draw; 3693 $self->_draw;
3032} 3694}
3033 3695
3034############################################################################# 3696#############################################################################
3035 3697

Diff Legend

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