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.165 by root, Mon Apr 24 08:22:22 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}->_topleft ($x + $self->{x}, $y + $self->{y}); 396 $tooltip =~ s/^\s+//;
397 $tooltip =~ s/\s+$//;
398
399 return if $self->{tooltip} eq $tooltip;
400
401 $self->{tooltip} = $tooltip;
402
403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
404 delete $CFClient::UI::TOOLTIP->{owner};
405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
406 }
253} 407}
254 408
255# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
256sub coord2local { 410sub coord2local {
257 my ($self, $x, $y) = @_; 411 my ($self, $x, $y) = @_;
258 412
259 my ($X, $Y) = $self->_topleft; 413 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
260 ($x - $X, $y - $Y)
261} 414}
262 415
263# translate local coordinates to global coordinate system 416# translate local coordinates to global coordinate system
264sub coord2global { 417sub coord2global {
265 my ($self, $x, $y) = @_; 418 my ($self, $x, $y) = @_;
266 419
267 my ($X, $Y) = $self->_topleft; 420 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
268 ($x + $X, $y + $Y)
269} 421}
270 422
271sub focus_in { 423sub focus_in {
272 my ($self) = @_; 424 my ($self) = @_;
273 425
274 return if $FOCUS == $self; 426 return if $FOCUS == $self;
275 return unless $self->{can_focus}; 427 return unless $self->{can_focus};
276 428
277 my $focus = $FOCUS; $FOCUS = $self; 429 my $focus = $FOCUS; $FOCUS = $self;
278 430
279 $self->emit (focus_in => $focus); 431 $self->_emit (focus_in => $focus);
280 432
281 $focus->update if $focus; 433 $focus->update if $focus;
282 $FOCUS->update; 434 $FOCUS->update;
283} 435}
284 436
… …
287 439
288 return unless $FOCUS == $self; 440 return unless $FOCUS == $self;
289 441
290 my $focus = $FOCUS; undef $FOCUS; 442 my $focus = $FOCUS; undef $FOCUS;
291 443
292 $self->emit (focus_out => $focus); 444 $self->_emit (focus_out => $focus);
293 445
294 $focus->update if $focus; #? 446 $focus->update if $focus; #?
295}
296 447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
449 unless $FOCUS;
450}
451
297sub mouse_motion { } 452sub mouse_motion { 0 }
298sub button_up { } 453sub button_up { 0 }
299sub key_down { } 454sub key_down { 0 }
300sub key_up { } 455sub key_up { 0 }
301 456
302sub button_down { 457sub button_down {
303 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
304 459
305 $self->focus_in; 460 $self->focus_in;
306}
307 461
308sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
309sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
310sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
311sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
312sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 466 my ($self, $x, $y) = @_;
467
468 return () unless $self->{can_events};
469
470 return $self
471 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
472 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
473
474 ()
475}
476
477sub set_parent {
478 my ($self, $parent) = @_;
479
480 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505}
506
507sub realloc {
508 my ($self) = @_;
509
510 if ($self->{visible}) {
511 return if $self->{root}{realloc}{$self+0};
512
513 $self->{root}{realloc}{$self+0} = $self;
514 $self->{root}->update;
515 } else {
516 delete $self->{req_w};
517 delete $self->{req_h};
518 }
519}
520
521sub update {
522 my ($self) = @_;
523
524 $self->{parent}->update
525 if $self->{parent};
526}
527
528sub reconfigure {
529 my ($self) = @_;
530
531 $self->realloc;
532 $self->update;
533}
534
535# using global variables seems a bit hacky, but passing through all drawing
536# functions seems pointless.
537our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
313 538
314sub draw { 539sub draw {
315 my ($self) = @_; 540 my ($self) = @_;
316 541
317 return unless $self->{h} && $self->{w}; 542 return unless $self->{h} && $self->{w};
543
544 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549
550 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
318 553
319 glPushMatrix; 554 glPushMatrix;
320 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
321 $self->_draw;
322 glPopMatrix;
323 556
324 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
325 my ($x, $y) = @$self{qw(x y)};
326
327 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
328 glEnable GL_BLEND; 559 glEnable GL_BLEND;
329 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
330 glBegin GL_QUADS; 561 glBegin GL_QUADS;
331 glVertex $x , $y;
332 glVertex $x + $self->{w}, $y;
333 glVertex $x + $self->{w}, $y + $self->{h};
334 glVertex $x , $y + $self->{h};
335 glEnd;
336 glDisable GL_BLEND;
337 }
338
339 if ($ENV{PCLIENT_DEBUG}) {
340 glPushMatrix;
341 glColor 1, 1, 0, 1;
342 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
343 glBegin GL_LINE_LOOP;
344 glVertex 0 , 0; 562 glVertex 0 , 0;
345 glVertex $self->{w}, 0; 563 glVertex $self->{w}, 0;
346 glVertex $self->{w}, $self->{h}; 564 glVertex $self->{w}, $self->{h};
347 glVertex 0 , $self->{h}; 565 glVertex 0 , $self->{h};
348 glEnd; 566 glEnd;
567 glDisable GL_BLEND;
568 }
569
570 if ($ENV{CFPLUS_DEBUG} & 1) {
571 glPushMatrix;
572 glColor 1, 1, 0, 1;
573 glTranslate 0.375, 0.375;
574 glBegin GL_LINE_LOOP;
575 glVertex 0 , 0;
576 glVertex $self->{w} - 1, 0;
577 glVertex $self->{w} - 1, $self->{h} - 1;
578 glVertex 0 , $self->{h} - 1;
579 glEnd;
349 glPopMatrix; 580 glPopMatrix;
350 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
351 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
352} 586}
353 587
354sub _draw { 588sub _draw {
355 my ($self) = @_; 589 my ($self) = @_;
356 590
357 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
358} 592}
359 593
360sub find_widget {
361 my ($self, $x, $y) = @_;
362
363 return () unless $self->{can_events};
364
365 return $self
366 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
367 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
368
369 ()
370}
371
372sub set_parent {
373 my ($self, $parent) = @_;
374
375 Scalar::Util::weaken ($self->{parent} = $parent);
376}
377
378sub check_size {
379 my ($self) = @_;
380
381 $self->{parent}
382 or return 1;
383
384 my ($w, $h) = $self->{user_w} && $self->{user_h}
385 ? @$self{qw(user_w user_h)}
386 : $self->size_request;
387
388 if ($w != $self->{req_w} || $h != $self->{req_h}) {
389 $self->{req_w} = $w;
390 $self->{req_h} = $h;
391
392 $self->{parent}->check_size
393 or $self->size_allocate (
394 (List::Util::max $self->{w}, $w),
395 (List::Util::max $self->{h}, $h),
396 );
397
398 1
399 } else {
400 0
401 }
402}
403
404sub update {
405 my ($self) = @_;
406
407 $self->{parent}->update
408 if $self->{parent};
409}
410
411sub connect {
412 my ($self, $signal, $cb) = @_;
413
414 push @{ $self->{signal_cb}{$signal} }, $cb;
415}
416
417sub emit {
418 my ($self, $signal, @args) = @_;
419
420 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
421}
422
423sub DESTROY { 594sub DESTROY {
424 my ($self) = @_; 595 my ($self) = @_;
425 596
426 #$self->deactivate; 597 delete $WIDGET{$self+0};
598
599 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
427} 601}
428 602
429############################################################################# 603#############################################################################
430 604
431package CFClient::UI::DrawBG; 605package CFClient::UI::DrawBG;
… …
439 my $class = shift; 613 my $class = shift;
440 614
441 # range [value, low, high, page] 615 # range [value, low, high, page]
442 616
443 $class->SUPER::new ( 617 $class->SUPER::new (
444 bg => [0, 0, 0, 0.2], 618 #bg => [0, 0, 0, 0.2],
445 active_bg => [1, 1, 1, 0.5], 619 #active_bg => [1, 1, 1, 0.5],
446 @_ 620 @_
447 ) 621 )
448} 622}
449 623
450sub _draw { 624sub _draw {
451 my ($self) = @_; 625 my ($self) = @_;
452 626
627 my $color = $FOCUS == $self && $self->{active_bg}
628 ? $self->{active_bg}
629 : $self->{bg};
630
631 if ($color && (@$color < 4 || $color->[3])) {
453 my ($w, $h) = @$self{qw(w h)}; 632 my ($w, $h) = @$self{qw(w h)};
454 633
455 glEnable GL_BLEND; 634 glEnable GL_BLEND;
456 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 635 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
457 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 636 glColor_premultiply @$color;
458 637
459 glBegin GL_QUADS; 638 glBegin GL_QUADS;
460 glVertex 0 , 0; 639 glVertex 0 , 0;
461 glVertex 0 , $h; 640 glVertex 0 , $h;
462 glVertex $w, $h; 641 glVertex $w, $h;
463 glVertex $w, 0; 642 glVertex $w, 0;
464 glEnd; 643 glEnd;
465 644
466 glDisable GL_BLEND; 645 glDisable GL_BLEND;
646 }
467} 647}
468 648
469############################################################################# 649#############################################################################
470 650
471package CFClient::UI::Empty; 651package CFClient::UI::Empty;
… …
476 my ($class, %arg) = @_; 656 my ($class, %arg) = @_;
477 $class->SUPER::new (can_events => 0, %arg); 657 $class->SUPER::new (can_events => 0, %arg);
478} 658}
479 659
480sub size_request { 660sub size_request {
481 (0, 0) 661 my ($self) = @_;
662
663 ($self->{w} + 0, $self->{h} + 0)
482} 664}
483 665
484sub draw { } 666sub draw { }
485 667
486############################################################################# 668#############################################################################
… …
490our @ISA = CFClient::UI::Base::; 672our @ISA = CFClient::UI::Base::;
491 673
492sub new { 674sub new {
493 my ($class, %arg) = @_; 675 my ($class, %arg) = @_;
494 676
495 my $children = delete $arg{children} || []; 677 my $children = delete $arg{children};
496 678
497 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 679 my $self = $class->SUPER::new (
680 children => [],
681 can_events => 0,
682 %arg,
683 );
684
498 $self->add ($_) for @$children; 685 $self->add (@$children)
686 if $children;
499 687
500 $self 688 $self
501} 689}
502 690
503sub add { 691sub add {
504 my ($self, $child) = @_; 692 my ($self, @widgets) = @_;
505 693
506 $child->set_parent ($self); 694 $_->set_parent ($self)
695 for @widgets;
507 696
508 use sort 'stable'; 697 use sort 'stable';
509 698
510 $self->{children} = [ 699 $self->{children} = [
511 sort { $a->{z} <=> $b->{z} } 700 sort { $a->{z} <=> $b->{z} }
512 @{$self->{children}}, $child 701 @{$self->{children}}, @widgets
513 ]; 702 ];
514 703
515 $child->check_size; 704 $self->realloc;
705}
706
707sub children {
708 @{ $_[0]{children} }
516} 709}
517 710
518sub remove { 711sub remove {
519 my ($self, $child) = @_; 712 my ($self, $child) = @_;
520 713
521 delete $child->{parent}; 714 delete $child->{parent};
522 $child->hide; 715 $child->hide;
523 716
524 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 717 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
525 718
526 $self->check_size; 719 $self->realloc;
527 $self->update;
528} 720}
529 721
530sub clear { 722sub clear {
531 my ($self) = @_; 723 my ($self) = @_;
532 724
… …
535 727
536 for (@$children) { 728 for (@$children) {
537 delete $_->{parent}; 729 delete $_->{parent};
538 $_->hide; 730 $_->hide;
539 } 731 }
732
733 $self->realloc;
540} 734}
541 735
542sub find_widget { 736sub find_widget {
543 my ($self, $x, $y) = @_; 737 my ($self, $x, $y) = @_;
544 738
545 $x -= $self->{x}; 739 $x -= $self->{x};
546 $y -= $self->{y}; 740 $y -= $self->{y};
547 741
548 my $res; 742 my $res;
549 743
550 for (reverse @{ $self->{children} }) { 744 for (reverse $self->visible_children) {
551 $res = $_->find_widget ($x, $y) 745 $res = $_->find_widget ($x, $y)
552 and return $res; 746 and return $res;
553 } 747 }
554 748
555 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 749 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
576} 770}
577 771
578sub add { 772sub add {
579 my ($self, $child) = @_; 773 my ($self, $child) = @_;
580 774
581 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
582
583 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
584} 777}
585 778
586sub remove { 779sub remove {
587 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
… …
604 $self->{children}[0]->configure (0, 0, $w, $h); 797 $self->{children}[0]->configure (0, 0, $w, $h);
605} 798}
606 799
607############################################################################# 800#############################################################################
608 801
802# back-buffered drawing area
803
609package CFClient::UI::Window; 804package CFClient::UI::Window;
610 805
611our @ISA = CFClient::UI::Bin::; 806our @ISA = CFClient::UI::Bin::;
612 807
613use CFClient::OpenGL; 808use CFClient::OpenGL;
… …
619} 814}
620 815
621sub update { 816sub update {
622 my ($self) = @_; 817 my ($self) = @_;
623 818
624 # we want to do this delayed... 819 $ROOT->on_post_alloc ($self => sub { $self->render_child });
625 $self->render_chld;
626 $self->SUPER::update; 820 $self->SUPER::update;
627}
628
629sub render_chld {
630 my ($self) = @_;
631
632 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
633 glClearColor 0, 0, 0, 1;
634 glClear GL_COLOR_BUFFER_BIT;
635 $self->child->draw;
636 };
637} 821}
638 822
639sub size_allocate { 823sub size_allocate {
640 my ($self, $w, $h) = @_; 824 my ($self, $w, $h) = @_;
641 825
642 $self->child->configure (0, 0, $w, $h); 826 $self->SUPER::size_allocate ($w, $h);
827 $self->update;
828}
643 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
644 $self->render_chld; 850 $self->_render;
851 };
645} 852}
646 853
647sub _draw { 854sub _draw {
648 my ($self) = @_; 855 my ($self) = @_;
649 856
650 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
651 858
652 my $tex = $self->{texture} 859 my $tex = $self->{texture}
653 or return; 860 or return;
654 861
655 glEnable GL_BLEND;
656 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
657 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
658 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;
659 865
660 $tex->draw_quad (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
661 867
662 glDisable GL_BLEND;
663 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
664} 869}
665 870
666############################################################################# 871#############################################################################
667 872
668package CFClient::UI::ViewPort; 873package CFClient::UI::ViewPort;
669 874
670our @ISA = CFClient::UI::Window::; 875our @ISA = CFClient::UI::Window::;
671
672sub new { die }
673
674sub size_request {
675 my ($self) = @_;
676
677 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
678 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
679
680 @$self{qw(child_w child_h)}
681}
682
683sub _draw {
684 my ($self) = @_;
685
686 $self->{children}[1]->draw;
687}
688
689
690#############################################################################
691
692package CFClient::UI::Frame;
693
694our @ISA = CFClient::UI::Bin::;
695
696use CFClient::OpenGL;
697 876
698sub new { 877sub new {
699 my $class = shift; 878 my $class = shift;
700 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
701 my $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
702 bg => [1, 1, 1, 1], 980 vp => (new CFClient::UI::ViewPort expand => 1),
703 border_bg => [1, 1, 1, 1], 981 slider => $slider,
704 border => 0.8, 982 %arg,
705 @_
706 ); 983 );
707 984
985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
987
708 $self 988 $self
709} 989}
710 990
711sub _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 {
712 my ($self) = @_; 1008 my ($self, $w, $h) = @_;
713 1009
714 my ($w, $h) = ($self->{w}, $self->{h}); 1010 $self->SUPER::size_allocate ($w, $h);
715 1011
716 glEnable GL_BLEND; 1012 my $child = $self->{vp}->child;
717 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]);
718 glEnable GL_TEXTURE_2D;
719 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
720
721# glBegin GL_QUADS;
722# glColor 0, 0, 0, 0;
723# glVertex 0 , 0;
724# glVertex 0 , $h;
725# glVertex $w, $h;
726# glVertex $w, 0;
727# glEnd;
728
729
730 $self->child->draw;
731 glDisable GL_BLEND;
732 glDisable GL_TEXTURE_2D;
733} 1014}
1015
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
734 1018
735############################################################################# 1019#############################################################################
736 1020
737package CFClient::UI::FancyFrame; 1021package CFClient::UI::Frame;
738 1022
739our @ISA = CFClient::UI::Bin::; 1023our @ISA = CFClient::UI::Bin::;
740 1024
741use CFClient::OpenGL; 1025use CFClient::OpenGL;
742
743my @tex =
744 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
745 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
746 1026
747sub new { 1027sub new {
748 my $class = shift; 1028 my $class = shift;
749 1029
750 # 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) = @_;
751 1077
752 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
753 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
754 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
755 border => 0.8, 1081 border => 0.6,
756 @_ 1082 can_events => 1,
1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
757 ); 1086 );
758 1087
759 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
760 align => 0, 1089 align => 0,
761 valign => 1, 1090 valign => 1,
762 text => $self->{title}, 1091 text => $self->{title},
763 fontsize => 1; 1092 fontsize => $self->{border},
1093 if exists $self->{title};
764 1094
765 $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};
766} 1103}
767 1104
768sub border { 1105sub border {
769 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
770} 1107}
771 1108
772sub size_request { 1109sub size_request {
773 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title_widget}->size_request
1113 if $self->{title_widget};
774 1114
775 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
776 1116
777 ( 1117 (
778 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
781} 1121}
782 1122
783sub size_allocate { 1123sub size_allocate {
784 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
785 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
786 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
787 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
788 1136
789 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
790 if $self->{title};
791
792 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
793} 1138}
794 1139
795sub button_down { 1140sub button_down {
796 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
797 1142
1143 my ($w, $h) = @$self{qw(w h)};
798 my $border = $self->border; 1144 my $border = $self->border;
799 1145
800 if ($x < $self->{w} && $x >= $self->{w} - $border 1146 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
801 && $y < $self->{h} && $y >= $self->{h} - $border) { 1147 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
802 1148
1149 if ($lr & $td) {
1150 my ($wx, $wy) = ($self->{x}, $self->{y});
803 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1151 my ($ox, $oy) = ($ev->{x}, $ev->{y});
804 my ($bw, $bh) = ($self->{w}, $self->{h}); 1152 my ($bw, $bh) = ($self->{w}, $self->{h});
805 1153
1154 my $mx = $x < $border;
1155 my $my = $y < $border;
1156
806 $self->{motion} = sub { 1157 $self->{motion} = sub {
807 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
808 1159
809 ($x, $y) = ($ev->{x}, $ev->{y}); 1160 my $dx = $ev->{x} - $ox;
1161 my $dy = $ev->{y} - $oy;
810 1162
811 $self->{user_w} = $bw + $x - $ox; 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
812 $self->{user_h} = $bh + $y - $oy; 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
813 $self->check_size; 1165
1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1167 $self->realloc;
814 }; 1168 };
815 1169
816 } elsif ($x >= 0 && $x < $self->{w} 1170 } elsif ($lr ^ $td) {
817 && $y >= 0 && $y < $border) {
818
819 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
820 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
821 1173
822 $self->{motion} = sub { 1174 $self->{motion} = sub {
823 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
824 1176
825 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
826 1178
827 $self->move ($bx + $x - $ox, $by + $y - $oy); 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
828 $self->update; 1180 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
829 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
830 } 1187 1
831} 1188}
832 1189
833sub button_up { 1190sub button_up {
834 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
835 1192
836 delete $self->{motion}; 1193 !!delete $self->{motion}
837} 1194}
838 1195
839sub mouse_motion { 1196sub mouse_motion {
840 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
841 1198
842 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
843} 1202}
844 1203
845sub _draw { 1204sub _draw {
846 my ($self) = @_; 1205 my ($self) = @_;
847 1206
1207 my $child = $self->{children}[0];
1208
848 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
849 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
850 1211
851 glEnable GL_BLEND;
852 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
853 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
854 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
855 1214
856 my $border = $self->border; 1215 my $border = $self->border;
857 1216
858 glColor @{ $self->{border_bg} }; 1217 glColor @{ $self->{border_bg} };
859 $tex[1]->draw_quad (0, 0, $w, $border); 1218 $border[0]->draw_quad_alpha (0, 0, $w, $border);
860 $tex[3]->draw_quad (0, $border, $border, $ch); 1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
861 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
862 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
863 1222
864 my $bg = $tex[0]; 1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1224 glColor @{ $self->{bg} };
865 1225
866 # TODO: repeat texture not scale 1226 # TODO: repeat texture not scale
867 my $rep_x = $cw / $bg->{w}; 1227 # solve this better(?)
868 my $rep_y = $ch / $bg->{h}; 1228 $bg->{s} = $cw / $bg->{w};
869 1229 $bg->{t} = $ch / $bg->{h};
870 glColor @{ $self->{bg} };
871
872 $bg->{s} = $rep_x;
873 $bg->{t} = $rep_y;
874 $bg->{wrap_mode} = 1;
875 $bg->draw_quad ($border, $border, $cw, $ch); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1231 }
876 1232
877 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
878 glDisable GL_BLEND;
879 1234
880 $self->{title}->draw if $self->{title};
881 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title_widget}->_draw;
1240 }
882} 1241}
883 1242
884############################################################################# 1243#############################################################################
885 1244
886package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
894sub new { 1253sub new {
895 my $class = shift; 1254 my $class = shift;
896 1255
897 $class->SUPER::new ( 1256 $class->SUPER::new (
898 col_expand => [], 1257 col_expand => [],
899 @_ 1258 @_,
900 ) 1259 )
1260}
1261
1262sub children {
1263 grep $_, map @$_, grep $_, @{ $_[0]{children} }
901} 1264}
902 1265
903sub add { 1266sub add {
904 my ($self, $x, $y, $child) = @_; 1267 my ($self, $x, $y, $child) = @_;
905 1268
906 $child->set_parent ($self); 1269 $child->set_parent ($self);
907 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
908 1271
909 $child->check_size; 1272 $self->realloc;
910} 1273}
911 1274
1275sub remove {
1276 my ($self, $child) = @_;
1277
1278 # TODO: not yet implemented
1279}
1280
912# 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?
913sub clear { 1282sub clear {
914 my ($self) = @_; 1283 my ($self) = @_;
915 1284
916 my $children = delete $self->{children}; 1285 my @children = $self->children;
1286 delete $self->{children};
917 1287
918 for (grep $_, map @$_, grep $_, @$children) { 1288 for (@children) {
919 delete $_->{parent}; 1289 delete $_->{parent};
920 $_->hide; 1290 $_->hide;
921 } 1291 }
922 1292
923 $self->update; 1293 $self->realloc;
924} 1294}
925 1295
926sub get_wh { 1296sub get_wh {
927 my ($self) = @_; 1297 my ($self) = @_;
928 1298
… …
959sub size_allocate { 1329sub size_allocate {
960 my ($self, $w, $h) = @_; 1330 my ($self, $w, $h) = @_;
961 1331
962 my ($ws, $hs) = $self->get_wh; 1332 my ($ws, $hs) = $self->get_wh;
963 1333
964 my $req_w = sum @$ws; 1334 my $req_w = (sum @$ws) || 1;
965 my $req_h = sum @$hs; 1335 my $req_h = (sum @$hs) || 1;
966 1336
967 # TODO: nicer code && do row_expand 1337 # TODO: nicer code && do row_expand
968 my @col_expand = @{$self->{col_expand}}; 1338 my @col_expand = @{$self->{col_expand}};
969 @col_expand = (1) x @$ws unless @col_expand; 1339 @col_expand = (1) x @$ws unless @col_expand;
970 my $col_expand = (sum @col_expand) || 1; 1340 my $col_expand = (sum @col_expand) || 1;
… …
1024 } 1394 }
1025} 1395}
1026 1396
1027############################################################################# 1397#############################################################################
1028 1398
1029package CFClient::UI::HBox; 1399package CFClient::UI::Box;
1030
1031# TODO: wrap into common Box base class
1032 1400
1033our @ISA = CFClient::UI::Container::; 1401our @ISA = CFClient::UI::Container::;
1034 1402
1035sub size_request { 1403sub size_request {
1036 my ($self) = @_; 1404 my ($self) = @_;
1037 1405
1038 my @alloc = map [$_->size_request], @{$self->{children}}; 1406 $self->{vertical}
1039 1407 ? (
1040 ( 1408 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1041 (List::Util::sum map $_->[0], @alloc), 1409 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1042 (List::Util::max map $_->[1], @alloc), 1410 )
1043 ) 1411 : (
1412 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1413 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1414 )
1044} 1415}
1045 1416
1046sub size_allocate { 1417sub size_allocate {
1047 my ($self, $w, $h) = @_; 1418 my ($self, $w, $h) = @_;
1048 1419
1049 ($h, $w) = ($w, $h); 1420 my $space = $self->{vertical} ? $h : $w;
1050
1051 my $children = $self->{children}; 1421 my $children = $self->{children};
1052 1422
1053 my @h = map $_->{req_w}, @$children; 1423 my @req;
1054 1424
1055 my $req_h = List::Util::sum @h; 1425 if ($self->{homogeneous}) {
1056 1426 @req = ($space / (@$children || 1)) x @$children;
1057 if ($req_h > $h) {
1058 # ah well, not enough space
1059 $_ *= $h / $req_h for @h;
1060 } 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 {
1061 my $exp = List::Util::sum map $_->{expand}, @$children; 1435 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1062 $exp ||= 1;
1063 1436
1437 $space = ($space - $req) / $expand; # remaining space to give away
1438
1439 $req[$_] += $space * $children->[$_]{expand}
1064 for (0 .. $#$children) { 1440 for 0 .. $#$children;
1065 my $child = $children->[$_];
1066
1067 my $alloc_h = $h[$_];
1068 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1069 $h[$_] = $alloc_h;
1070 } 1441 }
1071 } 1442 }
1072 1443
1073 CFClient::UI::harmonize \@h; 1444 CFClient::UI::harmonize \@req;
1074 1445
1075 my $y = 0; 1446 my $pos = 0;
1076 for (0 .. $#$children) { 1447 for (0 .. $#$children) {
1077 my $child = $children->[$_];
1078 my $h = $h[$_]; 1448 my $alloc = $req[$_];
1079 $child->configure ($y, 0, $h, $w); 1449 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1080 1450
1081 $y += $h; 1451 $pos += $alloc;
1082 } 1452 }
1083 1453
1084 1 1454 1
1085} 1455}
1086 1456
1087############################################################################# 1457#############################################################################
1088 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
1089package CFClient::UI::VBox; 1474package CFClient::UI::VBox;
1090 1475
1091# TODO: wrap into common Box base class
1092
1093our @ISA = CFClient::UI::Container::; 1476our @ISA = CFClient::UI::Box::;
1094 1477
1095sub size_request { 1478sub new {
1096 my ($self) = @_; 1479 my $class = shift;
1097 1480
1098 my @alloc = map [$_->size_request], @{$self->{children}}; 1481 $class->SUPER::new (
1099 1482 vertical => 1,
1100 ( 1483 @_,
1101 (List::Util::max map $_->[0], @alloc),
1102 (List::Util::sum map $_->[1], @alloc),
1103 ) 1484 )
1104} 1485}
1105 1486
1106sub size_allocate {
1107 my ($self, $w, $h) = @_;
1108
1109 my $children = $self->{children};
1110
1111 my @h = map $_->{req_h}, @$children;
1112
1113 my $req_h = List::Util::sum @h;
1114
1115 if ($req_h > $h) {
1116 # ah well, not enough space
1117 $_ *= $h / $req_h for @h;
1118 } else {
1119 my $exp = List::Util::sum map $_->{expand}, @$children;
1120 $exp ||= 1;
1121
1122 for (0 .. $#$children) {
1123 my $child = $children->[$_];
1124
1125 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1126 }
1127 }
1128
1129 CFClient::UI::harmonize \@h;
1130
1131 my $y = 0;
1132 for (0 .. $#$children) {
1133 my $child = $children->[$_];
1134 my $h = $h[$_];
1135 $child->configure (0, $y, $w, $h);
1136
1137 $y += $h;
1138 }
1139
1140 1
1141}
1142
1143############################################################################# 1487#############################################################################
1144 1488
1145package CFClient::UI::Label; 1489package CFClient::UI::Label;
1146 1490
1147our @ISA = CFClient::UI::Base::; 1491our @ISA = CFClient::UI::DrawBG::;
1148 1492
1149use CFClient::OpenGL; 1493use CFClient::OpenGL;
1150 1494
1151sub new { 1495sub new {
1152 my ($class, %arg) = @_; 1496 my ($class, %arg) = @_;
1153 1497
1154 my $self = $class->SUPER::new ( 1498 my $self = $class->SUPER::new (
1155 fg => [1, 1, 1], 1499 fg => [1, 1, 1],
1500 #bg => none
1501 #active_bg => none
1156 #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),
1157 fontsize => 1, 1508 fontsize => 1,
1158 text => "",
1159 align => -1, 1509 align => -1,
1160 valign => -1, 1510 valign => -1,
1161 padding => 2, 1511 padding_x => 2,
1162 layout => new CFClient::Layout, 1512 padding_y => 2,
1163 can_events => 0, 1513 can_events => 0,
1164 %arg 1514 %arg
1165 ); 1515 );
1166 1516
1167 if (exists $self->{template}) { 1517 if (exists $self->{template}) {
1168 my $layout = new CFClient::Layout; 1518 my $layout = new CFClient::Layout;
1169 $layout->set_text (delete $self->{template}); 1519 $layout->set_text (delete $self->{template});
1170 $self->{template} = $layout; 1520 $self->{template} = $layout;
1171 } 1521 }
1172 1522
1173 $self->set_text (delete $self->{text}) if exists $self->{text}; 1523 if (exists $self->{markup}) {
1174 $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 }
1175 1528
1176 $self 1529 $self
1177} 1530}
1178 1531
1179sub escape { 1532sub escape($) {
1180 local $_ = $_[1]; 1533 local $_ = $_[0];
1181 1534
1182 s/&/&amp;/g; 1535 s/&/&amp;/g;
1183 s/>/&gt;/g; 1536 s/>/&gt;/g;
1184 s/</&lt;/g; 1537 s/</&lt;/g;
1185 1538
1186 $_[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;
1187} 1554}
1188 1555
1189sub set_text { 1556sub set_text {
1190 my ($self, $text) = @_; 1557 my ($self, $text) = @_;
1191 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;
1192 $self->{layout}->set_text ($text); 1563 $self->{layout}->set_text ($text);
1193 1564
1194 delete $self->{texture}; 1565 delete $self->{size_req};
1195 $self->check_size; 1566 $self->realloc;
1196 $self->update; 1567 $self->update;
1197} 1568}
1198 1569
1199sub set_markup { 1570sub set_markup {
1200 my ($self, $markup) = @_; 1571 my ($self, $markup) = @_;
1201 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;
1202 $self->{layout}->set_markup ($markup); 1579 $self->{layout}->set_markup ($markup);
1203 1580
1204 delete $self->{texture}; 1581 delete $self->{size_req};
1205 $self->check_size; 1582 $self->realloc;
1206 $self->update; 1583 $self->update;
1207} 1584}
1208 1585
1209sub size_request { 1586sub size_request {
1210 my ($self) = @_; 1587 my ($self) = @_;
1211 1588
1589 $self->{size_req} ||= do {
1212 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1590 $self->{layout}->set_font ($self->{font}) if $self->{font};
1213 $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});
1214 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1594 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1215 1595
1216 my ($w, $h) = $self->{layout}->size; 1596 my ($w, $h) = $self->{layout}->size;
1217 1597
1218 if (exists $self->{template}) { 1598 if (exists $self->{template}) {
1219 $self->{template}->set_font ($self->{font}) if $self->{font}; 1599 $self->{template}->set_font ($self->{font}) if $self->{font};
1220 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1600 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1221 1601
1222 my ($w2, $h2) = $self->{template}->size; 1602 my ($w2, $h2) = $self->{template}->size;
1223 1603
1224 $w = List::Util::max $w, $w2; 1604 $w = List::Util::max $w, $w2;
1225 $h = List::Util::max $h, $h2; 1605 $h = List::Util::max $h, $h2;
1606 }
1607
1608 [$w, $h]
1226 } 1609 };
1227 1610
1228 ( 1611 @{ $self->{size_req} }
1229 $w + $self->{padding} * 2,
1230 $h + $self->{padding} * 2,
1231 )
1232} 1612}
1233 1613
1234sub size_allocate { 1614sub size_allocate {
1235 my ($self, $w, $h) = @_; 1615 my ($self, $w, $h) = @_;
1236 1616
1617 delete $self->{ox};
1618
1237 delete $self->{texture}; 1619 delete $self->{texture}
1620 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1238} 1621}
1239 1622
1240sub set_fontsize { 1623sub set_fontsize {
1241 my ($self, $fontsize) = @_; 1624 my ($self, $fontsize) = @_;
1242 1625
1243 $self->{fontsize} = $fontsize; 1626 $self->{fontsize} = $fontsize;
1244 delete $self->{texture}; 1627 delete $self->{texture};
1245 $self->check_size; 1628
1246 $self->update; 1629 $self->realloc;
1630}
1631
1632sub reconfigure {
1633 my ($self) = @_;
1634
1635 delete $self->{size_req};
1636
1637 $self->SUPER::reconfigure;
1247} 1638}
1248 1639
1249sub _draw { 1640sub _draw {
1250 my ($self) = @_; 1641 my ($self) = @_;
1251 1642
1643 $self->SUPER::_draw; # draw background, if applicable
1644
1252 my $tex = $self->{texture} ||= do { 1645 my $tex = $self->{texture} ||= do {
1646 $self->{layout}->set_foreground (@{$self->{fg}});
1253 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1647 $self->{layout}->set_font ($self->{font}) if $self->{font};
1254 $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});
1255 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1651 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1652
1256 new_from_layout CFClient::Texture $self->{layout} 1653 new_from_layout CFClient::Texture $self->{layout}
1257 }; 1654 };
1258 1655
1259 glEnable GL_BLEND; 1656 unless (exists $self->{ox}) {
1260 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
1261 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 {
1262 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1263 1677 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1264 glColor @{$self->{fg}}; 1678 }
1265
1266 $self->{ox} = int (
1267 $self->{align} < 0 ? $self->{padding}
1268 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1269 : ($self->{w} - $tex->{w}) * 0.5
1270 );
1271
1272 $self->{oy} = int (
1273 $self->{valign} < 0 ? $self->{padding}
1274 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1275 : ($self->{h} - $tex->{h}) * 0.5
1276 );
1277
1278 $tex->draw_quad ($self->{ox}, $self->{oy});
1279 1679
1280 glDisable GL_TEXTURE_2D; 1680 glDisable GL_TEXTURE_2D;
1281 glDisable GL_BLEND;
1282} 1681}
1283 1682
1284############################################################################# 1683#############################################################################
1285 1684
1286package CFClient::UI::EntryBase; 1685package CFClient::UI::EntryBase;
… …
1299 active_fg => [0, 0, 0], 1698 active_fg => [0, 0, 0],
1300 can_hover => 1, 1699 can_hover => 1,
1301 can_focus => 1, 1700 can_focus => 1,
1302 valign => 0, 1701 valign => 0,
1303 can_events => 1, 1702 can_events => 1,
1703 #text => ...
1704 #hidden => "*",
1304 @_ 1705 @_
1305 ) 1706 )
1306} 1707}
1307 1708
1308sub _set_text { 1709sub _set_text {
… …
1310 1711
1311 delete $self->{cur_h}; 1712 delete $self->{cur_h};
1312 1713
1313 return if $self->{text} eq $text; 1714 return if $self->{text} eq $text;
1314 1715
1315 delete $self->{texture};
1316
1317 $self->{last_activity} = $::NOW; 1716 $self->{last_activity} = $::NOW;
1318 $self->{text} = $text; 1717 $self->{text} = $text;
1319 1718
1320 $text =~ s/./*/g if $self->{hidden}; 1719 $text =~ s/./*/g if $self->{hidden};
1321 $self->{layout}->set_text ("$text "); 1720 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req};
1322 1722
1323 $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);
1324} 1734}
1325 1735
1326sub get_text { 1736sub get_text {
1327 $_[0]{text} 1737 $_[0]{text}
1328} 1738}
… …
1331 my ($self) = @_; 1741 my ($self) = @_;
1332 1742
1333 my ($w, $h) = $self->SUPER::size_request; 1743 my ($w, $h) = $self->SUPER::size_request;
1334 1744
1335 ($w + 1, $h) # add 1 for cursor 1745 ($w + 1, $h) # add 1 for cursor
1336}
1337
1338sub size_allocate {
1339 my ($self, $w, $h) = @_;
1340
1341 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1342}
1343
1344sub set_text {
1345 my ($self, $text) = @_;
1346
1347 $self->{cursor} = length $text;
1348 $self->_set_text ($text);
1349 $self->update;
1350} 1746}
1351 1747
1352sub key_down { 1748sub key_down {
1353 my ($self, $ev) = @_; 1749 my ($self, $ev) = @_;
1354 1750
… …
1356 my $sym = $ev->{sym}; 1752 my $sym = $ev->{sym};
1357 my $uni = $ev->{unicode}; 1753 my $uni = $ev->{unicode};
1358 1754
1359 my $text = $self->get_text; 1755 my $text = $self->get_text;
1360 1756
1361 if ($sym == 8) { 1757 if ($uni == 8) {
1362 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1758 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1363 } elsif ($sym == 127) { 1759 } elsif ($uni == 127) {
1364 substr $text, $self->{cursor}, 1, ""; 1760 substr $text, $self->{cursor}, 1, "";
1365 } elsif ($sym == CFClient::SDLK_LEFT) { 1761 } elsif ($sym == CFClient::SDLK_LEFT) {
1366 --$self->{cursor} if $self->{cursor}; 1762 --$self->{cursor} if $self->{cursor};
1367 } elsif ($sym == CFClient::SDLK_RIGHT) { 1763 } elsif ($sym == CFClient::SDLK_RIGHT) {
1368 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1764 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1369 } elsif ($sym == CFClient::SDLK_HOME) { 1765 } elsif ($sym == CFClient::SDLK_HOME) {
1370 $self->{cursor} = 0; 1766 $self->{cursor} = 0;
1371 } elsif ($sym == CFClient::SDLK_END) { 1767 } elsif ($sym == CFClient::SDLK_END) {
1372 $self->{cursor} = length $text; 1768 $self->{cursor} = length $text;
1373 } elsif ($sym == 27) { 1769 } elsif ($uni == 27) {
1374 $self->emit ('escape'); 1770 $self->_emit ('escape');
1375 } elsif ($uni) { 1771 } elsif ($uni) {
1376 substr $text, $self->{cursor}++, 0, chr $uni; 1772 substr $text, $self->{cursor}++, 0, chr $uni;
1773 } else {
1774 return 0;
1377 } 1775 }
1378 1776
1379 $self->_set_text ($text); 1777 $self->_set_text ($text);
1380 $self->update; 1778
1779 $self->realloc;
1780
1781 1
1381} 1782}
1382 1783
1383sub focus_in { 1784sub focus_in {
1384 my ($self) = @_; 1785 my ($self) = @_;
1385 1786
… …
1400 utf8::encode $text; 1801 utf8::encode $text;
1401 $self->{cursor} = length substr $text, 0, $idx; 1802 $self->{cursor} = length substr $text, 0, $idx;
1402 1803
1403 $self->_set_text ($self->{text}); 1804 $self->_set_text ($self->{text});
1404 $self->update; 1805 $self->update;
1806
1807 1
1405} 1808}
1406 1809
1407sub mouse_motion { 1810sub mouse_motion {
1408 my ($self, $ev, $x, $y) = @_; 1811 my ($self, $ev, $x, $y) = @_;
1409# 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
1410} 1815}
1411 1816
1412sub _draw { 1817sub _draw {
1413 my ($self) = @_; 1818 my ($self) = @_;
1414 1819
1415 local $self->{fg} = $self->{fg}; 1820 local $self->{fg} = $self->{fg};
1416 1821
1417 if ($FOCUS == $self) { 1822 if ($FOCUS == $self) {
1418 glColor @{$self->{active_bg}}; 1823 glColor_premultiply @{$self->{active_bg}};
1419 $self->{fg} = $self->{active_fg}; 1824 $self->{fg} = $self->{active_fg};
1420 } else { 1825 } else {
1421 glColor @{$self->{bg}}; 1826 glColor_premultiply @{$self->{bg}};
1422 } 1827 }
1423 1828
1424 glEnable GL_BLEND; 1829 glEnable GL_BLEND;
1425 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1830 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1426 glBegin GL_QUADS; 1831 glBegin GL_QUADS;
1427 glVertex 0 , 0; 1832 glVertex 0 , 0;
1428 glVertex 0 , $self->{h}; 1833 glVertex 0 , $self->{h};
1429 glVertex $self->{w}, $self->{h}; 1834 glVertex $self->{w}, $self->{h};
1430 glVertex $self->{w}, 0; 1835 glVertex $self->{w}, 0;
… …
1461 my ($self, $ev) = @_; 1866 my ($self, $ev) = @_;
1462 1867
1463 my $sym = $ev->{sym}; 1868 my $sym = $ev->{sym};
1464 1869
1465 if ($sym == 13) { 1870 if ($sym == 13) {
1871 unshift @{$self->{history}},
1872 my $txt = $self->get_text;
1873 $self->{history_pointer} = -1;
1874 $self->{history_saveback} = '';
1466 $self->emit (activate => $self->get_text); 1875 $self->_emit (activate => $txt);
1467 $self->update; 1876 $self->update;
1468 1877
1878 } elsif ($sym == CFClient::SDLK_UP) {
1879 if ($self->{history_pointer} < 0) {
1880 $self->{history_saveback} = $self->get_text;
1881 }
1882 if (@{$self->{history} || []} > 0) {
1883 $self->{history_pointer}++;
1884 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1885 $self->{history_pointer} = @{$self->{history} || []} - 1;
1886 }
1887 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1888 }
1889
1890 } elsif ($sym == CFClient::SDLK_DOWN) {
1891 $self->{history_pointer}--;
1892 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1893
1894 if ($self->{history_pointer} >= 0) {
1895 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1896 } else {
1897 $self->set_text ($self->{history_saveback});
1898 }
1899
1469 } else { 1900 } else {
1470 $self->SUPER::key_down ($ev); 1901 return $self->SUPER::key_down ($ev)
1902 }
1903
1471 } 1904 1
1472
1473} 1905}
1474 1906
1475############################################################################# 1907#############################################################################
1476 1908
1477package CFClient::UI::Button; 1909package CFClient::UI::Button;
… …
1486 1918
1487sub new { 1919sub new {
1488 my $class = shift; 1920 my $class = shift;
1489 1921
1490 $class->SUPER::new ( 1922 $class->SUPER::new (
1491 padding => 4, 1923 padding_x => 4,
1924 padding_y => 4,
1492 fg => [1, 1, 1], 1925 fg => [1, 1, 1],
1493 bg => [1, 1, 1, 0.2],
1494 active_fg => [0, 0, 1], 1926 active_fg => [0, 0, 1],
1495 can_hover => 1, 1927 can_hover => 1,
1496 align => 0, 1928 align => 0,
1497 valign => 0, 1929 valign => 0,
1498 can_events => 1, 1930 can_events => 1,
1499 @_ 1931 @_
1500 ) 1932 )
1501} 1933}
1502 1934
1935sub activate { }
1936
1503sub button_up { 1937sub button_up {
1504 my ($self, $ev, $x, $y) = @_; 1938 my ($self, $ev, $x, $y) = @_;
1505 1939
1940 $self->emit ("activate")
1506 if ($x >= 0 && $x < $self->{w} 1941 if $x >= 0 && $x < $self->{w}
1507 && $y >= 0 && $y < $self->{h}) { 1942 && $y >= 0 && $y < $self->{h};
1508 $self->emit ("activate"); 1943
1509 } 1944 1
1510} 1945}
1511 1946
1512sub _draw { 1947sub _draw {
1513 my ($self) = @_; 1948 my ($self) = @_;
1514 1949
1515 local $self->{fg} = $self->{fg}; 1950 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1516 1951
1517 if ($GRAB == $self) {
1518 $self->{fg} = $self->{active_fg};
1519 }
1520
1521 glEnable GL_BLEND;
1522 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1523 glEnable GL_TEXTURE_2D; 1952 glEnable GL_TEXTURE_2D;
1524 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1525 glColor 0, 0, 0, 1; 1954 glColor 0, 0, 0, 1;
1526 1955
1527 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1956 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1528 1957
1529 glDisable GL_TEXTURE_2D; 1958 glDisable GL_TEXTURE_2D;
1530 glDisable GL_BLEND;
1531 1959
1532 $self->SUPER::_draw; 1960 $self->SUPER::_draw;
1533} 1961}
1534 1962
1535############################################################################# 1963#############################################################################
… …
1546 1974
1547sub new { 1975sub new {
1548 my $class = shift; 1976 my $class = shift;
1549 1977
1550 $class->SUPER::new ( 1978 $class->SUPER::new (
1551 padding => 2, 1979 padding_x => 2,
1980 padding_y => 2,
1552 fg => [1, 1, 1], 1981 fg => [1, 1, 1],
1553 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],
1554 state => 0, 1985 state => 0,
1555 can_hover => 1, 1986 can_hover => 1,
1556 @_ 1987 @_
1557 ) 1988 )
1558} 1989}
1559 1990
1560sub size_request { 1991sub size_request {
1561 my ($self) = @_; 1992 my ($self) = @_;
1562 1993
1563 ($self->{padding} * 2 + 6) x 2 1994 (6) x 2
1564} 1995}
1565 1996
1566sub button_down { 1997sub button_down {
1567 my ($self, $ev, $x, $y) = @_; 1998 my ($self, $ev, $x, $y) = @_;
1568 1999
1569 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2000 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1570 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2001 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1571 $self->{state} = !$self->{state}; 2002 $self->{state} = !$self->{state};
1572 $self->emit (changed => $self->{state}); 2003 $self->_emit (changed => $self->{state});
2004 } else {
2005 return 0
2006 }
2007
1573 } 2008 1
1574} 2009}
1575 2010
1576sub _draw { 2011sub _draw {
1577 my ($self) = @_; 2012 my ($self) = @_;
1578 2013
1579 $self->SUPER::_draw; 2014 $self->SUPER::_draw;
1580 2015
1581 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2016 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1582 2017
1583 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;
1584 2021
1585 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2022 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1586 2023
1587 glEnable GL_BLEND; 2024 my $tex = $self->{state} ? $tex[1] : $tex[0];
2025
1588 glEnable GL_TEXTURE_2D; 2026 glEnable GL_TEXTURE_2D;
1589 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1590
1591 my $tex = $self->{state} ? $tex[1] : $tex[0];
1592
1593 $tex->draw_quad (0, 0, $s, $s); 2027 $tex->draw_quad_alpha (0, 0, $s, $s);
1594
1595 glDisable GL_TEXTURE_2D; 2028 glDisable GL_TEXTURE_2D;
1596 glDisable GL_BLEND;
1597} 2029}
1598 2030
1599############################################################################# 2031#############################################################################
1600 2032
1601package CFClient::UI::Image; 2033package CFClient::UI::Image;
… …
1644 glTranslate 0, -$self->{w}, 0; 2076 glTranslate 0, -$self->{w}, 0;
1645 2077
1646 ($w, $h) = ($h, $w); 2078 ($w, $h) = ($h, $w);
1647 } 2079 }
1648 2080
1649 glEnable GL_BLEND;
1650 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1651 glEnable GL_TEXTURE_2D; 2081 glEnable GL_TEXTURE_2D;
1652 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2082 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1653 2083
1654 $tex->draw_quad (0, 0, $w, $h); 2084 $tex->draw_quad_alpha (0, 0, $w, $h);
1655 2085
1656 glDisable GL_BLEND;
1657 glDisable GL_TEXTURE_2D; 2086 glDisable GL_TEXTURE_2D;
1658} 2087}
1659 2088
1660############################################################################# 2089#############################################################################
1661 2090
… …
1709} 2138}
1710 2139
1711sub set_max { 2140sub set_max {
1712 my ($self, $max) = @_; 2141 my ($self, $max) = @_;
1713 2142
2143 return if $self->{max_val} == $max;
2144
1714 $self->{max_val} = $max; 2145 $self->{max_val} = $max;
2146 $self->update;
1715} 2147}
1716 2148
1717sub set_value { 2149sub set_value {
1718 my ($self, $val, $max) = @_; 2150 my ($self, $val, $max) = @_;
1719 2151
1720 $self->set_max ($max) 2152 $self->set_max ($max)
1721 if defined $max; 2153 if defined $max;
1722 2154
1723 $max = $self->{max_val}; 2155 return if $self->{val} == $val;
2156
1724 $self->{val} = $val; 2157 $self->{val} = $val;
1725
1726 $self->update; 2158 $self->update;
1727} 2159}
1728 2160
1729sub _draw { 2161sub _draw {
1730 my ($self) = @_; 2162 my ($self) = @_;
… …
1748 2180
1749 my $h1 = $self->{h} * (1 - $ycut1); 2181 my $h1 = $self->{h} * (1 - $ycut1);
1750 my $h2 = $self->{h} * (1 - $ycut2); 2182 my $h2 = $self->{h} * (1 - $ycut2);
1751 2183
1752 glEnable GL_BLEND; 2184 glEnable GL_BLEND;
1753 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;
1754 glEnable GL_TEXTURE_2D; 2187 glEnable GL_TEXTURE_2D;
1755 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2188 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1756 2189
1757 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2190 glBindTexture GL_TEXTURE_2D, $t1->{name};
1758 glBegin GL_QUADS; 2191 glBegin GL_QUADS;
… …
1793 2226
1794sub new { 2227sub new {
1795 my ($class, %arg) = @_; 2228 my ($class, %arg) = @_;
1796 2229
1797 my $self = $class->SUPER::new ( 2230 my $self = $class->SUPER::new (
1798 tooltip => $arg{type}, 2231 tooltip => $arg{type},
1799 can_hover => 1, 2232 can_hover => 1,
2233 can_events => 1,
1800 %arg, 2234 %arg,
1801 ); 2235 );
1802 2236
1803 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2237 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1804 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2238 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1812 2246
1813 $self->{value}->set_fontsize ($fsize); 2247 $self->{value}->set_fontsize ($fsize);
1814 $self->{max} ->set_fontsize ($fsize); 2248 $self->{max} ->set_fontsize ($fsize);
1815} 2249}
1816 2250
2251sub set_max {
2252 my ($self, $max) = @_;
2253
2254 $self->{gauge}->set_max ($max);
2255 $self->{max}->set_text ($max);
2256}
2257
1817sub set_value { 2258sub set_value {
1818 my ($self, $val, $max) = @_; 2259 my ($self, $val, $max) = @_;
1819 2260
1820 $self->set_max ($max) 2261 $self->set_max ($max)
1821 if defined $max; 2262 if defined $max;
1822 2263
1823 $self->{gauge}->set_value ($val, $max); 2264 $self->{gauge}->set_value ($val, $max);
1824 $self->{value}->set_text ($val); 2265 $self->{value}->set_text ($val);
1825}
1826
1827sub set_max {
1828 my ($self, $max) = @_;
1829
1830 $self->{gauge}->set_max ($max);
1831 $self->{max}->set_text ($max);
1832} 2266}
1833 2267
1834############################################################################# 2268#############################################################################
1835 2269
1836package CFClient::UI::Slider; 2270package CFClient::UI::Slider;
… …
1846 qw(s1_slider.png s1_slider_bg.png); 2280 qw(s1_slider.png s1_slider_bg.png);
1847 2281
1848sub new { 2282sub new {
1849 my $class = shift; 2283 my $class = shift;
1850 2284
1851 # range [value, low, high, page] 2285 # range [value, low, high, page, unit]
1852 2286
1853 # TODO: 0-width page 2287 # TODO: 0-width page
1854 # TODO: req_w/h are wrong with vertical 2288 # TODO: req_w/h are wrong with vertical
1855 # TODO: calculations are off 2289 # TODO: calculations are off
1856 my $self = $class->SUPER::new ( 2290 my $self = $class->SUPER::new (
1857 fg => [1, 1, 1], 2291 fg => [1, 1, 1],
1858 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],
1859 range => [0, 0, 100, 10], 2295 range => [0, 0, 100, 10, 0],
1860 req_w => 20, 2296 min_w => $::WIDTH / 80,
1861 req_h => 20, 2297 min_h => $::WIDTH / 80,
1862 vertical => 0, 2298 vertical => 0,
1863 can_hover => 1, 2299 can_hover => 1,
1864 inner_pad => 5, 2300 inner_pad => 0.02,
1865 @_ 2301 @_
1866 ); 2302 );
1867 2303
2304 $self->set_value ($self->{range}[0]);
2305 $self->update;
2306
1868 $self 2307 $self
1869} 2308}
1870 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
1871sub size_request { 2346sub size_request {
1872 my ($self) = @_; 2347 my ($self) = @_;
1873 2348
1874 my $w = $self->{req_w}; 2349 ($self->{req_w}, $self->{req_h})
1875 my $h = $self->{req_h};
1876
1877 $self->{vertical} ? ($h, $w) : ($w, $h)
1878} 2350}
1879 2351
1880sub button_down { 2352sub button_down {
1881 my ($self, $ev, $x, $y) = @_; 2353 my ($self, $ev, $x, $y) = @_;
1882 2354
1883 $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
1884 $self->mouse_motion ($ev, $x, $y); 2359 $self->mouse_motion ($ev, $x, $y)
1885} 2360}
1886 2361
1887sub mouse_motion { 2362sub mouse_motion {
1888 my ($self, $ev, $x, $y) = @_; 2363 my ($self, $ev, $x, $y) = @_;
1889 2364
1890 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
1891 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2393 my ($value, $lo, $hi, $page) = @{$self->{range}};
2394 my $range = ($hi - $page - $lo) || 1e-100;
1892 2395
1893 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2396 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1894 2397
1895 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2398 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1896 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2399 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1897 2400
1898 $x -= $inner_pad_px; # substract the padding 2401 $value = ($value - $lo) / $range;
1899 $x = $x * ($hi - $lo) / $inner_w + $lo; 2402 $value = $value * $self->{scale} + $self->{offset};
1900 $x = $lo if $x < $lo;
1901 $x = $hi - $page if $x > $hi - $page;
1902 $self->{range}[0] = $x;
1903 2403
1904 $self->emit (changed => $x); 2404 $self->{knob_x} = $value - $knob_w * 0.5;
1905 $self->update; 2405 $self->{knob_w} = $knob_w;
1906 } 2406 }
1907}
1908
1909# the inner_* stuff is for generating a padding for the slider handle,
1910# so that the handle doesn't leave the texture. This calculation isn't 100%
1911# correct propably, but it does the job for now
1912sub _calc_inner_pad_px {
1913 my ($self, $w) = @_;
1914 ($w / 100) * $self->{inner_pad} # % to pixels
1915}
1916
1917sub _draw {
1918 my ($self) = @_;
1919 2407
1920 $self->SUPER::_draw (); 2408 $self->SUPER::_draw ();
1921 2409
1922 my ($w, $h) = @$self{qw(w h)}; 2410 glScale $self->{w}, $self->{h};
1923 2411
1924 if ($self->{vertical}) { 2412 if ($self->{vertical}) {
1925 # draw a vertical slider like a rotated horizontal slider 2413 # draw a vertical slider like a rotated horizontal slider
1926 2414
2415 glTranslate 1, 0, 0;
1927 glRotate 90, 0, 0, 1; 2416 glRotate 90, 0, 0, 1;
1928 glTranslate 0, -$self->{w}, 0;
1929
1930 ($w, $h) = ($h, $w);
1931 } 2417 }
1932 2418
1933 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2419 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1934 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2420 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1935 2421
1936 my ($value, $lo, $hi, $page) = @{$self->{range}};
1937
1938 $hi = $value + 1 if $lo == $hi;
1939
1940 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1941 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1942
1943 $page = int $page * $inner_w / ($hi - $lo);
1944 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1945
1946 $w -= $page;
1947 $page &= ~1;
1948 glTranslate $page * 0.5, 0, 0;
1949 $page ||= 2;
1950
1951 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1952 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1953
1954 glEnable GL_BLEND;
1955 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1956 glEnable GL_TEXTURE_2D; 2422 glEnable GL_TEXTURE_2D;
1957 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2423 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1958 2424
1959 # draw background 2425 # draw background
1960 $tex[1]->draw_quad (0, 0, $w, $h); 2426 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1961 2427
1962 # draw handle 2428 # draw handle
1963 $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);
1964 2430
1965 glDisable GL_BLEND;
1966 glDisable GL_TEXTURE_2D; 2431 glDisable GL_TEXTURE_2D;
1967} 2432}
1968 2433
1969############################################################################# 2434#############################################################################
1970 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
1971package CFClient::UI::TextView; 2477package CFClient::UI::TextScroller;
1972 2478
1973our @ISA = CFClient::UI::HBox::; 2479our @ISA = CFClient::UI::HBox::;
1974 2480
1975use CFClient::OpenGL; 2481use CFClient::OpenGL;
1976 2482
… …
1978 my $class = shift; 2484 my $class = shift;
1979 2485
1980 my $self = $class->SUPER::new ( 2486 my $self = $class->SUPER::new (
1981 fontsize => 1, 2487 fontsize => 1,
1982 can_events => 0, 2488 can_events => 0,
2489 indent => 0,
1983 #font => default_font 2490 #font => default_font
1984 @_, 2491 @_,
1985 2492
1986 layout => (new CFClient::Layout), 2493 layout => (new CFClient::Layout 1),
1987 par => [], 2494 par => [],
1988 height => 0, 2495 height => 0,
1989 children => [ 2496 children => [
1990 (new CFClient::UI::Empty expand => 1), 2497 (new CFClient::UI::Empty expand => 1),
1991 (new CFClient::UI::Slider vertical => 1), 2498 (new CFClient::UI::Slider vertical => 1),
1992 ], 2499 ],
1993 ); 2500 );
1994 2501
1995 $self->{children}[1]->connect (changed => sub { 2502 $self->{children}[1]->connect (changed => sub { $self->update });
1996 $self->update;
1997 });
1998 2503
1999 $self 2504 $self
2000} 2505}
2001 2506
2002sub set_fontsize { 2507sub set_fontsize {
2003 my ($self, $fontsize) = @_; 2508 my ($self, $fontsize) = @_;
2004 2509
2005 $self->{fontsize} = $fontsize; 2510 $self->{fontsize} = $fontsize;
2006 $self->reflow; 2511 $self->reflow;
2007}
2008
2009sub text_height {
2010 my ($self, $text) = @_;
2011
2012 my $layout = $self->{layout};
2013
2014 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2015 $layout->set_width ($self->{w});
2016 $layout->set_text ($text);
2017
2018 ($layout->size)[1]
2019}
2020
2021sub reflow {
2022 my ($self) = @_;
2023
2024 $self->{need_reflow}++;
2025 $self->update;
2026} 2512}
2027 2513
2028sub size_allocate { 2514sub size_allocate {
2029 my ($self, $w, $h) = @_; 2515 my ($self, $w, $h) = @_;
2030 2516
2031 $self->SUPER::size_allocate ($w, $h); 2517 $self->SUPER::size_allocate ($w, $h);
2032 2518
2033 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2519 $self->{layout}->set_font ($self->{font}) if $self->{font};
2034 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2035 $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});
2036 2523
2037 $self->reflow; 2524 $self->reflow;
2038} 2525}
2039 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
2040sub add_paragraph { 2562sub add_paragraph {
2041 my ($self, $color, $text) = @_; 2563 my ($self, $color, $text, $indent) = @_;
2042 2564
2043 #TODO: intelligently "reformat" paragraph 2565 for my $line (split /\n/, $text) {
2044 2566 my ($w, $h) = $self->text_size ($line);
2045 my $height = $self->text_height ($text);
2046
2047 $self->{height} += $height; 2567 $self->{height} += $h;
2568 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2569 }
2048 2570
2049 push @{$self->{par}}, [$height, $color, $text];
2050
2051 $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]);
2052 $self->{children}[1]->update;
2053} 2572}
2054 2573
2055sub update { 2574sub update {
2056 my ($self) = @_; 2575 my ($self) = @_;
2057 2576
… …
2059 2578
2060 return unless $self->{h} > 0; 2579 return unless $self->{h} > 0;
2061 2580
2062 delete $self->{texture}; 2581 delete $self->{texture};
2063 2582
2064 $ROOT->on_refresh ($self, sub { 2583 $ROOT->on_post_alloc ($self => sub {
2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2585
2065 if (delete $self->{need_reflow}) { 2586 if (delete $self->{need_reflow}) {
2066 my $height = 0; 2587 my $height = 0;
2067 2588
2068 $height += $_->[0] = $self->text_height ($_->[2]) 2589 my $layout = $self->{layout};
2590
2591 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2592
2069 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 }
2070 2605
2071 $self->{height} = $height; 2606 $self->{height} = $height;
2072 2607
2073 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2608 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2074 2609
2075 delete $self->{texture}; 2610 delete $self->{texture};
2076 } 2611 }
2077 2612
2078 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2613 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2079 glClearColor 0, 0, 0, 1; 2614 glClearColor 0, 0, 0, 0;
2080 glClear GL_COLOR_BUFFER_BIT; 2615 glClear GL_COLOR_BUFFER_BIT;
2081 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
2082 glEnable GL_BLEND; 2628 glEnable GL_BLEND;
2629 #TODO# not correct in windows where rgba is forced off
2083 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2084 glEnable GL_TEXTURE_2D;
2085 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2086
2087 my $top = int $self->{children}[1]{range}[0];
2088
2089 my $y0 = $top;
2090 my $y1 = $top + $self->{h};
2091
2092 my $y = 0;
2093
2094 my $layout = $self->{layout};
2095
2096 $layout->set_font ($self->{font}) if $self->{font};
2097 2631
2098 for my $par (@{$self->{par}}) { 2632 for my $par (@{$self->{par}}) {
2099 my $h = $par->[0]; 2633 my $h = $par->[1];
2100 2634
2101 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});
2102 $layout->set_text ($par->[2]); 2639 $layout->set_markup ($par->[4]);
2103 2640
2104 glColor @{ $par->[1] }; 2641 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2105 my ($W, $H) = $layout->size; 2642
2106 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;
2107 } 2645 }
2108 2646
2109 $y += $h; 2647 $y += $h;
2110 } 2648 }
2111 2649
2112 glDisable GL_TEXTURE_2D;
2113 glDisable GL_BLEND; 2650 glDisable GL_BLEND;
2114 }; 2651 };
2115 }); 2652 });
2116} 2653}
2117 2654
2118sub _draw { 2655sub _draw {
2119 my ($self) = @_; 2656 my ($self) = @_;
2120 2657
2121 if ($self->{texture}) {
2122 glEnable GL_TEXTURE_2D; 2658 glEnable GL_TEXTURE_2D;
2123 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2659 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2124 $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});
2125 glDisable GL_TEXTURE_2D; 2662 glDisable GL_TEXTURE_2D;
2126 }
2127 2663
2128 $self->{children}[1]->draw; 2664 $self->{children}[1]->draw;
2129 2665
2130} 2666}
2131 2667
… …
2179 2715
2180sub new { 2716sub new {
2181 my $class = shift; 2717 my $class = shift;
2182 2718
2183 my $self = $class->SUPER::new ( 2719 my $self = $class->SUPER::new (
2184 state => 0, 2720 state => 0,
2185 connect_activate => \&toggle_flopper, 2721 on_activate => \&toggle_flopper,
2186 @_ 2722 @_
2187 ); 2723 );
2188 2724
2189 if ($self->{state}) {
2190 $self->{state} = 0;
2191 $self->toggle_flopper;
2192 }
2193
2194 $self 2725 $self
2195} 2726}
2196 2727
2197sub toggle_flopper { 2728sub toggle_flopper {
2198 my ($self) = @_; 2729 my ($self) = @_;
2199 2730
2200 # TODO: use animation 2731 $self->{other}->toggle_visibility;
2201 if ($self->{state} = !$self->{state}) {
2202 $CFClient::UI::ROOT->add ($self->{other});
2203 $self->{other}->move ($self->coord2global (0, $self->{h}));
2204 $self->emit ("open");
2205 } else {
2206 $CFClient::UI::ROOT->remove ($self->{other});
2207 $self->emit ("close");
2208 }
2209
2210 $self->emit (changed => $self->{state});
2211} 2732}
2212 2733
2213############################################################################# 2734#############################################################################
2214 2735
2215package CFClient::UI::Tooltip; 2736package CFClient::UI::Tooltip;
… …
2225 @_, 2746 @_,
2226 can_events => 0, 2747 can_events => 0,
2227 ) 2748 )
2228} 2749}
2229 2750
2230sub set_markup { 2751sub set_tooltip_from {
2231 my ($self, $text) = @_; 2752 my ($self, $widget) = @_;
2232 2753
2233 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2754 my $tooltip = $widget->{tooltip};
2234 $self->{label}->set_markup ($text); 2755
2235 $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 );
2236} 2774}
2237 2775
2238sub size_request { 2776sub size_request {
2239 my ($self) = @_; 2777 my ($self) = @_;
2240
2241 $self->child->set_max_size ($::WIDTH * 0.3);
2242 2778
2243 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2779 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2244 2780
2245 ($w + 4, $h + 4) 2781 ($w + 4, $h + 4)
2246} 2782}
… …
2249 my ($self, $w, $h) = @_; 2785 my ($self, $w, $h) = @_;
2250 2786
2251 $self->SUPER::size_allocate ($w - 4, $h - 4); 2787 $self->SUPER::size_allocate ($w - 4, $h - 4);
2252} 2788}
2253 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
2254sub _draw { 2808sub _draw {
2255 my ($self) = @_; 2809 my ($self) = @_;
2256 2810
2257 glPushMatrix;
2258 glTranslate 0.375, 0.375; 2811 glTranslate 0.375, 0.375;
2259 2812
2260 my ($w, $h) = @$self{qw(w h)}; 2813 my ($w, $h) = @$self{qw(w h)};
2261 2814
2262 glColor 1, 0.8, 0.4; 2815 glColor 1, 0.8, 0.4;
… …
2273 glVertex 0 , $h; 2826 glVertex 0 , $h;
2274 glVertex $w, $h; 2827 glVertex $w, $h;
2275 glVertex $w, 0; 2828 glVertex $w, 0;
2276 glEnd; 2829 glEnd;
2277 2830
2278 glPopMatrix; 2831 glTranslate 2 - 0.375, 2 - 0.375;
2279 2832
2280 glTranslate 2, 2;
2281 $self->SUPER::_draw; 2833 $self->SUPER::_draw;
2282} 2834}
2283 2835
2284############################################################################# 2836#############################################################################
2285 2837
… …
2290use CFClient::OpenGL; 2842use CFClient::OpenGL;
2291 2843
2292sub new { 2844sub new {
2293 my $class = shift; 2845 my $class = shift;
2294 2846
2295 $class->SUPER::new ( 2847 my $self = $class->SUPER::new (
2296 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 => [],
2297 @_, 3561 @_,
2298 ) 3562 )
2299} 3563}
2300 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
2301sub size_request { 3694sub size_request {
2302 (32, 8)
2303}
2304
2305sub draw {
2306 my ($self) = @_; 3695 my ($self) = @_;
2307 3696
2308 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 3697 ($self->{w}, $self->{h})
2309
2310 if ($tex) {
2311 glEnable GL_BLEND;
2312 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2313 glEnable GL_TEXTURE_2D;
2314 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2315 glColor 1, 1, 1, 1;
2316 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2317 glDisable GL_TEXTURE_2D;
2318 glDisable GL_BLEND;
2319 }
2320} 3698}
2321 3699
2322############################################################################# 3700sub _to_pixel {
3701 my ($coord, $size, $max) = @_;
2323 3702
2324package CFClient::UI::Root; 3703 $coord =
3704 $coord eq "center" ? ($max - $size) * 0.5
3705 : $coord eq "max" ? $max
3706 : $coord;
2325 3707
2326our @ISA = CFClient::UI::Container::; 3708 $coord = 0 if $coord < 0;
3709 $coord = $max - $size if $coord > $max - $size;
2327 3710
2328use CFClient::OpenGL; 3711 int $coord + 0.5
2329
2330sub check_size {
2331 my ($self) = @_;
2332
2333 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2334} 3712}
2335 3713
2336sub size_request { 3714sub size_allocate {
2337 ($::WIDTH, $::HEIGHT)
2338}
2339
2340sub configure {
2341 my ($self, $x, $y, $w, $h) = @_; 3715 my ($self, $w, $h) = @_;
2342 3716
2343 $self->SUPER::configure ($x, $y, $w, $h);
2344
2345 for my $child (@{$self->{children}}) { 3717 for my $child ($self->children) {
2346 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)};
2347 3719
2348 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3720 $X = $child->{force_x} if exists $child->{force_x};
2349 $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
2350 $child->configure ($X, $Y, $W,$H); 3726 $child->configure ($X, $Y, $W, $H);
2351 } 3727 }
2352} 3728}
2353 3729
2354sub _topleft { 3730sub coord2local {
2355 my ($self, $x, $y) = @_; 3731 my ($self, $x, $y) = @_;
2356 3732
2357 ($x, $y) 3733 ($x, $y)
2358} 3734}
2359 3735
3736sub coord2global {
3737 my ($self, $x, $y) = @_;
3738
3739 ($x, $y)
3740}
3741
2360sub update { 3742sub update {
2361 my ($self) = @_; 3743 my ($self) = @_;
2362 3744
2363 $self->check_size; 3745 $::WANT_REFRESH++;
2364 ::refresh ();
2365} 3746}
2366 3747
2367sub add { 3748sub add {
2368 my ($self, $child) = @_; 3749 my ($self, @children) = @_;
2369 3750
2370 # integerize window positions 3751 $_->{is_toplevel} = 1
2371 $child->{x} = int $child->{x}; 3752 for @children;
2372 $child->{y} = int $child->{y};
2373 3753
2374 $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 }
2375} 3770}
2376 3771
2377sub on_refresh { 3772sub on_refresh {
2378 my ($self, $id, $cb) = @_; 3773 my ($self, $id, $cb) = @_;
2379 3774
2380 $self->{refresh_hook}{$id} = $cb; 3775 $self->{refresh_hook}{$id} = $cb;
2381} 3776}
2382 3777
3778sub on_post_alloc {
3779 my ($self, $id, $cb) = @_;
3780
3781 $self->{post_alloc_hook}{$id} = $cb;
3782}
3783
2383sub draw { 3784sub draw {
2384 my ($self) = @_; 3785 my ($self) = @_;
2385 3786
2386 while (my $rcb = delete $self->{refresh_hook}) { 3787 while ($self->{refresh_hook}) {
2387 $_->() for values %$rcb; 3788 $_->()
3789 for values %{delete $self->{refresh_hook}};
2388 } 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
2389 3883
2390 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3884 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2391 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3885 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2392 glClear GL_COLOR_BUFFER_BIT; 3886 glClear GL_COLOR_BUFFER_BIT;
2393 3887
2394 glMatrixMode GL_PROJECTION; 3888 glMatrixMode GL_PROJECTION;
2395 glLoadIdentity; 3889 glLoadIdentity;
2396 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3890 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2397 glMatrixMode GL_MODELVIEW; 3891 glMatrixMode GL_MODELVIEW;
2398 glLoadIdentity; 3892 glLoadIdentity;
2399 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
2400 $self->_draw; 3901 $self->_draw;
2401} 3902}
2402 3903
2403############################################################################# 3904#############################################################################
2404 3905
2405package CFClient::UI; 3906package CFClient::UI;
2406 3907
2407$ROOT = new CFClient::UI::Root; 3908$ROOT = new CFClient::UI::Root;
2408$TOOLTIP = new CFClient::UI::Tooltip; 3909$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2409 3910
24101 39111
2411 3912

Diff Legend

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