ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.172 by root, Tue Apr 25 09:52:04 2006 UTC vs.
Revision 1.403 by root, Sat Jul 21 21:25:23 2007 UTC

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

Diff Legend

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