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

Diff Legend

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