author | erik <erik> | 2007-02-08 01:45:16 (UTC) |
---|---|---|
committer | erik <erik> | 2007-02-08 01:45:16 (UTC) |
commit | 2e497f7cae45184184e2416114887095735958f5 (patch) (unidiff) | |
tree | a6b399d9bce5854dc7ad6c985b48965cf20680b0 | |
parent | 853b61f97e718359bef95147ab3c7beb0705acda (diff) | |
download | opie-2e497f7cae45184184e2416114887095735958f5.zip opie-2e497f7cae45184184e2416114887095735958f5.tar.gz opie-2e497f7cae45184184e2416114887095735958f5.tar.bz2 |
Each file in this commit has a problem where it is possible to dereference
a pointer without that pointer being valid. This commit fixes each instance
of that.
6 files changed, 62 insertions, 29 deletions
diff --git a/core/multimedia/opieplayer/modplug/sndfile.cpp b/core/multimedia/opieplayer/modplug/sndfile.cpp index 1d0d610..799555c 100644 --- a/core/multimedia/opieplayer/modplug/sndfile.cpp +++ b/core/multimedia/opieplayer/modplug/sndfile.cpp | |||
@@ -1646,193 +1646,196 @@ DWORD CSoundFile::TransposeToFrequency(int transp, int ftune) | |||
1646 | fscale | 1646 | fscale |
1647 | fstp st(1) | 1647 | fstp st(1) |
1648 | fmul st(1), st(0) | 1648 | fmul st(1), st(0) |
1649 | faddp st(1), st(0) | 1649 | faddp st(1), st(0) |
1650 | fistp freq | 1650 | fistp freq |
1651 | } | 1651 | } |
1652 | UINT derr = freq % 11025; | 1652 | UINT derr = freq % 11025; |
1653 | if (derr <= 8) freq -= derr; | 1653 | if (derr <= 8) freq -= derr; |
1654 | if (derr >= 11015) freq += 11025-derr; | 1654 | if (derr >= 11015) freq += 11025-derr; |
1655 | derr = freq % 1000; | 1655 | derr = freq % 1000; |
1656 | if (derr <= 5) freq -= derr; | 1656 | if (derr <= 5) freq -= derr; |
1657 | if (derr >= 995) freq += 1000-derr; | 1657 | if (derr >= 995) freq += 1000-derr; |
1658 | return freq; | 1658 | return freq; |
1659 | #endif | 1659 | #endif |
1660 | } | 1660 | } |
1661 | 1661 | ||
1662 | 1662 | ||
1663 | // returns 12*128*log2(freq/8363) | 1663 | // returns 12*128*log2(freq/8363) |
1664 | int CSoundFile::FrequencyToTranspose(DWORD freq) | 1664 | int CSoundFile::FrequencyToTranspose(DWORD freq) |
1665 | //---------------------------------------------- | 1665 | //---------------------------------------------- |
1666 | { | 1666 | { |
1667 | //---GCCFIX: Removed assembly. | 1667 | //---GCCFIX: Removed assembly. |
1668 | return int(1536*(log(freq/8363)/log(2))); | 1668 | return int(1536*(log(freq/8363)/log(2))); |
1669 | 1669 | ||
1670 | #ifdef WIN32 | 1670 | #ifdef WIN32 |
1671 | const float _f1_8363 = 1.0f / 8363.0f; | 1671 | const float _f1_8363 = 1.0f / 8363.0f; |
1672 | const float _factor = 128 * 12; | 1672 | const float _factor = 128 * 12; |
1673 | LONG result; | 1673 | LONG result; |
1674 | 1674 | ||
1675 | if (!freq) return 0; | 1675 | if (!freq) return 0; |
1676 | _asm { | 1676 | _asm { |
1677 | fld _factor | 1677 | fld _factor |
1678 | fild freq | 1678 | fild freq |
1679 | fld _f1_8363 | 1679 | fld _f1_8363 |
1680 | fmulp st(1), st(0) | 1680 | fmulp st(1), st(0) |
1681 | fyl2x | 1681 | fyl2x |
1682 | fistp result | 1682 | fistp result |
1683 | } | 1683 | } |
1684 | return result; | 1684 | return result; |
1685 | #endif | 1685 | #endif |
1686 | } | 1686 | } |
1687 | 1687 | ||
1688 | 1688 | ||
1689 | void CSoundFile::FrequencyToTranspose(MODINSTRUMENT *psmp) | 1689 | void CSoundFile::FrequencyToTranspose(MODINSTRUMENT *psmp) |
1690 | //-------------------------------------------------------- | 1690 | //-------------------------------------------------------- |
1691 | { | 1691 | { |
1692 | int f2t = FrequencyToTranspose(psmp->nC4Speed); | 1692 | int f2t = FrequencyToTranspose(psmp->nC4Speed); |
1693 | int transp = f2t >> 7; | 1693 | int transp = f2t >> 7; |
1694 | int ftune = f2t & 0x7F; | 1694 | int ftune = f2t & 0x7F; |
1695 | if (ftune > 80) | 1695 | if (ftune > 80) |
1696 | { | 1696 | { |
1697 | transp++; | 1697 | transp++; |
1698 | ftune -= 128; | 1698 | ftune -= 128; |
1699 | } | 1699 | } |
1700 | if (transp > 127) transp = 127; | 1700 | if (transp > 127) transp = 127; |
1701 | if (transp < -127) transp = -127; | 1701 | if (transp < -127) transp = -127; |
1702 | psmp->RelativeTone = transp; | 1702 | psmp->RelativeTone = transp; |
1703 | psmp->nFineTune = ftune; | 1703 | psmp->nFineTune = ftune; |
1704 | } | 1704 | } |
1705 | 1705 | ||
1706 | 1706 | ||
1707 | void CSoundFile::CheckCPUUsage(UINT nCPU) | 1707 | void CSoundFile::CheckCPUUsage(UINT nCPU) |
1708 | //--------------------------------------- | 1708 | //--------------------------------------- |
1709 | { | 1709 | { |
1710 | if (nCPU > 100) nCPU = 100; | 1710 | if (nCPU > 100) nCPU = 100; |
1711 | gnCPUUsage = nCPU; | 1711 | gnCPUUsage = nCPU; |
1712 | if (nCPU < 90) | 1712 | if (nCPU < 90) |
1713 | { | 1713 | { |
1714 | m_dwSongFlags &= ~SONG_CPUVERYHIGH; | 1714 | m_dwSongFlags &= ~SONG_CPUVERYHIGH; |
1715 | } else | 1715 | } else |
1716 | if ((m_dwSongFlags & SONG_CPUVERYHIGH) && (nCPU >= 94)) | 1716 | if ((m_dwSongFlags & SONG_CPUVERYHIGH) && (nCPU >= 94)) |
1717 | { | 1717 | { |
1718 | UINT i=MAX_CHANNELS; | 1718 | UINT i=MAX_CHANNELS; |
1719 | while (i >= 8) | 1719 | while (i >= 8) |
1720 | { | 1720 | { |
1721 | i--; | 1721 | i--; |
1722 | if (Chn[i].nLength) | 1722 | if (Chn[i].nLength) |
1723 | { | 1723 | { |
1724 | Chn[i].nLength = Chn[i].nPos = 0; | 1724 | Chn[i].nLength = Chn[i].nPos = 0; |
1725 | nCPU -= 2; | 1725 | nCPU -= 2; |
1726 | if (nCPU < 94) break; | 1726 | if (nCPU < 94) break; |
1727 | } | 1727 | } |
1728 | } | 1728 | } |
1729 | } else | 1729 | } else |
1730 | if (nCPU > 90) | 1730 | if (nCPU > 90) |
1731 | { | 1731 | { |
1732 | m_dwSongFlags |= SONG_CPUVERYHIGH; | 1732 | m_dwSongFlags |= SONG_CPUVERYHIGH; |
1733 | } | 1733 | } |
1734 | } | 1734 | } |
1735 | 1735 | ||
1736 | 1736 | ||
1737 | BOOL CSoundFile::SetPatternName(UINT nPat, LPCSTR lpszName) | 1737 | BOOL CSoundFile::SetPatternName(UINT nPat, LPCSTR lpszName) |
1738 | //--------------------------------------------------------- | 1738 | //--------------------------------------------------------- |
1739 | { | 1739 | { |
1740 | char szName[MAX_PATTERNNAME] = ""; // changed from CHAR | 1740 | char szName[MAX_PATTERNNAME] = ""; // changed from CHAR |
1741 | if (nPat >= MAX_PATTERNS) return FALSE; | 1741 | if (nPat >= MAX_PATTERNS) return FALSE; |
1742 | if (lpszName) lstrcpyn(szName, lpszName, MAX_PATTERNNAME); | 1742 | if (lpszName) |
1743 | lstrcpyn(szName, lpszName, MAX_PATTERNNAME); | ||
1744 | else | ||
1745 | return FALSE; | ||
1743 | szName[MAX_PATTERNNAME-1] = 0; | 1746 | szName[MAX_PATTERNNAME-1] = 0; |
1744 | if (!m_lpszPatternNames) m_nPatternNames = 0; | 1747 | if (!m_lpszPatternNames) m_nPatternNames = 0; |
1745 | if (nPat >= m_nPatternNames) | 1748 | if (nPat >= m_nPatternNames) |
1746 | { | 1749 | { |
1747 | if (!lpszName[0]) return TRUE; | 1750 | if (!lpszName[0]) return TRUE; |
1748 | UINT len = (nPat+1)*MAX_PATTERNNAME; | 1751 | UINT len = (nPat+1)*MAX_PATTERNNAME; |
1749 | char *p = new char[len]; // changed from CHAR | 1752 | char *p = new char[len]; // changed from CHAR |
1750 | if (!p) return FALSE; | 1753 | if (!p) return FALSE; |
1751 | memset(p, 0, len); | 1754 | memset(p, 0, len); |
1752 | if (m_lpszPatternNames) | 1755 | if (m_lpszPatternNames) |
1753 | { | 1756 | { |
1754 | memcpy(p, m_lpszPatternNames, m_nPatternNames * MAX_PATTERNNAME); | 1757 | memcpy(p, m_lpszPatternNames, m_nPatternNames * MAX_PATTERNNAME); |
1755 | delete m_lpszPatternNames; | 1758 | delete m_lpszPatternNames; |
1756 | m_lpszPatternNames = NULL; | 1759 | m_lpszPatternNames = NULL; |
1757 | } | 1760 | } |
1758 | m_lpszPatternNames = p; | 1761 | m_lpszPatternNames = p; |
1759 | m_nPatternNames = nPat + 1; | 1762 | m_nPatternNames = nPat + 1; |
1760 | } | 1763 | } |
1761 | memcpy(m_lpszPatternNames + nPat * MAX_PATTERNNAME, szName, MAX_PATTERNNAME); | 1764 | memcpy(m_lpszPatternNames + nPat * MAX_PATTERNNAME, szName, MAX_PATTERNNAME); |
1762 | return TRUE; | 1765 | return TRUE; |
1763 | } | 1766 | } |
1764 | 1767 | ||
1765 | 1768 | ||
1766 | BOOL CSoundFile::GetPatternName(UINT nPat, LPSTR lpszName, UINT cbSize) const | 1769 | BOOL CSoundFile::GetPatternName(UINT nPat, LPSTR lpszName, UINT cbSize) const |
1767 | //--------------------------------------------------------------------------- | 1770 | //--------------------------------------------------------------------------- |
1768 | { | 1771 | { |
1769 | if ((!lpszName) || (!cbSize)) return FALSE; | 1772 | if ((!lpszName) || (!cbSize)) return FALSE; |
1770 | lpszName[0] = 0; | 1773 | lpszName[0] = 0; |
1771 | if (cbSize > MAX_PATTERNNAME) cbSize = MAX_PATTERNNAME; | 1774 | if (cbSize > MAX_PATTERNNAME) cbSize = MAX_PATTERNNAME; |
1772 | if ((m_lpszPatternNames) && (nPat < m_nPatternNames)) | 1775 | if ((m_lpszPatternNames) && (nPat < m_nPatternNames)) |
1773 | { | 1776 | { |
1774 | memcpy(lpszName, m_lpszPatternNames + nPat * MAX_PATTERNNAME, cbSize); | 1777 | memcpy(lpszName, m_lpszPatternNames + nPat * MAX_PATTERNNAME, cbSize); |
1775 | lpszName[cbSize-1] = 0; | 1778 | lpszName[cbSize-1] = 0; |
1776 | return TRUE; | 1779 | return TRUE; |
1777 | } | 1780 | } |
1778 | return FALSE; | 1781 | return FALSE; |
1779 | } | 1782 | } |
1780 | 1783 | ||
1781 | 1784 | ||
1782 | #ifndef FASTSOUNDLIB | 1785 | #ifndef FASTSOUNDLIB |
1783 | 1786 | ||
1784 | UINT CSoundFile::DetectUnusedSamples(BOOL *pbIns) | 1787 | UINT CSoundFile::DetectUnusedSamples(BOOL *pbIns) |
1785 | //----------------------------------------------- | 1788 | //----------------------------------------------- |
1786 | { | 1789 | { |
1787 | UINT nExt = 0; | 1790 | UINT nExt = 0; |
1788 | 1791 | ||
1789 | if (!pbIns) return 0; | 1792 | if (!pbIns) return 0; |
1790 | if (m_nInstruments) | 1793 | if (m_nInstruments) |
1791 | { | 1794 | { |
1792 | memset(pbIns, 0, MAX_SAMPLES * sizeof(BOOL)); | 1795 | memset(pbIns, 0, MAX_SAMPLES * sizeof(BOOL)); |
1793 | for (UINT ipat=0; ipat<MAX_PATTERNS; ipat++) | 1796 | for (UINT ipat=0; ipat<MAX_PATTERNS; ipat++) |
1794 | { | 1797 | { |
1795 | MODCOMMAND *p = Patterns[ipat]; | 1798 | MODCOMMAND *p = Patterns[ipat]; |
1796 | if (p) | 1799 | if (p) |
1797 | { | 1800 | { |
1798 | UINT jmax = PatternSize[ipat] * m_nChannels; | 1801 | UINT jmax = PatternSize[ipat] * m_nChannels; |
1799 | for (UINT j=0; j<jmax; j++, p++) | 1802 | for (UINT j=0; j<jmax; j++, p++) |
1800 | { | 1803 | { |
1801 | if ((p->note) && (p->note <= 120)) | 1804 | if ((p->note) && (p->note <= 120)) |
1802 | { | 1805 | { |
1803 | if ((p->instr) && (p->instr < MAX_INSTRUMENTS)) | 1806 | if ((p->instr) && (p->instr < MAX_INSTRUMENTS)) |
1804 | { | 1807 | { |
1805 | INSTRUMENTHEADER *penv = Headers[p->instr]; | 1808 | INSTRUMENTHEADER *penv = Headers[p->instr]; |
1806 | if (penv) | 1809 | if (penv) |
1807 | { | 1810 | { |
1808 | UINT n = penv->Keyboard[p->note-1]; | 1811 | UINT n = penv->Keyboard[p->note-1]; |
1809 | if (n < MAX_SAMPLES) pbIns[n] = TRUE; | 1812 | if (n < MAX_SAMPLES) pbIns[n] = TRUE; |
1810 | } | 1813 | } |
1811 | } else | 1814 | } else |
1812 | { | 1815 | { |
1813 | for (UINT k=1; k<=m_nInstruments; k++) | 1816 | for (UINT k=1; k<=m_nInstruments; k++) |
1814 | { | 1817 | { |
1815 | INSTRUMENTHEADER *penv = Headers[k]; | 1818 | INSTRUMENTHEADER *penv = Headers[k]; |
1816 | if (penv) | 1819 | if (penv) |
1817 | { | 1820 | { |
1818 | UINT n = penv->Keyboard[p->note-1]; | 1821 | UINT n = penv->Keyboard[p->note-1]; |
1819 | if (n < MAX_SAMPLES) pbIns[n] = TRUE; | 1822 | if (n < MAX_SAMPLES) pbIns[n] = TRUE; |
1820 | } | 1823 | } |
1821 | } | 1824 | } |
1822 | } | 1825 | } |
1823 | } | 1826 | } |
1824 | } | 1827 | } |
1825 | } | 1828 | } |
1826 | } | 1829 | } |
1827 | for (UINT ichk=1; ichk<=m_nSamples; ichk++) | 1830 | for (UINT ichk=1; ichk<=m_nSamples; ichk++) |
1828 | { | 1831 | { |
1829 | if ((!pbIns[ichk]) && (Ins[ichk].pSample)) nExt++; | 1832 | if ((!pbIns[ichk]) && (Ins[ichk].pSample)) nExt++; |
1830 | } | 1833 | } |
1831 | } | 1834 | } |
1832 | return nExt; | 1835 | return nExt; |
1833 | } | 1836 | } |
1834 | 1837 | ||
1835 | 1838 | ||
1836 | BOOL CSoundFile::RemoveSelectedSamples(BOOL *pbIns) | 1839 | BOOL CSoundFile::RemoveSelectedSamples(BOOL *pbIns) |
1837 | //------------------------------------------------- | 1840 | //------------------------------------------------- |
1838 | { | 1841 | { |
diff --git a/core/multimedia/opieplayer/vorbis/tremor/block.c b/core/multimedia/opieplayer/vorbis/tremor/block.c index 8949253..7b5531b 100644 --- a/core/multimedia/opieplayer/vorbis/tremor/block.c +++ b/core/multimedia/opieplayer/vorbis/tremor/block.c | |||
@@ -133,194 +133,196 @@ void _vorbis_block_ripcord(vorbis_block *vb){ | |||
133 | /* pull the ripcord */ | 133 | /* pull the ripcord */ |
134 | vb->localtop=0; | 134 | vb->localtop=0; |
135 | vb->reap=NULL; | 135 | vb->reap=NULL; |
136 | } | 136 | } |
137 | 137 | ||
138 | int vorbis_block_clear(vorbis_block *vb){ | 138 | int vorbis_block_clear(vorbis_block *vb){ |
139 | _vorbis_block_ripcord(vb); | 139 | _vorbis_block_ripcord(vb); |
140 | if(vb->localstore)_ogg_free(vb->localstore); | 140 | if(vb->localstore)_ogg_free(vb->localstore); |
141 | 141 | ||
142 | memset(vb,0,sizeof(*vb)); | 142 | memset(vb,0,sizeof(*vb)); |
143 | return(0); | 143 | return(0); |
144 | } | 144 | } |
145 | 145 | ||
146 | static int _vds_init(vorbis_dsp_state *v,vorbis_info *vi){ | 146 | static int _vds_init(vorbis_dsp_state *v,vorbis_info *vi){ |
147 | int i; | 147 | int i; |
148 | codec_setup_info *ci=(codec_setup_info *)vi->codec_setup; | 148 | codec_setup_info *ci=(codec_setup_info *)vi->codec_setup; |
149 | private_state *b=NULL; | 149 | private_state *b=NULL; |
150 | 150 | ||
151 | memset(v,0,sizeof(*v)); | 151 | memset(v,0,sizeof(*v)); |
152 | b=(private_state *)(v->backend_state=_ogg_calloc(1,sizeof(*b))); | 152 | b=(private_state *)(v->backend_state=_ogg_calloc(1,sizeof(*b))); |
153 | 153 | ||
154 | v->vi=vi; | 154 | v->vi=vi; |
155 | b->modebits=ilog(ci->modes); | 155 | b->modebits=ilog(ci->modes); |
156 | 156 | ||
157 | /* Vorbis I uses only window type 0 */ | 157 | /* Vorbis I uses only window type 0 */ |
158 | b->window[0]=_vorbis_window(0,ci->blocksizes[0]/2); | 158 | b->window[0]=_vorbis_window(0,ci->blocksizes[0]/2); |
159 | b->window[1]=_vorbis_window(0,ci->blocksizes[1]/2); | 159 | b->window[1]=_vorbis_window(0,ci->blocksizes[1]/2); |
160 | 160 | ||
161 | /* finish the codebooks */ | 161 | /* finish the codebooks */ |
162 | if(!ci->fullbooks){ | 162 | if(!ci->fullbooks){ |
163 | ci->fullbooks=(codebook *)_ogg_calloc(ci->books,sizeof(*ci->fullbooks)); | 163 | ci->fullbooks=(codebook *)_ogg_calloc(ci->books,sizeof(*ci->fullbooks)); |
164 | for(i=0;i<ci->books;i++){ | 164 | for(i=0;i<ci->books;i++){ |
165 | vorbis_book_init_decode(ci->fullbooks+i,ci->book_param[i]); | 165 | vorbis_book_init_decode(ci->fullbooks+i,ci->book_param[i]); |
166 | /* decode codebooks are now standalone after init */ | 166 | /* decode codebooks are now standalone after init */ |
167 | vorbis_staticbook_destroy(ci->book_param[i]); | 167 | vorbis_staticbook_destroy(ci->book_param[i]); |
168 | ci->book_param[i]=NULL; | 168 | ci->book_param[i]=NULL; |
169 | } | 169 | } |
170 | } | 170 | } |
171 | 171 | ||
172 | v->pcm_storage=ci->blocksizes[1]; | 172 | v->pcm_storage=ci->blocksizes[1]; |
173 | v->pcm=(ogg_int32_t **)_ogg_malloc(vi->channels*sizeof(*v->pcm)); | 173 | v->pcm=(ogg_int32_t **)_ogg_malloc(vi->channels*sizeof(*v->pcm)); |
174 | v->pcmret=(ogg_int32_t **)_ogg_malloc(vi->channels*sizeof(*v->pcmret)); | 174 | v->pcmret=(ogg_int32_t **)_ogg_malloc(vi->channels*sizeof(*v->pcmret)); |
175 | for(i=0;i<vi->channels;i++) | 175 | for(i=0;i<vi->channels;i++) |
176 | v->pcm[i]=(ogg_int32_t *)_ogg_calloc(v->pcm_storage,sizeof(*v->pcm[i])); | 176 | v->pcm[i]=(ogg_int32_t *)_ogg_calloc(v->pcm_storage,sizeof(*v->pcm[i])); |
177 | 177 | ||
178 | /* all 1 (large block) or 0 (small block) */ | 178 | /* all 1 (large block) or 0 (small block) */ |
179 | /* explicitly set for the sake of clarity */ | 179 | /* explicitly set for the sake of clarity */ |
180 | v->lW=0; /* previous window size */ | 180 | v->lW=0; /* previous window size */ |
181 | v->W=0; /* current window size */ | 181 | v->W=0; /* current window size */ |
182 | 182 | ||
183 | /* initialize all the mapping/backend lookups */ | 183 | /* initialize all the mapping/backend lookups */ |
184 | b->mode=(vorbis_look_mapping **)_ogg_calloc(ci->modes,sizeof(*b->mode)); | 184 | b->mode=(vorbis_look_mapping **)_ogg_calloc(ci->modes,sizeof(*b->mode)); |
185 | for(i=0;i<ci->modes;i++){ | 185 | for(i=0;i<ci->modes;i++){ |
186 | int mapnum=ci->mode_param[i]->mapping; | 186 | int mapnum=ci->mode_param[i]->mapping; |
187 | int maptype=ci->map_type[mapnum]; | 187 | int maptype=ci->map_type[mapnum]; |
188 | b->mode[i]=_mapping_P[maptype]->look(v,ci->mode_param[i], | 188 | b->mode[i]=_mapping_P[maptype]->look(v,ci->mode_param[i], |
189 | ci->map_param[mapnum]); | 189 | ci->map_param[mapnum]); |
190 | } | 190 | } |
191 | return(0); | 191 | return(0); |
192 | } | 192 | } |
193 | 193 | ||
194 | int vorbis_synthesis_restart(vorbis_dsp_state *v){ | 194 | int vorbis_synthesis_restart(vorbis_dsp_state *v){ |
195 | vorbis_info *vi=v->vi; | 195 | vorbis_info *vi=v->vi; |
196 | codec_setup_info *ci; | 196 | codec_setup_info *ci; |
197 | 197 | ||
198 | if(!v->backend_state)return -1; | 198 | if(!v->backend_state)return -1; |
199 | if(!vi)return -1; | 199 | if(!vi)return -1; |
200 | ci=vi->codec_setup; | 200 | ci=vi->codec_setup; |
201 | if(!ci)return -1; | 201 | if(!ci)return -1; |
202 | 202 | ||
203 | v->centerW=ci->blocksizes[1]/2; | 203 | v->centerW=ci->blocksizes[1]/2; |
204 | v->pcm_current=v->centerW; | 204 | v->pcm_current=v->centerW; |
205 | 205 | ||
206 | v->pcm_returned=-1; | 206 | v->pcm_returned=-1; |
207 | v->granulepos=-1; | 207 | v->granulepos=-1; |
208 | v->sequence=-1; | 208 | v->sequence=-1; |
209 | ((private_state *)(v->backend_state))->sample_count=-1; | 209 | ((private_state *)(v->backend_state))->sample_count=-1; |
210 | 210 | ||
211 | return(0); | 211 | return(0); |
212 | } | 212 | } |
213 | 213 | ||
214 | int vorbis_synthesis_init(vorbis_dsp_state *v,vorbis_info *vi){ | 214 | int vorbis_synthesis_init(vorbis_dsp_state *v,vorbis_info *vi){ |
215 | _vds_init(v,vi); | 215 | _vds_init(v,vi); |
216 | vorbis_synthesis_restart(v); | 216 | vorbis_synthesis_restart(v); |
217 | 217 | ||
218 | return(0); | 218 | return(0); |
219 | } | 219 | } |
220 | 220 | ||
221 | void vorbis_dsp_clear(vorbis_dsp_state *v){ | 221 | void vorbis_dsp_clear(vorbis_dsp_state *v){ |
222 | int i; | 222 | int i; |
223 | if(v){ | 223 | if(v){ |
224 | vorbis_info *vi=v->vi; | 224 | vorbis_info *vi=v->vi; |
225 | codec_setup_info *ci=(codec_setup_info *)(vi?vi->codec_setup:NULL); | 225 | codec_setup_info *ci=(codec_setup_info *)(vi?vi->codec_setup:NULL); |
226 | private_state *b=(private_state *)v->backend_state; | 226 | private_state *b=(private_state *)v->backend_state; |
227 | 227 | ||
228 | if(v->pcm){ | 228 | if(v->pcm){ |
229 | for(i=0;i<vi->channels;i++) | 229 | if (vi) { |
230 | if(v->pcm[i])_ogg_free(v->pcm[i]); | 230 | for(i=0;i<vi->channels;i++) |
231 | if(v->pcm[i])_ogg_free(v->pcm[i]); | ||
232 | } | ||
231 | _ogg_free(v->pcm); | 233 | _ogg_free(v->pcm); |
232 | if(v->pcmret)_ogg_free(v->pcmret); | 234 | if(v->pcmret)_ogg_free(v->pcmret); |
233 | } | 235 | } |
234 | 236 | ||
235 | /* free mode lookups; these are actually vorbis_look_mapping structs */ | 237 | /* free mode lookups; these are actually vorbis_look_mapping structs */ |
236 | if(ci){ | 238 | if(ci){ |
237 | for(i=0;i<ci->modes;i++){ | 239 | for(i=0;i<ci->modes;i++){ |
238 | int mapnum=ci->mode_param[i]->mapping; | 240 | int mapnum=ci->mode_param[i]->mapping; |
239 | int maptype=ci->map_type[mapnum]; | 241 | int maptype=ci->map_type[mapnum]; |
240 | if(b && b->mode)_mapping_P[maptype]->free_look(b->mode[i]); | 242 | if(b && b->mode)_mapping_P[maptype]->free_look(b->mode[i]); |
241 | } | 243 | } |
242 | } | 244 | } |
243 | 245 | ||
244 | if(b){ | 246 | if(b){ |
245 | if(b->mode)_ogg_free(b->mode); | 247 | if(b->mode)_ogg_free(b->mode); |
246 | _ogg_free(b); | 248 | _ogg_free(b); |
247 | } | 249 | } |
248 | 250 | ||
249 | memset(v,0,sizeof(*v)); | 251 | memset(v,0,sizeof(*v)); |
250 | } | 252 | } |
251 | } | 253 | } |
252 | 254 | ||
253 | /* Unlike in analysis, the window is only partially applied for each | 255 | /* Unlike in analysis, the window is only partially applied for each |
254 | block. The time domain envelope is not yet handled at the point of | 256 | block. The time domain envelope is not yet handled at the point of |
255 | calling (as it relies on the previous block). */ | 257 | calling (as it relies on the previous block). */ |
256 | 258 | ||
257 | int vorbis_synthesis_blockin(vorbis_dsp_state *v,vorbis_block *vb){ | 259 | int vorbis_synthesis_blockin(vorbis_dsp_state *v,vorbis_block *vb){ |
258 | vorbis_info *vi=v->vi; | 260 | vorbis_info *vi=v->vi; |
259 | codec_setup_info *ci=(codec_setup_info *)vi->codec_setup; | 261 | codec_setup_info *ci=(codec_setup_info *)vi->codec_setup; |
260 | private_state *b=v->backend_state; | 262 | private_state *b=v->backend_state; |
261 | int i,j; | 263 | int i,j; |
262 | 264 | ||
263 | if(v->pcm_current>v->pcm_returned && v->pcm_returned!=-1)return(OV_EINVAL); | 265 | if(v->pcm_current>v->pcm_returned && v->pcm_returned!=-1)return(OV_EINVAL); |
264 | 266 | ||
265 | v->lW=v->W; | 267 | v->lW=v->W; |
266 | v->W=vb->W; | 268 | v->W=vb->W; |
267 | v->nW=-1; | 269 | v->nW=-1; |
268 | 270 | ||
269 | if((v->sequence==-1)|| | 271 | if((v->sequence==-1)|| |
270 | (v->sequence+1 != vb->sequence)){ | 272 | (v->sequence+1 != vb->sequence)){ |
271 | v->granulepos=-1; /* out of sequence; lose count */ | 273 | v->granulepos=-1; /* out of sequence; lose count */ |
272 | b->sample_count=-1; | 274 | b->sample_count=-1; |
273 | } | 275 | } |
274 | 276 | ||
275 | v->sequence=vb->sequence; | 277 | v->sequence=vb->sequence; |
276 | 278 | ||
277 | if(vb->pcm){ /* no pcm to process if vorbis_synthesis_trackonly | 279 | if(vb->pcm){ /* no pcm to process if vorbis_synthesis_trackonly |
278 | was called on block */ | 280 | was called on block */ |
279 | int n=ci->blocksizes[v->W]/2; | 281 | int n=ci->blocksizes[v->W]/2; |
280 | int n0=ci->blocksizes[0]/2; | 282 | int n0=ci->blocksizes[0]/2; |
281 | int n1=ci->blocksizes[1]/2; | 283 | int n1=ci->blocksizes[1]/2; |
282 | 284 | ||
283 | int thisCenter; | 285 | int thisCenter; |
284 | int prevCenter; | 286 | int prevCenter; |
285 | 287 | ||
286 | if(v->centerW){ | 288 | if(v->centerW){ |
287 | thisCenter=n1; | 289 | thisCenter=n1; |
288 | prevCenter=0; | 290 | prevCenter=0; |
289 | }else{ | 291 | }else{ |
290 | thisCenter=0; | 292 | thisCenter=0; |
291 | prevCenter=n1; | 293 | prevCenter=n1; |
292 | } | 294 | } |
293 | 295 | ||
294 | /* v->pcm is now used like a two-stage double buffer. We don't want | 296 | /* v->pcm is now used like a two-stage double buffer. We don't want |
295 | to have to constantly shift *or* adjust memory usage. Don't | 297 | to have to constantly shift *or* adjust memory usage. Don't |
296 | accept a new block until the old is shifted out */ | 298 | accept a new block until the old is shifted out */ |
297 | 299 | ||
298 | /* overlap/add PCM */ | 300 | /* overlap/add PCM */ |
299 | 301 | ||
300 | for(j=0;j<vi->channels;j++){ | 302 | for(j=0;j<vi->channels;j++){ |
301 | /* the overlap/add section */ | 303 | /* the overlap/add section */ |
302 | if(v->lW){ | 304 | if(v->lW){ |
303 | if(v->W){ | 305 | if(v->W){ |
304 | /* large/large */ | 306 | /* large/large */ |
305 | ogg_int32_t *pcm=v->pcm[j]+prevCenter; | 307 | ogg_int32_t *pcm=v->pcm[j]+prevCenter; |
306 | ogg_int32_t *p=vb->pcm[j]; | 308 | ogg_int32_t *p=vb->pcm[j]; |
307 | for(i=0;i<n1;i++) | 309 | for(i=0;i<n1;i++) |
308 | pcm[i]+=p[i]; | 310 | pcm[i]+=p[i]; |
309 | }else{ | 311 | }else{ |
310 | /* large/small */ | 312 | /* large/small */ |
311 | ogg_int32_t *pcm=v->pcm[j]+prevCenter+n1/2-n0/2; | 313 | ogg_int32_t *pcm=v->pcm[j]+prevCenter+n1/2-n0/2; |
312 | ogg_int32_t *p=vb->pcm[j]; | 314 | ogg_int32_t *p=vb->pcm[j]; |
313 | for(i=0;i<n0;i++) | 315 | for(i=0;i<n0;i++) |
314 | pcm[i]+=p[i]; | 316 | pcm[i]+=p[i]; |
315 | } | 317 | } |
316 | }else{ | 318 | }else{ |
317 | if(v->W){ | 319 | if(v->W){ |
318 | /* small/large */ | 320 | /* small/large */ |
319 | ogg_int32_t *pcm=v->pcm[j]+prevCenter; | 321 | ogg_int32_t *pcm=v->pcm[j]+prevCenter; |
320 | ogg_int32_t *p=vb->pcm[j]+n1/2-n0/2; | 322 | ogg_int32_t *p=vb->pcm[j]+n1/2-n0/2; |
321 | for(i=0;i<n0;i++) | 323 | for(i=0;i<n0;i++) |
322 | pcm[i]+=p[i]; | 324 | pcm[i]+=p[i]; |
323 | for(;i<n1/2+n0/2;i++) | 325 | for(;i<n1/2+n0/2;i++) |
324 | pcm[i]=p[i]; | 326 | pcm[i]=p[i]; |
325 | }else{ | 327 | }else{ |
326 | /* small/small */ | 328 | /* small/small */ |
diff --git a/core/multimedia/opieplayer/vorbis/tremor/info.c b/core/multimedia/opieplayer/vorbis/tremor/info.c index 941695e..3499ae4 100644 --- a/core/multimedia/opieplayer/vorbis/tremor/info.c +++ b/core/multimedia/opieplayer/vorbis/tremor/info.c | |||
@@ -4,194 +4,194 @@ | |||
4 | * * | 4 | * * |
5 | * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS * | 5 | * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS * |
6 | * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE * | 6 | * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE * |
7 | * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. * | 7 | * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. * |
8 | * * | 8 | * * |
9 | * THE OggVorbis 'TREMOR' SOURCE CODE IS (C) COPYRIGHT 1994-2003 * | 9 | * THE OggVorbis 'TREMOR' SOURCE CODE IS (C) COPYRIGHT 1994-2003 * |
10 | * BY THE Xiph.Org FOUNDATION http://www.xiph.org/ * | 10 | * BY THE Xiph.Org FOUNDATION http://www.xiph.org/ * |
11 | * * | 11 | * * |
12 | ******************************************************************** | 12 | ******************************************************************** |
13 | 13 | ||
14 | function: maintain the info structure, info <-> header packets | 14 | function: maintain the info structure, info <-> header packets |
15 | 15 | ||
16 | ********************************************************************/ | 16 | ********************************************************************/ |
17 | 17 | ||
18 | /* general handling of the header and the vorbis_info structure (and | 18 | /* general handling of the header and the vorbis_info structure (and |
19 | substructures) */ | 19 | substructures) */ |
20 | 20 | ||
21 | #include <stdlib.h> | 21 | #include <stdlib.h> |
22 | #include <string.h> | 22 | #include <string.h> |
23 | #include <ctype.h> | 23 | #include <ctype.h> |
24 | #include "ogg.h" | 24 | #include "ogg.h" |
25 | #include "ivorbiscodec.h" | 25 | #include "ivorbiscodec.h" |
26 | #include "codec_internal.h" | 26 | #include "codec_internal.h" |
27 | #include "codebook.h" | 27 | #include "codebook.h" |
28 | #include "registry.h" | 28 | #include "registry.h" |
29 | #include "window.h" | 29 | #include "window.h" |
30 | #include "misc.h" | 30 | #include "misc.h" |
31 | #include "os.h" | 31 | #include "os.h" |
32 | 32 | ||
33 | /* helpers */ | 33 | /* helpers */ |
34 | static void _v_readstring(oggpack_buffer *o,char *buf,int bytes){ | 34 | static void _v_readstring(oggpack_buffer *o,char *buf,int bytes){ |
35 | while(bytes--){ | 35 | while(bytes--){ |
36 | *buf++=oggpack_read(o,8); | 36 | *buf++=oggpack_read(o,8); |
37 | } | 37 | } |
38 | } | 38 | } |
39 | 39 | ||
40 | void vorbis_comment_init(vorbis_comment *vc){ | 40 | void vorbis_comment_init(vorbis_comment *vc){ |
41 | memset(vc,0,sizeof(*vc)); | 41 | memset(vc,0,sizeof(*vc)); |
42 | } | 42 | } |
43 | 43 | ||
44 | /* This is more or less the same as strncasecmp - but that doesn't exist | 44 | /* This is more or less the same as strncasecmp - but that doesn't exist |
45 | * everywhere, and this is a fairly trivial function, so we include it */ | 45 | * everywhere, and this is a fairly trivial function, so we include it */ |
46 | static int tagcompare(const char *s1, const char *s2, int n){ | 46 | static int tagcompare(const char *s1, const char *s2, int n){ |
47 | int c=0; | 47 | int c=0; |
48 | while(c < n){ | 48 | while(c < n){ |
49 | if(toupper(s1[c]) != toupper(s2[c])) | 49 | if(toupper(s1[c]) != toupper(s2[c])) |
50 | return !0; | 50 | return !0; |
51 | c++; | 51 | c++; |
52 | } | 52 | } |
53 | return 0; | 53 | return 0; |
54 | } | 54 | } |
55 | 55 | ||
56 | char *vorbis_comment_query(vorbis_comment *vc, char *tag, int count){ | 56 | char *vorbis_comment_query(vorbis_comment *vc, char *tag, int count){ |
57 | long i; | 57 | long i; |
58 | int found = 0; | 58 | int found = 0; |
59 | int taglen = strlen(tag)+1; /* +1 for the = we append */ | 59 | int taglen = strlen(tag)+1; /* +1 for the = we append */ |
60 | char *fulltag = (char *)alloca(taglen+ 1); | 60 | char *fulltag = (char *)alloca(taglen+ 1); |
61 | 61 | ||
62 | strcpy(fulltag, tag); | 62 | strcpy(fulltag, tag); |
63 | strcat(fulltag, "="); | 63 | strcat(fulltag, "="); |
64 | 64 | ||
65 | for(i=0;i<vc->comments;i++){ | 65 | for(i=0;i<vc->comments;i++){ |
66 | if(!tagcompare(vc->user_comments[i], fulltag, taglen)){ | 66 | if(!tagcompare(vc->user_comments[i], fulltag, taglen)){ |
67 | if(count == found) | 67 | if(count == found) |
68 | /* We return a pointer to the data, not a copy */ | 68 | /* We return a pointer to the data, not a copy */ |
69 | return vc->user_comments[i] + taglen; | 69 | return vc->user_comments[i] + taglen; |
70 | else | 70 | else |
71 | found++; | 71 | found++; |
72 | } | 72 | } |
73 | } | 73 | } |
74 | return NULL; /* didn't find anything */ | 74 | return NULL; /* didn't find anything */ |
75 | } | 75 | } |
76 | 76 | ||
77 | int vorbis_comment_query_count(vorbis_comment *vc, char *tag){ | 77 | int vorbis_comment_query_count(vorbis_comment *vc, char *tag){ |
78 | int i,count=0; | 78 | int i,count=0; |
79 | int taglen = strlen(tag)+1; /* +1 for the = we append */ | 79 | int taglen = strlen(tag)+1; /* +1 for the = we append */ |
80 | char *fulltag = (char *)alloca(taglen+1); | 80 | char *fulltag = (char *)alloca(taglen+1); |
81 | strcpy(fulltag,tag); | 81 | strcpy(fulltag,tag); |
82 | strcat(fulltag, "="); | 82 | strcat(fulltag, "="); |
83 | 83 | ||
84 | for(i=0;i<vc->comments;i++){ | 84 | for(i=0;i<vc->comments;i++){ |
85 | if(!tagcompare(vc->user_comments[i], fulltag, taglen)) | 85 | if(!tagcompare(vc->user_comments[i], fulltag, taglen)) |
86 | count++; | 86 | count++; |
87 | } | 87 | } |
88 | 88 | ||
89 | return count; | 89 | return count; |
90 | } | 90 | } |
91 | 91 | ||
92 | void vorbis_comment_clear(vorbis_comment *vc){ | 92 | void vorbis_comment_clear(vorbis_comment *vc){ |
93 | if(vc){ | 93 | if(vc){ |
94 | long i; | 94 | long i; |
95 | for(i=0;i<vc->comments;i++) | 95 | for(i=0;i<vc->comments;i++) |
96 | if(vc->user_comments[i])_ogg_free(vc->user_comments[i]); | 96 | if(vc->user_comments[i])_ogg_free(vc->user_comments[i]); |
97 | if(vc->user_comments)_ogg_free(vc->user_comments); | 97 | if(vc->user_comments)_ogg_free(vc->user_comments); |
98 | if(vc->comment_lengths)_ogg_free(vc->comment_lengths); | 98 | if(vc->comment_lengths)_ogg_free(vc->comment_lengths); |
99 | if(vc->vendor)_ogg_free(vc->vendor); | 99 | if(vc->vendor)_ogg_free(vc->vendor); |
100 | memset(vc,0,sizeof(*vc)); | ||
100 | } | 101 | } |
101 | memset(vc,0,sizeof(*vc)); | ||
102 | } | 102 | } |
103 | 103 | ||
104 | /* blocksize 0 is guaranteed to be short, 1 is guarantted to be long. | 104 | /* blocksize 0 is guaranteed to be short, 1 is guarantted to be long. |
105 | They may be equal, but short will never ge greater than long */ | 105 | They may be equal, but short will never ge greater than long */ |
106 | int vorbis_info_blocksize(vorbis_info *vi,int zo){ | 106 | int vorbis_info_blocksize(vorbis_info *vi,int zo){ |
107 | codec_setup_info *ci = (codec_setup_info *)vi->codec_setup; | 107 | codec_setup_info *ci = (codec_setup_info *)vi->codec_setup; |
108 | return ci ? ci->blocksizes[zo] : -1; | 108 | return ci ? ci->blocksizes[zo] : -1; |
109 | } | 109 | } |
110 | 110 | ||
111 | /* used by synthesis, which has a full, alloced vi */ | 111 | /* used by synthesis, which has a full, alloced vi */ |
112 | void vorbis_info_init(vorbis_info *vi){ | 112 | void vorbis_info_init(vorbis_info *vi){ |
113 | memset(vi,0,sizeof(*vi)); | 113 | memset(vi,0,sizeof(*vi)); |
114 | vi->codec_setup=(codec_setup_info *)_ogg_calloc(1,sizeof(codec_setup_info)); | 114 | vi->codec_setup=(codec_setup_info *)_ogg_calloc(1,sizeof(codec_setup_info)); |
115 | } | 115 | } |
116 | 116 | ||
117 | void vorbis_info_clear(vorbis_info *vi){ | 117 | void vorbis_info_clear(vorbis_info *vi){ |
118 | codec_setup_info *ci=(codec_setup_info *)vi->codec_setup; | 118 | codec_setup_info *ci=(codec_setup_info *)vi->codec_setup; |
119 | int i; | 119 | int i; |
120 | 120 | ||
121 | if(ci){ | 121 | if(ci){ |
122 | 122 | ||
123 | for(i=0;i<ci->modes;i++) | 123 | for(i=0;i<ci->modes;i++) |
124 | if(ci->mode_param[i])_ogg_free(ci->mode_param[i]); | 124 | if(ci->mode_param[i])_ogg_free(ci->mode_param[i]); |
125 | 125 | ||
126 | for(i=0;i<ci->maps;i++) /* unpack does the range checking */ | 126 | for(i=0;i<ci->maps;i++) /* unpack does the range checking */ |
127 | _mapping_P[ci->map_type[i]]->free_info(ci->map_param[i]); | 127 | _mapping_P[ci->map_type[i]]->free_info(ci->map_param[i]); |
128 | 128 | ||
129 | for(i=0;i<ci->floors;i++) /* unpack does the range checking */ | 129 | for(i=0;i<ci->floors;i++) /* unpack does the range checking */ |
130 | _floor_P[ci->floor_type[i]]->free_info(ci->floor_param[i]); | 130 | _floor_P[ci->floor_type[i]]->free_info(ci->floor_param[i]); |
131 | 131 | ||
132 | for(i=0;i<ci->residues;i++) /* unpack does the range checking */ | 132 | for(i=0;i<ci->residues;i++) /* unpack does the range checking */ |
133 | _residue_P[ci->residue_type[i]]->free_info(ci->residue_param[i]); | 133 | _residue_P[ci->residue_type[i]]->free_info(ci->residue_param[i]); |
134 | 134 | ||
135 | for(i=0;i<ci->books;i++){ | 135 | for(i=0;i<ci->books;i++){ |
136 | if(ci->book_param[i]){ | 136 | if(ci->book_param[i]){ |
137 | /* knows if the book was not alloced */ | 137 | /* knows if the book was not alloced */ |
138 | vorbis_staticbook_destroy(ci->book_param[i]); | 138 | vorbis_staticbook_destroy(ci->book_param[i]); |
139 | } | 139 | } |
140 | if(ci->fullbooks) | 140 | if(ci->fullbooks) |
141 | vorbis_book_clear(ci->fullbooks+i); | 141 | vorbis_book_clear(ci->fullbooks+i); |
142 | } | 142 | } |
143 | if(ci->fullbooks) | 143 | if(ci->fullbooks) |
144 | _ogg_free(ci->fullbooks); | 144 | _ogg_free(ci->fullbooks); |
145 | 145 | ||
146 | _ogg_free(ci); | 146 | _ogg_free(ci); |
147 | } | 147 | } |
148 | 148 | ||
149 | memset(vi,0,sizeof(*vi)); | 149 | memset(vi,0,sizeof(*vi)); |
150 | } | 150 | } |
151 | 151 | ||
152 | /* Header packing/unpacking ********************************************/ | 152 | /* Header packing/unpacking ********************************************/ |
153 | 153 | ||
154 | static int _vorbis_unpack_info(vorbis_info *vi,oggpack_buffer *opb){ | 154 | static int _vorbis_unpack_info(vorbis_info *vi,oggpack_buffer *opb){ |
155 | codec_setup_info *ci=(codec_setup_info *)vi->codec_setup; | 155 | codec_setup_info *ci=(codec_setup_info *)vi->codec_setup; |
156 | if(!ci)return(OV_EFAULT); | 156 | if(!ci)return(OV_EFAULT); |
157 | 157 | ||
158 | vi->version=oggpack_read(opb,32); | 158 | vi->version=oggpack_read(opb,32); |
159 | if(vi->version!=0)return(OV_EVERSION); | 159 | if(vi->version!=0)return(OV_EVERSION); |
160 | 160 | ||
161 | vi->channels=oggpack_read(opb,8); | 161 | vi->channels=oggpack_read(opb,8); |
162 | vi->rate=oggpack_read(opb,32); | 162 | vi->rate=oggpack_read(opb,32); |
163 | 163 | ||
164 | vi->bitrate_upper=oggpack_read(opb,32); | 164 | vi->bitrate_upper=oggpack_read(opb,32); |
165 | vi->bitrate_nominal=oggpack_read(opb,32); | 165 | vi->bitrate_nominal=oggpack_read(opb,32); |
166 | vi->bitrate_lower=oggpack_read(opb,32); | 166 | vi->bitrate_lower=oggpack_read(opb,32); |
167 | 167 | ||
168 | ci->blocksizes[0]=1<<oggpack_read(opb,4); | 168 | ci->blocksizes[0]=1<<oggpack_read(opb,4); |
169 | ci->blocksizes[1]=1<<oggpack_read(opb,4); | 169 | ci->blocksizes[1]=1<<oggpack_read(opb,4); |
170 | 170 | ||
171 | if(vi->rate<1)goto err_out; | 171 | if(vi->rate<1)goto err_out; |
172 | if(vi->channels<1)goto err_out; | 172 | if(vi->channels<1)goto err_out; |
173 | if(ci->blocksizes[0]<64)goto err_out; | 173 | if(ci->blocksizes[0]<64)goto err_out; |
174 | if(ci->blocksizes[1]<ci->blocksizes[0])goto err_out; | 174 | if(ci->blocksizes[1]<ci->blocksizes[0])goto err_out; |
175 | if(ci->blocksizes[1]>8192)goto err_out; | 175 | if(ci->blocksizes[1]>8192)goto err_out; |
176 | 176 | ||
177 | if(oggpack_read(opb,1)!=1)goto err_out; /* EOP check */ | 177 | if(oggpack_read(opb,1)!=1)goto err_out; /* EOP check */ |
178 | 178 | ||
179 | return(0); | 179 | return(0); |
180 | err_out: | 180 | err_out: |
181 | vorbis_info_clear(vi); | 181 | vorbis_info_clear(vi); |
182 | return(OV_EBADHEADER); | 182 | return(OV_EBADHEADER); |
183 | } | 183 | } |
184 | 184 | ||
185 | static int _vorbis_unpack_comment(vorbis_comment *vc,oggpack_buffer *opb){ | 185 | static int _vorbis_unpack_comment(vorbis_comment *vc,oggpack_buffer *opb){ |
186 | int i; | 186 | int i; |
187 | int vendorlen=oggpack_read(opb,32); | 187 | int vendorlen=oggpack_read(opb,32); |
188 | if(vendorlen<0)goto err_out; | 188 | if(vendorlen<0)goto err_out; |
189 | vc->vendor=(char *)_ogg_calloc(vendorlen+1,1); | 189 | vc->vendor=(char *)_ogg_calloc(vendorlen+1,1); |
190 | _v_readstring(opb,vc->vendor,vendorlen); | 190 | _v_readstring(opb,vc->vendor,vendorlen); |
191 | vc->comments=oggpack_read(opb,32); | 191 | vc->comments=oggpack_read(opb,32); |
192 | if(vc->comments<0)goto err_out; | 192 | if(vc->comments<0)goto err_out; |
193 | vc->user_comments=(char **)_ogg_calloc(vc->comments+1,sizeof(*vc->user_comments)); | 193 | vc->user_comments=(char **)_ogg_calloc(vc->comments+1,sizeof(*vc->user_comments)); |
194 | vc->comment_lengths=(int *)_ogg_calloc(vc->comments+1, sizeof(*vc->comment_lengths)); | 194 | vc->comment_lengths=(int *)_ogg_calloc(vc->comments+1, sizeof(*vc->comment_lengths)); |
195 | 195 | ||
196 | for(i=0;i<vc->comments;i++){ | 196 | for(i=0;i<vc->comments;i++){ |
197 | int len=oggpack_read(opb,32); | 197 | int len=oggpack_read(opb,32); |
diff --git a/noncore/apps/opie-write/qrichtext.cpp b/noncore/apps/opie-write/qrichtext.cpp index f040f1e..768da44 100644 --- a/noncore/apps/opie-write/qrichtext.cpp +++ b/noncore/apps/opie-write/qrichtext.cpp | |||
@@ -96,236 +96,245 @@ static inline int scale( int value, QPainter *painter ) | |||
96 | // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ | 96 | // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
97 | 97 | ||
98 | void QTextCommandHistory::addCommand( QTextCommand *cmd ) | 98 | void QTextCommandHistory::addCommand( QTextCommand *cmd ) |
99 | { | 99 | { |
100 | if ( current < (int)history.count() - 1 ) { | 100 | if ( current < (int)history.count() - 1 ) { |
101 | QPtrList<QTextCommand> commands; | 101 | QPtrList<QTextCommand> commands; |
102 | commands.setAutoDelete( FALSE ); | 102 | commands.setAutoDelete( FALSE ); |
103 | 103 | ||
104 | for( int i = 0; i <= current; ++i ) { | 104 | for( int i = 0; i <= current; ++i ) { |
105 | commands.insert( i, history.at( 0 ) ); | 105 | commands.insert( i, history.at( 0 ) ); |
106 | history.take( 0 ); | 106 | history.take( 0 ); |
107 | } | 107 | } |
108 | 108 | ||
109 | commands.append( cmd ); | 109 | commands.append( cmd ); |
110 | history.clear(); | 110 | history.clear(); |
111 | history = commands; | 111 | history = commands; |
112 | history.setAutoDelete( TRUE ); | 112 | history.setAutoDelete( TRUE ); |
113 | } else { | 113 | } else { |
114 | history.append( cmd ); | 114 | history.append( cmd ); |
115 | } | 115 | } |
116 | 116 | ||
117 | if ( (int)history.count() > steps ) | 117 | if ( (int)history.count() > steps ) |
118 | history.removeFirst(); | 118 | history.removeFirst(); |
119 | else | 119 | else |
120 | ++current; | 120 | ++current; |
121 | } | 121 | } |
122 | 122 | ||
123 | QTextCursor *QTextCommandHistory::undo( QTextCursor *c ) | 123 | QTextCursor *QTextCommandHistory::undo( QTextCursor *c ) |
124 | { | 124 | { |
125 | if ( current > -1 ) { | 125 | if ( current > -1 ) { |
126 | QTextCursor *c2 = history.at( current )->unexecute( c ); | 126 | QTextCursor *c2 = history.at( current )->unexecute( c ); |
127 | --current; | 127 | --current; |
128 | return c2; | 128 | return c2; |
129 | } | 129 | } |
130 | return 0; | 130 | return 0; |
131 | } | 131 | } |
132 | 132 | ||
133 | QTextCursor *QTextCommandHistory::redo( QTextCursor *c ) | 133 | QTextCursor *QTextCommandHistory::redo( QTextCursor *c ) |
134 | { | 134 | { |
135 | if ( current > -1 ) { | 135 | if ( current > -1 ) { |
136 | if ( current < (int)history.count() - 1 ) { | 136 | if ( current < (int)history.count() - 1 ) { |
137 | ++current; | 137 | ++current; |
138 | return history.at( current )->execute( c ); | 138 | return history.at( current )->execute( c ); |
139 | } | 139 | } |
140 | } else { | 140 | } else { |
141 | if ( history.count() > 0 ) { | 141 | if ( history.count() > 0 ) { |
142 | ++current; | 142 | ++current; |
143 | return history.at( current )->execute( c ); | 143 | return history.at( current )->execute( c ); |
144 | } | 144 | } |
145 | } | 145 | } |
146 | return 0; | 146 | return 0; |
147 | } | 147 | } |
148 | 148 | ||
149 | bool QTextCommandHistory::isUndoAvailable() | 149 | bool QTextCommandHistory::isUndoAvailable() |
150 | { | 150 | { |
151 | return current > -1; | 151 | return current > -1; |
152 | } | 152 | } |
153 | 153 | ||
154 | bool QTextCommandHistory::isRedoAvailable() | 154 | bool QTextCommandHistory::isRedoAvailable() |
155 | { | 155 | { |
156 | return current > -1 && current < (int)history.count() - 1 || current == -1 && history.count() > 0; | 156 | return current > -1 && current < (int)history.count() - 1 || current == -1 && history.count() > 0; |
157 | } | 157 | } |
158 | 158 | ||
159 | // +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ | 159 | // +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
160 | 160 | ||
161 | QTextDeleteCommand::QTextDeleteCommand( QTextDocument *d, int i, int idx, const QMemArray<QTextStringChar> &str, | 161 | QTextDeleteCommand::QTextDeleteCommand( QTextDocument *d, int i, int idx, const QMemArray<QTextStringChar> &str, |
162 | const QByteArray& oldStyleInfo ) | 162 | const QByteArray& oldStyleInfo ) |
163 | : QTextCommand( d ), id( i ), index( idx ), parag( 0 ), text( str ), styleInformation( oldStyleInfo ) | 163 | : QTextCommand( d ), id( i ), index( idx ), parag( 0 ), text( str ), styleInformation( oldStyleInfo ) |
164 | { | 164 | { |
165 | for ( int j = 0; j < (int)text.size(); ++j ) { | 165 | for ( int j = 0; j < (int)text.size(); ++j ) { |
166 | if ( text[ j ].format() ) | 166 | if ( text[ j ].format() ) |
167 | text[ j ].format()->addRef(); | 167 | text[ j ].format()->addRef(); |
168 | } | 168 | } |
169 | } | 169 | } |
170 | 170 | ||
171 | QTextDeleteCommand::QTextDeleteCommand( QTextParagraph *p, int idx, const QMemArray<QTextStringChar> &str ) | 171 | QTextDeleteCommand::QTextDeleteCommand( QTextParagraph *p, int idx, const QMemArray<QTextStringChar> &str ) |
172 | : QTextCommand( 0 ), id( -1 ), index( idx ), parag( p ), text( str ) | 172 | : QTextCommand( 0 ), id( -1 ), index( idx ), parag( p ), text( str ) |
173 | { | 173 | { |
174 | for ( int i = 0; i < (int)text.size(); ++i ) { | 174 | for ( int i = 0; i < (int)text.size(); ++i ) { |
175 | if ( text[ i ].format() ) | 175 | if ( text[ i ].format() ) |
176 | text[ i ].format()->addRef(); | 176 | text[ i ].format()->addRef(); |
177 | } | 177 | } |
178 | } | 178 | } |
179 | 179 | ||
180 | QTextDeleteCommand::~QTextDeleteCommand() | 180 | QTextDeleteCommand::~QTextDeleteCommand() |
181 | { | 181 | { |
182 | for ( int i = 0; i < (int)text.size(); ++i ) { | 182 | for ( int i = 0; i < (int)text.size(); ++i ) { |
183 | if ( text[ i ].format() ) | 183 | if ( text[ i ].format() ) |
184 | text[ i ].format()->removeRef(); | 184 | text[ i ].format()->removeRef(); |
185 | } | 185 | } |
186 | text.resize( 0 ); | 186 | text.resize( 0 ); |
187 | } | 187 | } |
188 | 188 | ||
189 | QTextCursor *QTextDeleteCommand::execute( QTextCursor *c ) | 189 | QTextCursor *QTextDeleteCommand::execute( QTextCursor *c ) |
190 | { | 190 | { |
191 | QTextParagraph *s = doc ? doc->paragAt( id ) : parag; | 191 | QTextParagraph *s = doc ? doc->paragAt( id ) : parag; |
192 | if ( !s ) { | 192 | if ( !s && doc ) { |
193 | owarn << "can't locate parag at " << id << ", last parag: " << doc->lastParagraph()->paragId() << "" << oendl; | 193 | owarn << "can't locate parag at " << id << ", last parag: " << doc->lastParagraph()->paragId() << "" << oendl; |
194 | return 0; | 194 | return 0; |
195 | } else if ( !doc ) { | ||
196 | owarn << "No valid doc" << oendl; | ||
197 | return 0; | ||
195 | } | 198 | } |
196 | 199 | ||
197 | cursor.setParagraph( s ); | 200 | cursor.setParagraph( s ); |
198 | cursor.setIndex( index ); | 201 | cursor.setIndex( index ); |
199 | int len = text.size(); | 202 | int len = text.size(); |
200 | if ( c ) | 203 | if ( c ) |
201 | *c = cursor; | 204 | *c = cursor; |
202 | if ( doc ) { | 205 | if ( doc ) { |
203 | doc->setSelectionStart( QTextDocument::Temp, cursor ); | 206 | doc->setSelectionStart( QTextDocument::Temp, cursor ); |
204 | for ( int i = 0; i < len; ++i ) | 207 | for ( int i = 0; i < len; ++i ) |
205 | cursor.gotoNextLetter(); | 208 | cursor.gotoNextLetter(); |
206 | doc->setSelectionEnd( QTextDocument::Temp, cursor ); | 209 | doc->setSelectionEnd( QTextDocument::Temp, cursor ); |
207 | doc->removeSelectedText( QTextDocument::Temp, &cursor ); | 210 | doc->removeSelectedText( QTextDocument::Temp, &cursor ); |
208 | if ( c ) | 211 | if ( c ) |
209 | *c = cursor; | 212 | *c = cursor; |
210 | } else { | 213 | } else { |
211 | s->remove( index, len ); | 214 | s->remove( index, len ); |
212 | } | 215 | } |
213 | 216 | ||
214 | return c; | 217 | return c; |
215 | } | 218 | } |
216 | 219 | ||
217 | QTextCursor *QTextDeleteCommand::unexecute( QTextCursor *c ) | 220 | QTextCursor *QTextDeleteCommand::unexecute( QTextCursor *c ) |
218 | { | 221 | { |
219 | QTextParagraph *s = doc ? doc->paragAt( id ) : parag; | 222 | QTextParagraph *s = doc ? doc->paragAt( id ) : parag; |
220 | if ( !s ) { | 223 | if ( !s && doc ) { |
221 | owarn << "can't locate parag at " << id << ", last parag: " << doc->lastParagraph()->paragId() << "" << oendl; | 224 | owarn << "can't locate parag at " << id << ", last parag: " << doc->lastParagraph()->paragId() << "" << oendl; |
222 | return 0; | 225 | return 0; |
226 | } else if ( !doc ) { | ||
227 | owarn << "No valid doc" << oendl; | ||
228 | return 0; | ||
223 | } | 229 | } |
224 | 230 | ||
225 | cursor.setParagraph( s ); | 231 | cursor.setParagraph( s ); |
226 | cursor.setIndex( index ); | 232 | cursor.setIndex( index ); |
227 | QString str = QTextString::toString( text ); | 233 | QString str = QTextString::toString( text ); |
228 | cursor.insert( str, TRUE, &text ); | 234 | cursor.insert( str, TRUE, &text ); |
229 | cursor.setParagraph( s ); | 235 | cursor.setParagraph( s ); |
230 | cursor.setIndex( index ); | 236 | cursor.setIndex( index ); |
231 | if ( c ) { | 237 | if ( c ) { |
232 | c->setParagraph( s ); | 238 | c->setParagraph( s ); |
233 | c->setIndex( index ); | 239 | c->setIndex( index ); |
234 | for ( int i = 0; i < (int)text.size(); ++i ) | 240 | for ( int i = 0; i < (int)text.size(); ++i ) |
235 | c->gotoNextLetter(); | 241 | c->gotoNextLetter(); |
242 | } else { | ||
243 | owarn << "No valid cursor" << oendl; | ||
244 | return 0; | ||
236 | } | 245 | } |
237 | 246 | ||
238 | if ( !styleInformation.isEmpty() ) { | 247 | if ( !styleInformation.isEmpty() ) { |
239 | QDataStream styleStream( styleInformation, IO_ReadOnly ); | 248 | QDataStream styleStream( styleInformation, IO_ReadOnly ); |
240 | int num; | 249 | int num; |
241 | styleStream >> num; | 250 | styleStream >> num; |
242 | QTextParagraph *p = s; | 251 | QTextParagraph *p = s; |
243 | while ( num-- && p ) { | 252 | while ( num-- && p ) { |
244 | p->readStyleInformation( styleStream ); | 253 | p->readStyleInformation( styleStream ); |
245 | p = p->next(); | 254 | p = p->next(); |
246 | } | 255 | } |
247 | } | 256 | } |
248 | s = cursor.paragraph(); | 257 | s = cursor.paragraph(); |
249 | while ( s ) { | 258 | while ( s ) { |
250 | s->format(); | 259 | s->format(); |
251 | s->setChanged( TRUE ); | 260 | s->setChanged( TRUE ); |
252 | if ( s == c->paragraph() ) | 261 | if ( s == c->paragraph() ) |
253 | break; | 262 | break; |
254 | s = s->next(); | 263 | s = s->next(); |
255 | } | 264 | } |
256 | 265 | ||
257 | return &cursor; | 266 | return &cursor; |
258 | } | 267 | } |
259 | 268 | ||
260 | QTextFormatCommand::QTextFormatCommand( QTextDocument *d, int sid, int sidx, int eid, int eidx, | 269 | QTextFormatCommand::QTextFormatCommand( QTextDocument *d, int sid, int sidx, int eid, int eidx, |
261 | const QMemArray<QTextStringChar> &old, QTextFormat *f, int fl ) | 270 | const QMemArray<QTextStringChar> &old, QTextFormat *f, int fl ) |
262 | : QTextCommand( d ), startId( sid ), startIndex( sidx ), endId( eid ), endIndex( eidx ), format( f ), oldFormats( old ), flags( fl ) | 271 | : QTextCommand( d ), startId( sid ), startIndex( sidx ), endId( eid ), endIndex( eidx ), format( f ), oldFormats( old ), flags( fl ) |
263 | { | 272 | { |
264 | format = d->formatCollection()->format( f ); | 273 | format = d->formatCollection()->format( f ); |
265 | for ( int j = 0; j < (int)oldFormats.size(); ++j ) { | 274 | for ( int j = 0; j < (int)oldFormats.size(); ++j ) { |
266 | if ( oldFormats[ j ].format() ) | 275 | if ( oldFormats[ j ].format() ) |
267 | oldFormats[ j ].format()->addRef(); | 276 | oldFormats[ j ].format()->addRef(); |
268 | } | 277 | } |
269 | } | 278 | } |
270 | 279 | ||
271 | QTextFormatCommand::~QTextFormatCommand() | 280 | QTextFormatCommand::~QTextFormatCommand() |
272 | { | 281 | { |
273 | format->removeRef(); | 282 | format->removeRef(); |
274 | for ( int j = 0; j < (int)oldFormats.size(); ++j ) { | 283 | for ( int j = 0; j < (int)oldFormats.size(); ++j ) { |
275 | if ( oldFormats[ j ].format() ) | 284 | if ( oldFormats[ j ].format() ) |
276 | oldFormats[ j ].format()->removeRef(); | 285 | oldFormats[ j ].format()->removeRef(); |
277 | } | 286 | } |
278 | } | 287 | } |
279 | 288 | ||
280 | QTextCursor *QTextFormatCommand::execute( QTextCursor *c ) | 289 | QTextCursor *QTextFormatCommand::execute( QTextCursor *c ) |
281 | { | 290 | { |
282 | QTextParagraph *sp = doc->paragAt( startId ); | 291 | QTextParagraph *sp = doc->paragAt( startId ); |
283 | QTextParagraph *ep = doc->paragAt( endId ); | 292 | QTextParagraph *ep = doc->paragAt( endId ); |
284 | if ( !sp || !ep ) | 293 | if ( !sp || !ep ) |
285 | return c; | 294 | return c; |
286 | 295 | ||
287 | QTextCursor start( doc ); | 296 | QTextCursor start( doc ); |
288 | start.setParagraph( sp ); | 297 | start.setParagraph( sp ); |
289 | start.setIndex( startIndex ); | 298 | start.setIndex( startIndex ); |
290 | QTextCursor end( doc ); | 299 | QTextCursor end( doc ); |
291 | end.setParagraph( ep ); | 300 | end.setParagraph( ep ); |
292 | end.setIndex( endIndex ); | 301 | end.setIndex( endIndex ); |
293 | 302 | ||
294 | doc->setSelectionStart( QTextDocument::Temp, start ); | 303 | doc->setSelectionStart( QTextDocument::Temp, start ); |
295 | doc->setSelectionEnd( QTextDocument::Temp, end ); | 304 | doc->setSelectionEnd( QTextDocument::Temp, end ); |
296 | doc->setFormat( QTextDocument::Temp, format, flags ); | 305 | doc->setFormat( QTextDocument::Temp, format, flags ); |
297 | doc->removeSelection( QTextDocument::Temp ); | 306 | doc->removeSelection( QTextDocument::Temp ); |
298 | if ( endIndex == ep->length() ) | 307 | if ( endIndex == ep->length() ) |
299 | end.gotoLeft(); | 308 | end.gotoLeft(); |
300 | *c = end; | 309 | *c = end; |
301 | return c; | 310 | return c; |
302 | } | 311 | } |
303 | 312 | ||
304 | QTextCursor *QTextFormatCommand::unexecute( QTextCursor *c ) | 313 | QTextCursor *QTextFormatCommand::unexecute( QTextCursor *c ) |
305 | { | 314 | { |
306 | QTextParagraph *sp = doc->paragAt( startId ); | 315 | QTextParagraph *sp = doc->paragAt( startId ); |
307 | QTextParagraph *ep = doc->paragAt( endId ); | 316 | QTextParagraph *ep = doc->paragAt( endId ); |
308 | if ( !sp || !ep ) | 317 | if ( !sp || !ep ) |
309 | return 0; | 318 | return 0; |
310 | 319 | ||
311 | int idx = startIndex; | 320 | int idx = startIndex; |
312 | int fIndex = 0; | 321 | int fIndex = 0; |
313 | for ( ;; ) { | 322 | for ( ;; ) { |
314 | if ( oldFormats.at( fIndex ).c == '\n' ) { | 323 | if ( oldFormats.at( fIndex ).c == '\n' ) { |
315 | if ( idx > 0 ) { | 324 | if ( idx > 0 ) { |
316 | if ( idx < sp->length() && fIndex > 0 ) | 325 | if ( idx < sp->length() && fIndex > 0 ) |
317 | sp->setFormat( idx, 1, oldFormats.at( fIndex - 1 ).format() ); | 326 | sp->setFormat( idx, 1, oldFormats.at( fIndex - 1 ).format() ); |
318 | if ( sp == ep ) | 327 | if ( sp == ep ) |
319 | break; | 328 | break; |
320 | sp = sp->next(); | 329 | sp = sp->next(); |
321 | idx = 0; | 330 | idx = 0; |
322 | } | 331 | } |
323 | fIndex++; | 332 | fIndex++; |
324 | } | 333 | } |
325 | if ( oldFormats.at( fIndex ).format() ) | 334 | if ( oldFormats.at( fIndex ).format() ) |
326 | sp->setFormat( idx, 1, oldFormats.at( fIndex ).format() ); | 335 | sp->setFormat( idx, 1, oldFormats.at( fIndex ).format() ); |
327 | idx++; | 336 | idx++; |
328 | fIndex++; | 337 | fIndex++; |
329 | if ( fIndex >= (int)oldFormats.size() ) | 338 | if ( fIndex >= (int)oldFormats.size() ) |
330 | break; | 339 | break; |
331 | if ( idx >= sp->length() ) { | 340 | if ( idx >= sp->length() ) { |
@@ -1299,210 +1308,221 @@ bool QTextDocument::setMinimumWidth( int needed, int used, QTextParagraph *p ) | |||
1299 | } else if ( needed > minw ) { | 1308 | } else if ( needed > minw ) { |
1300 | minw = needed; | 1309 | minw = needed; |
1301 | minwParag = p; | 1310 | minwParag = p; |
1302 | emit minimumWidthChanged( minw ); | 1311 | emit minimumWidthChanged( minw ); |
1303 | } | 1312 | } |
1304 | wused = QMAX( wused, used ); | 1313 | wused = QMAX( wused, used ); |
1305 | wused = QMAX( wused, minw ); | 1314 | wused = QMAX( wused, minw ); |
1306 | cw = QMAX( minw, cw ); | 1315 | cw = QMAX( minw, cw ); |
1307 | return TRUE; | 1316 | return TRUE; |
1308 | } | 1317 | } |
1309 | 1318 | ||
1310 | void QTextDocument::setPlainText( const QString &text ) | 1319 | void QTextDocument::setPlainText( const QString &text ) |
1311 | { | 1320 | { |
1312 | clear(); | 1321 | clear(); |
1313 | preferRichText = FALSE; | 1322 | preferRichText = FALSE; |
1314 | oTextValid = TRUE; | 1323 | oTextValid = TRUE; |
1315 | oText = text; | 1324 | oText = text; |
1316 | 1325 | ||
1317 | int lastNl = 0; | 1326 | int lastNl = 0; |
1318 | int nl = text.find( '\n' ); | 1327 | int nl = text.find( '\n' ); |
1319 | if ( nl == -1 ) { | 1328 | if ( nl == -1 ) { |
1320 | lParag = createParagraph( this, lParag, 0 ); | 1329 | lParag = createParagraph( this, lParag, 0 ); |
1321 | if ( !fParag ) | 1330 | if ( !fParag ) |
1322 | fParag = lParag; | 1331 | fParag = lParag; |
1323 | QString s = text; | 1332 | QString s = text; |
1324 | if ( !s.isEmpty() ) { | 1333 | if ( !s.isEmpty() ) { |
1325 | if ( s[ (int)s.length() - 1 ] == '\r' ) | 1334 | if ( s[ (int)s.length() - 1 ] == '\r' ) |
1326 | s.remove( s.length() - 1, 1 ); | 1335 | s.remove( s.length() - 1, 1 ); |
1327 | lParag->append( s ); | 1336 | lParag->append( s ); |
1328 | } | 1337 | } |
1329 | } else { | 1338 | } else { |
1330 | for (;;) { | 1339 | for (;;) { |
1331 | lParag = createParagraph( this, lParag, 0 ); | 1340 | lParag = createParagraph( this, lParag, 0 ); |
1332 | if ( !fParag ) | 1341 | if ( !fParag ) |
1333 | fParag = lParag; | 1342 | fParag = lParag; |
1334 | QString s = text.mid( lastNl, nl - lastNl ); | 1343 | QString s = text.mid( lastNl, nl - lastNl ); |
1335 | if ( !s.isEmpty() ) { | 1344 | if ( !s.isEmpty() ) { |
1336 | if ( s[ (int)s.length() - 1 ] == '\r' ) | 1345 | if ( s[ (int)s.length() - 1 ] == '\r' ) |
1337 | s.remove( s.length() - 1, 1 ); | 1346 | s.remove( s.length() - 1, 1 ); |
1338 | lParag->append( s ); | 1347 | lParag->append( s ); |
1339 | } | 1348 | } |
1340 | if ( nl == 0xffffff ) | 1349 | if ( nl == 0xffffff ) |
1341 | break; | 1350 | break; |
1342 | lastNl = nl + 1; | 1351 | lastNl = nl + 1; |
1343 | nl = text.find( '\n', nl + 1 ); | 1352 | nl = text.find( '\n', nl + 1 ); |
1344 | if ( nl == -1 ) | 1353 | if ( nl == -1 ) |
1345 | nl = 0xffffff; | 1354 | nl = 0xffffff; |
1346 | } | 1355 | } |
1347 | } | 1356 | } |
1348 | if ( !lParag ) | 1357 | if ( !lParag ) |
1349 | lParag = fParag = createParagraph( this, 0, 0 ); | 1358 | lParag = fParag = createParagraph( this, 0, 0 ); |
1350 | } | 1359 | } |
1351 | 1360 | ||
1352 | struct Q_EXPORT QTextDocumentTag { | 1361 | struct Q_EXPORT QTextDocumentTag { |
1353 | QTextDocumentTag(){} | 1362 | QTextDocumentTag(){} |
1354 | QTextDocumentTag( const QString&n, const QStyleSheetItem* s, const QTextFormat& f ) | 1363 | QTextDocumentTag( const QString&n, const QStyleSheetItem* s, const QTextFormat& f ) |
1355 | :name(n),style(s), format(f), alignment(Qt3::AlignAuto), direction(QChar::DirON),liststyle(QStyleSheetItem::ListDisc) { | 1364 | :name(n),style(s), format(f), alignment(Qt3::AlignAuto), direction(QChar::DirON),liststyle(QStyleSheetItem::ListDisc) { |
1356 | wsm = QStyleSheetItem::WhiteSpaceNormal; | 1365 | wsm = QStyleSheetItem::WhiteSpaceNormal; |
1357 | } | 1366 | } |
1358 | QString name; | 1367 | QString name; |
1359 | const QStyleSheetItem* style; | 1368 | const QStyleSheetItem* style; |
1360 | QString anchorHref; | 1369 | QString anchorHref; |
1361 | QStyleSheetItem::WhiteSpaceMode wsm; | 1370 | QStyleSheetItem::WhiteSpaceMode wsm; |
1362 | QTextFormat format; | 1371 | QTextFormat format; |
1363 | int alignment : 16; | 1372 | int alignment : 16; |
1364 | int direction : 5; | 1373 | int direction : 5; |
1365 | QStyleSheetItem::ListStyle liststyle; | 1374 | QStyleSheetItem::ListStyle liststyle; |
1366 | 1375 | ||
1367 | QTextDocumentTag( const QTextDocumentTag& t ) { | 1376 | QTextDocumentTag( const QTextDocumentTag& t ) { |
1368 | name = t.name; | 1377 | name = t.name; |
1369 | style = t.style; | 1378 | style = t.style; |
1370 | anchorHref = t.anchorHref; | 1379 | anchorHref = t.anchorHref; |
1371 | wsm = t.wsm; | 1380 | wsm = t.wsm; |
1372 | format = t.format; | 1381 | format = t.format; |
1373 | alignment = t.alignment; | 1382 | alignment = t.alignment; |
1374 | direction = t.direction; | 1383 | direction = t.direction; |
1375 | liststyle = t.liststyle; | 1384 | liststyle = t.liststyle; |
1376 | } | 1385 | } |
1377 | QTextDocumentTag& operator=(const QTextDocumentTag& t) { | 1386 | QTextDocumentTag& operator=(const QTextDocumentTag& t) { |
1378 | name = t.name; | 1387 | name = t.name; |
1379 | style = t.style; | 1388 | style = t.style; |
1380 | anchorHref = t.anchorHref; | 1389 | anchorHref = t.anchorHref; |
1381 | wsm = t.wsm; | 1390 | wsm = t.wsm; |
1382 | format = t.format; | 1391 | format = t.format; |
1383 | alignment = t.alignment; | 1392 | alignment = t.alignment; |
1384 | direction = t.direction; | 1393 | direction = t.direction; |
1385 | liststyle = t.liststyle; | 1394 | liststyle = t.liststyle; |
1386 | return *this; | 1395 | return *this; |
1387 | } | 1396 | } |
1388 | 1397 | ||
1389 | #if defined(Q_FULL_TEMPLATE_INSTANTIATION) | 1398 | #if defined(Q_FULL_TEMPLATE_INSTANTIATION) |
1390 | bool operator==( const QTextDocumentTag& ) const { return FALSE; } | 1399 | bool operator==( const QTextDocumentTag& ) const { return FALSE; } |
1391 | #endif | 1400 | #endif |
1392 | }; | 1401 | }; |
1393 | 1402 | ||
1394 | 1403 | ||
1395 | #define NEWPAR do{ if ( !hasNewPar) { \ | 1404 | #define NEWPAR do { \ |
1396 | if ( !textEditMode && curpar && curpar->length()>1 && curpar->at( curpar->length()-2)->c == QChar_linesep ) \ | 1405 | if ( !hasNewPar) { \ |
1397 | curpar->remove( curpar->length()-2, 1 ); \ | 1406 | if ( !curpar ) { \ |
1398 | curpar = createParagraph( this, curpar, curpar->next() ); styles.append( vec ); vec = 0;} \ | 1407 | owarn << "no current paragraph" << oendl; \ |
1399 | hasNewPar = TRUE; \ | 1408 | return; \ |
1400 | curpar->rtext = TRUE; \ | 1409 | } \ |
1401 | curpar->align = curtag.alignment; \ | 1410 | if ( !textEditMode && curpar && curpar->length()>1 && curpar->at( curpar->length()-2)->c == QChar_linesep ) \ |
1402 | curpar->lstyle = curtag.liststyle; \ | 1411 | curpar->remove( curpar->length()-2, 1 ); \ |
1403 | curpar->litem = ( curtag.style->displayMode() == QStyleSheetItem::DisplayListItem ); \ | 1412 | curpar = createParagraph( this, curpar, curpar->next() ); styles.append( vec ); \ |
1404 | curpar->str->setDirection( (QChar::Direction)curtag.direction ); \ | 1413 | if ( !curpar ) { \ |
1405 | space = TRUE; \ | 1414 | owarn << "failed in creating a new paragraph" << oendl; \ |
1406 | delete vec; vec = new QPtrVector<QStyleSheetItem>( (uint)tags.count() + 1); \ | 1415 | return; \ |
1407 | int i = 0; \ | 1416 | } \ |
1408 | for ( QValueStack<QTextDocumentTag>::Iterator it = tags.begin(); it != tags.end(); ++it ) \ | 1417 | vec = 0; \ |
1409 | vec->insert( i++, (*it).style ); \ | 1418 | } \ |
1410 | vec->insert( i, curtag.style ); \ | 1419 | hasNewPar = TRUE; \ |
1411 | }while(FALSE) | 1420 | curpar->rtext = TRUE; \ |
1412 | 1421 | curpar->align = curtag.alignment; \ | |
1422 | curpar->lstyle = curtag.liststyle; \ | ||
1423 | curpar->litem = ( curtag.style->displayMode() == QStyleSheetItem::DisplayListItem ); \ | ||
1424 | curpar->str->setDirection( (QChar::Direction)curtag.direction ); \ | ||
1425 | space = TRUE; \ | ||
1426 | delete vec; \ | ||
1427 | vec = new QPtrVector<QStyleSheetItem>( (uint)tags.count() + 1); \ | ||
1428 | int i = 0; \ | ||
1429 | for ( QValueStack<QTextDocumentTag>::Iterator it = tags.begin(); it != tags.end(); ++it ) \ | ||
1430 | vec->insert( i++, (*it).style ); \ | ||
1431 | vec->insert( i, curtag.style ); \ | ||
1432 | } while ( FALSE ) | ||
1413 | 1433 | ||
1414 | void QTextDocument::setRichText( const QString &text, const QString &context ) | 1434 | void QTextDocument::setRichText( const QString &text, const QString &context ) |
1415 | { | 1435 | { |
1416 | if ( !context.isEmpty() ) | 1436 | if ( !context.isEmpty() ) |
1417 | setContext( context ); | 1437 | setContext( context ); |
1418 | clear(); | 1438 | clear(); |
1419 | fParag = lParag = createParagraph( this ); | 1439 | fParag = lParag = createParagraph( this ); |
1420 | oTextValid = TRUE; | 1440 | oTextValid = TRUE; |
1421 | oText = text; | 1441 | oText = text; |
1422 | setRichTextInternal( text ); | 1442 | setRichTextInternal( text ); |
1423 | fParag->rtext = TRUE; | 1443 | fParag->rtext = TRUE; |
1424 | } | 1444 | } |
1425 | 1445 | ||
1426 | void QTextDocument::setRichTextInternal( const QString &text, QTextCursor* cursor ) | 1446 | void QTextDocument::setRichTextInternal( const QString &text, QTextCursor* cursor ) |
1427 | { | 1447 | { |
1428 | QTextParagraph* curpar = lParag; | 1448 | QTextParagraph* curpar = lParag; |
1429 | int pos = 0; | 1449 | int pos = 0; |
1430 | QValueStack<QTextDocumentTag> tags; | 1450 | QValueStack<QTextDocumentTag> tags; |
1431 | QTextDocumentTag initag( "", sheet_->item(""), *formatCollection()->defaultFormat() ); | 1451 | QTextDocumentTag initag( "", sheet_->item(""), *formatCollection()->defaultFormat() ); |
1432 | QTextDocumentTag curtag = initag; | 1452 | QTextDocumentTag curtag = initag; |
1433 | bool space = TRUE; | 1453 | bool space = TRUE; |
1434 | bool canMergeLi = FALSE; | 1454 | bool canMergeLi = FALSE; |
1435 | 1455 | ||
1436 | bool textEditMode = FALSE; | 1456 | bool textEditMode = FALSE; |
1437 | 1457 | ||
1438 | const QChar* doc = text.unicode(); | 1458 | const QChar* doc = text.unicode(); |
1439 | int length = text.length(); | 1459 | int length = text.length(); |
1440 | bool hasNewPar = curpar->length() <= 1; | 1460 | bool hasNewPar = curpar->length() <= 1; |
1441 | QString anchorName; | 1461 | QString anchorName; |
1442 | 1462 | ||
1443 | // style sheet handling for margin and line spacing calculation below | 1463 | // style sheet handling for margin and line spacing calculation below |
1444 | QTextParagraph* stylesPar = curpar; | 1464 | QTextParagraph* stylesPar = curpar; |
1445 | QPtrVector<QStyleSheetItem>* vec = 0; | 1465 | QPtrVector<QStyleSheetItem>* vec = 0; |
1446 | QPtrList< QPtrVector<QStyleSheetItem> > styles; | 1466 | QPtrList< QPtrVector<QStyleSheetItem> > styles; |
1447 | styles.setAutoDelete( TRUE ); | 1467 | styles.setAutoDelete( TRUE ); |
1448 | 1468 | ||
1449 | if ( cursor ) { | 1469 | if ( cursor ) { |
1450 | cursor->splitAndInsertEmptyParagraph(); | 1470 | cursor->splitAndInsertEmptyParagraph(); |
1451 | QTextCursor tmp = *cursor; | 1471 | QTextCursor tmp = *cursor; |
1452 | tmp.gotoPreviousLetter(); | 1472 | tmp.gotoPreviousLetter(); |
1453 | stylesPar = curpar = tmp.paragraph(); | 1473 | stylesPar = curpar = tmp.paragraph(); |
1454 | hasNewPar = TRUE; | 1474 | hasNewPar = TRUE; |
1455 | textEditMode = TRUE; | 1475 | textEditMode = TRUE; |
1456 | } else { | 1476 | } else { |
1457 | NEWPAR; | 1477 | NEWPAR; |
1458 | } | 1478 | } |
1459 | 1479 | ||
1460 | // set rtext spacing to FALSE for the initial paragraph. | 1480 | // set rtext spacing to FALSE for the initial paragraph. |
1461 | curpar->rtext = FALSE; | 1481 | curpar->rtext = FALSE; |
1462 | 1482 | ||
1463 | QString wellKnownTags = "br hr wsp table qt body meta title"; | 1483 | QString wellKnownTags = "br hr wsp table qt body meta title"; |
1464 | 1484 | ||
1465 | while ( pos < length ) { | 1485 | while ( pos < length ) { |
1466 | if ( hasPrefix(doc, length, pos, '<' ) ){ | 1486 | if ( hasPrefix(doc, length, pos, '<' ) ){ |
1467 | if ( !hasPrefix( doc, length, pos+1, QChar('/') ) ) { | 1487 | if ( !hasPrefix( doc, length, pos+1, QChar('/') ) ) { |
1468 | // open tag | 1488 | // open tag |
1469 | QMap<QString, QString> attr; | 1489 | QMap<QString, QString> attr; |
1470 | bool emptyTag = FALSE; | 1490 | bool emptyTag = FALSE; |
1471 | QString tagname = parseOpenTag(doc, length, pos, attr, emptyTag); | 1491 | QString tagname = parseOpenTag(doc, length, pos, attr, emptyTag); |
1472 | if ( tagname.isEmpty() ) | 1492 | if ( tagname.isEmpty() ) |
1473 | continue; // nothing we could do with this, probably parse error | 1493 | continue; // nothing we could do with this, probably parse error |
1474 | 1494 | ||
1475 | const QStyleSheetItem* nstyle = sheet_->item(tagname); | 1495 | const QStyleSheetItem* nstyle = sheet_->item(tagname); |
1476 | 1496 | ||
1477 | if ( nstyle ) { | 1497 | if ( nstyle ) { |
1478 | // we might have to close some 'forgotten' tags | 1498 | // we might have to close some 'forgotten' tags |
1479 | while ( !nstyle->allowedInContext( curtag.style ) ) { | 1499 | while ( !nstyle->allowedInContext( curtag.style ) ) { |
1480 | QString msg; | 1500 | QString msg; |
1481 | msg.sprintf( "QText Warning: Document not valid ( '%s' not allowed in '%s' #%d)", | 1501 | msg.sprintf( "QText Warning: Document not valid ( '%s' not allowed in '%s' #%d)", |
1482 | tagname.ascii(), curtag.style->name().ascii(), pos); | 1502 | tagname.ascii(), curtag.style->name().ascii(), pos); |
1483 | sheet_->error( msg ); | 1503 | sheet_->error( msg ); |
1484 | if ( tags.isEmpty() ) | 1504 | if ( tags.isEmpty() ) |
1485 | break; | 1505 | break; |
1486 | curtag = tags.pop(); | 1506 | curtag = tags.pop(); |
1487 | } | 1507 | } |
1488 | 1508 | ||
1489 | /* special handling for p and li for HTML | 1509 | /* special handling for p and li for HTML |
1490 | compatibility. We do not want to embed blocks in | 1510 | compatibility. We do not want to embed blocks in |
1491 | p, and we do not want new blocks inside non-empty | 1511 | p, and we do not want new blocks inside non-empty |
1492 | lis. Plus we want to merge empty lis sometimes. */ | 1512 | lis. Plus we want to merge empty lis sometimes. */ |
1493 | if( nstyle->displayMode() == QStyleSheetItem::DisplayListItem ) { | 1513 | if( nstyle->displayMode() == QStyleSheetItem::DisplayListItem ) { |
1494 | canMergeLi = TRUE; | 1514 | canMergeLi = TRUE; |
1495 | } else if ( nstyle->displayMode() == QStyleSheetItem::DisplayBlock ) { | 1515 | } else if ( nstyle->displayMode() == QStyleSheetItem::DisplayBlock ) { |
1496 | while ( curtag.style->name() == "p" ) { | 1516 | while ( curtag.style->name() == "p" ) { |
1497 | if ( tags.isEmpty() ) | 1517 | if ( tags.isEmpty() ) |
1498 | break; | 1518 | break; |
1499 | curtag = tags.pop(); | 1519 | curtag = tags.pop(); |
1500 | } | 1520 | } |
1501 | 1521 | ||
1502 | if ( curtag.style->displayMode() == QStyleSheetItem::DisplayListItem ) { | 1522 | if ( curtag.style->displayMode() == QStyleSheetItem::DisplayListItem ) { |
1503 | // we are in a li and a new block comes along | 1523 | // we are in a li and a new block comes along |
1504 | if ( nstyle->name() == "ul" || nstyle->name() == "ol" ) | 1524 | if ( nstyle->name() == "ul" || nstyle->name() == "ol" ) |
1505 | hasNewPar = FALSE; // we want an empty li (like most browsers) | 1525 | hasNewPar = FALSE; // we want an empty li (like most browsers) |
1506 | if ( !hasNewPar ) { | 1526 | if ( !hasNewPar ) { |
1507 | /* do not add new blocks inside | 1527 | /* do not add new blocks inside |
1508 | non-empty lis */ | 1528 | non-empty lis */ |
@@ -1802,194 +1822,197 @@ void QTextDocument::setRichTextInternal( const QString &text, QTextCursor* curso | |||
1802 | c = parseChar( doc, length, pos, QStyleSheetItem::WhiteSpacePre ); | 1822 | c = parseChar( doc, length, pos, QStyleSheetItem::WhiteSpacePre ); |
1803 | if ( c == QChar_linesep ) | 1823 | if ( c == QChar_linesep ) |
1804 | break; | 1824 | break; |
1805 | } else { | 1825 | } else { |
1806 | int l = pos; | 1826 | int l = pos; |
1807 | c = parseChar( doc, length, pos, curtag.wsm ); | 1827 | c = parseChar( doc, length, pos, curtag.wsm ); |
1808 | 1828 | ||
1809 | // in white space pre mode: treat any space as non breakable | 1829 | // in white space pre mode: treat any space as non breakable |
1810 | if ( c == ' ' && curtag.wsm == QStyleSheetItem::WhiteSpacePre ) | 1830 | if ( c == ' ' && curtag.wsm == QStyleSheetItem::WhiteSpacePre ) |
1811 | c = QChar::nbsp; | 1831 | c = QChar::nbsp; |
1812 | 1832 | ||
1813 | if ( c == ' ' || c == QChar_linesep ) { | 1833 | if ( c == ' ' || c == QChar_linesep ) { |
1814 | /* avoid overlong paragraphs by forcing a new | 1834 | /* avoid overlong paragraphs by forcing a new |
1815 | paragraph after 4096 characters. This case can | 1835 | paragraph after 4096 characters. This case can |
1816 | occur when loading undiscovered plain text | 1836 | occur when loading undiscovered plain text |
1817 | documents in rich text mode. Instead of hanging | 1837 | documents in rich text mode. Instead of hanging |
1818 | forever, we do the trick. | 1838 | forever, we do the trick. |
1819 | */ | 1839 | */ |
1820 | if ( curtag.wsm == QStyleSheetItem::WhiteSpaceNormal && s.length() > 4096 ) do { | 1840 | if ( curtag.wsm == QStyleSheetItem::WhiteSpaceNormal && s.length() > 4096 ) do { |
1821 | if ( doc[l] == '\n' ) { | 1841 | if ( doc[l] == '\n' ) { |
1822 | hasNewPar = FALSE; // for a new paragraph ... | 1842 | hasNewPar = FALSE; // for a new paragraph ... |
1823 | NEWPAR; | 1843 | NEWPAR; |
1824 | hasNewPar = FALSE; // ... and make it non-reusable | 1844 | hasNewPar = FALSE; // ... and make it non-reusable |
1825 | c = '\n'; // make sure we break below | 1845 | c = '\n'; // make sure we break below |
1826 | break; | 1846 | break; |
1827 | } | 1847 | } |
1828 | } while ( ++l < pos ); | 1848 | } while ( ++l < pos ); |
1829 | } | 1849 | } |
1830 | } | 1850 | } |
1831 | 1851 | ||
1832 | if ( c == '\n' ) | 1852 | if ( c == '\n' ) |
1833 | break; // break on newlines, pre delievers a QChar_linesep | 1853 | break; // break on newlines, pre delievers a QChar_linesep |
1834 | 1854 | ||
1835 | bool c_isSpace = c.isSpace() && c.unicode() != 0x00a0U && !textEditMode; | 1855 | bool c_isSpace = c.isSpace() && c.unicode() != 0x00a0U && !textEditMode; |
1836 | 1856 | ||
1837 | if ( curtag.wsm == QStyleSheetItem::WhiteSpaceNormal && c_isSpace && space ) | 1857 | if ( curtag.wsm == QStyleSheetItem::WhiteSpaceNormal && c_isSpace && space ) |
1838 | continue; | 1858 | continue; |
1839 | if ( c == '\r' ) | 1859 | if ( c == '\r' ) |
1840 | continue; | 1860 | continue; |
1841 | space = c_isSpace; | 1861 | space = c_isSpace; |
1842 | s += c; | 1862 | s += c; |
1843 | } | 1863 | } |
1844 | if ( !s.isEmpty() && curtag.style->displayMode() != QStyleSheetItem::DisplayNone ) { | 1864 | if ( !s.isEmpty() && curtag.style->displayMode() != QStyleSheetItem::DisplayNone ) { |
1845 | hasNewPar = FALSE; | 1865 | hasNewPar = FALSE; |
1846 | int index = QMAX( curpar->length(),1) - 1; | 1866 | int index = QMAX( curpar->length(),1) - 1; |
1847 | curpar->append( s ); | 1867 | curpar->append( s ); |
1848 | QTextFormat* f = formatCollection()->format( &curtag.format ); | 1868 | QTextFormat* f = formatCollection()->format( &curtag.format ); |
1849 | curpar->setFormat( index, s.length(), f, FALSE ); // do not use collection because we have done that already | 1869 | curpar->setFormat( index, s.length(), f, FALSE ); // do not use collection because we have done that already |
1850 | f->ref += s.length() -1; // that what friends are for... | 1870 | f->ref += s.length() -1; // that what friends are for... |
1851 | if ( !curtag.anchorHref.isEmpty() ) { | 1871 | if ( !curtag.anchorHref.isEmpty() ) { |
1852 | for ( int i = 0; i < int(s.length()); i++ ) | 1872 | for ( int i = 0; i < int(s.length()); i++ ) |
1853 | curpar->at(index + i)->setAnchor( QString::null, curtag.anchorHref ); | 1873 | curpar->at(index + i)->setAnchor( QString::null, curtag.anchorHref ); |
1854 | } | 1874 | } |
1855 | if ( !anchorName.isEmpty() ) { | 1875 | if ( !anchorName.isEmpty() ) { |
1856 | curpar->at(index)->setAnchor( anchorName, curpar->at(index)->anchorHref() ); | 1876 | curpar->at(index)->setAnchor( anchorName, curpar->at(index)->anchorHref() ); |
1857 | anchorName = QString::null; | 1877 | anchorName = QString::null; |
1858 | } | 1878 | } |
1859 | } | 1879 | } |
1860 | } | 1880 | } |
1861 | } | 1881 | } |
1862 | if ( hasNewPar && curpar != fParag && !cursor ) { | 1882 | if ( hasNewPar && curpar != fParag && !cursor ) { |
1863 | // cleanup unused last paragraphs | 1883 | // cleanup unused last paragraphs |
1864 | curpar = curpar->p; | 1884 | curpar = curpar->p; |
1865 | delete curpar->n; | 1885 | delete curpar->n; |
1866 | } | 1886 | } |
1867 | if ( !anchorName.isEmpty() ) { | 1887 | if ( !anchorName.isEmpty() ) { |
1868 | curpar->at(curpar->length() - 1)->setAnchor( anchorName, curpar->at( curpar->length() - 1 )->anchorHref() ); | 1888 | curpar->at(curpar->length() - 1)->setAnchor( anchorName, curpar->at( curpar->length() - 1 )->anchorHref() ); |
1869 | anchorName = QString::null; | 1889 | anchorName = QString::null; |
1870 | } | 1890 | } |
1871 | 1891 | ||
1872 | 1892 | ||
1873 | setRichTextMarginsInternal( styles, stylesPar ); | 1893 | setRichTextMarginsInternal( styles, stylesPar ); |
1874 | 1894 | ||
1875 | if ( cursor ) { | 1895 | if ( cursor ) { |
1876 | cursor->gotoPreviousLetter(); | 1896 | cursor->gotoPreviousLetter(); |
1877 | cursor->remove(); | 1897 | cursor->remove(); |
1878 | } | 1898 | } |
1879 | 1899 | ||
1880 | } | 1900 | } |
1881 | 1901 | ||
1882 | void QTextDocument::setRichTextMarginsInternal( QPtrList< QPtrVector<QStyleSheetItem> >& styles, QTextParagraph* stylesPar ) | 1902 | void QTextDocument::setRichTextMarginsInternal( QPtrList< QPtrVector<QStyleSheetItem> >& styles, QTextParagraph* stylesPar ) |
1883 | { | 1903 | { |
1884 | // margin and line spacing calculation | 1904 | // margin and line spacing calculation |
1885 | QPtrVector<QStyleSheetItem>* prevStyle = 0; | 1905 | QPtrVector<QStyleSheetItem>* prevStyle = 0; |
1886 | QPtrVector<QStyleSheetItem>* curStyle = styles.first(); | 1906 | QPtrVector<QStyleSheetItem>* curStyle = styles.first(); |
1887 | QPtrVector<QStyleSheetItem>* nextStyle = styles.next(); | 1907 | QPtrVector<QStyleSheetItem>* nextStyle = styles.next(); |
1888 | while ( stylesPar ) { | 1908 | while ( stylesPar ) { |
1889 | if ( !curStyle ) { | 1909 | if ( !curStyle ) { |
1890 | stylesPar = stylesPar->next(); | 1910 | stylesPar = stylesPar->next(); |
1891 | prevStyle = curStyle; | 1911 | prevStyle = curStyle; |
1892 | curStyle = nextStyle; | 1912 | curStyle = nextStyle; |
1893 | nextStyle = styles.next(); | 1913 | nextStyle = styles.next(); |
1894 | continue; | 1914 | continue; |
1895 | } | 1915 | } |
1896 | 1916 | ||
1897 | int i, mar; | 1917 | int i, mar; |
1898 | QStyleSheetItem* mainStyle = curStyle->size() ? (*curStyle)[curStyle->size()-1] : 0; | 1918 | QStyleSheetItem* mainStyle = (*curStyle)[curStyle->size()-1]; |
1899 | if ( mainStyle && mainStyle->displayMode() == QStyleSheetItem::DisplayListItem ) | 1919 | if ( !mainStyle ) |
1920 | return; | ||
1921 | |||
1922 | if ( mainStyle->displayMode() == QStyleSheetItem::DisplayListItem ) | ||
1900 | stylesPar->setListItem( TRUE ); | 1923 | stylesPar->setListItem( TRUE ); |
1901 | int numLists = 0; | 1924 | int numLists = 0; |
1902 | for ( i = 0; i < (int)curStyle->size(); ++i ) { | 1925 | for ( i = 0; i < (int)curStyle->size(); ++i ) { |
1903 | if ( (*curStyle)[ i ]->displayMode() == QStyleSheetItem::DisplayBlock | 1926 | if ( (*curStyle)[ i ]->displayMode() == QStyleSheetItem::DisplayBlock |
1904 | && int((*curStyle)[ i ]->listStyle()) != QStyleSheetItem::Undefined ) | 1927 | && int((*curStyle)[ i ]->listStyle()) != QStyleSheetItem::Undefined ) |
1905 | numLists++; | 1928 | numLists++; |
1906 | } | 1929 | } |
1907 | stylesPar->ldepth = numLists; | 1930 | stylesPar->ldepth = numLists; |
1908 | if ( stylesPar->next() && nextStyle ) { | 1931 | if ( stylesPar->next() && nextStyle ) { |
1909 | // also set the depth of the next paragraph, required for the margin calculation | 1932 | // also set the depth of the next paragraph, required for the margin calculation |
1910 | numLists = 0; | 1933 | numLists = 0; |
1911 | for ( i = 0; i < (int)nextStyle->size(); ++i ) { | 1934 | for ( i = 0; i < (int)nextStyle->size(); ++i ) { |
1912 | if ( (*nextStyle)[ i ]->displayMode() == QStyleSheetItem::DisplayBlock | 1935 | if ( (*nextStyle)[ i ]->displayMode() == QStyleSheetItem::DisplayBlock |
1913 | && int((*nextStyle)[ i ]->listStyle()) != QStyleSheetItem::Undefined ) | 1936 | && int((*nextStyle)[ i ]->listStyle()) != QStyleSheetItem::Undefined ) |
1914 | numLists++; | 1937 | numLists++; |
1915 | } | 1938 | } |
1916 | stylesPar->next()->ldepth = numLists; | 1939 | stylesPar->next()->ldepth = numLists; |
1917 | } | 1940 | } |
1918 | 1941 | ||
1919 | // do the top margin | 1942 | // do the top margin |
1920 | QStyleSheetItem* item = mainStyle; | 1943 | QStyleSheetItem* item = mainStyle; |
1921 | int m; | 1944 | int m; |
1922 | if (stylesPar->utm > 0 ) { | 1945 | if (stylesPar->utm > 0 ) { |
1923 | m = stylesPar->utm-1; | 1946 | m = stylesPar->utm-1; |
1924 | stylesPar->utm = 0; | 1947 | stylesPar->utm = 0; |
1925 | } else { | 1948 | } else { |
1926 | m = QMAX(0, item->margin( QStyleSheetItem::MarginTop ) ); | 1949 | m = QMAX(0, item->margin( QStyleSheetItem::MarginTop ) ); |
1927 | if ( item->displayMode() == QStyleSheetItem::DisplayListItem | 1950 | if ( item->displayMode() == QStyleSheetItem::DisplayListItem |
1928 | && stylesPar->ldepth ) | 1951 | && stylesPar->ldepth ) |
1929 | m /= stylesPar->ldepth; | 1952 | m /= stylesPar->ldepth; |
1930 | } | 1953 | } |
1931 | for ( i = (int)curStyle->size() - 2 ; i >= 0; --i ) { | 1954 | for ( i = (int)curStyle->size() - 2 ; i >= 0; --i ) { |
1932 | item = (*curStyle)[ i ]; | 1955 | item = (*curStyle)[ i ]; |
1933 | if ( prevStyle && i < (int) prevStyle->size() && | 1956 | if ( prevStyle && i < (int) prevStyle->size() && |
1934 | ( item->displayMode() == QStyleSheetItem::DisplayBlock && | 1957 | ( item->displayMode() == QStyleSheetItem::DisplayBlock && |
1935 | (*prevStyle)[ i ] == item ) ) | 1958 | (*prevStyle)[ i ] == item ) ) |
1936 | break; | 1959 | break; |
1937 | // emulate CSS2' standard 0 vertical margin for multiple ul or ol tags | 1960 | // emulate CSS2' standard 0 vertical margin for multiple ul or ol tags |
1938 | if ( int(item->listStyle()) != QStyleSheetItem::Undefined && | 1961 | if ( int(item->listStyle()) != QStyleSheetItem::Undefined && |
1939 | ( ( i> 0 && (*curStyle)[ i-1 ] == item ) || (*curStyle)[i+1] == item ) ) | 1962 | ( ( i> 0 && (*curStyle)[ i-1 ] == item ) || (*curStyle)[i+1] == item ) ) |
1940 | continue; | 1963 | continue; |
1941 | mar = QMAX( 0, item->margin( QStyleSheetItem::MarginTop ) ); | 1964 | mar = QMAX( 0, item->margin( QStyleSheetItem::MarginTop ) ); |
1942 | m = QMAX( m, mar ); | 1965 | m = QMAX( m, mar ); |
1943 | } | 1966 | } |
1944 | stylesPar->utm = m - stylesPar->topMargin(); | 1967 | stylesPar->utm = m - stylesPar->topMargin(); |
1945 | 1968 | ||
1946 | // do the bottom margin | 1969 | // do the bottom margin |
1947 | item = mainStyle; | 1970 | item = mainStyle; |
1948 | if (stylesPar->ubm > 0 ) { | 1971 | if (stylesPar->ubm > 0 ) { |
1949 | m = stylesPar->ubm-1; | 1972 | m = stylesPar->ubm-1; |
1950 | stylesPar->ubm = 0; | 1973 | stylesPar->ubm = 0; |
1951 | } else { | 1974 | } else { |
1952 | m = QMAX(0, item->margin( QStyleSheetItem::MarginBottom ) ); | 1975 | m = QMAX(0, item->margin( QStyleSheetItem::MarginBottom ) ); |
1953 | if ( item->displayMode() == QStyleSheetItem::DisplayListItem | 1976 | if ( item->displayMode() == QStyleSheetItem::DisplayListItem |
1954 | && stylesPar->ldepth ) | 1977 | && stylesPar->ldepth ) |
1955 | m /= stylesPar->ldepth; | 1978 | m /= stylesPar->ldepth; |
1956 | } | 1979 | } |
1957 | for ( i = (int)curStyle->size() - 2 ; i >= 0; --i ) { | 1980 | for ( i = (int)curStyle->size() - 2 ; i >= 0; --i ) { |
1958 | item = (*curStyle)[ i ]; | 1981 | item = (*curStyle)[ i ]; |
1959 | if ( nextStyle && i < (int) nextStyle->size() && | 1982 | if ( nextStyle && i < (int) nextStyle->size() && |
1960 | ( item->displayMode() == QStyleSheetItem::DisplayBlock && | 1983 | ( item->displayMode() == QStyleSheetItem::DisplayBlock && |
1961 | (*nextStyle)[ i ] == item ) ) | 1984 | (*nextStyle)[ i ] == item ) ) |
1962 | break; | 1985 | break; |
1963 | // emulate CSS2' standard 0 vertical margin for multiple ul or ol tags | 1986 | // emulate CSS2' standard 0 vertical margin for multiple ul or ol tags |
1964 | if ( int(item->listStyle()) != QStyleSheetItem::Undefined && | 1987 | if ( int(item->listStyle()) != QStyleSheetItem::Undefined && |
1965 | ( ( i> 0 && (*curStyle)[ i-1 ] == item ) || (*curStyle)[i+1] == item ) ) | 1988 | ( ( i> 0 && (*curStyle)[ i-1 ] == item ) || (*curStyle)[i+1] == item ) ) |
1966 | continue; | 1989 | continue; |
1967 | mar = QMAX(0, item->margin( QStyleSheetItem::MarginBottom ) ); | 1990 | mar = QMAX(0, item->margin( QStyleSheetItem::MarginBottom ) ); |
1968 | m = QMAX( m, mar ); | 1991 | m = QMAX( m, mar ); |
1969 | } | 1992 | } |
1970 | stylesPar->ubm = m - stylesPar->bottomMargin(); | 1993 | stylesPar->ubm = m - stylesPar->bottomMargin(); |
1971 | 1994 | ||
1972 | // do the left margin, simplyfied | 1995 | // do the left margin, simplyfied |
1973 | item = mainStyle; | 1996 | item = mainStyle; |
1974 | if (stylesPar->ulm > 0 ) { | 1997 | if (stylesPar->ulm > 0 ) { |
1975 | m = stylesPar->ulm-1; | 1998 | m = stylesPar->ulm-1; |
1976 | stylesPar->ulm = 0; | 1999 | stylesPar->ulm = 0; |
1977 | } else { | 2000 | } else { |
1978 | m = QMAX( 0, item->margin( QStyleSheetItem::MarginLeft ) ); | 2001 | m = QMAX( 0, item->margin( QStyleSheetItem::MarginLeft ) ); |
1979 | } | 2002 | } |
1980 | for ( i = (int)curStyle->size() - 2 ; i >= 0; --i ) { | 2003 | for ( i = (int)curStyle->size() - 2 ; i >= 0; --i ) { |
1981 | item = (*curStyle)[ i ]; | 2004 | item = (*curStyle)[ i ]; |
1982 | m += QMAX( 0, item->margin( QStyleSheetItem::MarginLeft ) ); | 2005 | m += QMAX( 0, item->margin( QStyleSheetItem::MarginLeft ) ); |
1983 | } | 2006 | } |
1984 | stylesPar->ulm = m - stylesPar->leftMargin(); | 2007 | stylesPar->ulm = m - stylesPar->leftMargin(); |
1985 | 2008 | ||
1986 | // do the right margin, simplyfied | 2009 | // do the right margin, simplyfied |
1987 | item = mainStyle; | 2010 | item = mainStyle; |
1988 | if (stylesPar->urm > 0 ) { | 2011 | if (stylesPar->urm > 0 ) { |
1989 | m = stylesPar->urm-1; | 2012 | m = stylesPar->urm-1; |
1990 | stylesPar->urm = 0; | 2013 | stylesPar->urm = 0; |
1991 | } else { | 2014 | } else { |
1992 | m = QMAX( 0, item->margin( QStyleSheetItem::MarginRight ) ); | 2015 | m = QMAX( 0, item->margin( QStyleSheetItem::MarginRight ) ); |
1993 | } | 2016 | } |
1994 | for ( i = (int)curStyle->size() - 2 ; i >= 0; --i ) { | 2017 | for ( i = (int)curStyle->size() - 2 ; i >= 0; --i ) { |
1995 | item = (*curStyle)[ i ]; | 2018 | item = (*curStyle)[ i ]; |
@@ -5248,193 +5271,193 @@ int QTextFormatterBreakInWords::format( QTextDocument *doc,QTextParagraph *parag | |||
5248 | col = 0; | 5271 | col = 0; |
5249 | if ( wrapAtColumn() != -1 ) | 5272 | if ( wrapAtColumn() != -1 ) |
5250 | minw = QMAX( minw, w ); | 5273 | minw = QMAX( minw, w ); |
5251 | } else if ( lineStart ) { | 5274 | } else if ( lineStart ) { |
5252 | lineStart->baseLine = QMAX( lineStart->baseLine, c->ascent() ); | 5275 | lineStart->baseLine = QMAX( lineStart->baseLine, c->ascent() ); |
5253 | h = QMAX( h, c->height() ); | 5276 | h = QMAX( h, c->height() ); |
5254 | lineStart->h = h; | 5277 | lineStart->h = h; |
5255 | } | 5278 | } |
5256 | 5279 | ||
5257 | c->x = x; | 5280 | c->x = x; |
5258 | x += ww; | 5281 | x += ww; |
5259 | wused = QMAX( wused, x ); | 5282 | wused = QMAX( wused, x ); |
5260 | } | 5283 | } |
5261 | 5284 | ||
5262 | int m = parag->bottomMargin(); | 5285 | int m = parag->bottomMargin(); |
5263 | if ( !parag->next() ) | 5286 | if ( !parag->next() ) |
5264 | m = 0; | 5287 | m = 0; |
5265 | else | 5288 | else |
5266 | m = QMAX(m, parag->next()->topMargin() ) / 2; | 5289 | m = QMAX(m, parag->next()->topMargin() ) / 2; |
5267 | parag->setFullWidth( fullWidth ); | 5290 | parag->setFullWidth( fullWidth ); |
5268 | y += h + m; | 5291 | y += h + m; |
5269 | if ( doc ) | 5292 | if ( doc ) |
5270 | minw += doc->rightMargin(); | 5293 | minw += doc->rightMargin(); |
5271 | if ( !wrapEnabled ) | 5294 | if ( !wrapEnabled ) |
5272 | minw = QMAX(minw, wused); | 5295 | minw = QMAX(minw, wused); |
5273 | 5296 | ||
5274 | thisminw = minw; | 5297 | thisminw = minw; |
5275 | thiswused = wused; | 5298 | thiswused = wused; |
5276 | return y; | 5299 | return y; |
5277 | } | 5300 | } |
5278 | 5301 | ||
5279 | // +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ | 5302 | // +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
5280 | 5303 | ||
5281 | QTextFormatterBreakWords::QTextFormatterBreakWords() | 5304 | QTextFormatterBreakWords::QTextFormatterBreakWords() |
5282 | { | 5305 | { |
5283 | } | 5306 | } |
5284 | 5307 | ||
5285 | #define DO_FLOW( lineStart ) do{ if ( doc && doc->isPageBreakEnabled() ) { \ | 5308 | #define DO_FLOW( lineStart ) do{ if ( doc && doc->isPageBreakEnabled() ) { \ |
5286 | int yflow = lineStart->y + parag->rect().y();\ | 5309 | int yflow = lineStart->y + parag->rect().y();\ |
5287 | int shift = doc->flow()->adjustFlow( yflow, dw, lineStart->h ); \ | 5310 | int shift = doc->flow()->adjustFlow( yflow, dw, lineStart->h ); \ |
5288 | lineStart->y += shift;\ | 5311 | lineStart->y += shift;\ |
5289 | y += shift;\ | 5312 | y += shift;\ |
5290 | }}while(FALSE) | 5313 | }}while(FALSE) |
5291 | 5314 | ||
5292 | int QTextFormatterBreakWords::format( QTextDocument *doc, QTextParagraph *parag, | 5315 | int QTextFormatterBreakWords::format( QTextDocument *doc, QTextParagraph *parag, |
5293 | int start, const QMap<int, QTextLineStart*> & ) | 5316 | int start, const QMap<int, QTextLineStart*> & ) |
5294 | { | 5317 | { |
5295 | QTextStringChar *c = 0; | 5318 | QTextStringChar *c = 0; |
5296 | QTextStringChar *firstChar = 0; | 5319 | QTextStringChar *firstChar = 0; |
5297 | QTextString *string = parag->string(); | 5320 | QTextString *string = parag->string(); |
5298 | int left = doc ? parag->leftMargin() + doc->leftMargin() : 0; | 5321 | int left = doc ? parag->leftMargin() + doc->leftMargin() : 0; |
5299 | int x = left + ( doc ? parag->firstLineMargin() : 0 ); | 5322 | int x = left + ( doc ? parag->firstLineMargin() : 0 ); |
5300 | int y = parag->prev() ? QMAX(parag->prev()->bottomMargin(),parag->topMargin()) / 2: 0; | 5323 | int y = parag->prev() ? QMAX(parag->prev()->bottomMargin(),parag->topMargin()) / 2: 0; |
5301 | int h = y; | 5324 | int h = y; |
5302 | int len = parag->length(); | 5325 | int len = parag->length(); |
5303 | if ( doc ) | 5326 | if ( doc ) |
5304 | x = doc->flow()->adjustLMargin( y + parag->rect().y(), parag->rect().height(), x, 0 ); | 5327 | x = doc->flow()->adjustLMargin( y + parag->rect().y(), parag->rect().height(), x, 0 ); |
5305 | int dw = parag->documentVisibleWidth() - ( doc ? ( left != x ? 0 : doc->rightMargin() ) : 0 ); | 5328 | int dw = parag->documentVisibleWidth() - ( doc ? ( left != x ? 0 : doc->rightMargin() ) : 0 ); |
5306 | 5329 | ||
5307 | int curLeft = x; | 5330 | int curLeft = x; |
5308 | int rm = parag->rightMargin(); | 5331 | int rm = parag->rightMargin(); |
5309 | int rdiff = doc ? doc->flow()->adjustRMargin( y + parag->rect().y(), parag->rect().height(), rm, 0 ) : 0; | 5332 | int rdiff = doc ? doc->flow()->adjustRMargin( y + parag->rect().y(), parag->rect().height(), rm, 0 ) : 0; |
5310 | int w = dw - rdiff; | 5333 | int w = dw - rdiff; |
5311 | bool fullWidth = TRUE; | 5334 | bool fullWidth = TRUE; |
5312 | int marg = left + rdiff; | 5335 | int marg = left + rdiff; |
5313 | int minw = 0; | 5336 | int minw = 0; |
5314 | int wused = 0; | 5337 | int wused = 0; |
5315 | int tminw = marg; | 5338 | int tminw = marg; |
5316 | int linespacing = doc ? parag->lineSpacing() : 0; | 5339 | int linespacing = doc ? parag->lineSpacing() : 0; |
5317 | bool wrapEnabled = isWrapEnabled( parag ); | 5340 | bool wrapEnabled = isWrapEnabled( parag ); |
5318 | 5341 | ||
5319 | start = 0; | 5342 | start = 0; |
5320 | if ( start == 0 ) | 5343 | if ( start == 0 ) |
5321 | c = ¶g->string()->at( 0 ); | 5344 | c = ¶g->string()->at( 0 ); |
5322 | 5345 | ||
5323 | int i = start; | 5346 | int i = start; |
5324 | QTextLineStart *lineStart = new QTextLineStart( y, y, 0 ); | 5347 | QTextLineStart *lineStart = new QTextLineStart( y, y, 0 ); |
5325 | insertLineStart( parag, 0, lineStart ); | 5348 | insertLineStart( parag, 0, lineStart ); |
5326 | int lastBreak = -1; | 5349 | int lastBreak = -1; |
5327 | int tmpBaseLine = 0, tmph = 0; | 5350 | int tmpBaseLine = 0, tmph = 0; |
5328 | bool lastWasNonInlineCustom = FALSE; | 5351 | bool lastWasNonInlineCustom = FALSE; |
5329 | 5352 | ||
5330 | int align = parag->alignment(); | 5353 | int align = parag->alignment(); |
5331 | if ( align == Qt3::AlignAuto && doc && doc->alignment() != Qt3::AlignAuto ) | 5354 | if ( align == Qt3::AlignAuto && doc && doc->alignment() != Qt3::AlignAuto ) |
5332 | align = doc->alignment(); | 5355 | align = doc->alignment(); |
5333 | 5356 | ||
5334 | align &= Qt3::AlignHorizontal_Mask; | 5357 | align &= Qt3::AlignHorizontal_Mask; |
5335 | 5358 | ||
5336 | QPainter *painter = QTextFormat::painter(); | 5359 | QPainter *painter = QTextFormat::painter(); |
5337 | int col = 0; | 5360 | int col = 0; |
5338 | int ww = 0; | 5361 | int ww = 0; |
5339 | QChar lastChr; | 5362 | QChar lastChr; |
5340 | for ( ; i < len; ++i, ++col ) { | 5363 | for ( ; i < len; ++i, ++col ) { |
5341 | if ( c ) | 5364 | if ( c ) |
5342 | lastChr = c->c; | 5365 | lastChr = c->c; |
5343 | // ### next line should not be needed | 5366 | // ### next line should not be needed |
5344 | if ( painter ) | 5367 | if ( c && painter ) |
5345 | c->format()->setPainter( painter ); | 5368 | c->format()->setPainter( painter ); |
5346 | c = &string->at( i ); | 5369 | c = &string->at( i ); |
5347 | c->rightToLeft = FALSE; | 5370 | c->rightToLeft = FALSE; |
5348 | if ( i > 0 && (x > curLeft || ww == 0) || lastWasNonInlineCustom ) { | 5371 | if ( i > 0 && (x > curLeft || ww == 0) || lastWasNonInlineCustom ) { |
5349 | c->lineStart = 0; | 5372 | c->lineStart = 0; |
5350 | } else { | 5373 | } else { |
5351 | c->lineStart = 1; | 5374 | c->lineStart = 1; |
5352 | firstChar = c; | 5375 | firstChar = c; |
5353 | } | 5376 | } |
5354 | 5377 | ||
5355 | if ( c->isCustom() && c->customItem()->placement() != QTextCustomItem::PlaceInline ) | 5378 | if ( c->isCustom() && c->customItem()->placement() != QTextCustomItem::PlaceInline ) |
5356 | lastWasNonInlineCustom = TRUE; | 5379 | lastWasNonInlineCustom = TRUE; |
5357 | else | 5380 | else |
5358 | lastWasNonInlineCustom = FALSE; | 5381 | lastWasNonInlineCustom = FALSE; |
5359 | 5382 | ||
5360 | if ( c->c.unicode() >= 32 || c->isCustom() ) { | 5383 | if ( c->c.unicode() >= 32 || c->isCustom() ) { |
5361 | ww = string->width( i ); | 5384 | ww = string->width( i ); |
5362 | } else if ( c->c == '\t' ) { | 5385 | } else if ( c->c == '\t' ) { |
5363 | int nx = parag->nextTab( i, x - left ) + left; | 5386 | int nx = parag->nextTab( i, x - left ) + left; |
5364 | if ( nx < x ) | 5387 | if ( nx < x ) |
5365 | ww = w - x; | 5388 | ww = w - x; |
5366 | else | 5389 | else |
5367 | ww = nx - x; | 5390 | ww = nx - x; |
5368 | } else { | 5391 | } else { |
5369 | ww = c->format()->width( ' ' ); | 5392 | ww = c->format()->width( ' ' ); |
5370 | } | 5393 | } |
5371 | 5394 | ||
5372 | // last character ("invisible" space) has no width | 5395 | // last character ("invisible" space) has no width |
5373 | if ( i == len - 1 ) | 5396 | if ( i == len - 1 ) |
5374 | ww = 0; | 5397 | ww = 0; |
5375 | 5398 | ||
5376 | QTextCustomItem* ci = c->customItem(); | 5399 | QTextCustomItem* ci = c->customItem(); |
5377 | if ( c->isCustom() && ci->ownLine() ) { | 5400 | if ( c->isCustom() && ci->ownLine() ) { |
5378 | x = doc ? doc->flow()->adjustLMargin( y + parag->rect().y(), parag->rect().height(), left, 4 ) : left; | 5401 | x = doc ? doc->flow()->adjustLMargin( y + parag->rect().y(), parag->rect().height(), left, 4 ) : left; |
5379 | w = dw - ( doc ? doc->flow()->adjustRMargin( y + parag->rect().y(), parag->rect().height(), rm, 4 ) : 0 ); | 5402 | w = dw - ( doc ? doc->flow()->adjustRMargin( y + parag->rect().y(), parag->rect().height(), rm, 4 ) : 0 ); |
5380 | QTextLineStart *lineStart2 = formatLine( parag, string, lineStart, firstChar, c-1, align, SPACE(w - x) ); | 5403 | QTextLineStart *lineStart2 = formatLine( parag, string, lineStart, firstChar, c-1, align, SPACE(w - x) ); |
5381 | ci->resize( w - x); | 5404 | ci->resize( w - x); |
5382 | if ( ci->width < w - x ) { | 5405 | if ( ci->width < w - x ) { |
5383 | if ( align & Qt::AlignHCenter ) | 5406 | if ( align & Qt::AlignHCenter ) |
5384 | x = ( w - ci->width ) / 2; | 5407 | x = ( w - ci->width ) / 2; |
5385 | else if ( align & Qt::AlignRight ) { | 5408 | else if ( align & Qt::AlignRight ) { |
5386 | x = w - ci->width; | 5409 | x = w - ci->width; |
5387 | } | 5410 | } |
5388 | } | 5411 | } |
5389 | c->x = x; | 5412 | c->x = x; |
5390 | curLeft = x; | 5413 | curLeft = x; |
5391 | if ( i == 0 || !isBreakable( string, i - 1 ) || string->at( i - 1 ).lineStart == 0 ) { | 5414 | if ( i == 0 || !isBreakable( string, i - 1 ) || string->at( i - 1 ).lineStart == 0 ) { |
5392 | y += QMAX( h, QMAX( tmph, linespacing ) ); | 5415 | y += QMAX( h, QMAX( tmph, linespacing ) ); |
5393 | tmph = c->height(); | 5416 | tmph = c->height(); |
5394 | h = tmph; | 5417 | h = tmph; |
5395 | lineStart = lineStart2; | 5418 | lineStart = lineStart2; |
5396 | lineStart->y = y; | 5419 | lineStart->y = y; |
5397 | insertLineStart( parag, i, lineStart ); | 5420 | insertLineStart( parag, i, lineStart ); |
5398 | c->lineStart = 1; | 5421 | c->lineStart = 1; |
5399 | firstChar = c; | 5422 | firstChar = c; |
5400 | } else { | 5423 | } else { |
5401 | tmph = c->height(); | 5424 | tmph = c->height(); |
5402 | h = tmph; | 5425 | h = tmph; |
5403 | delete lineStart2; | 5426 | delete lineStart2; |
5404 | } | 5427 | } |
5405 | lineStart->h = h; | 5428 | lineStart->h = h; |
5406 | lineStart->baseLine = h; | 5429 | lineStart->baseLine = h; |
5407 | tmpBaseLine = lineStart->baseLine; | 5430 | tmpBaseLine = lineStart->baseLine; |
5408 | lastBreak = -2; | 5431 | lastBreak = -2; |
5409 | x = 0xffffff; | 5432 | x = 0xffffff; |
5410 | minw = QMAX( minw, tminw ); | 5433 | minw = QMAX( minw, tminw ); |
5411 | 5434 | ||
5412 | int tw = ci->minimumWidth() + ( doc ? doc->leftMargin() : 0 ); | 5435 | int tw = ci->minimumWidth() + ( doc ? doc->leftMargin() : 0 ); |
5413 | if ( tw < QWIDGETSIZE_MAX ) | 5436 | if ( tw < QWIDGETSIZE_MAX ) |
5414 | tminw = tw; | 5437 | tminw = tw; |
5415 | else | 5438 | else |
5416 | tminw = marg; | 5439 | tminw = marg; |
5417 | wused = QMAX( wused, ci->width ); | 5440 | wused = QMAX( wused, ci->width ); |
5418 | continue; | 5441 | continue; |
5419 | } else if ( c->isCustom() && ci->placement() != QTextCustomItem::PlaceInline ) { | 5442 | } else if ( c->isCustom() && ci->placement() != QTextCustomItem::PlaceInline ) { |
5420 | int tw = ci->minimumWidth(); | 5443 | int tw = ci->minimumWidth(); |
5421 | if ( tw < QWIDGETSIZE_MAX ) | 5444 | if ( tw < QWIDGETSIZE_MAX ) |
5422 | minw = QMAX( minw, tw ); | 5445 | minw = QMAX( minw, tw ); |
5423 | } | 5446 | } |
5424 | 5447 | ||
5425 | bool lastWasOwnLineCustomItem = lastBreak == -2; | 5448 | bool lastWasOwnLineCustomItem = lastBreak == -2; |
5426 | bool hadBreakableChar = lastBreak != -1; | 5449 | bool hadBreakableChar = lastBreak != -1; |
5427 | bool lastWasHardBreak = lastChr == QChar_linesep; | 5450 | bool lastWasHardBreak = lastChr == QChar_linesep; |
5428 | 5451 | ||
5429 | // we break if | 5452 | // we break if |
5430 | // 1. the last character was a hard break (QChar_linesep) or | 5453 | // 1. the last character was a hard break (QChar_linesep) or |
5431 | // 2. the last charater was a own-line custom item (eg. table or ruler) or | 5454 | // 2. the last charater was a own-line custom item (eg. table or ruler) or |
5432 | // 3. wrapping was enabled, it was not a space and following | 5455 | // 3. wrapping was enabled, it was not a space and following |
5433 | // condition is true: We either had a breakable character | 5456 | // condition is true: We either had a breakable character |
5434 | // previously or we ar allowed to break in words and - either | 5457 | // previously or we ar allowed to break in words and - either |
5435 | // we break at w pixels and the current char would exceed that | 5458 | // we break at w pixels and the current char would exceed that |
5436 | // or - we break at a column and the current character would | 5459 | // or - we break at a column and the current character would |
5437 | // exceed that. | 5460 | // exceed that. |
5438 | if ( lastWasHardBreak || lastWasOwnLineCustomItem || | 5461 | if ( lastWasHardBreak || lastWasOwnLineCustomItem || |
5439 | ( wrapEnabled && | 5462 | ( wrapEnabled && |
5440 | ( (!c->c.isSpace() && (hadBreakableChar || allowBreakInWords()) && | 5463 | ( (!c->c.isSpace() && (hadBreakableChar || allowBreakInWords()) && |
diff --git a/noncore/settings/networksettings2/opietooth2/OTSDPAttribute.cpp b/noncore/settings/networksettings2/opietooth2/OTSDPAttribute.cpp index 9069c09..3fd877f 100644 --- a/noncore/settings/networksettings2/opietooth2/OTSDPAttribute.cpp +++ b/noncore/settings/networksettings2/opietooth2/OTSDPAttribute.cpp | |||
@@ -202,128 +202,131 @@ void OTSDPAttribute::setInt(const OTSDPAttribute::int128_t & val) { | |||
202 | void OTSDPAttribute::setUInt(const uint128_t & val) { | 202 | void OTSDPAttribute::setUInt(const uint128_t & val) { |
203 | type = UINT; | 203 | type = UINT; |
204 | Value.uintVal = new uint128_t(val); | 204 | Value.uintVal = new uint128_t(val); |
205 | } | 205 | } |
206 | 206 | ||
207 | void OTSDPAttribute::setUUID(const OTUUID & val) { | 207 | void OTSDPAttribute::setUUID(const OTUUID & val) { |
208 | type = UUID; | 208 | type = UUID; |
209 | Value.uuidVal = new OTUUID( val ); | 209 | Value.uuidVal = new OTUUID( val ); |
210 | } | 210 | } |
211 | 211 | ||
212 | void OTSDPAttribute::setBool(bool val) { | 212 | void OTSDPAttribute::setBool(bool val) { |
213 | type = BOOLEAN; | 213 | type = BOOLEAN; |
214 | Value.boolVal = val; | 214 | Value.boolVal = val; |
215 | } | 215 | } |
216 | 216 | ||
217 | void OTSDPAttribute::setString( const QString & val) { | 217 | void OTSDPAttribute::setString( const QString & val) { |
218 | type = STRING; | 218 | type = STRING; |
219 | Value.stringVal = new QString( val ); | 219 | Value.stringVal = new QString( val ); |
220 | } | 220 | } |
221 | 221 | ||
222 | void OTSDPAttribute::setURL( const QString & val) { | 222 | void OTSDPAttribute::setURL( const QString & val) { |
223 | type = URL; | 223 | type = URL; |
224 | Value.stringVal = new QString(val); | 224 | Value.stringVal = new QString(val); |
225 | } | 225 | } |
226 | 226 | ||
227 | void OTSDPAttribute::setSequence(const AttributeVector& val) { | 227 | void OTSDPAttribute::setSequence(const AttributeVector& val) { |
228 | type = SEQUENCE; | 228 | type = SEQUENCE; |
229 | Value.sequenceVal = new AttributeVector(); | 229 | Value.sequenceVal = new AttributeVector(); |
230 | Value.sequenceVal->setAutoDelete( TRUE ); | 230 | Value.sequenceVal->setAutoDelete( TRUE ); |
231 | *Value.sequenceVal = val; | 231 | *Value.sequenceVal = val; |
232 | } | 232 | } |
233 | 233 | ||
234 | void OTSDPAttribute::setAlternative(const AttributeVector& val) { | 234 | void OTSDPAttribute::setAlternative(const AttributeVector& val) { |
235 | type = ALTERNATIVE; | 235 | type = ALTERNATIVE; |
236 | Value.sequenceVal = new AttributeVector(); | 236 | Value.sequenceVal = new AttributeVector(); |
237 | Value.sequenceVal->setAutoDelete( TRUE ); | 237 | Value.sequenceVal->setAutoDelete( TRUE ); |
238 | *Value.sequenceVal = val; | 238 | *Value.sequenceVal = val; |
239 | } | 239 | } |
240 | 240 | ||
241 | QString OTSDPAttribute::getString() { | 241 | QString OTSDPAttribute::getString() { |
242 | assert(type == STRING); | 242 | assert(type == STRING); |
243 | return *Value.stringVal; | 243 | return *Value.stringVal; |
244 | } | 244 | } |
245 | 245 | ||
246 | QString OTSDPAttribute::getURL() { | 246 | QString OTSDPAttribute::getURL() { |
247 | assert(type == URL); | 247 | assert(type == URL); |
248 | return *Value.stringVal; | 248 | return *Value.stringVal; |
249 | } | 249 | } |
250 | 250 | ||
251 | const OTSDPAttribute::int128_t & OTSDPAttribute::getInt() { | 251 | const OTSDPAttribute::int128_t & OTSDPAttribute::getInt() { |
252 | assert(type == INT); | 252 | assert(type == INT); |
253 | return *Value.intVal; | 253 | return *Value.intVal; |
254 | } | 254 | } |
255 | 255 | ||
256 | 256 | ||
257 | const OTSDPAttribute::uint128_t & OTSDPAttribute::getUInt() { | 257 | const OTSDPAttribute::uint128_t & OTSDPAttribute::getUInt() { |
258 | assert(type == UINT); | 258 | assert(type == UINT); |
259 | return *Value.uintVal; | 259 | return *Value.uintVal; |
260 | } | 260 | } |
261 | 261 | ||
262 | const OTUUID & OTSDPAttribute::getUUID() { | 262 | const OTUUID & OTSDPAttribute::getUUID() { |
263 | assert(type == UUID); | 263 | assert(type == UUID); |
264 | return *Value.uuidVal; | 264 | return *Value.uuidVal; |
265 | } | 265 | } |
266 | 266 | ||
267 | bool OTSDPAttribute::getBool() { | 267 | bool OTSDPAttribute::getBool() { |
268 | assert(type == BOOLEAN); | 268 | assert(type == BOOLEAN); |
269 | return Value.boolVal; | 269 | return Value.boolVal; |
270 | } | 270 | } |
271 | 271 | ||
272 | AttributeVector * OTSDPAttribute::getSequence() { | 272 | AttributeVector * OTSDPAttribute::getSequence() { |
273 | assert(type == SEQUENCE); | 273 | assert(type == SEQUENCE); |
274 | return Value.sequenceVal; | 274 | return Value.sequenceVal; |
275 | } | 275 | } |
276 | 276 | ||
277 | AttributeVector * OTSDPAttribute::getAlternative() { | 277 | AttributeVector * OTSDPAttribute::getAlternative() { |
278 | assert(type == ALTERNATIVE); | 278 | assert(type == ALTERNATIVE); |
279 | return Value.sequenceVal; | 279 | return Value.sequenceVal; |
280 | } | 280 | } |
281 | 281 | ||
282 | UUIDVector OTSDPAttribute::getAllUUIDs() { | 282 | UUIDVector OTSDPAttribute::getAllUUIDs() { |
283 | 283 | ||
284 | UUIDVector uuids; | 284 | UUIDVector uuids; |
285 | 285 | ||
286 | if (getType() == UUID) { | 286 | if (getType() == UUID) { |
287 | uuids.resize( uuids.size()+1 ); | 287 | uuids.resize( uuids.size()+1 ); |
288 | uuids[uuids.size()-1] = getUUID(); | 288 | uuids[uuids.size()-1] = getUUID(); |
289 | } else { | 289 | } else { |
290 | AttributeVector * subAttributes = 0 ; | 290 | AttributeVector * subAttributes = 0 ; |
291 | 291 | ||
292 | if (getType() == SEQUENCE) { | 292 | if (getType() == SEQUENCE) { |
293 | subAttributes = getSequence(); | 293 | subAttributes = getSequence(); |
294 | } else if (getType() == ALTERNATIVE) { | 294 | } else if (getType() == ALTERNATIVE) { |
295 | subAttributes = getAlternative(); | 295 | subAttributes = getAlternative(); |
296 | } | 296 | } |
297 | 297 | ||
298 | if (!subAttributes) | ||
299 | return 0; | ||
300 | |||
298 | int os; | 301 | int os; |
299 | for( unsigned int i = 0; i < subAttributes->count(); i++ ) { | 302 | for( unsigned int i = 0; i < subAttributes->count(); i++ ) { |
300 | UUIDVector subUUIDs = (*subAttributes)[i]->getAllUUIDs(); | 303 | UUIDVector subUUIDs = (*subAttributes)[i]->getAllUUIDs(); |
301 | 304 | ||
302 | os = uuids.size(); | 305 | os = uuids.size(); |
303 | uuids.resize( uuids.size()+subUUIDs.count() ); | 306 | uuids.resize( uuids.size()+subUUIDs.count() ); |
304 | 307 | ||
305 | for( unsigned int k = 0; k < subUUIDs.count(); k++ ) { | 308 | for( unsigned int k = 0; k < subUUIDs.count(); k++ ) { |
306 | uuids[os + k] = subUUIDs[k]; | 309 | uuids[os + k] = subUUIDs[k]; |
307 | } | 310 | } |
308 | } | 311 | } |
309 | } | 312 | } |
310 | return uuids; | 313 | return uuids; |
311 | } | 314 | } |
312 | 315 | ||
313 | static char * Attr2String[] = { | 316 | static char * Attr2String[] = { |
314 | "Invalid", | 317 | "Invalid", |
315 | "Nil", | 318 | "Nil", |
316 | "UInt", | 319 | "UInt", |
317 | "int", | 320 | "int", |
318 | "UUID", | 321 | "UUID", |
319 | "Boolean", | 322 | "Boolean", |
320 | "String", | 323 | "String", |
321 | "Sequence", | 324 | "Sequence", |
322 | "Alternative", | 325 | "Alternative", |
323 | "URL", | 326 | "URL", |
324 | "Unknown" | 327 | "Unknown" |
325 | }; | 328 | }; |
326 | 329 | ||
327 | const char * OTSDPAttribute::getTypeString() { | 330 | const char * OTSDPAttribute::getTypeString() { |
328 | return Attr2String[type]; | 331 | return Attr2String[type]; |
329 | } | 332 | } |
diff --git a/noncore/settings/packagemanager/oipkgconfigdlg.cpp b/noncore/settings/packagemanager/oipkgconfigdlg.cpp index d014378..78a18f7 100644 --- a/noncore/settings/packagemanager/oipkgconfigdlg.cpp +++ b/noncore/settings/packagemanager/oipkgconfigdlg.cpp | |||
@@ -343,207 +343,209 @@ void OIpkgConfigDlg::initOptionsWidget() | |||
343 | m_optForceRecursive = new QCheckBox( tr( "Force Recursive" ), container ); | 343 | m_optForceRecursive = new QCheckBox( tr( "Force Recursive" ), container ); |
344 | QWhatsThis::add( m_optForceRecursive, tr( "Tap here to enable or disable the '-recursive' option for Ipkg." ) ); | 344 | QWhatsThis::add( m_optForceRecursive, tr( "Tap here to enable or disable the '-recursive' option for Ipkg." ) ); |
345 | layout->addMultiCellWidget( m_optForceRecursive, 4, 4, 0, 1 ); | 345 | layout->addMultiCellWidget( m_optForceRecursive, 4, 4, 0, 1 ); |
346 | 346 | ||
347 | m_optVerboseWget = new QCheckBox( tr( "Verbose fetch" ), container ); | 347 | m_optVerboseWget = new QCheckBox( tr( "Verbose fetch" ), container ); |
348 | QWhatsThis::add( m_optVerboseWget, tr( "Tap here to enable or disable the '-verbose_wget' option for Ipkg." ) ); | 348 | QWhatsThis::add( m_optVerboseWget, tr( "Tap here to enable or disable the '-verbose_wget' option for Ipkg." ) ); |
349 | layout->addMultiCellWidget( m_optVerboseWget, 5, 5, 0, 1 ); | 349 | layout->addMultiCellWidget( m_optVerboseWget, 5, 5, 0, 1 ); |
350 | 350 | ||
351 | QLabel *l = new QLabel( tr( "Information level:" ), container ); | 351 | QLabel *l = new QLabel( tr( "Information level:" ), container ); |
352 | QWhatsThis::add( l, tr( "Select information level for Ipkg." ) ); | 352 | QWhatsThis::add( l, tr( "Select information level for Ipkg." ) ); |
353 | layout->addMultiCellWidget( l, 6, 6, 0, 1 ); | 353 | layout->addMultiCellWidget( l, 6, 6, 0, 1 ); |
354 | 354 | ||
355 | m_optVerboseIpkg = new QComboBox( container ); | 355 | m_optVerboseIpkg = new QComboBox( container ); |
356 | QWhatsThis::add( m_optVerboseIpkg, tr( "Select information level for Ipkg." ) ); | 356 | QWhatsThis::add( m_optVerboseIpkg, tr( "Select information level for Ipkg." ) ); |
357 | m_optVerboseIpkg->insertItem( tr( "Errors only" ) ); | 357 | m_optVerboseIpkg->insertItem( tr( "Errors only" ) ); |
358 | m_optVerboseIpkg->insertItem( tr( "Normal messages" ) ); | 358 | m_optVerboseIpkg->insertItem( tr( "Normal messages" ) ); |
359 | m_optVerboseIpkg->insertItem( tr( "Informative messages" ) ); | 359 | m_optVerboseIpkg->insertItem( tr( "Informative messages" ) ); |
360 | m_optVerboseIpkg->insertItem( tr( "Troubleshooting output" ) ); | 360 | m_optVerboseIpkg->insertItem( tr( "Troubleshooting output" ) ); |
361 | layout->addMultiCellWidget( m_optVerboseIpkg, 7, 7, 0, 1 ); | 361 | layout->addMultiCellWidget( m_optVerboseIpkg, 7, 7, 0, 1 ); |
362 | 362 | ||
363 | l = new QLabel( tr( "Package source lists directory:" ), container ); | 363 | l = new QLabel( tr( "Package source lists directory:" ), container ); |
364 | QWhatsThis::add( l, tr( "Enter the directory where package source feed information is stored." ) ); | 364 | QWhatsThis::add( l, tr( "Enter the directory where package source feed information is stored." ) ); |
365 | layout->addMultiCellWidget( l, 8, 8, 0, 1 ); | 365 | layout->addMultiCellWidget( l, 8, 8, 0, 1 ); |
366 | 366 | ||
367 | m_optSourceLists = new QLineEdit( container ); | 367 | m_optSourceLists = new QLineEdit( container ); |
368 | QWhatsThis::add( m_optSourceLists, tr( "Enter the directory where package source feed information is stored." ) ); | 368 | QWhatsThis::add( m_optSourceLists, tr( "Enter the directory where package source feed information is stored." ) ); |
369 | layout->addWidget( m_optSourceLists, 9, 0 ); | 369 | layout->addWidget( m_optSourceLists, 9, 0 ); |
370 | 370 | ||
371 | QPushButton *btn = new QPushButton( Opie::Core::OResource::loadPixmap( "folder", Opie::Core::OResource::SmallIcon ), | 371 | QPushButton *btn = new QPushButton( Opie::Core::OResource::loadPixmap( "folder", Opie::Core::OResource::SmallIcon ), |
372 | QString::null, container ); | 372 | QString::null, container ); |
373 | btn->setMinimumHeight( AppLnk::smallIconSize()+4 ); | 373 | btn->setMinimumHeight( AppLnk::smallIconSize()+4 ); |
374 | btn->setMaximumWidth( btn->height() ); | 374 | btn->setMaximumWidth( btn->height() ); |
375 | QWhatsThis::add( btn, tr( "Tap here to select the directory where package source feed information is stored." ) ); | 375 | QWhatsThis::add( btn, tr( "Tap here to select the directory where package source feed information is stored." ) ); |
376 | connect( btn, SIGNAL(clicked()), this, SLOT(slotOptSelectSourceListsPath()) ); | 376 | connect( btn, SIGNAL(clicked()), this, SLOT(slotOptSelectSourceListsPath()) ); |
377 | layout->addWidget( btn, 9, 1 ); | 377 | layout->addWidget( btn, 9, 1 ); |
378 | 378 | ||
379 | layout->addItem( new QSpacerItem( 1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding ) ); | 379 | layout->addItem( new QSpacerItem( 1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding ) ); |
380 | } | 380 | } |
381 | 381 | ||
382 | void OIpkgConfigDlg::initData() | 382 | void OIpkgConfigDlg::initData() |
383 | { | 383 | { |
384 | // Read ipkg configuration (server/destination/proxy) information | 384 | // Read ipkg configuration (server/destination/proxy) information |
385 | if ( m_ipkg && !m_installOptions ) | 385 | if ( m_ipkg && !m_installOptions ) |
386 | { | 386 | { |
387 | m_configs = m_ipkg->configItems(); | 387 | m_configs = m_ipkg->configItems(); |
388 | if ( m_configs ) | 388 | if ( m_configs ) |
389 | { | 389 | { |
390 | for ( OConfItemListIterator configIt( *m_configs ); configIt.current(); ++configIt ) | 390 | for ( OConfItemListIterator configIt( *m_configs ); configIt.current(); ++configIt ) |
391 | { | 391 | { |
392 | OConfItem *config = configIt.current(); | 392 | OConfItem *config = configIt.current(); |
393 | 393 | ||
394 | // Add configuration item to the appropriate dialog controls | 394 | // Add configuration item to the appropriate dialog controls |
395 | if ( config ) | 395 | if ( config ) |
396 | { | 396 | { |
397 | switch ( config->type() ) | 397 | switch ( config->type() ) |
398 | { | 398 | { |
399 | case OConfItem::Source : m_serverList->insertItem( config->name() ); break; | 399 | case OConfItem::Source : m_serverList->insertItem( config->name() ); break; |
400 | case OConfItem::Destination : m_destList->insertItem( config->name() ); break; | 400 | case OConfItem::Destination : m_destList->insertItem( config->name() ); break; |
401 | case OConfItem::Option : | 401 | case OConfItem::Option : |
402 | { | 402 | { |
403 | if ( config->name() == "http_proxy" ) | 403 | if ( config->name() == "http_proxy" ) |
404 | { | 404 | { |
405 | m_proxyHttpServer->setText( config->value() ); | 405 | m_proxyHttpServer->setText( config->value() ); |
406 | m_proxyHttpActive->setChecked( config->active() ); | 406 | m_proxyHttpActive->setChecked( config->active() ); |
407 | } | 407 | } |
408 | else if ( config->name() == "ftp_proxy" ) | 408 | else if ( config->name() == "ftp_proxy" ) |
409 | { | 409 | { |
410 | m_proxyFtpServer->setText( config->value() ); | 410 | m_proxyFtpServer->setText( config->value() ); |
411 | m_proxyFtpActive->setChecked( config->active() ); | 411 | m_proxyFtpActive->setChecked( config->active() ); |
412 | } | 412 | } |
413 | else if ( config->name() == "proxy_username" ) | 413 | else if ( config->name() == "proxy_username" ) |
414 | { | 414 | { |
415 | m_proxyUsername->setText( config->value() ); | 415 | m_proxyUsername->setText( config->value() ); |
416 | } | 416 | } |
417 | else if ( config->name() == "proxy_password" ) | 417 | else if ( config->name() == "proxy_password" ) |
418 | { | 418 | { |
419 | m_proxyPassword->setText( config->value() ); | 419 | m_proxyPassword->setText( config->value() ); |
420 | } | 420 | } |
421 | } | 421 | } |
422 | break; | 422 | break; |
423 | case OConfItem::Other : | 423 | case OConfItem::Other : |
424 | { | 424 | { |
425 | if ( config->name() == "lists_dir" ) | 425 | if ( config->name() == "lists_dir" ) |
426 | m_optSourceLists->setText( config->value() ); | 426 | m_optSourceLists->setText( config->value() ); |
427 | else // TODO - use proper libipkg define | 427 | else // TODO - use proper libipkg define |
428 | m_optSourceLists->setText( "/usr/lib/ipkg/lists" ); | 428 | m_optSourceLists->setText( "/usr/lib/ipkg/lists" ); |
429 | } | 429 | } |
430 | break; | 430 | break; |
431 | default : break; | 431 | default : break; |
432 | }; | 432 | }; |
433 | } | 433 | } |
434 | } | 434 | } |
435 | } | 435 | } |
436 | } | 436 | } |
437 | 437 | ||
438 | // Get Ipkg execution options | 438 | // Get Ipkg execution options |
439 | int options = m_ipkg->ipkgExecOptions(); | 439 | int options = 0; |
440 | if ( m_ipkg ) | ||
441 | options = m_ipkg->ipkgExecOptions(); | ||
440 | if ( options & FORCE_DEPENDS ) | 442 | if ( options & FORCE_DEPENDS ) |
441 | m_optForceDepends->setChecked( true ); | 443 | m_optForceDepends->setChecked( true ); |
442 | if ( options & FORCE_REINSTALL ) | 444 | if ( options & FORCE_REINSTALL ) |
443 | m_optForceReinstall->setChecked( true ); | 445 | m_optForceReinstall->setChecked( true ); |
444 | if ( options & FORCE_REMOVE ) | 446 | if ( options & FORCE_REMOVE ) |
445 | m_optForceRemove->setChecked( true ); | 447 | m_optForceRemove->setChecked( true ); |
446 | if ( options & FORCE_OVERWRITE ) | 448 | if ( options & FORCE_OVERWRITE ) |
447 | m_optForceOverwrite->setChecked( true ); | 449 | m_optForceOverwrite->setChecked( true ); |
448 | if ( options & FORCE_RECURSIVE ) | 450 | if ( options & FORCE_RECURSIVE ) |
449 | m_optForceRecursive->setChecked( true ); | 451 | m_optForceRecursive->setChecked( true ); |
450 | if ( options & FORCE_VERBOSE_WGET ) | 452 | if ( options & FORCE_VERBOSE_WGET ) |
451 | m_optVerboseWget->setChecked( true ); | 453 | m_optVerboseWget->setChecked( true ); |
452 | 454 | ||
453 | m_optVerboseIpkg->setCurrentItem( m_ipkg->ipkgExecVerbosity() ); | 455 | m_optVerboseIpkg->setCurrentItem( ( m_ipkg ? m_ipkg->ipkgExecVerbosity() : 0 ) ); |
454 | } | 456 | } |
455 | 457 | ||
456 | void OIpkgConfigDlg::slotServerSelected( int index ) | 458 | void OIpkgConfigDlg::slotServerSelected( int index ) |
457 | { | 459 | { |
458 | m_serverCurrent = index; | 460 | m_serverCurrent = index; |
459 | 461 | ||
460 | // Enable Edit and Delete buttons | 462 | // Enable Edit and Delete buttons |
461 | m_serverEditBtn->setEnabled( true ); | 463 | m_serverEditBtn->setEnabled( true ); |
462 | m_serverDeleteBtn->setEnabled( true ); | 464 | m_serverDeleteBtn->setEnabled( true ); |
463 | } | 465 | } |
464 | 466 | ||
465 | void OIpkgConfigDlg::slotServerNew() | 467 | void OIpkgConfigDlg::slotServerNew() |
466 | { | 468 | { |
467 | OConfItem *server = new OConfItem( OConfItem::Source ); | 469 | OConfItem *server = new OConfItem( OConfItem::Source ); |
468 | 470 | ||
469 | OIpkgServerDlg dlg( server, this ); | 471 | OIpkgServerDlg dlg( server, this ); |
470 | if ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted ) | 472 | if ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted ) |
471 | { | 473 | { |
472 | // Add to configuration option list | 474 | // Add to configuration option list |
473 | m_configs->append( server ); | 475 | m_configs->append( server ); |
474 | m_configs->sort(); | 476 | m_configs->sort(); |
475 | 477 | ||
476 | // Add to server list | 478 | // Add to server list |
477 | m_serverList->insertItem( server->name() ); | 479 | m_serverList->insertItem( server->name() ); |
478 | m_serverList->setCurrentItem( m_serverList->count() ); | 480 | m_serverList->setCurrentItem( m_serverList->count() ); |
479 | } | 481 | } |
480 | else | 482 | else |
481 | delete server; | 483 | delete server; |
482 | } | 484 | } |
483 | 485 | ||
484 | void OIpkgConfigDlg::slotServerEdit() | 486 | void OIpkgConfigDlg::slotServerEdit() |
485 | { | 487 | { |
486 | // Find selected server in list | 488 | // Find selected server in list |
487 | OConfItem *server = m_ipkg->findConfItem( OConfItem::Source, m_serverList->currentText() ); | 489 | OConfItem *server = m_ipkg->findConfItem( OConfItem::Source, m_serverList->currentText() ); |
488 | 490 | ||
489 | // Edit server | 491 | // Edit server |
490 | if ( server ) | 492 | if ( server ) |
491 | { | 493 | { |
492 | QString origName = server->name(); | 494 | QString origName = server->name(); |
493 | OIpkgServerDlg dlg( server, this ); | 495 | OIpkgServerDlg dlg( server, this ); |
494 | if ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted ) | 496 | if ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted ) |
495 | { | 497 | { |
496 | // Check to see if name has changed, if so update the server list | 498 | // Check to see if name has changed, if so update the server list |
497 | if ( server->name() != origName ) | 499 | if ( server->name() != origName ) |
498 | m_serverList->changeItem( server->name(), m_serverCurrent ); | 500 | m_serverList->changeItem( server->name(), m_serverCurrent ); |
499 | } | 501 | } |
500 | } | 502 | } |
501 | } | 503 | } |
502 | 504 | ||
503 | void OIpkgConfigDlg::slotServerDelete() | 505 | void OIpkgConfigDlg::slotServerDelete() |
504 | { | 506 | { |
505 | // Find selected server in list | 507 | // Find selected server in list |
506 | OConfItem *server = m_ipkg->findConfItem( OConfItem::Source, m_serverList->currentText() ); | 508 | OConfItem *server = m_ipkg->findConfItem( OConfItem::Source, m_serverList->currentText() ); |
507 | 509 | ||
508 | // Delete server | 510 | // Delete server |
509 | if ( server ) | 511 | if ( server ) |
510 | { | 512 | { |
511 | m_configs->removeRef( server ); | 513 | m_configs->removeRef( server ); |
512 | m_serverList->removeItem( m_serverCurrent ); | 514 | m_serverList->removeItem( m_serverCurrent ); |
513 | } | 515 | } |
514 | } | 516 | } |
515 | 517 | ||
516 | void OIpkgConfigDlg::slotDestSelected( int index ) | 518 | void OIpkgConfigDlg::slotDestSelected( int index ) |
517 | { | 519 | { |
518 | m_destCurrent = index; | 520 | m_destCurrent = index; |
519 | 521 | ||
520 | // Enable Edit and Delete buttons | 522 | // Enable Edit and Delete buttons |
521 | m_destEditBtn->setEnabled( true ); | 523 | m_destEditBtn->setEnabled( true ); |
522 | m_destDeleteBtn->setEnabled( true ); | 524 | m_destDeleteBtn->setEnabled( true ); |
523 | } | 525 | } |
524 | 526 | ||
525 | void OIpkgConfigDlg::slotDestNew() | 527 | void OIpkgConfigDlg::slotDestNew() |
526 | { | 528 | { |
527 | OConfItem *dest = new OConfItem( OConfItem::Destination ); | 529 | OConfItem *dest = new OConfItem( OConfItem::Destination ); |
528 | 530 | ||
529 | OIpkgDestDlg dlg( dest, this ); | 531 | OIpkgDestDlg dlg( dest, this ); |
530 | if ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted ) | 532 | if ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted ) |
531 | { | 533 | { |
532 | // Add to configuration option list | 534 | // Add to configuration option list |
533 | m_configs->append( dest ); | 535 | m_configs->append( dest ); |
534 | m_configs->sort(); | 536 | m_configs->sort(); |
535 | 537 | ||
536 | // Add to destination list | 538 | // Add to destination list |
537 | m_destList->insertItem( dest->name() ); | 539 | m_destList->insertItem( dest->name() ); |
538 | m_destList->setCurrentItem( m_destList->count() ); | 540 | m_destList->setCurrentItem( m_destList->count() ); |
539 | } | 541 | } |
540 | else | 542 | else |
541 | delete dest; | 543 | delete dest; |
542 | } | 544 | } |
543 | 545 | ||
544 | void OIpkgConfigDlg::slotDestEdit() | 546 | void OIpkgConfigDlg::slotDestEdit() |
545 | { | 547 | { |
546 | // Find selected destination in list | 548 | // Find selected destination in list |
547 | OConfItem *dest = m_ipkg->findConfItem( OConfItem::Destination, m_destList->currentText() ); | 549 | OConfItem *dest = m_ipkg->findConfItem( OConfItem::Destination, m_destList->currentText() ); |
548 | 550 | ||
549 | // Edit destination | 551 | // Edit destination |