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

Diff Legend

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