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.192 by root, Tue May 9 22:49:32 2006 UTC vs.
Revision 1.283 by root, Mon Jun 5 02:28:30 2006 UTC

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

Diff Legend

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