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.172 by root, Tue Apr 25 09:52:04 2006 UTC vs.
Revision 1.373 by root, Sun Jul 15 22:39:30 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines