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.181 by root, Sat Apr 29 16:17:09 2006 UTC vs.
Revision 1.425 by root, Fri Aug 10 04:02:13 2007 UTC

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

Diff Legend

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