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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.179 by elmex, Fri Apr 28 05:17:21 2006 UTC vs.
Revision 1.421 by root, Wed Aug 1 14:27:21 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;
1253} 1926}
1254 1927
1255sub set_text { 1928sub set_text {
1256 my ($self, $text) = @_; 1929 my ($self, $text) = @_;
1257 1930
1258 return if $self->{text} eq "T$text"; 1931 return if $self->{text} eq "T$text";
1259 $self->{text} = "T$text"; 1932 $self->{text} = "T$text";
1260 1933
1261 $self->{layout}->set_text ($text); 1934 $self->{layout}->set_text ($text);
1262 1935
1263 delete $self->{texture}; 1936 delete $self->{size_req};
1937 $self->realloc;
1264 $self->update; 1938 $self->update;
1265 $self->check_size;
1266} 1939}
1267 1940
1268sub set_markup { 1941sub set_markup {
1269 my ($self, $markup) = @_; 1942 my ($self, $markup) = @_;
1270 1943
1271 return if $self->{text} eq "M$markup"; 1944 return if $self->{text} eq "M$markup";
1272 $self->{text} = "M$markup"; 1945 $self->{text} = "M$markup";
1273 1946
1947 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1948
1274 $self->{layout}->set_markup ($markup); 1949 $self->{layout}->set_markup ($markup);
1275 1950
1276 delete $self->{texture}; 1951 delete $self->{size_req};
1952 $self->realloc;
1277 $self->update; 1953 $self->update;
1278 $self->check_size;
1279} 1954}
1280 1955
1281sub size_request { 1956sub size_request {
1282 my ($self) = @_; 1957 my ($self) = @_;
1283 1958
1959 $self->{size_req} ||= do {
1284 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1960 $self->{layout}->set_font ($self->{font}) if $self->{font};
1285 $self->{layout}->set_width ($self->{max_w} || -1); 1961 $self->{layout}->set_width ($self->{max_w} || -1);
1962 $self->{layout}->set_ellipsise ($self->{ellipsise});
1963 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1286 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1964 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1287 1965
1288 my ($w, $h) = $self->{layout}->size; 1966 my ($w, $h) = $self->{layout}->size;
1289 1967
1290 if (exists $self->{template}) { 1968 if (exists $self->{template}) {
1291 $self->{template}->set_font ($self->{font}) if $self->{font}; 1969 $self->{template}->set_font ($self->{font}) if $self->{font};
1970 $self->{template}->set_width ($self->{max_w} || -1);
1292 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1971 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1293 1972
1294 my ($w2, $h2) = $self->{template}->size; 1973 my ($w2, $h2) = $self->{template}->size;
1295 1974
1296 $w = List::Util::max $w, $w2; 1975 $w = List::Util::max $w, $w2;
1297 $h = List::Util::max $h, $h2; 1976 $h = List::Util::max $h, $h2;
1977 }
1978
1979 [$w, $h]
1298 } 1980 };
1299 1981
1300 ( 1982 @{ $self->{size_req} }
1301 $w + $self->{padding} * 2,
1302 $h + $self->{padding} * 2,
1303 )
1304} 1983}
1305 1984
1985sub baseline_shift {
1986 $_[0]{layout}->descent
1987}
1988
1306sub size_allocate { 1989sub invoke_size_allocate {
1307 my ($self, $w, $h) = @_; 1990 my ($self, $w, $h) = @_;
1308 1991
1992 delete $self->{ox};
1993
1309 delete $self->{texture}; 1994 delete $self->{texture}
1995 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1996
1997 1
1310} 1998}
1311 1999
1312sub set_fontsize { 2000sub set_fontsize {
1313 my ($self, $fontsize) = @_; 2001 my ($self, $fontsize) = @_;
1314 2002
1315 $self->{fontsize} = $fontsize; 2003 $self->{fontsize} = $fontsize;
2004 delete $self->{size_req};
1316 delete $self->{texture}; 2005 delete $self->{texture};
1317 $self->check_size; 2006
1318 $self->update; 2007 $self->realloc;
2008}
2009
2010sub reconfigure {
2011 my ($self) = @_;
2012
2013 delete $self->{size_req};
2014 delete $self->{texture};
2015
2016 $self->SUPER::reconfigure;
1319} 2017}
1320 2018
1321sub _draw { 2019sub _draw {
1322 my ($self) = @_; 2020 my ($self) = @_;
1323 2021
2022 $self->SUPER::_draw; # draw background, if applicable
2023
1324 my $tex = $self->{texture} ||= do { 2024 my $size = $self->{texture} ||= do {
2025 $self->{layout}->set_foreground (@{$self->{fg}});
1325 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2026 $self->{layout}->set_font ($self->{font}) if $self->{font};
1326 $self->{layout}->set_width ($self->{w}); 2027 $self->{layout}->set_width ($self->{w});
2028 $self->{layout}->set_ellipsise ($self->{ellipsise});
2029 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1327 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 2030 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1328 new_from_layout CFClient::Texture $self->{layout} 2031
2032 [$self->{layout}->size]
1329 }; 2033 };
1330 2034
1331 glEnable GL_BLEND; 2035 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} 2036 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1340 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 2037 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1341 : ($self->{w} - $tex->{w}) * 0.5 2038 : ($self->{w} - $size->[0]) * 0.5);
1342 );
1343 2039
1344 $self->{oy} = int (
1345 $self->{valign} < 0 ? $self->{padding} 2040 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1346 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 2041 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1347 : ($self->{h} - $tex->{h}) * 0.5 2042 : ($self->{h} - $size->[1]) * 0.5);
1348 ); 2043 };
1349 2044
1350 $tex->draw_quad ($self->{ox}, $self->{oy}); 2045# unless ($self->{list}) {
2046# $self->{list} = CFPlus::OpenGL::glGenList;
2047# CFPlus::OpenGL::glNewList $self->{list};
2048# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2049# CFPlus::OpenGL::glEndList;
2050# }
2051#
2052# CFPlus::OpenGL::glCallList $self->{list};
1351 2053
1352 glDisable GL_TEXTURE_2D; 2054 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1353 glDisable GL_BLEND;
1354} 2055}
2056
2057#sub destroy {
2058# my ($self) = @_;
2059#
2060# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2061#
2062# $self->SUPER::destroy;
2063#}
1355 2064
1356############################################################################# 2065#############################################################################
1357 2066
1358package CFClient::UI::EntryBase; 2067package CFPlus::UI::EntryBase;
1359 2068
1360our @ISA = CFClient::UI::Label::; 2069our @ISA = CFPlus::UI::Label::;
1361 2070
1362use CFClient::OpenGL; 2071use CFPlus::OpenGL;
1363 2072
1364sub new { 2073sub new {
1365 my $class = shift; 2074 my $class = shift;
1366 2075
1367 $class->SUPER::new ( 2076 $class->SUPER::new (
1368 fg => [1, 1, 1], 2077 fg => [1, 1, 1],
1369 bg => [0, 0, 0, 0.2], 2078 bg => [0, 0, 0, 0.2],
2079 outline => [0.6, 0.3, 0.1],
1370 active_bg => [1, 1, 1, 0.5], 2080 active_bg => [0, 0, 1, .2],
1371 active_fg => [0, 0, 0], 2081 active_fg => [1, 1, 1],
2082 active_outline => [1, 1, 0],
1372 can_hover => 1, 2083 can_hover => 1,
1373 can_focus => 1, 2084 can_focus => 1,
1374 valign => 0, 2085 valign => 0,
1375 can_events => 1, 2086 can_events => 1,
2087 ellipsise => 0,
2088 #text => ...
2089 #hidden => "*",
1376 @_ 2090 @_
1377 ) 2091 )
1378} 2092}
1379 2093
1380sub _set_text { 2094sub _set_text {
… …
1382 2096
1383 delete $self->{cur_h}; 2097 delete $self->{cur_h};
1384 2098
1385 return if $self->{text} eq $text; 2099 return if $self->{text} eq $text;
1386 2100
1387 delete $self->{texture};
1388
1389 $self->{last_activity} = $::NOW; 2101 $self->{last_activity} = $::NOW;
1390 $self->{text} = $text; 2102 $self->{text} = $text;
1391 2103
1392 $text =~ s/./*/g if $self->{hidden}; 2104 $text =~ s/./*/g if $self->{hidden};
1393 $self->{layout}->set_text ("$text "); 2105 $self->{layout}->set_text ("$text ");
2106 delete $self->{size_req};
1394 2107
1395 $self->emit (changed => $self->{text}); 2108 $self->emit (changed => $self->{text});
2109
2110 $self->realloc;
2111 $self->update;
2112}
2113
2114sub set_text {
2115 my ($self, $text) = @_;
2116
2117 $self->{cursor} = length $text;
2118 $self->_set_text ($text);
1396} 2119}
1397 2120
1398sub get_text { 2121sub get_text {
1399 $_[0]{text} 2122 $_[0]{text}
1400} 2123}
… …
1405 my ($w, $h) = $self->SUPER::size_request; 2128 my ($w, $h) = $self->SUPER::size_request;
1406 2129
1407 ($w + 1, $h) # add 1 for cursor 2130 ($w + 1, $h) # add 1 for cursor
1408} 2131}
1409 2132
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 { 2133sub invoke_key_down {
1425 my ($self, $ev) = @_; 2134 my ($self, $ev) = @_;
1426 2135
1427 my $mod = $ev->{mod}; 2136 my $mod = $ev->{mod};
1428 my $sym = $ev->{sym}; 2137 my $sym = $ev->{sym};
1429 my $uni = $ev->{unicode}; 2138 my $uni = $ev->{unicode};
1430 2139
1431 my $text = $self->get_text; 2140 my $text = $self->get_text;
1432 2141
2142 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2143
1433 if ($sym == 8) { 2144 if ($uni == 8) {
1434 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2145 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1435 } elsif ($sym == 127) { 2146 } elsif ($uni == 127) {
1436 substr $text, $self->{cursor}, 1, ""; 2147 substr $text, $self->{cursor}, 1, "";
1437 } elsif ($sym == CFClient::SDLK_LEFT) { 2148 } elsif ($sym == CFPlus::SDLK_LEFT) {
1438 --$self->{cursor} if $self->{cursor}; 2149 --$self->{cursor} if $self->{cursor};
1439 } elsif ($sym == CFClient::SDLK_RIGHT) { 2150 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1440 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2151 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1441 } elsif ($sym == CFClient::SDLK_HOME) { 2152 } elsif ($sym == CFPlus::SDLK_HOME) {
2153 # what a hack
2154 $self->{cursor} =
2155 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2156 ? length $1
2157 : 0;
2158 } elsif ($sym == CFPlus::SDLK_END) {
2159 # uh, again
2160 $self->{cursor} =
2161 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2162 ? $self->{cursor} + length $1
2163 : length $self->{text};
2164 } elsif ($uni == 21) { # ctrl-u
2165 $text = "";
1442 $self->{cursor} = 0; 2166 $self->{cursor} = 0;
1443 } elsif ($sym == CFClient::SDLK_END) {
1444 $self->{cursor} = length $text;
1445 } elsif ($sym == 27) { 2167 } elsif ($uni == 27) {
1446 $self->emit ('escape'); 2168 $self->emit ('escape');
1447 } elsif ($uni) { 2169 } elsif ($uni == 0x0d) {
2170 substr $text, $self->{cursor}++, 0, "\012";
2171 } elsif ($uni >= 0x20) {
1448 substr $text, $self->{cursor}++, 0, chr $uni; 2172 substr $text, $self->{cursor}++, 0, chr $uni;
2173 } else {
2174 return 0;
1449 } 2175 }
1450 2176
1451 $self->_set_text ($text); 2177 $self->_set_text ($text);
2178
2179 $self->realloc;
1452 $self->update; 2180 $self->update;
1453}
1454 2181
2182 1
2183}
2184
1455sub focus_in { 2185sub invoke_focus_in {
1456 my ($self) = @_; 2186 my ($self) = @_;
1457 2187
1458 $self->{last_activity} = $::NOW; 2188 $self->{last_activity} = $::NOW;
1459 2189
1460 $self->SUPER::focus_in; 2190 $self->SUPER::invoke_focus_in
1461} 2191}
1462 2192
1463sub button_down { 2193sub invoke_button_down {
1464 my ($self, $ev, $x, $y) = @_; 2194 my ($self, $ev, $x, $y) = @_;
1465 2195
1466 $self->SUPER::button_down ($ev, $x, $y); 2196 $self->SUPER::invoke_button_down ($ev, $x, $y);
1467 2197
1468 my $idx = $self->{layout}->xy_to_index ($x, $y); 2198 my $idx = $self->{layout}->xy_to_index ($x, $y);
1469 2199
1470 # byte-index to char-index 2200 # byte-index to char-index
1471 my $text = $self->{text}; 2201 my $text = $self->{text};
1472 utf8::encode $text; 2202 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1473 $self->{cursor} = length substr $text, 0, $idx; 2203 $self->{cursor} = length $text;
1474 2204
1475 $self->_set_text ($self->{text}); 2205 $self->_set_text ($self->{text});
1476 $self->update; 2206 $self->update;
2207
2208 1
1477} 2209}
1478 2210
1479sub mouse_motion { 2211sub invoke_mouse_motion {
1480 my ($self, $ev, $x, $y) = @_; 2212 my ($self, $ev, $x, $y) = @_;
1481# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2213# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
2214
2215 1
1482} 2216}
1483 2217
1484sub _draw { 2218sub _draw {
1485 my ($self) = @_; 2219 my ($self) = @_;
1486 2220
1487 local $self->{fg} = $self->{fg}; 2221 local $self->{fg} = $self->{fg};
1488 2222
1489 if ($FOCUS == $self) { 2223 if ($FOCUS == $self) {
1490 glColor @{$self->{active_bg}}; 2224 glColor_premultiply @{$self->{active_bg}};
1491 $self->{fg} = $self->{active_fg}; 2225 $self->{fg} = $self->{active_fg};
1492 } else { 2226 } else {
1493 glColor @{$self->{bg}}; 2227 glColor_premultiply @{$self->{bg}};
1494 } 2228 }
1495 2229
1496 glEnable GL_BLEND; 2230 glEnable GL_BLEND;
1497 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2231 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1498 glBegin GL_QUADS; 2232 glBegin GL_QUADS;
1499 glVertex 0 , 0; 2233 glVertex 0 , 0;
1500 glVertex 0 , $self->{h}; 2234 glVertex 0 , $self->{h};
1501 glVertex $self->{w}, $self->{h}; 2235 glVertex $self->{w}, $self->{h};
1502 glVertex $self->{w}, 0; 2236 glVertex $self->{w}, 0;
… …
1510 2244
1511 unless (exists $self->{cur_h}) { 2245 unless (exists $self->{cur_h}) {
1512 my $text = substr $self->{text}, 0, $self->{cursor}; 2246 my $text = substr $self->{text}, 0, $self->{cursor};
1513 utf8::encode $text; 2247 utf8::encode $text;
1514 2248
1515 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2249 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1516 } 2250 }
1517 2251
1518 glColor @{$self->{fg}}; 2252 glColor_premultiply @{$self->{active_fg}};
1519 glBegin GL_LINES; 2253 glBegin GL_LINES;
1520 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2254 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}; 2255 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1522 glEnd; 2256 glEnd;
1523 }
1524}
1525 2257
2258 glLineWidth 3;
2259 glColor @{$self->{active_outline}};
2260 glBegin GL_LINE_LOOP;
2261 glVertex 0, 0;
2262 glVertex $self->{w} - 1, 0;
2263 glVertex $self->{w} - 1, $self->{h} - 1;
2264 glVertex 0, $self->{h} - 1;
2265 glEnd;
2266 glLineWidth 1;
2267
2268 } else {
2269 glColor @{$self->{outline}};
2270 glTranslate .375, .375;
2271 glBegin GL_LINE_STRIP;
2272 glVertex 0, $self->{h} * .5;
2273 glVertex 0, $self->{h} - 3;
2274 glVertex $self->{w} - 1, $self->{h} - 3;
2275 glVertex $self->{w} - 1, $self->{h} * .5;
2276 glEnd;
2277 }
2278}
2279
2280#############################################################################
2281
1526package CFClient::UI::Entry; 2282package CFPlus::UI::Entry;
1527 2283
1528our @ISA = CFClient::UI::EntryBase::; 2284our @ISA = CFPlus::UI::EntryBase::;
1529 2285
1530use CFClient::OpenGL; 2286use CFPlus::OpenGL;
1531 2287
1532sub key_down { 2288sub invoke_key_down {
1533 my ($self, $ev) = @_; 2289 my ($self, $ev) = @_;
1534 2290
1535 my $sym = $ev->{sym}; 2291 my $sym = $ev->{sym};
1536 2292
1537 if ($sym == 13) { 2293 if ($ev->{uni} == 0x0d || $sym == 13) {
1538 unshift @{$self->{history}}, 2294 unshift @{$self->{history}},
1539 my $txt = $self->get_text; 2295 my $txt = $self->get_text;
2296
1540 $self->{history_pointer} = -1; 2297 $self->{history_pointer} = -1;
1541 $self->{history_saveback} = ''; 2298 $self->{history_saveback} = '';
1542 $self->emit (activate => $txt); 2299 $self->emit (activate => $txt);
1543 $self->update; 2300 $self->update;
1544 2301
1545 } elsif ($sym == CFClient::SDLK_UP) { 2302 } elsif ($sym == CFPlus::SDLK_UP) {
1546 if ($self->{history_pointer} < 0) { 2303 if ($self->{history_pointer} < 0) {
1547 $self->{history_saveback} = $self->get_text; 2304 $self->{history_saveback} = $self->get_text;
1548 } 2305 }
1549 if (@{$self->{history} || []} > 0) { 2306 if (@{$self->{history} || []} > 0) {
1550 $self->{history_pointer}++; 2307 $self->{history_pointer}++;
… …
1552 $self->{history_pointer} = @{$self->{history} || []} - 1; 2309 $self->{history_pointer} = @{$self->{history} || []} - 1;
1553 } 2310 }
1554 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2311 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1555 } 2312 }
1556 2313
1557 } elsif ($sym == CFClient::SDLK_DOWN) { 2314 } elsif ($sym == CFPlus::SDLK_DOWN) {
1558 $self->{history_pointer}--; 2315 $self->{history_pointer}--;
1559 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2316 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1560 2317
1561 if ($self->{history_pointer} >= 0) { 2318 if ($self->{history_pointer} >= 0) {
1562 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2319 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1563 } else { 2320 } else {
1564 $self->set_text ($self->{history_saveback}); 2321 $self->set_text ($self->{history_saveback});
1565 } 2322 }
1566 2323
1567 } else { 2324 } else {
1568 $self->SUPER::key_down ($ev); 2325 return $self->SUPER::invoke_key_down ($ev)
2326 }
2327
1569 } 2328 1
1570
1571} 2329}
1572 2330
1573############################################################################# 2331#############################################################################
1574 2332
2333package CFPlus::UI::TextEdit;
2334
2335our @ISA = CFPlus::UI::EntryBase::;
2336
2337use CFPlus::OpenGL;
2338
2339sub move_cursor_ver {
2340 my ($self, $dy) = @_;
2341
2342 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2343
2344 $y += $dy;
2345
2346 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2347 $self->{cursor} = $index;
2348 delete $self->{cur_h};
2349 $self->update;
2350 return;
2351 }
2352}
2353
2354sub invoke_key_down {
2355 my ($self, $ev) = @_;
2356
2357 my $sym = $ev->{sym};
2358
2359 if ($sym == CFPlus::SDLK_UP) {
2360 $self->move_cursor_ver (-1);
2361 } elsif ($sym == CFPlus::SDLK_DOWN) {
2362 $self->move_cursor_ver (+1);
2363 } else {
2364 return $self->SUPER::invoke_key_down ($ev)
2365 }
2366
2367 1
2368}
2369
2370#############################################################################
2371
1575package CFClient::UI::Button; 2372package CFPlus::UI::ButtonBin;
1576 2373
1577our @ISA = CFClient::UI::Label::; 2374our @ISA = CFPlus::UI::Bin::;
1578 2375
1579use CFClient::OpenGL; 2376use CFPlus::OpenGL;
1580 2377
1581my @tex = 2378my @tex =
1582 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2379 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1583 qw(b1_button_active.png); 2380 qw(b1_button_inactive.png b1_button_active.png);
1584 2381
1585sub new { 2382sub new {
1586 my $class = shift; 2383 my $class = shift;
1587 2384
1588 $class->SUPER::new ( 2385 $class->SUPER::new (
2386 can_hover => 1,
2387 align => 0,
2388 valign => 0,
2389 can_events => 1,
2390 @_
2391 )
2392}
2393
2394sub invoke_button_up {
2395 my ($self, $ev, $x, $y) = @_;
2396
2397 $self->emit ("activate")
2398 if $x >= 0 && $x < $self->{w}
2399 && $y >= 0 && $y < $self->{h};
2400
2401 1
2402}
2403
2404sub _draw {
2405 my ($self) = @_;
2406
2407 glEnable GL_TEXTURE_2D;
2408 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2409 glColor 0, 0, 0, 1;
2410
2411 my $tex = $tex[$GRAB == $self];
2412 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2413
2414 glDisable GL_TEXTURE_2D;
2415
2416 $self->SUPER::_draw;
2417}
2418
2419#############################################################################
2420
2421package CFPlus::UI::Button;
2422
2423our @ISA = CFPlus::UI::Label::;
2424
2425use CFPlus::OpenGL;
2426
2427my @tex =
2428 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2429 qw(b1_button_inactive.png b1_button_active.png);
2430
2431sub new {
2432 my $class = shift;
2433
2434 $class->SUPER::new (
1589 padding => 4, 2435 padding_x => 4,
2436 padding_y => 4,
2437 fg => [1.0, 1.0, 1.0],
2438 active_fg => [0.8, 0.8, 0.8],
2439 can_hover => 1,
2440 align => 0,
2441 valign => 0,
2442 can_events => 1,
2443 @_
2444 )
2445}
2446
2447sub invoke_button_up {
2448 my ($self, $ev, $x, $y) = @_;
2449
2450 $self->emit ("activate")
2451 if $x >= 0 && $x < $self->{w}
2452 && $y >= 0 && $y < $self->{h};
2453
2454 1
2455}
2456
2457sub _draw {
2458 my ($self) = @_;
2459
2460 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2461
2462 glEnable GL_TEXTURE_2D;
2463 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2464 glColor 0, 0, 0, 1;
2465
2466 my $tex = $tex[$GRAB == $self];
2467 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2468
2469 glDisable GL_TEXTURE_2D;
2470
2471 $self->SUPER::_draw;
2472}
2473
2474#############################################################################
2475
2476package CFPlus::UI::CheckBox;
2477
2478our @ISA = CFPlus::UI::DrawBG::;
2479
2480my @tex =
2481 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2482 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2483
2484use CFPlus::OpenGL;
2485
2486sub new {
2487 my $class = shift;
2488
2489 $class->SUPER::new (
2490 padding_x => 2,
2491 padding_y => 2,
2492 fg => [1, 1, 1],
2493 active_fg => [1, 1, 0],
2494 bg => [0, 0, 0, 0.2],
2495 active_bg => [1, 1, 1, 0.5],
2496 state => 0,
2497 can_hover => 1,
2498 @_
2499 )
2500}
2501
2502sub size_request {
2503 my ($self) = @_;
2504
2505 (6) x 2
2506}
2507
2508sub toggle {
2509 my ($self) = @_;
2510
2511 $self->{state} = !$self->{state};
2512 $self->emit (changed => $self->{state});
2513 $self->update;
2514}
2515
2516sub invoke_button_down {
2517 my ($self, $ev, $x, $y) = @_;
2518
2519 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2520 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2521 $self->toggle;
2522 } else {
2523 return 0
2524 }
2525
2526 1
2527}
2528
2529sub _draw {
2530 my ($self) = @_;
2531
2532 $self->SUPER::_draw;
2533
2534 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2535
2536 my ($w, $h) = @$self{qw(w h)};
2537
2538 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2539
2540 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2541
2542 my $tex = $self->{state} ? $tex[1] : $tex[0];
2543
2544 glEnable GL_TEXTURE_2D;
2545 $tex->draw_quad_alpha (0, 0, $s, $s);
2546 glDisable GL_TEXTURE_2D;
2547}
2548
2549#############################################################################
2550
2551package CFPlus::UI::Image;
2552
2553our @ISA = CFPlus::UI::Base::;
2554
2555use CFPlus::OpenGL;
2556
2557our %texture_cache;
2558
2559sub new {
2560 my $class = shift;
2561
2562 my $self = $class->SUPER::new (
2563 can_events => 0,
2564 scale => 1,
2565 @_,
2566 );
2567
2568 $self->{path} || $self->{tex}
2569 or Carp::croak "'path' or 'tex' attributes required";
2570
2571 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2572 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2573
2574 CFPlus::weaken $texture_cache{$self->{path}};
2575
2576 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2577
2578 $self
2579}
2580
2581sub STORABLE_freeze {
2582 my ($self, $cloning) = @_;
2583
2584 $self->{path}
2585 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2586
2587 $self->{path}
2588}
2589
2590sub STORABLE_attach {
2591 my ($self, $cloning, $path) = @_;
2592
2593 $self->new (path => $path)
2594}
2595
2596sub size_request {
2597 my ($self) = @_;
2598
2599 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2600}
2601
2602sub _draw {
2603 my ($self) = @_;
2604
2605 my $tex = $self->{tex};
2606
2607 my ($w, $h) = ($self->{w}, $self->{h});
2608
2609 if ($self->{rot90}) {
2610 glRotate 90, 0, 0, 1;
2611 glTranslate 0, -$self->{w}, 0;
2612
2613 ($w, $h) = ($h, $w);
2614 }
2615
2616 glEnable GL_TEXTURE_2D;
2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2618
2619 $tex->draw_quad_alpha (0, 0, $w, $h);
2620
2621 glDisable GL_TEXTURE_2D;
2622}
2623
2624#############################################################################
2625
2626package CFPlus::UI::ImageButton;
2627
2628our @ISA = CFPlus::UI::Image::;
2629
2630use CFPlus::OpenGL;
2631
2632my %textures;
2633
2634sub new {
2635 my $class = shift;
2636
2637 my $self = $class->SUPER::new (
2638 padding_x => 4,
2639 padding_y => 4,
1590 fg => [1, 1, 1], 2640 fg => [1, 1, 1],
1591 bg => [1, 1, 1, 0.2],
1592 active_fg => [0, 0, 1], 2641 active_fg => [0, 0, 1],
1593 can_hover => 1, 2642 can_hover => 1,
1594 align => 0, 2643 align => 0,
1595 valign => 0, 2644 valign => 0,
1596 can_events => 1, 2645 can_events => 1,
1597 @_ 2646 @_
1598 ) 2647 );
1599} 2648}
1600 2649
1601sub button_up { 2650sub invoke_button_up {
1602 my ($self, $ev, $x, $y) = @_; 2651 my ($self, $ev, $x, $y) = @_;
1603 2652
2653 $self->emit ("activate")
1604 if ($x >= 0 && $x < $self->{w} 2654 if $x >= 0 && $x < $self->{w}
1605 && $y >= 0 && $y < $self->{h}) { 2655 && $y >= 0 && $y < $self->{h};
1606 $self->emit ("activate"); 2656
1607 } 2657 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} 2658}
1632 2659
1633############################################################################# 2660#############################################################################
1634 2661
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; 2662package CFPlus::UI::VGauge;
1700 2663
1701our @ISA = CFClient::UI::Base::; 2664our @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 2665
1764use List::Util qw(min max); 2666use List::Util qw(min max);
1765 2667
1766use CFClient::OpenGL; 2668use CFPlus::OpenGL;
1767 2669
1768my %tex = ( 2670my %tex = (
1769 food => [ 2671 food => [
1770 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2672 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1771 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2673 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1772 ], 2674 ],
1773 grace => [ 2675 grace => [
1774 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2676 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/ 2677 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1776 ], 2678 ],
1777 hp => [ 2679 hp => [
1778 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2680 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1779 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2681 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1780 ], 2682 ],
1781 mana => [ 2683 mana => [
1782 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2684 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/ 2685 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1784 ], 2686 ],
1785); 2687);
1786 2688
1787# eg. VGauge->new (gauge => 'food'), default gauge: food 2689# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
1847 my $ycut1 = max 0, min 1, $ycut; 2749 my $ycut1 = max 0, min 1, $ycut;
1848 my $ycut2 = max 0, min 1, $ycut - 1; 2750 my $ycut2 = max 0, min 1, $ycut - 1;
1849 2751
1850 my $h1 = $self->{h} * (1 - $ycut1); 2752 my $h1 = $self->{h} * (1 - $ycut1);
1851 my $h2 = $self->{h} * (1 - $ycut2); 2753 my $h2 = $self->{h} * (1 - $ycut2);
2754 my $h3 = $self->{h};
2755
2756 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
1852 2757
1853 glEnable GL_BLEND; 2758 glEnable GL_BLEND;
1854 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2759 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2760 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1855 glEnable GL_TEXTURE_2D; 2761 glEnable GL_TEXTURE_2D;
1856 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2762 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1857 2763
1858 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2764 glBindTexture GL_TEXTURE_2D, $t1->{name};
1859 glBegin GL_QUADS; 2765 glBegin GL_QUADS;
… …
1874 2780
1875 if ($t3) { 2781 if ($t3) {
1876 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2782 glBindTexture GL_TEXTURE_2D, $t3->{name};
1877 glBegin GL_QUADS; 2783 glBegin GL_QUADS;
1878 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2784 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1879 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2785 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
1880 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2786 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
1881 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2787 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1882 glEnd; 2788 glEnd;
1883 } 2789 }
1884 2790
1885 glDisable GL_BLEND; 2791 glDisable GL_BLEND;
1886 glDisable GL_TEXTURE_2D; 2792 glDisable GL_TEXTURE_2D;
1887} 2793}
1888 2794
1889############################################################################# 2795#############################################################################
1890 2796
1891package CFClient::UI::Gauge; 2797package CFPlus::UI::Gauge;
1892 2798
1893our @ISA = CFClient::UI::VBox::; 2799our @ISA = CFPlus::UI::VBox::;
1894 2800
1895sub new { 2801sub new {
1896 my ($class, %arg) = @_; 2802 my ($class, %arg) = @_;
1897 2803
1898 my $self = $class->SUPER::new ( 2804 my $self = $class->SUPER::new (
… …
1900 can_hover => 1, 2806 can_hover => 1,
1901 can_events => 1, 2807 can_events => 1,
1902 %arg, 2808 %arg,
1903 ); 2809 );
1904 2810
1905 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2811 $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); 2812 $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"); 2813 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
1908 2814
1909 $self 2815 $self
1910} 2816}
1911 2817
1912sub set_fontsize { 2818sub set_fontsize {
… …
1933 $self->{value}->set_text ($val); 2839 $self->{value}->set_text ($val);
1934} 2840}
1935 2841
1936############################################################################# 2842#############################################################################
1937 2843
1938package CFClient::UI::Slider; 2844package CFPlus::UI::Slider;
1939 2845
1940use strict; 2846use strict;
1941 2847
1942use CFClient::OpenGL; 2848use CFPlus::OpenGL;
1943 2849
1944our @ISA = CFClient::UI::DrawBG::; 2850our @ISA = CFPlus::UI::DrawBG::;
1945 2851
1946my @tex = 2852my @tex =
1947 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2853 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
1948 qw(s1_slider.png s1_slider_bg.png); 2854 qw(s1_slider.png s1_slider_bg.png);
1949 2855
1950sub new { 2856sub new {
1951 my $class = shift; 2857 my $class = shift;
1952 2858
1953 # range [value, low, high, page] 2859 # range [value, low, high, page, unit]
1954 2860
1955 # TODO: 0-width page 2861 # TODO: 0-width page
1956 # TODO: req_w/h are wrong with vertical 2862 # TODO: req_w/h are wrong with vertical
1957 # TODO: calculations are off 2863 # TODO: calculations are off
1958 my $self = $class->SUPER::new ( 2864 my $self = $class->SUPER::new (
1959 fg => [1, 1, 1], 2865 fg => [1, 1, 1],
1960 active_fg => [0, 0, 0], 2866 active_fg => [0, 0, 0],
2867 bg => [0, 0, 0, 0.2],
2868 active_bg => [1, 1, 1, 0.5],
1961 range => [0, 0, 100, 10], 2869 range => [0, 0, 100, 10, 0],
1962 req_w => 20, 2870 min_w => $::WIDTH / 80,
1963 req_h => 20, 2871 min_h => $::WIDTH / 80,
1964 vertical => 0, 2872 vertical => 0,
1965 can_hover => 1, 2873 can_hover => 1,
1966 inner_pad => 5, 2874 inner_pad => 0.02,
1967 @_ 2875 @_
1968 ); 2876 );
1969 2877
2878 $self->set_value ($self->{range}[0]);
2879 $self->update;
2880
1970 $self 2881 $self
1971} 2882}
1972 2883
2884sub set_range {
2885 my ($self, $range) = @_;
2886
2887 ($range, $self->{range}) = ($self->{range}, $range);
2888
2889 if ("@$range" ne "@{$self->{range}}") {
2890 $self->update;
2891 $self->set_value ($self->{range}[0]);
2892 }
2893}
2894
2895sub set_value {
2896 my ($self, $value) = @_;
2897
2898 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2899
2900 $hi = $lo + 1 if $hi <= $lo;
2901
2902 $page = $hi - $lo if $page > $hi - $lo;
2903
2904 $value = $lo if $value < $lo;
2905 $value = $hi - $page if $value > $hi - $page;
2906
2907 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2908 if $unit;
2909
2910 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2911
2912 if ($value != $old_value) {
2913 $self->emit (changed => $value);
2914 $self->update;
2915 }
2916}
2917
1973sub size_request { 2918sub size_request {
1974 my ($self) = @_; 2919 my ($self) = @_;
1975 2920
1976 my $w = $self->{req_w}; 2921 ($self->{req_w}, $self->{req_h})
1977 my $h = $self->{req_h};
1978
1979 $self->{vertical} ? ($h, $w) : ($w, $h)
1980} 2922}
1981 2923
1982sub button_down { 2924sub invoke_button_down {
1983 my ($self, $ev, $x, $y) = @_; 2925 my ($self, $ev, $x, $y) = @_;
1984 2926
1985 $self->SUPER::button_down ($ev, $x, $y); 2927 $self->SUPER::invoke_button_down ($ev, $x, $y);
2928
2929 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2930
1986 $self->mouse_motion ($ev, $x, $y); 2931 $self->invoke_mouse_motion ($ev, $x, $y);
1987}
1988 2932
2933 1
2934}
2935
1989sub mouse_motion { 2936sub invoke_mouse_motion {
1990 my ($self, $ev, $x, $y) = @_; 2937 my ($self, $ev, $x, $y) = @_;
1991 2938
1992 if ($GRAB == $self) { 2939 if ($GRAB == $self) {
2940 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2941
2942 my (undef, $lo, $hi, $page) = @{$self->{range}};
2943
2944 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2945
2946 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2947 } else {
2948 return 0;
2949 }
2950
2951 1
2952}
2953
2954sub invoke_mouse_wheel {
2955 my ($self, $ev) = @_;
2956
2957 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2958
2959 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2960
2961 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2962
2963 1
2964}
2965
2966sub update {
2967 my ($self) = @_;
2968
2969 delete $self->{knob_w};
2970 $self->SUPER::update;
2971}
2972
2973sub _draw {
2974 my ($self) = @_;
2975
2976 unless ($self->{knob_w}) {
2977 $self->set_value ($self->{range}[0]);
2978
1993 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2979 my ($value, $lo, $hi, $page) = @{$self->{range}};
2980 my $range = ($hi - $page - $lo) || 1e-100;
1994 2981
1995 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2982 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1996 2983
1997 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2984 $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 2985 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1999 2986
2000 $x -= $inner_pad_px; # substract the padding 2987 $value = ($value - $lo) / $range;
2001 $x = $x * ($hi - $lo) / $inner_w + $lo; 2988 $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 2989
2006 $self->emit (changed => $x); 2990 $self->{knob_x} = $value - $knob_w * 0.5;
2007 $self->update; 2991 $self->{knob_w} = $knob_w;
2008 } 2992 }
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 2993
2022 $self->SUPER::_draw (); 2994 $self->SUPER::_draw ();
2023 2995
2024 my ($w, $h) = @$self{qw(w h)}; 2996 glScale $self->{w}, $self->{h};
2025 2997
2026 if ($self->{vertical}) { 2998 if ($self->{vertical}) {
2027 # draw a vertical slider like a rotated horizontal slider 2999 # draw a vertical slider like a rotated horizontal slider
2028 3000
3001 glTranslate 1, 0, 0;
2029 glRotate 90, 0, 0, 1; 3002 glRotate 90, 0, 0, 1;
2030 glTranslate 0, -$self->{w}, 0;
2031
2032 ($w, $h) = ($h, $w);
2033 } 3003 }
2034 3004
2035 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 3005 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2036 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 3006 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2037 3007
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; 3008 glEnable GL_TEXTURE_2D;
2059 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3009 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2060 3010
2061 # draw background 3011 # draw background
2062 $tex[1]->draw_quad (0, 0, $w, $h); 3012 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2063 3013
2064 # draw handle 3014 # draw handle
2065 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 3015 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2066 3016
2067 glDisable GL_BLEND;
2068 glDisable GL_TEXTURE_2D; 3017 glDisable GL_TEXTURE_2D;
2069} 3018}
2070 3019
2071############################################################################# 3020#############################################################################
2072 3021
2073package CFClient::UI::TextView; 3022package CFPlus::UI::ValSlider;
2074 3023
2075our @ISA = CFClient::UI::HBox::; 3024our @ISA = CFPlus::UI::HBox::;
2076 3025
3026sub new {
3027 my ($class, %arg) = @_;
3028
3029 my $range = delete $arg{range};
3030
3031 my $self = $class->SUPER::new (
3032 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
3033 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
3034 to_value => sub { shift },
3035 from_value => sub { shift },
3036 %arg,
3037 );
3038
3039 $self->{slider}->connect (changed => sub {
3040 my ($self, $value) = @_;
3041 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
3042 $self->{parent}->emit (changed => $value);
3043 });
3044
3045# $self->{entry}->connect (changed => sub {
3046# my ($self, $value) = @_;
3047# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
3048# $self->{parent}->emit (changed => $value);
3049# });
3050
3051 $self->add ($self->{slider}, $self->{entry});
3052
3053 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
3054
3055 $self
3056}
3057
3058sub set_range { shift->{slider}->set_range (@_) }
3059sub set_value { shift->{slider}->set_value (@_) }
3060
3061#############################################################################
3062
3063package CFPlus::UI::TextScroller;
3064
3065our @ISA = CFPlus::UI::HBox::;
3066
2077use CFClient::OpenGL; 3067use CFPlus::OpenGL;
2078 3068
2079sub new { 3069sub new {
2080 my $class = shift; 3070 my $class = shift;
2081 3071
2082 my $self = $class->SUPER::new ( 3072 my $self = $class->SUPER::new (
2083 fontsize => 1, 3073 fontsize => 1,
2084 can_events => 0, 3074 can_events => 1,
3075 indent => 0,
2085 #font => default_font 3076 #font => default_font
2086 @_, 3077 @_,
2087 3078
2088 layout => (new CFClient::Layout), 3079 layout => (new CFPlus::Layout),
2089 par => [], 3080 par => [],
3081 max_par => 0,
2090 height => 0, 3082 height => 0,
2091 children => [ 3083 children => [
2092 (new CFClient::UI::Empty expand => 1), 3084 (new CFPlus::UI::Empty expand => 1),
2093 (new CFClient::UI::Slider vertical => 1), 3085 (new CFPlus::UI::Slider vertical => 1),
2094 ], 3086 ],
2095 ); 3087 );
2096 3088
2097 $self->{children}[1]->connect (changed => sub { $self->update }); 3089 $self->{children}[1]->connect (changed => sub { $self->update });
2098 3090
… …
2104 3096
2105 $self->{fontsize} = $fontsize; 3097 $self->{fontsize} = $fontsize;
2106 $self->reflow; 3098 $self->reflow;
2107} 3099}
2108 3100
2109sub text_height { 3101sub size_request {
3102 my ($self) = @_;
3103
3104 my ($empty, $slider) = $self->visible_children;
3105
3106 local $self->{children} = [$empty, $slider];
3107 $self->SUPER::size_request
3108}
3109
3110sub invoke_size_allocate {
3111 my ($self, $w, $h) = @_;
3112
3113 my ($empty, $slider, @other) = @{ $self->{children} };
3114 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
3115
3116 $self->{layout}->set_font ($self->{font}) if $self->{font};
3117 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
3118 $self->{layout}->set_width ($empty->{w});
3119 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3120
3121 $self->reflow;
3122
3123 local $self->{children} = [$empty, $slider];
3124 $self->SUPER::invoke_size_allocate ($w, $h)
3125}
3126
3127sub invoke_mouse_wheel {
2110 my ($self, $text) = @_; 3128 my ($self, $ev) = @_;
3129
3130 return 0 unless $ev->{dy}; # only vertical movements
3131
3132 $self->{children}[1]->emit (mouse_wheel => $ev);
3133
3134 1
3135}
3136
3137sub get_layout {
3138 my ($self, $para) = @_;
2111 3139
2112 my $layout = $self->{layout}; 3140 my $layout = $self->{layout};
2113 3141
3142 $layout->set_font ($self->{font}) if $self->{font};
3143 $layout->set_foreground (@{$para->{fg}});
2114 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3144 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2115 $layout->set_width ($self->{children}[0]{w}); 3145 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2116 $layout->set_text ($text); 3146 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3147 $layout->set_markup ($para->{markup});
3148
3149 $layout->set_shapes (
3150 map
3151 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3152 @{$para->{widget}}
2117 3153 );
2118 ($layout->size)[1] 3154
3155 $layout
2119} 3156}
2120 3157
2121sub reflow { 3158sub reflow {
2122 my ($self) = @_; 3159 my ($self) = @_;
2123 3160
2124 $self->{need_reflow}++; 3161 $self->{need_reflow}++;
2125 $self->update; 3162 $self->update;
2126} 3163}
2127 3164
2128sub size_allocate { 3165sub set_offset {
3166 my ($self, $offset) = @_;
3167
3168 # todo: base offset on lines or so, not on pixels
3169 $self->{children}[1]->set_value ($offset);
3170}
3171
3172sub current_paragraph {
3173 my ($self) = @_;
3174
3175 $self->{top_paragraph} - 1
3176}
3177
3178sub scroll_to {
2129 my ($self, $w, $h) = @_; 3179 my ($self, $para) = @_;
2130 3180
2131 $self->SUPER::size_allocate ($w, $h); 3181 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2132 3182
2133 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3183 $self->{scroll_to} = $para;
2134 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3184 $self->update;
2135 $self->{layout}->set_width ($self->{children}[0]{w}); 3185}
2136 3186
2137 $self->reflow; 3187sub clear {
3188 my ($self) = @_;
3189
3190 my (undef, undef, @other) = @{ $self->{children} };
3191 $self->remove ($_) for @other;
3192
3193 $self->{par} = [];
3194 $self->{height} = 0;
3195 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2138} 3196}
2139 3197
2140sub add_paragraph { 3198sub add_paragraph {
2141 my ($self, $color, $text) = @_; 3199 my $self = shift;
2142 3200
2143 #TODO: intelligently "reformat" paragraph 3201 for my $para (@_) {
3202 $para = {
3203 fg => [1, 1, 1, 1],
3204 indent => 0,
3205 markup => "",
3206 widget => [],
3207 ref $para ? %$para : (markup => $para),
3208 w => 1e10,
3209 wrapped => 1,
3210 };
2144 3211
2145 my $height = $self->text_height ($text); 3212 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3213 push @{$self->{par}}, $para;
3214 }
2146 3215
3216 if (my $max = $self->{max_par}) {
3217 shift @{$self->{par}} while @{$self->{par}} > $max;
3218 }
3219
3220 $self->{need_reflow}++;
3221 $self->update;
3222}
3223
3224sub scroll_to_bottom {
3225 my ($self) = @_;
3226
3227 $self->{scroll_to} = $#{$self->{par}};
3228 $self->update;
3229}
3230
3231sub force_uptodate {
3232 my ($self) = @_;
3233
3234 if (delete $self->{need_reflow}) {
3235 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3236
3237 my $height = 0;
3238
3239 for my $para (@{$self->{par}}) {
3240 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3241 my $layout = $self->get_layout ($para);
3242 my ($w, $h) = $layout->size;
3243
3244 $para->{w} = $w + $para->{indent};
3245 $para->{h} = $h;
3246 $para->{wrapped} = $layout->has_wrapped;
3247 }
3248
3249 $para->{y} = $height;
3250 $height += $para->{h};
3251 }
3252
2147 $self->{height} += $height; 3253 $self->{height} = $height;
3254 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2148 3255
2149 push @{$self->{par}}, [$height, $color, $text]; 3256 delete $self->{texture};
3257 }
2150 3258
2151 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 3259 if (my $paridx = delete $self->{scroll_to}) {
2152 $self->{children}[1]->update; 3260 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3261 }
2153} 3262}
2154 3263
2155sub update { 3264sub update {
2156 my ($self) = @_; 3265 my ($self) = @_;
2157 3266
… …
2159 3268
2160 return unless $self->{h} > 0; 3269 return unless $self->{h} > 0;
2161 3270
2162 delete $self->{texture}; 3271 delete $self->{texture};
2163 3272
2164 $ROOT->on_refresh ($self, sub { 3273 $ROOT->on_post_alloc ($self => sub {
2165 if (delete $self->{need_reflow}) { 3274 $self->force_uptodate;
2166 my $height = 0;
2167 3275
2168 $height += $_->[0] = $self->text_height ($_->[2]) 3276 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2169 for @{$self->{par}};
2170 3277
2171 $self->{height} = $height; 3278 $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; 3279 glClearColor 0, 0, 0, 0;
2180 glClear GL_COLOR_BUFFER_BIT; 3280 glClear GL_COLOR_BUFFER_BIT;
2181 3281
2182 glEnable GL_BLEND; 3282 package CFPlus::UI::Base;
2183 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 3283 local ($draw_x, $draw_y, $draw_w, $draw_h) =
2184 glEnable GL_TEXTURE_2D; 3284 (0, 0, $self->{w}, $self->{h});
2185 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2186 3285
2187 my $top = int $self->{children}[1]{range}[0]; 3286 my $top = int $self->{children}[1]{range}[0];
2188 3287
3288 my $paridx = 0;
3289 my $top_paragraph;
3290 my $top = int $self->{children}[1]{range}[0];
3291
2189 my $y0 = $top; 3292 my $y0 = $top;
2190 my $y1 = $top + $self->{h}; 3293 my $y1 = $top + $H;
2191 3294
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}}) { 3295 for my $para (@{$self->{par}}) {
2199 my $h = $par->[0]; 3296 my $h = $para->{h};
3297 my $y = $para->{y};
2200 3298
2201 if ($y0 < $y + $h && $y < $y1) { 3299 if ($y0 < $y + $h && $y < $y1) {
2202 $layout->set_text ($par->[2]); 3300 my $layout = $self->get_layout ($para);
2203 3301
2204 glColor @{ $par->[1] }; 3302 $layout->render ($para->{indent}, $y - $y0);
2205 my ($W, $H) = $layout->size; 3303
2206 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 3304 if (my @w = @{ $para->{widget} }) {
3305 my @s = $layout->get_shapes;
3306
3307 for (@w) {
3308 my ($dx, $dy) = splice @s, 0, 2, ();
3309
3310 $_->{x} = $dx + $para->{indent};
3311 $_->{y} = $dy + $y - $y0;
3312
3313 $_->draw;
3314 }
3315 }
2207 } 3316 }
2208 3317
2209 $y += $h; 3318 $paridx++;
3319 $top_paragraph ||= $paridx if $y >= $top;
2210 } 3320 }
2211 3321
2212 glDisable GL_TEXTURE_2D; 3322 $self->{top_paragraph} = $top_paragraph;
2213 glDisable GL_BLEND;
2214 }; 3323 };
2215 }); 3324 });
2216} 3325}
2217 3326
3327sub reconfigure {
3328 my ($self) = @_;
3329
3330 $self->SUPER::reconfigure;
3331
3332 $_->{w} = 1e10 for @{ $self->{par} };
3333 $self->reflow;
3334}
3335
2218sub _draw { 3336sub _draw {
2219 my ($self) = @_; 3337 my ($self) = @_;
2220 3338
2221 glEnable GL_BLEND;
2222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2223 glEnable GL_TEXTURE_2D; 3339 glEnable GL_TEXTURE_2D;
2224 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3340 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2225 glColor 1, 1, 1, 1; 3341 glColor 0, 0, 0, 1;
2226 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3342 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2227 glDisable GL_TEXTURE_2D; 3343 glDisable GL_TEXTURE_2D;
2228 glDisable GL_BLEND;
2229 3344
2230 $self->{children}[1]->draw; 3345 $self->{children}[1]->draw;
2231
2232} 3346}
2233 3347
2234############################################################################# 3348#############################################################################
2235 3349
2236package CFClient::UI::Animator; 3350package CFPlus::UI::Animator;
2237 3351
2238use CFClient::OpenGL; 3352use CFPlus::OpenGL;
2239 3353
2240our @ISA = CFClient::UI::Bin::; 3354our @ISA = CFPlus::UI::Bin::;
2241 3355
2242sub moveto { 3356sub moveto {
2243 my ($self, $x, $y) = @_; 3357 my ($self, $x, $y) = @_;
2244 3358
2245 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3359 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2273 glPopMatrix; 3387 glPopMatrix;
2274} 3388}
2275 3389
2276############################################################################# 3390#############################################################################
2277 3391
2278package CFClient::UI::Flopper; 3392package CFPlus::UI::Flopper;
2279 3393
2280our @ISA = CFClient::UI::Button::; 3394our @ISA = CFPlus::UI::Button::;
2281 3395
2282sub new { 3396sub new {
2283 my $class = shift; 3397 my $class = shift;
2284 3398
2285 my $self = $class->SUPER::new ( 3399 my $self = $class->SUPER::new (
2286 state => 0, 3400 state => 0,
2287 connect_activate => \&toggle_flopper, 3401 on_activate => \&toggle_flopper,
2288 @_ 3402 @_
2289 ); 3403 );
2290 3404
2291 if ($self->{state}) {
2292 $self->{state} = 0;
2293 $self->toggle_flopper;
2294 }
2295
2296 $self 3405 $self
2297} 3406}
2298 3407
2299sub toggle_flopper { 3408sub toggle_flopper {
2300 my ($self) = @_; 3409 my ($self) = @_;
2301 3410
2302 # TODO: use animation 3411 $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} 3412}
2314 3413
2315############################################################################# 3414#############################################################################
2316 3415
2317package CFClient::UI::Tooltip; 3416package CFPlus::UI::Tooltip;
2318 3417
2319our @ISA = CFClient::UI::Bin::; 3418our @ISA = CFPlus::UI::Bin::;
2320 3419
2321use CFClient::OpenGL; 3420use CFPlus::OpenGL;
2322 3421
2323sub new { 3422sub new {
2324 my $class = shift; 3423 my $class = shift;
2325 3424
2326 $class->SUPER::new ( 3425 $class->SUPER::new (
2327 @_, 3426 @_,
2328 can_events => 0, 3427 can_events => 0,
2329 ) 3428 )
2330} 3429}
2331 3430
2332sub set_markup { 3431sub set_tooltip_from {
2333 my ($self, $text) = @_; 3432 my ($self, $widget) = @_;
2334 3433
2335 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 3434 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
2336 $self->{label}->set_markup ($text); 3435 if $widget->{tooltip} =~ /^#(.*)$/;
2337 $self->add ($self->{label}); 3436
3437 my $tooltip = $widget->{tooltip};
3438
3439 if ($ENV{CFPLUS_DEBUG} & 2) {
3440 $tooltip .= "\n\n" . (ref $widget) . "\n"
3441 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3442 . "req $widget->{req_w} $widget->{req_h}\n"
3443 . "visible $widget->{visible}";
3444 }
3445
3446 $tooltip =~ s/^\n+//;
3447 $tooltip =~ s/\n+$//;
3448
3449 $self->add (new CFPlus::UI::Label
3450 markup => $tooltip,
3451 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3452 fontsize => 0.8,
3453 style => 1, # FLAG_INVERSE
3454 ellipsise => 0,
3455 font => ($widget->{tooltip_font} || $::FONT_PROP),
3456 );
2338} 3457}
2339 3458
2340sub size_request { 3459sub size_request {
2341 my ($self) = @_; 3460 my ($self) = @_;
2342 3461
2343 $self->child->set_max_size ($::WIDTH * 0.3);
2344
2345 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3462 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2346 3463
2347 ($w + 4, $h + 4) 3464 ($w + 4, $h + 4)
2348} 3465}
2349 3466
2350sub size_allocate { 3467sub invoke_size_allocate {
2351 my ($self, $w, $h) = @_; 3468 my ($self, $w, $h) = @_;
2352 3469
2353 $self->SUPER::size_allocate ($w - 4, $h - 4); 3470 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
3471}
3472
3473sub invoke_visibility_change {
3474 my ($self, $visible) = @_;
3475
3476 return unless $visible;
3477
3478 $self->{root}->on_post_alloc ("move_$self" => sub {
3479 my $widget = $self->{owner}
3480 or return;
3481
3482 if ($widget->{visible}) {
3483 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
3484
3485 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
3486 if $x + $self->{w} > $self->{root}{w};
3487
3488 $self->move_abs ($x, $y);
3489 } else {
3490 $self->hide;
3491 }
3492 });
2354} 3493}
2355 3494
2356sub _draw { 3495sub _draw {
2357 my ($self) = @_; 3496 my ($self) = @_;
2358 3497
2359 glPushMatrix;
2360 glTranslate 0.375, 0.375; 3498 glTranslate 0.375, 0.375;
2361 3499
2362 my ($w, $h) = @$self{qw(w h)}; 3500 my ($w, $h) = @$self{qw(w h)};
2363 3501
2364 glColor 1, 0.8, 0.4; 3502 glColor 1, 0.8, 0.4;
2365 glBegin GL_QUADS; 3503 glRect 0, 0, $w, $h;
2366 glVertex 0 , 0;
2367 glVertex 0 , $h;
2368 glVertex $w, $h;
2369 glVertex $w, 0;
2370 glEnd;
2371 3504
2372 glColor 0, 0, 0; 3505 glColor 0, 0, 0;
2373 glBegin GL_LINE_LOOP; 3506 glBegin GL_LINE_LOOP;
2374 glVertex 0 , 0; 3507 glVertex 0 , 0;
2375 glVertex 0 , $h; 3508 glVertex 0 , $h;
2376 glVertex $w, $h; 3509 glVertex $w, $h;
2377 glVertex $w, 0; 3510 glVertex $w, 0;
2378 glEnd; 3511 glEnd;
2379 3512
2380 glPopMatrix; 3513 glTranslate 2 - 0.375, 2 - 0.375;
2381 3514
2382 glTranslate 2, 2;
2383 $self->SUPER::_draw; 3515 $self->SUPER::_draw;
2384} 3516}
2385 3517
2386############################################################################# 3518#############################################################################
2387 3519
2388package CFClient::UI::Face; 3520package CFPlus::UI::Face;
2389 3521
2390our @ISA = CFClient::UI::Base::; 3522our @ISA = CFPlus::UI::DrawBG::;
2391 3523
2392use CFClient::OpenGL; 3524use CFPlus::OpenGL;
2393 3525
2394sub new { 3526sub new {
2395 my $class = shift; 3527 my $class = shift;
2396 3528
2397 $class->SUPER::new ( 3529 my $self = $class->SUPER::new (
3530 size_w => 32,
3531 size_h => 8,
2398 aspect => 1, 3532 aspect => 1,
3533 can_events => 0,
2399 @_, 3534 @_,
2400 ) 3535 );
3536
3537 if ($self->{anim} && $self->{animspeed}) {
3538 CFPlus::weaken (my $widget = $self);
3539
3540 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3541 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3542 $self->{timer} = Event->timer (
3543 parked => 1,
3544 cb => sub {
3545 return unless $::CONN && $widget;
3546
3547 ++$widget->{frame};
3548 $widget->update_face;
3549 $widget->update;
3550
3551 $widget->update_timer;
3552 },
3553 );
3554
3555 $self->update_face;
3556 $self->update_timer;
3557 }
3558
3559 $self
3560}
3561
3562sub update_timer {
3563 my ($self) = @_;
3564
3565 return unless $self->{timer};
3566
3567 if ($self->{visible}) {
3568 $self->{timer}->at (
3569 $self->{anim_start}
3570 + $self->{animspeed}
3571 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3572 );
3573 $self->{timer}->start;
3574 } else {
3575 $self->{timer}->stop;
3576 }
3577}
3578
3579sub update_face {
3580 my ($self) = @_;
3581
3582 return unless $::CONN;
3583
3584 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3585 if ($anim && @$anim) {
3586 delete $self->{wait_face};
3587 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3588 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3589 }
3590 }
2401} 3591}
2402 3592
2403sub size_request { 3593sub size_request {
2404 (32, 8) 3594 my ($self) = @_;
3595
3596 if ($::CONN) {
3597 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3598 if (my $tex = $::CONN->{texture}[$faceid]) {
3599 $self->{tex} = $tex;
3600 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3601 } else {
3602 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3603 $self->realloc;
3604 });
3605 }
3606 }
3607 }
3608
3609 ($self->{size_w} || 8, $self->{size_h} || 8)
3610}
3611
3612sub update {
3613 my ($self) = @_;
3614
3615 return unless $self->{visible};
3616
3617 $self->SUPER::update;
3618}
3619
3620sub invoke_visibility_change {
3621 my ($self) = @_;
3622
3623 $self->update_timer;
3624
3625 0
2405} 3626}
2406 3627
2407sub _draw { 3628sub _draw {
2408 my ($self) = @_; 3629 my ($self) = @_;
2409 3630
2410 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 3631 $self->SUPER::_draw;
2411 3632
2412 # TODO animation 3633 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; 3634 glEnable GL_TEXTURE_2D;
2417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2418 glColor 1, 1, 1, 1; 3636 glColor 0, 0, 0, 1;
2419 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 3637 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2420 glDisable GL_TEXTURE_2D; 3638 glDisable GL_TEXTURE_2D;
2421 glDisable GL_BLEND;
2422 } 3639 }
3640}
3641
3642sub destroy {
3643 my ($self) = @_;
3644
3645 (delete $self->{timer})->cancel
3646 if $self->{timer};
3647
3648 $self->SUPER::destroy;
2423} 3649}
2424 3650
2425############################################################################# 3651#############################################################################
2426 3652
3653package CFPlus::UI::Buttonbar;
3654
3655our @ISA = CFPlus::UI::HBox::;
3656
3657# TODO: should actually wrap buttons and other goodies.
3658
3659#############################################################################
3660
2427package CFClient::UI::Menu; 3661package CFPlus::UI::Menu;
2428 3662
2429our @ISA = CFClient::UI::FancyFrame::; 3663our @ISA = CFPlus::UI::Toplevel::;
2430 3664
2431use CFClient::OpenGL; 3665use CFPlus::OpenGL;
2432 3666
2433sub new { 3667sub new {
2434 my $class = shift; 3668 my $class = shift;
2435 3669
2436 my $self = $class->SUPER::new ( 3670 my $self = $class->SUPER::new (
2437 items => [], 3671 items => [],
2438 z => 100, 3672 z => 100,
2439 @_, 3673 @_,
2440 ); 3674 );
2441 3675
2442 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3676 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2443 3677
2444 for my $item (@{ $self->{items} }) { 3678 for my $item (@{ $self->{items} }) {
2445 my ($widget, $cb) = @$item; 3679 my ($widget, $cb, $tooltip) = @$item;
2446 3680
2447 # handle various types of items, only text for now 3681 # handle various types of items, only text for now
2448 if (!ref $widget) { 3682 if (!ref $widget) {
3683 if ($widget =~ /\t/) {
3684 my ($left, $right) = split /\t/, $widget, 2;
3685
2449 $widget = new CFClient::UI::Label 3686 $widget = new CFPlus::UI::HBox
2450 can_hover => 1, 3687 can_hover => 1,
2451 can_events => 1, 3688 can_events => 1,
3689 tooltip => $tooltip,
3690 children => [
3691 (new CFPlus::UI::Label markup => $left, expand => 1),
3692 (new CFPlus::UI::Label markup => $right, align => +1),
3693 ],
3694 ;
3695
3696 } else {
3697 $widget = new CFPlus::UI::Label
3698 can_hover => 1,
3699 can_events => 1,
2452 text => $widget; 3700 markup => $widget,
3701 tooltip => $tooltip;
3702 }
2453 } 3703 }
2454 3704
2455 $self->{item}{$widget} = $item; 3705 $self->{item}{$widget} = $item;
2456 3706
2457 $self->{vbox}->add ($widget); 3707 $self->{vbox}->add ($widget);
… …
2469 # maybe save $GRAB? must be careful about events... 3719 # maybe save $GRAB? must be careful about events...
2470 $GRAB = $self; 3720 $GRAB = $self;
2471 $self->{button} = $ev->{button}; 3721 $self->{button} = $ev->{button};
2472 3722
2473 $self->show; 3723 $self->show;
2474 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3724 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2475} 3725}
2476 3726
2477sub mouse_motion { 3727sub invoke_mouse_motion {
2478 my ($self, $ev, $x, $y) = @_; 3728 my ($self, $ev, $x, $y) = @_;
2479 3729
2480 # TODO: should use vbox->fdind_widget or so 3730 # TODO: should use vbox->find_widget or so
2481 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3731 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2482 $self->{hover} = $self->{item}{$HOVER}; 3732 $self->{hover} = $self->{item}{$HOVER};
2483}
2484 3733
3734 0
3735}
3736
2485sub button_up { 3737sub invoke_button_up {
2486 my ($self, $ev, $x, $y) = @_; 3738 my ($self, $ev, $x, $y) = @_;
2487 3739
2488 if ($ev->{button} == $self->{button}) { 3740 if ($ev->{button} == $self->{button}) {
2489 undef $GRAB; 3741 undef $GRAB;
2490 $self->hide; 3742 $self->hide;
2491 3743
2492 $self->emit ("popdown"); 3744 $self->emit ("popdown");
2493 $self->{hover}[1]->() if $self->{hover}; 3745 $self->{hover}[1]->() if $self->{hover};
3746 } else {
3747 return 0
3748 }
3749
2494 } 3750 1
2495} 3751}
2496 3752
2497############################################################################# 3753#############################################################################
2498 3754
2499package CFClient::UI::Root; 3755package CFPlus::UI::Multiplexer;
2500 3756
2501our @ISA = CFClient::UI::Container::; 3757our @ISA = CFPlus::UI::Container::;
2502 3758
2503use CFClient::OpenGL; 3759sub new {
3760 my $class = shift;
2504 3761
2505sub check_size { 3762 my $self = $class->SUPER::new (
3763 @_,
3764 );
3765
3766 $self->{current} = $self->{children}[0]
3767 if @{ $self->{children} };
3768
3769 $self
3770}
3771
3772sub add {
2506 my ($self) = @_; 3773 my ($self, @widgets) = @_;
2507 3774
2508 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3775 $self->SUPER::add (@widgets);
3776
3777 $self->{current} = $self->{children}[0]
3778 if @{ $self->{children} };
3779}
3780
3781sub get_current_page {
3782 my ($self) = @_;
3783
3784 $self->{current}
3785}
3786
3787sub set_current_page {
3788 my ($self, $page_or_widget) = @_;
3789
3790 my $widget = ref $page_or_widget
3791 ? $page_or_widget
3792 : $self->{children}[$page_or_widget];
3793
3794 $self->{current} = $widget;
3795 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3796
3797 $self->emit (page_changed => $self->{current});
3798
3799 $self->realloc;
3800}
3801
3802sub visible_children {
3803 $_[0]{current}
2509} 3804}
2510 3805
2511sub size_request { 3806sub size_request {
2512 ($::WIDTH, $::HEIGHT) 3807 my ($self) = @_;
2513}
2514 3808
3809 $self->{current}->size_request
3810}
3811
3812sub invoke_size_allocate {
3813 my ($self, $w, $h) = @_;
3814
3815 $self->{current}->configure (0, 0, $w, $h);
3816
3817 1
3818}
3819
3820sub _draw {
3821 my ($self) = @_;
3822
3823 $self->{current}->draw;
3824}
3825
3826#############################################################################
3827
3828package CFPlus::UI::Notebook;
3829
3830our @ISA = CFPlus::UI::VBox::;
3831
3832sub new {
3833 my $class = shift;
3834
3835 my $self = $class->SUPER::new (
3836 buttonbar => (new CFPlus::UI::Buttonbar),
3837 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3838 # filter => # will be put between multiplexer and $self
3839 @_,
3840 );
3841
3842 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3843 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3844
3845 {
3846 Scalar::Util::weaken (my $wself = $self);
3847
3848 $self->{multiplexer}->connect (c_add => sub {
3849 my ($mplex, $widgets) = @_;
3850
3851 for my $child (@$widgets) {
3852 Scalar::Util::weaken $child;
3853 $child->{c_tab_} ||= do {
3854 my $tab =
3855 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3856 ? $child->{c_tab}
3857 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3858
3859 $tab->connect (activate => sub {
3860 $wself->set_current_page ($child);
3861 });
3862
3863 $tab
3864 };
3865
3866 $self->{buttonbar}->add ($child->{c_tab_});
3867 }
3868 });
3869
3870 $self->{multiplexer}->connect (c_remove => sub {
3871 my ($mplex, $widgets) = @_;
3872
3873 for my $child (@$widgets) {
3874 $wself->{buttonbar}->remove ($child->{c_tab_});
3875 }
3876 });
3877 }
3878
3879 $self
3880}
3881
3882sub add {
3883 my ($self, @widgets) = @_;
3884
3885 $self->{multiplexer}->add (@widgets)
3886}
3887
3888sub remove {
3889 my ($self, @widgets) = @_;
3890
3891 $self->{multiplexer}->remove (@widgets)
3892}
3893
3894sub pages {
3895 my ($self) = @_;
3896 $self->{multiplexer}->children
3897}
3898
3899sub add_tab {
3900 my ($self, $title, $widget, $tooltip) = @_;
3901
3902 $title = [$title, $tooltip] unless ref $title;
3903 $widget->{c_tab} = $title;
3904
3905 $self->add ($widget);
3906}
3907
3908sub get_current_page {
3909 my ($self) = @_;
3910
3911 $self->{multiplexer}->get_current_page
3912}
3913
3914sub set_current_page {
3915 my ($self, $page) = @_;
3916
3917 $self->{multiplexer}->set_current_page ($page);
3918 $self->emit (page_changed => $self->{multiplexer}{current});
3919}
3920
3921#############################################################################
3922
3923package CFPlus::UI::Selector;
3924
3925use utf8;
3926
3927our @ISA = CFPlus::UI::Button::;
3928
3929sub new {
3930 my $class = shift;
3931
3932 my $self = $class->SUPER::new (
3933 options => [], # [value, title, longdesc], ...
3934 value => undef,
3935 @_,
3936 );
3937
3938 $self->_set_value ($self->{value});
3939
3940 $self
3941}
3942
3943sub invoke_button_down {
3944 my ($self, $ev) = @_;
3945
3946 my @menu_items;
3947
3948 for (@{ $self->{options} }) {
3949 my ($value, $title, $tooltip) = @$_;
3950
3951 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3952 }
3953
3954 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3955}
3956
3957sub _set_value {
3958 my ($self, $value) = @_;
3959
3960 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3961 or return;
3962
3963 $self->{value} = $item->[0];
3964 $self->set_markup ("$item->[1] ⇓");
3965 $self->set_tooltip ($item->[2]);
3966}
3967
3968sub set_value {
3969 my ($self, $value) = @_;
3970
3971 return unless $self->{value} ne $value;
3972
3973 $self->_set_value ($value);
3974 $self->emit (changed => $value);
3975}
3976
3977#############################################################################
3978
3979package CFPlus::UI::Statusbox;
3980
3981our @ISA = CFPlus::UI::VBox::;
3982
3983sub new {
3984 my $class = shift;
3985
3986 my $self = $class->SUPER::new (
3987 fontsize => 0.8,
3988 @_,
3989 );
3990
3991 CFPlus::weaken (my $this = $self);
3992
3993 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3994
3995 $self
3996}
3997
3998sub reorder {
3999 my ($self) = @_;
4000 my $NOW = Time::HiRes::time;
4001
4002 # freeze display when hovering over any label
4003 return if $CFPlus::UI::TOOLTIP->{owner}
4004 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
4005 values %{ $self->{item} };
4006
4007 while (my ($k, $v) = each %{ $self->{item} }) {
4008 delete $self->{item}{$k} if $v->{timeout} < $NOW;
4009 }
4010
4011 my @widgets;
4012
4013 my @items = sort {
4014 $a->{pri} <=> $b->{pri}
4015 or $b->{id} <=> $a->{id}
4016 } values %{ $self->{item} };
4017
4018 $self->{timer}->interval (1);
4019
4020 my $count = 10 + 1;
4021 for my $item (@items) {
4022 last unless --$count;
4023
4024 my $label = $item->{label} ||= do {
4025 # TODO: doesn't handle markup well (read as: at all)
4026 my $short = $item->{count} > 1
4027 ? "<b>$item->{count} ×</b> $item->{text}"
4028 : $item->{text};
4029
4030 for ($short) {
4031 s/^\s+//;
4032 s/\s+/ /g;
4033 }
4034
4035 new CFPlus::UI::Label
4036 markup => $short,
4037 tooltip => $item->{tooltip},
4038 tooltip_font => $::FONT_PROP,
4039 tooltip_width => 0.67,
4040 fontsize => $item->{fontsize} || $self->{fontsize},
4041 max_w => $::WIDTH * 0.44,
4042 fg => [@{ $item->{fg} }],
4043 can_events => 1,
4044 can_hover => 1
4045 };
4046
4047 if ((my $diff = $item->{timeout} - $NOW) < 2) {
4048 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
4049 $label->update;
4050 $label->set_max_size (undef, $label->{req_h} * $diff)
4051 if $diff < 1;
4052 $self->{timer}->interval (1/30);
4053 } else {
4054 $label->{fg}[3] = $item->{fg}[3] || 1;
4055 }
4056
4057 push @widgets, $label;
4058 }
4059
4060 $self->clear;
4061 $self->SUPER::add (reverse @widgets);
4062}
4063
4064sub add {
4065 my ($self, $text, %arg) = @_;
4066
4067 $text =~ s/^\s+//;
4068 $text =~ s/\s+$//;
4069
4070 return unless $text;
4071
4072 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
4073
4074 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
4075
4076 if (my $item = $self->{item}{$group}) {
4077 if ($item->{text} eq $text) {
4078 $item->{count}++;
4079 } else {
4080 $item->{count} = 1;
4081 $item->{text} = $item->{tooltip} = $text;
4082 }
4083 $item->{id} += 0.2;#d#
4084 $item->{timeout} = $timeout;
4085 delete $item->{label};
4086 } else {
4087 $self->{item}{$group} = {
4088 id => ++$self->{id},
4089 text => $text,
4090 timeout => $timeout,
4091 tooltip => $text,
4092 fg => [0.8, 0.8, 0.8, 0.8],
4093 pri => 0,
4094 count => 1,
4095 %arg,
4096 };
4097 }
4098
4099 $ROOT->on_refresh (reorder => sub {
4100 $self->reorder;
4101 });
4102}
4103
2515sub configure { 4104sub reconfigure {
4105 my ($self) = @_;
4106
4107 delete $_->{label}
4108 for values %{ $self->{item} || {} };
4109
4110 $self->reorder;
4111 $self->SUPER::reconfigure;
4112}
4113
4114sub destroy {
4115 my ($self) = @_;
4116
4117 $self->{timer}->cancel;
4118
4119 $self->SUPER::destroy;
4120}
4121
4122#############################################################################
4123
4124package CFPlus::UI::Root;
4125
4126our @ISA = CFPlus::UI::Container::;
4127
4128use List::Util qw(min max);
4129
4130use CFPlus::OpenGL;
4131
4132sub new {
4133 my $class = shift;
4134
4135 my $self = $class->SUPER::new (
4136 visible => 1,
4137 @_,
4138 );
4139
4140 CFPlus::weaken ($self->{root} = $self);
4141
4142 $self
4143}
4144
4145sub size_request {
4146 my ($self) = @_;
4147
4148 ($self->{w}, $self->{h})
4149}
4150
4151sub _to_pixel {
4152 my ($coord, $size, $max) = @_;
4153
4154 $coord =
4155 $coord eq "center" ? ($max - $size) * 0.5
4156 : $coord eq "max" ? $max
4157 : $coord;
4158
4159 $coord = 0 if $coord < 0;
4160 $coord = $max - $size if $coord > $max - $size;
4161
4162 int $coord + 0.5
4163}
4164
4165sub invoke_size_allocate {
2516 my ($self, $x, $y, $w, $h) = @_; 4166 my ($self, $w, $h) = @_;
2517 4167
2518 $self->SUPER::configure ($x, $y, $w, $h);
2519
2520 for my $child (@{$self->{children}}) { 4168 for my $child ($self->children) {
2521 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4169 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2522 4170
2523 $X = List::Util::max 0, List::Util::min $w - $W, $X; 4171 $X = $child->{force_x} if exists $child->{force_x};
2524 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 4172 $Y = $child->{force_y} if exists $child->{force_y};
4173
4174 $X = _to_pixel $X, $W, $self->{w};
4175 $Y = _to_pixel $Y, $H, $self->{h};
4176
2525 $child->configure ($X, $Y, $W,$H); 4177 $child->configure ($X, $Y, $W, $H);
4178 }
4179
2526 } 4180 1
2527} 4181}
2528 4182
2529sub _topleft { 4183sub coord2local {
2530 my ($self, $x, $y) = @_; 4184 my ($self, $x, $y) = @_;
2531 4185
2532 ($x, $y) 4186 ($x, $y)
2533} 4187}
2534 4188
4189sub coord2global {
4190 my ($self, $x, $y) = @_;
4191
4192 ($x, $y)
4193}
4194
2535sub update { 4195sub update {
2536 my ($self) = @_; 4196 my ($self) = @_;
2537 4197
2538 $self->check_size; 4198 $::WANT_REFRESH++;
2539 ::refresh ();
2540} 4199}
2541 4200
2542sub add { 4201sub add {
2543 my ($self, $child) = @_; 4202 my ($self, @children) = @_;
2544 4203
2545 # integerize window positions 4204 $_->{is_toplevel} = 1
2546 $child->{x} = int $child->{x}; 4205 for @children;
2547 $child->{y} = int $child->{y};
2548 4206
2549 $self->SUPER::add ($child); 4207 $self->SUPER::add (@children);
4208}
4209
4210sub remove {
4211 my ($self, @children) = @_;
4212
4213 $self->SUPER::remove (@children);
4214
4215 delete $self->{is_toplevel}
4216 for @children;
4217
4218 while (@children) {
4219 my $w = pop @children;
4220 push @children, $w->children;
4221 $w->set_invisible;
4222 }
2550} 4223}
2551 4224
2552sub on_refresh { 4225sub on_refresh {
2553 my ($self, $id, $cb) = @_; 4226 my ($self, $id, $cb) = @_;
2554 4227
2555 $self->{refresh_hook}{$id} = $cb; 4228 $self->{refresh_hook}{$id} = $cb;
2556} 4229}
2557 4230
4231sub on_post_alloc {
4232 my ($self, $id, $cb) = @_;
4233
4234 $self->{post_alloc_hook}{$id} = $cb;
4235}
4236
2558sub draw { 4237sub draw {
2559 my ($self) = @_; 4238 my ($self) = @_;
2560 4239
2561 while (my $rcb = delete $self->{refresh_hook}) { 4240 while ($self->{refresh_hook}) {
2562 $_->() for values %$rcb; 4241 $_->()
4242 for values %{delete $self->{refresh_hook}};
4243 }
4244
4245 while ($self->{realloc}) {
4246 my %queue;
4247 my @queue;
4248 my $widget;
4249
4250 outer:
4251 while () {
4252 if (my $realloc = delete $self->{realloc}) {
4253 for $widget (values %$realloc) {
4254 $widget->{visible} or next; # do not resize invisible widgets
4255
4256 $queue{$widget+0}++ and next; # duplicates are common
4257
4258 push @{ $queue[$widget->{visible}] }, $widget;
4259 }
4260 }
4261
4262 while () {
4263 @queue or last outer;
4264
4265 $widget = pop @{ $queue[-1] || [] }
4266 and last;
4267
4268 pop @queue;
4269 }
4270
4271 delete $queue{$widget+0};
4272
4273 my ($w, $h) = $widget->size_request;
4274
4275 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
4276 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4277
4278 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4279 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4280
4281 $w = $widget->{force_w} if exists $widget->{force_w};
4282 $h = $widget->{force_h} if exists $widget->{force_h};
4283
4284 if ($widget->{req_w} != $w || $widget->{req_h} != $h
4285 || delete $widget->{force_realloc}) {
4286 $widget->{req_w} = $w;
4287 $widget->{req_h} = $h;
4288
4289 $self->{size_alloc}{$widget+0} = $widget;
4290
4291 if (my $parent = $widget->{parent}) {
4292 $self->{realloc}{$parent+0} = $parent
4293 unless $queue{$parent+0};
4294
4295 $parent->{force_size_alloc} = 1;
4296 $self->{size_alloc}{$parent+0} = $parent;
4297 }
4298 }
4299
4300 delete $self->{realloc}{$widget+0};
4301 }
4302
4303 while (my $size_alloc = delete $self->{size_alloc}) {
4304 my @queue = sort { $a->{visible} <=> $b->{visible} }
4305 values %$size_alloc;
4306
4307 while () {
4308 my $widget = pop @queue || last;
4309
4310 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4311
4312 $w = max $widget->{min_w}, $w;
4313 $h = max $widget->{min_h}, $h;
4314
4315# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4316# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4317
4318 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4319 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4320
4321 $w = int $w + 0.5;
4322 $h = int $h + 0.5;
4323
4324 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4325 $widget->{old_w} = $widget->{w};
4326 $widget->{old_h} = $widget->{h};
4327
4328 $widget->{w} = $w;
4329 $widget->{h} = $h;
4330
4331 $widget->emit (size_allocate => $w, $h);
4332 }
4333 }
4334 }
4335 }
4336
4337 while ($self->{post_alloc_hook}) {
4338 $_->()
4339 for values %{delete $self->{post_alloc_hook}};
2563 } 4340 }
2564 4341
2565 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4342 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2566 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4343 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2567 glClear GL_COLOR_BUFFER_BIT; 4344 glClear GL_COLOR_BUFFER_BIT;
2568 4345
2569 glMatrixMode GL_PROJECTION; 4346 glMatrixMode GL_PROJECTION;
2570 glLoadIdentity; 4347 glLoadIdentity;
2571 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 4348 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2572 glMatrixMode GL_MODELVIEW; 4349 glMatrixMode GL_MODELVIEW;
2573 glLoadIdentity; 4350 glLoadIdentity;
2574 4351
4352 {
4353 package CFPlus::UI::Base;
4354
4355 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4356 (0, 0, $self->{w}, $self->{h});
4357
2575 $self->_draw; 4358 $self->_draw;
4359 }
2576} 4360}
2577 4361
2578############################################################################# 4362#############################################################################
2579 4363
2580package CFClient::UI::Inventory;
2581
2582our @ISA = CFClient::UI::Container::;
2583
2584use CFClient::OpenGL;
2585
2586sub new {
2587 my $class = shift;
2588
2589 my $self = $class->SUPER::new (@_);
2590
2591 $self
2592}
2593
2594sub size_allocate {
2595 my ($self, $w, $h) = @_;
2596
2597 $self->{w} = $w;
2598 $self->{h} = $h;
2599
2600 $self->check_size;
2601}
2602
2603sub set_items {
2604 my ($self, $items) = @_;
2605 my @items = values %{$items};
2606 @items = sort { $a->{type} <=> $b->{type} } @items;
2607
2608 $self->{real_items} = \@items;
2609
2610 for my $item (@items) {
2611 my $desc = $item->{nrof} < 2
2612 ? $item->{name}
2613 : "$item->{nrof} $item->{name_pl}";
2614
2615 $self->add (my $hb = new CFClient::UI::HBox);
2616
2617 $hb->add (my $f = new CFClient::UI::Face
2618 can_events => 0,
2619 face => $item->{face},
2620 anim => $item->{anim},
2621 animspeed => $item->{animspeed},
2622 expand => 1
2623 );
2624 $hb->add (new CFClient::UI::Label text => $desc, expand => 1);
2625 }
2626
2627 $self->{max_pos} = (scalar @items) - 1;
2628
2629 my $range = $self->{range};
2630 my $page = $self->{h} / 32; # waht information souce to use for face size?
2631 # it should be configurable i guess...
2632 $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2633 $range->update;
2634}
2635
2636sub size_request {
2637 my ($self) = @_;
2638 (100, 200)
2639}
2640
2641sub set_range {
2642 my ($self, $range) = @_;
2643
2644 $self->{range} = $range;
2645 $range->connect (changed => sub { $self->update });
2646
2647 my $page = $self->{h} / 32; # waht information souce to use for face size?
2648 # it should be configurable i guess...
2649
2650 $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2651 $range->update;
2652
2653 $self->update;
2654}
2655
2656sub _draw {
2657 my ($self) = @_;
2658
2659 my ($w, $h) = ($self->{w}, $self->{h});
2660
2661 $self->{pos} = int $self->{range}{range}[0];
2662
2663 my $y = 0;
2664 my $cnt = 0;
2665 my $hrem = $self->{h}; # horiz. remaining space
2666
2667 for (my $i = $self->{pos}; $i < @{$self->{children} || []}; $i++) {
2668 my $chld = $self->{children}->[$i];
2669
2670 if ($hrem >= $chld->{h}) {
2671 $chld->configure (0, $y, $chld->{w}, $chld->{h});
2672
2673 $chld->show;
2674 $chld->draw;
2675
2676 $hrem -= $chld->{h};
2677 $y += $chld->{h};
2678 } else {
2679 last
2680 }
2681 }
2682}
2683
2684
2685#############################################################################
2686
2687package CFClient::UI; 4364package CFPlus::UI;
2688 4365
2689$ROOT = new CFClient::UI::Root; 4366$ROOT = new CFPlus::UI::Root;
2690$TOOLTIP = new CFClient::UI::Tooltip; 4367$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
2691 4368
26921 43691
2693 4370

Diff Legend

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