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.240 by root, Fri May 26 18:28:23 2006 UTC vs.
Revision 1.430 by root, Tue Aug 21 02:39:17 2007 UTC

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

Diff Legend

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