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

Diff Legend

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