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.222 by root, Mon May 22 03:59:51 2006 UTC vs.
Revision 1.401 by root, Sat Jul 21 20:05:37 2007 UTC

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

Diff Legend

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