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

Diff Legend

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