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

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

Diff Legend

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