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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines