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

Diff Legend

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