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

Diff Legend

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