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.189 by root, Mon May 8 22:17:24 2006 UTC vs.
Revision 1.413 by root, Mon Jul 23 15:30:45 2007 UTC

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

Diff Legend

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