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.46 by root, Sun Apr 9 22:21:02 2006 UTC vs.
Revision 1.80 by root, Wed Apr 12 00:36:13 2006 UTC

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

Diff Legend

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