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

Diff Legend

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