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

Diff Legend

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