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

Diff Legend

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