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.151 by root, Sun Apr 23 00:57:39 2006 UTC vs.
Revision 1.278 by root, Sun Jun 4 23:05:06 2006 UTC

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

Diff Legend

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