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.150 by elmex, Sun Apr 23 00:08:29 2006 UTC vs.
Revision 1.283 by root, Mon Jun 5 02:28:30 2006 UTC

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

Diff Legend

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