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

Diff Legend

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