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.243 by root, Sat May 27 20:46:54 2006 UTC vs.
Revision 1.418 by elmex, Tue Jul 24 18:39:39 2007 UTC

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

Diff Legend

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