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.179 by elmex, Fri Apr 28 05:17:21 2006 UTC vs.
Revision 1.373 by root, Sun Jul 15 22:39:30 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines