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.173 by root, Tue Apr 25 10:30:48 2006 UTC vs.
Revision 1.288 by root, Mon Jun 5 21:14:40 2006 UTC

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

Diff Legend

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