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

Diff Legend

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