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.67 by root, Tue Apr 11 14:36:59 2006 UTC vs.
Revision 1.81 by root, Wed Apr 12 00:40:45 2006 UTC

1package CFClient::Widget; 1package CFClient::UI;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util ();
6 6use List::Util ();
7use SDL::OpenGL;
8use SDL::OpenGL::Constants;
9 7
10use CFClient; 8use CFClient;
11 9
12our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
13 11
… …
45 43
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47 45
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49 47
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 48 $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB;
51 49
52 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
53 my $grab = $GRAB; undef $GRAB; 51 my $grab = $GRAB; undef $GRAB;
54 $grab->update if $grab; 52 $grab->update if $grab;
55 $GRAB->update if $GRAB; 53 $GRAB->update if $GRAB;
… …
70 } 68 }
71 69
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; 70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
73} 71}
74 72
73#############################################################################
74
75package CFClient::UI::Base;
76
77use strict;
78
79use SDL::OpenGL;
80
75sub new { 81sub new {
76 my $class = shift; 82 my $class = shift;
77 83
78 bless { 84 my $self = bless {
79 x => 0, 85 x => 0,
80 y => 0, 86 y => 0,
81 z => 0, 87 z => 0,
88 w => -1,
89 h => -1,
82 @_ 90 @_
83 }, $class 91 }, $class;
92
93 for (keys %$self) {
94 if (/^connect_(.*)$/) {
95 $self->connect ($1 => delete $self->{$_});
96 }
97 }
98
99 $self
84} 100}
85 101
86sub move { 102sub move {
87 my ($self, $x, $y, $z) = @_; 103 my ($self, $x, $y, $z) = @_;
88 $self->{x} = $x; 104 $self->{x} = $x;
… …
97sub size_request { 113sub size_request {
98 require Carp; 114 require Carp;
99 Carp::confess "size_request is abtract"; 115 Carp::confess "size_request is abtract";
100} 116}
101 117
102sub size_allocate { 118sub _size_allocate {
103 my ($self, $w, $h) = @_; 119 my ($self, $x, $y, $w, $h) = @_;
120
121 $self->{x} = $x;
122 $self->{y} = $y;
123
124 return unless $self->{w} != $w || $self->{h} != $h;
104 125
105 $self->{w} = $w; 126 $self->{w} = $w;
106 $self->{h} = $h; 127 $self->{h} = $h;
128
129 1
130}
131
132sub size_allocate {
133 my ($self, $x, $y, $w, $h) = @_;
134
135 $self->_size_allocate ($x, $y, $w, $h);
107} 136}
108 137
109# translate global koordinates to local coordinate system 138# translate global koordinates to local coordinate system
110sub translate { 139sub translate {
111 my ($self, $x, $y) = @_; 140 my ($self, $x, $y) = @_;
… …
114} 143}
115 144
116sub focus_in { 145sub focus_in {
117 my ($self) = @_; 146 my ($self) = @_;
118 147
148 return if $FOCUS == $self;
149
119 my $focus = $FOCUS; $FOCUS = $self; 150 my $focus = $FOCUS; $FOCUS = $self;
120 $focus->update if $focus; 151 $focus->update if $focus;
121 $FOCUS->update; 152 $FOCUS->update;
122} 153}
123 154
… …
130 $focus->update if $focus; #? 161 $focus->update if $focus; #?
131} 162}
132 163
133sub mouse_motion { } 164sub mouse_motion { }
134sub button_up { } 165sub button_up { }
135sub button_down { }
136sub key_down { } 166sub key_down { }
137sub key_up { } 167sub key_up { }
168
169sub button_down {
170 my ($self, $ev, $x, $y) = @_;
171
172 $self->focus_in;
173}
138 174
139sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 175sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
140sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 176sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
141sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 177sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
142sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 178sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
143sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 179sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
144 180
145sub draw { 181sub draw {
146 my ($self) = @_; 182 my ($self) = @_;
147 183
184 return unless $self->{h} && $self->{w};
185
148 glPushMatrix; 186 glPushMatrix;
149 glTranslate $self->{x}, $self->{y}, 0; 187 glTranslate $self->{x}, $self->{y}, 0;
150 $self->_draw; 188 $self->_draw;
189 glPopMatrix;
190
151 if ($self == $HOVER) { 191 if ($self == $HOVER) {
152 glColor 1, 1, 1, 0.4; 192 my ($x, $y) = @$self{qw(x y)};
193
194 glColor 0, 0, 1, 0.2;
153 glEnable GL_BLEND; 195 glEnable GL_BLEND;
196 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
154 glBegin GL_QUADS; 197 glBegin GL_QUADS;
155 glVertex 0 , 0; 198 glVertex $x , $y;
156 glVertex $self->{w}, 0; 199 glVertex $x + $self->{w}, $y;
157 glVertex $self->{w}, $self->{h}; 200 glVertex $x + $self->{w}, $y + $self->{h};
158 glVertex 0 , $self->{h}; 201 glVertex $x , $y + $self->{h};
159 glEnd; 202 glEnd;
160 glDisable GL_BLEND; 203 glDisable GL_BLEND;
161 } 204 }
162 glPopMatrix;
163} 205}
164 206
165sub _draw { 207sub _draw {
166 my ($self) = @_; 208 my ($self) = @_;
167 209
168 warn "no draw defined for $self\n"; 210 warn "no draw defined for $self\n";
169}
170
171sub bbox {
172 my ($self) = @_;
173 my ($w, $h) = $self->size_request;
174 (
175 $self->{x},
176 $self->{y},
177 $self->{x} = $w,
178 $self->{y} = $h
179 )
180} 211}
181 212
182sub find_widget { 213sub find_widget {
183 my ($self, $x, $y) = @_; 214 my ($self, $x, $y) = @_;
184 215
… …
187 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 218 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
188 219
189 () 220 ()
190} 221}
191 222
192sub del_parent { $_[0]->{parent} = undef }
193
194sub set_parent { 223sub set_parent {
195 my ($self, $par) = @_; 224 my ($self, $par) = @_;
196 225
197 $self->{parent} = $par; 226 $self->{parent} = $par;
198 Scalar::Util::weaken $self->{parent}; 227 Scalar::Util::weaken $self->{parent};
… …
207 236
208 $self->{parent}->update 237 $self->{parent}->update
209 if $self->{parent}; 238 if $self->{parent};
210} 239}
211 240
241sub connect {
242 my ($self, $signal, $cb) = @_;
243
244 push @{ $self->{cb}{$signal} }, $cb;
245}
246
247sub emit {
248 my ($self, $signal, @args) = @_;
249
250 $_->($self, @args)
251 for @{$self->{cb}{$signal} || []};
252}
253
212sub DESTROY { 254sub DESTROY {
213 my ($self) = @_; 255 my ($self) = @_;
214 256
215 #$self->deactivate; 257 #$self->deactivate;
216} 258}
217 259
218############################################################################# 260#############################################################################
219 261
262package CFClient::UI::DrawBG;
263
264our @ISA = CFClient::UI::Base::;
265
266use strict;
267use SDL::OpenGL;
268
269sub new {
270 my $class = shift;
271
272 # range [value, low, high, page]
273
274 $class->SUPER::new (
275 bg => [0, 0, 0, 0.2],
276 active_bg => [1, 1, 1, 0.5],
277 @_
278 )
279}
280
281sub _draw {
282 my ($self) = @_;
283
284 my ($w, $h) = @$self{qw(w h)};
285
286 glEnable GL_BLEND;
287 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
288 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
289
290 glBegin GL_QUADS;
291 glVertex 0 , 0;
292 glVertex 0 , $h;
293 glVertex $w, $h;
294 glVertex $w, 0;
295 glEnd;
296
297 glDisable GL_BLEND;
298}
299
300#############################################################################
301
220package CFClient::Widget::Empty; 302package CFClient::UI::Empty;
221 303
222our @ISA = CFClient::Widget::; 304our @ISA = CFClient::UI::Base::;
223 305
224sub size_request { 306sub size_request {
225 (0, 0) 307 (0, 0)
226} 308}
227 309
228sub draw { } 310sub draw { }
229 311
230############################################################################# 312#############################################################################
231 313
232package CFClient::Widget::Container; 314package CFClient::UI::Container;
233 315
234our @ISA = CFClient::Widget::; 316our @ISA = CFClient::UI::Base::;
235 317
236sub new { 318sub new {
237 my ($class, %arg) = @_; 319 my ($class, %arg) = @_;
238 320
239 my $children = delete $arg{children} || []; 321 my $children = delete $arg{children} || [];
… …
243 325
244 $self 326 $self
245} 327}
246 328
247sub add { 329sub add {
248 my ($self, $chld, $expand) = @_; 330 my ($self, $chld) = @_;
249 331
250 $chld->{expand} = $expand;
251 $chld->set_parent ($self); 332 $chld->set_parent ($self);
252 333
253 $self->{children} = [ 334 $self->{children} = [
254 sort { $a->{z} <=> $b->{z} } 335 sort { $a->{z} <=> $b->{z} }
255 @{$self->{children}}, $chld 336 @{$self->{children}}, $chld
256 ]; 337 ];
257 338
258 $self->size_allocate ($self->{w}, $self->{h}) 339 $self->{w} = $self->{h} = -1;
259 if $self->{w}; #TODO: check for "realised state" 340 $self->update;
260} 341}
261 342
262sub remove { 343sub remove {
263 my ($self, $widget) = @_; 344 my ($self, $widget) = @_;
264 345
265 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 346 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
266 347
267 $self->size_allocate ($self->{w}, $self->{h}); 348 $self->size_allocate (0, 0, $self->{w}, $self->{h});
268} 349}
269 350
270sub find_widget { 351sub find_widget {
271 my ($self, $x, $y) = @_; 352 my ($self, $x, $y) = @_;
272 353
… …
289 $_->draw for @{$self->{children}}; 370 $_->draw for @{$self->{children}};
290} 371}
291 372
292############################################################################# 373#############################################################################
293 374
294package CFClient::Widget::Bin; 375package CFClient::UI::Bin;
295 376
296our @ISA = CFClient::Widget::Container::; 377our @ISA = CFClient::UI::Container::;
297 378
298sub new { 379sub new {
299 my ($class, %arg) = @_; 380 my ($class, %arg) = @_;
300 381
301 my $child = (delete $arg{child}) || new CFClient::Widget::Empty::; 382 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
302 383
303 $class->SUPER::new (children => [$child], %arg) 384 $class->SUPER::new (children => [$child], %arg)
304} 385}
305 386
306sub add { 387sub add {
… …
314sub remove { 395sub remove {
315 my ($self, $widget) = @_; 396 my ($self, $widget) = @_;
316 397
317 $self->SUPER::remove ($widget); 398 $self->SUPER::remove ($widget);
318 399
319 $self->{children} = [new CFClient::Widget::Empty] 400 $self->{children} = [new CFClient::UI::Empty]
320 unless @{$self->{children}}; 401 unless @{$self->{children}};
321} 402}
322 403
323sub child { $_[0]->{children}[0] } 404sub child { $_[0]->{children}[0] }
324 405
325sub size_request { 406sub size_request {
326 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 407 $_[0]{children}[0]->size_request
327} 408}
328 409
329sub size_allocate { 410sub size_allocate {
330 my ($self, $w, $h) = @_; 411 my ($self, $x, $y, $w, $h) = @_;
331 412
332 $self->SUPER::size_allocate ($w, $h); 413 $self->_size_allocate ($x, $y, $w, $h) or return;
414
333 $self->{children}[0]->size_allocate ($w, $h) 415 $self->{children}[0]->size_allocate (0, 0, $w, $h);
334 if $self->{children}[0]
335} 416}
336 417
337############################################################################# 418#############################################################################
338 419
339package CFClient::Widget::Window; 420package CFClient::UI::Window;
340 421
341our @ISA = CFClient::Widget::Bin::; 422our @ISA = CFClient::UI::Bin::;
342 423
343use SDL::OpenGL; 424use SDL::OpenGL;
344 425
345sub new { 426sub new {
346 my ($class, %arg) = @_; 427 my ($class, %arg) = @_;
… …
364 $self->{w}, $self->{h}, sub { $self->child->draw } 445 $self->{w}, $self->{h}, sub { $self->child->draw }
365 ); 446 );
366} 447}
367 448
368sub size_allocate { 449sub size_allocate {
369 my ($self, $w, $h) = @_; 450 my ($self, $x, $y, $w, $h) = @_;
370 451
371 $self->{w} = $w; 452 $self->_size_allocate ($x, $y, $w, $h) or return;
372 $self->{h} = $h;
373 453
374 $self->child->size_allocate ($w, $h); 454 $self->child->size_allocate (0, 0, $w, $h);
375 455
376 $self->render_chld; 456 $self->render_chld;
377} 457}
378 458
379sub _draw { 459sub _draw {
… …
383 463
384 my $tex = $self->{texture} 464 my $tex = $self->{texture}
385 or return; 465 or return;
386 466
387 glEnable GL_BLEND; 467 glEnable GL_BLEND;
468 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
388 glEnable GL_TEXTURE_2D; 469 glEnable GL_TEXTURE_2D;
389 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 470 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
390 471
391 $tex->draw_quad (0, 0, $w, $h); 472 $tex->draw_quad (0, 0, $w, $h);
392 473
… …
394 glDisable GL_TEXTURE_2D; 475 glDisable GL_TEXTURE_2D;
395} 476}
396 477
397############################################################################# 478#############################################################################
398 479
399package CFClient::Widget::Frame; 480package CFClient::UI::Frame;
400 481
401our @ISA = CFClient::Widget::Bin::; 482our @ISA = CFClient::UI::Bin::;
402 483
403use SDL::OpenGL; 484use SDL::OpenGL;
404 485
405sub size_request { 486sub size_request {
406 my ($self) = @_; 487 my ($self) = @_;
… …
411 492
412 map { $_ + 4 } $chld->size_request; 493 map { $_ + 4 } $chld->size_request;
413} 494}
414 495
415sub size_allocate { 496sub size_allocate {
416 my ($self, $w, $h) = @_; 497 my ($self, $x, $y, $w, $h) = @_;
417 498
418 $self->{w} = $w; 499 $self->_size_allocate ($x, $y, $w, $h) or return;
419 $self->{h} = $h;
420 500
421 $self->child->size_allocate ($w - 4, $h - 4); 501 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
422 $self->child->move (2, 2);
423} 502}
424 503
425sub _draw { 504sub _draw {
426 my ($self) = @_; 505 my ($self) = @_;
427 506
… …
440 $chld->draw; 519 $chld->draw;
441} 520}
442 521
443############################################################################# 522#############################################################################
444 523
445package CFClient::Widget::FancyFrame; 524package CFClient::UI::FancyFrame;
446 525
447our @ISA = CFClient::Widget::Bin::; 526our @ISA = CFClient::UI::Bin::;
448 527
449use SDL::OpenGL; 528use SDL::OpenGL;
450 529
451my @tex = 530my @tex =
452 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 531 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
453 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 532 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
454 533
455sub size_request { 534sub size_request {
456 my ($self) = @_; 535 my ($self) = @_;
457 536
537 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
538
458 my ($w, $h) = $self->SUPER::size_request; 539 my ($w, $h) = $self->SUPER::size_request;
459 540
460 $h += $tex[1]->{height}; 541 $h += $tex[1]->{h};
461 $h += $tex[4]->{height}; 542 $h += $tex[4]->{h};
462 $w += $tex[2]->{width}; 543 $w += $tex[2]->{w};
463 $w += $tex[3]->{width}; 544 $w += $tex[3]->{w};
464 545
465 ($w, $h) 546 ($w, $h)
466} 547}
467 548
468sub size_allocate { 549sub size_allocate {
469 my ($self, $w, $h) = @_; 550 my ($self, $x, $y, $w, $h) = @_;
470 551
471 $self->SUPER::size_allocate ($w, $h); 552 $self->_size_allocate ($x, $y, $w, $h) or return;
472 553
473 $h -= $tex[1]->{height}; 554 $h -= $tex[1]{h};
474 $h -= $tex[4]->{height}; 555 $h -= $tex[4]{h};
475 $w -= $tex[2]->{width}; 556 $w -= $tex[2]{w};
476 $w -= $tex[3]->{width}; 557 $w -= $tex[3]{w};
477 558
478 $h = $h < 0 ? 0 : $h; 559 $h = $h < 0 ? 0 : $h;
479 $w = $w < 0 ? 0 : $w; 560 $w = $w < 0 ? 0 : $w;
480 561
481 my $child = $self->child; 562 my $child = $self->child;
482 563
483 $child->size_allocate ($w, $h); 564 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
484 $child->move ($tex[3]->{width}, $tex[1]->{height}); 565}
566
567sub button_down {
568 my ($self, $ev, $x, $y) = @_;
569
570 if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w}
571 && $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) {
572
573 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
574 my ($bw, $bh) = ($self->{w}, $self->{h});
575
576 $self->{motion} = sub {
577 my ($ev, $x, $y) = @_;
578
579 ($x, $y) = ($ev->motion_x, $ev->motion_y);
580
581 $self->{user_w} = $bw + $x - $ox;
582 $self->{user_h} = $bh + $y - $oy;
583 $self->update;
584 };
585
586 } elsif ($x >= 0 && $x < $self->{w}
587 && $y >= 0 && $y < $tex[1]{h}) {
588
589 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
590 my ($bx, $by) = ($self->{x}, $self->{y});
591
592 $self->{motion} = sub {
593 my ($ev, $x, $y) = @_;
594
595 ($x, $y) = ($ev->motion_x, $ev->motion_y);
596
597 $self->move ($bx + $x - $ox, $by + $y - $oy);
598 $self->update;
599 };
600 }
601}
602
603sub button_up {
604 my ($self, $ev, $x, $y) = @_;
605
606 delete $self->{motion};
607}
608
609sub mouse_motion {
610 my ($self, $ev, $x, $y) = @_;
611
612 $self->{motion}->($ev, $x, $y) if $self->{motion};
485} 613}
486 614
487sub _draw { 615sub _draw {
488 my ($self) = @_; 616 my ($self) = @_;
489 617
490 my ($w, $h) = ($self->{w}, $self->{h}); 618 my ($w, $h) = ($self->{w}, $self->{h});
491 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 619 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
492 620
493 glEnable GL_BLEND; 621 glEnable GL_BLEND;
622 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
494 glEnable GL_TEXTURE_2D; 623 glEnable GL_TEXTURE_2D;
495 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
497 625
498 my $top = $tex[1]; 626 my $top = $tex[1];
499 $top->draw_quad (0, 0, $w, $top->{height}); 627 $top->draw_quad (0, 0, $w, $top->{h});
500 628
501 my $left = $tex[3]; 629 my $left = $tex[3];
502 $left->draw_quad (0, $top->{height}, $left->{width}, $ch); 630 $left->draw_quad (0, $top->{h}, $left->{w}, $ch);
503 631
504 my $right = $tex[2]; 632 my $right = $tex[2];
505 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch); 633 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
506 634
507 my $bottom = $tex[4]; 635 my $bottom = $tex[4];
508 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height}); 636 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
509 637
510 my $bg = $tex[0]; 638 my $bg = $tex[0];
639
511 glBindTexture GL_TEXTURE_2D, $bg->{name}; 640 glBindTexture GL_TEXTURE_2D, $bg->{name};
512 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
513 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 642 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
514 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 643 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
515 644
516 my $rep_x = $cw / $bg->{width}; 645 my $rep_x = $cw / $bg->{w};
517 my $rep_y = $ch / $bg->{height}; 646 my $rep_y = $ch / $bg->{h};
518 647
519 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch); 648 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);
520 649
650 glDisable GL_TEXTURE_2D;
521 glDisable GL_BLEND; 651 glDisable GL_BLEND;
522 glDisable GL_TEXTURE_2D;
523 652
524 $self->child->draw; 653 $self->child->draw;
525 654
526} 655}
527 656
528############################################################################# 657#############################################################################
529 658
530package CFClient::Widget::Table; 659package CFClient::UI::Table;
531 660
532our @ISA = CFClient::Widget::Bin::; 661our @ISA = CFClient::UI::Base::;
662
663use List::Util qw(max sum);
533 664
534use SDL::OpenGL; 665use SDL::OpenGL;
666
667sub new {
668 my $class = shift;
669
670 $class->SUPER::new (
671 col_expand => [],
672 @_
673 )
674}
535 675
536sub add { 676sub add {
537 my ($self, $x, $y, $chld) = @_; 677 my ($self, $x, $y, $chld) = @_;
538 my $old_chld = $self->{children}[$y][$x];
539 678
540 $self->{children}[$y][$x] = $chld; 679 $self->{children}[$y][$x] = $chld;
541 $chld->set_parent ($self); 680 $chld->set_parent ($self);
681
682 $self->{w} = $self->{h} = -1;
542 $self->update; 683 $self->update;
543} 684}
544 685
545sub max_row_height { 686sub get_wh {
546 my ($self, $row) = @_; 687 my ($self) = @_;
547 688
548 my $hs = 0; 689 my (@w, @h);
549 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) { 690
691 for my $y (0 .. $#{$self->{children}}) {
550 my $c = $self->{children}->[$row]->[$xi]; 692 my $row = $self->{children}[$y]
551 if ($c) { 693 or next;
694
695 for my $x (0 .. $#$row) {
696 my $widget = $row->[$x]
697 or next;
552 my ($w, $h) = $c->size_request; 698 my ($w, $h) = $widget->size_request;
553 if ($hs < $h) { $hs = $h } 699
700 $w[$x] = max $w[$x], $w;
701 $h[$y] = max $h[$y], $h;
554 } 702 }
555 } 703 }
556 return $hs;
557}
558 704
559sub max_col_width { 705 (\@w, \@h)
706}
707
708sub size_request {
560 my ($self, $col) = @_; 709 my ($self) = @_;
561 710
711 my ($ws, $hs) = $self->get_wh;
712
713 (
714 (sum @$ws),
715 (sum @$hs),
716 )
717}
718
719sub size_allocate {
720 my ($self, $x, $y, $w, $h) = @_;
721
722 $self->_size_allocate ($x, $y, $w, $h) or return;
723
724 my ($ws, $hs) = $self->get_wh;
725
726 my $req_w = sum @$ws;
727 my $req_h = sum @$hs;
728
729 # TODO: nicer code && do row_expand
730 my @col_expand = @{$self->{col_expand}};
731 @col_expand = (1) x @$ws unless @col_expand;
732 my $col_expand = (sum @col_expand) || 1;
733
734 # linearly scale sizes
735 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
736 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
737
738 my $y;
739
740 for my $r (0 .. $#{$self->{children}}) {
741 my $row = $self->{children}[$r]
742 or next;
743
562 my $ws = 0; 744 my $x = 0;
563 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) { 745 my $row_h = $hs->[$r];
564 my $c = ($self->{children}->[$yi] || [])->[$col]; 746
565 if ($c) { 747 for my $c (0 .. $#$row) {
566 my ($w, $h) = $c->size_request; 748 my $widget = $row->[$c]
567 if ($ws < $w) { $ws = $w } 749 or next;
750
751 my $col_w = $ws->[$c];
752
753 $widget->size_allocate ($x, $y, $col_w, $row_h);
754
755 $x += $col_w;
568 } 756 }
757
758 $y += $row_h;
569 } 759 }
570 return $ws; 760
571} 761}
762
763sub find_widget {
764 my ($self, $x, $y) = @_;
765
766 $x -= $self->{x};
767 $y -= $self->{y};
768
769 my $res;
770
771 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
772 $res = $_->find_widget ($x, $y)
773 and return $res;
774 }
775
776 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
777}
778
779sub _draw {
780 my ($self) = @_;
781
782 for (grep $_, @{$self->{children}}) {
783 $_->draw for grep $_, @$_;
784 }
785}
786
787#############################################################################
788
789package CFClient::UI::HBox;
790
791# TODO: wrap into common Box base class
792
793our @ISA = CFClient::UI::Container::;
572 794
573sub size_request { 795sub size_request {
574 my ($self) = @_; 796 my ($self) = @_;
575 797
798 my @alloc = map [$_->size_request], @{$self->{children}};
799
800 (
801 (List::Util::sum map $_->[0], @alloc),
802 (List::Util::max map $_->[1], @alloc),
803 )
804}
805
806sub size_allocate {
807 my ($self, $x, $y, $w, $h) = @_;
808
809 $self->_size_allocate ($x, $y, $w, $h) or return;
810
811 return unless $self->{w};
812
576 my ($hs, $ws) = (0, 0); 813 ($h, $w) = ($w, $h);
577 814
578 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 815 my $children = $self->{children};
579 $hs += $self->max_row_height ($yi);
580 }
581 816
582 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 817 my @h = map +($_->size_request)[0], @$children;
583 my $wm = 0; 818
584 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 819 my $req_h = List::Util::sum @h;
585 $wm += $self->max_col_width ($xi) 820
821 if ($req_h > $h) {
822 # ah well, not enough space
823 $_ *= $h / $req_h for @h;
824 } else {
825 my $exp = List::Util::sum map $_->{expand}, @$children;
826 $exp ||= 1;
827
828 for (0 .. $#$children) {
829 my $child = $children->[$_];
830
831 my $alloc_h = $h[$_];
832 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
833 $h[$_] = $alloc_h;
586 } 834 }
587 if ($ws < $wm) { $ws = $wm }
588 } 835 }
589
590 return ($ws, $hs);
591}
592
593sub _draw {
594 my ($self) = @_;
595 836
596 my $y = 0; 837 my $y = 0;
597 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 838 for (0 .. $#$children) {
839 my $child = $children->[$_];
598 my $x = 0; 840 my $h = $h[$_];
841 $child->size_allocate ($y, 0, $h, $w);
599 842
600 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 843 $y += $h;
601
602 my $c = $self->{children}->[$yi]->[$xi];
603 if ($c) {
604 $c->move ($x, $y, 0); #TODO: Move to size_request
605 $c->draw if $c;
606 }
607
608 $x += $self->max_col_width ($xi);
609 }
610
611 $y += $self->max_row_height ($yi);
612 } 844 }
613} 845}
614 846
615############################################################################# 847#############################################################################
616 848
617package CFClient::Widget::VBox; 849package CFClient::UI::VBox;
618 850
851# TODO: wrap into common Box base class
852
619our @ISA = CFClient::Widget::Container::; 853our @ISA = CFClient::UI::Container::;
620
621use SDL::OpenGL;
622 854
623sub size_request { 855sub size_request {
624 my ($self) = @_; 856 my ($self) = @_;
625 857
626 my @alloc = map [$_->size_request], @{$self->{children}}; 858 my @alloc = map [$_->size_request], @{$self->{children}};
… …
630 (List::Util::sum map $_->[1], @alloc), 862 (List::Util::sum map $_->[1], @alloc),
631 ) 863 )
632} 864}
633 865
634sub size_allocate { 866sub size_allocate {
635 my ($self, $w, $h) = @_; 867 my ($self, $x, $y, $w, $h) = @_;
636 868
637 $self->w ($w); 869 $self->_size_allocate ($x, $y, $w, $h) or return;
638 $self->h ($h);
639 870
640 my $exp; 871 return unless $self->{h};
641 my @oth; 872
642 # find expand widget 873 my $children = $self->{children};
643 for (@{$self->{children}}) { 874
644 if ($_->{expand}) { 875 my @h = map +($_->size_request)[1], @$children;
876
877 my $req_h = List::Util::sum @h;
878
879 if ($req_h > $h) {
880 # ah well, not enough space
881 $_ *= $h / $req_h for @h;
882 } else {
883 my $exp = List::Util::sum map $_->{expand}, @$children;
645 $exp = $_; 884 $exp ||= 1;
646 last; 885
886 for (0 .. $#$children) {
887 my $child = $children->[$_];
888
889 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
647 } 890 }
648 push @oth, $_;
649 }
650
651 my ($ow, $oh);
652
653 # get sizes of other widgets
654 for (@oth) {
655 my ($w, $h) = $_->size_request;
656 $oh += $h;
657 if ($ow < $w) { $ow = $w }
658 } 891 }
659 892
660 my $y = 0; 893 my $y = 0;
661 for (@{$self->{children}}) { 894 for (0 .. $#$children) {
662 $_->move (0, $y); 895 my $child = $children->[$_];
663 896 my $h = $h[$_];
664 if ($_ == $exp) {
665 $_->size_allocate ($w, $h - $oh);
666 $y += $h - $oh;
667 } else {
668 my ($cw, $h) = $_->size_request;
669 $_->size_allocate ($w, $h); 897 $child->size_allocate (0, $y, $w, $h);
898
670 $y += $h; 899 $y += $h;
671 }
672 } 900 }
673} 901}
674 902
675############################################################################# 903#############################################################################
676 904
677package CFClient::Widget::Label; 905package CFClient::UI::Label;
678 906
679our @ISA = CFClient::Widget::; 907our @ISA = CFClient::UI::Base::;
680 908
681use SDL::OpenGL; 909use SDL::OpenGL;
682 910
683sub new { 911sub new {
684 my ($class, %arg) = @_; 912 my ($class, %arg) = @_;
685 913
686 # TODO: color, and make height, xyz etc. optional
687 my $self = $class->SUPER::new ( 914 my $self = $class->SUPER::new (
688 color => [1, 1, 1], 915 fg => [1, 1, 1],
689 height => $::FONTSIZE, 916 height => $::FONTSIZE,
690 text => "", 917 text => "",
918 align => -1,
919 padding => 2,
691 layout => new CFClient::Layout, 920 layout => new CFClient::Layout,
692 %arg 921 %arg
693 ); 922 );
694 923
695 $self->set_text ($self->{text}); 924 $self->set_text ($self->{text});
696 925
697 $self 926 $self
698} 927}
699 928
929sub escape_text {
930 local $_ = $_[1];
931
932 s/&/&amp;/g;
933 s/>/&gt;/g;
934 s/</&lt;/g;
935
936 $_[1]
937}
938
700sub set_text { 939sub set_text {
701 my ($self, $text) = @_; 940 my ($self, $text) = @_;
702 941
703 $self->{text} = $text; 942 $self->{text} = $text;
704 $self->{layout}->set_markup ($text); 943 $self->{layout}->set_markup ($text);
705 944
706 delete $self->{texture}; 945 delete $self->{texture};
946# $self->{w} = $self->{h} = -1;
947 $self->update;
707} 948}
708 949
709sub get_text { 950sub get_text {
710 my ($self, $text) = @_; 951 my ($self, $text) = @_;
711 952
… …
715sub size_request { 956sub size_request {
716 my ($self) = @_; 957 my ($self) = @_;
717 958
718 $self->{layout}->set_width; 959 $self->{layout}->set_width;
719 $self->{layout}->set_height ($self->{height}); 960 $self->{layout}->set_height ($self->{height});
720 $self->{layout}->size 961 my ($w, $h) = $self->{layout}->size;
721# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack 962
722# ( 963 (
723# $self->{texture}{width}, 964 $w + $self->{padding} * 2,
724# $self->{texture}{height}, 965 $h + $self->{padding} * 2,
725# ) 966 )
726# } else {
727# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
728#
729# ($w, $h)
730# }
731} 967}
732 968
733sub size_allocate { 969sub size_allocate {
734 my ($self, $w, $h) = @_; 970 my ($self, $x, $y, $w, $h) = @_;
735 971
736 $self->SUPER::size_allocate ($w, $h); 972 $self->_size_allocate ($x, $y, $w, $h) or return;
973
737 delete $self->{texture}; 974 delete $self->{texture};
975}
976
977sub update {
978 my ($self) = @_;
979
980 delete $self->{texture};
981 $self->SUPER::update;
738} 982}
739 983
740sub _draw { 984sub _draw {
741 my ($self) = @_; 985 my ($self) = @_;
742 986
743 my $tex = $self->{texture} ||= do { 987 my $tex = $self->{texture} ||= do {
744 $self->{layout}->set_width ($self->{w}); 988 $self->{layout}->set_width ($self->{w});
989 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
745 new_from_layout CFClient::Texture $self->{layout}; 990 new_from_layout CFClient::Texture $self->{layout}
746 }; 991 };
747 992
748 glEnable GL_BLEND; 993 glEnable GL_BLEND;
994 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
749 glEnable GL_TEXTURE_2D; 995 glEnable GL_TEXTURE_2D;
750 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 996 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
752 997
753 glColor @{$self->{color}}; 998 glColor @{$self->{fg}};
754 999
755 $tex->draw_quad (0, 0); 1000 my $x =
1001 $self->{align} < 0 ? $self->{padding}
1002 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1003 : ($self->{w} - $tex->{w}) * 0.5;
756 1004
1005 $tex->draw_quad ($x, $self->{padding});
1006
1007 glDisable GL_TEXTURE_2D;
757 glDisable GL_BLEND; 1008 glDisable GL_BLEND;
758 glDisable GL_TEXTURE_2D;
759} 1009}
760 1010
761############################################################################# 1011#############################################################################
762 1012
763package CFClient::Widget::Entry; 1013package CFClient::UI::Entry;
764 1014
765our @ISA = CFClient::Widget::Label::; 1015our @ISA = CFClient::UI::Label::;
766 1016
767use SDL; 1017use SDL;
768use SDL::OpenGL; 1018use SDL::OpenGL;
769 1019
1020sub new {
1021 my $class = shift;
1022
1023 $class->SUPER::new (
1024 fg => [1, 1, 1],
1025 bg => [0, 0, 0, 0.2],
1026 active_bg => [1, 1, 1, 0.5],
1027 active_fg => [0, 0, 0],
1028 @_
1029 )
1030}
1031
1032sub _set_text {
1033 my ($self, $text) = @_;
1034
1035 $self->{last_activity} = $::NOW;
1036
1037 $self->{text} = $text;
1038 $self->{layout}->set_width ($self->{w});
1039
1040 $text =~ s/./*/g if $self->{hidden};
1041
1042 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
1043
1044 $text = substr $text, 0, $self->{cursor};
1045 utf8::encode $text;
1046
1047 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1048}
1049
1050sub size_request {
1051 my ($self) = @_;
1052
1053 my ($w, $h) = $self->SUPER::size_request;
1054
1055 ($w + 1, $h) # add 1 for cursor
1056}
1057
1058sub size_allocate {
1059 my ($self, $x, $y, $w, $h) = @_;
1060
1061 $self->SUPER::size_allocate ($x, $y, $w, $h);
1062
1063 $self->_set_text ($self->{text});
1064}
1065
1066sub set_text {
1067 my ($self, $text) = @_;
1068
1069 $self->{cursor} = length $text;
1070 $self->_set_text ($text);
1071 $self->update;
1072}
1073
770sub key_down { 1074sub key_down {
771 my ($self, $ev) = @_; 1075 my ($self, $ev) = @_;
772 1076
773 my $mod = $ev->key_mod; 1077 my $mod = $ev->key_mod;
774 my $sym = $ev->key_sym; 1078 my $sym = $ev->key_sym;
… …
776 my $uni = $ev->key_unicode; 1080 my $uni = $ev->key_unicode;
777 1081
778 my $text = $self->get_text; 1082 my $text = $self->get_text;
779 1083
780 if ($sym == SDLK_BACKSPACE) { 1084 if ($sym == SDLK_BACKSPACE) {
781 substr $text, -1, 1, ''; 1085 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1086 } elsif ($sym == SDLK_DELETE) {
1087 substr $text, $self->{cursor}, 1, "";
1088 } elsif ($sym == SDLK_LEFT) {
1089 --$self->{cursor} if $self->{cursor};
1090 } elsif ($sym == SDLK_RIGHT) {
1091 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1092 } elsif ($sym == SDLK_HOME) {
1093 $self->{cursor} = 0;
1094 } elsif ($sym == SDLK_END) {
1095 $self->{cursor} = length $text;
782 } elsif ($uni) { 1096 } elsif ($uni) {
783 $text .= chr $uni; 1097 substr $text, $self->{cursor}++, 0, chr $uni;
784 } 1098 }
785 1099
786 $self->set_text ($text); 1100 $self->_set_text ($text);
1101 $self->update;
1102}
1103
1104sub focus_in {
1105 my ($self) = @_;
1106
1107 $self->{last_activity} = $::NOW;
1108
1109 $self->SUPER::focus_in;
787} 1110}
788 1111
789sub button_down { 1112sub button_down {
790 my ($self, $ev) = @_; 1113 my ($self, $ev, $x, $y) = @_;
791 1114
792 $self->focus_in; 1115 $self->SUPER::button_down ($ev, $x, $y);
1116
1117 my $idx = $self->{layout}->xy_to_index ($x, $y);
1118
1119 # byte-index to char-index
1120 my $text = $self->{text};
1121 utf8::encode $text;
1122 $self->{cursor} = length substr $text, 0, $idx;
1123
1124 $self->_set_text ($self->{text});
1125 $self->update;
793} 1126}
794 1127
795sub mouse_motion { 1128sub mouse_motion {
796 my ($self, $ev, $x, $y) = @_; 1129 my ($self, $ev, $x, $y) = @_;
797 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1130# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
798} 1131}
799 1132
800sub _draw { 1133sub _draw {
801 my ($self) = @_; 1134 my ($self) = @_;
802 1135
1136 local $self->{fg} = $self->{fg};
1137
803 if ($FOCUS == $self) { 1138 if ($FOCUS == $self) {
804 glColor 1, 1, 1; 1139 glColor @{$self->{active_bg}};
1140 $self->{fg} = $self->{active_fg};
805 } else { 1141 } else {
806 glColor 0.7, 0.7, 0.7; 1142 glColor @{$self->{bg}};
807 } 1143 }
808 1144
1145 glEnable GL_BLEND;
1146 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
809 glBegin GL_QUADS; 1147 glBegin GL_QUADS;
810 glVertex 0 , 0; 1148 glVertex 0 , 0;
811 glVertex 0 , $self->{h} - 1; 1149 glVertex 0 , $self->{h};
812 glVertex $self->{w} - 1, $self->{h} - 1; 1150 glVertex $self->{w}, $self->{h};
813 glVertex $self->{w} - 1, 0; 1151 glVertex $self->{w}, 0;
814 glEnd; 1152 glEnd;
1153 glDisable GL_BLEND;
815 1154
816 $self->SUPER::_draw; 1155 $self->SUPER::_draw;
817}
818 1156
819############################################################################# 1157 #TODO: force update every cursor change :(
1158 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1159 glColor @{$self->{fg}};
1160 glBegin GL_LINES;
1161 glVertex $self->{cur_x}, $self->{cur_y};
1162 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1163 glEnd;
1164 }
1165}
820 1166
821package CFClient::Widget::MapWidget; 1167#############################################################################
822 1168
823use strict; 1169package CFClient::UI::Button;
824 1170
825use List::Util qw(min max); 1171our @ISA = CFClient::UI::Label::;
826 1172
827use SDL; 1173use SDL;
828use SDL::OpenGL; 1174use SDL::OpenGL;
829use SDL::OpenGL::Constants;
830 1175
1176sub new {
1177 my $class = shift;
1178
1179 $class->SUPER::new (
1180 padding => 4,
1181 fg => [1, 1, 1],
1182 bg => [1, 1, 1, 0.2],
1183 active_bg => [0, 0, 0, 0.5],
1184 active_fg => [1, 1, 0],
1185 border_fg => [1, 1, 0],
1186 @_
1187 )
1188}
1189
1190sub button_up {
1191 my ($self, $ev, $x, $y) = @_;
1192
1193 if ($x >= 0 && $x < $self->{w}
1194 && $y >= 0 && $y < $self->{h}) {
1195 $self->emit ("activate");
1196 }
1197}
1198
1199sub _draw {
1200 my ($self) = @_;
1201
1202 local $self->{fg} = $self->{fg};
1203
1204 glEnable GL_BLEND;
1205 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1206
1207 glTranslate 0.375, 0.375, 0; # make line and polyogon coordinates behave similarly
1208
1209 glBegin GL_LINE_LOOP;
1210 glColor @{$self->{border_fg}};
1211 glVertex 1 , 1;
1212 glVertex 1 , $self->{h} - 2;
1213 glVertex $self->{w} - 2, $self->{h} - 2;
1214 glVertex $self->{w} - 2, 1;
1215 glEnd;
1216
1217 if ($GRAB == $self) {
1218 glColor @{$self->{active_bg}};
1219 $self->{fg} = $self->{active_fg};
1220 } else {
1221 glColor @{$self->{bg}};
1222 }
1223
1224 glBegin GL_QUADS;
1225 glVertex 2 , 2;
1226 glVertex 2 , $self->{h} - 2;
1227 glVertex $self->{w} - 2, $self->{h} - 2;
1228 glVertex $self->{w} - 2, 2;
1229 glEnd;
1230 glDisable GL_BLEND;
1231
1232 $self->SUPER::_draw;
1233}
1234
1235#############################################################################
1236
1237package CFClient::UI::Slider;
1238
1239use strict;
1240
1241use SDL::OpenGL;
1242
1243our @ISA = CFClient::UI::DrawBG::;
1244
1245sub new {
1246 my $class = shift;
1247
1248 # range [value, low, high, page]
1249
1250 my $self = $class->SUPER::new (
1251 fg => [1, 1, 1],
1252 active_fg => [0, 0, 0],
1253 range => [0, 0, 100, 10],
1254 req_w => 40,
1255 req_h => 10,
1256 vertical => 0,
1257 @_
1258 );
1259
1260 $self
1261}
1262
1263sub size_request {
1264 my ($self) = @_;
1265
1266 my $w = $self->{req_w};
1267 my $h = $self->{req_h};
1268
1269 $self->{vertical} ? ($h, $w) : ($w, $h)
1270}
1271
1272sub button_down {
1273 my ($self, $ev, $x, $y) = @_;
1274
1275 $self->SUPER::button_down ($ev, $x, $y);
1276 $self->mouse_motion ($ev, $x, $y);
1277}
1278
1279sub mouse_motion {
1280 my ($self, $ev, $x, $y) = @_;
1281
1282 if ($GRAB == $self) {
1283 my ($value, $lo, $hi, $page) = @{$self->{range}};
1284
1285 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1286
1287 $x = $x * ($hi - $lo) / $w + $lo;
1288 $x = $lo if $x < $lo;
1289 $x = $hi - $page if $x > $hi - $page;
1290 $self->{range}[0] = $x;
1291
1292 $self->emit (changed => $x);
1293 $self->update;
1294 }
1295}
1296
1297sub _draw {
1298 my ($self) = @_;
1299
1300 $self->SUPER::_draw ();
1301
1302 my ($w, $h) = @$self{qw(w h)};
1303
1304 if ($self->{vertical}) {
1305 # draw a vertical slider like a rotated horizontal slider
1306
1307 glRotate 90, 0, 0, 1;
1308 glTranslate 0, -$self->{w}, 0;
1309
1310 ($w, $h) = ($h, $w);
1311 }
1312
1313 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1314 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1315
1316 my ($value, $lo, $hi, $page) = @{$self->{range}};
1317
1318 $page = int $page * $w / ($hi - $lo);
1319 $value = int +($value - $lo) * $w / ($hi - $lo);
1320
1321 $w -= $page;
1322 $page &= ~1;
1323 glTranslate $page * 0.5, 0, 0;
1324 $page ||= 2;
1325
1326 glColor @$fg;
1327 glBegin GL_LINES;
1328 glVertex 0, 0; glVertex 0, $h;
1329 glVertex $w - 1, 0; glVertex $w - 1, $h;
1330 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1331 glEnd;
1332
1333 my $knob_a = $value - $page * 0.5;
1334 my $knob_b = $value + $page * 0.5;
1335
1336 glBegin GL_QUADS;
1337 glColor @$fg;
1338 glVertex $knob_a, 0;
1339 glVertex $knob_a, $h;
1340 glVertex $knob_b, $h;
1341 glVertex $knob_b, 0;
1342
1343 if ($knob_a < $knob_b - 2) {
1344 glColor @$bg;
1345 glVertex $knob_a + 1, 1;
1346 glVertex $knob_a + 1, $h - 1;
1347 glVertex $knob_b - 1, $h - 1;
1348 glVertex $knob_b - 1, 1;
1349 }
1350 glEnd;
1351}
1352
1353#############################################################################
1354
1355package CFClient::UI::MapWidget;
1356
1357use strict;
1358
1359use List::Util qw(min max);
1360
1361use SDL;
1362use SDL::OpenGL;
1363
831our @ISA = CFClient::Widget::; 1364our @ISA = CFClient::UI::Base::;
832 1365
833sub new { 1366sub new {
834 my $class = shift; 1367 my $class = shift;
835 1368
836 $class->SUPER::new ( 1369 $class->SUPER::new (
… …
847sub key_up { 1380sub key_up {
848} 1381}
849 1382
850sub size_request { 1383sub size_request {
851 ( 1384 (
852 1 + int $::WIDTH / 32, 1385 1 + 32 * int $::WIDTH / 32,
853 1 + int $::HEIGHT / 32, 1386 1 + 32 * int $::HEIGHT / 32,
854 ) 1387 )
855} 1388}
856 1389
857sub update { 1390sub update {
858 my ($self) = @_; 1391 my ($self) = @_;
859 1392
860 $self->{need_update} = 1; 1393 $self->{need_update} = 1;
1394 $self->SUPER::update;
861} 1395}
862 1396
863sub _draw { 1397sub draw {
864 my ($self) = @_; 1398 my ($self) = @_;
865 1399
866 if (delete $self->{need_update}) { 1400 if (delete $self->{need_update}) {
867 glNewList $self->{list}, GL_COMPILE; 1401 glNewList $self->{list}, GL_COMPILE;
868 1402
… …
888 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1422 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
889 } 1423 }
890 1424
891 glEnable GL_TEXTURE_2D; 1425 glEnable GL_TEXTURE_2D;
892 glEnable GL_BLEND; 1426 glEnable GL_BLEND;
1427 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
893 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1428 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
894 1429
895 my $sw4 = ($sw + 3) & ~3; 1430 my $sw4 = ($sw + 3) & ~3;
896 my $darkness = "\x00" x ($sw4 * $sh); 1431 my $darkness = "\x00" x ($sw4 * $sh);
897 1432
… …
910 } 1445 }
911 1446
912 for my $num (grep $_, @$cell[1,2,3]) { 1447 for my $num (grep $_, @$cell[1,2,3]) {
913 my $tex = $::CONN->{face}[$num]{texture} || next; 1448 my $tex = $::CONN->{face}[$num]{texture} || next;
914 1449
915 my $w = $tex->{width}; 1450 my ($w, $h) = @$tex{qw(w h)};
916 my $h = $tex->{height};
917 1451
918 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h); 1452 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
919 } 1453 }
920 } 1454 }
921 } 1455 }
… …
928# 1462#
929# $lighting = $pb->get_pixels; 1463# $lighting = $pb->get_pixels;
930# $lighting =~ s/(.)../$1/gs; 1464# $lighting =~ s/(.)../$1/gs;
931# } 1465# }
932 1466
933 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
934 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1467 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
935 1468
936 $darkness = new CFClient::Texture 1469 $darkness = new CFClient::Texture
937 width => $sw4, 1470 w => $sw4,
938 height => $sh, 1471 h => $sh,
939 data => $darkness, 1472 data => $darkness,
940 internalformat => GL_ALPHA, 1473 internalformat => GL_ALPHA,
941 format => GL_ALPHA; 1474 format => GL_ALPHA;
942 1475
943 glColor 0.45, 0.45, 0.45, 1; 1476 glColor 0.45, 0.45, 0.45, 1;
… …
1003 } 1536 }
1004} 1537}
1005 1538
1006############################################################################# 1539#############################################################################
1007 1540
1008package CFClient::Widget::Animator; 1541package CFClient::UI::Animator;
1009 1542
1010use SDL::OpenGL; 1543use SDL::OpenGL;
1011 1544
1012our @ISA = CFClient::Widget::Bin::; 1545our @ISA = CFClient::UI::Bin::;
1013 1546
1014sub moveto { 1547sub moveto {
1015 my ($self, $x, $y) = @_; 1548 my ($self, $x, $y) = @_;
1016 1549
1017 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1550 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
1045 glPopMatrix; 1578 glPopMatrix;
1046} 1579}
1047 1580
1048############################################################################# 1581#############################################################################
1049 1582
1050package CFClient::Widget::Toplevel; 1583package CFClient::UI::Toplevel;
1051 1584
1052our @ISA = CFClient::Widget::Container::; 1585our @ISA = CFClient::UI::Container::;
1053 1586
1054sub size_request { 1587sub size_request {
1055 ($::WIDTH, $::HEIGHT) 1588 ($::WIDTH, $::HEIGHT)
1056} 1589}
1057 1590
1058sub size_allocate { 1591sub size_allocate {
1059 my ($self, $w, $h) = @_; 1592 my ($self, $x, $y, $w, $h) = @_;
1060 1593
1061 $self->SUPER::size_allocate ($w, $h); 1594 $self->_size_allocate ($x, $y, $w, $h);
1062 1595
1063 $_->size_allocate ($_->size_request) 1596 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1064 for @{$self->{children}}; 1597 for @{$self->{children}};
1065} 1598}
1066 1599
1067sub translate { 1600sub translate {
1068 my ($self, $x, $y) = @_; 1601 my ($self, $x, $y) = @_;
… …
1071} 1604}
1072 1605
1073sub update { 1606sub update {
1074 my ($self) = @_; 1607 my ($self) = @_;
1075 1608
1076 $self->size_allocate ($self->size_request); 1609 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1077 ::refresh (); 1610 ::refresh ();
1078} 1611}
1079 1612
1080sub add { 1613sub add {
1081 my ($self, $widget) = @_; 1614 my ($self, $widget) = @_;
1082 1615
1083 $self->SUPER::add ($widget); 1616 $self->SUPER::add ($widget);
1084 1617
1085 $widget->size_allocate ($widget->size_request); 1618 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1086} 1619}
1087 1620
1088sub draw { 1621sub draw {
1089 my ($self) = @_; 1622 my ($self) = @_;
1090 1623
1091 $self->_draw; 1624 $self->_draw;
1092} 1625}
1093 1626
1094############################################################################# 1627#############################################################################
1095 1628
1096package CFClient::Widget; 1629package CFClient::UI;
1097 1630
1098$TOPLEVEL = new CFClient::Widget::Toplevel; 1631$TOPLEVEL = new CFClient::UI::Toplevel;
1099 1632
11001 16331
1101 1634

Diff Legend

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