Wed Jul 23 20:03:28 CEST 2003

(Kim)

Fix "premature" commit of fix to deiconification problem :)


SVN revision: 7222
This commit is contained in:
Kim Woelders 2003-07-23 18:09:41 +00:00
parent a64ee3d306
commit 69cf601985
19 changed files with 119 additions and 119 deletions

View File

@ -2043,3 +2043,10 @@ Fix min/maximise bugs/inconsistencies, simplify code.
Some xinerama code cleanups.
Fix de-iconfy of windows not entirely on-screen.
-------------------------------------------------------------------------------
Wed Jul 23 20:03:28 CEST 2003
(Kim)
Fix "premature" commit of fix to deiconification problem :)

2
e.spec
View File

@ -1,7 +1,7 @@
Summary: The Enlightenment window manager.
Name: enlightenment
Version: 0.16.6
Release: 0.29
Release: 0.30
Copyright: BSD
Group: User Interface/Desktops
Source: ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment-%{version}.tar.gz

View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: enlightenment 0.16.6\n"
"POT-Creation-Date: 2003-07-20 18:47+0200\n"
"POT-Creation-Date: 2003-07-22 23:29+0200\n"
"PO-Revision-Date: 2000-03-29 21:12+0200\n"
"Last-Translator: Matthias Warkus <mawa@iname.com>\n"
"Language-Team: Enlightenment l10n <e-develop@enlightenment.org>\n"
@ -1404,22 +1404,22 @@ msgid "ImageClass Error!"
msgstr "ImageClass-Fehler!"
# src/iconify.c:2420
#: src/iconify.c:2382
#: src/iconify.c:2375
msgid "Iconbox Options"
msgstr "Iconbox-Optionen"
# src/iconify.c:2426
#: src/iconify.c:2387
#: src/iconify.c:2380
msgid "This Iconbox Settings..."
msgstr "Einstellungen dieser Iconbox..."
# src/iconify.c:2429
#: src/iconify.c:2390
#: src/iconify.c:2383
msgid "Close Iconbox"
msgstr "Iconbox schließen"
# src/iconify.c:2432
#: src/iconify.c:2392
#: src/iconify.c:2385
msgid "Create New Iconbox"
msgstr "Neue Iconbox erzeugen"

View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: enlightenment 0.16.6\n"
"POT-Creation-Date: 2003-07-20 18:47+0200\n"
"POT-Creation-Date: 2003-07-22 23:29+0200\n"
"PO-Revision-Date: 2000-03-02 16:23+0100\n"
"Last-Translator: Birger Langkjer <birger.langkjer@image.dk>\n"
"Language-Team: Dansk/Danish <sslug-locale@sslug.dk>\n"
@ -1037,19 +1037,19 @@ msgstr ""
msgid "ImageClass Error!"
msgstr ""
#: src/iconify.c:2382
#: src/iconify.c:2375
msgid "Iconbox Options"
msgstr "Ikonboks opsætning"
#: src/iconify.c:2387
#: src/iconify.c:2380
msgid "This Iconbox Settings..."
msgstr "Denne ikonboks' indstiilinger..."
#: src/iconify.c:2390
#: src/iconify.c:2383
msgid "Close Iconbox"
msgstr "Luk ikonboks"
#: src/iconify.c:2392
#: src/iconify.c:2385
msgid "Create New Iconbox"
msgstr "Opret ny ikonboks"

View File

@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: enlightenment 0.16.6\n"
"POT-Creation-Date: 2003-07-20 18:47+0200\n"
"POT-Creation-Date: 2003-07-22 23:29+0200\n"
"PO-Revision-Date: 2000-01-04 23:15+0100\n"
"Last-Translator: Peter Kjellerstedt <pkj@axis.com>\n"
"Language-Team: American English <en@li.org>\n"
@ -952,19 +952,19 @@ msgstr ""
msgid "ImageClass Error!"
msgstr ""
#: src/iconify.c:2382
#: src/iconify.c:2375
msgid "Iconbox Options"
msgstr ""
#: src/iconify.c:2387
#: src/iconify.c:2380
msgid "This Iconbox Settings..."
msgstr ""
#: src/iconify.c:2390
#: src/iconify.c:2383
msgid "Close Iconbox"
msgstr ""
#: src/iconify.c:2392
#: src/iconify.c:2385
msgid "Create New Iconbox"
msgstr ""

View File

@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: enlightenment 0.16.6\n"
"POT-Creation-Date: 2003-07-20 18:47+0200\n"
"POT-Creation-Date: 2003-07-22 23:29+0200\n"
"PO-Revision-Date: 2000-04-09 18:46+0200\n"
"Last-Translator: Antonio Ognio Cesti <ognio@altavista.net>\n"
"Language-Team: Spanish <es@li.org>\n"
@ -1261,19 +1261,19 @@ msgstr ""
msgid "ImageClass Error!"
msgstr ""
#: src/iconify.c:2382
#: src/iconify.c:2375
msgid "Iconbox Options"
msgstr "Opciones del Portaíconos"
#: src/iconify.c:2387
#: src/iconify.c:2380
msgid "This Iconbox Settings..."
msgstr "Configurar este Portaíconos..."
#: src/iconify.c:2390
#: src/iconify.c:2383
msgid "Close Iconbox"
msgstr "Cerrar Portaíconos"
#: src/iconify.c:2392
#: src/iconify.c:2385
msgid "Create New Iconbox"
msgstr "Crear un nuevo Portaíconos"

View File

@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: enlightenment 0.16.6\n"
"POT-Creation-Date: 2003-07-20 18:47+0200\n"
"POT-Creation-Date: 2003-07-22 23:29+0200\n"
"PO-Revision-Date: 2000-01-05 00:25+0100\n"
"Last-Translator: Sylvain GIL <tootella@tootella.com>\n"
"Language-Team: French <fr@li.org>\n"
@ -1198,19 +1198,19 @@ msgstr ""
msgid "ImageClass Error!"
msgstr ""
#: src/iconify.c:2382
#: src/iconify.c:2375
msgid "Iconbox Options"
msgstr "Options de la boîte à icônes"
#: src/iconify.c:2387
#: src/iconify.c:2380
msgid "This Iconbox Settings..."
msgstr "Paramètres de cette boîte à icônes..."
#: src/iconify.c:2390
#: src/iconify.c:2383
msgid "Close Iconbox"
msgstr "Fermer la boîte à icônes"
#: src/iconify.c:2392
#: src/iconify.c:2385
msgid "Create New Iconbox"
msgstr "Créer une nouvelle boîte à icônes"

View File

@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: enlightenment 0.16.6\n"
"POT-Creation-Date: 2003-07-20 18:47+0200\n"
"POT-Creation-Date: 2003-07-22 23:29+0200\n"
"PO-Revision-Date: 2000-01-04 23:15+0100\n"
"Last-Translator: Gergely Egerváry <mauzi@poli.hu>\n"
"Language-Team: Hungarian <hu@li.org>\n"
@ -931,19 +931,19 @@ msgstr ""
msgid "ImageClass Error!"
msgstr ""
#: src/iconify.c:2382
#: src/iconify.c:2375
msgid "Iconbox Options"
msgstr "Iconbox beállításai"
#: src/iconify.c:2387
#: src/iconify.c:2380
msgid "This Iconbox Settings..."
msgstr "Iconbox beállításai..."
#: src/iconify.c:2390
#: src/iconify.c:2383
msgid "Close Iconbox"
msgstr "Iconbox bezárása"
#: src/iconify.c:2392
#: src/iconify.c:2385
msgid "Create New Iconbox"
msgstr "Új iconbox létrehozása"

View File

@ -10,7 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: enlightenment 0.16.6\n"
"POT-Creation-Date: 2003-07-20 18:47+0200\n"
"POT-Creation-Date: 2003-07-22 23:29+0200\n"
"PO-Revision-Date: 2001-01-07 14:00+0900\n"
"Last-Translator: Enlightenment-jp Mailing List <enlightenment-jp@UaUa.ORG>\n"
"Language-Team: Japanese <ja@li.org>\n"
@ -1242,19 +1242,19 @@ msgstr ""
msgid "ImageClass Error!"
msgstr "imageclass エラー"
#: src/iconify.c:2382
#: src/iconify.c:2375
msgid "Iconbox Options"
msgstr "アイコンボックス オプション"
#: src/iconify.c:2387
#: src/iconify.c:2380
msgid "This Iconbox Settings..."
msgstr "このアイコンボックスの設定..."
#: src/iconify.c:2390
#: src/iconify.c:2383
msgid "Close Iconbox"
msgstr "アイコンボックスを閉じる"
#: src/iconify.c:2392
#: src/iconify.c:2385
msgid "Create New Iconbox"
msgstr "アイコンボックスの新規作成"

View File

@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: enlightenment 0.16.6\n"
"POT-Creation-Date: 2003-07-20 18:47+0200\n"
"POT-Creation-Date: 2003-07-22 23:29+0200\n"
"PO-Revision-Date: 2000-04-10 16:10:30+0900\n"
"Last-Translator: Sung-Hyun Nam <namsh@kldp.org>\n"
"Language-Team: Korean <ko@li.org>\n"
@ -1217,19 +1217,19 @@ msgstr ""
msgid "ImageClass Error!"
msgstr "ImageClass 에러!"
#: src/iconify.c:2382
#: src/iconify.c:2375
msgid "Iconbox Options"
msgstr "아이콘상자 옵션"
#: src/iconify.c:2387
#: src/iconify.c:2380
msgid "This Iconbox Settings..."
msgstr "이 아이콘상자 설정..."
#: src/iconify.c:2390
#: src/iconify.c:2383
msgid "Close Iconbox"
msgstr "아이콘상자 닫기"
#: src/iconify.c:2392
#: src/iconify.c:2385
msgid "Create New Iconbox"
msgstr "새 아이콘상자 생성"

View File

@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: enlightenment 0.16.6\n"
"POT-Creation-Date: 2003-07-20 18:47+0200\n"
"POT-Creation-Date: 2003-07-22 23:29+0200\n"
"PO-Revision-Date: 2000-01-04 23:15+0100\n"
"Last-Translator: Dènis Riedijk <ried@si.tn.tudelft.nl>\n"
"Language-Team: Dutch <nl@li.org>\n"
@ -1067,19 +1067,19 @@ msgstr ""
msgid "ImageClass Error!"
msgstr ""
#: src/iconify.c:2382
#: src/iconify.c:2375
msgid "Iconbox Options"
msgstr "Icoonbox Opties"
#: src/iconify.c:2387
#: src/iconify.c:2380
msgid "This Iconbox Settings..."
msgstr "Instellingen van deze Icoonbox"
#: src/iconify.c:2390
#: src/iconify.c:2383
msgid "Close Iconbox"
msgstr "Sluit Icoonbox"
#: src/iconify.c:2392
#: src/iconify.c:2385
msgid "Create New Iconbox"
msgstr "Maak een nieuwe Icoonbox"

View File

@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: enlightenment 0.16.6\n"
"POT-Creation-Date: 2003-07-20 18:47+0200\n"
"POT-Creation-Date: 2003-07-22 23:29+0200\n"
"PO-Revision-Date: 2000-03-07 12:08+0100\n"
"Last-Translator: Terje Røsten <terjeros@phys.ntnu.no>\n"
"Language-Team: Norwegian <no@li.org>\n"
@ -1235,19 +1235,19 @@ msgstr ""
msgid "ImageClass Error!"
msgstr "Feil ved bildeklasse!"
#: src/iconify.c:2382
#: src/iconify.c:2375
msgid "Iconbox Options"
msgstr "Meny for ikonboksen"
#: src/iconify.c:2387
#: src/iconify.c:2380
msgid "This Iconbox Settings..."
msgstr "Valg for denne ikonboksen"
#: src/iconify.c:2390
#: src/iconify.c:2383
msgid "Close Iconbox"
msgstr "Fjern denne ikonboksen"
#: src/iconify.c:2392
#: src/iconify.c:2385
msgid "Create New Iconbox"
msgstr "Lag en ny ikonboks"

View File

@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: enlightenment 0.16.6\n"
"POT-Creation-Date: 2003-07-20 18:47+0200\n"
"POT-Creation-Date: 2003-07-22 23:29+0200\n"
"PO-Revision-Date: 2000-01-04 23:15+0100\n"
"Last-Translator: Adam Kisiel <kisiel@if.pw.edu.pl>\n"
"Language-Team: Polshi <pl@li.org>\n"
@ -1237,19 +1237,19 @@ msgstr ""
msgid "ImageClass Error!"
msgstr "B³±d sekcji ImageClass"
#: src/iconify.c:2382
#: src/iconify.c:2375
msgid "Iconbox Options"
msgstr "Opcje Pude³ka na Ikony"
#: src/iconify.c:2387
#: src/iconify.c:2380
msgid "This Iconbox Settings..."
msgstr "Ustawienia tego Pude³ka na Ikony..."
#: src/iconify.c:2390
#: src/iconify.c:2383
msgid "Close Iconbox"
msgstr "Zamknij Pude³ko na Ikony"
#: src/iconify.c:2392
#: src/iconify.c:2385
msgid "Create New Iconbox"
msgstr "Stwórz nowe Pude³ko na Ikony"

View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: enlightenment 0.16.6\n"
"POT-Creation-Date: 2003-07-20 18:47+0200\n"
"POT-Creation-Date: 2003-07-22 23:29+0200\n"
"PO-Revision-Date: 2000-03-07 16:35+0100\n"
"Last-Translator: Daniel Vieira Pereira <gunsmithcat@ip.pt>\n"
"Language-Team: Portuguese <pt@li.org>\n"
@ -1248,19 +1248,19 @@ msgstr ""
msgid "ImageClass Error!"
msgstr ""
#: src/iconify.c:2382
#: src/iconify.c:2375
msgid "Iconbox Options"
msgstr "Opções da Caixa de Icones"
#: src/iconify.c:2387
#: src/iconify.c:2380
msgid "This Iconbox Settings..."
msgstr "Configuração desta Caixa de Icones ..."
#: src/iconify.c:2390
#: src/iconify.c:2383
msgid "Close Iconbox"
msgstr "Fechar Caixa de Icones"
#: src/iconify.c:2392
#: src/iconify.c:2385
msgid "Create New Iconbox"
msgstr "Criar Nova Caixa de Icones"

View File

@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: enlightenment 0.16.6\n"
"POT-Creation-Date: 2003-07-20 18:47+0200\n"
"POT-Creation-Date: 2003-07-22 23:29+0200\n"
"PO-Revision-Date: 2000-02-24 16:22+0100\n"
"Last-Translator: Roberto S. Teixeira <robteix@zaz.com.br>\n"
"Language-Team: Portuguese <pt@li.org>\n"
@ -1261,19 +1261,19 @@ msgstr ""
msgid "ImageClass Error!"
msgstr ""
#: src/iconify.c:2382
#: src/iconify.c:2375
msgid "Iconbox Options"
msgstr "Opções do Porta-ícone"
#: src/iconify.c:2387
#: src/iconify.c:2380
msgid "This Iconbox Settings..."
msgstr "Configurações deste Porta-Ícone..."
#: src/iconify.c:2390
#: src/iconify.c:2383
msgid "Close Iconbox"
msgstr "Fechar Porta-ícone"
#: src/iconify.c:2392
#: src/iconify.c:2385
msgid "Create New Iconbox"
msgstr "Criar Novo Porta-ícone"

View File

@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: enlightenment 0.16.6\n"
"POT-Creation-Date: 2003-07-20 18:47+0200\n"
"POT-Creation-Date: 2003-07-22 23:29+0200\n"
"PO-Revision-Date: 2000-01-14 20:43-0300\n"
"Last-Translator: Vladimir STEPANOV <stepanov@bird.iki.rssi.ru>\n"
"Language-Team: Russian <ru@li.org>\n"
@ -1258,19 +1258,19 @@ msgstr ""
msgid "ImageClass Error!"
msgstr ""
#: src/iconify.c:2382
#: src/iconify.c:2375
msgid "Iconbox Options"
msgstr "Iconbox"
#: src/iconify.c:2387
#: src/iconify.c:2380
msgid "This Iconbox Settings..."
msgstr "îÁÓÔÒÏÊËÉ ÜÔÏÇÏ Iconbox-Á..."
#: src/iconify.c:2390
#: src/iconify.c:2383
msgid "Close Iconbox"
msgstr "úÁËÒÙÔØ Iconbox"
#: src/iconify.c:2392
#: src/iconify.c:2385
msgid "Create New Iconbox"
msgstr "óÄÅÌÁÔØ ÎÏ×ÙÊ Iconbox"

View File

@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: enlightenment 0.16.6\n"
"POT-Creation-Date: 2003-07-20 18:47+0200\n"
"POT-Creation-Date: 2003-07-22 23:29+0200\n"
"PO-Revision-Date: 2000-04-10 17:30+0200\n"
"Last-Translator: Bernt Holmberg <bernt@grub01.physto.se>\n"
"Language-Team: Swedish <sv@li.org>\n"
@ -1236,19 +1236,19 @@ msgstr ""
msgid "ImageClass Error!"
msgstr "Bildklass fel!"
#: src/iconify.c:2382
#: src/iconify.c:2375
msgid "Iconbox Options"
msgstr "Ikonlådeval"
#: src/iconify.c:2387
#: src/iconify.c:2380
msgid "This Iconbox Settings..."
msgstr "Denna ikonlådas inställningar..."
#: src/iconify.c:2390
#: src/iconify.c:2383
msgid "Close Iconbox"
msgstr "Stäng ikonlåda"
#: src/iconify.c:2392
#: src/iconify.c:2385
msgid "Create New Iconbox"
msgstr "Skapa ny ikonlåda"

View File

@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: enlightenment 0.16.6\n"
"POT-Creation-Date: 2003-07-20 18:47+0200\n"
"POT-Creation-Date: 2003-07-22 23:29+0200\n"
"PO-Revision-Date: 2000-07-30 22:39+0200\n"
"Last-Translator: Fatih Demir <kabalak@gmx.net>\n"
"Language-Team: Turkish <tr@li.org>\n"
@ -1228,19 +1228,19 @@ msgstr ""
msgid "ImageClass Error!"
msgstr "ImageClass hatasý!"
#: src/iconify.c:2382
#: src/iconify.c:2375
msgid "Iconbox Options"
msgstr "Simge kutusu ayarlarý"
#: src/iconify.c:2387
#: src/iconify.c:2380
msgid "This Iconbox Settings..."
msgstr "Bu simge kutusunun ayarlarý ..."
#: src/iconify.c:2390
#: src/iconify.c:2383
msgid "Close Iconbox"
msgstr "Simge kutusunu kapat"
#: src/iconify.c:2392
#: src/iconify.c:2385
msgid "Create New Iconbox"
msgstr "Yeni simge kutusunu yarat"

View File

@ -274,7 +274,7 @@ DeIconifyEwin(EWin * ewin)
{
static int call_depth = 0;
Iconbox *ib;
int x1, y1, x2, y2, dx, dy;
int x, y, dx, dy;
EDBUG(6, "DeIconifyEwin");
call_depth++;
@ -288,31 +288,25 @@ DeIconifyEwin(EWin * ewin)
ib = SelectIconboxForEwin(ewin);
RemoveMiniIcon(ewin);
ScreenGetGeometry(ewin->x, ewin->y, &x1, &y1, &x2, &y2);
/* Allow 75% of client (container) offscreen */
dx = 3 * ewin->w / 4;
dy = 3 * ewin->h / 4;
x2 = x1 + x2 - (ewin->w - dx);
y2 = y1 + y2 - (ewin->h - dy);
x1 -= dx;
y1 -= dy;
dx = dy = 0;
if (ewin->x < x1)
dx = x1 - ewin->x;
if (ewin->x > x2)
dx = x2 - ewin->x;
if (ewin->y < y1)
dy = y1 - ewin->y;
if (ewin->y > y2)
dy = y2 - ewin->y;
dx = ewin->w / 2;
dy = ewin->h / 2;
x = (ewin->x + dx) % root.w;
if (x < 0)
x += root.w;
x -= dx;
y = (ewin->y + dy) % root.h;
if (y < 0)
y += root.h;
y -= dy;
dx = x - ewin->x;
dy = y - ewin->y;
if (!ewin->sticky)
{
MoveEwinToDesktopAt(ewin, desks.current,
ewin->x + dx, ewin->y + dy);
}
MoveEwinToDesktopAt(ewin, desks.current, ewin->x + dx, ewin->y + dy);
else
ConformEwinToDesktop(ewin);
MoveEwin(ewin, ewin->x + dx, ewin->y + dy);
AUDIO_PLAY("SOUND_DEICONIFY");
if (ib)
{
@ -326,7 +320,7 @@ DeIconifyEwin(EWin * ewin)
mode.destroy = 1;
if (ewin->has_transients)
{
EWin **lst;
EWin **lst, *e;
int i, num;
lst = ListTransientsFor(ewin->client.win, &num);
@ -334,20 +328,19 @@ DeIconifyEwin(EWin * ewin)
{
for (i = 0; i < num; i++)
{
if (lst[i]->iconified == 4)
{
if (!lst[i]->sticky)
{
MoveEwinToDesktopAt(lst[i], desks.current,
lst[i]->x + dx,
lst[i]->y + dy);
}
else
ConformEwinToDesktop(lst[i]);
RaiseEwin(lst[i]);
ShowEwin(lst[i]);
lst[i]->iconified = 0;
}
e = lst[i];
if (e->iconified != 4)
continue;
if (!e->sticky)
MoveEwinToDesktopAt(e, desks.current,
e->x + dx, e->y + dy);
else
MoveEwin(e, e->x + dx, e->y + dy);
RaiseEwin(e);
ShowEwin(e);
e->iconified = 0;
}
HintsSetClientList();
Efree(lst);