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

Diff Legend

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