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

Diff Legend

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